From b2163806ad3f741c2a103ad5876117d696d78bf7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:02:32 +0100 Subject: [PATCH 1/8] fix check of expiration date range --- op/op.Search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op/op.Search.php b/op/op.Search.php index d25941baf..bb6a16d75 100644 --- a/op/op.Search.php +++ b/op/op.Search.php @@ -276,7 +276,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { if(isset($_GET["expirationstart"]) && $_GET["expirationstart"]) { $tmp = explode("-", $_GET["expirationstart"]); - $expstartdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0); + $expstartdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0); if (!checkdate($expstartdate['month'], $expstartdate['day'], $expstartdate['year'])) { UI::exitError(getMLText("search"),getMLText("invalid_expiration_date_start")); } @@ -286,7 +286,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { } if(isset($_GET["expirationend"]) && $_GET["expirationend"]) { $tmp = explode("-", $_GET["expirationend"]); - $expstopdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0); + $expstopdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0); if (!checkdate($expstopdate['month'], $expstopdate['day'], $expstopdate['year'])) { UI::exitError(getMLText("search"),getMLText("invalid_expiration_date_end")); } From 4324970e72e336e3dfae9c86eb15eba92d3466d5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:06:33 +0100 Subject: [PATCH 2/8] add new key invalid_expiration_date_end and invalid_expiration_date_start --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 8 +++++--- languages/en_GB/lang.inc | 4 +++- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 2 ++ languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/uk_UA/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 23 files changed, 50 insertions(+), 4 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index eb0ac31f0..ee17e0ac5 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -493,6 +493,8 @@ URL: [url]', 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي', 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي', 'invalid_doc_id' => 'معرف مستند خاطىء', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'معرف ملف خاطىء', 'invalid_folder_id' => 'معرف مجلد خاطىء', 'invalid_group_id' => 'معرف مجموعة خاطىء', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 22f5c1ca1..71a3c9228 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -424,6 +424,8 @@ $text = array( 'invalid_create_date_end' => 'Неправилна крайна дата за диапазаона на датата на създаване', 'invalid_create_date_start' => 'Неправилна начална дата за диапазаона на датата на създаване', 'invalid_doc_id' => 'Неправилен идентификатор на документа', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Неправилен идентификатор на файла', 'invalid_folder_id' => 'Неправилен идентификатор на папка', 'invalid_group_id' => 'Неправилен идентификатор на група', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 1bda94213..69b65bc11 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -429,6 +429,8 @@ URL: [url]', 'invalid_create_date_end' => 'La data de final no és vàlida per a la creació de rangs de dates.', 'invalid_create_date_start' => 'La data d\'inici no és vàlida per a la creació de rangs de dates.', 'invalid_doc_id' => 'ID de document no vàlid', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'ID de fitxer no vàlid', 'invalid_folder_id' => 'ID de carpeta no vàlid', 'invalid_group_id' => 'ID de grup no vàlid', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 72d25b0e0..f133842cf 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -500,6 +500,8 @@ URL: [url]', 'invalid_create_date_end' => 'Neplatné koncové datum vytvoření.', 'invalid_create_date_start' => 'Neplatné počáteční datum vytvoření.', 'invalid_doc_id' => 'Neplatný ID dokumentu', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Nevalidní ID souboru', 'invalid_folder_id' => 'Neplatné ID adresáře', 'invalid_group_id' => 'Neplatné ID skupiny', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index ded32e88e..1587e26eb 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 (2132), dgrutsch (18) +// Translators: Admin (2136), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -502,9 +502,11 @@ URL: [url]', 'invalid_access_mode' => 'Unzulässige Zugangsart', 'invalid_action' => 'Unzulässige Aktion', 'invalid_approval_status' => 'Unzulässiger Freigabestatus', -'invalid_create_date_end' => 'Unzulässiges Enddatum für Erstellung des Datumsbereichs.', -'invalid_create_date_start' => 'Unzulässiges Startdatum für Erstellung des Datumsbereichs.', +'invalid_create_date_end' => 'Unzulässiges Erstellungsenddatum.', +'invalid_create_date_start' => 'Unzulässiges Erstellungsstartdatum.', 'invalid_doc_id' => 'Unzulässige Dokumentenidentifikation', +'invalid_expiration_date_end' => 'Unzulässiges Ablaufenddatum.', +'invalid_expiration_date_start' => 'Unzulässiges Ablaufstartdatum.', 'invalid_file_id' => 'Ungültige Datei-ID', 'invalid_folder_id' => 'Unzulässige Ordneridentifikation', 'invalid_group_id' => 'Unzulässige Gruppenidentifikation', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 9d127b038..8dcc8bb10 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 (1267), dgrutsch (3), netixw (14) +// Translators: Admin (1271), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -505,6 +505,8 @@ URL: [url]', 'invalid_create_date_end' => 'Invalid end date for creation date range.', 'invalid_create_date_start' => 'Invalid start date for creation date range.', 'invalid_doc_id' => 'Invalid Document ID', +'invalid_expiration_date_end' => 'Invalid end date for expiration date range.', +'invalid_expiration_date_start' => 'Invalid start date for expiration date range.', 'invalid_file_id' => 'Invalid file ID', 'invalid_folder_id' => 'Invalid Folder ID', 'invalid_group_id' => 'Invalid Group ID', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e97c3c0e4..af4ee1a06 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -500,6 +500,8 @@ URL: [url]', 'invalid_create_date_end' => 'Fecha de fin no válida para creación de rango de fechas.', 'invalid_create_date_start' => 'Fecha de inicio no válida para creación de rango de fechas.', 'invalid_doc_id' => 'ID de documento no válido', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'ID de fichero no válido', 'invalid_folder_id' => 'ID de carpeta no válido', 'invalid_group_id' => 'ID de grupo no válido', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 11f0dccdf..ddf6dff59 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -500,6 +500,8 @@ URL: [url]', 'invalid_create_date_end' => 'Date de fin invalide pour la plage de dates de création.', 'invalid_create_date_start' => 'Date de début invalide pour la plage de dates de création.', 'invalid_doc_id' => 'Identifiant de document invalide', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Identifiant de fichier invalide', 'invalid_folder_id' => 'Identifiant de dossier invalide', 'invalid_group_id' => 'Identifiant de groupe invalide', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index ef58ee5b9..ec87869d2 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -500,6 +500,8 @@ Internet poveznica: [url]', 'invalid_create_date_end' => 'Pogrešan krajnji datum za izradu vremenskog raspona.', 'invalid_create_date_start' => 'Pogrešan početni datum za izradu vremenskog raspona.', 'invalid_doc_id' => 'Pogrešan ID dokumenta', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Pogrešan ID datoteke', 'invalid_folder_id' => 'Pogrešan ID mape', 'invalid_group_id' => 'Pogrešan ID grupe', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index d30bde00e..04b774370 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -500,6 +500,8 @@ URL: [url]', 'invalid_create_date_end' => 'Érvénytelen befejezési dátum a létrehozási dátum tartományban.', 'invalid_create_date_start' => 'Érvénytelen kezdési dátum a létrehozási dátum tartományban.', 'invalid_doc_id' => 'Érvénytelen dokumentum azonosító', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Érvénytelen állomány azonosító', 'invalid_folder_id' => 'Érvénytelen mappa azonosító', 'invalid_group_id' => 'Érvénytelen csoport azonosító', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 7b28aaee5..0e143ad56 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -506,6 +506,8 @@ URL: [url]', 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale', 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale', 'invalid_doc_id' => 'ID del documento non valido', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'ID del file non valido', 'invalid_folder_id' => 'ID della cartella non valido', 'invalid_group_id' => 'ID del gruppo non valido', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index ec851dc45..609657764 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -505,6 +505,8 @@ URL: [url]', 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.', 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.', 'invalid_doc_id' => '잘못된 문서 ID', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => '잘못된 파일 ID', 'invalid_folder_id' => '잘못된 폴더 ID', 'invalid_group_id' => '잘못된 그룹 ID', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 96f5d4f77..d37e2a2ee 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -493,6 +493,8 @@ URL: [url]', 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.', 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.', 'invalid_doc_id' => 'Foutief Document ID', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Foutief Bestand ID', 'invalid_folder_id' => 'Foutief Map ID', 'invalid_group_id' => 'Foutief Groep ID', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 10d0fe6b9..9c231b59d 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -493,6 +493,8 @@ URL: [url]', 'invalid_create_date_end' => 'Nieprawidłowa data końcowa dla tworzenia przedziału czasowego.', 'invalid_create_date_start' => 'Nieprawidłowa data początkowa dla tworzenia przedziału czasowego.', 'invalid_doc_id' => 'Nieprawidłowy identyfikator dokumentu', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Nieprawidłowy identyfikator pliku', 'invalid_folder_id' => 'Nieprawidłowy identyfikator katalogu', 'invalid_group_id' => 'Nieprawidłowy identyfikator grupy', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 435b832d7..d073eaca2 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -499,6 +499,8 @@ URL: [url]', 'invalid_create_date_end' => 'Invalid end date for creation date range.', 'invalid_create_date_start' => 'Invalid start date for creation date range.', 'invalid_doc_id' => 'ID de documento inválida', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Invalid file ID', 'invalid_folder_id' => 'Invalid Folder ID', 'invalid_group_id' => 'Invalid Group ID', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 75058af72..160937857 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -505,6 +505,8 @@ URL: [url]', 'invalid_create_date_end' => 'Dată de încheiere invalidă pentru crearea intervalului de date.', 'invalid_create_date_start' => 'Dată de începere invalidă pentru crearea intervalului de date.', 'invalid_doc_id' => 'ID Document invalid', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'ID fisier invalid', 'invalid_folder_id' => 'ID Folder invalid', 'invalid_group_id' => 'ID Grup invalid', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 3aef2ccc5..2e65c4107 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -493,6 +493,8 @@ URL: [url]', 'invalid_create_date_end' => 'Неверная конечная дата диапазона даты создания', 'invalid_create_date_start' => 'Неверная начальная дата диапазона даты создания', 'invalid_doc_id' => 'Неверный идентификатор документа', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Неверный идентификатор файла', 'invalid_folder_id' => 'Неверный идентификатор каталога', 'invalid_group_id' => 'Неверный идентификатор группы', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index d7d3844f3..434a20df5 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -424,6 +424,8 @@ $text = array( 'invalid_create_date_end' => 'Neplatný koncový dátum vytvorenia.', 'invalid_create_date_start' => 'Neplatný počiatočný dátum vytvorenia.', 'invalid_doc_id' => 'Neplatný ID dokumentu', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Nesprávne ID súboru', 'invalid_folder_id' => 'Neplatný ID zložky', 'invalid_group_id' => 'Neplatný ID skupiny', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index a98cef938..2a410f5d3 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -493,6 +493,8 @@ URL: [url]', 'invalid_create_date_end' => 'Ogiltigt slutdatum för intervall.', 'invalid_create_date_start' => 'Ogiltigt startdatum för intervall.', 'invalid_doc_id' => 'Ogiltigt dokument-ID', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Ogiltigt fil-ID', 'invalid_folder_id' => 'Ogiltigt katalog-ID', 'invalid_group_id' => 'Ogiltigt grupp-ID', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index c4f7133f7..bcc37b9d2 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -499,6 +499,8 @@ URL: [url]', 'invalid_create_date_end' => 'Oluşturma tarih aralığı için geçersiz bitiş tarihi.', 'invalid_create_date_start' => 'Oluşturma tarih aralığı için geçersiz başlangıç tarihi.', 'invalid_doc_id' => 'Geçersiz Doküman ID', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Geçersiz dosya ID', 'invalid_folder_id' => 'Geçersiz Klasör ID', 'invalid_group_id' => 'Geçersiz Grup ID', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 039fe3f4d..040bb9220 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -505,6 +505,8 @@ URL: [url]', 'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення', 'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення', 'invalid_doc_id' => 'Невірний ідентифікатор документа', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => 'Невірний ідентифікатор файлу', 'invalid_folder_id' => 'Невірний ідентифікатор каталога', 'invalid_group_id' => 'Невірний ідентифікатор групи', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index f7dcc4bba..8eab54e07 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -430,6 +430,8 @@ URL: [url]', 'invalid_create_date_end' => '无效截止日期,不在创建日期范围内', 'invalid_create_date_start' => '无效开始日期,不在创建日期范围内', 'invalid_doc_id' => '无效文档ID号', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => '无效文件ID号', 'invalid_folder_id' => '无效文件夹ID号', 'invalid_group_id' => '无效组别ID号', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index d56396ffc..2d47b3ade 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -428,6 +428,8 @@ URL: [url]', 'invalid_create_date_end' => '無效截止日期,不在創建日期範圍內', 'invalid_create_date_start' => '無效開始日期,不在創建日期範圍內', 'invalid_doc_id' => '無效文檔ID號', +'invalid_expiration_date_end' => '', +'invalid_expiration_date_start' => '', 'invalid_file_id' => '無效檔ID號', 'invalid_folder_id' => '無效資料夾ID號', 'invalid_group_id' => '無效組別ID號', From 9c2928a60fb2d21b5e1620467880796990003561 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:06:55 +0100 Subject: [PATCH 3/8] fix error message when creation date was wrong --- op/op.Search.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/op/op.Search.php b/op/op.Search.php index bb6a16d75..ae887c6c4 100644 --- a/op/op.Search.php +++ b/op/op.Search.php @@ -247,10 +247,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { $startdate = array('year'=>$_GET["createstartyear"], 'month'=>$_GET["createstartmonth"], 'day'=>$_GET["createstartday"], 'hour'=>0, 'minute'=>0, 'second'=>0); } if ($startdate && !checkdate($startdate['month'], $startdate['day'], $startdate['year'])) { - UI::htmlStartPage(getMLText("search_results")); - UI::contentContainer(getMLText("invalid_create_date_start")); - UI::htmlEndPage(); - exit; + UI::exitError(getMLText("search"),getMLText("invalid_create_date_end")); } if(isset($_GET["createend"])) { $tmp = explode("-", $_GET["createend"]); @@ -260,10 +257,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { $stopdate = array('year'=>$_GET["createendyear"], 'month'=>$_GET["createendmonth"], 'day'=>$_GET["createendday"], 'hour'=>23, 'minute'=>59, 'second'=>59); } if ($stopdate && !checkdate($stopdate['month'], $stopdate['day'], $stopdate['year'])) { - UI::htmlStartPage(getMLText("search_results")); - UI::contentContainer(getMLText("invalid_create_date_end")); - UI::htmlEndPage(); - exit; + UI::exitError(getMLText("search"),getMLText("invalid_create_date_end")); } $expstartdate = array(); From 5200057e19e85114e3faf30358acf29070f8eeae Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:08:30 +0100 Subject: [PATCH 4/8] fix another error message --- op/op.Search.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/op/op.Search.php b/op/op.Search.php index ae887c6c4..688d2b55b 100644 --- a/op/op.Search.php +++ b/op/op.Search.php @@ -214,7 +214,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { $startFolder = $dms->getFolder($targetid); } if (!is_object($startFolder)) { - UI::exitError(getMLText("search_results"),getMLText("invalid_folder_id")); + UI::exitError(getMLText("search"),getMLText("invalid_folder_id")); } // Check to see if the search has been restricted to a particular @@ -223,10 +223,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) { if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) { $owner = $dms->getUser($_GET["ownerid"]); if (!is_object($owner)) { - UI::htmlStartPage(getMLText("search_results")); - UI::contentContainer(getMLText("unknown_owner")); - UI::htmlEndPage(); - exit; + UI::exitError(getMLText("search"),getMLText("unknown_owner")); } } From b47bea3accf12e0639d700b0b48b4097ce18f0ca Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:34:39 +0100 Subject: [PATCH 5/8] add key timeline_selected_item --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/en_GB/lang.inc | 3 ++- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 1 + languages/hu_HU/lang.inc | 1 + languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/nl_NL/lang.inc | 1 + languages/pl_PL/lang.inc | 1 + languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 1 + languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 1 + languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 23 files changed, 25 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index ee17e0ac5..be6e9379a 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -1231,6 +1231,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 71a3c9228..e172da925 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -1096,6 +1096,7 @@ $text = array( 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 69b65bc11..bf9f868fc 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -1101,6 +1101,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index f133842cf..e2afe51b3 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -1240,6 +1240,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 1587e26eb..4ee360ab8 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 (2136), dgrutsch (18) +// Translators: Admin (2137), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -1260,6 +1260,7 @@ URL: [url]', 'timeline_full_add_file' => '[document]
Neuer Anhang', 'timeline_full_add_version' => '[document]
Neue Version [version]', 'timeline_full_status_change' => '[document]
Version [version]: [status]', +'timeline_selected_item' => 'Ausgewähltes Dokument', 'timeline_skip_add_file' => 'Anhang hinzugefügt', 'timeline_skip_status_change_-1' => 'abgelehnt', 'timeline_skip_status_change_-3' => 'abgelaufen', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 8dcc8bb10..572677476 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 (1271), dgrutsch (3), netixw (14) +// Translators: Admin (1272), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -1267,6 +1267,7 @@ URL: [url]', 'timeline_full_add_file' => '[document]
New Attachment', 'timeline_full_add_version' => '[document]
New version [version]', 'timeline_full_status_change' => '[document]
Version [version]: [status]', +'timeline_selected_item' => 'Selected document', 'timeline_skip_add_file' => 'attachment added', 'timeline_skip_status_change_-1' => 'rejected', 'timeline_skip_status_change_-3' => 'expired', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index af4ee1a06..1430f2f81 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -1246,6 +1246,7 @@ URL: [url]', 'timeline_full_add_file' => '[document
nuevo anexo', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '[document]
Versión [version]: [status]', +'timeline_selected_item' => '', 'timeline_skip_add_file' => 'anexos agregados', 'timeline_skip_status_change_-1' => 'rechazado', 'timeline_skip_status_change_-3' => 'expirado', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index ddf6dff59..d8dd07f73 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -1222,6 +1222,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index ec87869d2..6b93b1e27 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -1252,6 +1252,7 @@ Internet poveznica: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 04b774370..cb1416ba9 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -1245,6 +1245,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 0e143ad56..88e83a379 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -1269,6 +1269,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 609657764..c5c65534d 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -1260,6 +1260,7 @@ URL : [url]', 'timeline_full_add_file' => '[document]
새로운 첨부', 'timeline_full_add_version' => '[document]
새버전 [version]', 'timeline_full_status_change' => '[document]
버전[version]: [status]', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다', 'timeline_skip_status_change_-1' => '거부', 'timeline_skip_status_change_-3' => '만료', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d37e2a2ee..acc487a64 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -1237,6 +1237,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 9c231b59d..18ebb746c 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1225,6 +1225,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index d073eaca2..bca443f9f 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -1243,6 +1243,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 160937857..634b719b7 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -1268,6 +1268,7 @@ URL: [url]', 'timeline_full_add_file' => '[document]
Adaugă atașament', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '[document] Versiune [version]: [status]', +'timeline_selected_item' => '', 'timeline_skip_add_file' => 'atașament adăugat', 'timeline_skip_status_change_-1' => 'rejectat', 'timeline_skip_status_change_-3' => 'expirat', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 2e65c4107..ccac6a60a 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -1236,6 +1236,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 434a20df5..5d5b7ae12 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -1096,6 +1096,7 @@ $text = array( 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 2a410f5d3..aa018dd89 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -1231,6 +1231,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index bcc37b9d2..74926dff0 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -1247,6 +1247,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => 'ek eklendi', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 040bb9220..ef193edab 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -1258,6 +1258,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 8eab54e07..bb7a97e9c 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -1102,6 +1102,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 2d47b3ade..a39cb9fc0 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -1100,6 +1100,7 @@ URL: [url]', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', +'timeline_selected_item' => '', 'timeline_skip_add_file' => '', 'timeline_skip_status_change_-1' => '', 'timeline_skip_status_change_-3' => '', From 6d16946a19db5bbece4d8d325cd39c42d9bb66a1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 08:35:06 +0100 Subject: [PATCH 6/8] show more information of selected document --- out/out.Timeline.php | 8 ++++++++ views/bootstrap/class.Timeline.php | 26 +++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/out/out.Timeline.php b/out/out.Timeline.php index baea15a38..6eab82918 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -23,6 +23,11 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); +/** + * Include class to preview documents + */ +require_once("SeedDMS/Preview.php"); + if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } @@ -65,6 +70,9 @@ if($view) { $view->setParam('skip', $skip); $view->setParam('document', $document); $view->setParam('version', $content); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('previewWidthDetail', $settings->_previewWidthDetail); $view($_GET); exit; } diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php index 0845edacf..68e634b18 100644 --- a/views/bootstrap/class.Timeline.php +++ b/views/bootstrap/class.Timeline.php @@ -39,9 +39,33 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style { function iteminfo() { /* {{{ */ $dms = $this->params['dms']; $document = $this->params['document']; + $version = $this->params['version']; + $cachedir = $this->params['cachedir']; + $previewwidthlist = $this->params['previewWidthList']; + $previewwidthdetail = $this->params['previewWidthDetail']; if($document) { - $this->contentHeading(getMLText("selected_item")); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail); + $previewer->createPreview($version); + + $this->contentHeading(getMLText("timeline_selected_item")); + $folder = $document->getFolder(); + $path = $folder->getPath(); + print ""; + + print "
"; + if($previewer->hasPreview($version)) { + print("getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">"); + } else { + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + } + print "
"; } } /* }}} */ From a836e65f35d430929951defa8c4d443678aa0c18 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 09:10:25 +0100 Subject: [PATCH 7/8] add method __get() --- SeedDMS_SQLiteFTS/SQLiteFTS/Document.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php index 48c4e789c..7734848e5 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php @@ -36,6 +36,13 @@ class SeedDMS_SQLiteFTS_Document { */ protected $fields; + public function __get($key) { /* {{{ */ + if(isset($this->fields[$key])) + return $this->fields[$key]; + else + return false; + } /* }}} */ + public function addField($key, $value) { /* {{{ */ if($key == 'document_id') { $this->id = $this->fields[$key] = (int) $value; From 94db3fe95097dda4310179ddb9bb540cb23c6f15 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 16 Nov 2015 09:10:36 +0100 Subject: [PATCH 8/8] new version 1.0.1 --- SeedDMS_SQLiteFTS/package.xml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml index 41e5c793b..67e694d9c 100644 --- a/SeedDMS_SQLiteFTS/package.xml +++ b/SeedDMS_SQLiteFTS/package.xml @@ -11,11 +11,11 @@ uwe@steinmann.cx yes - 2015-08-10 - + 2015-11-16 + - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 stable @@ -23,7 +23,7 @@ GPL License -initial release +add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists @@ -66,5 +66,21 @@ initial release + + 2015-08-10 + + + 1.0.0 + 1.0.0 + + + stable + stable + + GPL License + +initial release + +