Changeset 154 for www/index.php

Timestamp:

Feb 16, 2009, 7:54:34 PM (16 years ago)

Author:

george

Message:

• Upraveno: Postupné odstraňování odkazů na tabulku users.
• Upraveno: Některé stránky přepracovány do nového zobrazovacího systému.
• Přidáno: Tabulka Subject rozdělena na tabulky Subject a Member. Transformační skript upraven.

File:

• www/index.php (modified) (7 diffs)

www/index.php

@@ -104 +104 @@
     $Output = '<img alt="" src="images/favicons/comp.gif" width="16" height="16" /> '.$OnlineComputers.' / '.$TotalComputers.' &nbsp;  &nbsp; ';
 
-    $DbResult = $this->Database->select('users', 'COUNT(*)', 'role=2');
+    $DbResult = $this->Database->select('Member', 'COUNT(*)', 'MemberState=0');
     $DbRow = $DbResult->fetch_array();
     $TotalUser = $DbRow[0];
@@ -121 +121 @@
     if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState'))
     {
-      $DbResult = $this->Database->select('users', 'cash', 'User='.$this->System->Modules['User']->User['Id']);
+      $DbResult = $this->Database->select('Subject', 'Money', 'Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$this->System->Modules['User']->User['Id'].'))');
       if($DbResult->num_rows > 0)
       {
-        $DbRow = $DbResult->fetch_array();
-        $Finance = $DbRow[0];
-        $Output2 .= ' &nbsp;  &nbsp; <img alt="" src="images/favicons/money.gif" width="16" height="16" /> '.$Finance.' Kč';
+        $DbRow = $DbResult->fetch_assoc();
+        $Output2 .= ' &nbsp;  &nbsp; <img alt="" src="images/favicons/money.gif" width="16" height="16" /> '.$DbRow['Money'].' Kč';
       }
     }
@@ -157 +156 @@
   }
 
-  // Zobrazení seznamu online počítačů
   function OnlineHostList()
   {
@@ -172 +170 @@
   }
 
-  // Zobrazení seznamu neplaticich uzivatelu
   function ShowBadPayerList()
   {
     $Output .= '<div class="PanelTitle">Dlužníci:</div><span style="font-size: smaller;">';
-    $DbResult = $Database->select('users', 'CONCAT(second_name, " ", first_name) as fullname', 'cash<0 AND role=2 ORDER BY cash');
+    $DbResult = $Database->select('Subject', 'Name', 'Money < 0 ORDER BY Money');
     while($Row = $DbResult->fetch_array())
     {
-      $Output .= $Row['fullname'].'<br />';
+      $Output .= $Row['Name'].'<br />';
     }
     $Output .= '</span>';
@@ -185 +182 @@
   }
 
-  // Zobrazení času běhu počítače
   function GetServerUptime()
   {
     $Data = explode(' ',exec('uptime'));
-    $Data = array_slice($Data,3,-8);
+    $Data = array_slice($Data, 3, -8);
     $Uptime = '';
     foreach($Data as $Item)
     {
-      if(strpos($Item,':')) $Uptime .= substr($Item,0,-1).' hodin';
+      if(strpos($Item, ':')) $Uptime .= substr($Item, 0, -1).' hodin';
       else $Uptime .= $Item.' ';
     }
-    $Uptime = str_replace('2 days,','2 dny a',$Uptime);
-    $Uptime = str_replace('3 days,','3 dny a',$Uptime);
-    $Uptime = str_replace('4 days,','4 dny a',$Uptime);
-    $Uptime = str_replace('days,','dní a',$Uptime);
-    $Uptime = str_replace('day,','den a',$Uptime);
-    $Uptime = str_replace('min,','minut',$Uptime);
+    $Uptime = str_replace('2 days,', '2 dny a', $Uptime);
+    $Uptime = str_replace('3 days,', '3 dny a', $Uptime);
+    $Uptime = str_replace('4 days,', '4 dny a', $Uptime);
+    $Uptime = str_replace('days,', 'dní a', $Uptime);
+    $Uptime = str_replace('day,', 'den a', $Uptime);
+    $Uptime = str_replace('min,', 'minut', $Uptime);
     return($Uptime);
   }
@@ -209 +205 @@
     global $Database, $Config, $User;
 
-    //$Database->select_db('share');
-    //$Output = $this->InfoBar();
-    // Process cookies
         $Output = '';
     if(array_key_exists('Action', $_GET))
@@ -301 +294 @@
     $Database->select_db('is');
 
+    $Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr><td valign="top">';
     $Output .= '<div class="Panel">'.$this->ShowLinks($this->Links['main']).'</div>';