From fd974c7bb70fcd195aa6fb43ed8f771e22ac5fe0 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Wed, 19 Sep 2012 17:29:10 +0100 Subject: [PATCH] Removed restrictedFile, DOM ready update & tweak You cannot get access to ICEcoder unless you have logged in, so restrictedFiles is not needed anymore Removed it and all instances of it's usage Only updating pluginsContainer if it's a DOM elem Change title tag of login/set password screen conditionally --- files.php | 7 ------- lib/config.php | 1 - lib/file-control.php | 6 ------ lib/multiple-results.php | 6 +----- lib/settings-screen.php | 2 -- lib/settings.php | 14 ++++++++------ 6 files changed, 9 insertions(+), 27 deletions(-) diff --git a/files.php b/files.php index 26e5f95..d010316 100644 --- a/files.php +++ b/files.php @@ -12,7 +12,6 @@
\n"; } } - $restrictedFile=false; - for ($j=0;$j'.$chmodInfo.''; diff --git a/lib/config.php b/lib/config.php index 3fbc8b3..554cf53 100644 --- a/lib/config.php +++ b/lib/config.php @@ -9,7 +9,6 @@ $ICEcoder = array( "visibleTabs" => false, "lockedNav" => true, "accountPassword" => "", -"restrictedFiles" => array("wp-",".php",".rb",".sql",".zip"), "bannedFiles" => array("_coder","ICEcoder"), "allowedIPs" => array("*"), "plugins" => array( diff --git a/lib/file-control.php b/lib/file-control.php index 7ad6b64..44b534e 100644 --- a/lib/file-control.php +++ b/lib/file-control.php @@ -25,12 +25,6 @@ if ($_GET['action']=="load") { if (strpos($fileName,".jpg")>0||strpos($fileName,".jpeg")>0||strpos($fileName,".gif")>0||strpos($fileName,".png")>0) {$fileType="image";}; if ($fileType=="text") { - $bannedFile=false; - for ($i=0;$ifileType="text";'; echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";'; diff --git a/lib/multiple-results.php b/lib/multiple-results.php index 3b60e83..bd2a829 100644 --- a/lib/multiple-results.php +++ b/lib/multiple-results.php @@ -101,15 +101,11 @@ if (startTab!=top.ICEcoder.selectedTab) { if(is_dir($fullPath)) { $ret .= phpGrep($q, $fullPath, $base); } else if(stristr(file_get_contents($fullPath), $q)) { - $rFile = false; $bFile = false; - for ($i=0;$i0) {$rFile = true;}; - } for ($i=0;$i0) {$bFile = true;}; } - if (!$rFile && !$bFile) { + if (!$bFile) { $ret .= ""; $ret .= str_replace($base,"",$fullPath)."
Found ".substr_count(strtolower(file_get_contents($fullPath)),$q)." times
"; if (isset($_GET['replace'])) { diff --git a/lib/settings-screen.php b/lib/settings-screen.php index bc2e15d..e3f45e7 100644 --- a/lib/settings-screen.php +++ b/lib/settings-screen.php @@ -98,8 +98,6 @@ new password 8 chars
confirm password


-restricted files/folders
-">
banned files/folders
">
diff --git a/lib/settings.php b/lib/settings.php index 36b04f9..6ef252e 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -51,14 +51,13 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) { $ICEcoder["visibleTabs"] = $_POST['visibleTabs'] ? "true" : "false"; $ICEcoder["lockedNav"] = $_POST['lockedNav'] ? "true" : "false"; if ($_POST['accountPassword']!="") {$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));}; - $ICEcoder["restrictedFiles"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['restrictedFiles']))).'")'; $ICEcoder["bannedFiles"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")'; $ICEcoder["allowedIPs"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")'; $ICEcoder["plugins"] = 'array('.PHP_EOL.' array('.PHP_EOL.' '.str_replace('====================','),'.PHP_EOL.' array(',$_POST['plugins']).'))'; $ICEcoder["theme"] = strClean($_POST['theme']); $ICEcoder["tabWidth"] = numClean($_POST['tabWidth']); - $settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","restrictedFiles","bannedFiles","allowedIPs","plugins","theme","tabWidth"); + $settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","allowedIPs","plugins","theme","tabWidth"); $settingsNew = ""; for ($i=0;$i '; @@ -74,7 +73,7 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) { fclose($fh); // OK, now the config file has been updated, update our current session with new arrays - $settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs"); + $settingsArray = array("findFilesExclude","bannedFiles","allowedIPs"); for ($i=0;$itop.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."';"; + echo ""; // Work out what plugins we'll need to set on a setInterval $onLoadExtras = ""; @@ -227,7 +226,10 @@ if (!$_SESSION['loggedIn']) { - ICEcoder <?php echo $ICEcoder["versionNo"];?> setup + ICEcoder <?php +echo $ICEcoder["versionNo"]." : "; +echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login"; +?>