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

r20160118

Browse source
This commit is contained in:
Pachira 2016-01-18 21:21:08 +01:00
parent c334721bd1
commit 25f032b470
7 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/User.php
View file

@ -358,11 +358,6 @@ class User
return [0, 'USER_NOT_EXIST'];
}
// Check if the user has this user a friend
if (!$this->isFriends($uid)) {
return [0, 'ALREADY_REMOVED'];
}
// Remove friend
Database::delete('friends', [
'user_id' => [$this->id, '='],

2
libraries/Users.php
View file

@ -465,7 +465,7 @@ class Users
// Send the message
Utils::sendMail(
[
$user->email() => $user->username,
$user->email => $user->username,
],
Config::get('sitename') . ' Activation Mail',
$message

7
public/content/data/yuuno/css/yuuno.css
View file

@ -1122,14 +1122,15 @@ a.default:active {
}
#notifications > div > .notification-close {
height: 40px;
width: 40px;
height: 40px !important;
width: 40px !important;
margin: 0;
padding: 0;
padding: 0 !important;
border: 0;
margin-right: 4px;
visibility: visible;
flex-shrink: 0;
font-size: 2em !important;
}
#notifications > div > .notification-close > div {

4
public/settings.php
View file

@ -1222,7 +1222,7 @@ if (Users::checkLogin()) {
'menu' => true,
],
],
],
]/*,
'messages' => [
'title' => 'Messages',
'modes' => [
@ -1259,7 +1259,7 @@ if (Users::checkLogin()) {
'menu' => false,
],
],
],
]*/,
'notifications' => [
'title' => 'Notifications',
'modes' => [

2
sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura;
// Define Sakura version
define('SAKURA_VERSION', '20160117');
define('SAKURA_VERSION', '20160118');
define('SAKURA_VLABEL', 'Amethyst');
define('SAKURA_COLOUR', '#9966CC');

1
templates/yuuno/elements/indexPanel.twig
View file

@ -32,7 +32,6 @@
All active users in the past {{ sakura.onlineTimeout / 60 }} minute{% if sakura.onlineTimeout != 60 %}s{% endif %}
<table class="panelTable">
{% for amount,onlineUser in stats.onlineUsers %}
{% if amount != (stats.onlineUsers|length - 1) %}, {% endif %}
<tr><td style="text-align: left;"><a href="{{ urls.format('USER_PROFILE', [onlineUser.id]) }}" style="font-weight: bold; color: {{ onlineUser.colour }};" class="default">{{ onlineUser.username }}</a></td><td title="{{ onlineUser.lastOnline|date(sakura.dateFormat) }}" style="text-align: right;">{{ onlineUser.elapsed.lastOnline }}</td></tr>
{% endfor %}
</table>

4
templates/yuuno/global/master.twig
View file

@ -109,7 +109,7 @@
}
{% endif %}
{% if php.self == '/authenticate.php' and not sakura.lockAuth %}
{% if php.self == '/authenticate.php' and not (sakura.lockAuth or session.checkLogin) %}
// AJAX Form Submission
var forms = {
@ -171,7 +171,7 @@
<!-- User menu, displayed on right side of the bar. -->
{% if session.checkLogin %}
<a class="menu-item avatar" href="{{ urls.format('USER_PROFILE', [user.id]) }}" title="Logged in as {{ user.username }}" style="background-image: url('{{ urls.format('IMAGE_AVATAR', [user.id]) }}'); width: auto; color: {{ user.colour }}; border-color: {{ user.colour }}; font-weight: 700;"></a>
<a class="menu-item fa-envelope" href="{{ urls.format('SETTING_CAT', ['messages']) }}" title="Messages"></a>
{#<a class="menu-item fa-envelope" href="{{ urls.format('SETTING_CAT', ['messages']) }}" title="Messages"></a>#}
{% if user.permission(constant('Sakura\\Perms\\Manage::USE_MANAGE'), constant('Sakura\\Perms::MANAGE')) %}
<a class="menu-item fa-gavel" href="{{ urls.format('MANAGE_INDEX') }}" title="Manage"></a>
{% endif %}