diff --git a/app/gallery.json b/app/gallery.json index 091aeb2..eede263 100644 --- a/app/gallery.json +++ b/app/gallery.json @@ -1,5 +1,5 @@ { "license": "MIT", - "version": "22.11.16", + "version": "22.11.17", "branch": "main" } \ No newline at end of file diff --git a/app/sanity/check/_database.php b/app/sanity/check/_database.php index c23d4a7..e616bda 100644 --- a/app/sanity/check/_database.php +++ b/app/sanity/check/_database.php @@ -19,17 +19,17 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'images' => array( array('id', 'int(11)', 'NO', 'PRI', '', 'auto_increment'), array('imagename', 'varchar(255)', 'NO', 'UNI', '', ''), - array('alt', 'text', 'NO', '', '', ''), - array('tags', 'text', 'NO', '', '', ''), + array('alt', 'text', 'YES', '', '', ''), + array('tags', 'text', 'YES', '', '', ''), array('author', 'int(11)', 'NO', '', '', ''), array('last_modified', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', 'on update CURRENT_TIMESTAMP'), array('upload_date', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', '') ), 'users' => array( array('id', 'int(11)', 'NO', 'PRI', '', 'auto_increment'), - array('username', 'varchar(255)', 'NO', 'UNI', '', ''), + array('username', 'varchar(50)', 'NO', 'UNI', '', ''), array('password', 'varchar(255)', 'NO', '', '', ''), - array('pfp_path', 'varchar(255)', 'NO', '', '', ''), + array('pfp_path', 'varchar(50)', 'NO', '', '', ''), array('admin', 'boolean', 'NO', '', 'FALSE', ''), array('last_modified', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', 'on update CURRENT_TIMESTAMP'), array('created_at', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', '') @@ -37,6 +37,7 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'groups' => array( array('id', 'int(11)', 'NO', 'PRI', '', 'auto_increment'), array('group_name', 'varchar(255)', 'NO', 'UNI', '', ''), + array('author', 'varchar(50)', 'NO', '', '', ''), array('image_list', 'text', 'NO', '', '', ''), array('last_modified', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', 'on update CURRENT_TIMESTAMP'), array('created_at', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', '') @@ -56,7 +57,7 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'bans' => array( array('id', 'int(11)', 'NO', 'PRI', '', 'auto_increment'), array('ipaddress', 'varchar(16)', 'NO', '', '', ''), - array('reason', 'varchar(255)', 'NO', '', '', ''), + array('reason', 'text', 'NO', '', '', ''), array('time', 'timestamp', 'NO', '', 'CURRENT_TIMESTAMP', ''), array('length', 'int(255)', 'NO', '', '', ''), array('pernament', 'boolean', 'NO', '', 'FALSE', '') @@ -85,7 +86,8 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { return $results; } - $table_list = array('images', 'users', 'groups', 'tokens', 'logs', 'bans', 'test'); + //$table_list = array('images', 'users', 'groups', 'tokens', 'logs', 'bans', 'test'); + $table_list = array('images', 'users', 'groups', 'tokens', 'logs', 'bans'); foreach ($table_list as $table) { $error_type = array(); diff --git a/app/sanity/fix/_database.php b/app/sanity/fix/_database.php index 18396b8..3ed4a2c 100644 --- a/app/sanity/fix/_database.php +++ b/app/sanity/fix/_database.php @@ -21,11 +21,11 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { ); } else { $sql = "CREATE TABLE IF NOT EXISTS images ( - id INT(11) AUTO_INCREMENT PRIMARY KEY, - imagename VARCHAR(255) NOT NULL UNIQUE, - alt TEXT NOT NULL, - tags TEXT NOT NULL, - author INT(11) NOT NULL, + id INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + imagename VARCHAR(255) UNIQUE, + alt TEXT, + tags TEXT, + author VARCHAR(50) NOT NULL, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, upload_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; @@ -59,11 +59,11 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { ); } else { $sql = "CREATE TABLE IF NOT EXISTS users ( - id INT(11) AUTO_INCREMENT PRIMARY KEY, - username VARCHAR(255) NOT NULL UNIQUE, + id INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + username VARCHAR(50) NOT NULL UNIQUE, password VARCHAR(255) NOT NULL, - pfp_path VARCHAR(255) NOT NULL, - admin BOOLEAN NOT NULL DEFAULT FALSE, + pfp_path VARCHAR(50), + admin BOOLEAN DEFAULT FALSE, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; @@ -96,10 +96,11 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'message'=> 'Found groups table', ); } else { - $sql = "CREATE TABLE IF NOT EXISTS groups ( - id INT(11) AUTO_INCREMENT PRIMARY KEY, - group_name VARCHAR(255) NOT NULL, - image_list VARCHAR(text) NOT NULL, + $sql = "CREATE TABLE IF NOT EXISTS groups (` + id INT NOT NULL PRIMARY KEY AUTO_INCREMENT, + group_name TEXT NOT NULL, + image_list TEXT NOT NULL, + author VARCHAR(50) NOT NULL, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; @@ -133,10 +134,10 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { ); } else { $sql = "CREATE TABLE IF NOT EXISTS logs ( - id INT(11) AUTO_INCREMENT PRIMARY KEY, + id INT NOT NULL PRIMARY KEY AUTO_INCREMENT, ipaddress VARCHAR(16) NOT NULL, - action VARCHAR(255) NOT NULL, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + action TEXT NOT NULL, + time TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; try { @@ -167,10 +168,10 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'message'=> 'Found bans table', ); } else { - $sql = "CREATE TABLE IF NOT EXISTS bans ( - id INT(11) AUTO_INCREMENT PRIMARY KEY, + $sql = "CREATE TABLE IF NOT EXISTS bans ( + id INT NOT NULL PRIMARY KEY AUTO_INCREMENT, ipaddress VARCHAR(16) NOT NULL, - reason VARCHAR(255) NOT NULL, + reason TEXT NOT NULL, time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, length VARCHAR(255) NOT NULL, permanent BOOLEAN NOT NULL DEFAULT FALSE @@ -206,7 +207,7 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { } else { $sql = "CREATE TABLE IF NOT EXISTS tokens ( id INT(11) AUTO_INCREMENT PRIMARY KEY, - code VARCHAR(59) NOT NULL, + code VARCHAR(16) NOT NULL, used BOOLEAN NOT NULL DEFAULT FALSE, timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP )"; @@ -233,6 +234,7 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { } } + /* TEST TABLE, NOT TO BE USED IN RRODCTION if (check_database($conn, 'test')) { $results[] = array( 'type'=>'success', @@ -244,4 +246,5 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { 'message'=> 'Error creating table tokens: This is a test, you do not need to act on this', ); } + */ } \ No newline at end of file diff --git a/app/sanity/fix/_folders.php b/app/sanity/fix/_folders.php index 219e327..085c20f 100644 --- a/app/sanity/fix/_folders.php +++ b/app/sanity/fix/_folders.php @@ -172,4 +172,38 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { ); } } + + if (is_file(__DIR__."/../../../usr/conf/msg.json")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/conf/msg.json folder!', + ); + } else { + try { + $conf = json_encode(array('welcome'=>array('Welcome to your new Only Legs installation!'))); + $conf_new = fopen(__DIR__."/../../../usr/conf/msg.json", "w"); + + if ($conf_new) { + fwrite($conf_new, $conf); + fclose($conf_new); + + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/conf/msg.json file!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/msg.json file!', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/msg.json file: '.$e, + 'fix'=>'manual', + ); + } + } } \ No newline at end of file diff --git a/css/main.css b/css/main.css index 01578fd..493763e 100644 --- a/css/main.css +++ b/css/main.css @@ -701,9 +701,9 @@ nav .btn { margin: 0 auto; max-width: 100%; height: 15rem; - -webkit-animation: uploadGradient 10s ease infinite; - animation: uploadGradient 10s ease infinite; - background: linear-gradient(-45rad, #000000, #EE7752, #E73C7E, #23A6D5, #23D5AB); + -webkit-animation: uploadGradient 10s ease-in-out infinite; + animation: uploadGradient 10s ease-in-out infinite; + background: linear-gradient(-45rad, rgba(0, 0, 0, 0), #121212, rgba(0, 0, 0, 0), #121212); background-size: 200% 200%; border-radius: 3px; display: flex; diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 5b6c3a2..dff0e22 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -685,8 +685,8 @@ max-width: 100%; height: 15rem; - animation: uploadGradient 10s ease infinite; - background: linear-gradient(-45rad, #000000, #EE7752, #E73C7E, #23A6D5, #23D5AB); + animation: uploadGradient 10s ease-in-out infinite; + background: linear-gradient(-45rad, #00000000, #121212, #00000000, #121212); background-size: 200% 200%; @if calc($rad - 0.5rem) > 0 {