fix code errors (syntax only)

code formatting

api/functions/api-functions.php

@@ -1,105 +1,105 @@
 <?php
-
 function login($array)
 {
-    // Grab username and Password from login form
-    foreach ($array['data'] as $items) {
-        foreach ($items as $key => $value) {
-            if ($key == 'name') {
-                $newKey = $value;
-            }
-            if ($key == 'value') {
-                $newValue = $value;
-            }
-            if (isset($newKey) && isset($newValue)) {
-                $$newKey = $newValue;
-            }
-        }
-    }
-    $username = strtolower($username);
-    $days = (isset($remember)) ? 7 : 1;
-    try {
-        $database = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $authSuccess = false;
-        $function = 'plugin_auth_'.$GLOBALS['authBackend'];
-        $result = $database->fetch('SELECT * FROM users WHERE username = ? COLLATE NOCASE OR email = ? COLLATE NOCASE', $username, $username);
-        switch ($GLOBALS['authType']) {
-            case 'external':
-                if (function_exists($function)) {
-                    $authSuccess = $function($username, $password);
-                }
-                break;
-            case 'both':
-                if (function_exists($function)) {
-                    $authSuccess = $function($username, $password);
-                }
-                // no break
-            default: // Internal
-                if (!$authSuccess) {
-                    // perform the internal authentication step
-                    if (password_verify($password, $result['password'])) {
-                        $authSuccess = true;
-                    }
-                }
-        }
-        if ($authSuccess) {
-            // Make sure user exists in database
-            $userExists = false;
-            $token = (is_array($authSuccess) && isset($authSuccess['token']) ? $authSuccess['token'] : '');
-            if ($result['username']) {
-                $userExists = true;
-                $username = $result['username'];
-                $passwordMatches = (password_verify($password, $result['password'])) ? true : false;
-            }
-            if ($userExists) {
-                //does org password need to be updated
-                if (!$passwordMatches) {
-                    $database->query('
+	// Grab username and Password from login form
+	foreach ($array['data'] as $items) {
+		foreach ($items as $key => $value) {
+			if ($key == 'name') {
+				$newKey = $value;
+			}
+			if ($key == 'value') {
+				$newValue = $value;
+			}
+			if (isset($newKey) && isset($newValue)) {
+				$$newKey = $newValue;
+			}
+		}
+	}
+	$username = strtolower($username);
+	$days = (isset($remember)) ? 7 : 1;
+	try {
+		$database = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$authSuccess = false;
+		$function = 'plugin_auth_' . $GLOBALS['authBackend'];
+		$result = $database->fetch('SELECT * FROM users WHERE username = ? COLLATE NOCASE OR email = ? COLLATE NOCASE', $username, $username);
+		switch ($GLOBALS['authType']) {
+			case 'external':
+				if (function_exists($function)) {
+					$authSuccess = $function($username, $password);
+				}
+				break;
+			case 'both':
+				if (function_exists($function)) {
+					$authSuccess = $function($username, $password);
+				}
+			// no break
+			default: // Internal
+				if (!$authSuccess) {
+					// perform the internal authentication step
+					if (password_verify($password, $result['password'])) {
+						$authSuccess = true;
+					}
+				}
+		}
+		if ($authSuccess) {
+			// Make sure user exists in database
+			$userExists = false;
+			$token = (is_array($authSuccess) && isset($authSuccess['token']) ? $authSuccess['token'] : '');
+			if ($result['username']) {
+				$userExists = true;
+				$username = $result['username'];
+				$passwordMatches = (password_verify($password, $result['password'])) ? true : false;
+			}
+			if ($userExists) {
+				//does org password need to be updated
+				if (!$passwordMatches) {
+					$database->query('
                     	UPDATE users SET', [
-                            'password' => password_hash($password, PASSWORD_BCRYPT)
-                        ], '
+						'password' => password_hash($password, PASSWORD_BCRYPT)
+					], '
                     	WHERE id=?', $result['id']);
-                    writeLog('success', 'Login Function - User Password updated from backend', $username);
-                }
-                // authentication passed - 1) mark active and update token
-                if (createToken($result['username'], $result['email'], $result['image'], $result['group'], $result['group_id'], $GLOBALS['organizrHash'], $days)) {
-                    writeLoginLog($username, 'success');
-                    writeLog('success', 'Login Function - A User has logged in', $username);
-                    ssoCheck($username, $password, $token); //need to work on this
-                    return true;
-                } else {
-                    return 'error';
-                }
-            } else {
-                // Create User
-                ssoCheck($username, $password, $token);
-                return authRegister((is_array($authSuccess) && isset($authSuccess['username']) ? $authSuccess['username'] : $username), $password, '', (is_array($authSuccess) && isset($authSuccess['email']) ? $authSuccess['email'] : ''));
-            }
-        } else {
-            // authentication failed
-            writeLoginLog($username, 'error');
-            writeLog('error', 'Login Function - Wrong Password', $username);
-            return 'mismatch';
-        }
-    } catch (Dibi\Exception $e) {
-        return 'error';
-    }
+					writeLog('success', 'Login Function - User Password updated from backend', $username);
+				}
+				// authentication passed - 1) mark active and update token
+				if (createToken($result['username'], $result['email'], $result['image'], $result['group'], $result['group_id'], $GLOBALS['organizrHash'], $days)) {
+					writeLoginLog($username, 'success');
+					writeLog('success', 'Login Function - A User has logged in', $username);
+					ssoCheck($username, $password, $token); //need to work on this
+					return true;
+				} else {
+					return 'error';
+				}
+			} else {
+				// Create User
+				ssoCheck($username, $password, $token);
+				return authRegister((is_array($authSuccess) && isset($authSuccess['username']) ? $authSuccess['username'] : $username), $password, defaultUserGroup(), (is_array($authSuccess) && isset($authSuccess['email']) ? $authSuccess['email'] : ''));
+			}
+		} else {
+			// authentication failed
+			writeLoginLog($username, 'error');
+			writeLog('error', 'Login Function - Wrong Password', $username);
+			return 'mismatch';
+		}
+	} catch (Dibi\Exception $e) {
+		return 'error';
+	}
 }
+
 function createDB($path, $filename)
 {
-    try {
-	    if (!file_exists($path)) {
-		    mkdir($path, 0777, true);
-	    }
-        $createDB = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $path.$filename,
-        ]);
-        // Create Users
-        $users = $createDB->query('CREATE TABLE `users` (
+	try {
+		if (!file_exists($path)) {
+			mkdir($path, 0777, true);
+		}
+		$createDB = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $path . $filename,
+		]);
+		// Create Users
+		$users = $createDB->query('CREATE TABLE `users` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`username`	TEXT UNIQUE,
     		`password`	TEXT,
@@ -112,22 +112,22 @@ function createDB($path, $filename)
             `register_date` DATE,
     		`auth_service`	TEXT DEFAULT \'internal\'
     	);');
