flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

r20150906

Browse source 
Signed-off-by: Flashwave <me@flash.moe>
This commit is contained in:
Pachira 2015-09-06 03:04:55 +02:00
parent e67be33619
commit abb2f75669
17 changed files with 259 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
_developer_data/structure.sql
View file

@ -187,6 +187,19 @@ INSERT INTO `sakura_emoticons` (`emote_string`, `emote_path`) VALUES
(':what:', '/content/images/emoticons/what.png'),
(':smug:', '/content/images/emoticons/smug.png');
DROP TABLE IF EXISTS `sakura_error_log`;
CREATE TABLE `sakura_error_log` (
`id` varchar(32) COLLATE utf8_bin NOT NULL,
`timestamp` varchar(128) COLLATE utf8_bin NOT NULL,
`error_type` int(16) unsigned NOT NULL,
`error_line` int(32) unsigned NOT NULL,
`error_string` varchar(512) COLLATE utf8_bin NOT NULL,
`error_file` varchar(512) COLLATE utf8_bin NOT NULL,
`backtrace` text COLLATE utf8_bin NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
DROP TABLE IF EXISTS `sakura_faq`;
CREATE TABLE `sakura_faq` (
`id` bigint(128) unsigned NOT NULL AUTO_INCREMENT COMMENT 'MySQL Generated ID used for sorting.',

38
_sakura/changelog.json
View file

@ -58,7 +58,8 @@
"20150902",
"20150903",
"20150904",
"20150905"
"20150905",
"20150906"
]
@ -2512,6 +2513,41 @@
"user": "Flashwave"
}
],
"20150906": [
{
"type": "REM",
"change": "Removed unused URLs.",
"user": "Flashwave"
},
{
"type": "ADD",
"change": "Add ability to hide certain settings modes from the menu.",
"user": "Flashwave"
},
{
"type": "UPD",
"change": "Gave the error handler a massive update.",
"user": "Flashwave"
},
{
"type": "FIX",
"change": "Made friendlist mobile friendly.",
"user": "Flashwave"
},
{
"type": "FIX",
"change": "Fixed restricted.tpl not being referenced properly.",
"user": "Flashwave"
},
{
"type": "ADD",
"change": "Added cookie notification.",
"user": "Flashwave"
}
]
}

11
_sakura/components/Configuration.php
View file

