Changeset 455 for trunk/includes/global.php

Timestamp:

Apr 13, 2010, 10:03:12 AM (14 years ago)

Author:

george

Message:

• Upraveno: Přístup k databázi převeden na objektový pomocí rozšířené PHP třídy mysqli. Při práci s databází použít globální objekt $System a jeho prvek $Database ($System->Database->query("SELECT ...");.
• Upraveno: Při vkládání nové zprávy do Kecátka neprovádět přesměrování, ale rovnou zobrazit výpis. U některých překladatelů toto způsobovalo opakované vložení zprávy.

File:

• trunk/includes/global.php (modified) (12 diffs)

trunk/includes/global.php

@@ -15 +15 @@
 
 include_once(dirname(__FILE__).'/config.php');
-include_once(dirname(__FILE__).'/error.php');
-include_once(dirname(__FILE__).'/databaseconection.php');
+include_once(dirname(__FILE__).'/Database.php');
 include_once(dirname(__FILE__).'/global_function.php');
 include_once(dirname(__FILE__).'/rss.php');
@@ -22 +21 @@
 include_once(dirname(__FILE__).'/user.php');
 
-$Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password']); 
-$Database->SQLCommand('SET NAMES '.$Config['Database']['Charset']);
-$Database->SelectDatabase($Config['Database']['Database']);    
-
-$TranslationTree = GetTranslationTree();
-$LanguageList = GetLanguageList();
-
 $System = new System();
 $System->Init();
 $User = new User($System);
 
+include_once(dirname(__FILE__).'/error.php');
+
+$TranslationTree = GetTranslationTree();
+$LanguageList = GetLanguageList();
+
 function GetMicrotime()
 {
@@ -41 +38 @@
 function ShowShoutbox()
 {
-  global $Database, $Config, $User, $System;
+  global $System, $Config, $User, $System;
   
   echo('<strong><a href="'.$System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>');
@@ -47 +44 @@
     echo(' <a href="'.$System->Link('/action.php?action=shoutbox').'">Vložit</a>');
   echo('<div class="box"><table>');
-  $ID = $Database->SQLCommand('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-  while($Line = mysql_fetch_assoc($ID))
+  $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
+  while($Line = $DbResult->fetch_assoc())
     echo('<tr><td><strong>'.$Line['User'].'</strong>: '.htmlspecialchars($Line['Text']).'</td></tr>');
   echo('</table></div>');
@@ -55 +52 @@
 function ShowTopBar()
 {
-  global $Config, $Database, $User, $System;
+  global $Config, $System, $User, $System;
   
   echo('<div class="Menu">');
@@ -61 +58 @@
   if($User->Licence(LICENCE_USER))
   {
-    $DbResult = $Database->SQLCommand('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
-    $Team = mysql_fetch_assoc($DbResult);
+    $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
+    $Team = $DbResult->fetch_assoc();
 
     //echo('<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>');
@@ -159 +156 @@
 function ShowTranslatedMenu()
 {
-  global $TranslationTree, $Config, $Database, $User, $System;
+  global $TranslationTree, $User, $System;
 
   echo('<strong>Překladové skupiny:</strong><br /><div id="TranslationMenu">');
@@ -182 +179 @@
 function ShowOnlineUserList()
 {
-  global $Database, $Moderators, $User;
+  global $System, $Moderators, $User;
   
   echo('Online překladatelé:<br />');
-  $ID = $Database->SQLCommand('SELECT `Name`, `GM`, `ID` FROM `User` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
-  while($DbUser = mysql_fetch_assoc($ID))
+  $DbResult = $System->Database->query('SELECT `Name`, `GM`, `ID` FROM `User` WHERE `LastLogin` >= NOW() - 300 AND ((`LastLogout` < `LastLogin`) OR (ISNULL(`LastLogout`)))');
+  while($DbUser = $DbResult->fetch_assoc())
   {
     if($User->Licence(LICENCE_MODERATOR)) $Name = '<a href="user.php?user='.$DbUser['ID'].'">'.$DbUser['Name'].'</a>';
@@ -197 +194 @@
 function ShowPage()
 {
-  global $User, $Config, $Database, $RSSChannels, $PageFooterRequested, $System;  
-  
-  echo('<?xml version="1.0" encoding="'.$Config['Web']['Charset'].'"?>
+  global $User, $RSSChannels, $PageFooterRequested, $System;  
+  
+  echo('<?xml version="1.0" encoding="'.$System->Config['Web']['Charset'].'"?>
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cz">'.
 '<head>'.
-'<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$Config['Web']['Charset'].'" />'.
+'<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$System->Config['Web']['Charset'].'" />'.
 '<meta name="keywords" content="wow, quest, questy, questů, preklad, mangos, překlad, překládání, přeložený, přeložení, čeština, world of warcraft, open source, free, addon" />'.
-'<meta name="description" content="'.$Config['Web']['Title'].'" />'.
+'<meta name="description" content="'.$System->Config['Web']['Title'].'" />'.
 '<meta name="robots" content="all" />'.
 '<link rel="stylesheet" href="'.$System->Link('/style/style.css').'" type="text/css" media="all" />'.
@@ -213 +210 @@
   foreach($RSSChannels as $Channel)
     echo(' <link rel="alternate" title="'.$Channel['Title'].'" href="'.$Channel['URL'].'" type="application/rss+xml" />');
-  echo('<title>'.$Config['Web']['Title'].'</title>
+  echo('<title>'.$System->Config['Web']['Title'].'</title>
 </head>
 <body>');
@@ -268 +265 @@
 function ShowFooter()
 {
-  global $Database, $Config, $ScriptStartTime, $PageFooterRequested, $User;
+  global $System, $ScriptStartTime, $PageFooterRequested, $User;
 
   if(isset($PageFooterRequested)) 
@@ -291 +288 @@
 
     echo('</td></tr>');
-    if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>');
+    if($System->Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>');
     echo('</table>'.
       '</body>'.
       '</html>');
-    $Database->Disconnect();
     $User->Store();
   }