From 391ecbda59e909a734bfc6e565dca2d99f348f8c Mon Sep 17 00:00:00 2001 From: flashwave Date: Sat, 9 Apr 2016 13:22:15 +0200 Subject: [PATCH] unixing --- database/data.sql | 244 ++++++++++++++++++ database/structure.sql | 69 +---- .../Settings/FriendsController.php | 2 +- libraries/Perms/Site.php | 2 +- public/content/data/mio/css/feedback.css | 4 +- public/content/data/mio/css/mio.css | 2 +- public/content/data/misaki/images/spinner.svg | 18 +- public/content/scripts/dynload.ts | 2 +- public/content/scripts/sakura.js | 2 +- public/content/scripts/sakura.ts | 6 +- templates/mio/template.ini | 14 - templates/misaki/template.ini | 14 - templates/yuuno/manage/comments.manage.twig | 1 - templates/yuuno/manage/config.general.twig | 1 - templates/yuuno/manage/config.mail.twig | 1 - templates/yuuno/manage/config.premium.twig | 1 - templates/yuuno/manage/config.uploads.twig | 1 - templates/yuuno/manage/config.user.twig | 1 - templates/yuuno/manage/forums.manage.twig | 1 - templates/yuuno/manage/forums.settings.twig | 1 - templates/yuuno/manage/general.dashboard.twig | 57 ---- templates/yuuno/manage/general.info.twig | 1 - templates/yuuno/manage/logs.actions.twig | 1 - templates/yuuno/manage/logs.errors.twig | 1 - templates/yuuno/manage/logs.management.twig | 1 - templates/yuuno/manage/permissions.forum.twig | 1 - .../yuuno/manage/permissions.management.twig | 1 - templates/yuuno/manage/permissions.site.twig | 1 - templates/yuuno/manage/users.bans.twig | 1 - .../yuuno/manage/users.manage-ranks.twig | 1 - .../yuuno/manage/users.manage-users.twig | 1 - .../yuuno/manage/users.option-fields.twig | 1 - .../yuuno/manage/users.profile-fields.twig | 1 - templates/yuuno/manage/users.warnings.twig | 1 - 34 files changed, 265 insertions(+), 192 deletions(-) create mode 100644 database/data.sql delete mode 100644 templates/mio/template.ini delete mode 100644 templates/misaki/template.ini delete mode 100644 templates/yuuno/manage/comments.manage.twig delete mode 100644 templates/yuuno/manage/config.general.twig delete mode 100644 templates/yuuno/manage/config.mail.twig delete mode 100644 templates/yuuno/manage/config.premium.twig delete mode 100644 templates/yuuno/manage/config.uploads.twig delete mode 100644 templates/yuuno/manage/config.user.twig delete mode 100644 templates/yuuno/manage/forums.manage.twig delete mode 100644 templates/yuuno/manage/forums.settings.twig delete mode 100644 templates/yuuno/manage/general.dashboard.twig delete mode 100644 templates/yuuno/manage/general.info.twig delete mode 100644 templates/yuuno/manage/logs.actions.twig delete mode 100644 templates/yuuno/manage/logs.errors.twig delete mode 100644 templates/yuuno/manage/logs.management.twig delete mode 100644 templates/yuuno/manage/permissions.forum.twig delete mode 100644 templates/yuuno/manage/permissions.management.twig delete mode 100644 templates/yuuno/manage/permissions.site.twig delete mode 100644 templates/yuuno/manage/users.bans.twig delete mode 100644 templates/yuuno/manage/users.manage-ranks.twig delete mode 100644 templates/yuuno/manage/users.manage-users.twig delete mode 100644 templates/yuuno/manage/users.option-fields.twig delete mode 100644 templates/yuuno/manage/users.profile-fields.twig delete mode 100644 templates/yuuno/manage/users.warnings.twig diff --git a/database/data.sql b/database/data.sql new file mode 100644 index 0000000..12f04f9 --- /dev/null +++ b/database/data.sql @@ -0,0 +1,244 @@ +-- -------------------------------------------------------- +-- Host: 127.0.0.1 +-- Server version: 5.7.10-log - MySQL Community Server (GPL) +-- Server OS: Win64 +-- HeidiSQL Version: 9.3.0.4984 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8mb4 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +-- Dumping data for table sakura-development.sakura_config: ~79 rows (approximately) +/*!40000 ALTER TABLE `sakura_config` DISABLE KEYS */; +INSERT INTO `sakura_config` (`config_name`, `config_value`) VALUES + ('admin_email', 'sakura@localhost'), + ('alumni_rank_id', '9'), + ('avatar_max_fsize', '2097152'), + ('avatar_max_height', '512'), + ('avatar_max_width', '512'), + ('avatar_min_height', '20'), + ('avatar_min_width', '20'), + ('background_max_fsize', '5242880'), + ('background_max_height', '1440'), + ('background_max_width', '2560'), + ('background_min_height', '16'), + ('background_min_width', '16'), + ('banned_avatar_img', 'public/content/data/{{ TPL }}/images/banned-av.png'), + ('charset', 'utf-8'), + ('comment_max_length', '500'), + ('comment_min_length', '1'), + ('content_path', '/content'), + ('cookie_domain', 'localhost'), + ('cookie_path', '/'), + ('cookie_prefix', 'fii_'), + ('date_format', 'D Y-m-d H:i:s T'), + ('deactivated_avatar_img', 'public/content/data/{{ TPL }}/images/deactivated-av.png'), + ('deactive_rank_id', '1'), + ('default_rank_id', '2'), + ('disable_registration', '0'), + ('enable_tpl_cache', '0'), + ('forum_text_max', '60000'), + ('forum_text_min', '1'), + ('forum_title_max', '128'), + ('forum_title_min', '4'), + ('forum_trash_id', '19'), + ('front_page_news_posts', '3'), + ('header_announcement_image', ''), + ('header_announcement_link', ''), + ('header_max_fsize', '2097152'), + ('header_max_height', '500'), + ('header_max_width', '2048'), + ('header_min_height', '125'), + ('header_min_width', '512'), + ('lock_authentication', '0'), + ('mail_signature', 'Sakura | http://localhost/'), + ('max_online_time', '120'), + ('max_reg_keys', '5'), + ('members_per_page', '30'), + ('min_entropy', '1'), + ('news_posts_per_page', '3'), + ('no_avatar_img', 'public/content/data/{{ TPL }}/images/no-av.png'), + ('no_background_img', 'public/content/pixel.png'), + ('no_cron_interval', '30'), + ('no_cron_last', '1460167058'), + ('no_cron_service', '1'), + ('no_header_img', 'public/content/pixel.png'), + ('old_username_reserve', '90'), + ('paypal_client_id', ''), + ('paypal_mode', 'sandbox'), + ('paypal_secret', ''), + ('pixel_img', 'public/content/pixel.png'), + ('premium_amount_max', '24'), + ('premium_price_per_month', '1.49'), + ('premium_rank_id', '8'), + ('recaptcha', '0'), + ('recaptcha_private', ''), + ('recaptcha_public', ''), + ('require_activation', '1'), + ('restricted_rank_id', '10'), + ('session_check', '4'), + ('site_closed', '0'), + ('site_closed_reason', 'meow'), + ('site_news_category', 'site-news'), + ('site_style', 'yuuno'), + ('sitedesc', 'Live development environment for the script that powers Flashii.net called Sakura.'), + ('sitelogo', ''), + ('sitename', 'Sakura'), + ('sitetags', '["Flashii","Media","Flashwave","Circle","Zeniea","MalwareUp","Cybernetics","Saibateku","Community","osu!","osu"]'), + ('smtp_auth', ''), + ('smtp_from_email', ''), + ('smtp_from_name', ''), + ('smtp_password', '[ base 64 encoded ]'), + ('smtp_port', ''), + ('smtp_replyto_mail', ''), + ('smtp_replyto_name', ''), + ('smtp_secure', ''), + ('smtp_server', ''), + ('smtp_username', ''), + ('url_main', 'locahost'), + ('url_rewrite', '1'), + ('use_gzip', '0'), + ('user_uploads', 'uploads'), + ('username_max_length', '16'), + ('username_min_length', '3'); +/*!40000 ALTER TABLE `sakura_config` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_emoticons: ~38 rows (approximately) +/*!40000 ALTER TABLE `sakura_emoticons` DISABLE KEYS */; +INSERT INTO `sakura_emoticons` (`emote_string`, `emote_path`) VALUES + (':amu:', '/content/images/emoticons/amu.png'), + (':angrier:', '/content/images/emoticons/angrier.png'), + (':angriest:', '/content/images/emoticons/angriest.png'), + (':angry:', '/content/images/emoticons/angry.gif'), + (':blank:', '/content/images/emoticons/blank.png'), + (':childish:', '/content/images/emoticons/childish.png'), + (':congrats:', '/content/images/emoticons/congrats.png'), + (':crying:', '/content/images/emoticons/crying.gif'), + (':dizzy:', '/content/images/emoticons/dizzy.gif'), + (':eat:', '/content/images/emoticons/eat.gif'), + (':evil:', '/content/images/emoticons/evil.png'), + (':extreme:', '/content/images/emoticons/extreme.png'), + (':glare:', '/content/images/emoticons/glare.gif'), + (':happy:', '/content/images/emoticons/happy.gif'), + (':horror:', '/content/images/emoticons/horror.gif'), + (':huh:', '/content/images/emoticons/huh.png'), + (':idea:', '/content/images/emoticons/idea.png'), + (':jew:', '/content/images/emoticons/jew.png'), + (':kiss:', '/content/images/emoticons/kiss.gif'), + (':lmao:', '/content/images/emoticons/lmao.gif'), + (':lol:', '/content/images/emoticons/lol.gif'), + (':love:', '/content/images/emoticons/love.png'), + (':meow:', '/content/images/emoticons/meow.png'), + (':omg:', '/content/images/emoticons/omg.gif'), + (':ouch:', '/content/images/emoticons/ouch.gif'), + (':puke:', '/content/images/emoticons/puke.gif'), + (':ruse:', '/content/images/emoticons/ruse.png'), + (':sad:', '/content/images/emoticons/sad.png'), + (':sigh:', '/content/images/emoticons/sigh.gif'), + (':suspicious:', '/content/images/emoticons/suspicious.gif'), + (':sweat:', '/content/images/emoticons/sweat.gif'), + (':tired:', '/content/images/emoticons/tired.gif'), + (':yay:', '/content/images/emoticons/vhappy.gif'), + (':winxp:', '/content/images/emoticons/winxp.png'), + (':wtf:', '/content/images/emoticons/wtf.gif'), + (':sleep:', '/content/images/emoticons/zzz.gif'), + (':what:', '/content/images/emoticons/what.png'), + (':smug:', '/content/images/emoticons/smug.png'); +/*!40000 ALTER TABLE `sakura_emoticons` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_forums: ~18 rows (approximately) +/*!40000 ALTER TABLE `sakura_forums` DISABLE KEYS */; +INSERT INTO `sakura_forums` (`forum_id`, `forum_order`, `forum_name`, `forum_desc`, `forum_link`, `forum_category`, `forum_type`, `forum_icon`) VALUES + (1, 1, 'General', 'General category', '', 0, 1, ''), + (3, 2, 'General Discussion', 'Civilised discussions about things that don\'t have their own subforum.', '', 1, 0, 'fa-comments'), + (15, 3, 'Staff', 'Staff discussion', '', 0, 1, ''), + (18, 4, 'General', 'Discuss Staff Stuff.', '', 15, 0, 'fa-user-secret'), + (19, 5, 'Purgatorii', 'This is where deleted threads rot.', '', 15, 0, 'fa-trash'); +/*!40000 ALTER TABLE `sakura_forums` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_forum_permissions: ~55 rows (approximately) +/*!40000 ALTER TABLE `sakura_forum_permissions` DISABLE KEYS */; +INSERT INTO `sakura_forum_permissions` (`forum_id`, `rank_id`, `user_id`, `forum_perms`) VALUES + (1, 1, 0, '00000000001'), + (1, 2, 0, '00000011111'), + (1, 3, 0, '11111111111'), + (1, 4, 0, '11111111111'), + (1, 5, 0, '11111111111'), + (1, 6, 0, '00000011111'), + (1, 7, 0, '00000111111'), + (1, 8, 0, '00000011111'), + (1, 9, 0, '00000011111'), + (1, 10, 0, '00000000001'), + (1, 11, 0, '00000011111'), + (15, 1, 0, '00000000000'), + (15, 2, 0, '00000000000'), + (15, 3, 0, '00000111111'), + (15, 4, 0, '11111111111'), + (15, 5, 0, '00000111111'), + (15, 6, 0, '00000000000'), + (15, 7, 0, '00000111111'), + (15, 8, 0, '00000000000'), + (15, 9, 0, '00000000000'), + (15, 10, 0, '00000000000'), + (15, 11, 0, '00000000000'); +/*!40000 ALTER TABLE `sakura_forum_permissions` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_optionfields: ~3 rows (approximately) +/*!40000 ALTER TABLE `sakura_optionfields` DISABLE KEYS */; +INSERT INTO `sakura_optionfields` (`option_id`, `option_name`, `option_description`, `option_type`, `option_permission`) VALUES + ('profileBackgroundSiteWide', 'Display profile background site wide', 'This will make the profile background you set on your profile appear on the entire site (except on other profiles).', 'checkbox', 'CHANGE_BACKGROUND'), + ('useMisaki', 'Use the testing style', 'This will make the site use the new Misaki style instead of Yuuno.', 'checkbox', 'ALTER_PROFILE'); +/*!40000 ALTER TABLE `sakura_optionfields` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_permissions: ~11 rows (approximately) +/*!40000 ALTER TABLE `sakura_permissions` DISABLE KEYS */; +INSERT INTO `sakura_permissions` (`rank_id`, `user_id`, `permissions_site`, `permissions_manage`) VALUES + (1, 0, '00000000000000000000000000000001', '00'), + (2, 0, '11110000111111111100111101101100', '00'), + (3, 0, '11110001111111111111111111111100', '11'), + (4, 0, '11110111111111111111111111111100', '11'), + (5, 0, '11110001111111111111111111111100', '11'), + (6, 0, '11110000111111111100111101101100', '00'), + (7, 0, '11110001111111111111111111111100', '01'), + (8, 0, '11110001111111111111111111111100', '00'), + (9, 0, '11110001111111111111111111111100', '00'), + (10, 0, '11110000000011010100101000100010', '00'), + (11, 0, '11110000111111111100111101101100', '00'); +/*!40000 ALTER TABLE `sakura_permissions` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_profilefields: ~12 rows (approximately) +/*!40000 ALTER TABLE `sakura_profilefields` DISABLE KEYS */; +INSERT INTO `sakura_profilefields` (`field_id`, `field_name`, `field_type`, `field_link`, `field_linkformat`, `field_description`, `field_additional`) VALUES + (1, 'Website', 'url', 1, '{{ VAL }}', 'URL to your website', ''), + (2, 'Twitter', 'text', 1, 'https://twitter.com/{{ VAL }}', 'Your @twitter Username', ''), + (3, 'BitBucket', 'text', 1, 'https://bitbucket.org/{{ VAL }}', 'Your BitBucket Username', ''), + (4, 'Skype', 'text', 1, 'skype:{{ VAL }}?userinfo', 'Your Skype Username', ''), + (5, 'YouTube', 'text', 0, '', 'ID or Username excluding http://youtube.com/*/', '{"youtubetype": ["checkbox", "I do not have a Channel Username (url looks like https://www.youtube.com/channel/UCXZcw5hw5C7Neto-T_nRXBQ)."]}'), + (6, 'SoundCloud', 'text', 1, 'https://soundcloud.com/{{ VAL }}', 'Your SoundCloud username', ''), + (7, 'Steam', 'text', 1, 'https://steamcommunity.com/id/{{ VAL }}', 'Your Steam Community Username (may differ from login username)', ''), + (8, 'osu!', 'text', 1, 'https://osu.ppy.sh/u/{{ VAL }}', 'Your osu! Username', ''), + (9, 'Origin', 'text', 0, '', 'Your Origin User ID', ''), + (10, 'Xbox Live', 'text', 1, 'https://account.xbox.com/en-GB/Profile?Gamertag={{ VAL }}', 'Your Xbox User ID', ''), + (11, 'PSN', 'text', 1, 'http://psnprofiles.com/{{ VAL }}', 'Your PSN User ID', ''), + (12, 'Last.fm', 'text', 1, 'http://last.fm/user/{{ VAL }}', 'Your Last.fm username', ''); +/*!40000 ALTER TABLE `sakura_profilefields` ENABLE KEYS */; + +-- Dumping data for table sakura-development.sakura_ranks: ~11 rows (approximately) +/*!40000 ALTER TABLE `sakura_ranks` DISABLE KEYS */; +INSERT INTO `sakura_ranks` (`rank_id`, `rank_hierarchy`, `rank_name`, `rank_multiple`, `rank_hidden`, `rank_colour`, `rank_description`, `rank_title`) VALUES + (1, 0, 'Deactivated', '', 1, '#555', 'Users that are yet to be activated or that deactivated their own account.', 'Deactivated'), + (2, 1, 'Regular user', 's', 0, 'inherit', 'Regular users with regular permissions.', 'Regular user'), + (3, 3, 'Site moderator', 's', 0, '#FA3703', 'Users with special permissions like being able to ban and modify users if needed.', 'Moderator'), + (4, 4, 'Administrator', 's', 0, '#824CA0', 'Users that manage the server and everything around that.', 'Administrator'), + (5, 3, 'Developer', 's', 0, '#6EAC0A', 'Users that either create or test new features of the site.', 'Developer'), + (6, 1, 'Bot', 's', 1, '#9E8DA7', 'Reserved user accounts for services.', 'Bot'), + (7, 2, 'Chat moderator', 's', 0, '#09F', 'Moderators of the chat room.', 'Moderator'), + (8, 1, 'Tenshi', '', 0, '#EE9400', 'Users that bought premium to help us keep the site and its services alive!', 'Tenshi'), + (9, 1, 'Alumnii', '', 0, '#FF69B4', 'People who have made big contributions to the community but have moved on.', 'Alumni'), + (10, 0, 'Restricted', '', 1, '#666', 'Users that are restricted.', 'Restricted'), + (11, 1, 'Early Supporter', 's', 0, '#0049EE', 'User that donated before the premium system.', 'Early Supporter'); +/*!40000 ALTER TABLE `sakura_ranks` ENABLE KEYS */; +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/database/structure.sql b/database/structure.sql index a918ad4..e49e297 100644 --- a/database/structure.sql +++ b/database/structure.sql @@ -10,11 +10,6 @@ /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; --- Dumping database structure for sakura-development -CREATE DATABASE IF NOT EXISTS `sakura-development` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin */; -USE `sakura-development`; - - -- Dumping structure for table sakura-development.sakura_actioncodes CREATE TABLE IF NOT EXISTS `sakura_actioncodes` ( `code_action` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'Action identifier so the backend knows what to do.', @@ -25,36 +20,6 @@ CREATE TABLE IF NOT EXISTS `sakura_actioncodes` ( -- Data exporting was unselected. --- Dumping structure for table sakura-development.sakura_bans -CREATE TABLE IF NOT EXISTS `sakura_bans` ( - `ban_id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management.', - `user_id` bigint(255) unsigned NOT NULL COMMENT 'ID of user that was banned, 0 for just an IP ban.', - `ban_begin` int(11) unsigned NOT NULL COMMENT 'Timestamp when the user was banned.', - `ban_end` int(11) unsigned NOT NULL COMMENT 'Timestamp when the user should regain access to the site.', - `ban_reason` varchar(512) COLLATE utf8_bin DEFAULT NULL COMMENT 'Reason given for the ban.', - `ban_moderator` bigint(255) unsigned NOT NULL COMMENT 'ID of moderator that banned this user,', - PRIMARY KEY (`ban_id`), - KEY `uid` (`user_id`), - KEY `mod_id` (`ban_moderator`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; - --- Data exporting was unselected. - - --- Dumping structure for table sakura-development.sakura_bbcodes -CREATE TABLE IF NOT EXISTS `sakura_bbcodes` ( - `bbcode_id` int(64) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management.', - `bbcode_regex` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'Regular expression string for the BBCode.', - `bbcode_replace` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'What to replace it with.', - `bbcode_title` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'Button title for this bbcode.', - `bbcode_description` varchar(512) COLLATE utf8_bin NOT NULL COMMENT 'Description of what this does.', - `bbcode_display` tinyint(1) unsigned NOT NULL COMMENT 'Set if this bbcode is displayed on the posting page.', - PRIMARY KEY (`bbcode_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; - --- Data exporting was unselected. - - -- Dumping structure for table sakura-development.sakura_comments CREATE TABLE IF NOT EXISTS `sakura_comments` ( `comment_id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'MySQL Generated ID used for sorting.', @@ -179,7 +144,7 @@ CREATE TABLE IF NOT EXISTS `sakura_login_attempts` ( `attempt_id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'MySQL Generated ID used for sorting.', `attempt_success` tinyint(1) unsigned NOT NULL COMMENT 'Success boolean.', `attempt_timestamp` int(11) unsigned NOT NULL COMMENT 'Unix timestamp of the event.', - `attempt_ip` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'IP that made this attempt.', + `attempt_ip` varbinary(50) NOT NULL COMMENT 'IP that made this attempt.', `user_id` bigint(255) unsigned NOT NULL COMMENT 'ID of the user that was attempted to log in to.', PRIMARY KEY (`attempt_id`) ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_bin; @@ -187,22 +152,6 @@ CREATE TABLE IF NOT EXISTS `sakura_login_attempts` ( -- Data exporting was unselected. --- Dumping structure for table sakura-development.sakura_messages -CREATE TABLE IF NOT EXISTS `sakura_messages` ( - `id` bigint(128) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management.', - `from_user` bigint(255) unsigned NOT NULL COMMENT 'ID of the user that sent this message.', - `to_user` bigint(255) unsigned NOT NULL COMMENT 'ID of user that should receive this message.', - `read` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'IDs of users who read this message.', - `deleted` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'Indicator if one of the parties deleted the message, if it is already 1 the script will remove this row.', - `timestamp` int(11) unsigned NOT NULL COMMENT 'Timestamp of the time this message was sent', - `subject` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'Title of the message', - `content` text COLLATE utf8_bin NOT NULL COMMENT 'Contents of the message.', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; - --- Data exporting was unselected. - - -- Dumping structure for table sakura-development.sakura_news CREATE TABLE IF NOT EXISTS `sakura_news` ( `news_id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management.', @@ -337,20 +286,6 @@ CREATE TABLE IF NOT EXISTS `sakura_ranks` ( -- Data exporting was unselected. --- Dumping structure for table sakura-development.sakura_regcodes -CREATE TABLE IF NOT EXISTS `sakura_regcodes` ( - `id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management.', - `code` varchar(32) COLLATE utf8_bin NOT NULL COMMENT 'Randomly generated registration key.', - `created_by` bigint(255) unsigned NOT NULL COMMENT 'ID of user who generated this code.', - `used_by` bigint(255) unsigned NOT NULL COMMENT 'ID of user who used this code.', - `key_used` tinyint(1) unsigned NOT NULL COMMENT 'Boolean for setting this key as used.', - PRIMARY KEY (`id`), - KEY `created_by` (`created_by`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; - --- Data exporting was unselected. - - -- Dumping structure for table sakura-development.sakura_reports CREATE TABLE IF NOT EXISTS `sakura_reports` ( `id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'MySQL Generated ID used for sorting.', @@ -370,7 +305,7 @@ CREATE TABLE IF NOT EXISTS `sakura_reports` ( CREATE TABLE IF NOT EXISTS `sakura_sessions` ( `session_id` bigint(255) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Automatically generated ID by MySQL for management. ', `user_id` bigint(255) unsigned NOT NULL COMMENT 'ID of the user this session is spawned for. ', - `user_ip` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'IP of the user this session is spawned for.', + `user_ip` varbinary(50) NOT NULL COMMENT 'IP of the user this session is spawned for.', `user_agent` varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT 'User agent of the user this session is spawned for.', `session_key` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'Session key, allow direct access to the user''s account. ', `session_start` int(16) unsigned NOT NULL COMMENT 'The timestamp for when the session was started. ', diff --git a/libraries/Controllers/Settings/FriendsController.php b/libraries/Controllers/Settings/FriendsController.php index 530e632..9588b20 100644 --- a/libraries/Controllers/Settings/FriendsController.php +++ b/libraries/Controllers/Settings/FriendsController.php @@ -8,8 +8,8 @@ namespace Sakura\Controllers\Settings; use Sakura\ActiveUser; -use Sakura\Router; use Sakura\Perms\Site; +use Sakura\Router; use Sakura\Template; /** diff --git a/libraries/Perms/Site.php b/libraries/Perms/Site.php index a99e5b2..00d5359 100644 --- a/libraries/Perms/Site.php +++ b/libraries/Perms/Site.php @@ -149,7 +149,7 @@ class Site * Can this user change the colour of their username? */ const CHANGE_NAMECOLOUR = 67108864; - + /** * Does this user have infinite premium? */ diff --git a/public/content/data/mio/css/feedback.css b/public/content/data/mio/css/feedback.css index de95adc..e63c708 100644 --- a/public/content/data/mio/css/feedback.css +++ b/public/content/data/mio/css/feedback.css @@ -154,5 +154,5 @@ fieldset .replylink { overflow: hidden; } .header .logo { - background: url('//cdn.flashii.net/img/feedback-logo.png') no-repeat -} \ No newline at end of file + background: url('//cdn.flashii.net/img/feedback-logo.png') no-repeat +} diff --git a/public/content/data/mio/css/mio.css b/public/content/data/mio/css/mio.css index 31c0850..56753f3 100644 --- a/public/content/data/mio/css/mio.css +++ b/public/content/data/mio/css/mio.css @@ -832,4 +832,4 @@ div#recaptcha_image { } .news-comments-container { margin: 5px auto 0; -} \ No newline at end of file +} diff --git a/public/content/data/misaki/images/spinner.svg b/public/content/data/misaki/images/spinner.svg index 1550bd4..4138698 100644 --- a/public/content/data/misaki/images/spinner.svg +++ b/public/content/data/misaki/images/spinner.svg @@ -4,55 +4,55 @@ - + - + - + - + - + - + - + - + - + diff --git a/public/content/scripts/dynload.ts b/public/content/scripts/dynload.ts index 8768ef9..ad48e07 100644 --- a/public/content/scripts/dynload.ts +++ b/public/content/scripts/dynload.ts @@ -20,7 +20,7 @@ class DynLoad { if (e.target['href']) { // Prevent the default action e.preventDefault(); - + // Create a new ajax object var loader: AJAX = new AJAX(); diff --git a/public/content/scripts/sakura.js b/public/content/scripts/sakura.js index d842f80..3d9f90c 100644 --- a/public/content/scripts/sakura.js +++ b/public/content/scripts/sakura.js @@ -126,7 +126,7 @@ var Sakura = (function () { 60: ['minute', 'a'], 1: ['second', 'a'] }; - // + // var timeKeys = Object.keys(times).reverse(); // Iterate over the times for (var i in timeKeys) { diff --git a/public/content/scripts/sakura.ts b/public/content/scripts/sakura.ts index 55739d2..9682980 100644 --- a/public/content/scripts/sakura.ts +++ b/public/content/scripts/sakura.ts @@ -6,7 +6,7 @@ class Sakura { public static cookiePrefix: string = ""; // Cookie prefix, gets prepended to cookie names public static cookiePath: string = "/"; // Cookie path, can in most cases be left untouched - + // Get or set a cookie value public static cookie(name: string, value: string = null): string { // If value is null only get the cookie's value @@ -74,7 +74,7 @@ class Sakura { public static unique(string: string): number { // Store the already found character var used: string[] = []; - + // The amount of characters we've already found var count: number = 0; @@ -150,7 +150,7 @@ class Sakura { 1: ['second', 'a'] }; - // + // var timeKeys: string[] = Object.keys(times).reverse(); // Iterate over the times diff --git a/templates/mio/template.ini b/templates/mio/template.ini deleted file mode 100644 index 20259ea..0000000 --- a/templates/mio/template.ini +++ /dev/null @@ -1,14 +0,0 @@ -; Sakura Template Configuration - -[meta] -; Display name of the style, only used in the admin section of the management panel. -name = Mio -; Author of this template. -author = Flashwave -; If you set a URL below your name becomes a clickable link in the management panel. -author_url = https://flash.moe - -[manage] -; This defines whether the template is intended for the management panel. -; When it's incorrect Sakura will halt execution of the script. -mode = 0 diff --git a/templates/misaki/template.ini b/templates/misaki/template.ini deleted file mode 100644 index f62e3bd..0000000 --- a/templates/misaki/template.ini +++ /dev/null @@ -1,14 +0,0 @@ -; Sakura Template Configuration - -[meta] -; Display name of the style, only used in the admin section of the management panel. -name = Misaki -; Author of this template. -author = Flashwave -; If you set a URL below your name becomes a clickable link in the management panel. -author_url = https://flash.moe - -[manage] -; This defines whether the template is intended for the management panel. -; When it's incorrect Sakura will halt execution of the script. -mode = 0 diff --git a/templates/yuuno/manage/comments.manage.twig b/templates/yuuno/manage/comments.manage.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/comments.manage.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/config.general.twig b/templates/yuuno/manage/config.general.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/config.general.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/config.mail.twig b/templates/yuuno/manage/config.mail.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/config.mail.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/config.premium.twig b/templates/yuuno/manage/config.premium.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/config.premium.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/config.uploads.twig b/templates/yuuno/manage/config.uploads.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/config.uploads.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/config.user.twig b/templates/yuuno/manage/config.user.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/config.user.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/forums.manage.twig b/templates/yuuno/manage/forums.manage.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/forums.manage.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/forums.settings.twig b/templates/yuuno/manage/forums.settings.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/forums.settings.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/general.dashboard.twig b/templates/yuuno/manage/general.dashboard.twig deleted file mode 100644 index 7eabf1d..0000000 --- a/templates/yuuno/manage/general.dashboard.twig +++ /dev/null @@ -1,57 +0,0 @@ -

Statistics

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StatisticValueStatisticValue
Number of posts{{ stats.postcount }}Number of users{{ stats.userscount }}
Posts per dayxUsers per dayx
Number of threads{{ stats.threadcount }}Number of bans{{ stats.bancount }}
Threads per dayxBans per dayx
Number of comments{{ stats.commentcount }}Number of uploads{{ stats.uploadcount }}
Comments per dayxSize of uploadsx

-

Most recent reports

- - - - - - - - -
ReporterActionWhen
Nippon NickUser: Japan Joe2000 years ago on cyberneticsView
Sam HydePost: bug sports a shit4000 years ago on knuckleste.co.ukView

-

Most recent actions

-
-

Most recent moderation actions

diff --git a/templates/yuuno/manage/general.info.twig b/templates/yuuno/manage/general.info.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/general.info.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/logs.actions.twig b/templates/yuuno/manage/logs.actions.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/logs.actions.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/logs.errors.twig b/templates/yuuno/manage/logs.errors.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/logs.errors.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/logs.management.twig b/templates/yuuno/manage/logs.management.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/logs.management.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/permissions.forum.twig b/templates/yuuno/manage/permissions.forum.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/permissions.forum.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/permissions.management.twig b/templates/yuuno/manage/permissions.management.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/permissions.management.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/permissions.site.twig b/templates/yuuno/manage/permissions.site.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/permissions.site.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.bans.twig b/templates/yuuno/manage/users.bans.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.bans.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.manage-ranks.twig b/templates/yuuno/manage/users.manage-ranks.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.manage-ranks.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.manage-users.twig b/templates/yuuno/manage/users.manage-users.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.manage-users.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.option-fields.twig b/templates/yuuno/manage/users.option-fields.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.option-fields.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.profile-fields.twig b/templates/yuuno/manage/users.profile-fields.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.profile-fields.twig +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/templates/yuuno/manage/users.warnings.twig b/templates/yuuno/manage/users.warnings.twig deleted file mode 100644 index 3fc714a..0000000 --- a/templates/yuuno/manage/users.warnings.twig +++ /dev/null @@ -1 +0,0 @@ -