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

inc/inc.ClassSettings.php

@@ -99,6 +99,8 @@ class Settings { /* {{{ */
 	var $_fullSearchEngine = 'lucene';
 	// default search method
 	var $_defaultSearchMethod = 'database'; // or 'fulltext'
+	// jump straight to the document if it is the only hit of a search
+	var $_showSingleSearchHit = true;
 	// contentOffsetDirTo
 	var $_contentOffsetDir = "1048576";
 	// Maximum number of sub-directories per parent directory
@@ -404,6 +406,7 @@ class Settings { /* {{{ */
 		$this->_maxSizeForFullText = intval($tab["maxSizeForFullText"]);
 		$this->_fullSearchEngine = strval($tab["fullSearchEngine"]);
 		$this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]);
+		$this->_showSingleSearchHit = Settings::boolVal($tab["showSingleSearchHit"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
 		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
@@ -702,6 +705,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "maxSizeForFullText", $this->_maxSizeForFullText);
     $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine);
     $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod);
+    $this->setXMLAttributValue($node, "showSingleSearchHit", $this->_showSingleSearchHit);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
     $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);

languages/ar_EG/lang.inc

@@ -1194,6 +1194,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'الموقع',
 'settings_siteDefaultPage' => '',
 'settings_siteDefaultPage_desc' => '',

languages/bg_BG/lang.inc

@@ -1059,6 +1059,8 @@ $text = array(
 'settings_Server' => 'Настройки на сървъра',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Сайт',
 'settings_siteDefaultPage' => 'Страница по подразбиране',
 'settings_siteDefaultPage_desc' => 'Страница,показвана след влизане. Ако е празно, то out/out.ViewFolder.php',

languages/ca_ES/lang.inc

@@ -1064,6 +1064,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => '',
 'settings_siteDefaultPage_desc' => '',

languages/cs_CZ/lang.inc

@@ -1203,6 +1203,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => 'Zobrazit chybějící překlady',
 'settings_showMissingTranslations_desc' => 'Vypsat všechny chybějící překlady na stránce v dolní části. Přihlášený uživatel bude moci předložit návrh na chybějící překlad, který bude uložen v souboru CSV. Nezapínejte tuto funkci v produkčním prostředí!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Site Default Page',
 'settings_siteDefaultPage_desc' => '',

languages/de_DE/lang.inc

@@ -19,11 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2299), dgrutsch (21)
+//    Translators: Admin (2303), dgrutsch (21)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
-'2_factor_auth_info' => 'Dieses System erfordert 2-Faktor-Authentifikation. Dazu brauchen den Google Authenticator auf Ihrem Mobiltelefon. Unten sehen Sie zwei QR-Codes. Der rechte Code beinhaltet Ihren aktuellen geheimen Schlüssel. Auf der linken Seite wird ein neuer Schlüssel angezeigt. Wenn Sie den neuen Schlüssel speichern, dann stellen Sie zuvor sicher, dass sie ihn mit dem Google Authenticator zuvor eingescant haben.',
+'2_factor_auth_info' => 'Dieses System erfordert 2-Faktor-Authentifikation. Dazu brauchen Sie den Google Authenticator auf Ihrem Mobiltelefon. Unten sehen Sie zwei QR-Codes. Der rechte Code beinhaltet Ihren aktuellen geheimen Schlüssel. Auf der linken Seite wird ein neuer Schlüssel angezeigt. Wenn Sie den neuen Schlüssel speichern, dann stellen Sie zuvor sicher, dass sie ihn mit dem Google Authenticator zuvor eingescant haben.',
 '2_fact_auth_secret' => 'Schlüssel',
 'accept' => 'Übernehmen',
 'access_control' => 'Zugriffskontrolle',
@@ -697,7 +697,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '[sitename]: [folder_name] - Neuer Ordner',
 'new_user_image' => 'Neues Bild',
 'next_state' => 'Neuer Status',
-'nl_NL' => 'Hollandisch',
+'nl_NL' => 'Holländisch',
 'no' => 'Nein',
 'notify_added_email' => 'Benachrichtigung per Mail wurde eingerichtet',
 'notify_added_email_body' => 'Added to notification list
