Merge branch 'seeddms-4.3.3' into develop

Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php

CHANGELOG

@@ -1,7 +1,12 @@
 --------------------------------------------------------------------------------
                      Changes in version 4.3.3
 --------------------------------------------------------------------------------
+- theme and language selector can be turned off (Bug #109)
+  turning off the language selector will also turn it off on the login page
+- default method for sorting folders and documents can be set (#112)
+- port of database can be set behind hostname (separated by colon)
 - fix minor compatibility errors in database table creation
+- fix some php warnings when php 5.5.x is used (Bug #119)
 - strip slashes from _GET, _POST, _COOKIE, _REQUEST if magic quotes is
   turned on
 - use From address from smtp settings when sending mails

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -395,8 +395,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_subFolders)) {
-			if ($orderby=="n") $queryStr = "SELECT * FROM tblFolders WHERE parent = " . $this->_id . " ORDER BY name";
+			$queryStr = "SELECT * FROM tblFolders WHERE parent = " . $this->_id;
-			else $queryStr = "SELECT * FROM tblFolders WHERE parent = " . $this->_id . " ORDER BY sequence";
+
+			if ($orderby=="n") $queryStr .= " ORDER BY name";
+			elseif ($orderby=="s") $queryStr .= " ORDER BY sequence";
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
@@ -570,8 +572,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_documents)) {
-			if ($orderby=="n") $queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id . " ORDER BY name";
+			$queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id;
-			else $queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id . " ORDER BY sequence";
+			if ($orderby=="n") $queryStr .= " ORDER BY name";
+			elseif($orderby=="s") $queryStr .= " ORDER BY sequence";
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)

SeedDMS_Core/Core/inc.DBAccessPDO.php