-        // Create Tokens
-        $jwt = $createDB->query('CREATE TABLE `tokens` (
+		// Create Tokens
+		$jwt = $createDB->query('CREATE TABLE `tokens` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`token`	TEXT UNIQUE,
     		`user_id`	INTEGER,
             `created` DATE,
             `expires` DATE
     	);');
-        $groups = $createDB->query('CREATE TABLE `groups` (
+		$groups = $createDB->query('CREATE TABLE `groups` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`group`	TEXT UNIQUE,
             `group_id`	INTEGER,
     		`image`	TEXT,
             `default` INTEGER
     	);');
-        $categories = $createDB->query('CREATE TABLE `categories` (
+		$categories = $createDB->query('CREATE TABLE `categories` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
             `order`	INTEGER,
     		`category`	TEXT UNIQUE,
@@ -135,8 +135,8 @@ function createDB($path, $filename)
     		`image`	TEXT,
             `default` INTEGER
     	);');
-        // Create Tabs
-        $tabs = $createDB->query('CREATE TABLE `tabs` (
+		// Create Tabs
+		$tabs = $createDB->query('CREATE TABLE `tabs` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`order`	INTEGER,
     		`category_id`	INTEGER,
@@ -152,14 +152,14 @@ function createDB($path, $filename)
     		`ping`		INTEGER,
     		`ping_url`	TEXT
     	);');
-        // Create Options
-        $options = $createDB->query('CREATE TABLE `options` (
+		// Create Options
+		$options = $createDB->query('CREATE TABLE `options` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`name`	TEXT UNIQUE,
     		`value`	TEXT
     	);');
-        // Create Invites
-        $invites = $createDB->query('CREATE TABLE `invites` (
+		// Create Invites
+		$invites = $createDB->query('CREATE TABLE `invites` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`code`	TEXT UNIQUE,
     		`date`	TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
@@ -171,788 +171,803 @@ function createDB($path, $filename)
     		`valid`	TEXT,
             `type` TEXT
     	);');
-        return true;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+		return true;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
+
 // Upgrade Database
 function updateDB($path, $filename, $oldVerNum = false)
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $path.$filename,
-        ]);
-        // Cache current DB
-        $cache = array();
-        foreach ($connect->query('SELECT name FROM sqlite_master WHERE type="table";') as $table) {
-            foreach ($connect->query('SELECT * FROM '.$table['name'].';') as $key => $row) {
-                foreach ($row as $k => $v) {
-                    if (is_string($k)) {
-                        $cache[$table['name']][$key][$k] = $v;
-                    }
-                }
-            }
-        }
-        $connect->disconnect();
-    } catch (Dibi\Exception $e) {
-        return $e;
-    }
-    // Remove Current Database
-    $pathDigest = pathinfo($path.$filename);
-    if (file_exists($path.$filename)) {
-        copy($path.$filename, $pathDigest['dirname'].'/'.$pathDigest['filename'].'['.date('Y-m-d_H-i-s').']'.($oldVerNum?'['.$oldVerNum.']':'').'.bak.db');
-        unlink($path.$filename);
-    }
-    // Create New Database
-    $success = createDB($path, $filename);
-    try {
-        $GLOBALS['connect'] = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $path.$filename,
-        ]);
-
-        // Restore Items
-        if ($success) {
-            foreach ($cache as $table => $tableData) {
-                if ($tableData) {
-                    $queryBase = 'INSERT INTO '.$table.' (`'.implode('`,`', array_keys(current($tableData))).'`) values ';
-                    $insertValues = array();
-                    reset($tableData);
-                    foreach ($tableData as $key => $value) {
-                        $insertValues[] = '('.implode(',', array_map(function ($d) {
-                            return (isset($d)?str_replace('\/', '/', json_encode($d)):'null');
-                        }, $value)).')';
-                    }
-                    $GLOBALS['connect']->query($queryBase.implode(',', $insertValues).';');
-                }
-            }
-        }
-        updateConfig(array('configVersion'=>$GLOBALS['installedVersion']));
-        return true;
-    } catch (Dibi\Exception $e) {
-        return $e;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $path . $filename,
+		]);
+		// Cache current DB
+		$cache = array();
+		foreach ($connect->query('SELECT name FROM sqlite_master WHERE type="table";') as $table) {
+			foreach ($connect->query('SELECT * FROM ' . $table['name'] . ';') as $key => $row) {
+				foreach ($row as $k => $v) {
+					if (is_string($k)) {
+						$cache[$table['name']][$key][$k] = $v;
+					}
+				}
+			}
+		}
+		$connect->disconnect();
+	} catch (Dibi\Exception $e) {
+		return $e;
+	}
+	// Remove Current Database
+	$pathDigest = pathinfo($path . $filename);
+	if (file_exists($path . $filename)) {
+		copy($path . $filename, $pathDigest['dirname'] . '/' . $pathDigest['filename'] . '[' . date('Y-m-d_H-i-s') . ']' . ($oldVerNum ? '[' . $oldVerNum . ']' : '') . '.bak.db');
+		unlink($path . $filename);
+	}
+	// Create New Database
+	$success = createDB($path, $filename);
+	try {
+		$GLOBALS['connect'] = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $path . $filename,
+		]);
+		// Restore Items
+		if ($success) {
+			foreach ($cache as $table => $tableData) {
+				if ($tableData) {
+					$queryBase = 'INSERT INTO ' . $table . ' (`' . implode('`,`', array_keys(current($tableData))) . '`) values ';
+					$insertValues = array();
+					reset($tableData);
+					foreach ($tableData as $key => $value) {
+						$insertValues[] = '(' . implode(',', array_map(function ($d) {
+								return (isset($d) ? str_replace('\/', '/', json_encode($d)) : 'null');
+							}, $value)) . ')';
+					}
+					$GLOBALS['connect']->query($queryBase . implode(',', $insertValues) . ';');
+				}
+			}
+		}
+		updateConfig(array('configVersion' => $GLOBALS['installedVersion']));
+		return true;
+	} catch (Dibi\Exception $e) {
+		return $e;
+	}
 }
+
 function createFirstAdmin($path, $filename, $username, $password, $email)
 {
-    try {
-        $createDB = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $path.$filename,
-        ]);
-        $userInfo = [
-            'username' => $username,
-            'password'  => password_hash($password, PASSWORD_BCRYPT),
-            'email' => $email,
-            'group' => 'Admin',
-            'group_id' => 0,
-            'image' => gravatar($email),
-            'register_date' => $GLOBALS['currentTime'],
-        ];
-        $groupInfo0 = [
-            'group' => 'Admin',
-            'group_id' => 0,
-            'default' => false,
-            'image' => 'plugins/images/groups/admin.png',
-        ];
-        $groupInfo1 = [
-            'group' => 'Co-Admin',
-            'group_id' => 1,
-            'default' => false,
-            'image' => 'plugins/images/groups/coadmin.png',
-        ];
-        $groupInfo2 = [
-            'group' => 'Super User',
-            'group_id' => 2,
-            'default' => false,
-            'image' => 'plugins/images/groups/superuser.png',
-        ];
-        $groupInfo3 = [
-            'group' => 'Power User',
-            'group_id' => 3,
-            'default' => false,
-            'image' => 'plugins/images/groups/poweruser.png',
-        ];
-        $groupInfo4 = [
-            'group' => 'User',
-            'group_id' => 4,
-            'default' => true,
-            'image' => 'plugins/images/groups/user.png',
-        ];
-        $groupInfoGuest = [
-            'group' => 'Guest',
-            'group_id' => 999,
-            'default' => false,
-            'image' => 'plugins/images/groups/guest.png',
-        ];
-        $settingsInfo = [
-            'order' => 1,
-            'category_id' => 0,
-            'name' => 'Settings',
-            'url' => 'api/?v1/settings/page',
-            'default' => false,
-            'enabled' => true,
-            'group_id' => 1,
-            'image' => 'fontawesome::cog',
-            'type' => 0
-        ];
-        $homepageInfo = [
-            'order' => 2,
-            'category_id' => 0,
-            'name' => 'Homepage',
-            'url' => 'api/?v1/homepage/page',
-            'default' => false,
-            'enabled' => false,
-            'group_id' => 4,
-            'image' => 'fontawesome::home',
-            'type' => 0
-        ];
-        $unsortedInfo = [
-            'order' => 1,
-            'category' => 'Unsorted',
-            'category_id' => 0,
-            'image' => 'plugins/images/categories/unsorted.png',
-            'default' => true
-        ];
-        $createDB->query('INSERT INTO [users]', $userInfo);
-        $createDB->query('INSERT INTO [groups]', $groupInfo0);
-        $createDB->query('INSERT INTO [groups]', $groupInfo1);
-        $createDB->query('INSERT INTO [groups]', $groupInfo2);
-        $createDB->query('INSERT INTO [groups]', $groupInfo3);
-        $createDB->query('INSERT INTO [groups]', $groupInfo4);
-        $createDB->query('INSERT INTO [groups]', $groupInfoGuest);
-        $createDB->query('INSERT INTO [tabs]', $settingsInfo);
-        $createDB->query('INSERT INTO [tabs]', $homepageInfo);
-        $createDB->query('INSERT INTO [categories]', $unsortedInfo);
-        return true;
-    } catch (Dibi\Exception $e) {
-        writeLog('error', 'Wizard Function -  Error ['.$e.']', 'Wizard');
-        return false;
-    }
+	try {
+		$createDB = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $path . $filename,
+		]);
+		$userInfo = [
+			'username' => $username,
+			'password' => password_hash($password, PASSWORD_BCRYPT),
+			'email' => $email,
+			'group' => 'Admin',
+			'group_id' => 0,
+			'image' => gravatar($email),
+			'register_date' => $GLOBALS['currentTime'],
+		];
+		$groupInfo0 = [
+			'group' => 'Admin',
+			'group_id' => 0,
+			'default' => false,
+			'image' => 'plugins/images/groups/admin.png',
+		];
+		$groupInfo1 = [
+			'group' => 'Co-Admin',
+			'group_id' => 1,
+			'default' => false,
+			'image' => 'plugins/images/groups/coadmin.png',
+		];
+		$groupInfo2 = [
+			'group' => 'Super User',
+			'group_id' => 2,
+			'default' => false,
+			'image' => 'plugins/images/groups/superuser.png',
+		];
+		$groupInfo3 = [
+			'group' => 'Power User',
+			'group_id' => 3,
+			'default' => false,
+			'image' => 'plugins/images/groups/poweruser.png',
+		];
+		$groupInfo4 = [
+			'group' => 'User',
+			'group_id' => 4,
+			'default' => true,
+			'image' => 'plugins/images/groups/user.png',
+		];
+		$groupInfoGuest = [
+			'group' => 'Guest',
+			'group_id' => 999,
+			'default' => false,
+			'image' => 'plugins/images/groups/guest.png',
+		];
+		$settingsInfo = [
+			'order' => 1,
+			'category_id' => 0,
+			'name' => 'Settings',
+			'url' => 'api/?v1/settings/page',
+			'default' => false,
+			'enabled' => true,
+			'group_id' => 1,
+			'image' => 'fontawesome::cog',
+			'type' => 0
+		];
+		$homepageInfo = [
+			'order' => 2,
+			'category_id' => 0,
+			'name' => 'Homepage',
+			'url' => 'api/?v1/homepage/page',
+			'default' => false,
+			'enabled' => false,
+			'group_id' => 4,
+			'image' => 'fontawesome::home',
+			'type' => 0
+		];
+		$unsortedInfo = [
+			'order' => 1,
+			'category' => 'Unsorted',
+			'category_id' => 0,
+			'image' => 'plugins/images/categories/unsorted.png',
+			'default' => true
+		];
+		$createDB->query('INSERT INTO [users]', $userInfo);
+		$createDB->query('INSERT INTO [groups]', $groupInfo0);
+		$createDB->query('INSERT INTO [groups]', $groupInfo1);
+		$createDB->query('INSERT INTO [groups]', $groupInfo2);
+		$createDB->query('INSERT INTO [groups]', $groupInfo3);
+		$createDB->query('INSERT INTO [groups]', $groupInfo4);
+		$createDB->query('INSERT INTO [groups]', $groupInfoGuest);
+		$createDB->query('INSERT INTO [tabs]', $settingsInfo);
+		$createDB->query('INSERT INTO [tabs]', $homepageInfo);
+		$createDB->query('INSERT INTO [categories]', $unsortedInfo);
+		return true;
+	} catch (Dibi\Exception $e) {
+		writeLog('error', 'Wizard Function -  Error [' . $e . ']', 'Wizard');
+		return false;
+	}
 }
