Changeset 547 for trunk/includes/global.php

Timestamp:

Jun 18, 2013, 6:58:22 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Uživatelská podpora přepracována na aplikační modul.

File:

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

trunk/includes/global.php

@@ -5 +5 @@
 include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/rss.php');
-include_once(dirname(__FILE__).'/user.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/error.php');
@@ -19 +18 @@
 include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 include_once(dirname(__FILE__).'/../Modules/Team/Team.php');
+include_once(dirname(__FILE__).'/../Modules/User/User.php');
 
 GlobalInit();
+$User = &$System->User; // Back compatibility
 
 function GlobalInit()
@@ -53 +54 @@
   foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
   
-  $User = new User($System);
-  
   set_error_handler('ErrorHandler');
   set_exception_handler('ExceptionHandler'); 
@@ -62 +61 @@
   
   // Initialize application modules
-  $System->ModuleManager->RegisterModule(new AoWoW($System));
-  $System->ModuleManager->RegisterModule(new Referrer($System));
+  $System->ModuleManager->RegisterModule(new ModuleUser($System));
+  $System->ModuleManager->RegisterModule(new ModuleAoWoW($System));
+  $System->ModuleManager->RegisterModule(new ModuleReferrer($System));
   $System->ModuleManager->Modules['Referrer']->Excluded[] = $System->Config['Web']['Host'];
-  $System->ModuleManager->RegisterModule(new FrontPage($System));
-  $System->ModuleManager->RegisterModule(new Team($System));
+  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
+  $System->ModuleManager->RegisterModule(new ModuleTeam($System));
   $System->ModuleManager->StartAll();
 }
@@ -265 +265 @@
     'Direction' => $_SESSION['OrderDir'],
   ));
-}
-
-function FormatOutput($s)
-{
-  $out = '';
-  $nn = 0;
-  $n = 0;
-  while($s != '')
-  {
-    $start = strpos($s, '<');
-    $end = strpos($s, '>');
-    if($start != 0) 
-    {
-      $end = $start - 1;
-      $start = 0;
-    }
-    $line = trim(substr($s, $start, $end + 1));
-    if(strlen($line) > 0) 
-    if($line[0] == '<')
-    {
-      if($s[$start + 1] == '/') 
-      {
-        $n = $n - 2;
-        $nn = $n;
-      } else 
-      {
-        if(strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
-        else $cmd = substr($line, 1, strlen($line) - 2);
-        //echo('['.$cmd.']');
-        if(strpos($s, '</'.$cmd.'>')) $n = $n + 2;
-      }   
-    }// else $line = '['.$line.']';
-    //if($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));
-    if($line != '') $out .= (str_repeat(' ', $nn).$line."\n");
-    $s = substr($s, $end + 1, strlen($s));
-    $nn = $n;
-  }
-  return($out);
-}
-
-function WriteLanguages($Selected)
-{
-  global $System;
-  
-  $Output = '<select name="Language">';
-  $DbResult = $System->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
-  while($Language = $DbResult->fetch_assoc())
-  {
-    $Output .= '<option value="'.$Language['Id'].'"'; 
-    if($Selected == $Language['Id']) 
-      $Output .= ' selected="selected"';
-    $Output .= '>'.$Language['Name'].'</option>';
-  }    
-  $Output .= '</select>';
-  return($Output);    
 }
 
@@ -751 +696 @@
 }
 
+function WriteLanguages($Selected)
+{
+        global $System;
+
+        $Output = '<select name="Language">';
+        $DbResult = $System->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
+        while($Language = $DbResult->fetch_assoc())
+        {
+                $Output .= '<option value="'.$Language['Id'].'"';
+                if($Selected == $Language['Id'])
+                        $Output .= ' selected="selected"';
+                $Output .= '>'.$Language['Name'].'</option>';
+        }
+        $Output .= '</select>';
+        return($Output);
+}
+
+
 ?>