Changeset 838 for trunk/Modules

Timestamp:

Jan 9, 2016, 11:45:01 PM (8 years ago)

Author:

chronos

Message:

• Modified: Some libraries moved to Common package located at Packages directory.
• Modified: Application class System renamed to Core. System class is not just basic parent class for application.
• Fixed: alert file now use same application class as other files.
• Modified: Error application module.

Location:

trunk/Modules

Files:

• AoWoW/AoWoW.php (modified) (2 diffs)
• ClientVersion/ClientVersion.php (modified) (2 diffs)
• Dictionary/Dictionary.php (modified) (2 diffs)
• Download/Download.php (modified) (2 diffs)
• Error/Error.php (modified) (2 diffs)
• Export/Export.php (modified) (7 diffs)
• Export/Page.php (modified) (3 diffs)
• Export/ProcessAoWoWExport.php (modified) (1 diff)
• Export/ProcessTask.php (modified) (1 diff)
• Export/Progress.php (modified) (1 diff)
• Export/cmdmpqexport.php (modified) (1 diff)
• Forum/Forum.php (modified) (2 diffs)
• FrontPage/FrontPage.php (modified) (2 diffs)
• Import/Import.php (modified) (3 diffs)
• Import/cmd.php (modified) (1 diff)
• Log/Log.php (modified) (2 diffs)
• News/News.php (modified) (2 diffs)
• Redirection/Redirection.php (modified) (2 diffs)
• Referrer/Referrer.php (modified) (3 diffs)
• Search/Search.php (modified) (2 diffs)
• Server/Server.php (modified) (3 diffs)
• ShoutBox/ShoutBox.php (modified) (2 diffs)
• Team/Team.php (modified) (2 diffs)
• Translation/Translation.php (modified) (2 diffs)
• User/User.php (modified) (3 diffs)
• Wiki/Wiki.php (modified) (2 diffs)

trunk/Modules/AoWoW/AoWoW.php

