Tweaks

inc/header.inc.php

@@ -127,7 +127,7 @@
                             <!-- MENU FOR ALL LOGGED IN - BOTTOM END -->
                     </ul>
                     <ul class="navbar-nav mr-sm-2">
-                        <li class="nav-item"><a class="nav-link<?php $sname=$SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]; if($sname=="NOSITE") { echo " btn btn-sm btn-outline-warning"; } else { echo " btn btn-sm btn-outline-secondary"; }; ?>" href="#" data-toggle="modal" data-target="#sitetimeModal"><i class="fas fa-map-marker-alt"></i> <?php if ($sname=="NOSITE") {echo $transLang['NOSITE'];} else { echo $sname; } ?></a></li>
+                        <li class="nav-item"><a class="nav-link<?php $sname=$SiteInfo->getSite($siteid, "0", "0", "0")[0]["sites_name"]; if($sname=="NOSITE") { echo " btn btn-sm btn-outline-warning"; } else { echo " btn btn-sm btn-outline-secondary"; }; ?>" href="#" data-toggle="modal" data-target="#sitetimeModal"><i class="fas fa-map-marker-alt"></i> <?php if ($sname=="NOSITE") {echo $transLang['NOSITE'];} else { echo $sname; } ?></a></li>
                         <li class="nav-item<?php if ($app_current_pagename==$transLang['LOGOUT']): echo " active"; endif; ?>"><a class="nav-link btn btn-sm btn-outline-danger" href="logout.php"><i class="fas fa-ban"></i> <?php echo $transLang['LOGOUT']; ?></a></li>
                         <?php endif; ?>
                         <form action="changelang.php" method="post" name="changelang" class="changelang">
@@ -162,9 +162,8 @@
                                     <button class="btn btn-outline-secondary" type="button"><?php echo $transLang['CHOOSE']; ?></button>
                                 </div>
                                 <select class="custom-select" id="site" aria-label="Site" name="site" required>
-                                    <option value="<?php if (isset($siteid)) { echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]; } else { echo ""; } ?>" selected><?php if (isset($siteid)) { if ($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]=="NOSITE") {echo $transLang['NOSITE'];} else { echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]; } } else { echo "- - -"; } ?></option>
                                    <?php foreach($SiteInfo->getSite("0", $uid, "0", "0") as $row): ?>
-                                   <option value="<?php echo $row['sites_id']; ?>"><?php if ($row['sites_name']=="NOSITE") {echo $transLang['NOSITE'];} else { echo $row['sites_name']; } ?></option>
+                                   <option value="<?php echo $row['sites_id']; ?>"<?php if ($row['sites_id']==$siteid) { echo " selected"; } ?>><?php if ($row['sites_name']=="NOSITE") {echo $transLang['NOSITE'];} else { echo $row['sites_name']; } ?></option>
                                    <?php endforeach; ?>
                                 </select>
                                 <input class="btn" type="submit" value="<?php echo $transLang['SAVE']; ?>" />

index.php

@@ -154,7 +154,7 @@
                 <table class="table">
                     <thead class="thead-dark">
                         <tr>
-                            <th><?php echo $transLang['TIMEREASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['VALIDATIONS']; ?></th><th><?php echo $transLang['BADGEINITIALS']; ?></th><th><?php echo $transLang['ACTIONS']; ?></th><th>&nbsp</th>
+                            <th><?php echo $transLang['TIMEREASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['VALIDATIONS']; ?></th><th><?php echo $transLang['BADGEINITIALS']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM'] . " / " . $transLang['SSANUM']; ?></th><?php }; ?><th><?php echo $transLang['ACTIONS']; ?></th><th>&nbsp</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -163,6 +163,8 @@
                         $timein = new DateTime($row['visits_intime'], new DateTimeZone('UTC'));
                         $timein->setTimezone(new DateTimeZone("$timezone"));
                         $timein_disp = $timein->format('Y-m-d H:i:s');
