From d6c282a70a61386d809e27ec5f639e400d55ff81 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 31 May 2013 10:36:39 +0100 Subject: [PATCH] Multi user setup & login added Session accountUsername is now just username Settings filename now may contain the username if available from a post or session var setPWorLogin is now login by default, set password if we create a new config file Instead of the posted accountPassword value, we now look to the value of the submit button and if it contains 'set password' or not Set session username to the posted value on login or set password and set to itself on every load accountPassword form field now just password Focus on the username or password field, depending on the 1st one shown on page Set the value of the submit button to 'set password / login' if multiUser --- lib/settings.php | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/lib/settings.php b/lib/settings.php index eb8c474..b47a1a1 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -21,7 +21,7 @@ if(!isset($_SESSION)) {session_start();} // Logout if that's the action we're taking if (isset($_GET['logout'])) { $_SESSION['loggedIn']=false; - $_SESSION['accountUsername']=false; + $_SESSION['username']=false; session_destroy(); header("Location: dirname(__FILE__)./?loggedOut"); } @@ -81,11 +81,16 @@ function toUTF8noBOM($string,$message) { // Settings are stored in this file $settingsTemplate = 'config-template.php'; -$settingsFile = 'config-'.str_replace(".","_",$_SERVER['SERVER_NAME']).'.php'; +$username = ""; +if (isset($_POST['username']) && $_POST['username'] != "") {$username = strClean($_POST['username']."-");}; +if (isset($_SESSION['username']) && $_SESSION['username'] != "") {$username = strClean($_SESSION['username']."-");}; +$settingsFile = 'config-'.$username.str_replace(".","_",$_SERVER['SERVER_NAME']).'.php'; +$setPWorLogin = "login"; if (!file_exists(dirname(__FILE__)."/".$settingsFile)) { if (!copy(dirname(__FILE__)."/".$settingsTemplate, dirname(__FILE__)."/".$settingsFile)) { die("Couldn't create $settingsFile. Maybe you need write permissions on the lib folder?"); } + $setPWorLogin = "set password"; } include(dirname(__FILE__)."/".$settingsFile); @@ -95,7 +100,7 @@ $ICEcoder = array( "codeMirrorDir" => "CodeMirror-3.13", "demoMode" => false, "devMode" => false, - "multiUser" => false, + "multiUser" => true, "lineEnding" => "\n" )+$ICEcoder; @@ -120,7 +125,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset $ICEcoder["codeAssist"] = isset($_POST['codeAssist']) && $_POST['codeAssist'] ? "true" : "false"; $ICEcoder["visibleTabs"] = isset($_POST['visibleTabs']) && $_POST['visibleTabs'] ? "true" : "false"; $ICEcoder["lockedNav"] = isset($_POST['lockedNav']) && $_POST['lockedNav'] ? "true" : "false"; - if ($_POST['accountPassword']!="") {$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));}; + if (strpos($_POST['submit'],"set password")>-1) {$ICEcoder["accountPassword"] = generateHash(strClean($_POST['password']));}; $ICEcoder["bannedFiles"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")'; $ICEcoder["bannedPaths"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedPaths']))).'")'; $ICEcoder["allowedIPs"] = 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")'; @@ -165,8 +170,16 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset // Establish our user level if (!isset($_SESSION['loggedIn'])) {$_SESSION['loggedIn'] = false;}; -if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['loggedIn'] = true; header('Location: ../');}; +if (!isset($_SESSION['username'])) {$_SESSION['username'] = false;}; +if(isset($_POST['submit']) && $setPWorLogin=="login" && generateHash(strClean($_POST['password']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) { + if ($ICEcoder["multiUser"]) { + $_SESSION['username'] = $_POST['username']; + } + $_SESSION['loggedIn'] = true; + header('Location: ../'); +}; $_SESSION['loggedIn'] = $_SESSION['loggedIn']; +$_SESSION['username'] = $_SESSION['username']; // Define the serverType, docRoot & iceRoot $serverType = stristr($_SERVER['SERVER_SOFTWARE'], "win") ? "Windows" : "Linux"; @@ -300,8 +313,8 @@ if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_ // If we're due to show the settings screen } elseif (!$_SESSION['loggedIn']) { // If the password hasn't been set and we're setting it - if ($ICEcoder["accountPassword"] == "" && isset($_POST['accountPassword'])) { - $password = generateHash(strClean($_POST['accountPassword'])); + if ($ICEcoder["accountPassword"] == "" && isset($_POST['submit']) && (strpos($_POST['submit'],"set password")>-1)) { + $password = generateHash(strClean($_POST['password'])); $settingsFile = $settingsFile; $settingsContents = file_get_contents($settingsFile,false,$context); // Replace our empty password with the one submitted by user @@ -316,6 +329,9 @@ if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_ fwrite($fh, $settingsContents); fclose($fh); // Set the session user level + if ($ICEcoder["multiUser"]) { + $_SESSION['username']=$_POST['username']; + } $_SESSION['loggedIn'] = true; // Finally, load again as now this file has changed and auto login header('Location: ../'); @@ -327,7 +343,7 @@ if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_ ICEcoder <?php echo $ICEcoder["versionNo"]." : "; -echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login"; +echo $ICEcoder["accountPassword"] == "" && !$ICEcoder["multiUser"] ? "Setup" : "Login"; ?> @@ -335,7 +351,7 @@ echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login"; -Password.focus()"> +.focus()">
@@ -343,14 +359,14 @@ echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
v
-

';};?> - Password" class="accountPassword">

- " class="button"> +

';};?> +

+ " class="button"> auto-check for updates
'; } - if (!$ICEcoder["multiUser"] && 1==2) { echo '
multi-user?
';}; + if (!$ICEcoder["multiUser"]) { echo '
multi-user?
';}; ?>