Beginning cleanup stage

src/Database/SiteInfo.php

@@ -66,7 +66,7 @@ class SiteInfo {
     }
 
 // Return Site Information array.  0 eliminates argument
-    public function getSitePerms ($sites_id, $users_id) {
+    public function readSitePermissionBySiteAndUser ($sites_id, $users_id) {
         $query = "
             SELECT DISTINCT
             " . Registry::DB_PRFX . "users_sites.sites_id as users_sites_sites_id,
@@ -80,7 +80,7 @@ class SiteInfo {
     }
 
 // Update site perms. For now we delete all uid matches and then insert.
-    public function delSitePerms ($users_id) {
+    public function deleteSitePermissionByUser ($users_id) {
         $query = "
             DELETE
             FROM " . Registry::DB_PRFX . "users_sites
@@ -90,7 +90,7 @@ class SiteInfo {
         if(empty($rows)) {
         return "0";} else { return "1";};
     }
-    public function delSiteAdminPerms ($users_id, $sites_id) {
+    public function deleteSitePermissionByUserAndSite ($users_id, $sites_id) {
         $query = "
             DELETE
             FROM " . Registry::DB_PRFX . "users_sites
@@ -100,7 +100,7 @@ class SiteInfo {
         if(empty($rows)) {
         return "0";} else { return "1";};
     }
-    public function setSitePerms ($sites_id, $users_id) {
+    public function grantSitePermissionBySiteAndUser ($sites_id, $users_id) {
         $query = "
             INSERT
             INTO " . Registry::DB_PRFX . "users_sites

src/Database/Users.php

@@ -74,7 +74,7 @@ class Users {
         return $rows;
     }
 
-    public function getUserInitials($userid) {
+    public function readUserFirstAndLast($userid) {
        $query = "
         SELECT
         " . Registry::DB_PRFX . "users.id as users_id,
@@ -116,7 +116,7 @@ class Users {
         return $rows;
     }
 
-    public function checkSAMLUser ($email) {
+    public function lookupSamlUserByEmail ($email) {
         $query = "
             SELECT
             " . Registry::DB_PRFX . "users.email as users_email
@@ -182,7 +182,7 @@ class Users {
         return $count;
     }
 
-    public function updateSAMLName($uid, $firstname, $lastname) {
+    public function updateSamlFirstAndLast($uid, $firstname, $lastname) {
         $query = "
             UPDATE
             " . Registry::DB_PRFX . "users
@@ -196,18 +196,6 @@ class Users {
         return $count;
     }
 
-    public function getUserType ($usertypeid){
-        $query = "
-        SELECT
-        " . Registry::DB_PRFX . "usertypes.id as usertypes_id,
-        " . Registry::DB_PRFX . "usertypes.name as usertypes_name
-        FROM " . Registry::DB_PRFX . "usertypes
-        WHERE " . Registry::DB_PRFX . "usertypes.id LIKE \"$usertypeid\"";
-        $database = new \App\LobbySIO\Database\Connect();
-        $rows = $database->getQuery($query);
-        return $rows;
-    }
-
     public function deleteUser ($userid) {
         $query = "
             DELETE FROM " . Registry::DB_PRFX . "users WHERE " . Registry::DB_PRFX . "users.id=\"$userid\"
@@ -217,7 +205,7 @@ class Users {
         return $count;
     }
 
-    public function getUserTypeInfo ($usertypeid) {
+    public function readUserTypeByUserTypeID ($usertypeid) {
         $query = "
         SELECT
         " . Registry::DB_PRFX . "usertypes.id as usertypes_id,