Merge pull request websvnphp#121 from k10blogger/issue_119

Issue 119 PR for File Search using the svn command
ams-tschoening · Sep 28, 2020 · 9e26537 · 9e26537
2 parents 0a652b1 + a879cc2
commit 9e26537
Show file tree

Hide file tree

Showing 42 changed files with 626 additions and 0 deletions.
diff --git a/include/configclass.php b/include/configclass.php
@@ -1169,6 +1169,10 @@ function getUrlParts($rep, $path, $op) {
 				case 'comp':
 					$url = 'comp.php';
 					break;
+
+				case 'search':
+					$url = 'search.php';
+					break;
 			}
 
 			if (is_object($rep) && $op != 'index') {

diff --git a/include/setup.php b/include/setup.php
@@ -498,6 +498,7 @@
 // Set operative and peg revisions (if specified) and save passed-in revision
 $rev = (int)@$_REQUEST['rev'];
 $peg = (int)@$_REQUEST['peg'];
+$search = (string)@$_REQUEST['search'];
 if ($peg === 0)
 	$peg = '';
 $passrev = $rev;
@@ -506,6 +507,7 @@
 	// With MultiViews, browse creates the form once the current project is found.
 	createProjectSelectionForm();
 	createRevisionSelectionForm();
+	createSearchSelectionForm();
 }
 
 // set flag if robots should be blocked
@@ -584,6 +586,31 @@ function createRevisionSelectionForm() {
 	$vars['revision_endform'] = '</form>';
 }
 
+function createSearchSelectionForm() {
+	global $config, $lang, $vars, $rep, $path, $rev, $peg, $search;
+	if ($rep === null)
+		return;
+	$params = array();
+	if (!$config->multiViews) {
+		$params['repname'] = $rep->getDisplayName();
+		if ($path === null)
+			$path = !empty($_REQUEST['path']) ? $_REQUEST['path'] : null;
+		if ($path && $path != '/')
+			$params['path'] = $path;
+	}
+	if ($peg || $rev)
+		$params['rev'] = ($peg ? $peg : $rev);
+	$hidden = '';
+	foreach ($params as $key => $value) {
+		$hidden .= '<input type="hidden" name="'.$key.'" value="'.escape($value).'" />';
+	}
+	$vars['search'] = true;
+	$vars['search_form'] = '<form method="get" action="'.$config->getURL($rep, '', 'search').'" id="search">'.$hidden;
+	$search = $search? $search : $lang['SEARCH_PLACEHOLDER'];
+	$vars['search_input'] = '<input type="text" size="20" name="search" placeholder="'.$search.'" />';
+	$vars['search_submit'] = '<input type="submit" value="'.$lang['SEARCH'].'" />';
+	$vars['search_endform'] = '</form>';
+}
 function sendHeaderForbidden() {
 	http_response_code(403);
 }
