From 273cfe7bd2ba1f8905d6deadce855ce4de89ae48 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Fri, 26 Jun 2015 00:35:06 +0200
Subject: [PATCH] massive amounts of fucking

---
 _sakura/components/Database.php                 |   2 +-
 _sakura/components/database/mysql.php           |   3 ++-
 _sakura/sakura.php                              |   2 +-
 _sakura/templates/yuuno/main/forgotpassword.tpl |   4 ++--
 content/images/emoticons/extreme.png            | Bin 0 -> 1769 bytes
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 content/images/emoticons/extreme.png

diff --git a/_sakura/components/Database.php b/_sakura/components/Database.php
index 4e3b52b..c94a557 100644
--- a/_sakura/components/Database.php
+++ b/_sakura/components/Database.php
@@ -14,7 +14,7 @@ class Database {
     public static function init($engine) {
 
         // Make the engine class name lowercase
-        $engine = __NAMESPACE__ .'\\'. strtolower($engine);
+        $engine = __NAMESPACE__ .'\DBWrapper\\'. strtolower($engine);
 
         // Check if the class exists
         if(!class_exists($engine))
diff --git a/_sakura/components/database/mysql.php b/_sakura/components/database/mysql.php
index 8c9025f..021d6fb 100644
--- a/_sakura/components/database/mysql.php
+++ b/_sakura/components/database/mysql.php
@@ -3,11 +3,12 @@
  * Sakura MySQL Database Engine
  */
 
-namespace Sakura;
+namespace Sakura\DBWrapper;
 
 use PDO;
 use PDOException;
 use PDOStatement;
+use \Sakura\Configuration;
 
 class MySQL {
 
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index 6ecaa15..c867716 100644
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION',    '20150621');
+define('SAKURA_VERSION',    '20150625');
 define('SAKURA_VLABEL',     'Eminence');
 define('SAKURA_VTYPE',      'Development');
 define('SAKURA_COLOUR',     '#6C3082');
diff --git a/_sakura/templates/yuuno/main/forgotpassword.tpl b/_sakura/templates/yuuno/main/forgotpassword.tpl
index 59a81e9..725152b 100644
--- a/_sakura/templates/yuuno/main/forgotpassword.tpl
+++ b/_sakura/templates/yuuno/main/forgotpassword.tpl
@@ -7,9 +7,9 @@
             <input type="hidden" name="time" value="{{ php.time }}" />
             <input type="hidden" name="uid" value="{{ auth.userId }}" />
             <input type="hidden" name="mode" value="changepassword" />
-            <div class="profile-field">
+            <div class="profile-field{% if auth.forgotKey %} hidden{% endif %}">
                 <div><h2>Verification Key</h2></div>
-                <div style="text-align: center;"><input type="text" name="verk" placeholder="The key that was sent to you in the e-mail" class="inputStyling"{% if auth.forgotKey is not null %} value="{{ auth.forgotKey }}" disabled="disabled"{% endif %} /></div>
+                <div style="text-align: center;"><input type="text" name="verk" placeholder="The key that was sent to you in the e-mail" class="inputStyling"{% if auth.forgotKey %} value="{{ auth.forgotKey }}"{% endif %} /></div>
             </div>
             <div class="profile-field">
                 <div><h2>New Password</h2></div>
diff --git a/content/images/emoticons/extreme.png b/content/images/emoticons/extreme.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c02c6d4bed9384dac1cd2baa06317f46efc742e
GIT binary patch
literal 1769
zcmaJ?c~BE)9NmyW!W}CH6oDm(P=O>%NPv_SA_0jdh!Hh(sAb765Fy!+tR|phI7`u1
z)T$^@k?JU@fY_?k;gZ@SayU*I1*8?RwTDnz@fr}ip@RLRbZ2+=`@VVa{jRsOAIHY5
zv9(%e1pt7pBuXqJ-b;zcg=PT&B=6nNM@$EJgdE?1CF6Qnivl79OF}`33Qj>~D2!xg
z+(1JBfXr0J$#J<fTA;vGEZBr$8B`jA4FDmb1`Vu8Lvb((O;M_a%s;NSFhM0EWNzk3
zIZ{nHnyQS-(xMx(V&W88X^LQk8Tu|5Vh|7lDinu7gDPFE6BvZdSzQ6KHXXB>;4B1B
z6EgovN-m8B!!a!i@>pCy1qXsaKA!~z@c4Yl7xd>q{%j6$^ZlRz0go^64+LLdOd^^V
zNfyY&k*{MBJ0UX_$29^rTd&u%^jsFEO<_a9!NDdCe}6v$;it<~<FLU`t@D^u5TiPU
zR;j_2m>M)G!b#XRT*xFc{ig(#W?ojUd)+3YVQd4eVM8pAsiZleRQmr=m1-WX!)553
zeE(Be7ni9)*)mjzZPO}<!6kc`LTLoyS`@}HZ5)QB&vh|26~i%IDy9L$H}FC4%}O<b
z>2+_<;-yl7M6JVNwE~rhg-k+$rBot<$OwL9V2~&fS{=lNpa@=2L;xp<&+`w2!o&T!
zyw!7DF{aq2Le=;j7kR@CT99k9f=WX~7Nc6_b`*)!Vk&U9WPx(wTzCuWz2+hd=fYo*
z%O;Xxn+E%@LC+l#?lCRrZA)zCjgP7cw`&Pom+X<BBEFUnBw|sVVIb+n%uHze`Q90k
zk(BSA|FCTav~et{X#6WQY6*>-8?he<15VKDIcr_ap8Wi{1OduyZr@z;!X+t$*4t?K
zJv0n}S|1n0qq6Zwp<OPCmL-f*GrFw|bf{<aInl@8zwBJ=+^*^XKx6EbWqYDe$t#-%
z$E^Y6LLYb<e&Ap85~DxQ6I~iMCm$(Tns;o#y|8XD9uy?TP^&48c4Ke}7Y0_)WUa>T
z2+*=Tn?wVztSa3d_U*NVkGccs-IUvBI@?=mRoHIW=xnPE_U^fompv8eH#O-NZ+CsB
zW0BdX>rQe=jlki^(!^s0T|XL?kI=JD>Y)b3tph12$MUkpMG>qY9mb+cNu+z3UJPoR
zimD9Z<`ls3TyE(oeFw$2XY?hNJKP2oPv+de)ih}HiC0fv|Bf%NIgNWQ^0mlGFsFyv
z{L)Wxi?pPaN-FP1=$A#?A>_O99P`Q`kwv8gzj_$Tt2nTV+$Hhm8*`T|-T6*Nv3s3}
z;aWTn79O>;lHtH@irG^}Vd4=Etg~uR)feRtnspwpJPE9It@pKjue|;t`QS*vx#`}C
z?YrnBO;qPLNqCn!wAj{>k--u7O`G4$F-8@-eq#?xQ#QF4_+(c%GWLo9gx0X!y5VZx
zXFs)#Q9Q}KEs+)}m8G?3=+Ca%FdQo<4xT%0wfTNiw*6gDek^woxS3EBcD)0#mF?ZX
z%MzCV3a~#f>Z7nP6-leXWnkD@bYCvVfdbn;fJ2OTv*^~=qWTLBPb0U4`P7yCK=zg!
z07Wx(u@}2{%19O!-54C|ujogzJzRBx!_9AvUz~`M8dxl^J%u}FoGv&#crMNkAIgf-
z)wr)C9VM+)Uv1u~eFE@2uO}jn17T(fSB_H?IZahvKCPAOtIqCEKa`Om@>Q<i^QG`s
zP{5s?ZT9194e>Af+`JFVPuLfLUq#>Z+jP3#VS?T=`Q+3}1mM;5RQNrsYKQ6=QQEJ+
z#~Ev;4Tb6D*eE3j8M}i<wNgcgqGcYm?_$c_%B_k<C}jgu=T}?hhs_R!I8L;7=NEU*
zbPhqaJ3TL5e3{J8YH8lMqNQIp*)dvYon6mK?c07H_FP1@nqZKZH|$GkeEQq;hpUvY
cTD|`yrIif@j@2zTn0`Kzh!}D0>crf?0q9wii2wiq

literal 0
HcmV?d00001