@@ -1240,6 +1240,8 @@ URL: [url]',
 'settings_Server' => 'Server-Einstellungen',
 'settings_showMissingTranslations' => 'Zeige fehlende Übersetzungen',
 'settings_showMissingTranslations_desc' => 'Listet die fehlenden Übersetzungen der Seite unterhalb der Fußzeile und erlaubt dem Benutzer Vorschläge einzureichen. Diese Vorschläge werden in einer CSV-Datei gespeichert. Diese Funktion sollte nicht in Produktionssystemen eingeschaltet sein.',
+'settings_showSingleSearchHit' => 'Springe zu direkt zu einem einzelnen Suchtreffer.',
+'settings_showSingleSearchHit_desc' => 'Wenn die Suche nur einen Treffer liefert, dann wird dieser direkt angezeigt und nicht die Liste der Treffer.',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Startseite',
 'settings_siteDefaultPage_desc' => 'Erste Seite nach der Anmeldung. Voreingestellt ist \'out/out.ViewFolder.php\'',

languages/el_GR/lang.inc

@@ -1070,6 +1070,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '',
 'settings_siteDefaultPage' => '',
 'settings_siteDefaultPage_desc' => '',

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 (1445), dgrutsch (7), netixw (14)
+//    Translators: Admin (1447), dgrutsch (7), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1241,6 +1241,8 @@ URL: [url]',
 'settings_Server' => 'Server settings',
 'settings_showMissingTranslations' => 'Show missing translations',
 'settings_showMissingTranslations_desc' => 'List all missing translations on the page at the bottom of the page. The logged in user will be able to submit a proposal for a missing translation which will be saved in a csv file. Do not turn this function on if in a production environment!',
+'settings_showSingleSearchHit' => 'Jump right to a single search hit',
+'settings_showSingleSearchHit_desc' => 'If the search results into just one hit, then it will be displayed right away instead of the result list.',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Site Default Page',
 'settings_siteDefaultPage_desc' => 'Default page on login. If empty defaults to out/out.ViewFolder.php',

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 (998), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (999), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -529,7 +529,7 @@ URL: [url]',
 'identical_version' => 'La nueva versión es idéntica a la actual.',
 'import' => 'Importar',
 'importfs' => '',
-'import_fs' => 'Importar desde sistema de aechivos',
+'import_fs' => 'Importar desde sistema de archivos',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
@@ -1209,6 +1209,8 @@ URL: [url]',
 'settings_Server' => 'Configuración del servidor',
 'settings_showMissingTranslations' => 'Mostrar traducciones faltantes',
 'settings_showMissingTranslations_desc' => 'Listar todos los términos pendientes de traducción de esta página al final de la misma. En entorno productivo no activar esta función',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Sitio',
 'settings_siteDefaultPage' => 'Página por defecto del sitio',
 'settings_siteDefaultPage_desc' => 'Página por defecto al conectar. Si está vacío se dirige a out/out.ViewFolder.php',

languages/fr_FR/lang.inc

@@ -1185,6 +1185,8 @@ URL: [url]',
 'settings_Server' => 'Paramètres serveur',
 'settings_showMissingTranslations' => 'Afficher les traductions manquantes',
 'settings_showMissingTranslations_desc' => 'Lister toutes les traductions manquantes de la page dans le bas de la page. L\'utilisateur connecté pourra proposer une traduction manquante qui sera sauvegardée dans un fichier CSV. Ne pas activer cette fonction en production.',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Page par défaut du site',
 'settings_siteDefaultPage_desc' => 'Page par défaut lors de la connexion. Si vide, valeur par défaut à out/out.ViewFolder.php',

languages/hr_HR/lang.inc

@@ -1230,6 +1230,8 @@ Internet poveznica: [url]',
 'settings_Server' => 'Postavke servera',
 'settings_showMissingTranslations' => 'Prikaži prijevode koji nedostaju',
 'settings_showMissingTranslations_desc' => 'Navedi sve prijevode koji nedostaju na stranici na dnu stranice. Prijavljeni korisnik će moći podnijeti prijedlog za prijevode koji nedostaju koji će biti pohranjen u csv datoteku. Ne uključujte ovu funkciju ako ste u proizvodnoj okolini!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Stranica',
 'settings_siteDefaultPage' => 'Zadana stranica',
 'settings_siteDefaultPage_desc' => 'Zadana stranica kod prijave. Ako je prazno, zadano je out/out.ViewFolder.php',