diff --git a/include/svnlook.php b/include/svnlook.php
@@ -1054,6 +1054,39 @@ function getList($path, $rev = 0, $peg = '') {
 
 	// }}}
 
+	// {{{ getListSearch
+
+	function getListSearch($path,$searchstring='', $rev = 0, $peg = '') {
+		global $config, $curList;
+
+		// Since directories returned by svn log don't have trailing slashes (:-(), we need to remove
+		// the trailing slash from the path for comparison purposes
+
+		if ($path[strlen($path) - 1] == '/' && $path != '/') {
+			$path = substr($path, 0, -1);
+		}
+
+		$curList = new SVNList;
+		$curList->entries = array();
+		$curList->path = $path;
+
+		// Get the list info
+
+		if ($rev == 0) {
+			$headlog = $this->getLog('/', '', '', true, 1);
+			if ($headlog && isset($headlog->entries[0]))
+				$rev = $headlog->entries[0]->rev;
+		}
+
+		$cmd = $this->svnCommandString('list -R --search '. '"'.$searchstring.'"'.' --xml', $path, $rev, $peg);
+		$this->_xmlParseCmdOutput($cmd, 'listStartElement', 'listEndElement', 'listCharacterData');
+
+		return $curList;
+	}
+
+	// }}}
+
+
 	// {{{ getLog
 
 	function getLog($path, $brev = '', $erev = 1, $quiet = false, $limit = 2, $peg = '', $verbose = false) {

diff --git a/include/template.php b/include/template.php
@@ -289,3 +289,14 @@ function renderTemplate($view) {
 function executePlainPhpTemplate($vars) {
 	require_once $vars['templateentrypoint'];
 }
+
+// {{{ renderTemplateNoRepo
+
+function renderTemplateNoRepo($view)
+{
+	http_response_code(404);
+	renderTemplate($view);
+	exit(0);
+}
+
+// }}}
diff --git a/include/utils.php b/include/utils.php
@@ -399,6 +399,8 @@ function getUserLanguage($languages, $default, $userchoice) {
 
 // }}}
 
+// {{{ tempnameWithCheck
+
 function tempnamWithCheck($dir, $prefix) {
 	$tmp = tempnam($dir, $prefix);
 
@@ -416,3 +418,5 @@ function tempnamWithCheck($dir, $prefix) {
 
 	return $tmp;
 }
+
+// }}}
diff --git a/languages/catalan.php b/languages/catalan.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "Amb el camí:";
 $lang["FILEDELETED"] = "Fitxer suprimit";
 $lang["FILEADDED"] = "Nou fitxer";
+
+$lang['SEARCH'] = "Cerca";
+$lang['SEARCH_PLACEHOLDER'] = "Cerqueu articles aquí";
+$lang['NOITEMSFOUND'] = "No s'ha trobat cap element";
diff --git a/languages/chinese-simplified.php b/languages/chinese-simplified.php
@@ -118,3 +118,7 @@
 // $lang["WITHPATH"] = "With Path:";
 $lang["FILEDELETED"] = "已删除文件";
 $lang["FILEADDED"] = "新文件";
+
+$lang['SEARCH'] = "搜索";
+$lang['SEARCH_PLACEHOLDER'] = "在这里搜索项目";
+$lang['NOITEMSFOUND'] = "未找到任何项目";
diff --git a/languages/chinese-traditional.php b/languages/chinese-traditional.php
@@ -118,3 +118,6 @@
 // $lang["FILEDELETED"] = "File deleted";
 // $lang["FILEADDED"] = "New file";
 
+$lang['SEARCH'] = "搜索";
+$lang['SEARCH_PLACEHOLDER'] = "在這裡搜索項目";
+$lang['NOITEMSFOUND'] = "未找到任何項目";
diff --git a/languages/czech.php b/languages/czech.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "S umístěním:";
 $lang["FILEDELETED"] = "Soubor smazán";
 $lang["FILEADDED"] = "Nový soubor";
+
+$lang['SEARCH'] = "Vyhledávání";
+$lang['SEARCH_PLACEHOLDER'] = "Vyhledejte položky zde";
+$lang['NOITEMSFOUND'] = "Žádné předměty nenalezeny";
diff --git a/languages/danish.php b/languages/danish.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "med sti:";
 $lang["FILEDELETED"] = "Fil slettet";
 $lang["FILEADDED"] = "Ny fil";
+
+$lang['SEARCH'] = "Søg";
+$lang['SEARCH_PLACEHOLDER'] = "Søg efter emner her";
+$lang['NOITEMSFOUND'] = "Ingen varer fundet";
diff --git a/languages/dutch.php b/languages/dutch.php
@@ -119,3 +119,7 @@
 $lang["WITHPATH"] = "Met pad:";
 $lang["FILEDELETED"] = "Bestand gewist";
 $lang["FILEADDED"] = "Nieuw bestand";
+
+$lang['SEARCH'] = "Zoeken";
+$lang['SEARCH_PLACEHOLDER'] = "Zoek hier naar items";
+$lang['NOITEMSFOUND'] = "Geen items gevonden";
diff --git a/languages/english.php b/languages/english.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "With Path:";
 $lang["FILEDELETED"] = "File deleted";
 $lang["FILEADDED"] = "New file";
+
+$lang['SEARCH'] = "Search";
+$lang['SEARCH_PLACEHOLDER'] = "Search for items here";
+$lang['NOITEMSFOUND'] = "No Items Found";
diff --git a/languages/finnish.php b/languages/finnish.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Vertailtava Polku:";
 $lang["FILEDELETED"] = "Tiedosto poistettu";
 $lang["FILEADDED"] = "Uusi tiedosto";
+
+$lang['SEARCH'] = "Hae";
+$lang['SEARCH_PLACEHOLDER'] = "Hae kohteita täältä";
+$lang['NOITEMSFOUND'] = "Kohteita ei löytynyt";
diff --git a/languages/french.php b/languages/french.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Au dossier:";
 $lang["FILEDELETED"] = "Fichier supprimé";
 $lang["FILEADDED"] = "Nouveau fichier";
+
+$lang['SEARCH'] = "Chercher";
+$lang['SEARCH_PLACEHOLDER'] = "Rechercher des articles ici";
+$lang['NOITEMSFOUND'] = "Aucun élément trouvé";
diff --git a/languages/german.php b/languages/german.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "Mit Pfad:";
 $lang["FILEDELETED"] = "Datei gelöscht";
 $lang["FILEADDED"] = "Neue Datei";
+
+$lang['SEARCH'] = "suchen";
+$lang['SEARCH_PLACEHOLDER'] = "Suchen Sie hier nach Elementen";
+$lang['NOITEMSFOUND'] = "Keine Elemente gefunden";
diff --git a/languages/hebrew.php b/languages/hebrew.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "עם נתיב:";
 $lang["FILEDELETED"] = "קובץ נמחק";
 $lang["FILEADDED"] = "קובץ חדש";
+
+$lang['SEARCH'] = "לחפש";
+$lang['SEARCH_PLACEHOLDER'] = "חפש פריטים כאן";
+$lang['NOITEMSFOUND'] = "לא נמצאו פריטים";
diff --git a/languages/hindi.php b/languages/hindi.php
@@ -119,3 +119,7 @@
 $lang["WITHPATH"] = "इस पथ से:";
 $lang["FILEDELETED"] = "मिटाया हुआ लेख्यपत्र";
 $lang["FILEADDED"] = "नया लेख्यपत्र";
+
+$lang['SEARCH'] = "खोज";
+$lang['SEARCH_PLACEHOLDER'] = "यहां आइटम खोजें";
+$lang['NOITEMSFOUND'] = "कुछ नहीं मिला";
diff --git a/languages/hungarian.php b/languages/hungarian.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "ezzel az útvonallal:";
 $lang["FILEDELETED"] = "A file törölve";
 $lang["FILEADDED"] = "Új file";
+
+$lang['SEARCH'] = "Keresés";
+$lang['SEARCH_PLACEHOLDER'] = "Tételek keresése itt";
+$lang['NOITEMSFOUND'] = "Nincs találat";
diff --git a/languages/indonesian.php b/languages/indonesian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Dengan Path:";
 $lang["FILEDELETED"] = "File dihapus";
 $lang["FILEADDED"] = "File baru";
+
+$lang['SEARCH'] = "Cari";
+$lang['SEARCH_PLACEHOLDER'] = "Cari item di sini";
+$lang['NOITEMSFOUND'] = "Tidak Ada Item yang Ditemukan";
diff --git a/languages/italian.php b/languages/italian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Con il percorso:";
 $lang["FILEDELETED"] = "File cancellato";
 $lang["FILEADDED"] = "Nuovo file";
+
+$lang['SEARCH'] = "Ricerca";
+$lang['SEARCH_PLACEHOLDER'] = "Cerca qui gli articoli";
+$lang['NOITEMSFOUND'] = "Nessun articolo trovato";
diff --git a/languages/japanese.php b/languages/japanese.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "比較先パス：";
 $lang["FILEDELETED"] = "ファイル削除";
 $lang["FILEADDED"] = "新規ファイル";
+
+$lang['SEARCH'] = "探す";
+$lang['SEARCH_PLACEHOLDER'] = "こちらから商品を検索";
+$lang['NOITEMSFOUND'] = "項目は見つかりませんでした";
diff --git a/languages/korean.php b/languages/korean.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "경로:";
 // $lang["FILEDELETED"] = "File deleted";
 // $lang["FILEADDED"] = "New file";
+
+$lang['SEARCH'] = "검색";
+$lang['SEARCH_PLACEHOLDER'] = "여기에서 항목 검색";
+$lang['NOITEMSFOUND'] = "제품을 찾지 못했습니다";
diff --git a/languages/macedonian.php b/languages/macedonian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Со пат:";
 $lang["FILEDELETED"] = "Датотеката е избришана";
 $lang["FILEADDED"] = "Нова датотека";
+
+$lang['SEARCH'] = "Пребарување";
+$lang['SEARCH_PLACEHOLDER'] = "Пребарувајте предмети овде";
+$lang['NOITEMSFOUND'] = "Не се пронајдени предмети";
diff --git a/languages/marathi.php b/languages/marathi.php
@@ -119,3 +119,7 @@
 $lang["WITHPATH"] = "या मार्गाशी:";
 $lang["FILEDELETED"] = "खतावणी काढली";
 $lang["FILEADDED"] = "नवीन  खतावणी";
+
+$lang['SEARCH'] = "शोधा";
+$lang['SEARCH_PLACEHOLDER'] = "येथे आयटम शोधा";
+$lang['NOITEMSFOUND'] = "कोणतेही आयटम सापडले नाहीत";
diff --git a/languages/norwegian.php b/languages/norwegian.php
@@ -122,3 +122,7 @@
 $lang["WITHPATH"] = "Med sti:";
 $lang["FILEDELETED"] = "Fil slettet";
 $lang["FILEADDED"] = "Ny fil";
+
+$lang['SEARCH'] = "Søk";
+$lang['SEARCH_PLACEHOLDER'] = "Søk etter varer her";
+$lang['NOITEMSFOUND'] = "Ingen objekter funnet";
diff --git a/languages/polish.php b/languages/polish.php
@@ -121,3 +121,7 @@
 $lang["WITHPATH"] = "Z katalogiem:";
 $lang["FILEDELETED"] = "Plik usunięty";
 $lang["FILEADDED"] = "Nowy plik";
+
+$lang['SEARCH'] = "Szukaj";
+$lang['SEARCH_PLACEHOLDER'] = "Wyszukaj elementy tutaj";
+$lang['NOITEMSFOUND'] = "Nie znaleziono żadnych pozycji";
diff --git a/languages/portuguese-br.php b/languages/portuguese-br.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Com caminho:";
 $lang["FILEDELETED"] = "Arquivo apagado";
 $lang["FILEADDED"] = "Arquivo adicionado";
+
+$lang['SEARCH'] = "Procurar";
+$lang['SEARCH_PLACEHOLDER'] = "Procure por itens aqui";
+$lang['NOITEMSFOUND'] = "Nenhum item encontrado";
diff --git a/languages/portuguese.php b/languages/portuguese.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "Com caminho:";
 $lang["FILEDELETED"] = "Arquivo apagado";
 $lang["FILEADDED"] = "Arquivo adicionado";
+
+$lang['SEARCH'] = "Procurar";
+$lang['SEARCH_PLACEHOLDER'] = "Procure por itens aqui";
+$lang['NOITEMSFOUND'] = "Nenhum item encontrado";
diff --git a/languages/russian.php b/languages/russian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "С путем:";
 $lang["FILEDELETED"] = "Файл удален";
 $lang["FILEADDED"] = "Новый файл";
+
+$lang['SEARCH'] = "Поиск";
+$lang['SEARCH_PLACEHOLDER'] = "Искать предметы здесь";
+$lang['NOITEMSFOUND'] = "Ничего не найдено";
diff --git a/languages/slovak.php b/languages/slovak.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "S cestou:";
 $lang["FILEDELETED"] = "Súbor odstránený";
 $lang["FILEADDED"] = "Nový súbor";
+
+$lang['SEARCH'] = "Vyhľadávanie";
+$lang['SEARCH_PLACEHOLDER'] = "Vyhľadajte položky tu";
+$lang['NOITEMSFOUND'] = "Nenašli sa žiadne položky";
diff --git a/languages/slovenian.php b/languages/slovenian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "S potjo:";
 $lang["FILEDELETED"] = "Datoteka pobrisana";
 $lang["FILEADDED"] = "Nova datoteka";
+
+$lang['SEARCH'] = "Iskanje";
+$lang['SEARCH_PLACEHOLDER'] = "Poiščite predmete tukaj";
+$lang['NOITEMSFOUND'] = "Ni najdenih predmetov";
diff --git a/languages/spanish.php b/languages/spanish.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "Con Ruta:";
 $lang["FILEDELETED"] = "Archivo Eliminado";
 $lang["FILEADDED"] = "Archivo Nuevo";
+
+$lang['SEARCH'] = "Buscar";
+$lang['SEARCH_PLACEHOLDER'] = "Buscar artículos aquí";
+$lang['NOITEMSFOUND'] = "No se encontraron artículos";
diff --git a/languages/swedish.php b/languages/swedish.php
@@ -116,3 +116,7 @@
 $lang["WITHPATH"] = "Med sökväg:";
 $lang["FILEDELETED"] = "Filen raderad";
 $lang["FILEADDED"] = "Ny fil";
+
+$lang['SEARCH'] = "Sök";
+$lang['SEARCH_PLACEHOLDER'] = "Sök efter objekt här";
+$lang['NOITEMSFOUND'] = "Inga föremål hittades";
diff --git a/languages/turkish.php b/languages/turkish.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Patika ile:";
 $lang["FILEDELETED"] = "Dosya silinmiş";
 $lang["FILEADDED"] = "Yeni dosya";
+
+$lang['SEARCH'] = "Arama";
+$lang['SEARCH_PLACEHOLDER'] = "Burada ürün arayın";
+$lang['NOITEMSFOUND'] = "Hiç bir öğe bulunamadı";
diff --git a/languages/ukrainian.php b/languages/ukrainian.php
@@ -117,3 +117,7 @@
 $lang["WITHPATH"] = "Зі шляхом:";
 $lang["FILEDELETED"] = "Файл вилучено";
 $lang["FILEADDED"] = "Новий файл";
+
+$lang['SEARCH'] = "Пошук";
+$lang['SEARCH_PLACEHOLDER'] = "Шукайте тут предмети";
+$lang['NOITEMSFOUND'] = "Елементів не знайдено";