Changeset 466 for trunk/includes

Timestamp:

Apr 15, 2010, 8:20:31 AM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazopvání HTTP odkazů v kecátku.
• Přidáno: Systémová hlášení se nyní zobrazují v barevných rámečcích s ikonou. Typy zpráv jsou informace, varování a kritická chyba.

Location:

trunk/includes

Files:

• global.php (modified) (2 diffs)
• global_function.php (modified) (4 diffs)

trunk/includes/global.php

@@ -14 +14 @@
 foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
 
-include_once(dirname(__FILE__).'/config.php');
+include_once(dirname(__FILE__).'/global_function.php');
+if(file_exists(dirname(__FILE__).'/config.php')) include_once(dirname(__FILE__).'/config.php');
+  else die('Nenalezen konfigurační soubor config.php ve složce includes. Vytvořte jej zkopírováním vzoru config.sample.php.');
 include_once(dirname(__FILE__).'/Database.php');
-include_once(dirname(__FILE__).'/global_function.php');
 include_once(dirname(__FILE__).'/rss.php');
 include_once(dirname(__FILE__).'/system.php');
@@ -48 +49 @@
   $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>: '.MakeActiveLinks(htmlspecialchars($Line['Text'])).'</td></tr>');
+    echo('<tr><td><strong>'.$Line['User'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>');
   echo('</table></div>');
 }

trunk/includes/global_function.php

@@ -342 +342 @@
   if(isset($LanguageList[$LanguageId]) == false)
   {
-    echo('Jazyk dle zadaného Id neexistuje.');
+    ShowMessage('Jazyk dle zadaného Id neexistuje.', MESSAGE_CRITICAL);
     ShowFooter();
     die();
@@ -559 +559 @@
 function MakeActiveLinks($Content)
 {
+  $Content = htmlspecialchars($Content);
+  $Content = str_replace("\n", ' <br/>', $Content);
+  $Content = str_replace("\r", '', $Content);
+  
   $Result = '';  
   $I = 0;
@@ -566 +570 @@
     $Result .= substr($Content, 0, $I);
     $Content = substr($Content, $I);
-    if(strpos($Content, ' ') !== false)
-      $URL = substr($Content, 0, strpos($Content, ' '));
+    $SpacePos = strpos($Content, ' ');
+    if($SpacePos !== false) $URL = substr($Content, 0, strpos($Content, ' '));
       else $URL = substr($Content, 0);
+    
     $Result .= '<a href="'.$URL.'">'.$URL.'</a>';
     $Content = substr($Content, strlen($URL));
@@ -576 +581 @@
 }
 
+define('MESSAGE_WARNING', 0);
+define('MESSAGE_CRITICAL', 1);
+define('MESSAGE_INFORMATION', 2);
+
+function ShowMessage($Text, $Type = MESSAGE_INFORMATION)
+{
+  global $System;
+  
+  $IconName = array(MESSAGE_INFORMATION => 'information', MESSAGE_WARNING => 'warning', MESSAGE_CRITICAL => 'critical');
+  $BackgroundColor = array(MESSAGE_INFORMATION => '#e0e0ff', MESSAGE_WARNING => '#ffffe0', MESSAGE_CRITICAL => '#ffe0e0');
+  
+  echo('<div class="message" style="background-color: '.$BackgroundColor[$Type].';"><table><tr><td class="icon"><img src="'.$System->Link('/images/message/'.$IconName[$Type].'.png').'" alt="'.$IconName[$Type].'"><td>'.$Text.'</td></tr></table></div>');
+}
+
 ?>