Beginning cleanup stage

This commit is contained in:
2021-05-07 16:57:59 -04:00
parent b19f2f8ac4
commit aee930ecff
5 changed files with 23 additions and 35 deletions

View File

@@ -130,7 +130,7 @@
<span class="input-group-text" id="username"><?php echo $transLang['ACCESS_LEVEL']; ?></span>
</div>
<select class="custom-select" id="usertype" aria-label="<?php echo $transLang['ACCESS_LEVEL']; ?>" name="usertype" required>
<?php foreach($Users->getUserTypeInfo("%") as $row): ?>
<?php foreach($Users->readUserTypeByUserTypeID("%") as $row): ?>
<option value="<?php echo $row['usertypes_id']; ?>"<?php if ($row['usertypes_id']==$edituser["0"]["users_usertypeid"]) { echo " selected"; } ?>><?php echo $transLang[$row['usertypes_name']]; ?></option>
<?php endforeach; ?>
</select>
@@ -143,7 +143,7 @@
</div>
<select id="sitepermissions" name="sitepermissions[]" class="custom-select" multiple size="5">
<?php foreach($SiteInfo->listSite("0", "0") as $row): ?>
<option value="<?php echo $row['sites_id']; ?>"<?php if ($SiteInfo->getSitePerms($row['sites_id'], $edituser["0"]["users_id"])=="1") { echo " selected"; } ?>><?php echo $row['sites_name']; ?></option>
<option value="<?php echo $row['sites_id']; ?>"<?php if ($SiteInfo->readSitePermissionBySiteAndUser($row['sites_id'], $edituser["0"]["users_id"])=="1") { echo " selected"; } ?>><?php echo $row['sites_name']; ?></option>
<?php endforeach; ?>
</select>
</div>
@@ -173,8 +173,8 @@
if (!empty($_POST['newsite'])): // NEW SITE
$SiteInfo->addSite($_POST['sitename'], $_POST['timezone'], $_POST['region']);
$newsiteid = $SiteInfo->getSiteByID($_POST['sitename']);
$SiteInfo->setSitePerms($newsiteid["0"]["id"], "1");
$SiteInfo->setSitePerms($newsiteid["0"]["id"], "2");
$SiteInfo->grantSitePermissionBySiteAndUser($newsiteid["0"]["id"], "1");
$SiteInfo->grantSitePermissionBySiteAndUser($newsiteid["0"]["id"], "2");
header('Location: ' . $_SERVER['PHP_SELF']);
endif;
@@ -208,7 +208,7 @@ if (Registry::AUTHMETHOD == 'INTERNAL') {
if (!empty($_POST['newuser'])): // NEW USER SAML
$email = filter_var($_POST['email'], FILTER_VALIDATE_EMAIL);
if (!$email): $errors['email'] = $transLang['EMAIL_NOTVALID']; endif;
$existing = $Users->checkSAMLUser($email);
$existing = $Users->lookupSamlUserByEmail($email);
if ($existing):
if ($existing[0]["users_email"] == $email): $errors['email'] = $transLang['PASSWORD_USED']; endif;
endif;
@@ -247,9 +247,9 @@ if (Registry::AUTHMETHOD == 'INTERNAL') {
}
$Users->editUserInfo($_POST['edituserid'], $_POST['firstname'], $_POST['lastname'], $editedusername, $_POST['email'], $_POST['usertype']);
//foreach loop to check if exists, if new, delete or add as needed
$SiteInfo->delSitePerms($_POST['edituserid']);
$SiteInfo->deleteSitePermissionByUser($_POST['edituserid']);
foreach($_POST['sitepermissions'] as $editsitepermission) {
$SiteInfo->setSitePerms($editsitepermission, $_POST['edituserid']);
$SiteInfo->grantSitePermissionBySiteAndUser($editsitepermission, $_POST['edituserid']);
}
header('Location: ' . $_SERVER['PHP_SELF']);
endif;
@@ -386,7 +386,7 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
<div class="row">
<div class="col-sm">
<select class="custom-select" id="usertype" aria-label="<?php echo $transLang['ACCESS_LEVEL']; ?>" name="usertype" required>
<option value="" selected><?php echo $transLang['CHOOSE']; ?> <?php echo $transLang['ACCESS_LEVEL']; ?></option><?php foreach($Users->getUserTypeInfo("%") as $row): ?>
<option value="" selected><?php echo $transLang['CHOOSE']; ?> <?php echo $transLang['ACCESS_LEVEL']; ?></option><?php foreach($Users->readUserTypeByUserTypeID("%") as $row): ?>
<option value="<?php echo $row['usertypes_id']; ?>"><?php echo $transLang[$row['usertypes_name']]; ?></option><?php endforeach; ?>
</select>
</div>
@@ -411,9 +411,9 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
if (!empty($_POST['delsite'])) {
if ($_SERVER['REQUEST_METHOD'] == 'DELETE' || ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['_METHOD'] == 'DELETE')) {
$deleteid = (int) $_POST['deleteid'];
$SiteInfo->delSiteAdminPerms ('0', $deleteid);
$SiteInfo->delSiteAdminPerms ('1', $deleteid);
$SiteInfo->delSiteAdminPerms ('2', $deleteid);
$SiteInfo->deleteSitePermissionByUserAndSite ('0', $deleteid);
$SiteInfo->deleteSitePermissionByUserAndSite ('1', $deleteid);
$SiteInfo->deleteSitePermissionByUserAndSite ('2', $deleteid);
echo $SiteInfo->deleteSite($deleteid);
echo "site deleted!";
header('Location: ' . $_SERVER['PHP_SELF']);