@ -8,8 +8,8 @@ namespace Sakura;
class Configuration {
// Configuration data
private static $_LCNF;
private static $_DCNF;
private static $_LCNF = [];
private static $_DCNF = [];
// Initialise configuration, does not contain database initialisation because explained below
public static function init($local) {
@ -115,7 +115,7 @@ class Configuration {
}
// Get values from the configuration in the database
public static function getConfig($key) {
public static function getConfig($key, $returnNull = false) {
// Check if the key that we're looking for exists
if(array_key_exists($key, self::$_DCNF)) {
@ -123,6 +123,11 @@ class Configuration {
// Then return the value
return self::$_DCNF[$key];
} elseif($returnNull) {
// Avoid the error trigger if requested
return null;
} else {
// Then return the value

7
_sakura/components/Database.php
View file

@ -8,7 +8,7 @@ namespace Sakura;
class Database {
// Database container
private static $_DATABASE;
public static $_DATABASE;
// Initialisation function
public static function init($wrapper) {
@ -17,9 +17,12 @@ class Database {
$wrapper = __NAMESPACE__ .'\DBWrapper\\'. strtolower($wrapper);
// Check if the class exists
if(!class_exists($wrapper))
if(!class_exists($wrapper)) {
trigger_error('Failed to load database wrapper', E_USER_ERROR);
}
// Initialise SQL wrapper
self::$_DATABASE = new $wrapper;

111
_sakura/components/Main.php
View file

@ -114,10 +114,43 @@ class Main {
// Error Handler
public static function errorHandler($errno, $errstr, $errfile, $errline) {
// Set some variables to work with including A HUGE fallback hackjob for the templates folder
// Remove ROOT path from the error string and file location
$errstr = str_replace(ROOT, '', $errstr);
$errfile = str_replace(ROOT, '', $errfile);
$templates = ROOT .'_sakura/templates/';
// Attempt to log the error to the database
if(Database::$_DATABASE !== null) {
// Encode backtrace data
$backtrace = base64_encode(json_encode(debug_backtrace()));
// Check if this error has already been logged in the past
if($past = Database::fetch('error_log', false, ['backtrace' => [$backtrace, '=', true], 'error_string' => [$errstr, '=']])) {
// If so assign the errid
$errid = $past['id'];
} else {
// Create an error ID
$errid = substr(md5(microtime()), rand(0, 22), 10);
// Log the error
Database::insert('error_log', [
'id' => $errid,
'timestamp' => date("r"),
'error_type' => $errno,
'error_line' => $errline,
'error_string' => $errstr,
'error_file' => $errfile,
'backtrace' => $backtrace
]);
}
}
switch ($errno) {
@ -141,18 +174,78 @@ class Main {
}
// Use file_get_contents instead of Twig in case the problem is related to twig
$errorPage = file_get_contents($templates. 'errorPage.tpl');
// str_replace {{ error }} on the error page with the error data
$error = str_replace('{{ error }}', $error, $errorPage);
// Truncate all previous outputs
ob_clean();
ob_end_clean();
// Build page
$errorPage = '<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Sakura Internal Error</title>
<style type="text/css">
body { margin: 0; padding: 0; background: #EEE; color: #000; font: 12px/20px Verdana, Arial, Helvetica, sans-serif; }
h1, h2 { font-weight: 100; background: #CAA; padding: 8px 5px 10px; margin: 0; font-style: italic; font-family: serif; }
h1 { border-radius: 8px 8px 0 0; }
h2 { margin: 0 -10px; }
.container { border: 1px solid #CAA; margin: 10px auto; background: #FFF; box-shadow: 2px 2px 1em #888; max-width: 1024px; border-radius: 10px; }
.container .inner { padding: 0px 10px; }
.container .inner .error { background: #555; color: #EEE; border-left: 5px solid #C22; padding: 4px 6px; text-shadow: 0px 1px 1px #888; white-space: pre-wrap; word-wrap: break-word; margin: 12px 0; border-radius: 5px; box-shadow: inset 0 0 1em #333; }
.container .footer { border-top: 1px solid #CAA; font-size: x-small; padding: 0px 5px 1px; }
a { color: #77E; text-decoration: none; }
a:hover { text-decoration: underline; }
a:active { color: #E77; }
</style>
</head>
<body>
<div class="container">
<h1>An error occurred while executing the script.</h1>
<div class="inner">
<p>To prevent potential security risks or data loss Sakura has stopped execution of the script.</p>';
if(isset($errid)) {
$errorPage .= '<p>The error and surrounding data has been logged.</p>
<h2>'. (SAKURA_STABLE ? 'Report the following text to a staff member' : 'Logged as') .'</h2><pre class="error">'. $errid .'</pre>';
} else {
$errorPage .= '<p>Sakura was not able to log this error which could mean that there was an error with the database connection. If you\'re the system administrator check the database credentials and make sure the server is running and if you\'re not please let the system administrator know about this error if it occurs again.</p>';
}
if(!SAKURA_STABLE) {
$errorPage .= ' <h2>Summary</h2>
<pre class="error">'. $error .'</pre>
<h2>Backtraces</h2>';
foreach(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $num => $trace) {
$errorPage .= '<h3>#'. $num .'</h3><pre class="error">';
foreach($trace as $key => $val) {
$errorPage .= str_pad('['. $key .']', 12) .'=> '. (is_array($val) || is_object($val) ? json_encode($val) : $val) ."\r\n";
}
$errorPage .= '</pre>';
}
}
$errorPage .= '</div>
<div class="footer">
Sakura r'. SAKURA_VERSION .'.
</div>
</div>
</body>
</html>';
// Die and display error message
die($error);
die($errorPage);
}

2
_sakura/components/Urls.php
View file

@ -66,8 +66,6 @@ class Urls {
'SETTINGS_INDEX' => ['/settings.php', '/settings'],
'SETTING_CAT' => ['/settings.php?cat=%s', '/settings/%s'],
'SETTING_MODE' => ['/settings.php?cat=%s&mode=%s', '/settings/%s/%s'],
'MESSAGES_INDEX' => ['/settings.php?cat=messages', '/messages'],
'MESSAGES_MODE' => ['/settings.php?cat=messages&mode=%s', '/messages/%s'],
// Friend Actions
'FRIEND_ACTION' => ['/settings.php?friend-action=true', '/friends'],

10
_sakura/config/config.example.ini
View file

@ -44,13 +44,3 @@ whoisservers = config/whois.json
; JSON file containing ISO 3166 country codes
iso3166 = config/iso3166.json
; Sock Chat extensions configuration
; These only work properly if Sock Chat uses the same database as the rest of Sakura
[sockchat]
; Set whether the Sock Chat extensions should be used or not
enabled = true
; The table prefix used for Sock Chat
prefix = sock_

2
_sakura/sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura;
// Define Sakura version
define('SAKURA_VERSION', '20150905');
define('SAKURA_VERSION', '20150906');
define('SAKURA_VLABEL', 'Eminence');
define('SAKURA_COLOUR', '#6C3082');
define('SAKURA_STABLE', false);

78
_sakura/templates/errorPage.tpl
View file

@ -1,78 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Sakura Internal Error</title>
<style type="text/css">
body {
margin: 0;
padding: 0;
background: #EEE;
color: #000;
font: 12px/20px Verdana, Arial, Helvetica, sans-serif;
}
h1 {
font-weight: 100;
background: #CAA;
padding: 8px 5px 10px;
margin: 0;
}
.container {
border: 1px solid #CAA;
margin: 10px;
background: #FFF;
box-shadow: 2px 2px 1em #888;
}
.container .inner {
padding: 0px 10px;
}
.container .inner .error {
background: #555;
color: #EEE;
border-left: 5px solid #C22;
padding: 4px 6px 5px;
text-shadow: 0px 1px 1px #888;
font-family: monospace;
}
.container .contact {
border-top: 1px solid #CAA;
font-size: x-small;
padding: 0px 5px 1px;
}
a {
color: #77E;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
a:active {
color: #E77;
}
</style>
</head>
<body>
<div class="container">
<h1>An Error occurred while executing the script.</h1>
<div class="inner">
<p>To prevent potential security risks PHP has stopped execution of the script.</p>
<p>PHP Reported the following error log:</p>
<div class="error">
{{ error }}
</div>
<p>If you have an account on <a href="https://bitbucket.org/" target="_blank">BitBucket</a> please go to the <a href="https://bitbucket.org/circlestorm/sakura/issues" target="_blank">issues section</a> and report the error listed above (do a check to see if it hasn't been reported yet as well).</p>
</div>
<div class="contact">
Contact the System Operator at <a href="mailto:me@flash.moe">me@flash.moe</a> or check our <a href="http://status.flashii.net/" target="_blank">Status Page</a> and <a href="http://twitter.com/_flashii" target="_blank">Twitter Account</a> to see if anything is going on.
</div>
</div>
</body>
</html>

4
_sakura/templates/yuuno/elements/restricted.tpl
View file

@ -1,4 +0,0 @@
<div class="content standalone" style="padding: 20px;">
<h1>You aren't allowed to view this page!</h1>
Please make sure that you're logged in and are supposed to be able to access this page. If you think this was a mistake please contact a staff member.
</div>

2
_sakura/templates/yuuno/elements/settingsNav.tpl
View file

@ -5,7 +5,7 @@
{% for catname,category in pages %}
<div>{{ category.title }}</div>
{% for mname,mode in category.modes %}
{% if mode.access %}
{% if mode.access and mode.menu %}
<a href="{{ urls.format('SETTING_MODE', [catname, mname]) }}">{{ mode.title }}</a>
{% endif %}
{% endfor %}

12
_sakura/templates/yuuno/global/master.tpl
View file

@ -46,6 +46,7 @@
},
"siteName": "{{ sakura.siteName }}",
"urlMain": "{{ sakura.urlMain }}",
"content": "{{ sakura.contentPath }}",
"resources": "{{ sakura.resources }}",
@ -150,6 +151,17 @@
{% endif %}
if(!cookieData('get', sakuraVars.cookie.prefix +'accept_cookies')) {
notifyUI({
"title": sakuraVars.siteName + " uses cookies!",
"text": "Click this if you're OK with that and want to hide this message.",
"img": "FONT:fa-asterisk",
"link": "javascript:cookieData('set', '"+ sakuraVars.cookie.prefix +"accept_cookies', 'true');notifyClose(this.parentNode.id);"
});
}
});
</script>

10
_sakura/templates/yuuno/global/restricted.tpl Normal file
View file

@ -0,0 +1,10 @@
{% extends 'global/master.tpl' %}
{% block content %}
<div class="content standalone">
<div>
<h1>You aren't allowed to view this page!</h1>
Please make sure that you're logged in and are supposed to be able to access this page. If you think this was a mistake please contact a staff member.
</div>
</div>
{% endblock %}

0
_sakura/templates/yuuno/settings/messages.read.tpl Normal file
View file

15
main/content/data/yuuno/css/yuuno.css
View file

@ -1416,6 +1416,7 @@ a#gotop.exit {
border-radius: 3px;
box-shadow: inset 0 0 1px #9475B2;
background: #E4CFFF;
transition: .2s;
}
.settings .friends-list > div:not(:last-child):hover {
@ -1436,7 +1437,7 @@ a#gotop.exit {
.settings .friends-list > div > .friends-list-actions {
display: none;
background: linear-gradient(0deg, #9475B2, #C2AFFE) #9475B2;
background: linear-gradient(0deg, #9475B2, transparent) transparent;
}
.settings .friends-list > div > .friends-list-actions > a {
@ -1477,6 +1478,18 @@ a#gotop.exit {
width: 100%;
}
@media (max-width: 1024px) {
.settings .friends-list > div:not(:last-child) {
margin-bottom: 6px;
}
.settings .friends-list > div > .friends-list-actions {
display: block;
}
}
/*
* Support page Styling
*/

2
main/content/data/yuuno/js/yuuno.js
View file

@ -77,7 +77,7 @@ function notifyUI(content) {
if(content.link) {
notif .setAttribute('sakurahref', content.link);
notifContent.setAttribute('onclick', 'notifyOpen(this.parentNode.id);');
notifContent.setAttribute('onclick', content.link.substring(0, 11) == 'javascript:' ? content.link.substring(11) : 'notifyOpen(this.parentNode.id);');
}
notifContent .appendChild(notifTitle);

79
main/settings.php
View file

@ -672,7 +672,8 @@ if(Users::checkLogin()) {
'Welcome to the Settings Panel. From here you can monitor, view and update your profile and preferences.'
],
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED')
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED'),
'menu' => true
],
'profile' => [
@ -683,7 +684,8 @@ if(Users::checkLogin()) {
'These are the external account links etc. on your profile, shouldn\'t need any additional explanation for this one.'
],
'access' => $currentUser->checkPermission('SITE', 'ALTER_PROFILE')
'access' => $currentUser->checkPermission('SITE', 'ALTER_PROFILE'),
'menu' => true
],
'options' => [
@ -694,7 +696,8 @@ if(Users::checkLogin()) {
'These are a few personalisation options for the site while you\'re logged in.'
],
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED')
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED'),
'menu' => true
],
'groups' => [
@ -705,7 +708,8 @@ if(Users::checkLogin()) {
'{{ user.colour }}'
],
'access' => $currentUser->checkPermission('SITE', 'JOIN_GROUPS')
'access' => $currentUser->checkPermission('SITE', 'JOIN_GROUPS'),
'menu' => true
]
@ -726,7 +730,8 @@ if(Users::checkLogin()) {
'Manage your friends.'
],
'access' => $currentUser->checkPermission('SITE', 'MANAGE_FRIENDS')
'access' => $currentUser->checkPermission('SITE', 'MANAGE_FRIENDS'),
'menu' => true
],
'requests' => [
@ -737,7 +742,8 @@ if(Users::checkLogin()) {
'Handle friend requests.'
],
'access' => $currentUser->checkPermission('SITE', 'MANAGE_FRIENDS')
'access' => $currentUser->checkPermission('SITE', 'MANAGE_FRIENDS'),
'menu' => true
]
@ -758,7 +764,8 @@ if(Users::checkLogin()) {
'The list of messages you\'ve received.'
],
'access' => $currentUser->checkPermission('SITE', 'USE_MESSAGES')
'access' => $currentUser->checkPermission('SITE', 'USE_MESSAGES'),
'menu' => true
],
'sent' => [
@ -769,7 +776,8 @@ if(Users::checkLogin()) {
'The list of messages you\'ve sent to other users.'
],
'access' => $currentUser->checkPermission('SITE', 'USE_MESSAGES')
'access' => $currentUser->checkPermission('SITE', 'USE_MESSAGES'),
'menu' => true
],
'compose' => [
@ -780,7 +788,20 @@ if(Users::checkLogin()) {
'Write a new message.'
],
'access' => $currentUser->checkPermission('SITE', 'SEND_MESSAGES')
'access' => $currentUser->checkPermission('SITE', 'SEND_MESSAGES'),
'menu' => true
],
'read' => [
'title' => 'Read',
'description' => [
'Read a message.'
],
'access' => $currentUser->checkPermission('SITE', 'USE_MESSAGES'),
'menu' => false
]
@ -801,7 +822,8 @@ if(Users::checkLogin()) {
'The history of notifications that have been sent to you.'
],
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED')
'access' => !$currentUser->checkPermission('SITE', 'DEACTIVATED'),
'menu' => true
]
@ -824,7 +846,8 @@ if(Users::checkLogin()) {
],
'access' => $currentUser->checkPermission('SITE', 'CHANGE_AVATAR')
'access' => $currentUser->checkPermission('SITE', 'CHANGE_AVATAR'),
'menu' => true
],
'background' => [
@ -836,7 +859,8 @@ if(Users::checkLogin()) {
'Maximum image size is {{ background.max_width }}x{{ background.max_height }}, minimum image size is {{ background.min_width }}x{{ background.min_height }}, maximum file size is {{ background.max_size_view }}.'
],
'access' => (isset($currentUser->data['userData']['profileBackground']) && $currentUser->checkPermission('SITE', 'CHANGE_BACKGROUND')) || $currentUser->checkPermission('SITE', 'CREATE_BACKGROUND')
'access' => (isset($currentUser->data['userData']['profileBackground']) && $currentUser->checkPermission('SITE', 'CHANGE_BACKGROUND')) || $currentUser->checkPermission('SITE', 'CREATE_BACKGROUND'),
'menu' => true
],
'userpage' => [
@ -847,7 +871,8 @@ if(Users::checkLogin()) {
'The custom text that is displayed on your profile.'
],
'access' => (isset($currentUser->data['userData']['userPage']) && $currentUser->checkPermission('SITE', 'CHANGE_USERPAGE')) || $currentUser->checkPermission('SITE', 'CREATE_USERPAGE')
'access' => (isset($currentUser->data['userData']['userPage']) && $currentUser->checkPermission('SITE', 'CHANGE_USERPAGE')) || $currentUser->checkPermission('SITE', 'CREATE_USERPAGE'),
'menu' => true
]
@ -868,7 +893,8 @@ if(Users::checkLogin()) {
'You e-mail address is used for password recovery and stuff like that, we won\'t spam you ;).'
],
'access' => $currentUser->checkPermission('SITE', 'CHANGE_EMAIL')
'access' => $currentUser->checkPermission('SITE', 'CHANGE_EMAIL'),
'menu' => true
],
'username' => [
@ -880,7 +906,8 @@ if(Users::checkLogin()) {
'<b>You can only change this once every 30 days so choose wisely.</b>'
],
'access' => $currentUser->checkPermission('SITE', 'CHANGE_USERNAME')
'access' => $currentUser->checkPermission('SITE', 'CHANGE_USERNAME'),
'menu' => true
],
'usertitle' => [
@ -891,7 +918,8 @@ if(Users::checkLogin()) {
'That little piece of text displayed under your username on your profile.'
],
'access' => $currentUser->checkPermission('SITE', 'CHANGE_USERTITLE')
'access' => $currentUser->checkPermission('SITE', 'CHANGE_USERTITLE'),
'menu' => true
],
'password' => [
@ -902,7 +930,8 @@ if(Users::checkLogin()) {
'Used to authenticate with the site and certain related services.'
],
'access' => $currentUser->checkPermission('SITE', 'CHANGE_PASSWORD')
'access' => $currentUser->checkPermission('SITE', 'CHANGE_PASSWORD'),
'menu' => true
],
'ranks' => [
@ -913,7 +942,8 @@ if(Users::checkLogin()) {
'Manage what ranks you\'re in and what is set as your main rank. Your main rank is highlighted. You get the permissions of all of the ranks you\'re in combined.'
],
'access' => $currentUser->checkPermission('SITE', 'ALTER_RANKS')
'access' => $currentUser->checkPermission('SITE', 'ALTER_RANKS'),
'menu' => true
]
@ -936,7 +966,8 @@ if(Users::checkLogin()) {
'If you get logged out after clicking one you\'ve most likely killed your current session, to make it easier to avoid this from happening your current session is highlighted.'
],
'access' => $currentUser->checkPermission('SITE', 'MANAGE_SESSIONS')
'access' => $currentUser->checkPermission('SITE', 'MANAGE_SESSIONS'),
'menu' => true
],
'registrationkeys' => [
@ -948,7 +979,8 @@ if(Users::checkLogin()) {
'Each user can generate 5 of these keys, bans and deactivates render these keys useless.'
],
'access' => $currentUser->checkPermission('SITE', 'CREATE_REGKEYS')
'access' => $currentUser->checkPermission('SITE', 'CREATE_REGKEYS'),
'menu' => true
],
'deactivate' => [
@ -959,7 +991,8 @@ if(Users::checkLogin()) {
'You can deactivate your account here if you want to leave :(.'
],
'access' => $currentUser->checkPermission('SITE', 'DEACTIVATE_ACCOUNT')
'access' => $currentUser->checkPermission('SITE', 'DEACTIVATE_ACCOUNT'),
'menu' => true
]
@ -1084,8 +1117,6 @@ if(Users::checkLogin()) {
$renderData['page']['title'] = 'Restricted!';
print Templates::render('global/header.tpl', $renderData);
print Templates::render('elements/restricted.tpl', $renderData);
print Templates::render('global/footer.tpl', $renderData);
print Templates::render('global/restricted.tpl', $renderData);
}