From 2b0b67d2a056be36bf597692ac202134534a90f7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 29 Sep 2016 21:51:49 -0400
Subject: [PATCH] Login screen redone

---
 admin/index.php           | 168 +++++++++++++++++++-------------------
 css/mods-for-hesk-new.css |  19 +++++
 inc/headerAdmin.inc.php   |   6 ++
 language/en/text.php      |   1 +
 4 files changed, 110 insertions(+), 84 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 5e7598f1..822e3de4 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,6 +30,7 @@
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
+define('PAGE_TITLE', 'LOGIN');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -58,9 +59,6 @@ switch ($action) {
         hesk_autoLogin();
         print_login();
 }
-
-/* Print footer */
-require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
 
 /*** START FUNCTIONS ***/
@@ -274,7 +272,7 @@ function print_login()
     }
 
     $hesk_settings['tmp_title'] = $hesk_settings['hesk_title'] . ' - ' .$hesklang['admin_login'];
-	require_once(HESK_PATH . 'inc/header.inc.php');
+	require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
 	if ( hesk_isREQUEST('notice') )
 	{
@@ -287,29 +285,34 @@ function print_login()
     }
 
 	?>
-    <div class="loginError"><?php
-	            /* This will handle error, success and notice messages */
-	            hesk_handle_messages();
-	        ?></div>
-    <div>
-    <div class="panel panel-default form-signin">
-        <div class="panel-heading">
-            <h4><span <?php echo $iconDisplay; ?>><span class="mega-octicon octicon-sign-in"></span>&nbsp;</span><?php echo $hesklang['admin_login']; ?></h4>
+<div class="login-box">
+    <div class="login-logo">
+        <?php echo $hesklang['staff_login_title']; ?>
+    </div>
+    <div class="login-box-body">
+        <div class="loginError">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
+            ?>
         </div>
-        <div class="panel-body">
-            <form class="form-signin form-horizontal" role="form" action="index.php" method="post" name="form1">
-                <?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?>
-                <label for="user" class="col-sm-4 control-label"><?php echo $hesklang['username']; ?>:</label>
+        <form class="form-horizontal" role="form" action="index.php" method="post" name="form1">
+            <?php
+            $has_error = '';
+            if (in_array('pass',$_SESSION['a_iserror'])) {
+                $has_error = 'has-error';
+            }
+            ?>
+            <div class="form-group <?php echo $has_error; ?>">
+                <label for="user" class="col-sm-4 control-label">
+                    <?php echo $hesklang['username']; ?>
+                </label>
                 <div class="col-sm-8">
                     <?php
-
-                    if (defined('HESK_USER'))
-                    {
+                    if (defined('HESK_USER')) {
                         $savedUser = HESK_USER;
-                    }
-                    else
-                    {
-                        $savedUser = hesk_htmlspecialchars( hesk_COOKIE('hesk_username') );
+                    } else {
+                        $savedUser = hesk_htmlspecialchars(hesk_COOKIE('hesk_username'));
                     }
 
                     $is_1 = '';
@@ -318,44 +321,48 @@ function print_login()
 
                     $remember_user = hesk_POST('remember_user');
 
-                    if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN') )
-                    {
-                        $is_1 = 'checked="checked"';
+                    if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN')) {
+                        $is_1 = 'checked';
+                    } elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER') {
+                        $is_2 = 'checked';
+                    } else {
+                        $is_3 = 'checked';
                     }
