Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -40,6 +40,7 @@
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
 - fix strict standard error in SeedDMS_Lucene (Closes #263)
+- fix sql statements, because the didn't work for mysql 5.7.5 anymore (Closes #273)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26

SeedDMS_Core/Core/inc.DBAccessPDO.php

@@ -308,7 +308,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (PRIMARY KEY (`reviewID`), INDEX (`maxLogID`)) ".
@@ -316,7 +316,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttreviewid) {
 				if (!$this->getResult($queryStr))
@@ -341,7 +341,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (PRIMARY KEY (`approveID`), INDEX (`maxLogID`)) ".
@@ -349,7 +349,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttapproveid) {
 				if (!$this->getResult($queryStr))
@@ -374,7 +374,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (PRIMARY KEY (`statusID`), INDEX (`maxLogID`)) ".
@@ -382,7 +382,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttstatid) {
 				if (!$this->getResult($queryStr))

SeedDMS_Core/package.xml

@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+- all changes from 4.3.27 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

SeedDMS_Preview/Preview/Previewer.php

@@ -72,16 +72,17 @@ class SeedDMS_Preview_Previewer {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
-			$read = array($pipes[1]);
-			$write = NULL;
-			$exeptions = NULL;
 			stream_select($read, $write, $exeptions, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
 													}
+			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
  
 		if ($timeleft <= 0) {

SeedDMS_Preview/package.xml

@@ -24,8 +24,9 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 add more documentation
-finished deletePreview()
+finish deletePreview()
 add new method deleteDocumentPreviews()
+fix calculation of timeout (Bug #269)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php

@@ -44,14 +44,17 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
-			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
 													}
+			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
  
 		if ($timeleft <= 0) {

SeedDMS_SQLiteFTS/package.xml

@@ -14,7 +14,7 @@
  <date>2016-03-29</date>
  <time>08:09:48</time>
  <version>
-  <release>1.0.5</release>
+  <release>1.0.6</release>
   <api>1.0.1</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+fix calculation of timeout (see bug #269)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -146,5 +146,21 @@ add command for indexing postѕcript files
 make it work with sqlite3 &lt; 3.8.0
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:09:48</time>
+   <version>
+    <release>1.0.5</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>

languages/ca_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 (699)
+//    Translators: Admin (702)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -1195,7 +1195,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versió [version]:[status]',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',
 'to_before_from' => '',
@@ -1214,7 +1214,7 @@ URL: [url]',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
-'type_to_search' => '',
+'type_to_search' => 'Cerca',
 'uk_UA' => 'Ucraïnès',
 'under_folder' => 'A carpeta',
 'unknown_attrdef' => '',
@@ -1246,7 +1246,7 @@ URL: [url]',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
 'uploading_zerosize' => '',
-'used_discspace' => '',
+'used_discspace' => 'Espai utilitzat',
 'user' => 'Usuari',
 'users' => 'Usuaris',
 'users_and_groups' => '',

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: acabello (20), Admin (992), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (993), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -228,7 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleccione acción del flujo de trabajo',
 'choose_workflow_state' => 'Seleccione estado del flujo de trabajo',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Borrar cache',
 'clear_clipboard' => 'Limpiar portapapeles',
 'clear_password' => '',
 'clipboard' => 'Portapapeles',

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 (1030), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1032), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -228,7 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose une action de workflow',
 'choose_workflow_state' => 'Choisir un état de workflow',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Effacer le cache',
 'clear_clipboard' => 'Vider le presse-papier',
 'clear_password' => '',
 'clipboard' => 'Presse-papier',
@@ -236,7 +236,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
-'confirm_clear_cache' => '',
+'confirm_clear_cache' => 'Confirmer l\'effacement du cache',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de texte intégral!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',

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 (587), ribaz (1019)
+//    Translators: Admin (587), ribaz (1023)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -64,7 +64,7 @@ URL: [url]',
 'add_receipt' => '',
 'add_review' => 'Felülvizsgálat küldése',
 'add_revision' => '',
-'add_role' => '',
+'add_role' => 'szerepkör hozzáadása',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
 'add_to_transmittal' => '',
@@ -164,7 +164,7 @@ URL: [url]',
 'at_least_n_users_of_group' => 'Legalább [number_of_users] felhasználó a [group] csoportban',
 'august' => 'Augusztus',
 'authentication' => 'Hitelesítés',
-'author' => '',
+'author' => 'szerző',
 'automatic_status_update' => 'Automatikus állapot változás',
 'back' => 'Vissza',
 'backup_list' => 'Meglévő mentések listája',
@@ -365,7 +365,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Ellenőrző összeg beállítása',
 'do_object_setfilesize' => 'Állomány méret beállítása',
 'do_object_unlink' => 'Dokumentum verzió törlése',
-'draft' => '',
+'draft' => 'piszkozat',
 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
@@ -633,7 +633,7 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => 'Név',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
-'never' => '',
+'never' => 'soha',
 'new' => 'Új',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',

languages/it_IT/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 (1526), s.pnt (26)
+//    Translators: Admin (1527), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -234,7 +234,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleziona l\'azione del flusso di lavoro',
 'choose_workflow_state' => 'Seleziona lo stato del flusso di lavoro',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Pulisci cache',
 'clear_clipboard' => 'Cancella appunti',
 'clear_password' => '',
 'clipboard' => 'Appunti',

languages/pl_PL/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 (734), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (735), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -221,7 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Wybierz działanie procesu',
 'choose_workflow_state' => 'Wybierz stan obiegu',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Wyczyść cache',
 'clear_clipboard' => 'Oczyść schowek',
 'clear_password' => '',
 'clipboard' => 'Schowek',

languages/ru_RU/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 (1542)
+//    Translators: Admin (1543)
 
 $text = array(
 'accept' => 'Принять',
@@ -233,7 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Выберите действие процесса',
 'choose_workflow_state' => 'Выберите статус процесса',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Очистить кэш',
 'clear_clipboard' => 'Очистить буфер обмена',
 'clear_password' => '',
 'clipboard' => 'Буфер обмена',

languages/sk_SK/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 (494), destinqo (19)
+//    Translators: Admin (499), destinqo (19)
 
 $text = array(
 'accept' => 'Prijať',
@@ -242,7 +242,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
-'create_fulltext_index' => '',
+'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
 'cs_CZ' => 'Čestina',
@@ -410,7 +410,7 @@ URL: [url]',
 'fr_FR' => 'Francúzština',
 'fullsearch' => 'Fulltext index vyhľadávanie',
 'fullsearch_hint' => 'Použiť fulltext index',
-'fulltext_info' => '',
+'fulltext_info' => 'Informácie o fulltext indexe',
 'global_attributedefinitions' => 'Atribúty',
 'global_default_keywords' => 'Globálne kľúčové slová',
 'global_document_categories' => 'Kategórie',
@@ -1194,7 +1194,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Verzia [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
 'to_before_from' => '',
@@ -1207,7 +1207,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Prosím počkajte kým sa nahrá strom dokumentov...',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
@@ -1234,7 +1234,7 @@ URL: [url]',
 'update' => 'Aktualizovať',
 'update_approvers' => 'Aktualizovať zoznam schvaľovateľov',
 'update_document' => 'Aktualizovať',
-'update_fulltext_index' => '',
+'update_fulltext_index' => 'Aktualizovať fulltext index',
 'update_info' => 'Aktualizovať informácie',
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => '',

languages/tr_TR/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 (1037), aydin (83)
+//    Translators: Admin (1038), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -227,7 +227,7 @@ URL: [url]',
 'choose_workflow_action' => 'İş akış eylemi seçiniz',
 'choose_workflow_state' => 'İş akış durumunu seçiniz',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => 'Ön belleği temizle',
 'clear_clipboard' => 'Panoyu temizle',
 'clear_password' => '',
 'clipboard' => 'Pano',

languages/zh_CN/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 (634), fengjohn (5)
+//    Translators: Admin (635), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -210,7 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => '清除缓存',
 'clear_clipboard' => '清除粘贴板',
 'clear_password' => '',
 'clipboard' => '剪切板',

languages/zh_TW/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 (2360)
+//    Translators: Admin (2369)
 
 $text = array(
 'accept' => '接受',
@@ -155,7 +155,7 @@ URL: [url]',
 'backup_tools' => '備份工具',
 'between' => '時間段',
 'bg_BG' => '保加利亞語',
-'browse' => '',
+'browse' => '瀏覽',
 'calendar' => '日曆',
 'calendar_week' => '',
 'cancel' => '取消',
@@ -321,7 +321,7 @@ URL: [url]',
 'draft_pending_approval' => '待審核',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
-'dropfolder_file' => '',
+'dropfolder_file' => '檔案來源為 drop 目錄',
 'dropfolder_folder' => '',
 'dropupload' => '快速上傳',
 'drop_files_here' => '拖入這裡',
@@ -358,7 +358,7 @@ URL: [url]',
 'empty_notify_list' => '沒有條目',
 'en_GB' => '英語',
 'equal_transition_states' => '',
-'error' => '',
+'error' => '錯誤',
 'error_add_aro' => '',
 'error_add_permission' => '',
 'error_importfs' => '',
@@ -382,7 +382,7 @@ URL: [url]',
 'files' => '文件',
 'files_deletion' => '刪除檔',
 'files_deletion_warning' => '通過此操作，您可以刪除整個DMS(文檔管理系統)資料夾裡的所有檔.但版本資訊將被保留',
-'files_loading' => '',
+'files_loading' => '請稍候， 檔案讀取中',
 'file_size' => '文件大小',
 'filter_for_documents' => '',
 'filter_for_folders' => '',
@@ -437,7 +437,7 @@ URL: [url]',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
-'identical_version' => '',
+'identical_version' => '新版本的內容與舊版本完全相同',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
@@ -778,19 +778,19 @@ URL: [url]',
 'selection' => '選擇',
 'select_category' => '選中分類',
 'select_groups' => '點擊選擇組',
-'select_grp_approvers' => '',
+'select_grp_approvers' => '請點選審核人員群組',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
-'select_grp_reviewers' => '',
+'select_grp_reviewers' => '請點選校對人員群組',
 'select_grp_revisors' => '',
-'select_ind_approvers' => '',
+'select_ind_approvers' => '請點選單一的審核人',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => '',
+'select_ind_reviewers' => '請點選單一的校對人',
 'select_ind_revisors' => '',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',

restapi/index.php

@@ -461,6 +461,7 @@ function getDocument($id) { /* {{{ */
 				'date'=>$document->getDate(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'orig_filename'=>$lc->getOriginalFileName(),
 				'size'=>$lc->getFileSize(),
 				'keywords'=>htmlspecialchars($document->getKeywords()),
 			);