@@ -37,6 +37,11 @@ class SeedDMS_Core_DatabaseAccess {
 	 */
 	protected $_hostname;
 
+	/**
+	 * @var int port number of database 
+	 */
+	protected $_port;
+
 	/**
 	 * @var string name of database
 	 */
@@ -125,7 +130,11 @@ class SeedDMS_Core_DatabaseAccess {
 	 */
 	function SeedDMS_Core_DatabaseAccess($driver, $hostname, $user, $passw, $database = false) { /* {{{ */
 		$this->_driver = $driver;
-		$this->_hostname = $hostname;
+		$tmp = explode(":", $hostname);
+		$this->_hostname = $tmp[0];
+		$this->_port = null;
+		if(!empty($tmp[1]))
+			$this->_port = $tmp[1];
 		$this->_database = $database;
 		$this->_user = $user;
 		$this->_passw = $passw;
@@ -156,6 +165,8 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'mysqli':
 			case 'mysqlnd':
 				$dsn = $this->_driver.":dbname=".$this->_database.";host=".$this->_hostname;
+				if($this->_port)
+					$dsn .= ";port=".$this->_port;
 				break;
 			case 'sqlite':
 				$dsn = $this->_driver.":".$this->_database;

SeedDMS_Core/Core/inc.FileUtils.php

@@ -25,25 +25,25 @@
  * @version    Release: @package_version@
  */
 class SeedDMS_Core_File {
-	function renameFile($old, $new) { /* {{{ */
+	static function renameFile($old, $new) { /* {{{ */
 		return @rename($old, $new);
 	} /* }}} */
 
-	function removeFile($file) { /* {{{ */
+	static function removeFile($file) { /* {{{ */
 		return @unlink($file);
 	} /* }}} */
 
-	function copyFile($source, $target) { /* {{{ */
+	static function copyFile($source, $target) { /* {{{ */
 		return @copy($source, $target);
 	} /* }}} */
 
-	function moveFile($source, $target) { /* {{{ */
+	static function moveFile($source, $target) { /* {{{ */
 		if (!@copyFile($source, $target))
 			return false;
 		return @removeFile($source);
 	} /* }}} */
 
-	function fileSize($file) { /* {{{ */
+	static function fileSize($file) { /* {{{ */
 		if(!$a = fopen($file, 'r'))
 			return false;
 		fseek($a, 0, SEEK_END);
@@ -52,12 +52,12 @@ class SeedDMS_Core_File {
 		return $filesize;
 	} /* }}} */
 
-	function format_filesize($size, $sizes = array('Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')) { /* {{{ */
+	static function format_filesize($size, $sizes = array('Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')) { /* {{{ */
 		if ($size == 0) return('0 Bytes');
 		return (round($size/pow(1024, ($i = floor(log($size, 1024)))), 2) . ' ' . $sizes[$i]);
 	} /* }}} */
 
-	function parse_filesize($str) { /* {{{ */
+	static function parse_filesize($str) { /* {{{ */
 		preg_replace('/\s\s+/', ' ', $str);
 		if(strtoupper(substr($str, -1)) == 'B') {
 			$value = (int) substr($str, 0, -2);
@@ -83,15 +83,15 @@ class SeedDMS_Core_File {
 		return false;
 	} /* }}} */
 
-	function checksum($file) { /* {{{ */
+	static function checksum($file) { /* {{{ */
 		return md5_file($file);
 	} /* }}} */
 
-	function renameDir($old, $new) { /* {{{ */
+	static function renameDir($old, $new) { /* {{{ */
 		return @rename($old, $new);
 	} /* }}} */
 
-	function makeDir($path) { /* {{{ */
+	static function makeDir($path) { /* {{{ */
 		
 		if( !is_dir( $path ) ){
 			$res=@mkdir( $path , 0777, true);
@@ -146,7 +146,7 @@ class SeedDMS_Core_File {
 */
 	} /* }}} */
 
-	function removeDir($path) { /* {{{ */
+	static function removeDir($path) { /* {{{ */
 		$handle = @opendir($path);
 		while ($entry = @readdir($handle) )
 		{
@@ -167,7 +167,7 @@ class SeedDMS_Core_File {
 		return @rmdir($path);
 	} /* }}} */
 
-	function copyDir($sourcePath, $targetPath) { /* {{{ */
+	static function copyDir($sourcePath, $targetPath) { /* {{{ */
 		if (mkdir($targetPath, 0777)) {
 			$handle = @opendir($sourcePath);
 			while ($entry = @readdir($handle) ) {
@@ -189,14 +189,14 @@ class SeedDMS_Core_File {
 		return true;
 	} /* }}} */
 
-	function moveDir($sourcePath, $targetPath) { /* {{{ */
+	static function moveDir($sourcePath, $targetPath) { /* {{{ */
 		if (!copyDir($sourcePath, $targetPath))
 			return false;
 		return removeDir($sourcePath);
 	} /* }}} */
 
 	// code by Kioob (php.net manual)
-	function gzcompressfile($source,$level=false) { /* {{{ */
+	static function gzcompressfile($source,$level=false) { /* {{{ */
 		$dest=$source.'.gz';
 		$mode='wb'.$level;
 		$error=false;

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2013-11-27</date>
+ <date>2014-01-13</date>
- <time>10:57:32</time>
+ <time>14:29:34</time>
  <version>
-  <release>4.3.2</release>
+  <release>4.3.3</release>
-  <api>4.3.2</api>
+  <api>4.3.3</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,9 +24,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- new method SeedDMS_Core_Folder::isSubFolder()
+- database hostname can have port seperated by ':'
-- check for subFolder in SeedDMS_Core_Folder::setParent()
+- make all functions in SeedDMS_Core_File static (fixes problem with php 5.5.x)
-- new methods SeedDMS_Core_DMS::checkFolders() and SeedDMS_Core_DMS::checkDocuments()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -567,5 +566,23 @@ New release
 - SeedDMЅ_Core_Folder::getPath() can handle a subfolder treated as a root folder
    </notes>
   </release>
+  <release>
+   <date>2013-11-27</date>
+   <time>10:57:32</time>
+   <version>
+    <release>4.3.2</release>
+    <api>4.3.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- new method SeedDMS_Core_Folder::isSubFolder()
+- check for subFolder in SeedDMS_Core_Folder::setParent()
+- new methods SeedDMS_Core_DMS::checkFolders() and SeedDMS_Core_DMS::checkDocuments()
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.ClassSettings.php

@@ -153,12 +153,16 @@ class Settings { /* {{{ */
 	var $_maxRecursiveCount = 10000;
 	// enable/disable language selection menu
 	var $_enableLanguageSelector = true;
+	// enable/disable theme selector
+	var $_enableThemeSelector = true;
 	// expandFolderTree
 	var $_expandFolderTree = 1;
 	// enable/disable editing of users own profile
 	var $_disableSelfEdit = false;
 	// Sort order of users in lists('fullname' or '' (login))
 	var $_sortUsersInList = '';
+	// Sort method for forders and documents ('n' (name) or '')
+	var $_sortFoldersDefault = '';
 	// enable/disable lucene fulltext search
 	// if enabled admin can login only by specified IP addres
 	var $_adminIP = "";
@@ -320,9 +324,11 @@ class Settings { /* {{{ */
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
 		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
+		$this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
+		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
 		$this->_expandFolderTree = intval($tab["expandFolderTree"]);
 
 		// XML Path: /configuration/site/calendar
@@ -590,10 +596,12 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
     $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
+    $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector);
     $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
     $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
+    $this->setXMLAttributValue($node, "sortFoldersDefault", $this->_sortFoldersDefault);
 
     // XML Path: /configuration/site/calendar
     $node = $this->getXMLNode($xml, '/configuration/site', 'calendar');

install/settings.xml.template_install

@@ -28,6 +28,7 @@
        -                   2 to start with tree shown fully expanded     
        - stopWordsFile: path to stop word file for indexer
        - sortUsersInList: how to sort users in lists ('fullname' or '' (default))
+       - sortFoldersDefault: how to sort folders and documents in folder view  ('n' (name) or 's' (sequence, default))
     -->   
     <edition
       strictFormCheck = "false"
@@ -41,6 +42,7 @@
       enableLanguageSelector = "true"
       stopWordsFile = ""
       sortUsersInList = ""
+			sortFoldersDefault="s"
     >
     </edition> 
     <!-- enableCalendar: enable/disable calendar

languages/ar_EG/lang.inc

@@ -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 (874)
+//    Translators: Admin (875)
 
 $text = array(
 'accept' => 'وافق',
@@ -318,6 +318,7 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية',
+'extension_manager' => '',
 'february' => 'فبراير',
 'file' => 'ملف',
 'files' => 'ملفات',
@@ -781,7 +782,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
 'settings_enableLanguageSelector' => 'Enable Language Selector',
-'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in. This does not affect the language selection on the login page.',
+'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
@@ -796,6 +797,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',
@@ -812,6 +815,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'start with tree hidden',
 'settings_expandFolderTree_val1' => 'start with tree shown and first level expanded',
 'settings_expandFolderTree_val2' => 'start with tree shown fully expanded',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Extra PHP include Path',
 'settings_extraPath_desc' => 'Path to additional software. This is the directory containing e.g. the adodb directory or additional pear packages',
 'settings_firstDayOfWeek' => 'First day of the week',
@@ -900,6 +904,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'ترتيب المستخدمين في القائمة',
 'settings_sortUsersInList_desc' => 'Sets if users in selection menus are ordered by login or by its full name',
 'settings_sortUsersInList_val_fullname' => 'ترتيب بالاسم الكامل',

languages/ca_ES/lang.inc

@@ -271,6 +271,7 @@ $text = array(
 'expiry_changed_email' => 'Data de caducitat modificada',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'extension_manager' => '',
 'february' => 'Febrer',
 'file' => 'Fitxer',
 'files' => 'Fitxers',
@@ -662,6 +663,8 @@ $text = array(
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',
@@ -678,6 +681,7 @@ $text = array(
 'settings_expandFolderTree_val0' => 'start with tree hidden',
 'settings_expandFolderTree_val1' => 'start with tree shown and first level expanded',
 'settings_expandFolderTree_val2' => 'start with tree shown fully expanded',
+'settings_Extensions' => '',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => 'First day of the week',
@@ -766,6 +770,11 @@ $text = array(
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => '',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => '',

languages/cs_CZ/lang.inc

@@ -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 (607), kreml (370)
+//    Translators: Admin (608), kreml (370)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -318,6 +318,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Datum ukončení platnosti změněn',
+'extension_manager' => '',
 'february' => 'Únor',
 'file' => 'Soubor',
 'files' => 'Soubory',
@@ -783,7 +784,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
 'settings_enableLanguageSelector' => 'Povolit výběr jazyka',
-'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení. Toto nemá vliv na volbu jazyka na přihlašovací stránce.',
+'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli',
@@ -798,6 +799,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.',
 'settings_enableSelfRevApp' => 'Povolit posouzení/schválení pro přihlášeného uživatele',
 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',
@@ -814,6 +817,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'start with tree hidden',
 'settings_expandFolderTree_val1' => 'start with tree shown and first level expanded',
 'settings_expandFolderTree_val2' => 'start with tree shown fully expanded',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Extra PHP include Path',
 'settings_extraPath_desc' => 'Cesta pro další software. To je adresář obsahující např. "adodb" adresář nebo další "pear" balíčky.',
 'settings_firstDayOfWeek' => 'First day of the week',
@@ -902,6 +906,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'Uživatel SMTP serveru',
 'settings_smtpUser_desc' => 'Uživatel SMTP serveru',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Seřadit uživatele v seznamu',
 'settings_sortUsersInList_desc' => 'Nastavuje, zda budou uživatelé v nabídce seřazeni podle "login-u" nebo podle celého jména',
 'settings_sortUsersInList_val_fullname' => 'Řadit podle celého jména',

languages/de_DE/lang.inc

@@ -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 (1811)
+//    Translators: Admin (1819)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -789,7 +789,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Anmeldung als Gast',
 'settings_enableGuestLogin_desc' => 'Wenn Sie Gast-Logins erlauben wollen, dann wählen Sie diese Option an. Anmerkung: Gast-Logins sollten nur in einer vertrauenswürdigen Umgebung erlaubt werden.',
 'settings_enableLanguageSelector' => 'Sprachauswahl einschalten',
-'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat. Dies hat keinen Einfluss auf die Sprachauswahl auf der Anmeldeseite.',
+'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat.',
 'settings_enableLargeFileUpload' => 'Hochladen von sehr großen Dateien ermöglichen',
 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht.',
 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen',
@@ -804,6 +804,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
+'settings_enableThemeSelector' => 'Auswahl des Themas',
+'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.',
 'settings_enableUserImage' => 'Benutzerbilder einschalten',
 'settings_enableUserImage_desc' => 'Foto der Benutzer ein-/ausschalten',
 'settings_enableUsersView' => 'Benutzeransicht aktivieren',
@@ -909,6 +911,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP Server-Hostname',
 'settings_smtpUser' => 'SMTP Server User',
 'settings_smtpUser_desc' => 'SMTP Server User',
+'settings_sortFoldersDefault' => 'Voreingestellte Sortiermethode',
+'settings_sortFoldersDefault_desc' => 'Setzt die Sortiermethode für Ordner und Dokumente in der Ordneransicht.',
+'settings_sortFoldersDefault_val_name' => 'nach Name',
+'settings_sortFoldersDefault_val_sequence' => 'nach Folge',
+'settings_sortFoldersDefault_val_unsorted' => 'unsortiert',
 'settings_sortUsersInList' => 'Sortiere Benutzer in Listen',
 'settings_sortUsersInList_desc' => 'Stellt ein, ob die Benutzer in Listen nach Login oder Name sortiert werden sollen.',
 'settings_sortUsersInList_val_fullname' => 'Sortiere nach Name',

languages/en_GB/lang.inc

@@ -789,7 +789,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
 'settings_enableLanguageSelector' => 'Enable Language Selector',
-'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in. This does not affect the language selection on the login page.',
+'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
@@ -804,6 +804,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
+'settings_enableThemeSelector' => 'Theme selection',
+'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',
@@ -909,6 +911,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'SMTP Server user',
 'settings_smtpUser_desc' => 'SMTP Server user',
+'settings_sortFoldersDefault' => 'Default sort method',
+'settings_sortFoldersDefault_desc' => 'This sets the sort methods for folders and documents in the folder view.',
+'settings_sortFoldersDefault_val_name' => 'by name',
+'settings_sortFoldersDefault_val_sequence' => 'by sequence',
+'settings_sortFoldersDefault_val_unsorted' => 'unsorted',
 'settings_sortUsersInList' => 'Sort users in list',
 'settings_sortUsersInList_desc' => 'Sets if users in selection menus are ordered by login or by its full name',
 'settings_sortUsersInList_val_fullname' => 'Sort by full name',

languages/es_ES/lang.inc

@@ -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 (906), francisco (2)
+//    Translators: Admin (907), francisco (2)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -318,6 +318,7 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Fecha de caducidad modificada',
+'extension_manager' => '',
 'february' => 'Febrero',
 'file' => 'Fichero',
 'files' => 'Ficheros',
@@ -789,7 +790,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Habilitar acceso de invitado',
 'settings_enableGuestLogin_desc' => 'Si quiere que cualquiera acceda como invitado, chequee esta opción. Nota: El acceso de invitado debería permitirse solo en entornos de confianza',
 'settings_enableLanguageSelector' => 'Habilitar selector de idioma',
-'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse. Esto no afecta al lenguaje seleccionado en la página de identificación.',
+'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
 'settings_enableLargeFileUpload' => 'Habilitar la carga de ficheros grandes',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
@@ -804,6 +805,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.',
 'settings_enableSelfRevApp' => 'Permitir al usuario identificado revisar/aprobar.',
 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Habilitar imágenes de usuario',
 'settings_enableUserImage_desc' => 'Habilitar imágenes de usuario',
 'settings_enableUsersView' => 'Habilitar vista de usuarios',
@@ -820,6 +823,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'Comenzar con el árbol oculto',
 'settings_expandFolderTree_val1' => 'comentar con el árbol visible y el primer nivel de expansión',
 'settings_expandFolderTree_val2' => 'comentar con el árbol visible y completamente expandido',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Extra PHP include Ruta',
 'settings_extraPath_desc' => 'Ruta para software adicional. Esta es la carpeta que contiene ej. la carpeta adodb o paquetes PEAR adicionales',
 'settings_firstDayOfWeek' => 'Primer día de la semana',
@@ -908,6 +912,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Nombre de servidor SMTP',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Ordenar los usuarios en la lista',
 'settings_sortUsersInList_desc' => 'Establecer si los menús de selección de usuarios se ordenan por nombre de acceso o por nombre completo',
 'settings_sortUsersInList_val_fullname' => 'Ordernar por nombre completo',

languages/fr_FR/lang.inc

@@ -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 (878), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (879), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -318,6 +318,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Date d\'expiration modifiée',
+'extension_manager' => '',
 'february' => 'Février',
 'file' => 'Fichier',
 'files' => 'Fichiers',
@@ -765,7 +766,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
-'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur. Cela n\'affecte pas la sélection de langue d\'interface sur la page de connexion.',
+'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
@@ -780,6 +781,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
 'settings_enableSelfRevApp' => 'Autoriser correction/approbbation pour l\'utilisateur actuel',
 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Activer image utilisateurs',
 'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
 'settings_enableUsersView' => 'Activer Vue des Utilisateurs',
@@ -796,6 +799,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'Démarrer avec l\'arborescence cachée',
 'settings_expandFolderTree_val1' => 'Démarrer avec le premier niveau déroulé',
 'settings_expandFolderTree_val2' => 'Démarrer avec l\'arborescence déroulée',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Chemin ADOdb',
 'settings_extraPath_desc' => 'Chemin vers adodb. Il s\'agit du répertoire contenant le répertoire adodb',
 'settings_firstDayOfWeek' => 'Premier jour de la semaine',
@@ -884,6 +888,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Nom du serveur SMTP',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Tri des utilisateurs',
 'settings_sortUsersInList_desc' => 'Définit si les utilisateurs dans les menus de sélection sont triés par identifiant ou par nom complet',
 'settings_sortUsersInList_val_fullname' => 'Tri par nom complet',

languages/hu_HU/lang.inc

@@ -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 (534), ribaz (956)
+//    Translators: Admin (535), ribaz (956)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -318,6 +318,7 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Lejárati dátum módosítva',
+'extension_manager' => '',
 'february' => 'Február',
 'file' => 'Állomány',
 'files' => 'Állományok',
@@ -788,7 +789,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Vendég belépésének engedélyezése',
 'settings_enableGuestLogin_desc' => 'Ha azt szeretné, hogy bárki be tudjon jelentkezni vendégként, jelölje be ezt a lehetőséget. Megjegyzés: vendég bejelentkezés megbízható környezetben használható',
 'settings_enableLanguageSelector' => 'Engedélyezi a nyelv választót',
-'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően. Ez nem érinti a bejelentkezési oldalon található nyelv választót.',
+'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően.',
 'settings_enableLargeFileUpload' => 'Nagy méretű állományok feltöltésének engedélyezése',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
@@ -803,6 +804,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.',
 'settings_enableSelfRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást a bejelentkezett felhasználó számára',
 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Felhasználói kép engedélyezése',
 'settings_enableUserImage_desc' => 'Engedélyezi a felhasználók képeit',
 'settings_enableUsersView' => 'Felhasználók nézetének engedélyezése',
@@ -819,6 +822,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'indulás rejtett fastruktúrával',
 'settings_expandFolderTree_val1' => 'indulás a fastruktúra első szintjének kibontásával',
 'settings_expandFolderTree_val2' => 'indulás teljesen kibontott fastruktúrával',
+'settings_Extensions' => '',
 'settings_extraPath' => 'További PHP include elérési út',
 'settings_extraPath_desc' => 'További szoftverek elérési útvonala. Ez a könyvtár tartalmazza pl.: az adodb könyvtárat vagy kiegészítő pear csomagokat.',
 'settings_firstDayOfWeek' => 'A hét első napja',
@@ -907,6 +911,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP kiszolgáló gépnév',
 'settings_smtpUser' => 'SMTP kiszolgáló felhasználó',
 'settings_smtpUser_desc' => 'SMTP kiszolgáló felhasználó',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Felhasználók rendezése a listában',
 'settings_sortUsersInList_desc' => 'Állítsa be, ha azt szeretné, hogy a felhasználók bejelentkezési vagy teljes név alapján sorrendben legyenek a kiválasztó menükben',
 'settings_sortUsersInList_val_fullname' => 'Rendezés teljes név szerint',

languages/it_IT/lang.inc

@@ -271,6 +271,7 @@ $text = array(
 'expiry_changed_email' => 'Scadenza cambiata',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'extension_manager' => '',
 'february' => 'Febbraio',
 'file' => 'File',
 'files' => 'Files',
@@ -670,6 +671,8 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',
@@ -686,6 +689,7 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'settings_expandFolderTree_val0' => 'Inizia con l\'albero nascosto',
 'settings_expandFolderTree_val1' => 'Inizia con l\'albero aperto e il primo livello espanso',
 'settings_expandFolderTree_val2' => 'Inizia con l\'albero aperto e completamente espanso',
+'settings_Extensions' => '',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => 'Primo giorno della settimana',
@@ -774,6 +778,11 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Ordina gli utenti nella lista',
 'settings_sortUsersInList_desc' => 'Imposta se gli utenti nel menù di selezione sono ordinato secondo login o nome completo',
 'settings_sortUsersInList_val_fullname' => 'Ordina secondo nome completo',

languages/nl_NL/lang.inc

@@ -318,6 +318,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Vervaldatum gewijzigd',
+'extension_manager' => '',
 'february' => 'februari',
 'file' => 'Bestand',
 'files' => 'Bestanden',
@@ -801,6 +802,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
 'settings_enableSelfRevApp' => 'Beoordeling/ goedkeuring toestaan voor ingelogde gebruikers',
 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes',
 'settings_enableUserImage_desc' => 'Inschakelen Gebruikerplaatjes',
 'settings_enableUsersView' => 'Inschakelen Gebruikers overzicht',
@@ -817,6 +820,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'begin met verborgen structuur',
 'settings_expandFolderTree_val1' => 'begin met structuur eerste niveau uitgevouwen',
 'settings_expandFolderTree_val2' => 'begin met structuur volledig uitgevouwen',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Extra PHP include Path',
 'settings_extraPath_desc' => 'Pad naar extra software. Dit pad bevat bv. het adodb pad of de extra pear packages.',
 'settings_firstDayOfWeek' => 'Eerste weekdag',
@@ -905,6 +909,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'SMTP Server gebruiker',
 'settings_smtpUser_desc' => 'SMTP Server gebruiker',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Sorteer gebruikers in de lijst',
 'settings_sortUsersInList_desc' => 'Bepaald of gebruikers in keuzemenus gesorteerd worden op loginnaam of volledige naam',
 'settings_sortUsersInList_val_fullname' => 'Sorteer op volledige name',

languages/pl_PL/lang.inc

@@ -318,6 +318,7 @@ Folder nadrzędny: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Zmiana daty wygaśnięcia',
+'extension_manager' => '',
 'february' => 'Luty',
 'file' => 'Plik',
 'files' => 'Pliki',
@@ -790,6 +791,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp',
 'settings_enableSelfRevApp' => 'Pozwalaj przeglądać/zatwierdzać dla zalogowanych użytkowników',
 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Włącz obrazy użytkowników',
 'settings_enableUserImage_desc' => 'Zezwól na indywidualne obrazki użytkowników',
 'settings_enableUsersView' => 'Włącz podgląd użytkownika',
@@ -806,6 +809,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'Rozpocznij z ukrytym drzewem',
 'settings_expandFolderTree_val1' => 'Rozpocznij z pokazanym drzewem i rozwiniętym pierwszym poziomem',
 'settings_expandFolderTree_val2' => 'Rozpocznij z pokazanym, w pełni rozwiniętym drzewem',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Dodatkowa ścieżka include dla PHP',
 'settings_extraPath_desc' => 'Ścieżka do dodatkowego oprogramowania. Jest to katalog zawierający np. adodb, pear lub dodatkowe pakiety',
 'settings_firstDayOfWeek' => 'Pierwszy dzień tygodnia',
@@ -894,6 +898,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP',
 'settings_smtpUser' => 'Użytkownik SMTP',
 'settings_smtpUser_desc' => 'Użytkownik SMTP',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Uporządkuj użytkowników na liście',
 'settings_sortUsersInList_desc' => 'Ustawia porządek sortowania użytkowników w menu wyboru wg loginu lub wg pełnej nazwy.',
 'settings_sortUsersInList_val_fullname' => 'Sortowanie wg pełnej nazwy',

languages/pt_BR/lang.inc

@@ -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 (536), flaviove (585)
+//    Translators: Admin (537), flaviove (585)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -317,6 +317,7 @@ Pasta mãe: [folder_path]
 Usuário: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de validade mudou',
+'extension_manager' => '',
 'february' => 'February',
 'file' => 'File',
 'files' => 'Arquivos',
@@ -786,7 +787,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Ativar Login de Visitante',
 'settings_enableGuestLogin_desc' => 'Se você quiser quiser permitir login como convidado, marque esta opção. Nota: login de convidado deve ser usado apenas em um ambiente de confiança',
 'settings_enableLanguageSelector' => 'Ativar Seletor de Idioma',
-'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login. Isso não afeta a seleção de idioma na página de login.',
+'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos',
 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.',
 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador',
@@ -801,6 +802,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva processando as pastas e contando esses documentos e pastas que o usuário tem permissão de acesso.',
 'settings_enableSelfRevApp' => 'Permitir revisão/aprovação para usuário conectado',
 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Ativar Imagem de Usuário',
 'settings_enableUserImage_desc' => 'Ativar Imagens de Usuários',
 'settings_enableUsersView' => 'Ativar Usuários Visualizar',
@@ -817,6 +820,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'começar com a árvore escondida',
 'settings_expandFolderTree_val1' => 'começar com a árvore mostrada e primeiro nível expandido',
 'settings_expandFolderTree_val2' => 'começar com árvore mostrada totalmente expandida',
+'settings_Extensions' => '',
 'settings_extraPath' => 'PHP extra incluem Path',
 'settings_extraPath_desc' => 'Caminho para o software adicional. Este é o diretório que contém, por exemplo, o diretório adodb ou pacotes adicionais em pear',
 'settings_firstDayOfWeek' => 'Primeiro dia da semana',
@@ -905,6 +909,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Hostname do servidor SMTP',
 'settings_smtpUser' => 'Usuário do servidor SMTP',
 'settings_smtpUser_desc' => 'Usuário do servidor SMTP',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Ordenação de usuários na lista',
 'settings_sortUsersInList_desc' => 'Define se os usuários em menus de seleção são ordenados por login, ou por seu nome completo',
 'settings_sortUsersInList_val_fullname' => 'Ordenar por nome completo',

languages/ru_RU/lang.inc

@@ -271,6 +271,7 @@ $text = array(
 'expiry_changed_email' => 'Дата истечения изменена',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'extension_manager' => '',
 'february' => 'Февраль',
 'file' => 'Файл',
 'files' => 'Файлы',
@@ -670,6 +671,8 @@ $text = array(
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Включить аватары',
 'settings_enableUserImage_desc' => 'Включить аватары пользователей',
 'settings_enableUsersView' => 'Включить просмотр пользователей',
@@ -686,6 +689,7 @@ $text = array(
 'settings_expandFolderTree_val0' => 'начинать со свернутого дерева',
 'settings_expandFolderTree_val1' => 'начинать с развернутого дерева с развернутым первым уровнем',
 'settings_expandFolderTree_val2' => 'начинать с полностью развернутого дерева',
+'settings_Extensions' => '',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => 'Первый день недели',
@@ -774,6 +778,11 @@ $text = array(
 'settings_smtpServer_desc' => 'Хост SMTP',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => '',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => '',

languages/sk_SK/lang.inc

@@ -271,6 +271,7 @@ $text = array(
 'expiry_changed_email' => 'Datum platnosti zmeneny',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'extension_manager' => '',
 'february' => 'Február',
 'file' => 'Súbor',
 'files' => 'Súbory',
@@ -662,6 +663,8 @@ $text = array(
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',
@@ -678,6 +681,7 @@ $text = array(
 'settings_expandFolderTree_val0' => '',
 'settings_expandFolderTree_val1' => '',
 'settings_expandFolderTree_val2' => '',
+'settings_Extensions' => '',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => '',
@@ -766,6 +770,11 @@ $text = array(
 'settings_smtpServer_desc' => '',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => '',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => '',

languages/sv_SE/lang.inc

@@ -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 (1071), tmichelfelder (56)
+//    Translators: Admin (1072), tmichelfelder (56)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -318,6 +318,7 @@ Dokument: [name]
 Användare: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
+'extension_manager' => '',
 'february' => 'februari',
 'file' => 'Dokumentinformation',
 'files' => 'Filer',
@@ -781,7 +782,7 @@ URL: [url]',
 'settings_enableGuestLogin' => 'Tillåt gäst-inloggning',
 'settings_enableGuestLogin_desc' => 'Om du vill att alla ska kunna logga in som gäst, aktivera denna option. OBS! Gästinloggning bör endast användas i en säker omgivning',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
-'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning. Detta påverkar inte språkurval på inloggningssidan.',
+'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
 'settings_enableLargeFileUpload' => 'Aktivera uppladdning av stora filer',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
@@ -796,6 +797,8 @@ URL: [url]',
 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.',
 'settings_enableSelfRevApp' => 'Tillåt granskning/godkänning av inloggad användare',
 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => 'Aktivera användarbilder',
 'settings_enableUserImage_desc' => 'Aktivera användarbilder',
 'settings_enableUsersView' => 'Aktivera visning av användare',
@@ -812,6 +815,7 @@ URL: [url]',
 'settings_expandFolderTree_val0' => 'Börja med dolt träd',
 'settings_expandFolderTree_val1' => 'Börja med att visa trädet och första nivån',
 'settings_expandFolderTree_val2' => 'Börja med att visa hela trädet',
+'settings_Extensions' => '',
 'settings_extraPath' => 'Extra PHP include sökväg',
 'settings_extraPath_desc' => 'Sökväg till ytterligare mjukvara. Detta är mappen som kan innehålla t.ex. ADOdb-mappen eller ytterligare pear paket.',
 'settings_firstDayOfWeek' => 'Första dagen i veckan',
@@ -900,6 +904,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP server-hostname',
 'settings_smtpUser' => 'SMTP Server användare',
 'settings_smtpUser_desc' => 'SMTP Server användare',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => 'Sortera användare i listan',
 'settings_sortUsersInList_desc' => 'Sortering av användare i urvalsmenyer efter person- eller inloggningsnamn',
 'settings_sortUsersInList_val_fullname' => 'Sortera efter namn',

languages/zh_CN/lang.inc

@@ -271,6 +271,7 @@ $text = array(
 'expiry_changed_email' => '到期日子已改变',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'extension_manager' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -662,6 +663,8 @@ $text = array(
 'settings_enableRecursiveCount_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
+'settings_enableThemeSelector' => '',
+'settings_enableThemeSelector_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',
@@ -678,6 +681,7 @@ $text = array(
 'settings_expandFolderTree_val0' => '',
 'settings_expandFolderTree_val1' => '',
 'settings_expandFolderTree_val2' => '',
+'settings_Extensions' => '',
 'settings_extraPath' => '',
 'settings_extraPath_desc' => '',
 'settings_firstDayOfWeek' => '',
@@ -766,6 +770,11 @@ $text = array(
 'settings_smtpServer_desc' => '',
 'settings_smtpUser' => '',
 'settings_smtpUser_desc' => '',
+'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_val_name' => '',
+'settings_sortFoldersDefault_val_sequence' => '',
+'settings_sortFoldersDefault_val_unsorted' => '',
 'settings_sortUsersInList' => '',
 'settings_sortUsersInList_desc' => '',
 'settings_sortUsersInList_val_fullname' => '',

op/op.Settings.php

@@ -71,9 +71,11 @@ if ($action == "saveSettings")
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
   $settings->_enableLanguageSelector = getBoolValue("enableLanguageSelector");
+  $settings->_enableThemeSelector = getBoolValue("enableThemeSelector");
   $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
 	$settings->_stopWordsFile = $_POST["stopWordsFile"];
 	$settings->_sortUsersInList = $_POST["sortUsersInList"];
+	$settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
 
   // SETTINGS - SITE - CALENDAR
   $settings->_enableCalendar = getBoolValue("enableCalendar");

out/out.Login.php

@@ -37,7 +37,7 @@ else if (isset($_POST["referuri"]) && strlen($_POST["referuri"])>0) {
 $themes = UI::getStyles();
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('enableguestlogin'=>$settings->_enableGuestLogin, 'enablepasswordforgotten'=>$settings->_enablePasswordForgotten, 'referrer'=>$refer, 'themes'=>$themes));
+$view = UI::factory($theme, $tmp[1], array('enableguestlogin'=>$settings->_enableGuestLogin, 'enablepasswordforgotten'=>$settings->_enablePasswordForgotten, 'referrer'=>$refer, 'themes'=>$themes, 'languages'=>getLanguages(), 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector));
 if($view) {
 	$view->show();
 	exit;

out/out.ViewFolder.php

@@ -50,7 +50,7 @@ $showtree=showtree();
 
 if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
-} else $orderby="";
+} else $orderby=$settings->_sortFoldersDefault;
 
 if ($folder->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));

views/bootstrap/class.Login.php

@@ -36,6 +36,9 @@ class SeedDMS_View_Login extends SeedDMS_Bootstrap_Style {
 		$enablepasswordforgotten = $this->params['enablepasswordforgotten'];
 		$refer = $this->params['referrer'];
 		$themes = $this->params['themes'];
+		$languages = $this->params['languages'];
+		$enableLanguageSelector = $this->params['enablelanguageselector'];
+		$enableThemeSelector = $this->params['enablethemeselector'];
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
@@ -94,13 +97,13 @@ function guestLogin()
 			<input type="Password" id="pwd" name="pwd">
 		</div>
 	</div>
+<?php if($enableLanguageSelector) { ?>
 	<div class="control-group">
 		<label class="control-label" for="pwd"><?php printMLText("language");?>:</label>
 		<div class="controls">
 <?php
 			print "<select name=\"lang\">";
 			print "<option value=\"\">-";
-			$languages = getLanguages();
 			foreach ($languages as $currLang) {
 				print "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
 			}
@@ -108,6 +111,10 @@ function guestLogin()
 ?>
 		</div>
 	</div>
+<?php
+	}
+	if($enableThemeSelector) {
+?>
 	<div class="control-group">
 		<label class="control-label" for="pwd"><?php printMLText("theme");?>:</label>
 		<div class="controls">
@@ -122,6 +129,9 @@ function guestLogin()
 ?>
 		</div>
 	</div>
+<?php
+	}
+?>
 	<div class="control-group">
 		<div class="controls">
 		<button type="submit" class="btn"><?php printMLText("submit_login") ?></button>

views/bootstrap/class.Settings.php

@@ -177,6 +177,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
         <td><input name="enableLanguageSelector" type="checkbox" <?php if ($settings->_enableLanguageSelector) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableThemeSelector_desc");?>">
+        <td><?php printMLText("settings_enableThemeSelector");?>:</td>
+        <td><input name="enableThemeSelector" type="checkbox" <?php if ($settings->_enableThemeSelector) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_sortUsersInList_desc");?>">
         <td><?php printMLText("settings_sortUsersInList");?>:</td>
         <td>
@@ -185,6 +189,15 @@ if(!is_writeable($settings->_configFilePath)) {
             <OPTION VALUE="fullname" <?php if ($settings->_sortUsersInList=='fullname') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_fullname");?></OPTION>
           </SELECT>
       </tr>
+      <tr title="<?php printMLText("settings_sortFoldersDefault_desc");?>">
+        <td><?php printMLText("settings_sortFoldersDefault");?>:</td>
+        <td>
+          <SELECT name="sortFoldersDefault">
+            <OPTION VALUE="u" <?php if ($settings->_sortFoldersDefault=='') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_unsorted");?></OPTION>
+            <OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='s') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_sequence");?></OPTION>
+            <OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='n') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_name");?></OPTION>
+          </SELECT>
+      </tr>
 
       <!--
         -- SETTINGS - SITE - CALENDAR

views/bootstrap/class.ViewFolder.php

@@ -219,7 +219,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 				print "<table class=\"table\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";	
-				print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"":"&orderby=n")."\">".getMLText("name")."</a></th>\n";
+				print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";
 	//			print "<th>".getMLText("owner")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
 	//			print "<th>".getMLText("version")."</th>\n";