Changeset 798 for trunk/includes

Timestamp:

Feb 12, 2014, 9:19:07 PM (11 years ago)

Author:

chronos

Message:

• Fixed: HTML validity.

Location:

trunk/includes

Files:

• Version.php (modified) (1 diff)
• global.php (modified) (1 diff)
• system.php (modified) (28 diffs)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 797; // Subversion revision
+$Revision = 798; // Subversion revision
 $DatabaseRevision = 787; // Database structure revision
 $ReleaseTime = '2014-02-12';

trunk/includes/global.php

@@ -287 +287 @@
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="'.
-      $System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow">';
+    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
+      $System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow"/>';
       else $ArrowImage = '';
     if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';

trunk/includes/system.php

@@ -12 +12 @@
   var $Menu;
   var $DoNotShowPage;
-  
+
   function __construct()
   {
@@ -20 +20 @@
     $this->DoNotShowPage = false;
   }
-  
+
   function Init()
   {
         global $Config, $LocaleManager;
-            
+
     $this->Config = $Config;
     $this->Database = new Database();
@@ -35 +35 @@
     $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
     $this->ModuleManager = new AppModuleManager();
-    
+
     $this->PathItems = ProcessURL();
     // Initialize locale
@@ -45 +45 @@
     );
     $Code = $Config['Web']['Locale'];
-    if (isset($_SESSION)) 
+    if (isset($_SESSION))
       if(array_key_exists('Locale', $_SESSION)) $Code = $_SESSION['Locale'];
-    if (isset($_GET)) 
+    if (isset($_GET))
       if(array_key_exists('locale', $_GET)) $Code = $_GET['locale'];
-    
+
     //echo(phpinfo());
     if(!array_key_exists($Code, $LocaleManager->Available)) $Code = 'en';
     $_SESSION['Locale'] = $Code;
-    $LocaleManager->LoadLocale($Code);       
-    
+    $LocaleManager->LoadLocale($Code);
+
     $this->Menu = array