languages/hu_HU/lang.inc

@@ -1208,6 +1208,8 @@ URL: [url]',
 'settings_Server' => 'Kiszolgáló beállítások',
 'settings_showMissingTranslations' => 'Jelenítse meg a hiányzó fordításokat',
 'settings_showMissingTranslations_desc' => 'Felsorolja az összes hiányzó fordítást a lap alján. A bejelentkezett felhasználó képes lesz arra, hogy javaslatot nyújtson be a hiányzó fordításokra, amelyek egy csv állományba kerülnek mentésre. Ne kapcsolja be ezt a funkciót élse környezetben!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Webhely',
 'settings_siteDefaultPage' => 'Webhely kezdőlap',
 'settings_siteDefaultPage_desc' => 'Alapértelmezett oldal a bejelentkezést követően. Ha üres, akkor az alapértelmezett out/out.ViewFolder.php',

languages/it_IT/lang.inc

@@ -1242,6 +1242,8 @@ URL: [url]',
 'settings_Server' => 'Impostazioni Server',
 'settings_showMissingTranslations' => 'Mostra traduzioni mancanti',
 'settings_showMissingTranslations_desc' => 'Elenca tutte le traduzioni mancanti alla fine della pagina. L\'utente collegato potrà sottoporre una proposta per le traduzioni mancanti che verrà salvata in un file .csv. Da non usarsi in un ambiente di produzione.',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Sito',
 'settings_siteDefaultPage' => 'Pagina iniziale',
 'settings_siteDefaultPage_desc' => 'Pagina iniziale di default del sito. Se lasciato vuoto punta su: out/out.ViewFolder.php',

languages/ko_KR/lang.inc

@@ -1223,6 +1223,8 @@ URL : [url]',
 'settings_Server' => '서버 설정',
 'settings_showMissingTranslations' => '누락된 번역보기',
 'settings_showMissingTranslations_desc' => '페이지 하단에 현재 페이지의 부족한 번역을 나열 합니다. 로그인 한 사용자는 부족한 번역을 제안 및 제출 할 수 있게 되며 CSV 파일로 저장됩니다. 프로덕션 환경의 경우이 기능을 이기능을 선택하지 마십시오!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '사이트',
 'settings_siteDefaultPage' => '사이트의 기본 페이지',
 'settings_siteDefaultPage_desc' => '로그인시 기본 페이지. 만약 빈 값이면  /out.ViewFolder.php로 이동',

languages/nl_NL/lang.inc

@@ -1236,6 +1236,8 @@ URL: [url]',
 'settings_Server' => 'Server instellingen',
 'settings_showMissingTranslations' => 'Ontbrekende vertalingen weergeven',
 'settings_showMissingTranslations_desc' => 'Geef alle ontbrekende vertalingen onder aan de pagina weer. De gebruiker kan een verzoek tot vertaling indienen dat wordt opgeslagen als csv bestand. Let op! Zet deze functie niet aan in productieomgevingen!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Web Locatie',
 'settings_siteDefaultPage' => 'Locatie standaard pagina',
 'settings_siteDefaultPage_desc' => 'Standaard pagina bij inloggen. Indien leeg is out/out.ViewFolder.php de standaard',

languages/pl_PL/lang.inc

@@ -1188,6 +1188,8 @@ URL: [url]',
 'settings_Server' => 'Ustawienia serwera',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Strona',
 'settings_siteDefaultPage' => 'Domyślna strona',
 'settings_siteDefaultPage_desc' => 'Strona wyświetlana domyślnie po zalogowaniu. Domyślnie jest to out/out.ViewFolder.php',

languages/pt_BR/lang.inc

