mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-31 13:18:06 +00:00 
			
		
		
		
	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
This commit is contained in:
		
						commit
						4e92b9e0d3
					
				|  | @ -66,7 +66,9 @@ | |||
| - remove file from dropfolder when updating a document and requested by | ||||
|   configuration | ||||
| - another check if dropfolder is accessible when opening the dialog box | ||||
| - add preview of pdf documents and convertion to pdf | ||||
| - add preview of pdf documents and conversion to pdf | ||||
| - replace some more php short tags | ||||
| - list of available languages can be set in configuration | ||||
| 
 | ||||
| -------------------------------------------------------------------------------- | ||||
|                      Changes in version 4.3.30 | ||||
|  |  | |||
|  | @ -103,7 +103,7 @@ class SeedDMS_Preview_Base { | |||
| 	 * and the value is the command to be called for creating the preview | ||||
| 	 */ | ||||
| 	function setConverters($arr) { /* {{{ */ | ||||
| 		$this->converters = array_merge($arr, $this->converters); | ||||
| 		$this->converters = array_merge($this->converters, $arr); | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	/** | ||||
|  |  | |||
|  | @ -11,10 +11,10 @@ | |||
|   <email>uwe@steinmann.cx</email> | ||||
|   <active>yes</active> | ||||
|  </lead> | ||||
|  <date>2016-11-07</date> | ||||
|  <time>15:17:11</time> | ||||
|  <date>2016-11-15</date> | ||||
|  <time>21:00:26</time> | ||||
|  <version> | ||||
|   <release>1.2.0</release> | ||||
|   <release>1.2.1</release> | ||||
|   <api>1.2.0</api> | ||||
|  </version> | ||||
|  <stability> | ||||
|  | @ -23,7 +23,7 @@ | |||
|  </stability> | ||||
|  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license> | ||||
|  <notes> | ||||
| add new previewer which converts document to pdf instead of png | ||||
| setConverters() overrides exiting converters | ||||
|  </notes> | ||||
|  <contents> | ||||
|   <dir baseinstalldir="SeedDMS" name="/"> | ||||
|  | @ -238,5 +238,21 @@ fix calculation of timeout (Bug #269) | |||
| check if cache dir exists before deleting it in deleteDocumentPreviews() | ||||
|    </notes> | ||||
|   </release> | ||||
|   <release> | ||||
|    <date>2016-11-07</date> | ||||
|    <time>15:17:11</time> | ||||
|    <version> | ||||
|     <release>1.2.0</release> | ||||
|     <api>1.2.0</api> | ||||
|    </version> | ||||
|    <stability> | ||||
|     <release>stable</release> | ||||
|     <api>stable</api> | ||||
|    </stability> | ||||
|    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license> | ||||
|    <notes> | ||||
| add new previewer which converts document to pdf instead of png | ||||
|    </notes> | ||||
|   </release> | ||||
|  </changelog> | ||||
| </package> | ||||
|  |  | |||
|  | @ -293,7 +293,24 @@ | |||
|       enableNotificationAppRev = "true" | ||||
|       enableOwnerNotification = "false" | ||||
|       enableNotificationWorkflow = "false" | ||||
|     /> | ||||
|       /> | ||||
|     <converters target="fulltext"> | ||||
|       <converter mimeType="application/pdf">pdftotext -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g'</converter> | ||||
|       <converter mimeType="application/msword">catdoc %s</converter> | ||||
|       <converter mimeType="application/vnd.ms-excel">ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1</converter> | ||||
|       <converter mimeType="audio/mp3">id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'</converter> | ||||
|       <converter mimeType="audio/mpeg">id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'</converter> | ||||
|       <converter mimeType="text/plain">cat %s</converter> | ||||
|       <converter mimeType="text/html">html2text %s</converter> | ||||
|       <converter mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document">docx2txt %s -</converter> | ||||
|     </converters> | ||||
|     <converters target="preview"> | ||||
|       <converter mimeType="application/msword">unoconv -d document -e PageRange=1 -f pdf --stdout -v '%f'|gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q - | convert  -resize %wx png:- '%o'</converter> | ||||
|       <converter mimeType="image/png">convert -resize %wx '%f' '%o'</converter> | ||||
|       <converter mimeType="image/jpg">convert -resize %wx '%f' '%o'</converter> | ||||
|       <converter mimeType="image/gif">convert -resize %wx '%f' '%o'</converter> | ||||
|       <converter mimeType="text/plain">a2ps -1 -a1  -R -B -o - '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dFirstPage=1 -dLastPage=1 -dPDFFitPage -r72x72 -sOutputFile=- -q - | convert  -resize %wx png:- '%o'</converter> | ||||
|     </converters> | ||||
|   </advanced> | ||||
|   <extensions/> | ||||
| </configuration> | ||||
|  |  | |||
|  | @ -84,7 +84,7 @@ if($user->isAdmin()) { | |||
| 	if($resArr["su"]) { | ||||
| 		$user = $dms->getUser($resArr["su"]); | ||||
| 	} else { | ||||
| 		$session->resetSu(); | ||||
| 	//	$session->resetSu();
 | ||||
| 	} | ||||
| } | ||||
| $theme = $resArr["theme"]; | ||||
|  |  | |||
|  | @ -105,6 +105,8 @@ class Settings { /* {{{ */ | |||
| 	var $_contentOffsetDir = "1048576"; | ||||
| 	// Maximum number of sub-directories per parent directory
 | ||||
| 	var $_maxDirID = 32700; | ||||
| 	// default available languages (list of languages shown in language selector)
 | ||||
| 	var $_availablelanguages = array(); | ||||
| 	// default language (name of a subfolder in folder "languages")
 | ||||
| 	var $_language = "en_GB"; | ||||
| 	// users are notified about document-changes that took place within the last $_updateNotifyTime seconds
 | ||||
|  | @ -383,6 +385,8 @@ class Settings { /* {{{ */ | |||
| 		$this->_footNote = strval($tab["footNote"]); | ||||
| 		$this->_printDisclaimer = Settings::boolVal($tab["printDisclaimer"]); | ||||
| 		$this->_language = strval($tab["language"]); | ||||
| 		if(trim(strval($tab["availablelanguages"]))) | ||||
| 			$this->_availablelanguages = explode(',',strval($tab["availablelanguages"])); | ||||
| 		$this->_theme = strval($tab["theme"]); | ||||
| 		if(isset($tab["previewWidthList"])) | ||||
| 			$this->_previewWidthList = intval($tab["previewWidthList"]); | ||||
|  | @ -689,6 +693,7 @@ class Settings { /* {{{ */ | |||
|     $this->setXMLAttributValue($node, "footNote", $this->_footNote); | ||||
|     $this->setXMLAttributValue($node, "printDisclaimer", $this->_printDisclaimer); | ||||
|     $this->setXMLAttributValue($node, "language", $this->_language); | ||||
|     $this->setXMLAttributValue($node, "availablelanguages", implode(',', $this->_availablelanguages)); | ||||
|     $this->setXMLAttributValue($node, "theme", $this->_theme); | ||||
|     $this->setXMLAttributValue($node, "previewWidthList", $this->_previewWidthList); | ||||
|     $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail); | ||||
|  |  | |||
|  | @ -20,7 +20,10 @@ | |||
| 
 | ||||
| $LANG = array(); | ||||
| $MISSING_LANG = array(); | ||||
| foreach(getLanguages() as $_lang) { | ||||
| $__languages = getLanguages(); | ||||
| if(!in_array($settings->_language, $__languages)) | ||||
| 	$__languages[] = $settings->_language; | ||||
| foreach($__languages as $_lang) { | ||||
| 	if(file_exists($settings->_rootDir . "languages/" . $_lang . "/lang.inc")) { | ||||
| 		include $settings->_rootDir . "languages/" . $_lang . "/lang.inc"; | ||||
| 		$LANG[$_lang] = $text; | ||||
|  | @ -28,15 +31,14 @@ foreach(getLanguages() as $_lang) { | |||
| } | ||||
| unset($text); | ||||
| 
 | ||||
| function getLanguages() | ||||
| { | ||||
| 	GLOBAL $settings; | ||||
| 	 | ||||
| function getAvailableLanguages() { /* {{{ */ | ||||
| 	global $settings; | ||||
| 
 | ||||
| 	$languages = array(); | ||||
| 	 | ||||
| 
 | ||||
| 	$path = $settings->_rootDir . "languages/"; | ||||
| 	$handle = opendir($path); | ||||
| 	 | ||||
| 
 | ||||
| 	while ($entry = readdir($handle) ) | ||||
| 	{ | ||||
| 		if ($entry == ".." || $entry == ".") | ||||
|  | @ -48,7 +50,17 @@ function getLanguages() | |||
| 
 | ||||
| 	asort($languages); | ||||
| 	return $languages; | ||||
| } | ||||
| } /* }}} */ | ||||
| 
 | ||||
| function getLanguages() { /* {{{ */ | ||||
| 	global $settings; | ||||
| 
 | ||||
| 	if($settings->_availablelanguages) { | ||||
| 		return $settings->_availablelanguages; | ||||
| 	} | ||||
| 
 | ||||
| 	return getAvailableLanguages(); | ||||
| } /* }}} */ | ||||
| 
 | ||||
| /** | ||||
|  * Get translation | ||||
|  | @ -102,7 +114,7 @@ function getMLText($key, $replace = array(), $defaulttext = "", $lang="") { /* { | |||
| 	$keys = array_keys($replace); | ||||
| 	foreach ($keys as $key) | ||||
| 		$tmpText = str_replace("[".$key."]", $replace[$key], $tmpText); | ||||
| 	 | ||||
| 
 | ||||
| 	return $tmpText; | ||||
| } /* }}} */ | ||||
| 
 | ||||
|  |  | |||
|  | @ -989,6 +989,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -854,6 +854,8 @@ $text = array( | |||
| 'settings_Authentication' => 'Настройки на автентификацията', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Кеш папка', | ||||
|  |  | |||
|  | @ -859,6 +859,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -998,6 +998,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Authentication settings', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Adresář mezipaměti', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (2335), dgrutsch (21)
 | ||||
| //    Translators: Admin (2337), dgrutsch (21)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '2-Faktor Authentifizierung', | ||||
|  | @ -1041,6 +1041,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Authentifikations-Einstellungen', | ||||
| 'settings_autoLoginUser' => 'Automatisches Login', | ||||
| 'settings_autoLoginUser_desc' => 'Verwende den Benutzer mit der angegebenen Id, sofern man nicht bereits angemeldet ist. Solch ein Zugriff erzeugt keine eigene Sitzung.', | ||||
| 'settings_available_languages' => 'Verfügbare Sprachen', | ||||
| 'settings_available_languages_desc' => 'Nur die hier ausgewählten Sprachen werden geladen und erscheinen bei der Sprachauswahl. Die voreingestellte Sprache wird immer geladen.', | ||||
| 'settings_backupDir' => 'Sicherungs-Verzeichnis', | ||||
| 'settings_backupDir_desc' => 'Verzeichnis in dem das Backup-Tool die Sicherungen ablegt. Wenn hier kein Wert gesetzt wird oder auf das Verzeichnis nicht zugriffen werden kann, dann werden die Sicherungen im Content-Verzeichnis abgelegt.', | ||||
| 'settings_cacheDir' => 'Cache Verzeichnis', | ||||
|  |  | |||
|  | @ -865,6 +865,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (1468), dgrutsch (7), netixw (14)
 | ||||
| //    Translators: Admin (1470), dgrutsch (7), netixw (14)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '2-factor authentication', | ||||
|  | @ -1036,6 +1036,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Authentication settings', | ||||
| 'settings_autoLoginUser' => 'Automatic login', | ||||
| 'settings_autoLoginUser_desc' => 'Use this user id for accesses if the user is not already logged in. Such an access will not create a session.', | ||||
| 'settings_available_languages' => 'Available languages', | ||||
| 'settings_available_languages_desc' => 'Only the selected languages will be loaded and show up in the language selector. The default language will always be loaded.', | ||||
| 'settings_backupDir' => 'Backup directory', | ||||
| 'settings_backupDir_desc' => 'Directory where the backup tool saves backups. If this directory is not set or cannot be accessed, then the backups will be saved in the content directory.', | ||||
| 'settings_cacheDir' => 'Cache directory', | ||||
|  |  | |||
|  | @ -1004,6 +1004,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Configuración de autenticación', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Carpeta caché', | ||||
|  |  | |||
|  | @ -986,6 +986,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Paramètres d\'authentification', | ||||
| 'settings_autoLoginUser' => 'Connexion automatique', | ||||
| 'settings_autoLoginUser_desc' => 'Utiliser l’ID de cet utilisateur pour se connecter automatiquement. Ce type d’accès ne permet pas la création de nouveaux comptes.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Dossier Cache', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (1189), marbanas (16)
 | ||||
| //    Translators: Admin (1190), marbanas (16)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '', | ||||
|  | @ -422,7 +422,7 @@ Internet poveznica: [url]', | |||
| 'edit_user' => 'Uredi korisnika', | ||||
| 'edit_user_details' => 'Uredi detalje korisnika', | ||||
| 'edit_version' => '', | ||||
| 'el_GR' => '', | ||||
| 'el_GR' => 'Grčki', | ||||
| 'email' => 'Email', | ||||
| 'email_error_title' => 'Nema ulaznog emaila', | ||||
| 'email_footer' => 'Koristeći funckcije \'Moj račun\' možete promijeniti postavke email obavještavanja.', | ||||
|  | @ -1025,6 +1025,8 @@ Internet poveznica: [url]', | |||
| 'settings_Authentication' => 'Postavke autentifikacije', | ||||
| 'settings_autoLoginUser' => 'Automatska prijava', | ||||
| 'settings_autoLoginUser_desc' => 'Koristite ovaj korisnički ID za pristup ukoliko korisnik već nije prijavljen. Takav pristup neće otvoriti sesiju.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => 'Mapa za sigurnosnu kopiju', | ||||
| 'settings_backupDir_desc' => 'Mapa gdje alat za sigurnosne kopije sprema podatke. Ako ova mapa nije postavljena ili joj se ne može pristupiti, tada se sigurnosne kopije spremaju u mapu sadržaja.', | ||||
| 'settings_cacheDir' => 'Mapa predmemorije', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (590), ribaz (1023)
 | ||||
| //    Translators: Admin (598), ribaz (1023)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '', | ||||
|  | @ -536,7 +536,7 @@ URL: [url]', | |||
| 'identical_version' => 'Az új verzió megegyezik az eredetivel.', | ||||
| 'import' => '', | ||||
| 'importfs' => '', | ||||
| 'import_fs' => '', | ||||
| 'import_fs' => 'Importálás fájlrendszerből', | ||||
| 'import_fs_warning' => '', | ||||
| 'include_content' => '', | ||||
| 'include_documents' => 'Tartalmazó dokumentumok', | ||||
|  | @ -1003,6 +1003,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Hitelesítési beállítások', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Átmeneti állományok könyvtára', | ||||
|  | @ -1396,13 +1398,13 @@ URL: [url]', | |||
| 'timeline_full_add_version' => '', | ||||
| 'timeline_full_status_change' => '', | ||||
| 'timeline_selected_item' => '', | ||||
| 'timeline_skip_add_file' => '', | ||||
| 'timeline_skip_status_change_-1' => '', | ||||
| 'timeline_skip_status_change_-3' => '', | ||||
| 'timeline_skip_status_change_0' => '', | ||||
| 'timeline_skip_status_change_1' => '', | ||||
| 'timeline_skip_status_change_2' => '', | ||||
| 'timeline_skip_status_change_3' => '', | ||||
| 'timeline_skip_add_file' => 'melléklet hozzáadva', | ||||
| 'timeline_skip_status_change_-1' => 'visszautasítva', | ||||
| 'timeline_skip_status_change_-3' => 'lejárt', | ||||
| 'timeline_skip_status_change_0' => 'felülvizsgálatra vár', | ||||
| 'timeline_skip_status_change_1' => 'jóváhagyásra vár', | ||||
| 'timeline_skip_status_change_2' => 'kiadva', | ||||
| 'timeline_skip_status_change_3' => 'munkafolyamat alatt', | ||||
| 'timeline_status_change' => '[version]: [status] Verzio', | ||||
| 'to' => 'ig', | ||||
| 'toggle_manager' => 'Kulcs kezelő', | ||||
|  |  | |||
|  | @ -1037,6 +1037,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Impostazioni di Autenticazione', | ||||
| 'settings_autoLoginUser' => 'Login automatico', | ||||
| 'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => 'Directory di backup', | ||||
| 'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.', | ||||
| 'settings_cacheDir' => 'Cartella di cache', | ||||
|  |  | |||
|  | @ -1018,6 +1018,8 @@ URL : [url]', | |||
| 'settings_Authentication' => '인증 설정', | ||||
| 'settings_autoLoginUser' => '자동 로그인', | ||||
| 'settings_autoLoginUser_desc' => '로그인하지 않은 사용자의 ID로 접근. 이러한 접근은 세션을 생성하지 않습니다.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '백업 디랙토리', | ||||
| 'settings_backupDir_desc' => '백업 도구가 백업을 저장할 디렉토리. 이 디렉토리가 설정되어 있지 않거나 액세스 할 수 없는 경우 백업은 컨텐츠 디렉토리에 저장 됩니다.', | ||||
| 'settings_cacheDir' => '캐시 디렉토리', | ||||
|  |  | |||
|  | @ -1031,6 +1031,8 @@ URL: [url]', | |||
|  => , | ||||
|  => , | ||||
|  =>', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => 'Instellingen backupmap', | ||||
| 'settings_backupDir_desc' => 'Instellingen backupmap', | ||||
| 'settings_cacheDir' => 'cache directory', | ||||
|  |  | |||
|  | @ -983,6 +983,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Ustawienia uwierzytelniania', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Folder bufora', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (927), flaviove (627), lfcristofoli (352)
 | ||||
| //    Translators: Admin (931), flaviove (627), lfcristofoli (352)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '', | ||||
|  | @ -146,12 +146,12 @@ URL: [url]', | |||
| 'attrdef_objtype' => 'Tipo de objeto', | ||||
| 'attrdef_regex' => 'Expressão regular', | ||||
| 'attrdef_type' => 'Tipo', | ||||
| 'attrdef_type_boolean' => '', | ||||
| 'attrdef_type_date' => '', | ||||
| 'attrdef_type_boolean' => 'Binário', | ||||
| 'attrdef_type_date' => 'Data', | ||||
| 'attrdef_type_email' => '', | ||||
| 'attrdef_type_float' => '', | ||||
| 'attrdef_type_int' => '', | ||||
| 'attrdef_type_string' => '', | ||||
| 'attrdef_type_int' => 'Inteiro', | ||||
| 'attrdef_type_string' => 'Texto', | ||||
| 'attrdef_type_url' => '', | ||||
| 'attrdef_valueset' => 'Conjunto de valores', | ||||
| 'attributes' => 'Atributos', | ||||
|  | @ -1001,6 +1001,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Definições de autenticação', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Diretório de cache', | ||||
|  |  | |||
|  | @ -1026,6 +1026,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Setări de autentificare', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Director Cache', | ||||
|  |  | |||
|  | @ -1033,6 +1033,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Настройки авторизации', | ||||
| 'settings_autoLoginUser' => 'Автоматический вход', | ||||
| 'settings_autoLoginUser_desc' => 'Использовать этого пользователя для доступа, если пользователь не вошел в систему. Такой доступ не будет создавать сеанс.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => 'Каталог резервного копирования', | ||||
| 'settings_backupDir_desc' => 'Каталог, в котором средство резервного копирования сохраняет резервные копии. Если этот каталог не установлен или в него отсутствует доступ, то резервные копии будут сохранены в каталоге содержимого.', | ||||
| 'settings_cacheDir' => 'Каталог кэша', | ||||
|  |  | |||
|  | @ -858,6 +858,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (1133), tmichelfelder (106)
 | ||||
| //    Translators: Admin (1134), tmichelfelder (106)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '', | ||||
|  | @ -527,7 +527,7 @@ URL: [url]', | |||
| 'hu_HU' => 'ungerska', | ||||
| 'id' => 'ID', | ||||
| 'identical_version' => 'Ny version är lika med den aktuella versionen.', | ||||
| 'import' => '', | ||||
| 'import' => 'Importera', | ||||
| 'importfs' => '', | ||||
| 'import_fs' => 'Import från filsystem', | ||||
| 'import_fs_warning' => '', | ||||
|  | @ -989,6 +989,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Autentiseringsinställningar', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Cache-mapp', | ||||
|  |  | |||
|  | @ -1005,6 +1005,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Yetkilendirme ayarları', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => 'Cache klasörü', | ||||
|  |  | |||
|  | @ -1026,6 +1026,8 @@ URL: [url]', | |||
| 'settings_Authentication' => 'Налаштування авторизації', | ||||
| 'settings_autoLoginUser' => 'Автоматичний вхід', | ||||
| 'settings_autoLoginUser_desc' => 'Використовувати цього користувача для доступу, якщо користувач не увійшов в систему. Такий доступ не буде створювати сеанс.', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => 'Каталог резервних копій', | ||||
| 'settings_backupDir_desc' => 'Каталог, в якому інструмент резервного копіювання зберігає резервні копії. Якщо цей каталог не встановлений або до нього не має доступу, то резервні копії будуть збережені в каталозі вмісту.', | ||||
| 'settings_cacheDir' => 'Каталог кешу', | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
| //    along with this program; if not, write to the Free Software
 | ||||
| //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | ||||
| //
 | ||||
| //    Translators: Admin (648), fengjohn (5)
 | ||||
| //    Translators: Admin (649), fengjohn (5)
 | ||||
| 
 | ||||
| $text = array( | ||||
| '2_factor_auth' => '', | ||||
|  | @ -688,7 +688,7 @@ URL: [url]', | |||
| 'personal_default_keywords' => '用户关键字', | ||||
| 'pl_PL' => '波兰语', | ||||
| 'possible_substitutes' => '', | ||||
| 'preview' => '', | ||||
| 'preview' => '预览', | ||||
| 'preview_converters' => '', | ||||
| 'preview_markdown' => '', | ||||
| 'preview_plain' => '', | ||||
|  | @ -860,6 +860,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -858,6 +858,8 @@ URL: [url]', | |||
| 'settings_Authentication' => '', | ||||
| 'settings_autoLoginUser' => '', | ||||
| 'settings_autoLoginUser_desc' => '', | ||||
| 'settings_available_languages' => '', | ||||
| 'settings_available_languages_desc' => '', | ||||
| 'settings_backupDir' => '', | ||||
| 'settings_backupDir_desc' => '', | ||||
| 'settings_cacheDir' => '', | ||||
|  |  | |||
|  | @ -59,6 +59,7 @@ if ($action == "saveSettings") | |||
|   $settings->_footNote = $_POST["footNote"]; | ||||
|   $settings->_printDisclaimer = getBoolValue("printDisclaimer"); | ||||
|   $settings->_language = $_POST["language"]; | ||||
|   $settings->_availablelanguages = $_POST["availablelanguages"]; | ||||
|   $settings->_theme = $_POST["theme"]; | ||||
|   $settings->_previewWidthList = $_POST["previewWidthList"]; | ||||
|   $settings->_previewWidthDetail = $_POST["previewWidthDetail"]; | ||||
|  |  | |||
|  | @ -54,7 +54,7 @@ $(document).ready(function()	{ | |||
| 				theme: 'defaultTheme', | ||||
| 				timeout: 1500, | ||||
| 			}); | ||||
| 			$('div.ajax').trigger('update', {documentid: <?= $document->getId() ?>});
 | ||||
| 			$('div.ajax').trigger('update', {documentid: <?php echo $document->getId(); ?>});
 | ||||
| 		}, "json"); | ||||
| 		return false; | ||||
| 	}); | ||||
|  | @ -118,7 +118,7 @@ echo "<div class=\"span6\">\n"; | |||
| $this->contentHeading(getMLText("content")); | ||||
| ?>
 | ||||
| <form action="../op/op.EditOnline.php" id="form1" method="post"> | ||||
| <input type="hidden" name="documentid" value="<?= $document->getId() ?>" /> | ||||
| <input type="hidden" name="documentid" value="<?php echo $document->getId(); ?>" /> | ||||
| <textarea id="markdown" name="data" width="100%" rows="20"> | ||||
| <?php | ||||
| 		echo htmlspecialchars(file_get_contents($dms->contentDir . $version->getPath())); | ||||
|  |  | |||
|  | @ -132,12 +132,29 @@ if(!is_writeable($settings->_configFilePath)) { | |||
|         <td><?php printMLText("settings_printDisclaimer");?>:</td>
 | ||||
|         <td><input name="printDisclaimer" type="checkbox" <?php if ($settings->_printDisclaimer) echo "checked" ?> /></td>
 | ||||
|       </tr> | ||||
|        <tr title="<?php printMLText("settings_language_desc");?>"> | ||||
|       <tr title="<?php printMLText("settings_available_languages_desc");?>"> | ||||
|         <td><?php printMLText("settings_available_languages");?>:</td>
 | ||||
|         <td> | ||||
|          <select name="availablelanguages[]" multiple> | ||||
|             <?php | ||||
|               $languages = getAvailableLanguages(); | ||||
|               foreach($languages as $language) | ||||
|               { | ||||
|                 echo '<option value="' . $language . '" '; | ||||
|                  if (in_array($language, $settings->_availablelanguages)) | ||||
|                    echo "selected"; | ||||
|                 echo '>' . getMLText($language) . '</option>'; | ||||
|              } | ||||
|             ?>
 | ||||
|           </select> | ||||
|         </td> | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_language_desc");?>"> | ||||
|         <td><?php printMLText("settings_language");?>:</td>
 | ||||
|         <td> | ||||
|          <SELECT name="language"> | ||||
|          <select name="language"> | ||||
|             <?php | ||||
|               $languages = getLanguages(); | ||||
|               $languages = getAvailableLanguages(); | ||||
|               foreach($languages as $language) | ||||
|               { | ||||
|                 echo '<option value="' . $language . '" '; | ||||
|  | @ -146,13 +163,13 @@ if(!is_writeable($settings->_configFilePath)) { | |||
|                 echo '>' . getMLText($language) . '</option>'; | ||||
|              } | ||||
|             ?>
 | ||||
|           </SELECT> | ||||
|           </select> | ||||
|         </td> | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_theme_desc");?>"> | ||||
|         <td><?php printMLText("settings_theme");?>:</td>
 | ||||
|         <td> | ||||
|          <SELECT name="theme"> | ||||
|          <select name="theme"> | ||||
|             <?php | ||||
|               $themes = UI::getStyles(); | ||||
|               foreach($themes as $theme) | ||||
|  | @ -163,7 +180,7 @@ if(!is_writeable($settings->_configFilePath)) { | |||
|                 echo '>' . $theme . '</option>'; | ||||
|              } | ||||
|             ?>
 | ||||
|           </SELECT> | ||||
|           </select> | ||||
|         </td> | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_previewWidthList_desc");?>"> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann