gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-02-07 22:32:18 +01:00
commit ab7776bdb9
38 changed files with 278 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -82,11 +82,13 @@
S_DRAFT_APP resp. S_DRAFT_REV
- add preview for webm videos (Closes #374)
- add support for apache mod_xsendfile, minor optimization of file download
- animate button to download more objects in folder list which loading is active
- animate button to download more objects in folder list when loading is active
- use converters for creating preview images as configured in settings (Closes #389)
- propperly check if user is already in database when doing ldap auth (Closes #388)
- list linked documents on the ViewDocument page in the way as in other document lists
- list linked documents on the ViewDocument page in the same way as in other document lists
- fix 2-factor authentification
- configuration variables in extension of type 'select' may have an empty option
- default position of documents/folders can be set in configuration (Closes #381)
--------------------------------------------------------------------------------
Changes in version 5.1.5

16
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -1698,6 +1698,22 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
return true;
} /* }}} */
/**
* Get the min and max sequence value for documents
*
* @return boolean/array array with keys 'min' and 'max', false in case of an error
*/
function getDocumentsMinMax() { /* {{{ */
$db = $this->_dms->getDB();
$queryStr = "SELECT min(`sequence`) AS `min`, max(`sequence`) AS `max` FROM `tblDocuments` WHERE `folder` = " . (int) $this->_id;
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
return $resArr[0];
} /* }}} */
}
?>

3
SeedDMS_Core/package.xml
View File

@ -1567,7 +1567,7 @@ returns just users which are not disabled
</notes>
</release>
<release>
<date>2018-01-18</date>
<date>2018-12-08</date>
<time>09:19:24</time>
<version>
<release>5.1.6</release>
@ -1579,6 +1579,7 @@ returns just users which are not disabled
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
add SeedDMS_Core_Folder::getDocumentsMinMax()
</notes>
</release>
<release>

4
inc/inc.Authentication.php
View File

@ -113,7 +113,7 @@ $notifier = new SeedDMS_NotificationService();
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
if(method_exists($notificationObj, 'preAddService')) {
$notificationObj->preAddService($notifier);
$notificationObj->preAddService($dms, $notifier);
}
}
}
@ -125,7 +125,7 @@ if($settings->_enableEmail) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
if(method_exists($notificationObj, 'postAddService')) {
$notificationObj->postAddService($notifier);
$notificationObj->postAddService($dms, $notifier);
}
}
}

4
inc/inc.ClassSettings.php
View File

