Changeset 131 for devel

Timestamp:

Jan 5, 2009, 7:40:40 AM (16 years ago)

Author:

george

Message:

• Opraveno: Chyba odebírání odpojených uživatelů.
• Přidáno: Funkce pro zobrazení velikosti čitelné lidmi.

Location:

devel/www

Files:

• aktuality/index.php (modified) (3 diffs)
• chat/history.php (modified) (2 diffs)
• database.php (modified) (1 diff)
• finance/inventory.php (modified) (1 diff)
• global.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• page.php (modified) (4 diffs)
• style.css (modified) (1 diff)
• user.php (modified) (1 diff)
• webcam/webcam.php (modified) (1 diff)

devel/www/aktuality/index.php

@@ -83 +83 @@
         if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $Category))
         {
-      
           //print_r($_FILES);
           // Process uploaded file
@@ -175 +174 @@
           while($Row = $DbResult->fetch_array())
           {
-            $Output .= '<div style="border: thin dotted #97ADFF;        background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong>'.$Row['title'].' ('.HumanDate($Row['date']).', '.$Row['Name'].$Row['author'].')</strong>';
+            $Output .= '<div style="border: thin dotted #97ADFF; background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong><a href="?action=view&id='.$Row['id'].'">'.$Row['title'].'</a> ('.HumanDate($Row['date']).', '.$Row['Name'].$Row['author'].')</strong>';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
-            { 
+            {
               $Output .= '&nbsp;<a href="index.php?action=del&amp;category='.$Category.'&amp;id='.$Row['id'].'">Smazat</a>';
               $Output .= '&nbsp;<a href="index.php?action=edit&amp;category='.$Category.'&amp;id='.$Row['id'].'">Editovat</a>';
@@ -183 +182 @@
             $Output .= '</div>'.$Row['content'].'<br />';
             if($Row['enclosure'] != '')
-            { 
+            {
               $Output .= '<br />Přílohy: ';
               $Enclosures = explode(';', $Row['enclosure']);

devel/www/chat/history.php

@@ -60 +60 @@
             }
             $Output .= '</span></div>';
-          } else $Output .= '<span><a href="?month='.$Month.'">'.$MonthNames[$Month].'</a></span> '; 
+          } else $Output .= '<span><a href="?month='.$Month.'">'.$MonthNames[$Month].'</a></span> ';
         }
         $Output .='</div></div>';
@@ -66 +66 @@
     }
     $Output .= '</div><div></div>';
-  
+
     $DbResult = $this->Database->select('ChatHistory', 'Nick, Color, Text, UNIX_TIMESTAMP(Time)', "RoomType = 0 AND Time > '".$Date." 00:00:00' AND Time < '".$Date." 23:59:59' ORDER BY Time DESC");
     $Output .= '<div class="ChatHistoryText">';

devel/www/database.php

@@ -36 +36 @@
       $Name .= ',`'.$Key.'`';
             if($Value == 'NOW()') $Values .= ",".$Value;
+else if($Value == 'UUID()') $Values .= ",".$Value;
               else $Values .= ",'".$Value."'";
     }

devel/www/finance/inventory.php

@@ -11 +11 @@
   {
     $TotalPrice = 0;
-    $Output = 'Výpis skladových zásob:<br><table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">';
+    $Output = 'Výpis skladových zásob:<br><table class="WideTable">';
     $Output .= '<tr><th>Název</th><th>Datum<br />zakoupení</th><th>Cena [Kč]</th><th>Počet</th><th>Cena<br /> dohromady [Kč]</th></tr>';
     $DbResult = $this->Database->query("SELECT * FROM network_devices WHERE used=2");

devel/www/global.php

@@ -8 +8 @@
 include('config.php');
 include('database.php');
-include('error.php');
+//include('error.php');
 include_once('code.php');
 $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
@@ -61 +61 @@
   list($Usec, $Sec) = explode(" ", microtime());
   return ((float)$Usec + (float)$Sec);
+}
+
+$UnitNames = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
+
+function HumanSize($Value)
+{
+  global $UnitNames;
+
+  $UnitIndex = 0;
+  while($Value > 1024)
+  {
+    $Value = round($Value / 1024, 3);
+    $UnitIndex++;
+  }
+  return($Value.' '.$UnitNames[$UnitIndex]);
 }
 

