diff --git a/CHANGELOG b/CHANGELOG
index d20441631..ce4366e90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -317,6 +317,12 @@
Changes in version 5.1.39
--------------------------------------------------------------------------------
- show quota on chart page when listing total document size per user
+- turn off legend for chart sizepermonth
+- do not add group manager as mandatory approver/reviewer if logged in
+ user is the manager itself
+- fixed setting group approvers from previous document version
+- very experimental support of memcached for accelerating some database
+ operations (do not use in production)
--------------------------------------------------------------------------------
Changes in version 5.1.38
diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index d809e0526..4e4f6dad0 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -103,7 +103,15 @@ class SeedDMS_Download_Mgr {
$this->tmpdir = $tmpdir;
$this->items = array();
$this->folder_items = array();
- $this->header = array(getMLText('download_header_document_no'), getMLText('download_header_document_name'), getMLText('download_header_filename'), getMLText('download_header_state'), getMLText('download_header_internal_version'), getMLText('download_header_reviewer'), getMLText('download_header_review_date'), getMLText('download_header_review_comment'), getMLText('download_header_review_state'), getMLText('download_header_approver'), getMLText('download_header_approval_date'), getMLText('download_header_approval_comment'), getMLText('download_header_approval_state'));
+ $this->header = array(getMLText('download_header_document_no'), getMLText('download_header_document_name'), getMLText('download_header_filename'), getMLText('download_header_state'), getMLText('download_header_internal_version'));
+ $this->header[] = getMLText('download_header_reviewer');
+ $this->header[] = getMLText('download_header_review_date');
+ $this->header[] = getMLText('download_header_review_comment');
+ $this->header[] = getMLText('download_header_review_state');
+ $this->header[] = getMLText('download_header_approver');
+ $this->header[] = getMLText('download_header_approval_date');
+ $this->header[] = getMLText('download_header_approval_comment');
+ $this->header[] = getMLText('download_header_approval_state');
$this->folder_header = array(getMLText('download_header_folder_no'), getMLText('download_header_folder_name'));
$this->extracols = array();
$this->folder_extracols = array();
@@ -111,10 +119,11 @@ class SeedDMS_Download_Mgr {
$this->extraheader = array();
$this->folder_extraheader = array();
$this->filenames = array();
- $this->skipdefaultcols = false;
+ $this->includereviewers = false;
+ $this->includeapprovers = false;
}
- public function setSkipDefaultCols($v) { /* {{{ */
+ public function skipDefaultCols($v) { /* {{{ */
$this->skipdefaultcols = (bool) $v;
} /* }}} */
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 18eebe468..0c1f3dc06 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -152,6 +152,8 @@ class Settings { /* {{{ */
var $_batchOperations = array(); // or 'all', 'change_owner', etc.
// jump straight to the document if it is the only hit of a search
var $_showSingleSearchHit = true;
+ // enable/disable use of memcached
+ var $_enableMemcached = false;
// contentOffsetDirTo
var $_contentOffsetDir = "1048576";
// Maximum number of sub-directories per parent directory
@@ -706,6 +708,7 @@ class Settings { /* {{{ */
$this->_partitionSize = strval($tab["partitionSize"]);
$this->_maxUploadSize = strval($tab["maxUploadSize"]);
$this->_enableXsendfile = Settings::boolVal($tab["enableXsendfile"]);
+ $this->_enableMemcached = Settings::boolVal($tab["enableMemcached"]);
// XML Path: /configuration/system/authentication
$node = $xml->xpath('/configuration/system/authentication');
@@ -1124,6 +1127,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "partitionSize", $this->_partitionSize);
$this->setXMLAttributValue($node, "maxUploadSize", $this->_maxUploadSize);
$this->setXMLAttributValue($node, "enableXsendfile", $this->_enableXsendfile);
+ $this->setXMLAttributValue($node, "enableMemcached", $this->_enableMemcached);
// XML Path: /configuration/system/authentication
$node = $this->getXMLNode($xml, '/configuration/system', 'authentication');
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index ee23cd6e6..6e520b96f 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -56,7 +56,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initStorage'])) {
$dms = new SeedDMS_Core_DMS($db, $storage ? $storage : $settings->_contentDir.$settings->_contentOffsetDir);
-if(extension_loaded('memcached')) {
+if($settings->_enableMemcached && extension_loaded('memcached')) {
$memcache = new Memcached('seeddms');
$memcache->addServers(array(
array('localhost',11211),
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index abdaf04e7..7dc457af0 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -1100,7 +1100,9 @@ function getMandatoryReviewers($folder, $document, $user) { /* {{{ */
foreach($groups as $group) {
$managers = $group->getManagers();
foreach($managers as $manager) {
- $revi[] = $manager->getId();
+ /* Do not add myself, if I'm the manager of the group */
+ if($manager->getId() != $user->getId())
+ $revi[] = $manager->getId();
}
}
}
@@ -1195,7 +1197,9 @@ function getMandatoryApprovers($folder, $document, $user) { /* {{{ */
foreach($groups as $group) {
$managers = $group->getManagers();
foreach($managers as $manager) {
- $appi[] = $manager->getId();
+ /* Do not add myself, if I'm the manager of the group */
+ if($manager->getId() != $user->getId())
+ $appi[] = $manager->getId();
}
}
}
diff --git a/index.php b/index.php
index bf780ef9a..5fe1d480c 100644
--- a/index.php
+++ b/index.php
@@ -44,32 +44,9 @@ if(true) {
$containerBuilder = new \DI\ContainerBuilder();
$c = $containerBuilder->build();
- /*
- $c['notFoundHandler'] = function ($c) use ($settings, $dms) {
- return function ($request, $response) use ($c, $settings, $dms) {
- $uri = $request->getUri();
- if($uri->getBasePath())
- $file = $uri->getPath();
- else
- $file = substr($uri->getPath(), 1);
- if(file_exists($file) && is_file($file)) {
- $_SERVER['SCRIPT_FILENAME'] = basename($file);
-// include($file);
- exit;
- }
- if($request->isXhr()) {
- exit;
- }
-// print_r($request->getUri());
-// exit;
- return $c['response']
- ->withStatus(302)
- ->withHeader('Location', isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_httpRoot.$settings->_siteDefaultPage : $settings->_httpRoot."out/out.ViewFolder.php");
- };
- };
- */
AppFactory::setContainer($c);
$app = AppFactory::create();
+
/* put lots of data into the container, because if slim instanciates
* a class by itself (with the help from the DI container), it will
* pass the container to the constructor of the instanciated class.
@@ -91,12 +68,8 @@ if(true) {
}
}
- $app->get('/', function($request, $response) {
- return $response
- ->withHeader('Location', '/out/out.ViewFolder.php')
- ->withStatus(302);
+ $app->addErrorMiddleware(false, true, true);
- });
if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
if (method_exists($hookObj, 'addRoute')) {
@@ -107,20 +80,13 @@ if(true) {
}
}
- /*
- $app->get('/out/[{path:.*}]', function($request, $response, $path = null) use ($app) {
- $uri = $request->getUri();
- if($uri->getBasePath())
- $file = $uri->getPath();
- else
- $file = substr($uri->getPath(), 1);
- if(file_exists($file) && is_file($file)) {
- $_SERVER['SCRIPT_FILENAME'] = basename($file);
- include($file);
- exit;
- }
+ /* Catch all route */
+ $app->get('/{path:.*}', function($request, $response) {
+ return $response
+ ->withHeader('Location', '/out/out.ViewFolder.php')
+ ->withStatus(302);
+
});
- */
$app->run();
} else {
diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 0036e8ad6..d7b26d872 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1683,6 +1683,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'تمكين تحميل الملفات الكبيرة',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'تمكين مهام القائمة',
'settings_enableMenuTasks_desc' => 'تمكين مهام القائمة',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 2fec078d0..69dd99be8 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1525,6 +1525,8 @@ $text = array(
'settings_enableLargeFileUpload_desc' => 'Ако е включено, качване на файлове е дустъпно и чрез джава-аплет, именован jumploader, без лимит за размер на файла. Това също ще позволи да се качват няколко файла наведнъж.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 2c7a40dc3..ba7301b4c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1530,6 +1530,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => '',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 7929d6c50..6a2a9920b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1755,6 +1755,8 @@ Jméno: [username]
'settings_enableLargeFileUpload_desc' => 'Je-li nastaveno, nahrávání souborů je také k dispozici prostřednictvím java appletu s názvem jumploader bez omezení velikosti souboru nastaveného prohlížečem. Umožňuje také nahrát několik souborů v jednom kroku.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Povolit seznam úkolů v nabídce',
'settings_enableMenuTasks_desc' => 'Aktivovat / Zakázat položku nabídky, která obsahuje všechny úkoly pro uživatele. Obsahuje dokumenty, které musí být přezkoumány, schváleny atd.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0ca34aff7..f12e0d09a 100644
--- a/languages/de_DE/lang.inc
+++ b/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 (3433), dgrutsch (22)
+// Translators: Admin (3435), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@@ -2146,6 +2146,8 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
'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. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.',
'settings_enableLoginByEmail' => 'Anmeldung mit E-Mail erlauben',
'settings_enableLoginByEmail_desc' => 'Wenn eingeschaltet, dann ist auch die Anmeldung mit der E-Mail-Adresse möglich. Die Anmeldung mit dem Benutzername bleibt weiterhin möglich. Diese Einstellung wird möglicherweise nicht von allen Authentifizierungsmethoden berücksichtigt. Da die E-Mail nicht eindeutig ist, kann die Identifikation fehlschagen, auch wenn das Password aus Sicht des anmeldenen Benutzers korrekt ist.',
+'settings_enableMemcached' => 'Memcached verwenden',
+'settings_enableMemcached_desc' => 'Verwendet intern memcached, um einige Datenbankoperationen zu beschleunigen und sollte nicht im Produktionsbetrieb eingeschaltet werden.',
'settings_enableMenuTasks' => 'Aufgabenliste im Menü',
'settings_enableMenuTasks_desc' => 'Ein-/Ausschalten des Menüeintrags, der anstehenden Aufgaben des Benutzers enthält. Diese Liste beinhaltet Dokumente die geprüft, freigegeben, usw. werden müssen.',
'settings_enableMenuTransmittals' => 'Dokumentenlisten im Menü',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 14fbed705..6f88ba684 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -1536,6 +1536,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => '',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 51baa5b59..35724942d 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/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 (2531), archonwang (3), dgrutsch (9), netixw (14)
+// Translators: Admin (2533), archonwang (3), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@@ -2148,6 +2148,8 @@ If you did not receive a password, please use the password forgotten function on
'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. Turning this on will turn off http only cookies.',
'settings_enableLoginByEmail' => 'Enable login by email',
'settings_enableLoginByEmail_desc' => 'If enabled, the user maya also use the email address for login. This will not disable login with the username. This setting may not be regarded by all authentication methods. Because the email is not unique, authentication may fail, even if the user enters a right password.',
+'settings_enableMemcached' => 'Use memcached (experimental)',
+'settings_enableMemcached_desc' => 'Use memcached for accelerating some database operations. This should not be be turned on in production.',
'settings_enableMenuTasks' => 'Enable task list in menu',
'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
'settings_enableMenuTransmittals' => 'Enable transmittals in menu',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 10b6a45c8..bd0006183 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1706,6 +1706,8 @@ URL: [url]',
'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_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Activar en el menú la lista de tareas',
'settings_enableMenuTasks_desc' => 'Habilita/Deshabillita la parte del menú que contiene todas las tareas para el usuario. Contiene documentos que necesitan ser revisados, aprobados, etc.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a5132814b..48f7fcd92 100644
--- a/languages/fr_FR/lang.inc
+++ b/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 (1173), jeromerobert (50), lonnnew (9), Oudiceval (1171)
+// Translators: Admin (1175), jeromerobert (50), lonnnew (9), Oudiceval (1171)
$text = array(
'2_factor_auth' => 'Authentification forte',
@@ -2093,6 +2093,8 @@ Nom : [username]
'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_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Activer le menu des tâches',
'settings_enableMenuTasks_desc' => 'Affiche un menu avec la liste des tâches. Cette liste contient les documents en attente d’une action par l’utilisateur.',
'settings_enableMenuTransmittals' => '',
@@ -2684,7 +2686,7 @@ URL : [url]',
'type_to_filter' => 'Filtrer dans la liste',
'type_to_search' => 'Effectuer une recherche',
'uk_UA' => 'Ukrénien',
-'undefined' => '',
+'undefined' => 'indéfini',
'under_folder' => 'Dans le dossier',
'unknown_attrdef' => 'Définition d’attribut inconnue',
'unknown_command' => 'Commande non reconnue.',
@@ -2703,7 +2705,7 @@ URL : [url]',
'unlock_cause_locking_user' => 'Vous pouvez encore le mettre à jour, car vous êtes le seul à l\'avoir verrouillé. Le verrouillage sera automatiquement annulé.',
'unlock_document' => 'Déverrouiller',
'update' => 'Mettre à jour',
-'updated' => '',
+'updated' => 'mis à jour',
'updated_documents' => '',
'update_approvers' => 'Mettre à jour la liste des approbateurs',
'update_document' => 'Mettre à jour',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 4d918fdf6..726d24f6e 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -1719,6 +1719,8 @@ Internet poveznica: [url]',
'settings_enableLargeFileUpload_desc' => 'Ako je postavljeno, učitavanje datoteke je također dostupno kroz Java aplet naziva "jumploader" bez postavljenog ograničenja veličine datoteke od strane pretraživača. To također omogućuje učitavanje nekoliko datoteka u jednom koraku. Uključivanjem ovoga isključit će se samo http kolačići.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Omogućavanje liste zadataka u izborniku',
'settings_enableMenuTasks_desc' => 'Omogućavanje/onemogućavanje stavke izbornika koja sadrži sve zadatke za korisnika. Ovo sadrži dokumente koji trebaju biti revidirani, odobreni itd.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f01240cdf..28e05914b 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1696,6 +1696,8 @@ URL: [url]',
'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_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Feladatok menüpont engedélyezése',
'settings_enableMenuTasks_desc' => 'Engedélyezi / letiltja a menüelemet, amely a felhasználó összes feladatát tartalmazza. Ez olyan dokumentumokat tartalmaz, amelyeket felül kell vizsgálni, jóvá kell hagyni stb.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index f57c3ff39..4ca2c9af1 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/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 (485), atoz-chevara (835)
+// Translators: Admin (489), atoz-chevara (835)
$text = array(
'2_factor_auth' => '',
@@ -382,7 +382,7 @@ URL: [url]',
'dashboard' => '',
'databasesearch' => 'Pencarian Basis data',
'database_schema_version' => 'Versi skema basis data',
-'data_loading' => '',
+'data_loading' => 'Harap tunggu, data sedang disiapkan.',
'date' => 'Tanggal',
'days' => 'hari',
'debug' => 'Debug',
@@ -689,7 +689,7 @@ URL: [url]',
'empty_notify_list' => 'Tidak ada entri',
'enable_extension' => 'Aktifkan ekstensi',
'enddate' => '',
-'en_GB' => '',
+'en_GB' => 'Inggris (GB)',
'equal_transition_states' => 'Status awal dan akhir sama',
'error' => 'Galat',
'error_add_aro' => 'Kesalahan saat menambahkan objek permintaan akses',
@@ -965,7 +965,7 @@ URL: [url]',
'index_processing' => '',
'index_waiting' => 'Mengunggu',
'individuals' => 'Perorangan',
-'individuals_in_groups' => '',
+'individuals_in_groups' => 'Anggota di grup',
'ind_review_removed' => 'Perubahan status, karena ulasan pengguna [name] telah dihapus.',
'info_recipients_tab_not_released' => '',
'info_rm_user_from_processes_none' => '',
@@ -1786,6 +1786,8 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
'settings_enableLargeFileUpload_desc' => 'Jika disetel, unggah berkas juga tersedia melalui java applet yang disebut jumploader tanpa batas ukuran berkas yang ditetapkan oleh peramban. Ini juga memungkinkan untuk mengunggah beberapa berkas dalam satu langkah. Mengaktifkan ini akan mematikan cookie http saja.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Aktifkan daftar task di menu',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 7186a045d..a14a9b3f4 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1742,6 +1742,8 @@ Name: [username]
'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù',
'settings_enableMenuTasks_desc' => 'Abilita/disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index b71a5cf17..d77801260 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1713,6 +1713,8 @@ URL : [url]',
'settings_enableLargeFileUpload_desc' => '설정하면, 브라우저가 설정 한 파일 크기 제한없이 jumploader라는 파일 업로드 자바 애플릿을 통해 사용할 수 있습니다. 또한 한 번에 여러 파일을 업로드 할 수 있습니다.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '메뉴의 작업 목록 허용',
'settings_enableMenuTasks_desc' => '사용자의 모든 작업이 포함되어있는 메뉴 항목을 활성/비활성 합니다. 이것은 검토, 승인등이 필요한 문서를 포함 합니다',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index ce3f7705a..32ffdf505 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -1739,6 +1739,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'ການຕັ້ງຄ່າອັບໂຫລດໄຟລຈະມີໃຫ້ບໍລິການຜ່ານທາງດ້ານຂວາຂອງເອັບເຟັກທີ່ເອີ້ນວ່າ jumploader ໂດຍບໍ່ມີຂິດຈຳກັດຂອງຂະໜາດໄຟລທີກຳນົດໂດຍບາວເຊີ ນອກຈາກນີຍັງຊ່ວຍໃນການອັບໂຫລດໄຟລຫຼາຍໄຟລໃນຂັນຕອນດຽວການເປີດຄຸນລັກສະນະນີ້ຈະປິດຄຸກກີ້ສະເພາະ Http ເທົ່ານັ້ນ',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'ເປີດການໄຊ້ງານ',
'settings_enableMenuTasks_desc' => 'ເປີດ/ປິດ ລາຍການເມນູທີ່ມີວຽກທັງໝົດສຳລັບຜູ້ໄຊ້ເອກະສານນີ້ມີເອກະສານທີຈ້ອງໄດ້ຮັບການກວດສອບ',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 4c6da3e96..b85063e86 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -1752,6 +1752,8 @@ Bruker: [username]
'settings_enableLargeFileUpload_desc' => 'Hvis det er satt, er filopplasting også tilgjengelig via en java-applet som heter jumploader uten en filstørrelsesgrense som er angitt av nettleseren. Det gjør det også mulig å laste opp flere filer på ett trinn. Hvis du slår på dette, slås bare av cookies.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Aktiver oppgaveliste i menyen',
'settings_enableMenuTasks_desc' => 'Aktiver/deaktiver menypunktet som inneholder alle oppgaver for brukeren. Denne inneholder dokumenter som må gjennomgås, godkjennes osv.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index f5c604927..06e7b1513 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1751,6 +1751,8 @@ Name: [username]
'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Menu-taken aanzetten',
'settings_enableMenuTasks_desc' => 'Menu-taken aanzetten',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 8bdd509bd..c30be33a3 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1682,6 +1682,8 @@ Name: [username]
'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy bez limitu rozmiaru plików. Aplet pozwala również na wczytywanie wielu plików jednocześnie.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Włącz listę zadań w menu',
'settings_enableMenuTasks_desc' => 'Włącza/Wyłącza pozycję w menu w której znajdują się wszystkie zadania dla użytkownika. Zawiera dokumenty, które potrzebują być ocenione, zatwierdzone, itd.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 0aecf194a..e4ccc69b8 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1758,6 +1758,8 @@ Nome: [username]
'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_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Ativar lista de tarefas no menu',
'settings_enableMenuTasks_desc' => 'Ativar / desativar o item de menu que contém todas as tarefas do usuário. Contém documentos que precisam ser revisados, aprovados etc.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 6d6df45f2..1c71319c6 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1720,6 +1720,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 3f6485a2d..ee185d1ed 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1727,6 +1727,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Включить список задач в меню',
'settings_enableMenuTasks_desc' => 'Включить/отключить пункт меню, который содержит все задачи пользователя. Там содержатся документы, которые нуждаются в рецензии, утверждении и т.д.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 2ad5de322..b813c91bc 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1760,6 +1760,8 @@ Meno: [username]
'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. Turning this on will turn off http only cookies.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Enable task list in menu',
'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 855648274..6485b5f10 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -1733,6 +1733,8 @@ Kommentar: [comment]',
'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_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Aktivera uppgiftslista i menyn',
'settings_enableMenuTasks_desc' => 'Aktiverar ett menyobjekt som visar användarens uppgifter, såsom dokument som behöver granskas eller godkännas.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 66856745c..8c104fe63 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1697,6 +1697,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '',
'settings_enableMenuTasks_desc' => '',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 2c586a27f..f55436cc5 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1719,6 +1719,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне також через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => 'Включити список завдань в меню',
'settings_enableMenuTasks_desc' => 'Включити/відключити пункт меню, який містить всі завдання користувача. Там містяться документи, які потребують рецензії, затвердження і т.ін.',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 4505f5c79..e043538a4 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1707,6 +1707,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => '如果设置了文件上传，也可以通过一个名为jumploader的浏览器java小程序来实现文件上传。它还允许一次上传多个文件。打开此选项将关闭网页cookie。',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '在菜单中启用任务列表',
'settings_enableMenuTasks_desc' => '启用/禁用包含用户所有任务的菜单项。其中包含需要审核、批准的文件等。',
'settings_enableMenuTransmittals' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 2f04097e8..f10508d96 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1758,6 +1758,8 @@ URL: [url]',
'settings_enableLargeFileUpload_desc' => '如果設置了該選項，則還可以通過一個名為Jumploader的Java小程序來上傳文件，而瀏覽器沒有設置文件大小限制。它還允許一步上傳幾個文件。啟用此功能將關閉僅HTTP cookie。',
'settings_enableLoginByEmail' => '',
'settings_enableLoginByEmail_desc' => '',
+'settings_enableMemcached' => '',
+'settings_enableMemcached_desc' => '',
'settings_enableMenuTasks' => '在菜單中啟用任務列表',
'settings_enableMenuTasks_desc' => '啟用/禁用包含用戶所有任務的菜單項。其中包含需要審查，批准等的文件。',
'settings_enableMenuTransmittals' => '',
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 40420a36b..f7c797d39 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -199,6 +199,7 @@ if ($action == "saveSettings")
setStrValue("partitionSize"); // TODO: check if valid value, e.g. 1M or 5K
setStrValue("maxUploadSize"); // TODO: check if valid value, e.g. 1M or 5K
setBoolValue("enableXsendfile");
+ setBoolValue("enableMemcached");
// SETTINGS - SYSTEM - AUTHENTICATION
setBoolValue("enableGuestLogin");
diff --git a/out/out.Search.php b/out/out.Search.php
index 72d71b28c..a456b6e0b 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -52,6 +52,10 @@ $includecontent = false;
if (isset($_GET["includecontent"]) && $_GET["includecontent"])
$includecontent = true;
+$skipdefaultcols = false;
+if (isset($_GET["skipdefaultcols"]) && $_GET["skipdefaultcols"])
+ $skipdefaultcols = true;
+
$newowner = null;
if (isset($_GET["newowner"]) && is_numeric($_GET["newowner"]) && $_GET['newowner'] > 0) {
$newowner = $dms->getUser((int) $_GET['newowner']);
@@ -772,6 +776,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('accessobject', $accessop);
$view->setParam('query', $query);
$view->setParam('includecontent', $includecontent);
+ $view->setParam('skipdefaultcols', $skipdefaultcols);
$view->setParam('marks', isset($_GET['marks']) ? $_GET['marks'] : array());
$view->setParam('newowner', $newowner);
$view->setParam('newreviewer', $newreviewer);
diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php
index 549c94c23..da627df17 100644
--- a/views/bootstrap/class.Charts.php
+++ b/views/bootstrap/class.Charts.php
@@ -273,7 +273,7 @@ $(document).ready( function() {
$this->contentContainerEnd();
$this->columnEnd();
- if(in_array($type, array('docspermonth', 'docsaccumulated'))) {
+ if(in_array($type, array('sizepermonth', 'docspermonth', 'docsaccumulated'))) {
$this->columnStart(9);
} else {
$this->columnStart(6);
@@ -354,7 +354,7 @@ $(document).ready( function() {
echo "";
$this->columnEnd();
- if(!in_array($type, array('docspermonth', 'docsaccumulated'))) {
+ if(!in_array($type, array('sizepermonth', 'docspermonth', 'docsaccumulated'))) {
$this->columnStart(3);
$this->contentHeading(getMLText('legend'));
$this->contentContainerStart('', 'legend');
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index d144715ae..caeaa4fba 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -57,7 +57,7 @@ $(document).ready( function() {
$('#export').on('click', function(ev) {
ev.preventDefault();
ev.stopPropagation();
- var url = $(this).attr('href')+'&includecontent='+($('#includecontent').prop('checked') ? '1' : '0');
+ var url = $(this).attr('href')+'&includecontent='+($('#includecontent').prop('checked') ? '1' : '0')+'&skipdefaultcols='+($('#skipdefaultcols').prop('checked') ? '1' : '0');
var values = {};
$('input[name^=\"marks\"]').each(function() {
if(this.checked)
@@ -225,10 +225,12 @@ $(document).ready(function() {
$user = $this->params['user'];
$entries = $this->params['searchhits'];
$includecontent = $this->params['includecontent'];
+ $skipdefaultcols = $this->params['skipdefaultcols'];
$marks = $this->params['marks'];
include("../inc/inc.ClassDownloadMgr.php");
$downmgr = new SeedDMS_Download_Mgr();
+ $downmgr->skipDefaultCols($skipdefaultcols);
if($extraheader = $this->callHook('extraDownloadHeader'))
$downmgr->addHeader($extraheader);
foreach($entries as $entry) {
@@ -1506,6 +1508,16 @@ $(document).ready(function() {
'value'=>1,
)
);
+ $this->formField(
+ getMLText("skip_default_export_cols"),
+ array(
+ 'element'=>'input',
+ 'type'=>'checkbox',
+ 'name'=>'skipdefaultcols',
+ 'id'=>'skipdefaultcols',
+ 'value'=>1,
+ )
+ );
//$this->formSubmit(" ".getMLText('export'));
print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), " ".getMLText("batch_export"), false, true)."\n";
$content = ob_get_clean();
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 45867ca2e..90d4cc404 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -547,6 +547,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
showConfigText('settings_partitionSize', 'partitionSize'); ?>
showConfigText('settings_maxUploadSize', 'maxUploadSize'); ?>
showConfigCheckbox('settings_enableXsendfile', 'enableXsendfile'); ?>
+showConfigCheckbox('settings_enableMemcached', 'enableMemcached'); ?>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 9ce6b2d73..59e3492a6 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -604,10 +604,12 @@ console.log(element);
$tmp = array();
foreach($approvalStatus as $r) {
if($r['type'] == 1) {
- if(!in_array($r['required'], $mapprovers['g']))
+ if($mapprovers) {
+ if(!in_array($r['required'], $mapprovers['g']))
+ $tmp[] = $r['required'];
+ } else {
$tmp[] = $r['required'];
- } else {
- $tmp[] = $r['required'];
+ }
}
}
$fieldwrap = array('', '');