+                        if(!empty($row['visits_carnum'])) { $carnum=$row['visits_carnum']; } else { $carnum="";};
+                        if(!empty($row['visits_ssanum'])) { $ssanum=$row['visits_ssanum']; } else { $ssanum="";};
                         ?>
                         <?php if($row['visits_approved']==2) { ?>
                         <tr class="alert alert-success">
@@ -191,6 +193,9 @@
                                                                     <?php }; ?>
 </td>
                                 <td><input type="text" id="badge" name="badge" class="form-control" autofocus disabled value="<?php echo $row['visits_badge']; ?>"> <input type="text" id="initials" name="initials" class="form-control" autofocus disabled value="<?php echo $row['visits_initials']; ?>"></td>
+<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
+                                <td><?php echo $carnum; ?> / <?php echo $ssanum; ?></td>
+<?php }; ?>
                                 <td> </td>
                                 <td><button type="submit" name="endvisit" value="<?php echo $row['visits_id']; ?>" class="btn btn-warning btn-block"><i class="fas fa-sign-out-alt"></i>&nbsp<?php echo $transLang['SIGNOUT']; ?></button><br>
                                     <div>
@@ -212,7 +217,7 @@
                                     <option value="<?php echo $row['idtypes_id']; ?>"><?php echo $transLang[$row['idtypes_name']]; ?></option><?php endforeach; ?>
                                 </select>
                                 <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
-                                <input class="form-check-input" type="checkbox" value="1" id="id_checked" name="id_checked">
+                                <input class="form-check-input" type="checkbox" value="1" id="id_checked" name="id_checked" required>
                                 <label class="form-check-label" for="id_checked"><?php echo $transLang['ID_CHECKED']; ?></label><br>
 <?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
                                 <input class="form-check-input" type="checkbox" value="1" id="citizen" name="citizen">
@@ -224,6 +229,9 @@
                                     <input type="text" id="initials" name="initials" class="form-control<?php if( isset($initials_error) && $initials_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" placeholder="<?php echo $transLang['INITIALS']; ?>" autofocus maxlength="5">
                                         <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
                                 </td>
+<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
+                                <td><?php echo $carnum; ?> / <?php echo $ssanum; ?></td>
+<?php }; ?>
                                 <td>
                                     <button type="submit" name="approvevisit" value="<?php echo $visitid; ?>" class="btn btn-success btn-block"><i class="fas fa-thumbs-up"></i>&nbsp;<?php echo $transLang['APPROVE']; ?></button><br /><button type="submit" name="voidvisit" value="<?php echo $visitid; ?>" class="btn btn-danger btn-block" onsubmit="return confirm('<?php echo $transLang['VOID_WARNING']; ?>')"><i class="fas fa-thumbs-down"></i>&nbsp;<?php echo $transLang['VOID']; ?></button>
                                 </td>

reports.php

@@ -133,11 +133,11 @@
         <?php if ($_POST['reporttype'] == "Default"): ?>
         <div class="container-fluid">
             <table id="report" class="table table-striped table-bordered">
-                <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['INITIALS']; ?></th><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php }; ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['ID_CHECKED']; ?></th></tr></thead>
+                <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['INITIALS']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM']; ?></th><th><?php echo $transLang['SSANUM']; ?></th><?php } ?><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php } ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['ID_CHECKED']; ?></th></tr></thead>
                 <tbody>
                     <?php
                         $approval = "2";
-                        if ($_POST['repsite'] == "all") { $selsite="%"; } else { $selsite=$_POST['repsite'];}; 
+                        if ($_POST['repsite'] == "all") { $selsite="%"; } else { $selsite=$_POST['repsite'];}
                         foreach ($VisitInfo->getVisitInfo($selsite, $approval, "%", "%", "%", $_POST['starttime'], $_POST['endtime'], "%", "%") as $row):
                         $timein = new DateTime($row['visits_intime'], new DateTimeZone('UTC'));
                         $timeout = new DateTime($row['visits_outtime'], new DateTimeZone('UTC'));
@@ -145,10 +145,12 @@
                         $timeout->setTimezone(new DateTimeZone("$timezone"));
                         $timein_disp = $timein->format('Y-m-d H:i:s');
                         $timeout_disp = $timeout->format('Y-m-d H:i:s');