@@ -3 +3 @@
 class ModuleAoWoW extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterMenuItem(array(

trunk/Modules/ClientVersion/ClientVersion.php

@@ -3 +3 @@
 class ModuleClientVersion extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -11 +11 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Manage and show list of known versions of WoW client.';
-    $this->Dependencies = array('');
+    $this->Dependencies = array();
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('client-version', 'PageClientVersion');

trunk/Modules/Dictionary/Dictionary.php

@@ -3 +3 @@
 class ModuleDictionary extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('dictionary', 'PageDictionary');

trunk/Modules/Download/Download.php

@@ -3 +3 @@
 class ModuleDownload extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('download', 'PageDownload');

trunk/Modules/Error/Error.php

@@ -3 +3 @@
 class ModuleError extends AppModule
 {
-  var $Encoding;
-  var $ShowError;
-  var $UserErrors;
   var $OnError;
+  var $ErrorHandler;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -18 +16 @@
     $this->Dependencies = array();
 
-    $this->Encoding = 'utf-8';
-    $this->ShowError = false;
-    $this->UserErrors = E_ALL;  //E_ERROR | E_WARNING | E_PARSE;
     $this->OnError = array();
+    $this->ErrorHandler = new ErrorHandler();
+    $this->ErrorHandler->OnError[] = array($this, 'DoError');
   }
 
-  function Install()
+  function DoStart()
   {
-    parent::Install();
+    $this->ErrorHandler->Start();
   }
 
-  function UnInstall()
+  function DoStop()
   {
-    parent::UnInstall();
+    $this->ErrorHandler->Stop();
   }
 
-  function Start()
+  function DoError($Error)
   {
-    parent::Start();
-    set_error_handler(array($this, 'ErrorHandler'));
-    set_exception_handler(array($this, 'ExceptionHandler'));
-  }
-
-  function Stop()
-  {
-    restore_error_handler();
-    restore_exception_handler();
-    parent::Stop();
-  }
-
-  function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
-  {
-    $ErrorType = array
-    (
-      1 => 'Error',
-      2 => 'Warning',
-      4 => 'Parsing Error',
-      8 => 'Notice',
-      16 => 'Core Error',
-      32 => 'Core Warning',
-      64 => 'Compile Error',
-      128 => 'Compile Warning',
-      256 => 'User Error',
-      512 => 'User Warning',
-      1024 => 'User Notice'
-    );
-
-    if(($this->UserErrors & $Number))
-    {
-      $Backtrace = debug_backtrace();
-      $Backtrace[0]['function'] = $Message;
-      $Backtrace[0]['args'] = '';
-      $Backtrace[0]['file'] = $FileName;
-      $Backtrace[0]['line'] = $LineNumber;
-      $this->Report($Backtrace);
-      //if((E_ERROR | E_PARSE) & $Number)
-      die();
-    }
-  }
-
-  function ExceptionHandler(Exception $Exception)
-  {
-    $Backtrace = $Exception->getTrace();
-    array_unshift($Backtrace, array(
-      'function' => $Exception->getMessage(),
-      'file' => $Exception->getFile(),
-      'line' => $Exception->getLine(),
-    ));
-    $this->Report($Backtrace);
-    die();
-  }
-
-  function Report($Backtrace)
-  {
-    $Date = date('Y-m-d H:i:s');
-    $Error = '# '.$Date."\n";
-    foreach($Backtrace as $Item)
-    {
-      if(!array_key_exists('line', $Item)) $Item['line'] = '';
-      if(!array_key_exists('file', $Item)) $Item['file'] = '';
-
-      $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
-      $Arguments = '';
-      if(array_key_exists('args', $Item) and is_array($Item['args']))
-        foreach($Item['args'] as $Item)
-        {
-          if(is_object($Item)) ;
-          else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
-          else $Arguments .= "'".$Item."',";
-        }
-        if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
-        $Error .= "\n";
-    }
-    $Error .= "\n";
-
-    // Show error message
-    $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
-      '<meta http-equiv="Content-Language" content="cs">'."\n".
-      '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
-      T('An internal error occurred! <br /> Administrator has been made ​​aware of it and the error soon will be removed.').'<br/><br/>';
-    if($this->ShowError == true)
-      $Output .= '<pre>'.$Error.'</pre><br/>';
-    $Output .= '</body></html>';
-    echo($Output);
     foreach($this->OnError as $OnError)
-      $OnError[0]->$OnError[1]($Error);
+      call_user_func($OnError, $Error);
   }
 }

trunk/Modules/Export/Export.php

@@ -16 +16 @@
   function Init()
   {
-    $this->TempDir = dirname(__FILE__).'/../../'.$this->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    $this->TempDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
     if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
-    $this->TempDirRelative = $this->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    $this->SourceDir = dirname(__FILE__).'/../../'.$this->Config['Web']['SourceFolder'];
-    $this->SourceDirRelative = $this->Config['Web']['SourceFolder'];
+    $this->TempDirRelative = $this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    $this->SourceDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['SourceFolder'];
+    $this->SourceDirRelative = $this->System->Config['Web']['SourceFolder'];
     if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
   }
@@ -161 +161 @@
       "-- ===========================================\n".
       "--\n".
-      "-- Web projektu: ".$this->Config['Web']['Host'].$this->System->Link('/')."\n".
+      "-- Web projektu: ".$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
       "-- Datum exportu: ".date("j.n.Y  H:i:s")."\n".
-      "-- Znaková sada: ".$this->Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".
+      "-- Znaková sada: ".$this->System->Config['Database']['Charset']." / ".$this->System->Config['Web']['Charset']."\n".
       "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n".
       "-- Vygeneroval uživatel: ".$this->System->User->Name."\n".
@@ -229 +229 @@
     /*
     // Data to aowow
-    $Database2 = new mysqli($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']);
-    $Database2->query('SET NAMES '.$this->Config['Database']['Charset']);
+    $Database2 = new mysqli($this->System->Config['Database']['Host'],
+      $this->System->Config['Database']['User'],
+      $this->System->Config['Database']['Password'],
+      $this->System->Config['Database']['Database']);
+    $Database2->query('SET NAMES '.$this->System->Config['Database']['Charset']);
     $Database2->select_db($AoWoWconf['mangos']['db']);
     $AoWoWTables = array(
@@ -256 +259 @@
         {
           $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
-          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`TextNPCOption` AS `TableTran`
+          (SELECT `OptionText` FROM `'.$this->System->Config['Database']['Database'].'`.`TextNPCOption` AS `TableTran`
            WHERE `TableEn`.`Entry` = `TableTran`.`Entry` AND (`Complete` = 1) AND '.$this->WhereLang.'
             AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `Tran`
-          FROM `'.$this->Config['Database']['Database'].'`.`TextNPCOption` AS `TableEn` WHERE
+          FROM `'.$this->System->Config['Database']['Database'].'`.`TextNPCOption` AS `TableEn` WHERE
             `OptionText` = "'.addslashes($Ori_text).'" LIMIT 1');
           $Tran = $DbResult2->fetch_assoc();
@@ -646 +649 @@
     "<document>\n".
     "  <meta>\n".
-    "    <projecturl>".$this->Config['Web']['Host'].$this->System->Link('/')."</projecturl>\n".
+    "    <projecturl>".$this->System->Config['Web']['Host'].$this->System->Link('/')."</projecturl>\n".
     "    <time>".date('r')."</time>\n".
     "    <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n".
@@ -696 +699 @@
 class ModuleExport extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -707 +710 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('export', 'PageExport');

trunk/Modules/Export/Page.php

@@ -96 +96 @@
             '<tr><td colspan="2"><input type="submit" value="'.T('Create').'" /></td></tr>'.
             '</table></fieldset></form>';
-      } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'), $this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     return($Output);
@@ -117 +117 @@
           $_GET['Filter'] = 'my';
           $this->ExportList();
-        } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').' '.$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+        } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'),$this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL);
       } else $Output = ShowMessage(T('Missing data in form.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
@@ -800 +800 @@
             $this->ExportList();
           } else $Output = ShowMessage('Zdrojový export nenalezen', MESSAGE_CRITICAL);
-        } else $Output = ShowMessage('Nemůžete vytvářet další export. Max. počet na uživatele je '.
-          $this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+        } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'),
+          $this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL);
       } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);

trunk/Modules/Export/ProcessAoWoWExport.php

@@ -8 +8 @@
 include_once('Page.php');
 
-  $System = new System();
-  $System->DoNotShowPage = true;
-    $System->Run();
+$System = new Core();
+$System->DoNotShowPage = true;
+$System->Run();
 
 $Output = '';

trunk/Modules/Export/ProcessTask.php

@@ -10 +10 @@
 
 //LoadCommandLineParameters();
-$System = new System();
+$System = new Core();
 $System->DoNotShowPage = true;
 $System->Run();

trunk/Modules/Export/Progress.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/../../includes/global.php');
 
-$System = new System();
+$System = new Core();
 $System->DoNotShowPage = true;
 $System->Run();

trunk/Modules/Export/cmdmpqexport.php

@@ -8 +8 @@
 include_once('Page.php');
 
-  $System = new System();
-  $System->DoNotShowPage = true;
-    $System->Run();
+$System = new Core();
+$System->DoNotShowPage = true;
+$System->Run();
 $PageExport = new PageExport($System);
 

trunk/Modules/Forum/Forum.php

@@ -3 +3 @@
 class ModuleForum extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('forum', 'PageForum');

trunk/Modules/FrontPage/FrontPage.php

@@ -3 +3 @@
 class ModuleFrontPage extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('', 'PageFrontPage');

trunk/Modules/Import/Import.php

@@ -7 +7 @@
 class ModuleImport extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -18 +18 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('import', 'PageImport');
@@ -31 +31 @@
   var $System;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     $this->System = &$System;

trunk/Modules/Import/cmd.php

@@ -5 +5 @@
 include_once('Import.php');
 
-  $System = new System();
-  $System->DoNotShowPage = true;
-    $System->Run();
+$System = new Core();
+$System->DoNotShowPage = true;
+$System->Run();
 $Import = new Import($System);
 

trunk/Modules/Log/Log.php

@@ -5 +5 @@
   var $Excludes;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -18 +18 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('log.php', 'PageLog');

trunk/Modules/News/News.php

@@ -7 +7 @@
   var $RSSChannels;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -16 +16 @@
     $this->Description = 'Web site annoucements management';
     $this->Dependencies = array();
+    $this->RSSChannels = array();
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('news', 'PageNews');

trunk/Modules/Redirection/Redirection.php

@@ -3 +3 @@
 class ModuleRedirection extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -15 +15 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->OnPageNotFound = array($this, 'ShowRedirect');

trunk/Modules/Referrer/Referrer.php

@@ -5 +5 @@
   var $Excludes;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -12 +12 @@
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
-    $this->Description = 'Log HTTP referrer URLs.';
+    $this->Description = 'Log visitor HTTP referrer URLs to database for later evaluation.';
     $this->Dependencies = array();
 
@@ -18 +18 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->Log();

trunk/Modules/Search/Search.php

@@ -5 +5 @@
   var $SearchItems;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -17 +17 @@
   }
 
-  function Start()
+  function doStart()
   {
     $this->System->RegisterPage('search', 'PageSearch');

trunk/Modules/Server/Server.php

@@ -3 +3 @@
 class ModuleServer extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('server', 'PageServerList');
@@ -29 +29 @@
 class PageServerList extends PageEdit
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);

trunk/Modules/ShoutBox/ShoutBox.php

@@ -3 +3 @@
 class ModuleShoutBox extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('shoutbox', 'PageShoutBox');

trunk/Modules/Team/Team.php

@@ -3 +3 @@
 class ModuleTeam extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->RegisterPage('team', 'PageTeam');

trunk/Modules/Translation/Translation.php

@@ -11 +11 @@
 class ModuleTranslation extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -22 +22 @@
   }
 
-  function Start()
+  function DoStart()
   {
     global $TranslationTree;

trunk/Modules/User/User.php

@@ -8 +8 @@
 class ModuleUser extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -19 +19 @@
   }
 
-  function Start()
+  function DoStart()
   {
     $this->System->User = new User($this->System);
@@ -100 +100 @@
   var $PreferredVersion = 0;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     $this->System = &$System;

trunk/Modules/Wiki/Wiki.php

@@ -3 +3 @@
 class ModuleWiki extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -14 +14 @@
   }
 
-  function Install()
-  {
-    parent::Install();
-  }
-
-  function UnInstall()
-  {
-    parent::UnInstall();
-  }
-
-  function Start()
-  {
-    parent::Start();
+  function DoStart()
+  {
     $this->LoadPages();
-  }
-
-  function Stop()
-  {
-    parent::Stop();
   }