From 12d6db41166682993886bca80aa0d86a4edabe03 Mon Sep 17 00:00:00 2001 From: causefx Date: Fri, 13 Jan 2017 20:04:10 -0700 Subject: [PATCH] More Fixes and DB location support Fixed #33 Fixed #13 --- index.php | 313 ++++++++++++++++++++++++++++++++++----------------- settings.php | 6 +- user.php | 6 +- 3 files changed, 213 insertions(+), 112 deletions(-) diff --git a/index.php b/index.php index 556591563..b413ac525 100644 --- a/index.php +++ b/index.php @@ -1,20 +1,35 @@ query($query) as $data) { +if($action == "createLocation") : - $needSetup = "No"; + $databaseData = '; ' . "\r\n"; -} + foreach ($_POST as $postName => $postValue) { + + if($postName !== "action") : + + if(substr($postValue, -1) == "/") : $postValue = rtrim($postValue, "/"); endif; + + $databaseData .= $postName . " = \"" . $postValue . "\"\r\n"; + + endif; + + } -$db = DATABASE_LOCATION . constant('User::DATABASE_NAME') . ".db"; -$file_db = new PDO("sqlite:" . $db); -$file_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + write_ini_file($databaseData, $databaseLocation); -$dbTab = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="tabs"'); -$dbOptions = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="options"'); +endif; -$tabSetup = "Yes"; -$hasOptions = "No"; -$settingsicon = "No"; +if(!file_exists($databaseLocation)) : -foreach($dbTab as $row) : + $configReady = "No"; + $userpic = ""; - if (in_array("tabs", $row)) : - - $tabSetup = "No"; - - endif; +else : -endforeach; + $configReady = "Yes"; -foreach($dbOptions as $row) : + require_once("user.php"); - if (in_array("options", $row)) : - - $hasOptions = "Yes"; + $USER = new User("registration_callback"); + + $dbfile = DATABASE_LOCATION . constant('User::DATABASE_NAME') . ".db"; + + $database = new PDO("sqlite:" . $dbfile); + + $query = "SELECT * FROM users"; + + foreach($database->query($query) as $data) { + + $needSetup = "No"; + + } + + $db = DATABASE_LOCATION . constant('User::DATABASE_NAME') . ".db"; + $file_db = new PDO("sqlite:" . $db); + $file_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + $dbTab = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="tabs"'); + $dbOptions = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="options"'); + + foreach($dbTab as $row) : + + if (in_array("tabs", $row)) : + + $tabSetup = "No"; + + endif; + + endforeach; + + if($tabSetup == "Yes") : + + $settingsActive = "active"; endif; -endforeach; + foreach($dbOptions as $row) : -if($tabSetup == "No") : + if (in_array("options", $row)) : - if($USER->authenticated && $USER->role == "admin") : + $hasOptions = "Yes"; - $result = $file_db->query('SELECT * FROM tabs WHERE active = "true"'); - $getsettings = $file_db->query('SELECT * FROM tabs WHERE active = "true"'); + endif; - foreach($getsettings as $row) : + endforeach; - if(!empty($row['iconurl']) && $settingsicon == "No") : + if($tabSetup == "No") : - $settingsicon = "Yes"; + if($USER->authenticated && $USER->role == "admin") : - endif; + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true"'); + $getsettings = $file_db->query('SELECT * FROM tabs WHERE active = "true"'); - endforeach; + foreach($getsettings as $row) : - elseif($USER->authenticated && $USER->role == "user") : + if(!empty($row['iconurl']) && $settingsicon == "No") : - $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND user = "true"'); + $settingsicon = "Yes"; - else : + endif; - $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND guest = "true"'); + endforeach; - endif; - -endif; + elseif($USER->authenticated && $USER->role == "user") : -$settingsActive = ""; + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND user = "true"'); -if($tabSetup == "Yes") : + else : - $settingsActive = "active"; - -endif; + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND guest = "true"'); -if($hasOptions == "Yes") : + endif; - $resulto = $file_db->query('SELECT * FROM options'); + endif; - foreach($resulto as $row) : - - $title = $row['title']; - $topbartext = $row['topbartext']; - $topbar = $row['topbar']; - $bottombar = $row['bottombar']; - $sidebar = $row['sidebar']; - $hoverbg = $row['hoverbg']; - $activetabBG = $row['activetabBG']; - $activetabicon = $row['activetabicon']; - $activetabtext = $row['activetabtext']; - $inactiveicon = $row['inactiveicon']; - $inactivetext = $row['inactivetext']; + if($hasOptions == "Yes") : - endforeach; + $resulto = $file_db->query('SELECT * FROM options'); -elseif($hasOptions == "No") : + foreach($resulto as $row) : - $title = "Organizr"; - $topbar = "#eb6363"; - $topbartext = "#FFFFFF"; - $bottombar = "#eb6363"; - $sidebar = "#000000"; - $hoverbg = "#eb6363"; - $activetabBG = "#eb6363"; - $activetabicon = "#FFFFFF"; - $activetabtext = "#FFFFFF"; - $inactiveicon = "#FFFFFF"; - $inactivetext = "#FFFFFF"; + $title = $row['title']; + $topbartext = $row['topbartext']; + $topbar = $row['topbar']; + $bottombar = $row['bottombar']; + $sidebar = $row['sidebar']; + $hoverbg = $row['hoverbg']; + $activetabBG = $row['activetabBG']; + $activetabicon = $row['activetabicon']; + $activetabtext = $row['activetabtext']; + $inactiveicon = $row['inactiveicon']; + $inactivetext = $row['inactivetext']; -endif; + endforeach; + + endif; -$userpic = md5( strtolower( trim( $USER->email ) ) ); + $userpic = md5( strtolower( trim( $USER->email ) ) ); + +endif; ?> @@ -399,7 +448,7 @@ function printArray($arrayName){ - authenticated && $USER->role == "admin") :?> + authenticated && $USER->role == "admin") :?>
  • @@ -420,7 +469,7 @@ function printArray($arrayName){
    • - + @@ -451,17 +500,17 @@ function printArray($arrayName){
  • - authenticated) : ?> + authenticated) : ?> - + @@ -498,7 +547,7 @@ function printArray($arrayName){
    - +
    @@ -564,7 +613,61 @@ function printArray($arrayName){
    - authenticated && $tabSetup == "Yes" && $needSetup == "No") :?> + + + +
    + +
    + +
    + + + +
    + +
    + +
    + + + + authenticated && $tabSetup == "Yes" && $needSetup == "No") :?>
    @@ -598,7 +701,7 @@ function printArray($arrayName){
    - +
    - authenticated) : ?> + authenticated && $configReady == "Yes") : ?> - - authenticated) : ?> + + authenticated) : ?>
    @@ -869,7 +972,7 @@ function printArray($arrayName){
    - + diff --git a/settings.php b/settings.php index 472284686..c77a47509 100644 --- a/settings.php +++ b/settings.php @@ -438,8 +438,6 @@ function rcopy($src, $dst) { $stmt->execute(); endforeach; - - //echo ""; endif; @@ -1679,7 +1677,7 @@ function changeColor(elementName, elementColor) { dataType: "json", success: function(github) { - var currentVersion = "0.98"; + var currentVersion = "0.985"; var githubVersion = github.tag_name; var githubDescription = github.body; var githubName = github.name; @@ -1724,7 +1722,7 @@ function changeColor(elementName, elementColor) { } - $(infoTabVersion).html("Installed Version: " + currentVersion + " Current Version: " + githubVersion); + $(infoTabVersion).html("Installed Version: " + currentVersion + " Current Version: " + githubVersion + " Database Location: "); } diff --git a/user.php b/user.php index d41b56a1c..3faab792b 100644 --- a/user.php +++ b/user.php @@ -7,9 +7,9 @@ * entry is assigned a new random token, which is used in * salting subsequent password checks. */ - - define('USER_HOME', dirname(__DIR__) . '/users/'); - define('DATABASE_LOCATION', dirname(__DIR__) . '/'); + $databaseConfig = parse_ini_file('databaseLocation.ini.php', true); + define('USER_HOME', $databaseConfig['databaseLocation'] . '/users/'); + define('DATABASE_LOCATION', $databaseConfig['databaseLocation'] . '/'); class User {