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

probably all for today

Browse source 
tired as shit
This commit is contained in:
Pachira 2015-08-22 17:00:01 +02:00
parent fb1b56e8f5
commit 731c3f4cda
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
_sakura/changelog.json
View file

@ -46,7 +46,8 @@
"20150818",
"20150819",
"20150820",
"20150821"
"20150821",
"20150822"
]
@ -2180,6 +2181,16 @@
"user": "Flashwave"
}
],
"20150822": [
{
"type": "FIX",
"change": "Fixed premium purchasing being broken somehow.",
"user": "Flashwave"
}
]
}

2
_sakura/sakura.php
View file

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

4
_sakura/templates/yuuno/main/support.tpl
View file

@ -84,7 +84,7 @@
</div>
</div>
</div>
{% if session.checkLogin and perms.canGetPremium %}
{% if session.checkLogin and user.checkPermission('SITE', 'OBTAIN_PREMIUM') %}
<div class="slider">
<input class="inputStyling" type="range" min="1" max="{{ page.amount_max }}" value="1" onchange="document.getElementById('monthsNo').value = this.value; document.getElementById('monthNoBtn').innerHTML = this.value; document.getElementById('monthsTrailingS').innerHTML = (this.value == 1 ? '' : 's'); document.getElementById('totalAmount').innerHTML = (this.value * {{ page.price }}).formatMoney(2);" />
</div>
@ -103,7 +103,7 @@
<h1 style="text-align: center; margin: 1em auto;" class="stylised">You need to be logged in to get Tenshi!</h1>
{% endif %}
</div>
{% if session.checkLogin and perms.canGetPremium %}
{% if session.checkLogin and user.checkPermission('SITE', 'OBTAIN_PREMIUM') %}
<form action="/support" method="post" id="purchaseForm" class="hidden">
<input type="hidden" name="mode" value="purchase" />
<input type="hidden" name="time" value="{{ php.time }}" />

2
_sakura/templates/yuuno/settings/home.tpl
View file

@ -21,7 +21,7 @@
<h1 class="stylised">Personal Statistics</h1>
<ul>
<li>You joined on <b>{{ user.data.regdate|date(sakura.dateFormat) }}</b>.</li>
<li>You have made <b>{{ settings.forum_stats.posts }} forum post{% if settings.forum_stats.posts != 1 %}s{% endif %}</b> and started <b>{{ settings.forum_stats.topics }} forum thread{% if settings.forum_stats.topics != 1 %}s{% endif %}</b>.</li>
<li>You have made <b>{{ user.forumStats.posts }} forum post{% if user.forumStats.posts != 1 %}s{% endif %}</b> and started <b>{{ user.forumStats.topics }} forum thread{% if user.forumStats.topics != 1 %}s{% endif %}</b>.</li>
<li>You have <b>x</b> warnings.</li>
<li>You have <b>{{ settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) }} friend{% if settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) != 1 %}s{% endif %}</b>.</li>
</ul>

3
main/settings.php
View file

@ -707,8 +707,7 @@ if(Users::checkLogin()) {
// Homepage
case 'home':
$renderData['settings'] = [
'friends' => Users::getFriends(null, true, true, true),
'forum_stats' => Forum::getUserStats(Session::$userId)
'friends' => Users::getFriends(null, true, true, true)
];
break;