@ -236,6 +236,8 @@ class Settings { /* {{{ */
var $_sortUsersInList = '';
// Sort method for forders and documents ('n' (name) or '')
var $_sortFoldersDefault = '';
// Where to insert new documents ('start' or 'end')
var $_defaultDocPosition = 'end';
// Set valid IP for admin logins
// if enabled admin can login only by specified IP addres
var $_adminIP = "";
@ -484,6 +486,7 @@ class Settings { /* {{{ */
$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
$this->_expandFolderTree = intval($tab["expandFolderTree"]);
$this->_libraryFolder = intval($tab["libraryFolder"]);
$this->_defaultDocPosition = strval($tab["defaultDocPosition"]);
// XML Path: /configuration/site/calendar
$node = $xml->xpath('/configuration/site/calendar');
@ -815,6 +818,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
$this->setXMLAttributValue($node, "sortFoldersDefault", $this->_sortFoldersDefault);
$this->setXMLAttributValue($node, "libraryFolder", $this->_libraryFolder);
$this->setXMLAttributValue($node, "defaultDocPosition", $this->_defaultDocPosition);
// XML Path: /configuration/site/calendar
$node = $this->getXMLNode($xml, '/configuration/site', 'calendar');

4
inc/inc.Language.php
View File

@ -76,7 +76,7 @@ function getLanguages() { /* {{{ */
* @param string $defaulttext text used if no translation can be found
* @param string $lang use this language instead of the currently set lang
*/
function getMLText($key, $replace = array(), $defaulttext = "", $lang="") { /* {{{ */
function getMLText($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
GLOBAL $settings, $LANG, $session, $MISSING_LANG;
$trantext = '';
@ -92,7 +92,7 @@ function getMLText($key, $replace = array(), $defaulttext = "", $lang="") { /* {
}
if(!isset($LANG[$lang][$key]) || !$LANG[$lang][$key]) {
if (!$defaulttext) {
if ($defaulttext === null) {
$MISSING_LANG[$key] = $lang; //$_SERVER['SCRIPT_NAME'];
if(!empty($LANG[$settings->_language][$key])) {
$tmpText = $LANG[$settings->_language][$key];

8
languages/ar_EG/lang.inc
View File

@ -1047,7 +1047,9 @@ URL: [url]',
'seconds' => 'ثواني',
'selection' => 'اختيار',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'اضغط لاختيار قسم',
'select_group' => '',
'select_groups' => 'اضغط لاختيار مجموعة',
'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون',
'select_grp_ind_approvers' => '',
@ -1065,7 +1067,9 @@ URL: [url]',
'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
'select_ind_revisors' => '',
'select_one' => 'اختر واحد',
'select_user' => '',
'select_users' => 'اضغط لاختيار المستخدم',
'select_value' => '',
'select_workflow' => 'اختر مسار العمل',
'send_email' => '',
'send_login_data' => '',
@ -1134,6 +1138,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

8
languages/bg_BG/lang.inc
View File

@ -912,7 +912,9 @@ $text = array(
'seconds' => 'секунди',
'selection' => 'Избор',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Изберете категория',
'select_group' => '',
'select_groups' => 'Кликни да избереш групи',
'select_grp_approvers' => 'Кликни да избереш група утвърждаващи',
'select_grp_ind_approvers' => '',
@ -930,7 +932,9 @@ $text = array(
'select_ind_reviewers' => 'Кликни да избереш рецензент',
'select_ind_revisors' => '',
'select_one' => 'Избери един',
'select_user' => '',
'select_users' => 'Кликни да избереш потребители',
'select_value' => '',
'select_workflow' => 'Избери процес',
'send_email' => '',
'send_login_data' => '',
@ -999,6 +1003,10 @@ $text = array(
'settings_dbVersion' => 'Схема БД остаряла',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

16
languages/ca_ES/lang.inc
View File

@ -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 (735)
// Translators: Admin (738)
$text = array(
'2_factor_auth' => '',
@ -407,7 +407,7 @@ URL: [url]',
'email_header' => 'Aquest es un missatge automàtic del servidor de DMS.',
'email_not_given' => '',
'empty_attribute_group_list' => '',
'empty_folder_list' => '',
'empty_folder_list' => 'Sense documents o carpetes',
'empty_notify_list' => 'No hi ha entrades',
'en_GB' => 'Anglès (Regne Unit)',
'equal_transition_states' => '',
@ -528,7 +528,7 @@ URL: [url]',
'individuals' => 'Individuals',
'indivіduals_in_groups' => '',
'info_recipients_tab_not_released' => '',
'inherited' => '',
'inherited' => 'Heredat',
'inherits_access_copy_msg' => 'Copiar llista d\'accés heretat',
'inherits_access_empty_msg' => 'Començar amb una llista d\'accés buida',
'inherits_access_msg' => 'Accés heretat',
@ -603,7 +603,7 @@ URL: [url]',
'linked_to_this_version' => '',
'link_alt_updatedocument' => '',
'link_to_version' => '',
'list_access_rights' => '',
'list_access_rights' => 'Llista tots els tipus d\'accés...',
'list_contains_no_access_docs' => '',
'list_hooks' => '',
'local_file' => 'Arxiu local',
@ -917,7 +917,9 @@ URL: [url]',
'seconds' => '',
'selection' => 'Selecció',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Prem per seleccionar la categoria',
'select_group' => '',
'select_groups' => '',
'select_grp_approvers' => '',
'select_grp_ind_approvers' => '',
@ -935,7 +937,9 @@ URL: [url]',
'select_ind_reviewers' => '',
'select_ind_revisors' => '',
'select_one' => 'Seleccionar un',
'select_user' => '',
'select_users' => 'Prem per seleccionar els usuaris',
'select_value' => '',
'select_workflow' => '',
'send_email' => '',
'send_login_data' => '',
@ -1004,6 +1008,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

8
languages/cs_CZ/lang.inc
View File

@ -1056,7 +1056,9 @@ URL: [url]',
'seconds' => 'sekundy',
'selection' => 'Výběr',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Kliknutím vyberte kategorii',
'select_group' => '',
'select_groups' => 'Kliknutím vyberte skupiny',
'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele',
'select_grp_ind_approvers' => '',
@ -1074,7 +1076,9 @@ URL: [url]',
'select_ind_reviewers' => 'Klepnutím vyberte jednotlivého posuzovatele',
'select_ind_revisors' => '',
'select_one' => 'Vyberte jeden',
'select_user' => '',
'select_users' => 'Kliknutím vyberte uživatele',
'select_value' => '',
'select_workflow' => 'Vyberte postup práce',
'send_email' => '',
'send_login_data' => '',
@ -1143,6 +1147,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

10
languages/de_DE/lang.inc
View File

@ -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 (2528), dgrutsch (22)
// Translators: Admin (2536), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -1117,7 +1117,9 @@ URL: [url]',
'seconds' => 'Sekunden',
'selection' => 'Auswahl',
'select_attrdefgrp_show' => 'Anzeigeort auswählen',
'select_attribute_value' => 'Attributwert auswählen',
'select_category' => 'Klicken zur Auswahl einer Kategorie',
'select_group' => 'Gruppe auswählen',
'select_groups' => 'Klicken zur Auswahl einer Gruppe',
'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe',
'select_grp_ind_approvers' => 'Klicken zur Auswahl einer Gruppe',
@ -1135,7 +1137,9 @@ URL: [url]',
'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
'select_ind_revisors' => 'Klicken zur Auswahl eines Wiederholungsprüfers',
'select_one' => 'Bitte wählen',
'select_user' => 'Benutzer auswählen',
'select_users' => 'Klicken zur Auswahl eines Benutzers',
'select_value' => 'Wert auswählen',
'select_workflow' => 'Workflow auswählen',
'send_email' => 'E-Mail verschicken',
'send_login_data' => 'Sende Login-Daten',
@ -1209,6 +1213,10 @@ Name: [username]
'settings_dbVersion' => 'Datenbankschema zu alt',
'settings_defaultAccessDocs' => 'Standardberechtigung für neue Dokumente',
'settings_defaultAccessDocs_desc' => 'Beim Erstellen eines neuen Dokuments wird dies als Standardberechtigung gesetzt.',
'settings_defaultDocPosition' => 'Position eines Dokuments beim Anlegen',
'settings_defaultDocPosition_desc' => 'Dies ist die voreingestellte Position eines Dokuments innerhalb eines Ordners, wenn dieses angelegt wird.',
'settings_defaultDocPosition_val_end' => 'Ende',
'settings_defaultDocPosition_val_start' => 'Anfang',
'settings_defaultSearchMethod' => 'Voreingestellte Suchmethode',
'settings_defaultSearchMethod_desc' => 'Voreingestellte Suchmethode, wenn über das Suchfeld in der Menüleiste gesucht wird.',
'settings_defaultSearchMethod_valdatabase' => 'Datenbank',

8
languages/el_GR/lang.inc
View File

@ -923,7 +923,9 @@ URL: [url]',
'seconds' => 'δεύτερα',
'selection' => 'Επιλογή',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Επιλογή κατηγορίας',
'select_group' => '',
'select_groups' => '',
'select_grp_approvers' => '',
'select_grp_ind_approvers' => '',
@ -941,7 +943,9 @@ URL: [url]',
'select_ind_reviewers' => '',
'select_ind_revisors' => '',
'select_one' => '',
'select_user' => '',
'select_users' => '',
'select_value' => '',
'select_workflow' => '',
'send_email' => '',
'send_login_data' => '',
@ -1010,6 +1014,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

10
languages/en_GB/lang.inc
View File

@ -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 (1650), archonwang (3), dgrutsch (9), netixw (14)
// Translators: Admin (1658), archonwang (3), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -1112,7 +1112,9 @@ URL: [url]',
'seconds' => 'seconds',
'selection' => 'Selection',
'select_attrdefgrp_show' => 'Choose when to show',
'select_attribute_value' => 'Select attribute value',
'select_category' => 'Click to select category',
'select_group' => 'Select group',
'select_groups' => 'Click to select groups',
'select_grp_approvers' => 'Click to select group approver',
'select_grp_ind_approvers' => 'Click to select group',
@ -1130,7 +1132,9 @@ URL: [url]',
'select_ind_reviewers' => 'Click to select individual reviewer',
'select_ind_revisors' => 'Click to select individual revisors',
'select_one' => 'Select one',
'select_user' => 'Select user',
'select_users' => 'Click to select users',
'select_value' => 'Select value',
'select_workflow' => 'Select workflow',
'send_email' => 'Send email',
'send_login_data' => 'Send login data',
@ -1204,6 +1208,10 @@ Name: [username]
'settings_dbVersion' => 'Database schema too old',
'settings_defaultAccessDocs' => 'Default access for new documents',
'settings_defaultAccessDocs_desc' => 'When a new document is created, this will be the default access right.',
'settings_defaultDocPosition' => 'Position of document when created',
'settings_defaultDocPosition_desc' => 'This is the default position within a folder when a document is created.',
'settings_defaultDocPosition_val_end' => 'end',
'settings_defaultDocPosition_val_start' => 'start',
'settings_defaultSearchMethod' => 'Default search method',
'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.',
'settings_defaultSearchMethod_valdatabase' => 'database',

8
languages/es_ES/lang.inc
View File

@ -1062,7 +1062,9 @@ URL: [url]',
'seconds' => 'segundos',
'selection' => 'Selección',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Haga Click para seleccionar categoría',
'select_group' => '',
'select_groups' => 'Haga Click para seleccionar grupos',
'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores',
'select_grp_ind_approvers' => '',
@ -1080,7 +1082,9 @@ URL: [url]',
'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
'select_ind_revisors' => '',
'select_one' => 'Seleccionar uno',
'select_user' => '',
'select_users' => 'Haga Click para seleccionar usuarios',
'select_value' => '',
'select_workflow' => 'Selecionar Flujo de Trabajo',
'send_email' => '',
'send_login_data' => '',
@ -1149,6 +1153,10 @@ URL: [url]',
'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo',
'settings_defaultAccessDocs' => 'Acceso por defecto de nuevos documentos',
'settings_defaultAccessDocs_desc' => 'Cuando un nuevo documento sea creado, este sera el acceso por defecto.',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Método de búsqueda por defecto',
'settings_defaultSearchMethod_desc' => 'Método de búsqueda por defecto, cuando se inicia una búsqueda mediante el formulario en el menú principal',
'settings_defaultSearchMethod_valdatabase' => 'base de datos',

8
languages/fr_FR/lang.inc
View File

@ -1079,7 +1079,9 @@ URL : [url]',
'seconds' => 'secondes',
'selection' => 'Sélection',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Cliquer pour choisir une catégorie',
'select_group' => '',
'select_groups' => 'Cliquer pour choisir un groupe',
'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur',
'select_grp_ind_approvers' => '',
@ -1097,7 +1099,9 @@ URL : [url]',
'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
'select_ind_revisors' => '',
'select_one' => 'Selectionner',
'select_user' => '',
'select_users' => 'Cliquer pour choisir un utilisateur',
'select_value' => '',
'select_workflow' => 'Choisir un workflow',
'send_email' => 'Envoyer un e-mail',
'send_login_data' => 'Envoyer les informations de connexion',
@ -1171,6 +1175,10 @@ Nom : [username]
'settings_dbVersion' => 'Schéma de base de données trop ancien',
'settings_defaultAccessDocs' => 'Accès par défaut des nouveaux documents',
'settings_defaultAccessDocs_desc' => 'Lors de la création d’un nouveau document, ce droit d’accès sera appliqué par défaut.',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Méthode de recherche par défaut',
'settings_defaultSearchMethod_desc' => 'Méthode de recherche par défaut, lorsque la recherche est exécutée depuis le moteur de recherche du menu principal',
'settings_defaultSearchMethod_valdatabase' => 'base de données',

8
languages/hr_HR/lang.inc
View File

@ -1083,7 +1083,9 @@ Internet poveznica: [url]',
'seconds' => 'sekunde',
'selection' => 'Odabir',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Kliknite za odabir kategorije',
'select_group' => '',
'select_groups' => 'Kliknite za odabir grupa',
'select_grp_approvers' => 'Kliknite za odabir validatora grupe',
'select_grp_ind_approvers' => '',
@ -1101,7 +1103,9 @@ Internet poveznica: [url]',
'select_ind_reviewers' => 'Kliknite za odabir pojedinačnog recezenta',
'select_ind_revisors' => 'Kliknite za odabir pojedinačnog revizora',
'select_one' => 'Odaberite jednog',
'select_user' => '',
'select_users' => 'Kliknite za odabir korisnika',
'select_value' => '',
'select_workflow' => 'Odaberite tok rada',
'send_email' => '',
'send_login_data' => '',
@ -1170,6 +1174,10 @@ Internet poveznica: [url]',
'settings_dbVersion' => 'Shema baze podataka je prestara',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Zadana metoda pretrage',
'settings_defaultSearchMethod_desc' => 'Zadana metoda pretrage, kada se pretraživanje pokreće putem formulara iz glavnog izbornika',
'settings_defaultSearchMethod_valdatabase' => 'baza podataka',

8
languages/hu_HU/lang.inc
View File

@ -1061,7 +1061,9 @@ URL: [url]',
'seconds' => 'másodperc',
'selection' => 'Selection',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Kattintson a kategória kiválasztásához',
'select_group' => '',
'select_groups' => 'Kattintson a csoportok kijelöléséhez',
'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez',
'select_grp_ind_approvers' => '',
@ -1079,7 +1081,9 @@ URL: [url]',
'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
'select_ind_revisors' => '',
'select_one' => 'Vßlasszon egyet',
'select_user' => '',
'select_users' => 'Kattintson a felhasználó kiválasztásához',
'select_value' => '',
'select_workflow' => 'Munkafolyamat választás',
'send_email' => '',
'send_login_data' => '',
@ -1148,6 +1152,10 @@ URL: [url]',
'settings_dbVersion' => 'Adatbázis séma túl régi',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Alapértelmezett keresési módszer',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => 'adatbázis',

8
languages/it_IT/lang.inc
View File

@ -1095,7 +1095,9 @@ URL: [url]',
'seconds' => 'secondi',
'selection' => 'Selezione',
'select_attrdefgrp_show' => 'Scegli quando mostrare',
'select_attribute_value' => '',
'select_category' => 'Clicca per selezionare la categoria',
'select_group' => '',
'select_groups' => 'Clicca per selezionare i gruppi',
'select_grp_approvers' => 'Seleziona gruppo approvatore',
'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo',
@ -1113,7 +1115,9 @@ URL: [url]',
'select_ind_reviewers' => 'Seleziona revisore',
'select_ind_revisors' => 'Seleziona singoli revisori',
'select_one' => 'Seleziona uno',
'select_user' => '',
'select_users' => 'Clicca per selezionare gli utenti',
'select_value' => '',
'select_workflow' => 'Seleziona il flusso di lavoro',
'send_email' => '',
'send_login_data' => '',
@ -1182,6 +1186,10 @@ URL: [url]',
'settings_dbVersion' => 'Schema del database obsoleto',
'settings_defaultAccessDocs' => 'Diritto di accesso per i nuovi documenti',
'settings_defaultAccessDocs_desc' => 'Quando si crea un nuovo documento, questo sarà il diritto di accesso predefinito',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito',
'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.',
'settings_defaultSearchMethod_valdatabase' => 'database',

8
languages/ko_KR/lang.inc
View File

@ -1077,7 +1077,9 @@ URL : [url]',
'seconds' => '초',
'selection' => '선택',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => '범주를 선택합니다',
'select_group' => '',
'select_groups' => '그룹을 선택합니다',
'select_grp_approvers' => '그룹 승인을 선택합니다',
'select_grp_ind_approvers' => '그룹 승인 선택',
@ -1095,7 +1097,9 @@ URL : [url]',
'select_ind_reviewers' => '클릭하여 개별 검토자를 고릅니다.',
'select_ind_revisors' => '개별 감사를 선택합니다',
'select_one' => '선택',
'select_user' => '',
'select_users' => '사용자를 선택합니다',
'select_value' => '',
'select_workflow' => '선택 워크플로우',
'send_email' => '전자우편 보내기',
'send_login_data' => '',
@ -1164,6 +1168,10 @@ URL : [url]',
'settings_dbVersion' => '오래된 데이터베이스 스키마',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '기본 검색 방법 설정',
'settings_defaultSearchMethod_desc' => '기본 검색 설정',
'settings_defaultSearchMethod_valdatabase' => '기본 검색 방법 설정',

8
languages/nl_NL/lang.inc
View File

@ -1098,7 +1098,9 @@ URL: [url]',
'seconds' => 'seconden',
'selection' => 'Selectie',
'select_attrdefgrp_show' => 'Toon attribut definities-groep',
'select_attribute_value' => '',
'select_category' => 'klik om categorie te selecteren',
'select_group' => '',
'select_groups' => 'Klik om groep te selecteren',
'select_grp_approvers' => 'Klik om beoordelaars te selecteren',
'select_grp_ind_approvers' => 'Klik om beoordelaars te selecteren',
@ -1116,7 +1118,9 @@ URL: [url]',
'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
'select_ind_revisors' => 'Klik voor individuele herziners',
'select_one' => 'Selecteer een',
'select_user' => '',
'select_users' => 'Klik om gebruikers te selecteren',
'select_value' => '',
'select_workflow' => 'Selecteer workflow',
'send_email' => 'Verstuur email',
'send_login_data' => 'Verstuur Login-data',
@ -1194,6 +1198,10 @@ Name: [username]
'settings_dbVersion' => 'Database schema te oud',
'settings_defaultAccessDocs' => 'Standaard toegangsrechten voor nieuwe documenten',
'settings_defaultAccessDocs_desc' => 'Als een nieuw document wordt gecreëerd, worden dit de nieuwe toegangsrechten.',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Standaard zoekmethode',
'settings_defaultSearchMethod_desc' => 'Default zoekmethode = op documentnaam / fulltext-search',
'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (Documentnaam)',

8
languages/pl_PL/lang.inc
View File

@ -1041,7 +1041,9 @@ URL: [url]',
'seconds' => 'sekund',
'selection' => 'Wybierz',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Kliknij by wybrać kategorię',
'select_group' => '',
'select_groups' => 'Kliknij by wybrać grupy',
'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą',
'select_grp_ind_approvers' => '',
@ -1059,7 +1061,9 @@ URL: [url]',
'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
'select_ind_revisors' => '',
'select_one' => 'Wybierz',
'select_user' => '',
'select_users' => 'Kliknij by wybrać użytkowników',
'select_value' => '',
'select_workflow' => 'Wybierz proces',
'send_email' => '',
'send_login_data' => '',
@ -1128,6 +1132,10 @@ URL: [url]',
'settings_dbVersion' => 'Schemat bazy danych jest za stary',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => 'baza danych',

12
languages/pt_BR/lang.inc
View File

@ -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 (967), flaviove (627), lfcristofoli (352)
// Translators: Admin (968), flaviove (627), lfcristofoli (352)
$text = array(
'2_factor_auth' => '',
@ -1059,7 +1059,9 @@ URL: [url]',
'seconds' => 'segundos',
'selection' => 'Selection',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Clique para selecionar a categoria',
'select_group' => '',
'select_groups' => 'Clique para selecionar os grupos',
'select_grp_approvers' => 'Clique para selecionar o grupo aprovador',
'select_grp_ind_approvers' => '',
@ -1077,7 +1079,9 @@ URL: [url]',
'select_ind_reviewers' => 'Clique para selecionar revisor individual',
'select_ind_revisors' => '',
'select_one' => 'Selecione um',
'select_user' => '',
'select_users' => 'Clique para selecionar os usuários',
'select_value' => '',
'select_workflow' => 'Selecione o fluxo de trabalho',
'send_email' => '',
'send_login_data' => '',
@ -1146,6 +1150,10 @@ URL: [url]',
'settings_dbVersion' => 'Esquema de banco de dados muito antigo',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Forma padrão para buscas',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => 'Banco de Dados',
@ -1521,7 +1529,7 @@ URL: [url]',
'switched_to' => 'Comutado para',
'takeOverAttributeValue' => '',
'takeOverGrpApprover' => '',
'takeOverGrpReviewer' => '',
'takeOverGrpReviewer' => 'Assuma o grupo de revisores da última versão.',
'takeOverIndApprover' => '',
'takeOverIndReviewer' => '',
'tasks' => '',

8
languages/ro_RO/lang.inc
View File

@ -1084,7 +1084,9 @@ URL: [url]',
'seconds' => 'secunde',
'selection' => 'Selecție',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Click pentru a selecta categoria',
'select_group' => '',
'select_groups' => 'Click pentru a selecta grupuri',
'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori',
'select_grp_ind_approvers' => '',
@ -1102,7 +1104,9 @@ URL: [url]',
'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
'select_ind_revisors' => 'Faceti click pentru a selecta retrimitori individuali',
'select_one' => 'Selectați unul',
'select_user' => '',
'select_users' => 'Click pentru a selecta utilizatori',
'select_value' => '',
'select_workflow' => 'Selectați workflow',
'send_email' => '',
'send_login_data' => '',
@ -1171,6 +1175,10 @@ URL: [url]',
'settings_dbVersion' => 'Schema bazei de date este prea veche',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'metoda de cautare implicita',
'settings_defaultSearchMethod_desc' => 'Metoda de cautare implicita cand cautarea a fost initiata prin formularul de cautare din meniul principal',
'settings_defaultSearchMethod_valdatabase' => 'baza de date',

8
languages/ru_RU/lang.inc
View File

@ -1091,7 +1091,9 @@ URL: [url]',
'seconds' => 'секунды',
'selection' => 'Выбор',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Выберите категорию',
'select_group' => '',
'select_groups' => 'Выберите группы',
'select_grp_approvers' => 'Выберите утверждающую группу',
'select_grp_ind_approvers' => 'Выберите группу',
@ -1109,7 +1111,9 @@ URL: [url]',
'select_ind_reviewers' => 'Выберите индивидуального рецензента',
'select_ind_revisors' => 'Выберите индивидуального ревизора',
'select_one' => 'Выберите',
'select_user' => '',
'select_users' => 'Выберите пользователей',
'select_value' => '',
'select_workflow' => 'Выберите процесс',
'send_email' => '',
'send_login_data' => '',
@ -1178,6 +1182,10 @@ URL: [url]',
'settings_dbVersion' => 'Схема БД устарела',
'settings_defaultAccessDocs' => 'Права доступа к новому документу по умолчанию',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Метод поиска по умолчанию',
'settings_defaultSearchMethod_desc' => 'Метод поиска по умолчанию, когда поиск начинается с поисковой формы главного меню.',
'settings_defaultSearchMethod_valdatabase' => 'база данных',

8
languages/sk_SK/lang.inc
View File

@ -916,7 +916,9 @@ URL: [url]',
'seconds' => 'sekundy',
'selection' => 'Výber',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Vyber kategóriu',
'select_group' => '',
'select_groups' => '',
'select_grp_approvers' => '',
'select_grp_ind_approvers' => 'Kliknutím vyberte skupinu',
@ -934,7 +936,9 @@ URL: [url]',
'select_ind_reviewers' => 'Kliknutím vyberte individuálneho recenzenta',
'select_ind_revisors' => '',
'select_one' => 'Vyberte jeden',
'select_user' => '',
'select_users' => 'Kliknutím vyberte používateľov',
'select_value' => '',
'select_workflow' => '',
'send_email' => 'Poslať E-mail',
'send_login_data' => 'Poslať prihlasovacie údaje',
@ -1003,6 +1007,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => 'Štandardný prístup pre nové dokumenty',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => 'databáza',

8
languages/sv_SE/lang.inc
View File

@ -1099,7 +1099,9 @@ URL: [url]',
'seconds' => 'sekunder',
'selection' => 'Urval',
'select_attrdefgrp_show' => 'Välj visingsalternativ',
'select_attribute_value' => '',
'select_category' => 'Klicka för att välja en kategori',
'select_group' => '',
'select_groups' => 'Välj grupper',
'select_grp_approvers' => 'Välj en grupp som ska godkänna',
'select_grp_ind_approvers' => 'Klicka för att välja grupp',
@ -1117,7 +1119,9 @@ URL: [url]',
'select_ind_reviewers' => 'Välj en person som ska granska',
'select_ind_revisors' => 'Klicka för att välja individuell reviderare',
'select_one' => 'Välj',
'select_user' => '',
'select_users' => 'Välj användare',
'select_value' => '',
'select_workflow' => 'Välj arbetsflöde',
'send_email' => 'Skicka e-post',
'send_login_data' => 'Skicka inloggningsuppgifter',
@ -1191,6 +1195,10 @@ Kommentar: [comment]',
'settings_dbVersion' => 'Databasschemat för gammalt',
'settings_defaultAccessDocs' => 'Standardåtkomst för nya dokument',
'settings_defaultAccessDocs_desc' => 'När ett nytt dokument skapas, används denna behörighet som standard.',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Standard sökmetod',
'settings_defaultSearchMethod_desc' => 'Standard sökmetod, när en sökning startas i sökformuläret i huvudmenyn.',
'settings_defaultSearchMethod_valdatabase' => 'databas',

8
languages/tr_TR/lang.inc
View File

@ -1063,7 +1063,9 @@ URL: [url]',
'seconds' => 'saniye',
'selection' => 'Seçim',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Kategori seçmek için tıklayın',
'select_group' => '',
'select_groups' => 'Grup seçmek için tıklayın',
'select_grp_approvers' => 'Grup onaylayıcı seçmek için tıklayın',
'select_grp_ind_approvers' => '',
@ -1081,7 +1083,9 @@ URL: [url]',
'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
'select_ind_revisors' => '',
'select_one' => 'Birini seçiniz',
'select_user' => '',
'select_users' => 'Kullanıcı seçmek için tıklayın',
'select_value' => '',
'select_workflow' => 'İş akışı seç',
'send_email' => '',
'send_login_data' => '',
@ -1150,6 +1154,10 @@ URL: [url]',
'settings_dbVersion' => 'Veritabanı yapısı çok eski',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

8
languages/uk_UA/lang.inc
View File

@ -1084,7 +1084,9 @@ URL: [url]',
'seconds' => 'секунди',
'selection' => 'Вибір',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => 'Оберіть категорію',
'select_group' => '',
'select_groups' => 'Оберіть групи',
'select_grp_approvers' => 'Оберіть групу затверджувачів',
'select_grp_ind_approvers' => 'Оберіть групу',
@ -1102,7 +1104,9 @@ URL: [url]',
'select_ind_reviewers' => 'Оберіть індивідуального рецензента',
'select_ind_revisors' => 'Оберіть індивідуального ревізора',
'select_one' => 'Оберіть',
'select_user' => '',
'select_users' => 'Оберіть користувачів',
'select_value' => '',
'select_workflow' => 'Оберіть процес',
'send_email' => '',
'send_login_data' => '',
@ -1171,6 +1175,10 @@ URL: [url]',
'settings_dbVersion' => 'Схема БД застаріла',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => 'Метод пошуку за замовчуванням',
'settings_defaultSearchMethod_desc' => 'Метод пошуку за замовчуванням, коли пошук починається з пошукової форми головного меню.',
'settings_defaultSearchMethod_valdatabase' => 'база даних',

8
languages/zh_CN/lang.inc
View File

@ -1062,7 +1062,9 @@ URL: [url]',
'seconds' => '秒',
'selection' => '选择',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => '选中分类',
'select_group' => '',
'select_groups' => '点击选择组',
'select_grp_approvers' => '点击选择组审批组',
'select_grp_ind_approvers' => '点击选择组',
@ -1080,7 +1082,9 @@ URL: [url]',
'select_ind_reviewers' => '点击选择审核人',
'select_ind_revisors' => '',
'select_one' => '选择一个',
'select_user' => '',
'select_users' => '点击选择用户',
'select_value' => '',
'select_workflow' => '选择工作流',
'send_email' => '发送邮件',
'send_login_data' => '发送登录数据',
@ -1154,6 +1158,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '新增文档时默认访问控制',
'settings_defaultAccessDocs_desc' => '创建新文档时的默认访问权限',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '默认搜索模式',
'settings_defaultSearchMethod_desc' => '在主菜单中启动检索时，设置默认的搜索方式',
'settings_defaultSearchMethod_valdatabase' => '数据库',

8
languages/zh_TW/lang.inc
View File

@ -916,7 +916,9 @@ URL: [url]',
'seconds' => '',
'selection' => '選擇',
'select_attrdefgrp_show' => '',
'select_attribute_value' => '',
'select_category' => '選中分類',
'select_group' => '',
'select_groups' => '點擊選擇組',
'select_grp_approvers' => '請點選審核人員群組',
'select_grp_ind_approvers' => '',
@ -934,7 +936,9 @@ URL: [url]',
'select_ind_reviewers' => '請點選單一的校對人',
'select_ind_revisors' => '',
'select_one' => '選擇一個',
'select_user' => '',
'select_users' => '點擊選擇用戶',
'select_value' => '',
'select_workflow' => '',
'send_email' => '',
'send_login_data' => '',
@ -1003,6 +1007,10 @@ URL: [url]',
'settings_dbVersion' => '',
'settings_defaultAccessDocs' => '',
'settings_defaultAccessDocs_desc' => '',
'settings_defaultDocPosition' => '',
'settings_defaultDocPosition_desc' => '',
'settings_defaultDocPosition_val_end' => '',
'settings_defaultDocPosition_val_start' => '',
'settings_defaultSearchMethod' => '',
'settings_defaultSearchMethod_desc' => '',
'settings_defaultSearchMethod_valdatabase' => '',

10
op/op.Ajax.php
View File

@ -69,7 +69,7 @@ if (isset($_COOKIE["mydms_session"])) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
if(method_exists($notificationObj, 'preAddService')) {
$notificationObj->preAddService($notifier);
$notificationObj->preAddService($dms, $notifier);
}
}
}
@ -89,7 +89,7 @@ if (isset($_COOKIE["mydms_session"])) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
if(method_exists($notificationObj, 'postAddService')) {
$notificationObj->postAddService($notifier);
$notificationObj->postAddService($dms, $notifier);
}
}
}
@ -668,7 +668,11 @@ switch($command) {
$controller->setParam('userfilename', $userfilename);
$controller->setParam('filetype', $fileType);
$controller->setParam('userfiletype', $userfiletype);
$controller->setParam('sequence', 0);
$minmax = $folder->getDocumentsMinMax();
if($settings->_defaultDocPosition == 'start')
$controller->setParam('sequence', $minmax['min'] - 1);
else
$controller->setParam('sequence', $minmax['max'] + 1);
$controller->setParam('reviewers', $reviewers);
$controller->setParam('approvers', $approvers);
$controller->setParam('reqversion', 1);

1
op/op.Settings.php
View File

@ -101,6 +101,7 @@ if ($action == "saveSettings")
$settings->_stopWordsFile = $_POST["stopWordsFile"];
$settings->_sortUsersInList = $_POST["sortUsersInList"];
$settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
$settings->_defaultDocPosition = $_POST["defaultDocPosition"];
$settings->_libraryFolder = intval($_POST["libraryFolder"]);
// SETTINGS - SITE - CALENDAR

1
out/out.AddDocument.php
View File

@ -84,6 +84,7 @@ if($view) {
$view->setParam('workflowmode', $settings->_workflowMode);
$view->setParam('presetexpiration', $settings->_presetExpirationDate);
$view->setParam('sortusersinlist', $settings->_sortUsersInList);
$view->setParam('defaultposition', $settings->_defaultDocPosition);
$view->setParam('orderby', $settings->_sortFoldersDefault);
$view->setParam('accessobject', $accessop);
$view($_GET);

1
out/out.AddSubFolder.php
View File

@ -51,6 +51,7 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
if($view) {
$view->setParam('folder', $folder);
$view->setParam('strictformcheck', $settings->_strictFormCheck);
$view->setParam('defaultposition', $settings->_defaultDocPosition);
$view->setParam('orderby', $settings->_sortFoldersDefault);
$view->setParam('accessobject', $accessop);
$view($_GET);

1
out/out.EditDocument.php
View File

@ -62,6 +62,7 @@ if($view) {
$view->setParam('attrdefs', $attrdefs);
$view->setParam('strictformcheck', $settings->_strictFormCheck);
$view->setParam('orderby', $settings->_sortFoldersDefault);
$view->setParam('defaultposition', $settings->_defaultDocPosition);
$view->setParam('accessobject', $accessop);
$view($_GET);
exit;

1
out/out.EditFolder.php
View File

@ -54,6 +54,7 @@ if($view) {
$view->setParam('rootfolderid', $settings->_rootFolderID);
$view->setParam('orderby', $settings->_sortFoldersDefault);
$view->setParam('accessobject', $accessop);
$view->setParam('defaultposition', $settings->_defaultDocPosition);
$view($_GET);
exit;
}

9
views/bootstrap/class.Bootstrap.php
View File

@ -1147,10 +1147,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if ($keepID != -1) {
print " <option value=\"keep\">" . getMLText("seq_keep");
}
print " <option value=\"".$max."\">" . getMLText("seq_end");
if($this->params['defaultposition'] != 'start')
print " <option value=\"".$max."\">" . getMLText("seq_end");
if (count($objArr) > 0) {
print " <option value=\"".$min."\">" . getMLText("seq_start");
}
if($this->params['defaultposition'] == 'start')
print " <option value=\"".$max."\">" . getMLText("seq_end");
for ($i = 0; $i < count($objArr) - 1; $i++) {
if (($objArr[$i]->getID() == $keepID) || (($i + 1 < count($objArr)) && ($objArr[$i+1]->getID() == $keepID))) {
continue;
@ -1386,14 +1389,14 @@ $(document).ready(function() {
break;
default:
if($valueset = $attrdef->getValueSetAsArray()) {
echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
echo "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
if($attrdef->getMultipleValues()) {
echo "[]\" multiple";
} else {
echo "\"";
}
echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select\">";
echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select-deselect\" data-placeholder=\"".getMLText("select_value")."\">";
if(!$attrdef->getMultipleValues()) {
echo "<option value=\"\"></option>";
}

43
views/bootstrap/class.Settings.php
View File

@ -341,19 +341,27 @@ if(!is_writeable($settings->_configFilePath)) {
<tr title="<?php printMLText("settings_sortUsersInList_desc");?>">
<td><?php printMLText("settings_sortUsersInList");?>:</td>
<td>
<SELECT name="sortUsersInList">
<OPTION VALUE="" <?php if ($settings->_sortUsersInList=='') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_login");?></OPTION>
<OPTION VALUE="fullname" <?php if ($settings->_sortUsersInList=='fullname') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_fullname");?></OPTION>
</SELECT>
<select name="sortUsersInList">
<option value="" <?php if ($settings->_sortUsersInList=='') echo "selected" ?> ><?php printMLText("settings_sortUsersInList_val_login");?></option>
<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="s" <?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>
<select name="sortFoldersDefault">
<option value="u" <?php if ($settings->_sortFoldersDefault=='') echo "selected" ?> ><?php printMLText("settings_sortFoldersDefault_val_unsorted");?></option>
<option value="s" <?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>
<tr title="<?php printMLText("settings_defaultDocPosition_desc");?>">
<td><?php printMLText("settings_defaultDocPosition");?>:</td>
<td>
<select name="defaultDocPosition">
<option value="end" <?php if ($settings->_defaultDocPosition=='end') echo "selected" ?> ><?php printMLText("settings_defaultDocPosition_val_end");?></option>
<option value="start" <?php if ($settings->_defaultDocPosition=='start') echo "selected" ?> ><?php printMLText("settings_defaultDocPosition_val_start");?></option>
</select>
</tr>
<tr title="<?php printMLText("settings_libraryFolder_desc");?>">
<td><?php printMLText("settings_libraryFolder");?>:</td>
@ -864,11 +872,14 @@ if(!is_writeable($settings->_configFilePath)) {
echo "</select>";
} elseif(!empty($conf['internal'])) {
$selections = empty($settings->_extensions[$extname][$confkey]) ? array() : explode(",", $settings->_extensions[$extname][$confkey]);
$allowempty = empty($conf['allow_empty']) ? false : $conf['allow_empty'];
switch($conf['internal']) {
case "categories":
$categories = $dms->getDocumentCategories();
if($categories) {
echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "").">";
echo "<select class=\"chzn-select".($allowempty ? "-deselect" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_category")."\">";
if($allowempty)
echo "<option value=\"\"></option>";
foreach($categories as $category) {
echo "<option value=\"".$category->getID()."\"";
if(in_array($category->getID(), $selections))
@ -881,7 +892,9 @@ if(!is_writeable($settings->_configFilePath)) {
case "users":
$users = $dms->getAllUsers();
if($users) {
echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "").">";
echo "<select class=\"chzn-select".($allowempty ? "-deselect" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_user")."\">";
if($allowempty)
echo "<option value=\"\"></option>";
foreach($users as $curuser) {
echo "<option value=\"".$curuser->getID()."\"";
if(in_array($curuser->getID(), $selections))
@ -894,7 +907,9 @@ if(!is_writeable($settings->_configFilePath)) {
case "groups":
$recs = $dms->getAllGroups();
if($recs) {
echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "").">";
echo "<select class=\"chzn-select".($allowempty ? "-deselect" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_group")."\">";
if($allowempty)
echo "<option value=\"\"></option>";
foreach($recs as $rec) {
echo "<option value=\"".$rec->getID()."\"";
if(in_array($rec->getID(), $selections))
@ -907,7 +922,9 @@ if(!is_writeable($settings->_configFilePath)) {
case "attributedefinitions":
$recs = $dms->getAllAttributeDefinitions();
if($recs) {
echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "").">";
echo "<select class=\"chzn-select".($allowempty ? "-deselect" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? " multiple" : "").(!empty($conf['size']) ? " size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
if($allowempty)
echo "<option value=\"\"></option>";
foreach($recs as $rec) {
echo "<option value=\"".$rec->getID()."\"";
if(in_array($rec->getID(), $selections))