@@ -1206,6 +1206,8 @@ URL: [url]',
 'settings_Server' => 'Configuraçoes do servidor',
 'settings_showMissingTranslations' => 'Mostrar traduções em falta',
 'settings_showMissingTranslations_desc' => 'Listar todas as traduções faltando na página na parte inferior da página. O usuário conectado será capaz de apresentar uma proposta para uma tradução em falta que serão salvos em um arquivo CSV. Não ativar eáa função, se em um ambiente de produção!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Página Padrão do Site',
 'settings_siteDefaultPage_desc' => 'Página padrão no login. Se os padrões estiverem vazios para out/out.ViewFolder.php',

languages/ro_RO/lang.inc

@@ -1231,6 +1231,8 @@ URL: [url]',
 'settings_Server' => 'Setări server',
 'settings_showMissingTranslations' => 'Arată traducerile lipsă',
 'settings_showMissingTranslations_desc' => 'Listează toate traducerile lipsă în partea de jos a paginii. Utilizatorul autentificat va putea să propună o traducere lipsă care va fi apoi salvată într-un fișier csv. Nu porniți această funcționalitate într-un mediu de producție!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Pagină implicită site (Home page)',
 'settings_siteDefaultPage_desc' => 'Pagina implicită dupa logare. Dacă se lasă gol, implicit este ViewFolder.php',

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 (1545)
+//    Translators: Admin (1547)
 
 $text = array(
 '2_factor_auth' => '',
@@ -415,7 +415,7 @@ URL: [url]',
 'edit_user' => 'Редактировать пользователя',
 'edit_user_details' => 'Изменить данные пользователя',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => 'греческий',
 'email' => 'E-mail',
 'email_error_title' => 'Не указан e-mail',
 'email_footer' => 'Вы можете изменить e-mail используя меню «Моя учётка».',
@@ -534,7 +534,7 @@ URL: [url]',
 'identical_version' => 'Новая версия идентична текущей.',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'импорт из файловой системы',
 'import_fs_warning' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
@@ -1238,6 +1238,8 @@ URL: [url]',
 'settings_Server' => 'Настройки сервера',
 'settings_showMissingTranslations' => 'Фразы которые нужно перевести',
 'settings_showMissingTranslations_desc' => 'Отображать внизу страницы фразы, которые нуждаются в переводе',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Сайт',
 'settings_siteDefaultPage' => 'Страница по умолчанию',
 'settings_siteDefaultPage_desc' => 'Страница, отображаемая после входа. По умолчанию: out/out.ViewFolder.php',

languages/sk_SK/lang.inc

@@ -1063,6 +1063,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Stránka',
 'settings_siteDefaultPage' => '',
 'settings_siteDefaultPage_desc' => '',

languages/sv_SE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1130), tmichelfelder (106)
+//    Translators: Admin (1133), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '',
@@ -403,7 +403,7 @@ URL: [url]',
 'edit_user' => 'Ändra användare',
 'edit_user_details' => 'Ändra användarens information',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => 'grekisk',
 'email' => 'E-post',
 'email_error_title' => 'E-post saknas',
 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'',
@@ -522,7 +522,7 @@ URL: [url]',
 'identical_version' => 'Ny version är lika med den aktuella versionen.',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'Import från filsystem',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
@@ -1194,6 +1194,8 @@ URL: [url]',
 'settings_Server' => 'Server-inställningar',
 'settings_showMissingTranslations' => 'Visa saknade översättningar',
 'settings_showMissingTranslations_desc' => 'Lista alla saknade översättningar längst ner på sidan. Den inloggade användaren får möjligheten att skicka in ett förslag för saknade översättningar som kommer sparas i en CSV fil. Sätt denna option inte på, på ett DMS som används i verksamheten.',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Sida',
 'settings_siteDefaultPage' => 'Standardsida',
 'settings_siteDefaultPage_desc' => 'Standardsida efter inloggning. Om fältet är tomt, används standard-out/out.ViewFolder.php',
@@ -1352,7 +1354,7 @@ URL: [url]',
 'thursday' => 'torsdag',
 'thursday_abbr' => 'to',
 'timeline' => 'Tidslinje',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Ny bilaga',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',

languages/tr_TR/lang.inc