-    (                   
+    (
    /*           array(
                                 'Title' => T('Files'),
@@ -85 +85 @@
                                 'Permission' => LICENCE_ANONYMOUS,
                                 'Icon' => '',
-                ),              
+                ),
                 array(
                                 'Title' => T('IRC chat'),
@@ -100 +100 @@
                                 'Icon' => '',
                 ),
-    );    
-  }
-  
+    );
+  }
+
   function Run()
   {
@@ -114 +114 @@
     if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
     date_default_timezone_set($Config['Web']['Timezone']);
-  
+
     $this->Init();
 
@@ -132 +132 @@
     }
     foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
-    
+
     // TODO: Global initialized variable should be removed
     $TranslationTree = GetTranslationTree();
-  
+
     // Initialize application modules
     $this->ModuleManager->RegisterModule(new ModuleError($System));
@@ -159 +159 @@
     $this->ModuleManager->RegisterModule(new ModuleForum($System));
     $this->ModuleManager->StartAll();
-    
-    $this->BaseView = new BaseView($this); 
+
+    $this->BaseView = new BaseView($this);
     if($this->DoNotShowPage == false)
     {
           $this->ShowPage();
-    }    
-  }
-  
+    }
+  }
+
   function GetMicrotime()
   {
@@ -172 +172 @@
     return ((float)$Usec + (float)$Sec);
   }
-  
+
   function Link($Target)
   {
     return($this->Config['Web']['BaseURL'].$Target);
-  } 
-  
+  }
+
   function RegisterPage($Path, $Handler)
   {
@@ -186 +186 @@
       foreach($Path as $PathItem)
       {
-        $Page = &$Page[$PathItem];       
+        $Page = &$Page[$PathItem];
       }
       if(!is_array($Page)) $Page = array('' => $Page);
@@ -192 +192 @@
     } else $this->Pages[$Path] = $Handler;
   }
-  
+
   function RegisterMenuItem($MenuItem, $Pos = NULL)
   {
@@ -200 +200 @@
           }
   }
-  
+
   function SearchPage($PathItems, $Pages)
   {
@@ -207 +207 @@
     if(array_key_exists($PathItem, $Pages))
     {
-      if(is_array($Pages[$PathItem])) 
+      if(is_array($Pages[$PathItem]))
       {
         array_shift($PathItems);
         return($this->SearchPage($PathItems, $Pages[$PathItem]));
-      } else 
+      } else
       {
-        if(count($PathItems) == 1) return($Pages[$PathItem]);           
+        if(count($PathItems) == 1) return($Pages[$PathItem]);
           else return(''); // Unexpected subpages
       }
     } else return('');
   }
-  
+
   function PageNotFound()
   {
@@ -225 +225 @@
           Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
         if(array_key_exists('HTTP_REFERER', $_SERVER)) $Referer = ' Referer: '.$_SERVER['HTTP_REFERER'];
-          else $Referer = ''; 
-        if(isset($this->ModuleManager->Modules['Log'])) 
+          else $Referer = '';
+        if(isset($this->ModuleManager->Modules['Log']))
           $this->ModuleManager->Modules['Log']->WriteLog('Stránka "'.
           implode('/', $this->PathItems).'" nenalezena'.$Referer, LOG_TYPE_PAGE_NOT_FOUND);
     return(ShowMessage(sprintf(T('Page "%s" not found'), implode('/', $this->PathItems)), MESSAGE_CRITICAL));
   }
-  
+
   function ShowPage()
   {
@@ -237 +237 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if($ClassName != '') 
+    if($ClassName != '')
     {
       $Page = new $ClassName($this);
       $Output = $Page->GetOutput();
       $this->BaseView->Title = $Page->Title;
-      if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);      
+      if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
     } else {
         $Output = $this->PageNotFound();
@@ -250 +250 @@
     echo($Output);
   }
-} 
+}
 
 class BaseView extends View
 {
-        var $Title;     
-        
+        var $Title;
+
         function ShowTopBar()
         {
                 global $LocaleManager;
-                
+
                 $Output = '<div class="Menu">';
                 if(!$this->System->User->Licence(LICENCE_USER))
@@ -291 +291 @@
                         $Output .= '<option title="" value="'.$Locale['Code'].'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
                 }
-                $Output .= '</select><noscript><input type="submit" value="Submit"></noscript></form>';
+                $Output .= '</select><noscript><input type="submit" value="Submit"/></noscript></form>';
                 $Output .= '</span></div>';
                 return($Output);
         }
-        
+
         function ShowLoginBox()
         {
@@ -321 +321 @@
                 return($Output);
         }
-        
+
         function ShowSearchBox()
         {
                 $Output = '<strong>'.T('Search').':</strong>'.
-                                '<form action="'.$this->System->Link('/search/').'" method="get"><div>'.                        
+                                '<form action="'.$this->System->Link('/search/').'" method="get"><div>'.
                                 '<table>'.
                                 '<tr>'.
@@ -337 +337 @@
                 return($Output);
         }
-        
+
         function ShowMainMenu()
         {
@@ -355 +355 @@
                         return($Output);
         }
-        
+
         function ShowTranslatedMenu()
         {
                 global $TranslationTree;
-        
+
                 $Output = '<strong>'.T('Translate groups').':</strong><br /><div id="TranslationMenu">';
                 $DbResult = $this->System->Database->select('Group', '`Id`, `Name`', '1 ORDER BY `Name`');
@@ -380 +380 @@
                 return($Output);
         }
-        
+
         function ShowHeader()
         {
@@ -399 +399 @@
                 $Output .= '<title>'.$Title.'</title>'.
                 '</head><body>';
-        
+
                 $Output .= $this->ShowTopBar();
                 $Output .= '<table class="page"><tr><td class="menu">';
@@ -410 +410 @@
                 return($Output);
         }
-        
+
         function ShowFooter()
         {
                 global $ScriptStartTime, $Revision, $ReleaseTime;
-        
+
                 $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
-        
+
                 $Output = '</td>'.
       '<td class="menu2">';
@@ -426 +426 @@
       '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">'.T('Changelog').'</a> &nbsp; '.
       $this->System->Config['Web']['WebCounter'];
-        
+
                 $Output .= '</td></tr>';
                 if($this->System->Config['Web']['ShowRuntimeInfo'] == true)
@@ -438 +438 @@
                 return($Output);
         }
-        
+
         function ShowPage($Content)
         {
@@ -445 +445 @@
                 return($Output);
         }
-        
+
         function FormatOutput($s)
         {
@@ -482 +482 @@
                 }
                 return($out);
-        }       
+        }
 }