From 47cf80102c60e43009eb88342dddadf7518fd045 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 31 May 2013 20:25:44 +0100 Subject: [PATCH] Run processes on events On logout event, include that process Settings template file is now config___template.php Create new if statement for login success and fail, plus run processes for each event On new user setup, run that process If multiUser, always show the checkUpdates box as we don't know if we're setting up a new user or logging in, so have to assume it's a new user and allow this setting to show --- lib/settings.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/settings.php b/lib/settings.php index 4d5098b..b80e206 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -20,6 +20,7 @@ if(!isset($_SESSION)) {session_start();} // Logout if that's the action we're taking if (isset($_GET['logout'])) { + include(dirname(__FILE__)."/../processes/on-user-logout.php"); $_SESSION['loggedIn']=false; $_SESSION['username']=false; session_destroy(); @@ -80,7 +81,7 @@ function toUTF8noBOM($string,$message) { } // Settings are stored in this file -$settingsTemplate = 'config-template.php'; +$settingsTemplate = 'config___template.php'; $username = ""; if (isset($_POST['username']) && $_POST['username'] != "") {$username = strClean($_POST['username']."-");}; if (isset($_SESSION['username']) && $_SESSION['username'] != "") {$username = strClean($_SESSION['username']."-");}; @@ -171,12 +172,17 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset // Establish our user level if (!isset($_SESSION['loggedIn'])) {$_SESSION['loggedIn'] = false;}; 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']; +if(isset($_POST['submit']) && $setPWorLogin=="login") { + if (generateHash(strClean($_POST['password']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) { + if ($ICEcoder["multiUser"]) { + $_SESSION['username'] = $_POST['username']; + } + $_SESSION['loggedIn'] = true; + include(dirname(__FILE__)."/../processes/on-user-login.php"); + header('Location: ../'); + } else { + include(dirname(__FILE__)."/../processes/on-user-login-fail.php"); } - $_SESSION['loggedIn'] = true; - header('Location: ../'); }; $_SESSION['loggedIn'] = $_SESSION['loggedIn']; $_SESSION['username'] = $_SESSION['username']; @@ -333,6 +339,7 @@ if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_ $_SESSION['username']=$_POST['username']; } $_SESSION['loggedIn'] = true; + include(dirname(__FILE__)."/../processes/on-user-new.php"); // Finally, load again as now this file has changed and auto login header('Location: ../'); } @@ -363,7 +370,7 @@ echo $ICEcoder["accountPassword"] == "" && !$ICEcoder["multiUser"] ? "Setup" : "

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