Changeset 495 for trunk

Timestamp:

Jan 27, 2013, 7:42:05 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zamezit registraci více stejných jmen s různě velkými písmeny.
• Opraveno: Kódování znaků v tabulce User znemožňovalo přihlašování kvůli kódování.

Location:

trunk

Files:

• includes/config.sample.php (modified) (2 diffs)
• includes/global.php (modified) (3 diffs)
• includes/user.php (modified) (2 diffs)
• registrace.php (modified) (1 diff)
• sql/updates/483.sql (modified) (1 diff)
• sql/updates/487.sql (modified) (1 diff)
• sql/updates/488.sql (modified) (1 diff)
• sql/updates/495.sql (added)

trunk/includes/config.sample.php

@@ -1 +1 @@
 <?php
+
+$IsDeveloper = in_array($_SERVER['REMOTE_ADDR'], array('127.0.0.1'));
 
 $Config = array(
@@ -21 +23 @@
     'Authors' => 'autor',
     'ShowSQLQuery' => false,
-    'ShowSQLError' => false,
-    'ShowPHPError' => false,
-    'ShowRuntimeInfo' => false,
+    'ShowSQLError' => $IsDeveloper,
+    'ShowPHPError' => $IsDeveloper,
+    'ShowRuntimeInfo' => $IsDeveloper,
     'ItemsPerPage' => 40,
     'TempFolder' => '../tmp/',

trunk/includes/global.php

@@ -129 +129 @@
   (
     $System->Link('/') => array(LICENCE_ANONYMOUS, 'Hlavní stránka', 'Domů'),
-    //'http://www.heroesoffantasy.cz/forum/viewforum.php?f=22' => array(LICENCE_ANONYMOUS, 'Diskuze na téma překládání', 'Fórum projektu'),
-    $System->Link('/phpBB3/') => array(LICENCE_ANONYMOUS, 'Forum ohledně překládání', 'Forum'),
     $System->Link('/dictionary.php') => array(LICENCE_ANONYMOUS, 'Slovník WoW výrazů', 'Slovníček'),
     $System->Link('/statistic.php') => array(LICENCE_ANONYMOUS, 'Stav dokončení překládů', 'Stav dokončení'),
@@ -266 +264 @@
   echo('<br />');
   ShowSearchBox();
-  echo('<br /><a href="http://wow.herniweb.cz/" title="World of Warcraft Czech and Slovak Fansite" target="_blank"><img src="http://wow.herniweb.cz/pic/design/ikonka.gif" style="height:31px; width:88px; border:0px;" alt="World of Warcraft Czech and Slovak Fansite"></a>'.
-  '</td><td id="border-left"></td><td class="content">');
+  echo('</td><td id="border-left"></td><td class="content">');
   $PageFooterRequested = true;
   if(isset($Message)) ShowMessage($Message, $MessageType);
@@ -300 +297 @@
     echo('</td>'.
   '</tr><tr>'.
-  '<td colspan="4" class="page-bottom">Autoři: '.$System->Config['Web']['Authors'].' &nbsp; <a href="http://wowpreklad.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
-  '<a href="http://wowpreklad.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
+  '<td colspan="4" class="page-bottom">Autoři: '.$System->Config['Web']['Authors'].' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
+  '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
   '<a href="http://counter.cnw.cz/"><img src="http://counter.cnw.cz/monika.cgi?wowpreklad&amp;5&amp;000000&amp;FFFFFF&amp;on" alt="CNW:Counter" /></a>
     <script type="text/javascript">

trunk/includes/user.php

@@ -31 +31 @@
   function Login($Name, $Password)
   {
-    $DbResult = $this->System->Database->query('SELECT `ID` FROM `User` WHERE LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
+    $DbResult = $this->System->Database->query('SELECT `ID` FROM `User` WHERE '.
+      'LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
     if($DbResult->num_rows > 0)
     {
@@ -105 +106 @@
   function CryptPasswordSQL($Password, $Salt)
   {
-    return('sha1(CONCAT(sha1('.$Password.'), '.$Salt.'))');
+    return('SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))');
   } 
   

trunk/registrace.php

@@ -94 +94 @@
         if($Pass == $Pass2) 
         {
-          $DbResult = $System->Database->query('SELECT * FROM `User` WHERE `Name` = "'.$UserName.'"');
+          $DbResult = $System->Database->query('SELECT * FROM `User` WHERE LOWER(`Name`) = LOWER("'.$UserName.'")');
           $Line = $DbResult->fetch_row();
           if(!$Line) 
           {
             $Salt = $User->GetPasswordSalt();
-            $System->Database->query('INSERT INTO `User` (`Name` , `Pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime` ) VALUES ("'.$UserName.'", '.$User->CryptPasswordSQL('"'.$Pass.'"', '"'.$Salt.'"').', "'.$Salt.'", "'.$_SERVER['REMOTE_ADDR'].'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
+            $System->Database->query('INSERT INTO `User` (`Name` , `Pass` , `Salt`, `LastIP` , `LastLogin` , `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime` ) '.
+              'VALUES ("'.$UserName.'", '.$User->CryptPasswordSQL('"'.$Pass.'"', '"'.$Salt.'"').', "'.$Salt.'", "'.$_SERVER['REMOTE_ADDR'].'", NOW(), "'.$Email.'", '.$Language.', '.$Team.', 1, NOW())');
             ShowMessage('Registrace proběhla úspěšně.');
             echo('Přečtěte si pozorně <a href="'.$System->Link('/info.php').'">pokyny pro překladání</a> a můžete pak hned začít překládat.');

trunk/sql/updates/483.sql

@@ +1 @@
+ALTER TABLE  `DbVersion` CHANGE  `Require_476`  `Require_483` INT( 255 ) NULL DEFAULT NULL;
+UPDATE  `DbVersion` SET  `Version` =  'Rev. 483' WHERE  `DbVersion`.`Id` =1;
+
 ALTER TABLE `Referrer` ADD `Hits` INT NOT NULL ;
 ALTER TABLE `Referrer` ADD `Parent` INT NOT NULL ;

trunk/sql/updates/487.sql

@@ +1 @@
+ALTER TABLE  `DbVersion` CHANGE  `Require_483`  `Require_487` INT( 255 ) NULL DEFAULT NULL;
+UPDATE  `DbVersion` SET  `Version` =  'Rev. 487' WHERE  `DbVersion`.`Id` =1;
+
 ALTER TABLE `Referrer` ADD INDEX ( `DateLast` );
 ALTER TABLE `Referrer` ADD INDEX ( `Parent` );

trunk/sql/updates/488.sql

@@ +1 @@
+ALTER TABLE  `DbVersion` CHANGE  `Require_487`  `Require_488` INT( 255 ) NULL DEFAULT NULL;
+UPDATE  `DbVersion` SET  `Version` =  'Rev. 488' WHERE  `DbVersion`.`Id` =1;
 
 INSERT INTO `GroupItemDBC` (`Id`, `ClientVersion`, `GroupItem`, `ColumnIndex`) VALUES