@@ -1210,6 +1210,8 @@ URL: [url]',
 'settings_Server' => 'Sunucu ayarları',
 'settings_showMissingTranslations' => 'Eksik çevirileri göster',
 'settings_showMissingTranslations_desc' => 'Eksik çevirilerin tamamı sayfanın en altında listelenir. Giriş yapan kullanıclıar yapacakları çevirileri csv formatında gönderebilirler. Gerçekte kullanılan sistemlerde bunu açmamanız önerilir!',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Site Varsayılan Sayfası',
 'settings_siteDefaultPage_desc' => 'Giriş yapıldığında varsayılan olarak gelecek sayfa. Boş bırakılırsa out/out.ViewFolder.php sayfası gelir.',

languages/uk_UA/lang.inc

@@ -1231,6 +1231,8 @@ URL: [url]',
 'settings_Server' => 'Налаштування сервера',
 'settings_showMissingTranslations' => 'Фрази, як потребують перекладу',
 'settings_showMissingTranslations_desc' => 'Відображати внизу сторінки фрази, які потребують перекладу',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => 'Сайт',
 'settings_siteDefaultPage' => 'Сторінка по замовчуванню',
 'settings_siteDefaultPage_desc' => 'Сторінка, яка відображається після авторизації. По замовчуванню: out/out.ViewFolder.php',

languages/zh_CN/lang.inc

@@ -1065,6 +1065,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '显示丢失的翻译',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '站点设置',
 'settings_siteDefaultPage' => '网站的默认页',
 'settings_siteDefaultPage_desc' => '',

languages/zh_TW/lang.inc

@@ -1063,6 +1063,8 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
+'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '',
 'settings_siteDefaultPage' => '網站的默認頁',
 'settings_siteDefaultPage_desc' => '',

op/op.Settings.php

@@ -74,6 +74,7 @@ if ($action == "saveSettings")
   $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]);
   $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
   $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
+  $settings->_showSingleSearchHit = $_POST["showSingleSearchHit"];
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");

out/out.Search.php

@@ -391,7 +391,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 // -------------- Output results --------------------------------------------
 
-if(count($entries) == 1) {
+if($settings->_showSingleSearchHit && count($entries) == 1) {
 	$entry = $entries[0];
 	if(get_class($entry) == $dms->getClassname('document')) {
 		header('Location: ../out/out.ViewDocument.php?documentid='.$entry->getID());

views/bootstrap/class.Bootstrap.php

@@ -1125,7 +1125,7 @@ $('#acceptkeywords').click(function(ev) {
 <?php
 	} /* }}} */
 
-	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes') { /* {{{ */
+	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
 			echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"0\" />";
@@ -1149,7 +1149,7 @@ $('#acceptkeywords').click(function(ev) {
 				} else {
 					echo "\"";
 				}
-				echo "".($attrdef->getMinValues() > 0 ? ' required' : '').">";
+				echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">";
 				if(!$attrdef->getMultipleValues()) {
 					echo "<option value=\"\"></option>";
 				}
@@ -1168,9 +1168,9 @@ $('#acceptkeywords').click(function(ev) {
 			} else {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 				if(strlen($objvalue) > 80) {
-					echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\"".($attrdef->getMinValues() > 0 ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
+					echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".($attrdef->getMinValues() > 0 ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;

views/bootstrap/class.Search.php

@@ -199,7 +199,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true) ?></td>
 </tr>
 
 <?php
@@ -307,7 +307,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true) ?></td>
 </tr>
 
 <?php
@@ -353,7 +353,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true) ?></td>
 </tr>
 <?php
 				}

views/bootstrap/class.Settings.php

@@ -229,6 +229,10 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
       </tr>
+      <tr title="<?php printMLText("settings_showSingleSearchHit_desc");?>">
+        <td><?php printMLText("settings_showSingleSearchHit");?>:</td>
+        <td><input name="showSingleSearchHit" type="checkbox" <?php if ($settings->_showSingleSearchHit) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
         <td><?php printMLText("settings_stopWordsFile");?>:</td>
         <td><?php $this->showTextField("stopWordsFile", $settings->_stopWordsFile); ?></td>