-                    elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER' )
-                    {
-                        $is_2 = 'checked="checked"';
-                    }
-                    else
-                    {
-                        $is_3 = 'checked="checked"';
-                    }
-
-                    if ($hesk_settings['list_users'])
-                    {
-                        echo '<select class="form-control" name="user">';
-                        $res = hesk_dbQuery('SELECT `user` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'users` ORDER BY `user` ASC');
-                        while ($row=hesk_dbFetchAssoc($res))
-                        {
-                            $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected="selected"' : '';
-                            echo '<option value="'.$row['user'].'" '.$sel.'>'.$row['user'].'</option>';
-                        }
-                        echo '</select>';
 
-                    }
-                    else
-                    {
-                        echo '<input class="form-control" type="text" name="user" size="35" placeholder="'.htmlspecialchars($hesklang['username']).'" value="'.$savedUser.'" />';
-                    }
+                    if ($hesk_settings['list_users']) :
+                        $res = hesk_dbQuery("SELECT `user` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `user` ASC");
                     ?>
+                        <select class="form-control" name="user">
+                            <?php
+                            while ($row = hesk_dbFetchAssoc($res)):
+                                $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected' : '';
+                            ?>
+                                <option value="<?php echo $row['user']; ?>" <?php echo $sel; ?>>
+                                    <?php echo $row['user']; ?>
+                                </option>
+                            <?php endwhile; ?>
+                        </select>
+                    <?php else: ?>
+                        <input class="form-control" type="text" name="user" size="35"
+                               placeholder="<?php echo htmlspecialchars($hesklang['username']); ?>"
+                               value="<?php echo $savedUser; ?>">
+                    <?php endif; ?>
                 </div>
             </div>
-            <?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?>
-            <label for="pass" class="col-sm-4 control-label"><?php echo $hesklang['pass']; ?>:</label>
-            <div class="col-sm-8">
-                <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>"  />
+            <?php
+            $has_error = '';
+            if (in_array('pass',$_SESSION['a_iserror'])) {
+                $has_error = 'has-error';
+            }
+            ?>
+            <div class="form-group <?php echo $has_error; ?>">
+                <label for="pass" class="col-sm-4 control-label">
+                    <?php echo $hesklang['pass']; ?>
+                </label>
+                <div class="col-sm-8">
+                    <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>">
+                </div>
             </div>
-        </div>
             <?php
             if ($hesk_settings['secimg_use'] == 2)
             {
@@ -387,22 +394,22 @@ function print_login()
                             }
                         };
                     </script>
-                    <?php
-                    require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
-                    echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
-                    echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
-                    echo '</div></div>';
+                <?php
+                require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
+                echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
+                echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
+                echo '</div></div>';
                 }
                 // Use reCaptcha API v2?
                 elseif ($hesk_settings['recaptcha_use'] == 2)
                 {
-                    ?>
+                ?>
                     <div class="form-group">
                         <div class="col-md-8 col-md-offset-4">
                             <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>"></div>
                         </div>
                     </div>
-                <?php
+                    <?php
                 }
                 // At least use some basic PHP generated image (better than nothing)
                 else
@@ -410,9 +417,9 @@ function print_login()
                     echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
                     $cls = in_array('mysecnum',$_SESSION['a_iserror']) ? ' class="isError" ' : '';
 
-                    echo $hesklang['sec_enter'].'<br />&nbsp;<br /><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom" /> '.
-                        '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom" /></a>'.
-                        '<br />&nbsp;<br /><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.' />';
+                    echo $hesklang['sec_enter'].'<br><br><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom"> '.
+                        '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom"></a>'.
+                        '<br><br><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.'>';
                     echo '</div></div>';
                 }
             } // End if $hesk_settings['secimg_use'] == 2
@@ -423,17 +430,17 @@ function print_login()
                 <div class="form-group">
                     <div class="col-md-offset-4 col-md-8">
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?> /> <?php echo $hesklang['autologin']; ?></label>
+                            <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?>> <?php echo $hesklang['autologin']; ?></label>
                         </div>
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?> /> <?php echo $hesklang['just_user']; ?></label>
+                            <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?>> <?php echo $hesklang['just_user']; ?></label>
                         </div>
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?> /> <?php echo $hesklang['nothx']; ?></label>
+                            <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?>> <?php echo $hesklang['nothx']; ?></label>
                         </div>
                     </div>
                 </div>
-            <?php
+                <?php
             }
             else
             {
@@ -445,40 +452,33 @@ function print_login()
                         </div>
                     </div>
                 </div>
-            <?php
+                <?php
             } // End if $hesk_settings['autologin']
             ?>
             <div class="form-group">
                 <div class="col-md-offset-4 col-md-8">
-                    <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default" />
-                    <input type="hidden" name="a" value="do_login" />
+                    <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default">
+                    <input type="hidden" name="a" value="do_login">
                     <?php
                     if ( hesk_isREQUEST('goto') && $url=hesk_REQUEST('goto') )
                     {
-                        echo '<input type="hidden" name="goto" value="'.$url.'" />';
+                        echo '<input type="hidden" name="goto" value="'.$url.'">';
                     }
 
                     // Do we allow staff password reset?
                     if ($hesk_settings['reset_pass'])
                     {
-                        echo '<br />&nbsp;<br /><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
+                        echo '<br><br><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
                     }
                     ?>
                 </div>
             </div>
-
-            </form>
-        </div>
+        </form>
     </div>
-
-    </div>
-
-    <p>&nbsp;</p>
-
-	<?php
+</div>
+<?php
 	hesk_cleanSessionVars('a_iserror');
 
-    require_once(HESK_PATH . 'inc/footer.inc.php');
     exit();
 } // End print_login()
 
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index 99dabd02..c8ed2556 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -131,4 +131,23 @@
 button.dropdown-submit {
     background: none !important;
     border: none;
+}
+
+.form-signin {
+    max-width: 800px;
+    margin: 0 auto;
+}
+
+.loginError {
+    padding-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.login-box {
+    width: 500px;
+}
+
+.login-box-body {
+    border-radius: 5px;
 }
\ No newline at end of file
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index dfd117a3..53274e4f 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -140,6 +140,12 @@ $modsForHesk_settings = mfh_getSettings();
         .h3questionmark {
             color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
         }
+
+        <?php if (defined('PAGE_TITLE') && PAGE_TITLE == 'LOGIN'): ?>
+        body {
+            background: #d2d6de;
+        }
+        <?php endif; ?>
     </style>
 
     <?php
diff --git a/language/en/text.php b/language/en/text.php
index 0e72afed..2a39ef5e 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -65,6 +65,7 @@ $hesklang['revoke_all_tokens'] = 'Revoke All Tokens';
 $hesklang['generated_token_colon'] = 'Generated Token:';
 $hesklang['record_this_token_warning'] = 'Please record this token, as this is the only time you will be able to view it!';
 $hesklang['all_tokens_revoked'] = 'All tokens for this user have been revoked';
+$hesklang['staff_login_title'] = 'Staff Login';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.6.0
 $hesklang['search_logs'] = 'Search Logs';