devel/www/index.php

@@ -17 +17 @@
       array('Seznam počítačů', '/hostlist.php', 'comp.gif'),
       array('Historie chatu', '/chat/history.php', 'sunrisechat.gif', array('Chat', 'Display')),
-      array('Webový chat', 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&channel=%23zdechov&forcePrompt=true&charset=windows-1250', 'sunrisechat.gif'),
+      array('Webový chat', 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&channel=%23zdechov&forcePrompt=true&charset=utf-8', 'sunrisechat.gif'),
       array('Diskusní fórum', '/forum/', 'discus.gif'),
       array('WebMail', 'https://centrala.zdechov.net/cgi-bin/openwebmail/openwebmail.pl', 'openwebmail.gif'),
@@ -83 +83 @@
     return($Result);
   }
-  
+
   function InfoBar()
   {

devel/www/page.php

@@ -92 +92 @@
     'jidelna' => array('',
       'index.php' => 'Jídelníček',
-      'menuedit.php' => 'Editace jídelníčku',   
+      'menuedit.php' => 'Editace jídelníčku',
     ),
     'backup' => array('',
-      'index.php' => 'Nastavení zálohování',   
+      'index.php' => 'Nastavení zálohování',
     ),
     'mapa.php' => 'Mapa webu',
@@ -138 +138 @@
     } 
     $Navigation = substr($Navigation, 0, -6);
-  
+
     $Output = '<?xml version="1.0" encoding="'.$this->System->Config['Web']['Charset'].'"?>'."\n".
     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.
@@ -148 +148 @@
     <div id="Title">'.$Title.'</div>
     <div class="Navigation"><span class="MenuItem"><strong>Navigace &gt;&gt;</strong> '.$Navigation.'</span><div class="MenuItem2">';
-    if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId) 
-      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=LoginForm">Přihlášení</a> <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserRegister">Registrace</a>'; 
-      else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
+    if($this->System->Config['Web']['UserSupport'] == 1)
+    {
+      if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
+        $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=LoginForm">Přihlášení</a> <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserRegister">Registrace</a>'; 
+        else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=Logout">Odhlásit</a>';
+   } else $Output .= '&nbsp;';
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 
     $Output .= '</div></div>';
@@ -160 +163 @@
     $Time = floor((GetMicrotime() - $this->Time_Start) * 100) / 100;
     $Output = '<div id="Footer">
-   <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' | Vygenerováno za '.$Time.' s | Verze: 1.1 | Úprava skriptu: '.date('j.n.Y',filemtime($_SERVER['SCRIPT_FILENAME'])).' |</i></div></body></html>';
+   <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' | Vygenerováno za '.$Time.' s |  Použitá paměť:  '.HumanSize(memory_get_peak_usage(FALSE)).' |</i></div></body></html>';
     return($Output); 
   }

devel/www/style.css

@@ -14 +14 @@
   border-style: solid;
   border-color: silver;
-  padding: 0px 5px 0px 5px;
+  padding: 0px 1px 0px 1px;
 }
 

devel/www/user.php

@@ -62 +62 @@
 
     // Odeber neaktivní uživatele
-    $DbResult = $this->Database->select('UserOnline', 'User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.USER_TIMEOUT.' SECOND)');
+    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.USER_TIMEOUT.' SECOND)');
     while($DbRow = $DbResult->fetch_array())
     {

devel/www/webcam/webcam.php

@@ -4 +4 @@
 {
   var $ImageFileName = 'webcam.jpg';
-  
+
   function ShowImage()
   {
     global $Config;
-    return('<a href="'.$this->System->Config['Web']['RootFolder'].'/webcam/"><img alt="Webkamera školní hřiště" width="160" height="120" src="'.$this->System->Config['Web']['RootFolder'].'/webcam/'.$this->ImageFileName.'" /></a>');
+    return('<a href="'.$this->System->Config['Web']['RootFolder'].'/webcam/"><img alt="Webkamera školní hřiště" width="140" height="105" src="'.$this->System->Config['Web']['RootFolder'].'/webcam/'.$this->ImageFileName.'" /></a>');
   }
 }