From 1b37c3f5370db0a6d4b0b294e8f58e35a42a5211 Mon Sep 17 00:00:00 2001
From: Kim Keown <kimkeown@users.noreply.github.com>
Date: Tue, 25 Oct 2016 06:12:40 -0600
Subject: [PATCH]  Revise login-email.php - Admin folder rename

Add variable in bl-kernel/boot/init.php that allows User to rename bl-kernel/admin folder.
User can then define variable in bl-kernel/boot/init.php and change the foldername itself to effect the rename.

Add global $adminfolder variable as necessary and replace relevant 'admin' strings with $adminfolder.
Applies to most of the files in bl-kernel/admin/controllers.

Line 17 - Reference Admin folder variable within function
	       	global $adminfolder;

Line 37 - Replace Admin string with folder variable:
		$link = $Site->url().$adminfolder.'/login-email?tokenEmail='.$token.'&username='.$username;
Original: 	$link = $Site->url().'admin/login-email?tokenEmail='.$token.'&username='.$username;


Line 78 - Reference Admin folder variable within function
	      global $adminfolder;

Line 91 - Replace Admin string with folder variable:
		Redirect::page($adminfolder, 'dashboard');
Original:  Redirect::page('admin', 'dashboard');
---
 bl-kernel/admin/controllers/login-email.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bl-kernel/admin/controllers/login-email.php b/bl-kernel/admin/controllers/login-email.php
index fdfbfb3e..fd7b8fe5 100644
--- a/bl-kernel/admin/controllers/login-email.php
+++ b/bl-kernel/admin/controllers/login-email.php
@@ -14,7 +14,8 @@ function checkPost($args)
 	global $Language;
 	global $dbUsers;
 	global $Site;
-
+	global $adminfolder;
+	
 	if($Security->isBlocked()) {
 		Alert::set($Language->g('IP address has been blocked').'<br>'.$Language->g('Try again in a few minutes'));
 		return false;
@@ -33,7 +34,7 @@ function checkPost($args)
 			$token = $dbUsers->generateTokenEmail($username);
 
 			// ---- EMAIL ----
-			$link = $Site->url().'admin/login-email?tokenEmail='.$token.'&username='.$username;
+			$link = $Site->url().$adminfolder.'/login-email?tokenEmail='.$token.'&username='.$username;
 			$subject = $Language->g('BLUDIT Login access code');
 			$message = Text::replaceAssoc(
 					array(
@@ -74,6 +75,7 @@ function checkGet($args)
 	global $Security;
 	global $Language;
 	global $Login;
+	global $adminfolder;
 
 	if($Security->isBlocked()) {
 		Alert::set($Language->g('IP address has been blocked').'<br>'.$Language->g('Try again in a few minutes'));
@@ -86,7 +88,7 @@ function checkGet($args)
 		// Renew the tokenCRFS. This token will be the same inside the session for multiple forms.
 		$Security->generateTokenCSRF();
 
-		Redirect::page('admin', 'dashboard');
+		Redirect::page($adminfolder, 'dashboard');
 		return true;
 	}