+
 function defaultUserGroup()
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $all = $connect->fetch('SELECT * FROM groups WHERE `default` = 1');
-        return $all;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$all = $connect->fetch('SELECT * FROM groups WHERE `default` = 1');
+		return $all;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
-function defaulTabCategory()
+
+function defaultTabCategory()
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $all = $connect->fetch('SELECT * FROM categories WHERE `default` = 1');
-        return $all;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$all = $connect->fetch('SELECT * FROM categories WHERE `default` = 1');
+		return $all;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
+
 function getGuest()
 {
-    if (isset($GLOBALS['dbLocation'])) {
-        try {
-            $connect = new Dibi\Connection([
-                'driver' => 'sqlite3',
-                'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-            ]);
-            $all = $connect->fetch('SELECT * FROM groups WHERE `group` = "Guest"');
-            return $all;
-        } catch (Dibi\Exception $e) {
-            return false;
-        }
-    } else {
-        return array(
-            'group' => 'Guest',
-            'group_id' => 999,
-            'image' => 'plugins/images/groups/guest.png'
-        );
-    }
+	if (isset($GLOBALS['dbLocation'])) {
+		try {
+			$connect = new Dibi\Connection([
+				'driver' => 'sqlite3',
+				'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+			]);
+			$all = $connect->fetch('SELECT * FROM groups WHERE `group` = "Guest"');
+			return $all;
+		} catch (Dibi\Exception $e) {
+			return false;
+		}
+	} else {
+		return array(
+			'group' => 'Guest',
+			'group_id' => 999,
+			'image' => 'plugins/images/groups/guest.png'
+		);
+	}
 }
+
 function adminEditGroup($array)
 {
-    switch ($array['data']['action']) {
-        case 'changeDefaultGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('UPDATE groups SET `default` = 0');
-                $connect->query('
+	switch ($array['data']['action']) {
+		case 'changeDefaultGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('UPDATE groups SET `default` = 0');
+				$connect->query('
                 	UPDATE groups SET', [
-                        'default' => 1
-                    ], '
+					'default' => 1
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Group Management Function -  Changed Default Group from ['.$array['data']['oldGroupName'].'] to ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'deleteUserGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('DELETE FROM groups WHERE id = ?', $array['data']['id']);
-                writeLog('success', 'Group Management Function -  Deleted Group ['.$array['data']['groupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'addUserGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $newGroup = [
-                    'group' => $array['data']['newGroupName'],
-                    'group_id' => $array['data']['newGroupID'],
-                    'default' => false,
-                    'image' => $array['data']['newGroupImage'],
-                ];
-                $connect->query('INSERT INTO [groups]', $newGroup);
-                writeLog('success', 'Group Management Function -  Added Group ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'editUserGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('
+				writeLog('success', 'Group Management Function -  Changed Default Group from [' . $array['data']['oldGroupName'] . '] to [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'deleteUserGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('DELETE FROM groups WHERE id = ?', $array['data']['id']);
+				writeLog('success', 'Group Management Function -  Deleted Group [' . $array['data']['groupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'addUserGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$newGroup = [
+					'group' => $array['data']['newGroupName'],
+					'group_id' => $array['data']['newGroupID'],
+					'default' => false,
+					'image' => $array['data']['newGroupImage'],
+				];
+				$connect->query('INSERT INTO [groups]', $newGroup);
+				writeLog('success', 'Group Management Function -  Added Group [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'editUserGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                 	UPDATE groups SET', [
-                        'group' => $array['data']['groupName'],
-                        'image' => $array['data']['groupImage'],
-                    ], '
+					'group' => $array['data']['groupName'],
+					'image' => $array['data']['groupImage'],
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Group Management Function -  Edited Group Info for ['.$array['data']['oldGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        default:
-            # code...
-            break;
-    }
+				writeLog('success', 'Group Management Function -  Edited Group Info for [' . $array['data']['oldGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		default:
+			# code...
+			break;
+	}
 }
+
 function adminEditUser($array)
 {
-    switch ($array['data']['action']) {
-        case 'changeGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('
+	switch ($array['data']['action']) {
+		case 'changeGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                 	UPDATE users SET', [
-                        'group' => $array['data']['newGroupName'],
-                        'group_id' => $array['data']['newGroupID'],
-                    ], '
+					'group' => $array['data']['newGroupName'],
+					'group_id' => $array['data']['newGroupID'],
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'User Management Function - User: '.$array['data']['username'].'\'s group was changed from ['.$array['data']['oldGroup'].'] to ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                writeLog('error', 'User Management Function - Error - User: '.$array['data']['username'].'\'s group was changed from ['.$array['data']['oldGroup'].'] to ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return false;
-            }
-            break;
-        case 'editUser':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                if (!usernameTakenExcept($array['data']['username'], $array['data']['email'], $array['data']['id'])) {
-                    $connect->query('
+				writeLog('success', 'User Management Function - User: ' . $array['data']['username'] . '\'s group was changed from [' . $array['data']['oldGroup'] . '] to [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				writeLog('error', 'User Management Function - Error - User: ' . $array['data']['username'] . '\'s group was changed from [' . $array['data']['oldGroup'] . '] to [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return false;
+			}
+			break;
+		case 'editUser':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				if (!usernameTakenExcept($array['data']['username'], $array['data']['email'], $array['data']['id'])) {
+					$connect->query('
                         UPDATE users SET', [
-                            'username' => $array['data']['username'],
-                            'email' => $array['data']['email'],
-                        ], '
+						'username' => $array['data']['username'],
+						'email' => $array['data']['email'],
+					], '
                         WHERE id=?', $array['data']['id']);
-                    if (!empty($array['data']['password'])) {
-                        $connect->query('
+					if (!empty($array['data']['password'])) {
+						$connect->query('
                             UPDATE users SET', [
-                                'password' => password_hash($array['data']['password'], PASSWORD_BCRYPT)
-                            ], '
+							'password' => password_hash($array['data']['password'], PASSWORD_BCRYPT)
+						], '
                             WHERE id=?', $array['data']['id']);
-                    }
-                    writeLog('success', 'User Management Function - User: '.$array['data']['username'].'\'s info was changed', $GLOBALS['organizrUser']['username']);
-                    return true;
-                } else {
-                    return false;
-                }
-            } catch (Dibi\Exception $e) {
-                writeLog('error', 'User Management Function - Error - User: '.$array['data']['username'].'\'s group was changed from ['.$array['data']['oldGroup'].'] to ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return false;
-            }
-            break;
-        case 'addNewUser':
-            $defaults = defaultUserGroup();
-            if (createUser($array['data']['username'], $array['data']['password'], $defaults, $array['data']['email'])) {
-                writeLog('success', 'Create User Function - Acount created for ['.$array['data']['username'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } else {
-                writeLog('error', 'Registration Function - An error occured', $GLOBALS['organizrUser']['username']);
-                return 'username taken';
-            }
-            break;
-        case 'deleteUser':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('DELETE FROM users WHERE id = ?', $array['data']['id']);
-                writeLog('success', 'User Management Function -  Deleted User ['.$array['data']['username'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        default:
-            # code...
-            break;
-    }
+					}
+					writeLog('success', 'User Management Function - User: ' . $array['data']['username'] . '\'s info was changed', $GLOBALS['organizrUser']['username']);
+					return true;
+				} else {
+					return false;
+				}
+			} catch (Dibi\Exception $e) {
+				writeLog('error', 'User Management Function - Error - User: ' . $array['data']['username'] . '\'s group was changed from [' . $array['data']['oldGroup'] . '] to [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return false;
+			}
+			break;
+		case 'addNewUser':
+			$defaults = defaultUserGroup();
+			if (createUser($array['data']['username'], $array['data']['password'], $defaults, $array['data']['email'])) {
+				writeLog('success', 'Create User Function - Account created for [' . $array['data']['username'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} else {
+				writeLog('error', 'Registration Function - An error occurred', $GLOBALS['organizrUser']['username']);
+				return 'username taken';
+			}
+			break;
+		case 'deleteUser':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('DELETE FROM users WHERE id = ?', $array['data']['id']);
+				writeLog('success', 'User Management Function -  Deleted User [' . $array['data']['username'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		default:
+			# code...
+			break;
+	}
 }
+
 function editTabs($array)
 {
-    switch ($array['data']['action']) {
-        case 'changeGroup':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('
+	switch ($array['data']['action']) {
+		case 'changeGroup':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                 	UPDATE tabs SET', [
-                        'group_id' => $array['data']['newGroupID'],
-                    ], '
+					'group_id' => $array['data']['newGroupID'],
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Tab Editor Function - Tab: '.$array['data']['tab'].'\'s group was changed to ['.$array['data']['newGroupName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'changeCategory':
-                try {
-                    $connect = new Dibi\Connection([
-                        'driver' => 'sqlite3',
-                        'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                    ]);
-                    $connect->query('
+				writeLog('success', 'Tab Editor Function - Tab: ' . $array['data']['tab'] . '\'s group was changed to [' . $array['data']['newGroupName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeCategory':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                         UPDATE tabs SET', [
-                            'category_id' => $array['data']['newCategoryID'],
-                        ], '
+					'category_id' => $array['data']['newCategoryID'],
+				], '
                         WHERE id=?', $array['data']['id']);
-                    writeLog('success', 'Tab Editor Function - Tab: '.$array['data']['tab'].'\'s category was changed to ['.$array['data']['newCategoryName'].']', $GLOBALS['organizrUser']['username']);
-                    return true;
-                } catch (Dibi\Exception $e) {
-                    return false;
-                }
-                break;
-        case 'changeType':
-                try {
-                    $connect = new Dibi\Connection([
-                        'driver' => 'sqlite3',
-                        'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                    ]);
-                    $connect->query('
+				writeLog('success', 'Tab Editor Function - Tab: ' . $array['data']['tab'] . '\'s category was changed to [' . $array['data']['newCategoryName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeType':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                         UPDATE tabs SET', [
-                            'type' => $array['data']['newTypeID'],
-                        ], '
+					'type' => $array['data']['newTypeID'],
+				], '
                         WHERE id=?', $array['data']['id']);
-                    writeLog('success', 'Tab Editor Function - Tab: '.$array['data']['tab'].'\'s type was changed to ['.$array['data']['newTypeName'].']', $GLOBALS['organizrUser']['username']);
-                    return true;
-                } catch (Dibi\Exception $e) {
-                    return false;
-                }
-                break;
-        case 'changeEnabled':
-                try {
-                    $connect = new Dibi\Connection([
-                        'driver' => 'sqlite3',
-                        'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                    ]);
-                    $connect->query('
+				writeLog('success', 'Tab Editor Function - Tab: ' . $array['data']['tab'] . '\'s type was changed to [' . $array['data']['newTypeName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeEnabled':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                         UPDATE tabs SET', [
-                            'enabled' => $array['data']['tabEnabled'],
-                        ], '
+					'enabled' => $array['data']['tabEnabled'],
+				], '
                         WHERE id=?', $array['data']['id']);
-                    writeLog('success', 'Tab Editor Function - Tab: '.$array['data']['tab'].'\'s enable status was changed to ['.$array['data']['tabEnabledWord'].']', $GLOBALS['organizrUser']['username']);
-                    return true;
-                } catch (Dibi\Exception $e) {
-                    return false;
-                }
-                break;
-        case 'changeSplash':
-                try {
-                    $connect = new Dibi\Connection([
-                        'driver' => 'sqlite3',
-                        'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                    ]);
-                    $connect->query('
+				writeLog('success', 'Tab Editor Function - Tab: ' . $array['data']['tab'] . '\'s enable status was changed to [' . $array['data']['tabEnabledWord'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeSplash':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                         UPDATE tabs SET', [
-                            'splash' => $array['data']['tabSplash'],
-                        ], '
+					'splash' => $array['data']['tabSplash'],
+				], '
                         WHERE id=?', $array['data']['id']);
-                    writeLog('success', 'Tab Editor Function - Tab: '.$array['data']['tab'].'\'s splash status was changed to ['.$array['data']['tabSplashWord'].']', $GLOBALS['organizrUser']['username']);
-                    return true;
-                } catch (Dibi\Exception $e) {
-                    return false;
-                }
-                break;
-        case 'changeDefault':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('UPDATE tabs SET `default` = 0');
-                $connect->query('
+				writeLog('success', 'Tab Editor Function - Tab: ' . $array['data']['tab'] . '\'s splash status was changed to [' . $array['data']['tabSplashWord'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeDefault':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('UPDATE tabs SET `default` = 0');
+				$connect->query('
                     UPDATE tabs SET', [
-                        'default' => 1
-                    ], '
+					'default' => 1
+				], '
                     WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Tab Editor Function -  Changed Default Tab to ['.$array['data']['tab'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'deleteTab':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('DELETE FROM tabs WHERE id = ?', $array['data']['id']);
-                writeLog('success', 'Tab Editor Function -  Deleted Tab ['.$array['data']['tab'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'editTab':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('
+				writeLog('success', 'Tab Editor Function -  Changed Default Tab to [' . $array['data']['tab'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'deleteTab':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('DELETE FROM tabs WHERE id = ?', $array['data']['id']);
+				writeLog('success', 'Tab Editor Function -  Deleted Tab [' . $array['data']['tab'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'editTab':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                     UPDATE tabs SET', [
-                        'name' => $array['data']['tabName'],
-                        'url' => $array['data']['tabURL'],
-                        'image' => $array['data']['tabImage'],
-                    ], '
+					'name' => $array['data']['tabName'],
+					'url' => $array['data']['tabURL'],
+					'image' => $array['data']['tabImage'],
+				], '
                     WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Tab Editor Function -  Edited Tab Info for ['.$array['data']['tabName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-        case 'changeOrder':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                foreach ($array['data']['tabs']['tab'] as $key => $value) {
-                    if ($value['order'] != $value['originalOrder']) {
-                        $connect->query('
+				writeLog('success', 'Tab Editor Function -  Edited Tab Info for [' . $array['data']['tabName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+		case 'changeOrder':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				foreach ($array['data']['tabs']['tab'] as $key => $value) {
+					if ($value['order'] != $value['originalOrder']) {
+						$connect->query('
                             UPDATE tabs SET', [
-                                'order' => $value['order'],
-                            ], '
+							'order' => $value['order'],
+						], '
                             WHERE id=?', $value['id']);
-                        writeLog('success', 'Tab Editor Function - '.$value['name'].' Order Changed From '.$value['order'].' to '.$value['originalOrder'], $GLOBALS['organizrUser']['username']);
-                    }
-                }
-                writeLog('success', 'Tab Editor Function - Tab Order Changed', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'addNewTab':
-            try {
-                $default = defaulTabCategory()['category_id'];
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $newTab = [
-                    'order' => $array['data']['tabOrder'],
-                    'category_id' => $default,
-                    'name' => $array['data']['tabName'],
-                    'url' => $array['data']['tabURL'],
-                    'default' => $array['data']['tabDefault'],
-                    'enabled' => 1,
-                    'group_id' => $array['data']['tabGroupID'],
-                    'image' => $array['data']['tabImage'],
-                    'type' => $array['data']['tabType']
-                ];
-                $connect->query('INSERT INTO [tabs]', $newTab);
-                writeLog('success', 'Tab Editor Function - Created Tab for: '.$array['data']['tabName'], $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        default:
-            # code...
-            break;
-    }
+						writeLog('success', 'Tab Editor Function - ' . $value['name'] . ' Order Changed From ' . $value['order'] . ' to ' . $value['originalOrder'], $GLOBALS['organizrUser']['username']);
+					}
+				}
+				writeLog('success', 'Tab Editor Function - Tab Order Changed', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'addNewTab':
+			try {
+				$default = defaultTabCategory()['category_id'];
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$newTab = [
+					'order' => $array['data']['tabOrder'],
+					'category_id' => $default,
+					'name' => $array['data']['tabName'],
+					'url' => $array['data']['tabURL'],
+					'default' => $array['data']['tabDefault'],
+					'enabled' => 1,
+					'group_id' => $array['data']['tabGroupID'],
+					'image' => $array['data']['tabImage'],
+					'type' => $array['data']['tabType']
+				];
+				$connect->query('INSERT INTO [tabs]', $newTab);
+				writeLog('success', 'Tab Editor Function - Created Tab for: ' . $array['data']['tabName'], $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		default:
+			# code...
+			break;
+	}
 }
+
 function editCategories($array)
 {
-    switch ($array['data']['action']) {
-        case 'changeDefault':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('UPDATE categories SET `default` = 0');
-                $connect->query('
+	switch ($array['data']['action']) {
+		case 'changeDefault':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('UPDATE categories SET `default` = 0');
+				$connect->query('
                 	UPDATE categories SET', [
-                        'default' => 1
-                    ], '
+					'default' => 1
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Category Editor Function -  Changed Default Category from ['.$array['data']['oldCategoryName'].'] to ['.$array['data']['newCategoryName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'deleteCategory':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('DELETE FROM categories WHERE id = ?', $array['data']['id']);
-                writeLog('success', 'Category Editor Function -  Deleted Category ['.$array['data']['category'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'addNewCategory':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $newCategory = [
-                    'category' => $array['data']['categoryName'],
-                    'order' => $array['data']['categoryOrder'],
-                    'category_id' => $array['data']['categoryID'],
-                    'default' => false,
-                    'image' => $array['data']['categoryImage'],
-                ];
-                $connect->query('INSERT INTO [categories]', $newCategory);
-                writeLog('success', 'Category Editor Function -  Added Category ['.$array['data']['categoryName'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return $e;
-            }
-            break;
-        case 'editCategory':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                $connect->query('
+				writeLog('success', 'Category Editor Function -  Changed Default Category from [' . $array['data']['oldCategoryName'] . '] to [' . $array['data']['newCategoryName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'deleteCategory':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('DELETE FROM categories WHERE id = ?', $array['data']['id']);
+				writeLog('success', 'Category Editor Function -  Deleted Category [' . $array['data']['category'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'addNewCategory':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$newCategory = [
+					'category' => $array['data']['categoryName'],
+					'order' => $array['data']['categoryOrder'],
+					'category_id' => $array['data']['categoryID'],
+					'default' => false,
+					'image' => $array['data']['categoryImage'],
+				];
+				$connect->query('INSERT INTO [categories]', $newCategory);
+				writeLog('success', 'Category Editor Function -  Added Category [' . $array['data']['categoryName'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return $e;
+			}
+			break;
+		case 'editCategory':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				$connect->query('
                 	UPDATE categories SET', [
-                        'category' => $array['data']['name'],
-                        'image' => $array['data']['image'],
-                    ], '
+					'category' => $array['data']['name'],
+					'image' => $array['data']['image'],
+				], '
                 	WHERE id=?', $array['data']['id']);
-                writeLog('success', 'Category Editor Function -  Edited Category Info for ['.$array['data']['name'].']', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        case 'changeOrder':
-            try {
-                $connect = new Dibi\Connection([
-                    'driver' => 'sqlite3',
-                    'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-                ]);
-                foreach ($array['data']['categories']['category'] as $key => $value) {
-                    if ($value['order'] != $value['originalOrder']) {
-                        $connect->query('
+				writeLog('success', 'Category Editor Function -  Edited Category Info for [' . $array['data']['name'] . ']', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		case 'changeOrder':
+			try {
+				$connect = new Dibi\Connection([
+					'driver' => 'sqlite3',
+					'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+				]);
+				foreach ($array['data']['categories']['category'] as $key => $value) {
+					if ($value['order'] != $value['originalOrder']) {
+						$connect->query('
                             UPDATE categories SET', [
-                                'order' => $value['order'],
-                            ], '
+							'order' => $value['order'],
+						], '
                             WHERE id=?', $value['id']);
-                        writeLog('success', 'Category Editor Function - '.$value['name'].' Order Changed From '.$value['order'].' to '.$value['originalOrder'], $GLOBALS['organizrUser']['username']);
-                    }
-                }
-                writeLog('success', 'Category Editor Function - Category Order Changed', $GLOBALS['organizrUser']['username']);
-                return true;
-            } catch (Dibi\Exception $e) {
-                return false;
-            }
-            break;
-        default:
-            # code...
-            break;
-    }
+						writeLog('success', 'Category Editor Function - ' . $value['name'] . ' Order Changed From ' . $value['order'] . ' to ' . $value['originalOrder'], $GLOBALS['organizrUser']['username']);
+					}
+				}
+				writeLog('success', 'Category Editor Function - Category Order Changed', $GLOBALS['organizrUser']['username']);
+				return true;
+			} catch (Dibi\Exception $e) {
+				return false;
+			}
+			break;
+		default:
+			# code...
+			break;
+	}
 }
+
 function allUsers()
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $users = $connect->fetchAll('SELECT * FROM users');
-        $groups = $connect->fetchAll('SELECT * FROM groups ORDER BY group_id ASC');
-        foreach ($users as $k => $v) {
-            // clear password from array
-            unset($users[$k]['password']);
-        }
-        $all['users'] = $users;
-        $all['groups'] = $groups;
-        return $all;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$users = $connect->fetchAll('SELECT * FROM users');
+		$groups = $connect->fetchAll('SELECT * FROM groups ORDER BY group_id ASC');
+		foreach ($users as $k => $v) {
+			// clear password from array
+			unset($users[$k]['password']);
+		}
+		$all['users'] = $users;
+		$all['groups'] = $groups;
+		return $all;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
+
 function usernameTaken($username, $email)
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $all = $connect->fetch('SELECT * FROM users WHERE username = ? COLLATE NOCASE OR email = ? COLLATE NOCASE', $username, $email);
-        return ($all) ? true : false;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$all = $connect->fetch('SELECT * FROM users WHERE username = ? COLLATE NOCASE OR email = ? COLLATE NOCASE', $username, $email);
+		return ($all) ? true : false;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
+
 function usernameTakenExcept($username, $email, $id)
 {
-    try {
-        $connect = new Dibi\Connection([
-            'driver' => 'sqlite3',
-            'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-        ]);
-        $all = $connect->fetch('SELECT * FROM users WHERE id IS NOT ? AND username = ? COLLATE NOCASE OR id IS NOT ? AND email = ? COLLATE NOCASE', $id, $username, $id, $email);
-        return ($all) ? true : false;
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	try {
+		$connect = new Dibi\Connection([
+			'driver' => 'sqlite3',
+			'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+		]);
+		$all = $connect->fetch('SELECT * FROM users WHERE id IS NOT ? AND username = ? COLLATE NOCASE OR id IS NOT ? AND email = ? COLLATE NOCASE', $id, $username, $id, $email);
+		return ($all) ? true : false;
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
-function createUser($username, $password, $defaults, $email=null)
+
+function createUser($username, $password, $defaults, $email = null)
 {
-    $email = ($email) ? $email : random_ascii_string(10).'@placeholder.eml';
-    try {
-        if (!usernameTaken($username, $email)) {
-            $createDB = new Dibi\Connection([
-                'driver' => 'sqlite3',
-                'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-            ]);
-            $userInfo = [
-                'username' => $username,
-                'password'  => password_hash($password, PASSWORD_BCRYPT),
-                'email' => $email,
-                'group' => $defaults['group'],
-                'group_id' => $defaults['group_id'],
-                'image' => gravatar($email),
-                'register_date' => $GLOBALS['currentTime'],
-            ];
-            $createDB->query('INSERT INTO [users]', $userInfo);
-            return true;
-        } else {
-            return false;
-        }
-    } catch (Dibi\Exception $e) {
-        return false;
-    }
+	$email = ($email) ? $email : random_ascii_string(10) . '@placeholder.eml';
+	try {
+		if (!usernameTaken($username, $email)) {
+			$createDB = new Dibi\Connection([
+				'driver' => 'sqlite3',
+				'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+			]);
+			$userInfo = [
+				'username' => $username,
+				'password' => password_hash($password, PASSWORD_BCRYPT),
+				'email' => $email,
+				'group' => $defaults['group'],
+				'group_id' => $defaults['group_id'],
+				'image' => gravatar($email),
+				'register_date' => $GLOBALS['currentTime'],
+			];
+			$createDB->query('INSERT INTO [users]', $userInfo);
+			return true;
+		} else {
+			return false;
+		}
+	} catch (Dibi\Exception $e) {
+		return false;
+	}
 }
+
 function allTabs()
 {
-    if (file_exists('config'.DIRECTORY_SEPARATOR.'config.php')) {
-        try {
-            $connect = new Dibi\Connection([
-                'driver' => 'sqlite3',
-                'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-            ]);
-            $all['tabs'] = $connect->fetchAll('SELECT * FROM tabs ORDER BY `order` ASC');
-            $all['categories'] = $connect->fetchAll('SELECT * FROM categories ORDER BY `order` ASC');
-            $all['groups'] = $connect->fetchAll('SELECT * FROM groups ORDER BY `group_id` ASC');
-            return $all;
-        } catch (Dibi\Exception $e) {
-            return false;
-        }
-    }
+	if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
+		try {
+			$connect = new Dibi\Connection([
+				'driver' => 'sqlite3',
+				'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+			]);
+			$all['tabs'] = $connect->fetchAll('SELECT * FROM tabs ORDER BY `order` ASC');
+			$all['categories'] = $connect->fetchAll('SELECT * FROM categories ORDER BY `order` ASC');
+			$all['groups'] = $connect->fetchAll('SELECT * FROM groups ORDER BY `group_id` ASC');
+			return $all;
+		} catch (Dibi\Exception $e) {
+			return false;
+		}
+	}
 }
+
 function allGroups()
 {
-    if (file_exists('config'.DIRECTORY_SEPARATOR.'config.php')) {
-        try {
-            $connect = new Dibi\Connection([
-                'driver' => 'sqlite3',
-                'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-            ]);
-            $all = $connect->fetchAll('SELECT * FROM groups ORDER BY `group_id` ASC');
-            return $all;
-        } catch (Dibi\Exception $e) {
-            return false;
-        }
-    }
+	if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
+		try {
+			$connect = new Dibi\Connection([
+				'driver' => 'sqlite3',
+				'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+			]);
+			$all = $connect->fetchAll('SELECT * FROM groups ORDER BY `group_id` ASC');
+			return $all;
+		} catch (Dibi\Exception $e) {
+			return false;
+		}
+	}
 }
+
 function loadTabs()
 {
-    if (file_exists('config'.DIRECTORY_SEPARATOR.'config.php')) {
-        try {
-            $connect = new Dibi\Connection([
-                'driver' => 'sqlite3',
-                'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
-            ]);
-            $tabs = $connect->fetchAll('SELECT * FROM tabs WHERE `group_id` >= ? AND `enabled` = 1 ORDER BY `order` DESC', $GLOBALS['organizrUser']['groupID']);
-            $categories = $connect->fetchAll('SELECT * FROM categories ORDER BY `order` ASC');
-            $all['tabs'] = $tabs;
-            foreach ($tabs as $k => $v) {
-                $v['access_url'] = isset($v['url_local']) && $_SERVER['SERVER_ADDR'] == userIP() ? $v['url_local'] : $v['url'];
-            }
-            $count = array_map(function ($element) {
-                return $element['category_id'];
-            }, $tabs);
-            $count = (array_count_values($count));
-            foreach ($categories as $k => $v) {
-                $v['count'] = isset($count[$v['category_id']]) ?  $count[$v['category_id']] : 0;
-            }
-            $all['categories'] = $categories;
-            return $all;
-        } catch (Dibi\Exception $e) {
-            return false;
-        }
-    }
+	if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
+		try {
+			$connect = new Dibi\Connection([
+				'driver' => 'sqlite3',
+				'database' => $GLOBALS['dbLocation'] . $GLOBALS['dbName'],
+			]);
+			$tabs = $connect->fetchAll('SELECT * FROM tabs WHERE `group_id` >= ? AND `enabled` = 1 ORDER BY `order` DESC', $GLOBALS['organizrUser']['groupID']);
+			$categories = $connect->fetchAll('SELECT * FROM categories ORDER BY `order` ASC');
+			$all['tabs'] = $tabs;
+			foreach ($tabs as $k => $v) {
+				$v['access_url'] = isset($v['url_local']) && $_SERVER['SERVER_ADDR'] == userIP() ? $v['url_local'] : $v['url'];
+			}
+			$count = array_map(function ($element) {
+				return $element['category_id'];
+			}, $tabs);
+			$count = (array_count_values($count));
+			foreach ($categories as $k => $v) {
+				$v['count'] = isset($count[$v['category_id']]) ? $count[$v['category_id']] : 0;
+			}
+			$all['categories'] = $categories;
+			return $all;
+		} catch (Dibi\Exception $e) {
+			return false;
+		}
+	}
 }

api/functions/auth-functions.php

@@ -1,251 +1,260 @@
 <?php
 function authRegister($username, $password, $defaults, $email)
 {
-    $defaults = defaultUserGroup();
-    if (createUser($username, $password, $defaults, $email)) {
-        writeLog('success', 'Registration Function - A User has registered', $username);
-        if ($GLOBALS['PHPMAILER-enabled']) {
-            $emailTemplate = array(
-                'type' => 'registration',
-                'body' => $GLOBALS['PHPMAILER-emailTemplateRegisterUser'],
-                'subject' => $GLOBALS['PHPMAILER-emailTemplateRegisterUserSubject'],
-                'user' => $username,
-                'password' => null,
-                'inviteCode' => null,
-            );
-            $emailTemplate = phpmEmailTemplate($emailTemplate);
-            $sendEmail = array(
-                'to' => $email,
-                'user' => $username,
-                'subject' => $emailTemplate['subject'],
-                'body' => phpmBuildEmail($emailTemplate),
-            );
-            phpmSendEmail($sendEmail);
-        }
-        if (createToken($username, $email, gravatar($email), $defaults['group'], $defaults['group_id'], $GLOBALS['organizrHash'], 7)) {
-            writeLoginLog($username, 'success');
-            writeLog('success', 'Login Function - A User has logged in', $username);
-            return true;
-        }
-    } else {
-        writeLog('error', 'Registration Function - An error occured', $username);
-        return 'username taken';
-    }
+	if (createUser($username, $password, $defaults, $email)) {
+		writeLog('success', 'Registration Function - A User has registered', $username);
+		if ($GLOBALS['PHPMAILER-enabled']) {
+			$emailTemplate = array(
+				'type' => 'registration',
+				'body' => $GLOBALS['PHPMAILER-emailTemplateRegisterUser'],
+				'subject' => $GLOBALS['PHPMAILER-emailTemplateRegisterUserSubject'],
+				'user' => $username,
+				'password' => null,
+				'inviteCode' => null,
+			);
+			$emailTemplate = phpmEmailTemplate($emailTemplate);
+			$sendEmail = array(
+				'to' => $email,
+				'user' => $username,
+				'subject' => $emailTemplate['subject'],
+				'body' => phpmBuildEmail($emailTemplate),
+			);
+			phpmSendEmail($sendEmail);
+		}
+		if (createToken($username, $email, gravatar($email), $defaults['group'], $defaults['group_id'], $GLOBALS['organizrHash'], 7)) {
+			writeLoginLog($username, 'success');
+			writeLog('success', 'Login Function - A User has logged in', $username);
+			return true;
+		}
+	} else {
+		writeLog('error', 'Registration Function - An error occurred', $username);
+		return 'username taken';
+	}
+	return false;
 }
+
 function checkPlexUser($username)
 {
-    try {
-        if (!empty($GLOBALS['plexToken'])) {
-            $url = 'https://plex.tv/pms/friends/all';
-            $headers = array(
-                'X-Plex-Token' => $GLOBALS['plexToken'],
-            );
-            $response = Requests::get($url, $headers);
-            if ($response->success) {
-                libxml_use_internal_errors(true);
-                $userXML = simplexml_load_string($response->body);
-                if (is_array($userXML) || is_object($userXML)) {
-                    $usernameLower = strtolower($username);
-                    foreach ($userXML as $child) {
-                        if (isset($child['username']) && strtolower($child['username']) == $usernameLower || isset($child['email']) && strtolower($child['email']) == $usernameLower) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    } catch (Requests_Exception $e) {
-        writeLog('success', 'Plex User Check Function - Error: '.$e->getMessage(), $username);
-    };
+	try {
+		if (!empty($GLOBALS['plexToken'])) {
+			$url = 'https://plex.tv/pms/friends/all';
+			$headers = array(
+				'X-Plex-Token' => $GLOBALS['plexToken'],
+			);
+			$response = Requests::get($url, $headers);
+			if ($response->success) {
+				libxml_use_internal_errors(true);
+				$userXML = simplexml_load_string($response->body);
+				if (is_array($userXML) || is_object($userXML)) {
+					$usernameLower = strtolower($username);
+					foreach ($userXML as $child) {
+						if (isset($child['username']) && strtolower($child['username']) == $usernameLower || isset($child['email']) && strtolower($child['email']) == $usernameLower) {
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	} catch (Requests_Exception $e) {
+		writeLog('success', 'Plex User Check Function - Error: ' . $e->getMessage(), $username);
+	}
+	return false;
 }
+
 function plugin_auth_plex($username, $password)
 {
-    try {
-        $usernameLower = strtolower($username);
-        if ((!empty($GLOBALS['plexAdmin']) && strtolower($GLOBALS['plexAdmin']) == $usernameLower) || checkPlexUser($username)) {
-            //Login User
-            $url = 'https://plex.tv/users/sign_in.json';
-            $headers = array(
-                'Accept'=> 'application/json',
-                'Content-Type' => 'application/x-www-form-urlencoded',
-                'X-Plex-Product' => 'Organizr',
-                'X-Plex-Version' => '2.0',
-                'X-Plex-Client-Identifier' => '01010101-10101010',
-            );
-            $data = array(
-                'user[login]' => $username,
-                'user[password]' => $password,
-            );
-            $response = Requests::post($url, $headers, $data);
-            if ($response->success) {
-                $json = json_decode($response->body, true);
-                if ((is_array($json) && isset($json['user']) && isset($json['user']['username'])) && strtolower($json['user']['username']) == $usernameLower || strtolower($json['user']['email']) == $usernameLower) {
-                    //writeLog("success", $json['user']['username']." was logged into organizr using plex credentials");
-                    return array(
-                        'username' => $json['user']['username'],
-                        'email' => $json['user']['email'],
-                        'image' => $json['user']['thumb'],
-                        'token' => $json['user']['authToken']
-                    );
-                }
-            }
-        }
-        return false;
-    } catch (Requests_Exception $e) {
-        writeLog('success', 'Plex Auth Function - Error: '.$e->getMessage(), $username);
-    };
+	try {
+		$usernameLower = strtolower($username);
+		if ((!empty($GLOBALS['plexAdmin']) && strtolower($GLOBALS['plexAdmin']) == $usernameLower) || checkPlexUser($username)) {
+			//Login User
+			$url = 'https://plex.tv/users/sign_in.json';
+			$headers = array(
+				'Accept' => 'application/json',
+				'Content-Type' => 'application/x-www-form-urlencoded',
+				'X-Plex-Product' => 'Organizr',
+				'X-Plex-Version' => '2.0',
+				'X-Plex-Client-Identifier' => '01010101-10101010',
+			);
+			$data = array(
+				'user[login]' => $username,
+				'user[password]' => $password,
+			);
+			$response = Requests::post($url, $headers, $data);
+			if ($response->success) {
+				$json = json_decode($response->body, true);
+				if ((is_array($json) && isset($json['user']) && isset($json['user']['username'])) && strtolower($json['user']['username']) == $usernameLower || strtolower($json['user']['email']) == $usernameLower) {
+					//writeLog("success", $json['user']['username']." was logged into organizr using plex credentials");
+					return array(
+						'username' => $json['user']['username'],
+						'email' => $json['user']['email'],
+						'image' => $json['user']['thumb'],
+						'token' => $json['user']['authToken']
+					);
+				}
+			}
+		}
+		return false;
+	} catch (Requests_Exception $e) {
+		writeLog('success', 'Plex Auth Function - Error: ' . $e->getMessage(), $username);
+	}
+	return false;
 }
+
 if (function_exists('ldap_connect')) {
-    // Pass credentials to LDAP backend
-    function plugin_auth_ldap($username, $password)
-    {
-        if (!empty($GLOBALS['authBaseDN']) && !empty($GLOBALS['authBackendHost'])) {
-            $ldapServers = explode(',', $GLOBALS['authBackendHost']);
-            foreach ($ldapServers as $key => $value) {
-                // Calculate parts
-                $digest = parse_url(trim($value));
-                $scheme = strtolower((isset($digest['scheme'])?$digest['scheme']:'ldap'));
-                $host = (isset($digest['host'])?$digest['host']:(isset($digest['path'])?$digest['path']:''));
-                $port = (isset($digest['port'])?$digest['port']:(strtolower($scheme)=='ldap'?389:636));
-                // Reassign
-                $ldapServers[$key] = $scheme.'://'.$host.':'.$port;
-            }
-            $ldap = ldap_connect(implode(' ', $ldapServers));
-            ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-            ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-            $bind = @ldap_bind($ldap, sprintf($GLOBALS['authBaseDN'], $username), $password);
-            return ($bind) ? true : false;
-        }
-        return false;
-    }
+	// Pass credentials to LDAP backend
+	function plugin_auth_ldap($username, $password)
+	{
+		if (!empty($GLOBALS['authBaseDN']) && !empty($GLOBALS['authBackendHost'])) {
+			$ldapServers = explode(',', $GLOBALS['authBackendHost']);
+			foreach ($ldapServers as $key => $value) {
+				// Calculate parts
+				$digest = parse_url(trim($value));
+				$scheme = strtolower((isset($digest['scheme']) ? $digest['scheme'] : 'ldap'));
+				$host = (isset($digest['host']) ? $digest['host'] : (isset($digest['path']) ? $digest['path'] : ''));
+				$port = (isset($digest['port']) ? $digest['port'] : (strtolower($scheme) == 'ldap' ? 389 : 636));
+				// Reassign
+				$ldapServers[$key] = $scheme . '://' . $host . ':' . $port;
+			}
+			$ldap = ldap_connect(implode(' ', $ldapServers));
+			ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+			ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+			$bind = @ldap_bind($ldap, sprintf($GLOBALS['authBaseDN'], $username), $password);
+			return ($bind) ? true : false;
+		}
+		return false;
+	}
 } else {
-    // Ldap Auth Missing Dependancy
-    function plugin_auth_ldap_disabled()
-    {
-        return 'LDAP - Disabled (Dependancy: php-ldap missing!)';
-    }
+	// Ldap Auth Missing Dependency
+	function plugin_auth_ldap_disabled()
+	{
+		return 'LDAP - Disabled (Dependency: php-ldap missing!)';
+	}
 }
 // Pass credentials to FTP backend
 function plugin_auth_ftp($username, $password)
 {
-    // Calculate parts
-    $digest = parse_url($GLOBALS['authBackendHost']);
-    $scheme = strtolower((isset($digest['scheme'])?$digest['scheme']:(function_exists('ftp_ssl_connect')?'ftps':'ftp')));
-    $host = (isset($digest['host'])?$digest['host']:(isset($digest['path'])?$digest['path']:''));
-    $port = (isset($digest['port'])?$digest['port']:21);
-    // Determine Connection Type
-    if ($scheme == 'ftps') {
-        $conn_id = ftp_ssl_connect($host, $port, 20);
-    } elseif ($scheme == 'ftp') {
-        $conn_id = ftp_connect($host, $port, 20);
-    } else {
-        return false;
-    }
-    // Check if valid FTP connection
-    if ($conn_id) {
-        // Attempt login
-        @$login_result = ftp_login($conn_id, $username, $password);
-        ftp_close($conn_id);
-        // Return Result
-        if ($login_result) {
-            return true;
-        } else {
-            return false;
-        }
-    } else {
-        return false;
-    }
-    return false;
+	// Calculate parts
+	$digest = parse_url($GLOBALS['authBackendHost']);
+	$scheme = strtolower((isset($digest['scheme']) ? $digest['scheme'] : (function_exists('ftp_ssl_connect') ? 'ftps' : 'ftp')));
+	$host = (isset($digest['host']) ? $digest['host'] : (isset($digest['path']) ? $digest['path'] : ''));
+	$port = (isset($digest['port']) ? $digest['port'] : 21);
+	// Determine Connection Type
+	if ($scheme == 'ftps') {
+		$conn_id = ftp_ssl_connect($host, $port, 20);
+	} elseif ($scheme == 'ftp') {
+		$conn_id = ftp_connect($host, $port, 20);
+	} else {
+		return false;
+	}
+	// Check if valid FTP connection
+	if ($conn_id) {
+		// Attempt login
+		@$login_result = ftp_login($conn_id, $username, $password);
+		ftp_close($conn_id);
+		// Return Result
+		if ($login_result) {
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return false;
+	}
 }
 
 // Pass credentials to Emby Backend
 function plugin_auth_emby_local($username, $password)
 {
-    try {
-        $url = qualifyURL($GLOBALS['embyURL']).'/Users/AuthenticateByName';
-        $headers = array(
-            'Authorization'=> 'MediaBrowser UserId="e8837bc1-ad67-520e-8cd2-f629e3155721", Client="None", Device="Organizr", DeviceId="xxx", Version="1.0.0.0"',
-            'Content-Type' => 'application/json',
-        );
-        $data = array(
-            'Username' => $username,
-            'Password' => sha1($password),
-            'PasswordMd5' => md5($password),
-        );
-        $response = Requests::post($url, $headers, json_encode($data));
-        if ($response->success) {
-            $json = json_decode($response->body, true);
-            if (is_array($json) && isset($json['SessionInfo']) && isset($json['User']) && $json['User']['HasPassword'] == true) {
-                // Login Success - Now Logout Emby Session As We No Longer Need It
-                $headers = array(
-                    'X-Mediabrowser-Token' => $json['AccessToken'],
-                );
-                $response = Requests::post(qualifyURL($GLOBALS['embyURL']).'/Sessions/Logout', $headers, array());
-                return true;
-            }
-        }
-        return false;
-    } catch (Requests_Exception $e) {
-        writeLog('error', 'Emby Local Auth Function - Error: '.$e->getMessage(), $username);
-    };
+	try {
+		$url = qualifyURL($GLOBALS['embyURL']) . '/Users/AuthenticateByName';
+		$headers = array(
+			'Authorization' => 'MediaBrowser UserId="e8837bc1-ad67-520e-8cd2-f629e3155721", Client="None", Device="Organizr", DeviceId="xxx", Version="1.0.0.0"',
+			'Content-Type' => 'application/json',
+		);
+		$data = array(
+			'Username' => $username,
+			'Password' => sha1($password),
+			'PasswordMd5' => md5($password),
+		);
+		$response = Requests::post($url, $headers, json_encode($data));
+		if ($response->success) {
+			$json = json_decode($response->body, true);
+			if (is_array($json) && isset($json['SessionInfo']) && isset($json['User']) && $json['User']['HasPassword'] == true) {
+				// Login Success - Now Logout Emby Session As We No Longer Need It
+				$headers = array(
+					'X-Mediabrowser-Token' => $json['AccessToken'],
+				);
+				$response = Requests::post(qualifyURL($GLOBALS['embyURL']) . '/Sessions/Logout', $headers, array());
+				if ($response->success) {
+					return true;
+				}
+			}
+		}
+		return false;
+	} catch (Requests_Exception $e) {
+		writeLog('error', 'Emby Local Auth Function - Error: ' . $e->getMessage(), $username);
+	}
+	return false;
 }
-// Authenicate against emby connect
+
+// Authenticate against emby connect
 function plugin_auth_emby_connect($username, $password)
 {
-    try {
-        // Get A User
-        $connectId = '';
-        $url = qualifyURL($GLOBALS['embyURL']).'/Users?api_key='.$GLOBALS['embyToken'];
-        $response = Requests::get($url);
-        if ($response->success) {
-            $json = json_decode($response->body, true);
-            if (is_array($json)) {
-                foreach ($json as $key => $value) { // Scan for this user
-                    if (isset($value['ConnectUserName']) && isset($value['ConnectUserId'])) { // Qualifty as connect account
-                        if ($value['ConnectUserName'] == $username || $value['Name'] == $username) {
-                            $connectId = $value['ConnectUserId'];
-                            writeLog('success', 'Emby Connect Auth Function - Found User', $username);
-                            break;
-                        }
-                    }
-                }
-                if ($connectId) {
-                    $connectURL = 'https://connect.emby.media/service/user/authenticate';
-                    $headers = array(
-                        'Accept'=> 'application/json',
-                        'Content-Type' => 'application/x-www-form-urlencoded',
-                    );
-                    $data = array(
-                        'nameOrEmail' => $username,
-                        'rawpw' => $password,
-                    );
-                    $response = Requests::post($connectURL, $headers, $data);
-                    if ($response->success) {
-                        $json = json_decode($response->body, true);
-                        if (is_array($json) && isset($json['AccessToken']) && isset($json['User']) && $json['User']['Id'] == $connectId) {
-                            return array(
-                                'email' => $json['User']['Email'],
-                                'image' => $json['User']['ImageUrl'],
-                            );
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    } catch (Requests_Exception $e) {
-        writeLog('error', 'Emby Connect Auth Function - Error: '.$e->getMessage(), $username);
-        return false;
-    };
+	try {
+		// Get A User
+		$connectId = '';
+		$url = qualifyURL($GLOBALS['embyURL']) . '/Users?api_key=' . $GLOBALS['embyToken'];
+		$response = Requests::get($url);
+		if ($response->success) {
+			$json = json_decode($response->body, true);
+			if (is_array($json)) {
+				foreach ($json as $key => $value) { // Scan for this user
+					if (isset($value['ConnectUserName']) && isset($value['ConnectUserId'])) { // Qualify as connect account
+						if ($value['ConnectUserName'] == $username || $value['Name'] == $username) {
+							$connectId = $value['ConnectUserId'];
+							writeLog('success', 'Emby Connect Auth Function - Found User', $username);
+							break;
+						}
+					}
+				}
+				if ($connectId) {
+					$connectURL = 'https://connect.emby.media/service/user/authenticate';
+					$headers = array(
+						'Accept' => 'application/json',
+						'Content-Type' => 'application/x-www-form-urlencoded',
+					);
+					$data = array(
+						'nameOrEmail' => $username,
+						'rawpw' => $password,
+					);
+					$response = Requests::post($connectURL, $headers, $data);
+					if ($response->success) {
+						$json = json_decode($response->body, true);
+						if (is_array($json) && isset($json['AccessToken']) && isset($json['User']) && $json['User']['Id'] == $connectId) {
+							return array(
+								'email' => $json['User']['Email'],
+								'image' => $json['User']['ImageUrl'],
+							);
+						}
+					}
+				}
+			}
+		}
+		return false;
+	} catch (Requests_Exception $e) {
+		writeLog('error', 'Emby Connect Auth Function - Error: ' . $e->getMessage(), $username);
+		return false;
+	}
 }
+
 // Authenticate Against Emby Local (first) and Emby Connect
 function plugin_auth_emby_all($username, $password)
 {
-    $localResult = plugin_auth_emby_local($username, $password);
-    if ($localResult) {
-        return $localResult;
-    } else {
-        return plugin_auth_emby_connect($username, $password);
-    }
+	$localResult = plugin_auth_emby_local($username, $password);
+	if ($localResult) {
+		return $localResult;
+	} else {
+		return plugin_auth_emby_connect($username, $password);
+	}
 }