+                        if(!empty($row['visits_carnum'])) { $carnum=$row['visits_carnum']; } else { $carnum="";}
+                        if(!empty($row['visits_ssanum'])) { $ssanum=$row['visits_ssanum']; } else { $ssanum="";}
                     ?>
                     <tr>
                         <td><?php echo $timein_disp; ?></td>
-                        <td><?php if (!empty($row['visits_outtime'])) {echo $timeout_disp; } else {echo $transLang['IN'];}; ?></td>
+                        <td><?php if (!empty($row['visits_outtime'])) {echo $timeout_disp; } else {echo $transLang['IN'];} ?></td>
                         <td><?php echo $SiteInfo->getSite($row['visits_site_id'], $uid, "0", "0")[0]["sites_name"]; ?></td>
                         <td><?php echo $row['visits_company']; ?></td>
                         <td><?php echo $transLang[$VisitTypeInfo->getVisitTypeInfo($row['visits_reason'])[0]['visittypes_name']]; ?></td>
@@ -156,9 +158,13 @@
                         <td><?php if (!empty($row['visits_escort'])) {echo $row['visits_escort'] . '<br /><img src="' . $row['visits_escort_signature'] . '" width="200" height="50" alt="Escort Signature" />'; } ?></td>
                         <td><?php echo $row['visits_badge']; ?></td>
                         <td><?php echo $row['visits_initials']; ?></td>
-<?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?>                        <td><?php if($row['visits_citizen']==1) { echo $transLang['YESYES']; } else { echo $transLang['NONO']; }; ?></td>  <?php }; ?>
+<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
+                                <td><?php echo $carnum; ?></td>
+                                <td><?php echo $ssanum; ?></td>
+<?php } ?>
+<?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?>                        <td><?php if($row['visits_citizen']==1) { echo $transLang['YESYES']; } else { echo $transLang['NONO']; } ?></td>  <?php } ?>
                         <td><?php echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]['idtypes_name']]; ?></td>
-                        <td><?php if($row['visits_id_checked']==1) { echo $transLang['YESYES']; } else { echo $transLang['NONO']; }; ?></td>
+                        <td><?php if($row['visits_id_checked']==1) { echo $transLang['YESYES']; } else { echo $transLang['NONO']; } ?></td>
                     </tr>
                     <?php endforeach; ?>
                 </tbody>

signin.php

@@ -68,6 +68,26 @@
                         </div>
                     </div>
                 </div>
+    <?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
+                <div class="row">
+                    <div class="col-sm">
+                        <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon3"><?php echo $transLang['CARNUM']; ?></span>
+                            </div>
+                            <input type="text" id="company" name="carnum" class="form-control" placeholder="<?php echo $transLang['CARNUM']; ?>" required autofocus>
+                        </div>
+                    </div>
+                    <div class="col-sm">
+                        <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text" id="basic-addon3"><?php echo $transLang['SSANUM']; ?></span>
+                            </div>
+                            <input type="text" id="company" name="ssanum" class="form-control" placeholder="<?php echo $transLang['SSANUM']; ?>" required autofocus>
+                        </div>
+                    </div>
+                </div>
+    <?php }; ?>
                 <div class="row">
                     <div class="col-sm">
                         <div class="input-group mb-3">

signin_display.php

