gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some code reoganisation

Browse Source 
start html page in case of an error
This commit is contained in:
steinm 2012-12-14 08:08:03 +00:00
parent b67ece54a2
commit bbe6f4e5a3
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
op/op.Search.php
View File

@ -37,7 +37,7 @@ if (isset($_GET["navBar"])) {
if(strlen($_GET["query"])==0) { if(strlen($_GET["query"])==0) {
header("Location: ../out/out.SearchForm.php?folderid=".$folderid); header("Location: ../out/out.SearchForm.php?folderid=".$folderid);
} else { } else {
if($_GET["fullsearch"]) { if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
header("Location: ../op/op.SearchFulltext.php?folderid=".$folderid."&query=".$_GET["query"]); header("Location: ../op/op.SearchFulltext.php?folderid=".$folderid."&query=".$_GET["query"]);
} }
} }
@ -117,20 +117,13 @@ if (!is_object($startFolder)) {
UI::exitError(getMLText("search_results"),getMLText("invalid_folder_id")); UI::exitError(getMLText("search_results"),getMLText("invalid_folder_id"));
} }
// Now that the target folder has been identified, it is possible to create
// the full navigation bar.
$folderPathHTML = getFolderPathHTML($startFolder, true);
UI::htmlStartPage(getMLText("search_results"));
UI::globalNavigation($startFolder);
UI::pageNavigation($folderPathHTML, "", $startFolder);
UI::contentHeading(getMLText("search_results"));
// Check to see if the search has been restricted to a particular // Check to see if the search has been restricted to a particular
// document owner. // document owner.
$owner = null; $owner = null;
if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) { if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
$owner = $dms->getUser($_GET["ownerid"]); $owner = $dms->getUser($_GET["ownerid"]);
if (!is_object($owner)) { if (!is_object($owner)) {
UI::htmlStartPage(getMLText("search_results"));
UI::contentContainer(getMLText("unknown_owner")); UI::contentContainer(getMLText("unknown_owner"));
UI::htmlEndPage(); UI::htmlEndPage();
exit; exit;
@ -143,12 +136,14 @@ $stopdate = array();
if (isset($_GET["creationdate"]) && $_GET["creationdate"]!=null) { if (isset($_GET["creationdate"]) && $_GET["creationdate"]!=null) {
$startdate = array('year'=>$_GET["createstartyear"], 'month'=>$_GET["createstartmonth"], 'day'=>$_GET["createstartday"], 'hour'=>0, 'minute'=>0, 'second'=>0); $startdate = array('year'=>$_GET["createstartyear"], 'month'=>$_GET["createstartmonth"], 'day'=>$_GET["createstartday"], 'hour'=>0, 'minute'=>0, 'second'=>0);
if (!checkdate($startdate['month'], $startdate['day'], $startdate['year'])) { if (!checkdate($startdate['month'], $startdate['day'], $startdate['year'])) {
UI::htmlStartPage(getMLText("search_results"));
UI::contentContainer(getMLText("invalid_create_date_start")); UI::contentContainer(getMLText("invalid_create_date_start"));
UI::htmlEndPage(); UI::htmlEndPage();
exit; exit;
} }
$stopdate = array('year'=>$_GET["createendyear"], 'month'=>$_GET["createendmonth"], 'day'=>$_GET["createendday"], 'hour'=>23, 'minute'=>59, 'second'=>59); $stopdate = array('year'=>$_GET["createendyear"], 'month'=>$_GET["createendmonth"], 'day'=>$_GET["createendday"], 'hour'=>23, 'minute'=>59, 'second'=>59);
if (!checkdate($stopdate['month'], $stopdate['day'], $stopdate['year'])) { if (!checkdate($stopdate['month'], $stopdate['day'], $stopdate['year'])) {
UI::htmlStartPage(getMLText("search_results"));
UI::contentContainer(getMLText("invalid_create_date_end")); UI::contentContainer(getMLText("invalid_create_date_end"));
UI::htmlEndPage(); UI::htmlEndPage();
exit; exit;
@ -233,6 +228,20 @@ if($resArr['docs']) {
} }
// -------------- Output results -------------------------------------------- // -------------- Output results --------------------------------------------
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$startFolder, 'searchhits'=>$entries, 'totalpages'=>$resArr['totalPages'], 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'searchin'=>$searchin));
if($view) {
$view->show();
exit;
}
// Now that the target folder has been identified, it is possible to create
// the full navigation bar.
UI::htmlStartPage(getMLText("search_results"));
UI::globalNavigation($startFolder);
UI::pageNavigation(getFolderPathHTML($startFolder, true), "", $startFolder);
UI::contentHeading(getMLText("search_results"));
UI::contentContainerStart(); UI::contentContainerStart();
UI::pageList($pageNumber, $resArr['totalPages'], "../op/op.Search.php", $_GET); UI::pageList($pageNumber, $resArr['totalPages'], "../op/op.Search.php", $_GET);