From 76bf9b113d8ebe684bb9ad4cf7958b2b8be9ff68 Mon Sep 17 00:00:00 2001 From: zlaxy Date: Sun, 1 Oct 2017 13:01:25 +0300 Subject: [PATCH] Category search in admin panel + some bugfixes --- administration.php | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/administration.php b/administration.php index 6cd83d4..34d21d2 100644 --- a/administration.php +++ b/administration.php @@ -50,9 +50,13 @@ function Search($SearchQuery) { function AddSearchBar() { global $Titles; global $GBsearch; - if ($GBsearch) if (!(isset($_SESSION["EditStatus"]) or ($_SESSION["DeleteStatus"]=="deletion"))) { + global $GBcategoryfield; + if ($GBsearch) if (!(isset($_SESSION["EditStatus"]) or (isset($_SESSION["DeleteStatus"])?($_SESSION["DeleteStatus"]=="deletion"):(false)))) { echo "
"; - echo ""; + echo ""; + echo ""; + foreach ($GBcategoryfield as $category) echo " "; echo ""; echo "
"; } @@ -63,7 +67,7 @@ function AdminHeaderView() { global $GBadmin; global $GBpassword; echo "

",$Titles["AdminHeader"],"

\n"; - if ($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))) { + if (isset($_SESSION["SessionStatus"])?($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))):false) { echo "
",AddSearchBar(),"
"; echo "
\n"; echo "

\n"; @@ -98,13 +102,15 @@ function AdminEntriesView() { global $GBlinkfield; global $GBsubjectfield; global $GBcategoryfield; - if ($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))) if ($DataStatus=="empty") echo $Titles["EmptyFile"],"\n"; - else if ($_SESSION["DeleteStatus"]=="deletion") { - echo " ",$Titles["AdminSureDel"]," ",count($_SESSION["DeleteEntries"])," ",$Titles["AdminSureDelMessages"],"?\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo "
\n"; + if (isset($_SESSION["SessionStatus"])?($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))):false) if ($DataStatus=="empty") echo $Titles["EmptyFile"],"\n"; + else if (isset($_SESSION["DeleteStatus"])) { + if ($_SESSION["DeleteStatus"]=="deletion") { + echo " ",$Titles["AdminSureDel"]," ",count($_SESSION["DeleteEntries"])," ",$Titles["AdminSureDelMessages"],"?\n"; + echo "
\n"; + echo " \n"; + echo " \n"; + echo "
\n"; + } } else if (isset($_SESSION["EditStatus"])) { echo " ",$Titles["AdminMessage"]," ", ($_SESSION["EditStatus"]),", ",date("j.m.Y, H:i",$AdminEntries[($_SESSION["EditStatus"]-1)][5]),":
\n"; echo "
\n"; @@ -133,7 +139,7 @@ function AdminEntriesView() { $SearchResult=Search($_POST["serachq"]); if ($SearchResult) { $GBpagination=0; - unset($AdminEntries); + Unset($AdminEntries); foreach($SearchResult as $n=>$Entry) $AdminEntries[$n]=$Entry[1]; } else echo $Titles["NoResult"],": '",$_POST["serachq"],"'.
\n"; } @@ -218,7 +224,7 @@ if (isset($_POST["canceldelete"])) { Unset($_SESSION["DeleteEntries"]); } if (isset($_POST["canceledit"])) Unset($_SESSION["EditStatus"]); -if ($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))) { +if (isset($_SESSION["SessionStatus"])?($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))):false) { $AdminEntries=ReadEntries(); if (isset($_POST["submitdelete"])) { $_SESSION["DeleteStatus"]="deletion"; @@ -246,11 +252,13 @@ if ($_SESSION["SessionStatus"]==(md5($GBadmin.$GBpassword))) { SaveEntries(); Unset($_SESSION["EditStatus"]); $AdminEntries=ReadEntries(); - } if (isset($_SESSION["DeleteStatus"])) if ($_SESSION["DeleteStatus"]) { + } if (isset($_SESSION["DeleteStatus"])?($_SESSION["DeleteStatus"]):(false)) { foreach($_SESSION["DeleteEntries"] as $e=>$DelEnt) Unset($AdminEntries[$DelEnt]); SaveEntries(); Unset($_SESSION["DeleteEntries"]); - $_SESSION["DeleteStatus"]=""; + + Unset($_SESSION["DeleteStatus"]); + //$_SESSION["DeleteStatus"]=""; $AdminEntries=ReadEntries(); } } if (!isset($_SESSION["EditStatus"])) for ($e=0;$e