some code refactoring, there is no any warnings now

This commit is contained in:
2017-09-30 11:14:00 +03:00
parent 15ad0e3e09
commit 8d36e4b584
5 changed files with 278 additions and 271 deletions

190
index.php
View File

@@ -16,15 +16,15 @@ function SendMail() {
global $GBlinkfield;
global $GBsubjectfield;
global $GBcategoryfield;
$message=$_POST['name'];
if ($GBcityfield) $message=$message." ".$Titles[From]." ".$_POST['from'];
$message=$_POST["name"];
if ($GBcityfield) $message=$message." ".$Titles["From"]." ".$_POST["from"];
$message=$message."(";
if ($GBlinkfield) $message=$message.$_POST['link'].", ";
$message=$message.$_POST['email'].") ".$Titles[Wrote];
if ($GBsubjectfield) $message=$message." ".$_POST['subj'];
if ($GBcategoryfield) $message=$message." [".$_POST['category']."]";
$message=$message.":\r\n\r\n".$_POST['text']."\r\n\r\n_____\r\n".$Titles[MailAdmin];
mail($GBnotificationmailto, $Titles[MailSubject], $message,
if ($GBlinkfield) $message=$message.$_POST["link"].", ";
$message=$message.$_POST["email"].") ".$Titles["Wrote"];
if ($GBsubjectfield) $message=$message." ".$_POST["subj"];
if ($GBcategoryfield) $message=$message." [".$_POST["category"]."]";
$message=$message.":\r\n\r\n".$_POST["text"]."\r\n\r\n_____\r\n".$Titles["MailAdmin"];
mail($GBnotificationmailto, $Titles["MailSubject"], $message,
"From: ".$GBnotificationmailfrom." \r\n"."Content-type: text/plain; charset=utf-8\r\n"
."X-Mailer: PHP/".phpversion());
}
@@ -38,15 +38,15 @@ function ReadEntries() {
$Entries["$e"][10]=$e+1;
}
fclose($fhandle);
if (!$Entries[0]) $DataStatus="empty";
return $Entries;
if (!isset($Entries[0])) $DataStatus="empty";
else return $Entries;
}
function SaveFile() {
$filename = substr(md5(uniqid()), 0, 13).'.'.pathinfo($_FILES['uploadedfile']['name'], PATHINFO_EXTENSION);
$uploaddir = 'upload/';
$filename = substr(md5(uniqid()), 0, 13).'.'.pathinfo($_FILES["uploadedfile"]["name"], PATHINFO_EXTENSION);
$uploaddir = "upload/";
$uploadfile = $uploaddir.$filename;
if (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $uploadfile)) {
if (move_uploaded_file($_FILES["uploadedfile"]["tmp_name"], $uploadfile)) {
return $uploadfile;
} else {
return false;
@@ -55,8 +55,8 @@ function SaveFile() {
function CheckFile() {
global $GBimagesize;
if (getimagesize($_FILES['uploadedfile']['tmp_name'])) {
if ((filesize($_FILES['uploadedfile']['tmp_name']))<($GBimagesize)) return SaveFile();
if (getimagesize($_FILES["uploadedfile"]["tmp_name"])) {
if ((filesize($_FILES["uploadedfile"]["tmp_name"]))<($GBimagesize)) return SaveFile();
else return false;
} else return false;
}
@@ -71,34 +71,34 @@ function AddEntry() {
global $GBsubjectfield;
global $GBcategoryfield;
global $GBstriptags;
if (!$GBstriptags) $NewEntry[name]=$_POST['name'];
else $NewEntry[name]=strip_tags($_POST['name']);
if (!$GBstriptags) $NewEntry["name"]=$_POST["name"];
else $NewEntry["name"]=strip_tags($_POST["name"]);
if ($GBcityfield) {
if (!$GBstriptags) $NewEntry[from]=$_POST['from'];
else $NewEntry[from]=strip_tags($_POST['from']);
} else $NewEntry[from]="";
if (!$GBstriptags) $NewEntry["from"]=$_POST["from"];
else $NewEntry["from"]=strip_tags($_POST["from"]);
} else $NewEntry["from"]="";
if ($GBlinkfield) {
if (!$GBstriptags) $NewEntry[link]=$_POST['link'];
else $NewEntry[link]=strip_tags($_POST['link']);
} else $NewEntry[link]="";
$NewEntry[email]=$_POST['email'];
if (!$GBstriptags) $NewEntry[text]=$_POST['text'];
else $NewEntry[text]=strip_tags($_POST['text']);
if ($UploadedFile) $NewEntry[text]=$NewEntry[text]." <br><img src=\"$UploadedFile\">";
$NewEntry[datetime]=time();
$NewEntry[response]="";
if (!$GBstriptags) $NewEntry["link"]=$_POST["link"];
else $NewEntry["link"]=strip_tags($_POST["link"]);
} else $NewEntry["link"]="";
$NewEntry["email"]=$_POST["email"];
if (!$GBstriptags) $NewEntry["text"]=$_POST["text"];
else $NewEntry["text"]=strip_tags($_POST["text"]);
if ($UploadedFile) $NewEntry["text"]=$NewEntry["text"]." <br><img src=\"$UploadedFile\">";
$NewEntry["datetime"]=time();
$NewEntry["response"]="";
if ($GBsubjectfield) {
if (!$GBstriptags) $NewEntry[subj]=$_POST['subj'];
else $NewEntry[subj]=strip_tags($_POST['subj']);
} else $NewEntry[subj]="";
if ($GBcategoryfield) $NewEntry[category]=strip_tags($_POST['category']);
else $NewEntry[category]="";
$NewEntry[parameters]="";
if (!$GBstriptags) $NewEntry["subj"]=$_POST["subj"];
else $NewEntry["subj"]=strip_tags($_POST["subj"]);
} else $NewEntry["subj"]="";
if ($GBcategoryfield) $NewEntry["category"]=strip_tags($_POST["category"]);
else $NewEntry["category"]="";
$NewEntry["parameters"]="";
$fhandle=fopen($GBdata,"a");
fputcsv($fhandle,$NewEntry);
fclose($fhandle);
$PageStatus="added";
$_SESSION['captcha']="";
$_SESSION["captcha"]="";
}
function AddEntryView() {
@@ -112,21 +112,21 @@ function AddEntryView() {
global $GBlinkfield;
global $GBsubjectfield;
global $GBcategoryfield;
echo "<h2>",$Titles[Page],"</h2><br>\n";
if ($PageStatus=="added") echo "$Titles[Added]"."<br>\n";
echo "<h2>",$Titles["Page"],"</h2><br>\n";
if ($PageStatus=="added") echo $Titles["Added"]."<br>\n";
$captchanumber11=rand(1, 4);
$captchanumber12=rand(0, 9);
$captchanumber21=rand(1, 4);
$captchanumber22=rand(0, 9);
$_SESSION['captcha']=md5(base64_encode(($captchanumber11.$captchanumber12)+($captchanumber21.$captchanumber22)));
$_SESSION["captcha"]=md5(base64_encode(($captchanumber11.$captchanumber12)+($captchanumber21.$captchanumber22)));
echo "<form action=index.php method=post enctype=\"multipart/form-data\">\n";
echo " $Titles[Name]: <input type=text name=\"name\" value=\"",$Values["name"],"\" maxlength=255> ($Titles[Required])<br>\n";
if ($GBcityfield) echo " $Titles[City]: <input type=text name=\"from\" value=\"",$Values["from"],"\" maxlength=255><br>\n";
if ($GBlinkfield) echo " $Titles[Link]: <input type=text name=\"link\" value=\"",$Values["link"],"\" maxlength=255><br>\n";
echo " $Titles[Email]: <input type=text name=\"email\" value=\"",$Values["email"],"\" maxlength=255> ($Titles[NotPublic])<br>\n";
if ($GBsubjectfield) echo " $Titles[Subject]: <input type=text name=\"subj\" value=\"",$Values["subj"],"\" maxlength=255><br>\n";
echo " ",$Titles["Name"],": <input type=text name=\"name\" value=\"",$Values["name"],"\" maxlength=255> (",$Titles["Required"],")<br>\n";
if ($GBcityfield) echo " ",$Titles["City"],": <input type=text name=\"from\" value=\"",$Values["from"],"\" maxlength=255><br>\n";
if ($GBlinkfield) echo " ",$Titles["Link"],": <input type=text name=\"link\" value=\"",$Values["link"],"\" maxlength=255><br>\n";
echo " ",$Titles["Email"],": <input type=text name=\"email\" value=\"",$Values["email"],"\" maxlength=255> ($Titles[NotPublic])<br>\n";
if ($GBsubjectfield) echo " ",$Titles["Subject"],": <input type=text name=\"subj\" value=\"",$Values["subj"],"\" maxlength=255><br>\n";
if ($GBcategoryfield) {
echo " $Titles[Category]: <select name=\"category\">";
echo " ",$Titles["Category"],": <select name=\"category\">";
foreach($GBcategoryfield as $Category) {
echo " <option value=\"$Category\"";
if ($Values["category"]==$Category) echo " selected=\"selected\"";
@@ -134,18 +134,18 @@ function AddEntryView() {
}
echo "</select><br>\n";
}
echo " $Titles[Text]:<br>\n <textarea name=\"text\" wrap=virtual cols=50 rows=5 maxlength=$GBtextlenght>",$Values["text"],"</textarea><br>\n";
echo " ",$Titles["Text"],":<br>\n <textarea name=\"text\" wrap=virtual cols=50 rows=5 maxlength=$GBtextlenght>",$Values["text"],"</textarea><br>\n";
if ($GBupload) {
echo " <label for=\"file\">".$Titles[FileUpload]."</label>\n";
echo " <label for=\"file\">".$Titles["FileUpload"]."</label>\n";
echo " <input type=\"file\" name=\"uploadedfile\"><br>\n";
}
if ($GBcaptcha) echo " $Titles[Captcha]: <font class=\"text\">$captchanumber11</font><font>$captchanumber11</font><font>$captchanumber12</font> $Titles[CaptchaPlus] <font>$captchanumber21</font><font>$captchanumber22</font><font class=\"text\">$captchanumber21</font> = <input type=text name=\"captcha\" size=2 maxlength=2> ?<br>\n";
echo " <input type=submit name=\"submit\" value=\"$Titles[Submit]\">\n";
if ($GBcaptcha) echo " ",$Titles["Captcha"],": <font class=\"text\">$captchanumber11</font><font>$captchanumber11</font><font>$captchanumber12</font> ",$Titles["CaptchaPlus"]," <font>$captchanumber21</font><font>$captchanumber22</font><font class=\"text\">$captchanumber21</font> = <input type=text name=\"captcha\" size=2 maxlength=2> ?<br>\n";
echo " <input type=submit name=\"submit\" value=\"",$Titles["Submit"],"\">\n";
echo "</form>\n";
if ($PageStatus=="emptyname") echo "$Titles[EmptyName]<br>\n";
if ($PageStatus=="emptytext") echo "$Titles[EmptyText]<br>\n";
if ($PageStatus=="wrongimage") echo "$Titles[WrongImage]<br>\n";
if ($PageStatus=="wrongcaptcha") echo "$Titles[WrongCaptcha]<br>\n";
if ($PageStatus=="emptyname") echo $Titles["EmptyName"],"<br>\n";
if ($PageStatus=="emptytext") echo $Titles["EmptyText"],"<br>\n";
if ($PageStatus=="wrongimage") echo $Titles["WrongImage"],"<br>\n";
if ($PageStatus=="wrongcaptcha") echo $Titles["WrongCaptcha"],"<br>\n";
}
function Search($SearchQuery) {
@@ -171,7 +171,7 @@ function AddSearchBar() {
if ($GBsearch) {
echo "<form action=index.php method=post>";
echo "<input type=text name=\"serachq\" value=\"\" maxlength=255>";
echo "<input type=submit name=\"search\" value=\"$Titles[Search]\">";
echo "<input type=submit name=\"search\" value=\"",$Titles["Search"],"\">";
echo "</form>";
}
}
@@ -187,9 +187,9 @@ function SinlgeEntry($Entry) {
if ($Entry[2]) echo "<a href=\"",$Entry[2],"\">";
echo "<b>",$Entry[0],"</b>";
if ($Entry[2]) echo "</a>";
if ($Entry[1]) echo " ",$Titles[From]," <b>",$Entry[1],"</b>";
echo ", ",date("j.m.Y, H:i",$Entry[5]),", ",$Titles[Wrote];
if (($GBsubjectfield)&&($Entry[7])) echo " ",$Titles[About]," '",$Entry[7],"'";
if ($Entry[1]) echo " ",$Titles["From"]," <b>",$Entry[1],"</b>";
echo ", ",date("j.m.Y, H:i",$Entry[5]),", ",$Titles["Wrote"];
if (($GBsubjectfield)&&($Entry[7])) echo " ",$Titles["About"]," '",$Entry[7],"'";
if (($GBcategoryfield)&&($Entry[8])) echo " [",$Entry[8],"]";
echo ":</div></h4><br>\n";
if ($GBreadmore>0) {
@@ -199,12 +199,12 @@ function SinlgeEntry($Entry) {
if ($_POST[$readmorenumber]) echo " ",nl2br($Entry[4]),"<br>\n";
else {
$Message = substr($Message, 0, $GBreadmore);
$Message = substr($Message, 0, strrpos($Message, ' '))."... <form action=\"\" method=\"post\"><button type=\"submit\" name=\"readmore".$Entry[10]."\" value=\"read\" class=\"btn-link\">".$Titles[ReadMore]."</button></form>";
$Message = substr($Message, 0, strrpos($Message, ' '))."... <form action=\"\" method=\"post\"><button type=\"submit\" name=\"readmore".$Entry[10]."\" value=\"read\" class=\"btn-link\">".$Titles["ReadMore"]."</button></form>";
echo " ",nl2br($Message),"<br>\n";
}
} else echo " ",nl2br($Entry[4]),"<br>\n";
} else echo " ",nl2br($Entry[4]),"<br>\n";
if ($Entry[6]) echo "<br><i><b>$Titles[Response]:</b><br>\n";
if ($Entry[6]) echo "<br><i><b>",$Titles["Response"],":</b><br>\n";
if ($Entry[6]) echo nl2br($Entry[6]),"</i><br>\n";
echo "</div><hr>\n";
}
@@ -219,32 +219,32 @@ function EntriesView() {
global $GBlinkfield;
global $GBsubjectfield;
global $GBcategoryfield;
if ($DataStatus=="empty") echo "$Titles[EmptyFile]";
else if($_POST['search']&&$_POST['serachq']) {
$SearchResult=Search($_POST['serachq']);
if ($DataStatus=="empty") echo $Titles["EmptyFile"];
else if(isset($_POST["search"])&&isset($_POST["serachq"])) {
$SearchResult=Search($_POST["serachq"]);
if ($SearchResult) {
$GBpagination=0;
unset($Entries);
foreach($SearchResult as $n=>$Entry) $Entries[$n]=$Entry[1];
} else echo "$Titles[NoResult]: '",$_POST['serachq'],"'.<br>\n";
} else echo $Titles["NoResult"].": '",$_POST["serachq"],"'.<br>\n";
}
if (($GBpagination>0)&&(count($Entries)>$GBpagination)) {
$Entries=array_reverse($Entries);
if ($_GET['page']) switch ($_GET['page']) {
case $Titles[First]:
if (isset($_GET["page"])) switch ($_GET["page"]) {
case $Titles["First"]:
$CurrentPage=0;
break;
case $Titles[Last]:
case $Titles["Last"]:
$CurrentPage=(int)((count($Entries)-1)/$GBpagination);
break;
case "$Titles[Previous]":
$CurrentPage=$_SESSION['currentpage']-1;
case $Titles["Previous"]:
$CurrentPage=$_SESSION["currentpage"]-1;
break;
case "$Titles[Next]":
$CurrentPage=$_SESSION['currentpage']+1;
case $Titles["Next"]:
$CurrentPage=$_SESSION["currentpage"]+1;
break;
default:
$CurrentPage=$_GET['page']-1;
$CurrentPage=$_GET["page"]-1;
}
else $CurrentPage=0;
for ($e = ($GBpagination*$CurrentPage); $e < ($GBpagination*($CurrentPage+1)); $e++) {
@@ -253,8 +253,8 @@ function EntriesView() {
}
echo "<form action=index.php method=\"get\">\n";
if ($CurrentPage>0) {
echo " <input type=\"submit\" value=\"$Titles[First]\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"$Titles[Previous]\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"",$Titles["First"],"\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"",$Titles["Previous"],"\" name=\"page\"/>\n";
}
for ($p = ($CurrentPage-2); $p <= ($CurrentPage+2); $p++) {
$page = $p+1;
@@ -265,50 +265,52 @@ function EntriesView() {
}
}
if ($CurrentPage<((count($Entries)/$GBpagination)-1)) {
echo " <input type=\"submit\" value=\"$Titles[Next]\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"$Titles[Last]\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"",$Titles["Next"],"\" name=\"page\"/>\n";
echo " <input type=\"submit\" value=\"",$Titles["Last"],"\" name=\"page\"/>\n";
}
echo "</form>\n";
$_SESSION['currentpage']=$CurrentPage;
$_SESSION["currentpage"]=$CurrentPage;
} else {
$Entries=array_reverse($Entries);
foreach($Entries as $e=>$Entry) SinlgeEntry($Entry);
if (isset($Entries[0])) {
$Entries=array_reverse($Entries);
foreach($Entries as $e=>$Entry) SinlgeEntry($Entry);
}
}
}
if($_POST['submit']) {
if (!$_POST['text']) $PageStatus="emptytext";
if (!$_POST['name']) $PageStatus="emptyname";
if(isset($_POST["submit"])) {
if (!$_POST["text"]) $PageStatus="emptytext";
if (!$_POST["name"]) $PageStatus="emptyname";
if ($GBupload) {
if ($_FILES['uploadedfile']['tmp_name']) {
if ($_FILES["uploadedfile"]["tmp_name"]) {
$UploadedFile=CheckFile();
if (!$UploadedFile) {
$PageStatus="wrongimage";
}
}
}
if (($_POST['name'])&&($_POST['text']))
if ($_POST["captcha"]&&(md5(base64_encode($_POST["captcha"]))==$_SESSION["captcha"])) {
if (!$PageStatus=="wrongimage") {
if (($_POST["name"])&&($_POST["text"]))
if (isset($_POST["captcha"])&&(md5(base64_encode($_POST["captcha"]))==$_SESSION["captcha"])) {
if (!isset($PageStatus)=="wrongimage") {
AddEntry();
if ($GBnotificationmailto) SendMail();
}
} else if (!$GBcaptcha) {
if (!$PageStatus=="wrongimage") {
if (!isset($PageStatus)=="wrongimage") {
AddEntry();
if ($GBnotificationmailto) SendMail();
}
} else $PageStatus="wrongcaptcha";
if (($PageStatus)&&!($PageStatus=="added")) {
$SESSION["value"]["name"]=$_POST['name'];
$SESSION["value"]["from"]=$_POST['from'];
$SESSION["value"]["link"]=$_POST['link'];
$SESSION["value"]["subj"]=$_POST['subj'];
$SESSION["value"]["category"]=$_POST['category'];
$SESSION["value"]["email"]=$_POST['email'];
$SESSION["value"]["text"]=$_POST['text'];
$SESSION["value"]["name"]=$_POST["name"];
$SESSION["value"]["from"]=$_POST["from"];
$SESSION["value"]["link"]=$_POST["link"];
$SESSION["value"]["subj"]=$_POST["subj"];
$SESSION["value"]["category"]=$_POST["category"];
$SESSION["value"]["email"]=$_POST["email"];
$SESSION["value"]["text"]=$_POST["text"];
$Values=$SESSION["value"];
} else Unset($SESSION["value"]);
} else if (isset($SESSION["value"])) Unset($SESSION["value"]);
}
$Entries=ReadEntries();