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

good commit

Browse source
This commit is contained in:
flash 2015-04-24 17:48:56 +00:00
parent a27ba62db9
commit de1a09cf1f
8 changed files with 57 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -41,11 +41,14 @@ local.properties
#################
errors.log
config.php
_sakura/config/config.php
content/images/avatars/*
!content/images/avatars/.htaccess
content/images/backgrounds/*
!content/images/backgrounds/.htaccess
BingSiteAuth.xml
google*.html
logs/*
#################

11
_sakura/components/Main.php
View file

@ -464,4 +464,15 @@ class Main {
}
// Calculate password entropy
public static function pwdEntropy($pw) {
// Decode utf-8 chars
$pw = utf8_decode($pw);
// Count the amount of unique characters in the password string and calculate the entropy
return count(count_chars($pw, 1)) * log(256, 2);
}
}

30
_sakura/templates/yuuno/global/footer.tpl
View file

@ -2,29 +2,29 @@
</div>
<div class="footer">
<div class="ftsections">
<div class="copycentre">Copyright &copy; 2013-2015 <a href="http://flash.moe/" target="_blank">Flashwave</a>, <a href="http://{{ sakura.urls.main }}/credits">et al</a></div>
<div class="copycentre">Copyright &copy; 2013-2015 <a href="//flash.moe/" target="_blank">Flashwave</a>, <a href="//{{ sakura.urls.main }}/credits">et al</a></div>
<ul class="ftsection">
<li class="fthead">General</li>
<li><a href="http://{{ sakura.urls.main }}/" title="Flashii Frontpage">Home</a></li>
<li><a href="http://{{ sakura.urls.main }}/news" title="Flashii News &amp; Updates">News</a></li>
<li><a href="http://{{ sakura.urls.main }}/contact" title="Contact Flashii Staff">Contact</a></li>
<li><a href="http://{{ sakura.urls.main }}/r/terms" title="Our Terms of Service">Terms of Service</a></li>
<li><a href="http://{{ sakura.urls.main }}/r/rules" title="Some Rules and Information kind of summing up the ToS">Rules and Information</a></li>
<li><a href="http://{{ sakura.urls.main }}/r/faq" title="Questions that get Asked Frequently">Frequently Asked Questions</a></li>
<li><a href="//{{ sakura.urls.main }}/" title="Flashii Frontpage">Home</a></li>
<li><a href="//{{ sakura.urls.main }}/news" title="Flashii News &amp; Updates">News</a></li>
<li><a href="//{{ sakura.urls.main }}/contact" title="Contact Flashii Staff">Contact</a></li>
<li><a href="//{{ sakura.urls.main }}/r/terms" title="Our Terms of Service">Terms of Service</a></li>
<li><a href="//{{ sakura.urls.main }}/r/rules" title="Some Rules and Information kind of summing up the ToS">Rules and Information</a></li>
<li><a href="//{{ sakura.urls.main }}/faq" title="Questions that get Asked Frequently but not actually">Frequently Asked Questions</a></li>
</ul>
<ul class="ftsection">
<li class="fthead">Status &amp; Social</li>
<li><a href="http://status.flashii.net" target="_blank" title="Check the status on the Flashii Server and related services">Server Status</a></li>
<li><a href="http://twitter.com/_flashii" target="_blank" title="Follow us on Twitter for news messages that are too short for the news page">@_flashii</a></li>
<li><a href="http://youtube.com/user/flashiinet" target="_blank" title="Our YouTube page where stuff barely ever gets uploaded, mainly used to archive community creations">YouTube</a></li>
<li><a href="http://steamcommunity.com/groups/flashiinet" target="_blank" title="Our Steam group, play games with other members on the site">Steam</a></li>
<li><a href="//status.flashii.net" target="_blank" title="Check the status on the Flashii Server and related services">Server Status</a></li>
<li><a href="//twitter.com/_flashii" target="_blank" title="Follow us on Twitter for news messages that are too short for the news page">Twitter</a></li>
<li><a href="//youtube.com/user/flashiinet" target="_blank" title="Our YouTube page where stuff barely ever gets uploaded, mainly used to archive community creations">YouTube</a></li>
<li><a href="//steamcommunity.com/groups/flashiinet" target="_blank" title="Our Steam group, play games with other members on the site">Steam</a></li>
</ul>
<ul class="ftsection">
<li class="fthead">Contribution</li>
<li><a href="http://flashii.net/changelog.php" title="All the changes made to Flashii are listed here">Changelog</a></li>
<li><a href="http://{{ sakura.urls.main }}/credits" title="Here everyone who's helped Flashii get to where it is now is listed">Credits</a></li>
<li><a href="http://{{ sakura.urls.main }}/feedback" target="_blank" title="Give us feedback on what to do">Feedback &amp; Suggestions</a></li>
<li><a href="http://github.com/flashii" target="_blank" title="Our Open Source repository thing">Github</a></li>
<li><a href="#" title="All the changes made to Flashii are listed here">Changelog</a></li>
<li><a href="//{{ sakura.urls.main }}/credits" title="Here everyone who's helped Flashii get to where it is now is listed">Credits</a></li>
<li><a href="//{{ sakura.urls.main }}/feedback" target="_blank" title="Give us feedback on what to do">Feedback &amp; Suggestions</a></li>
<li><a href="//github.com/flashii" target="_blank" title="Our Open Source repository thing">Github</a></li>
</ul>
</div>
</div>

22
_sakura/templates/yuuno/global/header.tpl
View file

@ -149,12 +149,20 @@
<input type="hidden" name="session" value="{{ php.sessionid }}" />
<input type="hidden" name="time" value="{{ php.time }}" />
<input type="hidden" name="mode" value="login" />
<label for="headerLoginUserName">Username:</label>
<input type="text" id="headerLoginUserName" name="username" class="inputStyling" placeholder="Username" />
<label for="headerLoginPassword">Password:</label>
<input type="password" id="headerLoginPassword" name="password" class="inputStyling" placeholder="Password" />
<input type="checkbox" name="remember" id="headerLoginRemember" />
<label for="headerLoginRemember">Remember me</label>
<input type="button" onclick="submitPost(this.parentNode.id, true, 'Logging in...');" id="headerLoginButton" name="submit" class="inputStyling small" value="Login" />
<div>
<label for="headerLoginUserName">Username:</label>
<input type="text" id="headerLoginUserName" name="username" class="inputStyling" placeholder="Username" />
</div>
<div>
<label for="headerLoginPassword">Password:</label>
<input type="password" id="headerLoginPassword" name="password" class="inputStyling" placeholder="Password" />
</div>
<div>
<input type="checkbox" name="remember" id="headerLoginRemember" />
<label for="headerLoginRemember">Remember me</label>
</div>
<div>
<input type="button" onclick="submitPost('headerLoginForm', true, 'Logging in...');" id="headerLoginButton" name="submit" class="inputStyling small" value="Login" />
</div>
</form>
{% endif %}

10
content/data/yuuno/css/yuuno.css
View file

@ -1252,6 +1252,16 @@ textarea.inputStyling {
box-shadow: 0 0 5px #8364A1;
text-align: center;
}
#headerLoginForm > div {
display: inline-block;
}
@media (max-width: 640px) {
#headerLoginForm > div {
display: block;
text-align: right;
padding-right: 2px;
}
}
#headerLoginForm label {
font-family: "Segoe UI", sans-serif;
font-weight: 100;

BIN
forum/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 361 KiB

4
main/authenticate.php
View file

@ -53,7 +53,7 @@ if(isset($_REQUEST['mode'])) {
// Login check
if(Users::checkLogin()) {
if($_REQUEST['mode'] != 'logout' || $_REQUEST['mode'] != 'legacypw')
if(!in_array($_REQUEST['mode'], ['logout', 'legacypw']))
$continue = false;
}
@ -134,7 +134,7 @@ if(isset($_REQUEST['mode'])) {
// Array containing "human understandable" messages
$messages = [
'USER_NOT_EXIST' => 'The user you tried to activate does not exist.',
'USER_NOT_EXIST' => 'The user you tried to activate does not exist (confirm the username/email combination).',
'USER_ALREADY_ACTIVE' => 'The user you tried to activate is already active.',
'SUCCESS' => 'The activation e-mail has been sent to the address associated with your account.'
];

BIN
manage/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 361 KiB