@@ -52,7 +52,9 @@
 <!-- CONTENT START -->
 
         <?php if (!empty($_POST)) {                              // PROCESS POST
-            echo $VisitActions->newVisit($_POST['firstname'], $_POST['lastname'], $_POST['company'], $_POST['visit_type'], $StaticFunctions->getUTC(), $_POST['v_signature'], $_POST['siteid'], "1", $_POST['e_signature'], $_POST['escort']);
+            if (empty($_POST['carnum'])) { $carnum="";} else {$carnum=$_POST['carnum'];};
+            if (empty($_POST['ssanum'])) { $ssanum="";} else {$ssanum=$_POST['ssanum'];};
+            echo $VisitActions->newVisit($_POST['firstname'], $_POST['lastname'], $_POST['company'], $_POST['visit_type'], $StaticFunctions->getUTC(), $_POST['v_signature'], $_POST['siteid'], "1", $_POST['e_signature'], $_POST['escort'], $carnum, $ssanum);
         ?>
         <div class="container">
             <div class="row">

src/Database/VisitActions.php

@@ -35,6 +35,7 @@ class VisitActions {
         ";
         $database = new \App\LobbySIO\Database\Connect();
         $count = $database->runQuery($query);
+        return $count;
     }
 
     public function voidVisit ($visitid, $approved) {
@@ -45,6 +46,7 @@ class VisitActions {
         ";
         $database = new \App\LobbySIO\Database\Connect();
         $count = $database->runQuery($query);
+        return $count;
     }
     
     public function approveVisit ($approvevisit, $id_type, $id_checked, $citizen, $badge, $initials, $approved) {
@@ -61,18 +63,20 @@ class VisitActions {
         ";
         $database = new \App\LobbySIO\Database\Connect();
         $count = $database->runQuery($query);
+        return $count;
     }
 
-    public function newVisit ($firstname, $lastname, $company, $reason, $intime, $signature, $siteid, $approved, $escort_signature, $escort) {
+    public function newVisit ($firstname, $lastname, $company, $reason, $intime, $signature, $siteid, $approved, $escort_signature, $escort, $carnum, $ssanum) {
         $query = "
             INSERT INTO " . Registry::DB_PRFX . "visits (" . Registry::DB_PRFX . "visits.firstname, " . Registry::DB_PRFX . "visits.lastname,
             " . Registry::DB_PRFX . "visits.company, " . Registry::DB_PRFX . "visits.reason, " . Registry::DB_PRFX . "visits.intime,
             " . Registry::DB_PRFX . "visits.signature, " . Registry::DB_PRFX . "visits.site_id, " . Registry::DB_PRFX . "visits.approved,
-            " . Registry::DB_PRFX . "visits.escort_signature, " . Registry::DB_PRFX . "visits.escort)
+            " . Registry::DB_PRFX . "visits.escort_signature, " . Registry::DB_PRFX . "visits.escort, " . Registry::DB_PRFX . "visits.carnum, " . Registry::DB_PRFX . "visits.ssanum)
             VALUES (\"$firstname\", \"$lastname\", \"$company\", \"$reason\", \"$intime\", \"$signature\", \"$siteid\",
-            \"$approved\", \"$escort_signature\", \"$escort\")
+            \"$approved\", \"$escort_signature\", \"$escort\", \"$carnum\", \"$ssanum\")
         ";
         $database = new \App\LobbySIO\Database\Connect();
         $count = $database->runQuery($query);
+        return $count;
     }
 }

src/Database/VisitInfo.php

@@ -62,7 +62,9 @@ class VisitInfo {
         " . Registry::DB_PRFX . "visits.badge as visits_badge,
         " . Registry::DB_PRFX . "visits.site_id as visits_site_id,
         " . Registry::DB_PRFX . "visits.company as visits_company,
-        " . Registry::DB_PRFX . "visits.approved as visits_approved
+        " . Registry::DB_PRFX . "visits.approved as visits_approved,
+        " . Registry::DB_PRFX . "visits.carnum as visits_carnum,
+        " . Registry::DB_PRFX . "visits.ssanum as visits_ssanum
         FROM " . Registry::DB_PRFX . "visits
         WHERE " . $cond_siteid . Registry::DB_PRFX . "visits.approved>=\"$approved\" AND " . $cond_outtime  . $cond_intime  . Registry::DB_PRFX . "visits.id LIKE \"$visitid\"" . $cond_rowsperpage . $cond_offset;
         $database = new \App\LobbySIO\Database\Connect();

src/Language/de.lang.ini.example

@@ -15,10 +15,11 @@ ADMIN = 'Administrator'
 ADMINISTRATION = 'Verwaltung'
 ALL = 'Alles'
 APPROVE = 'Genehmigen'
-APP_NAME = 'Empfangshalle Einloggen / Ausloggen'
+APP_NAME = 'Einloggen / Ausloggen'
 BACK = 'Zurückkehren'
 BADGE = 'Abzeichen-Nummer'
 BADGEINITIALS = 'Abzeichen-Nummer & Initialen'
+CARNUM = 'Autokennzeichen'
 CHANGE = 'Wechseln'
 CHOOSE = 'Wählen'
 CITIZEN = 'Bürger?'
@@ -114,6 +115,7 @@ SIGNOUT_THANKYOU = 'Danke - Sie wurden erfolgreich abgemeldet.'
 SINCE = 'seit'
 SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
+SSANUM = 'SSA-Ticketnummer'
 START = 'Anfang'
 STATEID = 'Staat ID'
 TERMSTITLE = 'Unsere Regeln'

src/Language/en.lang.ini.example

@@ -15,10 +15,11 @@ ADMIN = 'Administrator'
 ADMINISTRATION = 'Administration'
 ALL = 'All'
 APPROVE = 'Approve'
-APP_NAME = 'Lobby Sign-In/Sign-Out'
+APP_NAME = 'Sign-In/Sign-Out'
 BACK = 'Back'
 BADGE = 'Badge#'
 BADGEINITIALS = 'Badge & Initials'
+CARNUM = 'Car Registration #'
 CHANGE = 'Change'
 CHOOSE = 'Choose'
 CITIZEN = 'Citizen?'
@@ -26,9 +27,9 @@ CLOSE = 'Close'
 COMPANY = 'Company'
 CONFIRM = 'Confirm'
 CREATED = 'Created'
-CUSTSIGNIN = 'Customer Sign In'
-CUSTSIGNOUT = 'Customer Sign Out'
-CUST_BANNER = 'Lobby Sign-In/Sign-Out'
+CUSTSIGNIN = 'Visitor Sign In'
+CUSTSIGNOUT = 'Visitor Sign Out'
+CUST_BANNER = 'Visitor Sign-In/Sign-Out'
 DEFAULT = 'Default'
 DELETE = 'Delete'
 DELETE_WARNING = '********* WARNING! ********** Are you SURE you want to DELETE this user AND ALL ASSOCIATED PUNCHES!?!?  There is NO UNDO!'
@@ -114,6 +115,7 @@ SIGNOUT_THANKYOU = 'Thank you - you have been successfully signed out.'
 SINCE = 'since'
 SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
+SSANUM = 'SSA Ticket #'
 START = 'Start'
 STATEID = 'State ID'
 TERMSTITLE = 'Our Rules'

src/Language/es.lang.ini.example

@@ -19,6 +19,7 @@ APP_NAME = 'Lobby de inicio / cierre de sesión'
 BACK = 'Inicia'
 BADGE = 'Numero de placa'
 BADGEINITIALS = 'Numero de placa & Sigla'
+CARNUM = 'Numero de registro del carro'
 CHANGE = 'Cambiar'
 CHOOSE = 'Por favor seleccione'
 CITIZEN = 'Ciudadano de estados unidos?'
@@ -114,6 +115,7 @@ SIGNOUT_THANKYOU = 'Gracias, te has desconectado.'
 SINCE = 'desde'
 SITE = 'Sitio'
 SOFTWARE_VERSION = 'Versión del software'
+SSANUM = 'Número de boleto de la SSA'
 START = 'Comienzo'
 STATEID = 'Identificación del estado'
 TERMSTITLE = 'Nuestras reglas'

src/Language/fr.lang.ini.example

@@ -19,6 +19,7 @@ APP_NAME = 'Vestibule register/se désinscrire'
 BACK = 'Retour'
 BADGE = 'Numéro de badge'
 BADGEINITIALS = 'Numéro de badge & Initiales'
+CARNUM = 'Numéro d'immatriculation'
 CHANGE = 'Changement'
 CHOOSE = 'Choisir'
 CITIZEN = 'Citoyen?'
@@ -114,6 +115,7 @@ SIGNOUT_THANKYOU = 'Merci - vous avez été déconnecté avec succès.'
 SINCE = 'depuis'
 SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
+SSANUM = 'Numéro de billet SSA'
 START = 'Début'
 STATEID = 'State ID'
 TERMSTITLE = 'Nos règles'

src/Misc/StaticFunctions.php

@@ -29,7 +29,7 @@ class StaticFunctions {
     public function getVersion ($app_disp_lang) {
         $Translate = new \App\LobbySIO\Language\Translate($app_disp_lang);
         $transLang =  $Translate->userLanguage();
-        echo $transLang['SOFTWARE_VERSION'] . ': lobbysio_v0.16-beta';
+        echo $transLang['SOFTWARE_VERSION'] . ': lobbysio_v0.17-beta';
     }
 
     public function getUTC () {

users.php

@@ -51,6 +51,16 @@
 
 <?php if (isset($session_user)) { if($session_user["0"]["users_usertype"] !== "ADMIN") { header("Location: index.php"); ?><h2 class="content-subhead"><?php echo $transLang['NOT_AUTHORIZED']; ?></h2><?php }; }; ?>
 
+
+<?php    if (!empty($_POST['edituser'])):                                            // NEW SITE
+        //$SiteInfo->addSite($_POST['sitename'], $_POST['timezone'], $_POST['region']);
+        //header('Location: ' . $_SERVER['PHP_SELF']);
+
+        endif;
+?>
+
+
+
 <?php                                                            // POST ACTIONS
 
     if (!empty($_POST['newsite'])):                              // NEW SITE
@@ -126,7 +136,7 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
                 <tbody>
                     <?php foreach($Users->getUserInfo("%", $StaticFunctions->getPageRows(), $offset) as $row): ?>
                     <tr>
-                        <td><?php echo $row['users_lastname'] . ", " . $row['users_firstname']; ?></td><td><?php echo $row['users_username']; ?></td><td><?php echo $row['users_email']; ?></td><td><?php echo $row['users_created']; ?></td><td><?php echo $transLang[$row['users_usertype']]; ?></td><td><form method="post" onsubmit="return confirm('<?php echo $transLang['DELETE_WARNING']; ?>')"><input type="hidden" id="_METHOD" name="_METHOD" value="DELETE" /><input type="hidden" id="deleteid" name="deleteid" value="<?php echo $row['users_id']; ?>" /><button class="btn btn-danger btn-sm" id="deluser" name="deluser" value="deluser" type="submit" <?php if ($row['users_username'] == "admin"): echo "disabled"; endif; if ($row['users_username'] == "KIOSK"): echo "disabled"; endif; ?>><i class="fa fa-trash"></i> </button></form></td>
+                        <td><?php echo $row['users_lastname'] . ", " . $row['users_firstname']; ?></td><td><?php echo $row['users_username']; ?></td><td><?php echo $row['users_email']; ?></td><td><?php echo $row['users_created']; ?></td><td><?php echo $transLang[$row['users_usertype']]; ?></td><td><form method="post" onsubmit="return confirm('<?php echo $transLang['DELETE_WARNING']; ?>')"><input type="hidden" id="_METHOD" name="_METHOD" value="DELETE" /><input type="hidden" id="deleteid" name="deleteid" value="<?php echo $row['users_id']; ?>" /><button class="btn btn-primary btn-sm" id="edituser" name="edituser" value="edituser" type="submit" <?php if ($row['users_username'] == "admin"): echo "disabled"; endif; if ($row['users_username'] == "KIOSK"): echo "disabled"; endif; ?>><i class="fa fa-edit"></i> </button><button class="btn btn-danger btn-sm" id="deluser" name="deluser" value="deluser" type="submit" <?php if ($row['users_username'] == "admin"): echo "disabled"; endif; if ($row['users_username'] == "KIOSK"): echo "disabled"; endif; ?>><i class="fa fa-trash"></i> </button></form></td>
                     </tr>
                     <?php endforeach; ?>
                 </tbody>