Changeset 838
- Timestamp:
- Jan 9, 2016, 11:45:01 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 18 added
- 5 deleted
- 33 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/AoWoW/AoWoW.php
r816 r838 3 3 class ModuleAoWoW extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterMenuItem(array( -
trunk/Modules/ClientVersion/ClientVersion.php
r816 r838 3 3 class ModuleClientVersion extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 11 11 $this->License = 'GNU/GPL'; 12 12 $this->Description = 'Manage and show list of known versions of WoW client.'; 13 $this->Dependencies = array( '');13 $this->Dependencies = array(); 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('client-version', 'PageClientVersion'); -
trunk/Modules/Dictionary/Dictionary.php
r829 r838 3 3 class ModuleDictionary extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('dictionary', 'PageDictionary'); -
trunk/Modules/Download/Download.php
r816 r838 3 3 class ModuleDownload extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('download', 'PageDownload'); -
trunk/Modules/Error/Error.php
r816 r838 3 3 class ModuleError extends AppModule 4 4 { 5 var $Encoding;6 var $ShowError;7 var $UserErrors;8 5 var $OnError; 6 var $ErrorHandler; 9 7 10 function __construct( $System)8 function __construct(System $System) 11 9 { 12 10 parent::__construct($System); … … 18 16 $this->Dependencies = array(); 19 17 20 $this->Encoding = 'utf-8';21 $this->ShowError = false;22 $this->UserErrors = E_ALL; //E_ERROR | E_WARNING | E_PARSE;23 18 $this->OnError = array(); 19 $this->ErrorHandler = new ErrorHandler(); 20 $this->ErrorHandler->OnError[] = array($this, 'DoError'); 24 21 } 25 22 26 function Install()23 function DoStart() 27 24 { 28 parent::Install();25 $this->ErrorHandler->Start(); 29 26 } 30 27 31 function UnInstall()28 function DoStop() 32 29 { 33 parent::UnInstall();30 $this->ErrorHandler->Stop(); 34 31 } 35 32 36 function Start()33 function DoError($Error) 37 34 { 38 parent::Start();39 set_error_handler(array($this, 'ErrorHandler'));40 set_exception_handler(array($this, 'ExceptionHandler'));41 }42 43 function Stop()44 {45 restore_error_handler();46 restore_exception_handler();47 parent::Stop();48 }49 50 function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)51 {52 $ErrorType = array53 (54 1 => 'Error',55 2 => 'Warning',56 4 => 'Parsing Error',57 8 => 'Notice',58 16 => 'Core Error',59 32 => 'Core Warning',60 64 => 'Compile Error',61 128 => 'Compile Warning',62 256 => 'User Error',63 512 => 'User Warning',64 1024 => 'User Notice'65 );66 67 if(($this->UserErrors & $Number))68 {69 $Backtrace = debug_backtrace();70 $Backtrace[0]['function'] = $Message;71 $Backtrace[0]['args'] = '';72 $Backtrace[0]['file'] = $FileName;73 $Backtrace[0]['line'] = $LineNumber;74 $this->Report($Backtrace);75 //if((E_ERROR | E_PARSE) & $Number)76 die();77 }78 }79 80 function ExceptionHandler(Exception $Exception)81 {82 $Backtrace = $Exception->getTrace();83 array_unshift($Backtrace, array(84 'function' => $Exception->getMessage(),85 'file' => $Exception->getFile(),86 'line' => $Exception->getLine(),87 ));88 $this->Report($Backtrace);89 die();90 }91 92 function Report($Backtrace)93 {94 $Date = date('Y-m-d H:i:s');95 $Error = '# '.$Date."\n";96 foreach($Backtrace as $Item)97 {98 if(!array_key_exists('line', $Item)) $Item['line'] = '';99 if(!array_key_exists('file', $Item)) $Item['file'] = '';100 101 $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];102 $Arguments = '';103 if(array_key_exists('args', $Item) and is_array($Item['args']))104 foreach($Item['args'] as $Item)105 {106 if(is_object($Item)) ;107 else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";108 else $Arguments .= "'".$Item."',";109 }110 if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';111 $Error .= "\n";112 }113 $Error .= "\n";114 115 // Show error message116 $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".117 '<meta http-equiv="Content-Language" content="cs">'."\n".118 '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".119 T('An internal error occurred! <br /> Administrator has been made aware of it and the error soon will be removed.').'<br/><br/>';120 if($this->ShowError == true)121 $Output .= '<pre>'.$Error.'</pre><br/>';122 $Output .= '</body></html>';123 echo($Output);124 35 foreach($this->OnError as $OnError) 125 $OnError[0]->$OnError[1]($Error);36 call_user_func($OnError, $Error); 126 37 } 127 38 } -
trunk/Modules/Export/Export.php
r816 r838 16 16 function Init() 17 17 { 18 $this->TempDir = dirname(__FILE__).'/../../'.$this-> Config['Web']['TempFolder'].'Export/'.$this->Id.'/';18 $this->TempDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/'; 19 19 if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true); 20 $this->TempDirRelative = $this-> Config['Web']['TempFolder'].'Export/'.$this->Id.'/';21 $this->SourceDir = dirname(__FILE__).'/../../'.$this-> Config['Web']['SourceFolder'];22 $this->SourceDirRelative = $this-> Config['Web']['SourceFolder'];20 $this->TempDirRelative = $this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/'; 21 $this->SourceDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['SourceFolder']; 22 $this->SourceDirRelative = $this->System->Config['Web']['SourceFolder']; 23 23 if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true); 24 24 } … … 161 161 "-- ===========================================\n". 162 162 "--\n". 163 "-- Web projektu: ".$this-> Config['Web']['Host'].$this->System->Link('/')."\n".163 "-- Web projektu: ".$this->System->Config['Web']['Host'].$this->System->Link('/')."\n". 164 164 "-- Datum exportu: ".date("j.n.Y H:i:s")."\n". 165 "-- Znaková sada: ".$this-> Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".165 "-- Znaková sada: ".$this->System->Config['Database']['Charset']." / ".$this->System->Config['Web']['Charset']."\n". 166 166 "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n". 167 167 "-- Vygeneroval uživatel: ".$this->System->User->Name."\n". … … 229 229 /* 230 230 // Data to aowow 231 $Database2 = new mysqli($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']); 232 $Database2->query('SET NAMES '.$this->Config['Database']['Charset']); 231 $Database2 = new mysqli($this->System->Config['Database']['Host'], 232 $this->System->Config['Database']['User'], 233 $this->System->Config['Database']['Password'], 234 $this->System->Config['Database']['Database']); 235 $Database2->query('SET NAMES '.$this->System->Config['Database']['Charset']); 233 236 $Database2->select_db($AoWoWconf['mangos']['db']); 234 237 $AoWoWTables = array( … … 256 259 { 257 260 $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`, 258 (SELECT `OptionText` FROM `'.$this-> Config['Database']['Database'].'`.`TextNPCOption` AS `TableTran`261 (SELECT `OptionText` FROM `'.$this->System->Config['Database']['Database'].'`.`TextNPCOption` AS `TableTran` 259 262 WHERE `TableEn`.`Entry` = `TableTran`.`Entry` AND (`Complete` = 1) AND '.$this->WhereLang.' 260 263 AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `Tran` 261 FROM `'.$this-> Config['Database']['Database'].'`.`TextNPCOption` AS `TableEn` WHERE264 FROM `'.$this->System->Config['Database']['Database'].'`.`TextNPCOption` AS `TableEn` WHERE 262 265 `OptionText` = "'.addslashes($Ori_text).'" LIMIT 1'); 263 266 $Tran = $DbResult2->fetch_assoc(); … … 646 649 "<document>\n". 647 650 " <meta>\n". 648 " <projecturl>".$this-> Config['Web']['Host'].$this->System->Link('/')."</projecturl>\n".651 " <projecturl>".$this->System->Config['Web']['Host'].$this->System->Link('/')."</projecturl>\n". 649 652 " <time>".date('r')."</time>\n". 650 653 " <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n". … … 696 699 class ModuleExport extends AppModule 697 700 { 698 function __construct( $System)701 function __construct(System $System) 699 702 { 700 703 parent::__construct($System); … … 707 710 } 708 711 709 function Start()712 function DoStart() 710 713 { 711 714 $this->System->RegisterPage('export', 'PageExport'); -
trunk/Modules/Export/Page.php
r816 r838 96 96 '<tr><td colspan="2"><input type="submit" value="'.T('Create').'" /></td></tr>'. 97 97 '</table></fieldset></form>'; 98 } else $Output = ShowMessage( T('You can\'t create another export. Max for one user is').$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);98 } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'), $this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL); 99 99 } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL); 100 100 return($Output); … … 117 117 $_GET['Filter'] = 'my'; 118 118 $this->ExportList(); 119 } else $Output = ShowMessage( T('You can\'t create another export. Max for one user is').' '.$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);119 } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'),$this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL); 120 120 } else $Output = ShowMessage(T('Missing data in form.'), MESSAGE_CRITICAL); 121 121 } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL); … … 800 800 $this->ExportList(); 801 801 } else $Output = ShowMessage('Zdrojový export nenalezen', MESSAGE_CRITICAL); 802 } else $Output = ShowMessage( 'Nemůžete vytvářet další export. Max. počet na uživatele je '.803 $this->System->Config['MaxExportPerUser'] .'.', MESSAGE_CRITICAL);802 } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'), 803 $this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL); 804 804 } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL); 805 805 } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL); -
trunk/Modules/Export/ProcessAoWoWExport.php
r816 r838 8 8 include_once('Page.php'); 9 9 10 $System = new System();11 12 10 $System = new Core(); 11 $System->DoNotShowPage = true; 12 $System->Run(); 13 13 14 14 $Output = ''; -
trunk/Modules/Export/ProcessTask.php
r826 r838 10 10 11 11 //LoadCommandLineParameters(); 12 $System = new System();12 $System = new Core(); 13 13 $System->DoNotShowPage = true; 14 14 $System->Run(); -
trunk/Modules/Export/Progress.php
r818 r838 3 3 include_once(dirname(__FILE__).'/../../includes/global.php'); 4 4 5 $System = new System();5 $System = new Core(); 6 6 $System->DoNotShowPage = true; 7 7 $System->Run(); -
trunk/Modules/Export/cmdmpqexport.php
r816 r838 8 8 include_once('Page.php'); 9 9 10 $System = new System();11 12 10 $System = new Core(); 11 $System->DoNotShowPage = true; 12 $System->Run(); 13 13 $PageExport = new PageExport($System); 14 14 -
trunk/Modules/Forum/Forum.php
r816 r838 3 3 class ModuleForum extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('forum', 'PageForum'); -
trunk/Modules/FrontPage/FrontPage.php
r816 r838 3 3 class ModuleFrontPage extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('', 'PageFrontPage'); -
trunk/Modules/Import/Import.php
r817 r838 7 7 class ModuleImport extends AppModule 8 8 { 9 function __construct( $System)9 function __construct(System $System) 10 10 { 11 11 parent::__construct($System); … … 18 18 } 19 19 20 function Start()20 function DoStart() 21 21 { 22 22 $this->System->RegisterPage('import', 'PageImport'); … … 31 31 var $System; 32 32 33 function __construct( $System)33 function __construct(System $System) 34 34 { 35 35 $this->System = &$System; -
trunk/Modules/Import/cmd.php
r816 r838 5 5 include_once('Import.php'); 6 6 7 $System = new System();8 9 7 $System = new Core(); 8 $System->DoNotShowPage = true; 9 $System->Run(); 10 10 $Import = new Import($System); 11 11 -
trunk/Modules/Log/Log.php
r818 r838 5 5 var $Excludes; 6 6 7 function __construct( $System)7 function __construct(System $System) 8 8 { 9 9 parent::__construct($System); … … 18 18 } 19 19 20 function Start()20 function DoStart() 21 21 { 22 22 $this->System->RegisterPage('log.php', 'PageLog'); -
trunk/Modules/News/News.php
r828 r838 7 7 var $RSSChannels; 8 8 9 function __construct( $System)9 function __construct(System $System) 10 10 { 11 11 parent::__construct($System); … … 16 16 $this->Description = 'Web site annoucements management'; 17 17 $this->Dependencies = array(); 18 $this->RSSChannels = array(); 18 19 } 19 20 20 function Start()21 function DoStart() 21 22 { 22 23 $this->System->RegisterPage('news', 'PageNews'); -
trunk/Modules/Redirection/Redirection.php
r816 r838 3 3 class ModuleRedirection extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 15 15 } 16 16 17 function Start()17 function DoStart() 18 18 { 19 19 $this->System->OnPageNotFound = array($this, 'ShowRedirect'); -
trunk/Modules/Referrer/Referrer.php
r829 r838 5 5 var $Excludes; 6 6 7 function __construct( $System)7 function __construct(System $System) 8 8 { 9 9 parent::__construct($System); … … 12 12 $this->Creator = 'Chronos'; 13 13 $this->License = 'GNU/GPL'; 14 $this->Description = 'Log HTTP referrer URLs.';14 $this->Description = 'Log visitor HTTP referrer URLs to database for later evaluation.'; 15 15 $this->Dependencies = array(); 16 16 … … 18 18 } 19 19 20 function Start()20 function DoStart() 21 21 { 22 22 $this->Log(); -
trunk/Modules/Search/Search.php
r816 r838 5 5 var $SearchItems; 6 6 7 function __construct( $System)7 function __construct(System $System) 8 8 { 9 9 parent::__construct($System); … … 17 17 } 18 18 19 function Start()19 function doStart() 20 20 { 21 21 $this->System->RegisterPage('search', 'PageSearch'); -
trunk/Modules/Server/Server.php
r816 r838 3 3 class ModuleServer extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('server', 'PageServerList'); … … 29 29 class PageServerList extends PageEdit 30 30 { 31 function __construct( $System)31 function __construct(System $System) 32 32 { 33 33 parent::__construct($System); -
trunk/Modules/ShoutBox/ShoutBox.php
r816 r838 3 3 class ModuleShoutBox extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('shoutbox', 'PageShoutBox'); -
trunk/Modules/Team/Team.php
r826 r838 3 3 class ModuleTeam extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Start()16 function DoStart() 17 17 { 18 18 $this->System->RegisterPage('team', 'PageTeam'); -
trunk/Modules/Translation/Translation.php
r826 r838 11 11 class ModuleTranslation extends AppModule 12 12 { 13 function __construct( $System)13 function __construct(System $System) 14 14 { 15 15 parent::__construct($System); … … 22 22 } 23 23 24 function Start()24 function DoStart() 25 25 { 26 26 global $TranslationTree; -
trunk/Modules/User/User.php
r829 r838 8 8 class ModuleUser extends AppModule 9 9 { 10 function __construct( $System)10 function __construct(System $System) 11 11 { 12 12 parent::__construct($System); … … 19 19 } 20 20 21 function Start()21 function DoStart() 22 22 { 23 23 $this->System->User = new User($this->System); … … 100 100 var $PreferredVersion = 0; 101 101 102 function __construct( $System)102 function __construct(System $System) 103 103 { 104 104 $this->System = &$System; -
trunk/Modules/Wiki/Wiki.php
r831 r838 3 3 class ModuleWiki extends AppModule 4 4 { 5 function __construct( $System)5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); … … 14 14 } 15 15 16 function Install() 17 { 18 parent::Install(); 19 } 20 21 function UnInstall() 22 { 23 parent::UnInstall(); 24 } 25 26 function Start() 27 { 28 parent::Start(); 16 function DoStart() 17 { 29 18 $this->LoadPages(); 30 }31 32 function Stop()33 {34 parent::Stop();35 19 } 36 20 -
trunk/admin/install.php
r836 r838 174 174 } else 175 175 { 176 $System = new System();176 $System = new Core(); 177 177 $System->Init(); 178 178 $UpdateManager = new UpdateManager(); -
trunk/alert.php
r816 r838 1 1 <?php 2 2 3 include('includes/config.php'); 3 $InitSystem = true; 4 include_once('includes/global.php'); 4 5 5 function HumanDate($SQLDateTime) 6 class PageAlert extends Page 6 7 { 7 $DateTimeParts = explode(' ', $SQLDateTime); 8 if($DateTimeParts[0] != '0000-00-00') 8 function Show() 9 9 { 10 $DateParts = explode('-', $DateTimeParts[0]); 11 return(($DateParts[2] * 1).'.'.($DateParts[1] * 1).'.'.($DateParts[0] * 1)); 12 } else return(' '); 13 } 14 10 $this->RawPage = true; 15 11 $Output = 'SERVERALERT:'."\n"; 16 12 17 13 $Output .= 'Toto jsou aktuality z projektu wowpreklad.zdechov.net:'."\n"."\n"; 18 14 19 $Database = new mysqli($Config['Database']['Host'],$Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']); 20 $Database->query('SET NAMES "'.$Config['Database']['Charset'].'"'); 21 $DbResult = $Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '. 15 $DbResult = $this->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '. 22 16 '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '); 23 17 while($Article = $DbResult->fetch_assoc()) … … 25 19 $Output .= ('> '.HumanDate($Article['Time']).' '.$Article['Title']."\n".strip_tags($Article['Text'])."\n\n"); 26 20 } 27 echo ($Output); 21 return($Output); 22 } 23 } 24 25 $Page = new PageAlert($System); 26 ShowPageClass($Page); -
trunk/includes/PageEdit.php
r837 r838 1 1 <?php 2 3 class Page4 {5 var $System;6 var $Database;7 var $RawPage;8 var $Title;9 10 function __construct($System)11 {12 $this->System = &$System;13 $this->Database = &$System->Database;14 $this->RawPage = false;15 }16 17 function Show()18 {19 return('');20 }21 22 function GetOutput()23 {24 $Output = $this->Show();25 return($Output);26 }27 }28 2 29 3 class PageEdit extends Page -
trunk/includes/Version.php
r837 r838 6 6 // and system will need database update. 7 7 8 $Revision = 83 7; // Subversion revision8 $Revision = 838; // Subversion revision 9 9 $DatabaseRevision = 811; // Database structure revision 10 $ReleaseTime = '201 5-12-27';10 $ReleaseTime = '2016-01-11'; -
trunk/includes/global.php
r836 r838 1 1 <?php 2 2 3 include_once(dirname(__FILE__).'/Database.php'); 4 include_once(dirname(__FILE__).'/Base.php'); 3 include_once(dirname(__FILE__).'/../Packages/Common/Common.php'); 5 4 include_once(dirname(__FILE__).'/system.php'); 6 5 include_once(dirname(__FILE__).'/Update.php'); 7 include_once(dirname(__FILE__).'/Page .php');6 include_once(dirname(__FILE__).'/PageEdit.php'); 8 7 if(file_exists(dirname(__FILE__).'/config.php')) 9 8 include_once(dirname(__FILE__).'/config.php'); 10 9 include_once(dirname(__FILE__).'/Version.php'); 11 include_once(dirname(__FILE__).'/AppModule.php');12 10 include_once(dirname(__FILE__).'/Locale.php'); 13 include_once(dirname(__FILE__).'/UTF8.php');14 11 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php'); 15 12 … … 41 38 if(isset($InitSystem) and $InitSystem) 42 39 { 43 $System = new System();40 $System = new Core(); 44 41 $System->DoNotShowPage = true; 45 42 $System->Run(); 46 $User = $System->User; // Back compatibility, will be removed47 43 } 48 44 -
trunk/includes/system.php
r837 r838 1 1 <?php 2 2 3 include_once('Database.php'); 4 include_once('Application.php'); 5 6 class System extends Application 3 class Core extends Application 7 4 { 8 var $Database;9 5 var $Config; 10 var $ModuleManager;11 6 var $PathItems; 12 7 var $Menu; 13 8 var $DoNotShowPage; 14 9 var $OnPageNotFound; 10 var $Pages; 15 11 16 12 function __construct() 17 13 { 14 parent::__construct(); 18 15 $this->Config = array(); 19 16 $this->Menu = array(); … … 21 18 $this->DoNotShowPage = false; 22 19 $this->OnPageNotFound = array(); 20 $this->Pages = array(); 23 21 } 24 22 … … 28 26 29 27 $this->Config = $Config; 30 $this->Database = new Database();31 28 $this->Database->Connect($this->Config['Database']['Host'], 32 29 $this->Config['Database']['User'], $this->Config['Database']['Password'], … … 36 33 $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError']; 37 34 $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery']; 38 $this->ModuleManager = new AppModuleManager();39 35 40 36 $this->PathItems = ProcessURL(); … … 59 55 $this->Menu = array 60 56 ( 61 /* array(62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 57 /* array( 58 'Title' => T('Files'), 59 'Hint' => 'Stahování různých pomocných souborů a programů', 60 'Link' => $this->Link('/download.php'), 61 'Permission' => LICENCE_ANONYMOUS, 62 'Icon' => '', 63 ), 64 */ 65 array( 66 'Title' => T('Instructions'), 67 'Hint' => 'Informace k překladu hry', 68 'Link' => $this->Link('/info.php'), 69 'Permission' => LICENCE_ANONYMOUS, 70 'Icon' => '', 71 ), 72 array( 73 'Title' => T('Data source'), 74 'Hint' => 'Informace o překladových skupinách', 75 'Link' => $this->Link('/TranslationList.php?action=grouplist'), 76 'Permission' => LICENCE_ANONYMOUS, 77 'Icon' => '', 78 ), 79 array( 80 'Title' => T('Presentation'), 81 'Hint' => 'Prezentace a motivace překladu', 82 'Link' => $this->Link('/promotion.php'), 83 'Permission' => LICENCE_ANONYMOUS, 84 'Icon' => '', 85 ), 86 array( 87 'Title' => T('IRC chat'), 88 'Hint' => 'IRC chat pro překladatele', 89 'Link' => 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&channel=%23wowpreklad&forcePrompt=true&charset=utf-8', 90 'Permission' => LICENCE_ANONYMOUS, 91 'Icon' => '', 92 ), 93 array( 94 'Title' => T('Administration'), 95 'Hint' => 'Volby pro správu', 96 'Link' => $this->Link('/admin/'), 97 'Permission' => LICENCE_ADMIN, 98 'Icon' => '', 99 ), 104 100 ); 105 101 } … … 107 103 function Run() 108 104 { 109 global $S ystem, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,105 global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager, 110 106 $UpdateManager, $Config, $DatabaseRevision; 111 107 … … 139 135 140 136 // Initialize application modules 141 $this->ModuleManager->RegisterModule(new ModuleError($System)); 142 $this->ModuleManager->Modules['Error']->ShowError = $Config['Web']['ShowPHPError']; 143 $this->ModuleManager->RegisterModule(new ModuleLog($System)); 144 $this->ModuleManager->RegisterModule(new ModuleUser($System)); 145 $this->ModuleManager->RegisterModule(new ModuleAoWoW($System)); 146 $this->ModuleManager->RegisterModule(new ModuleReferrer($System)); 147 $this->ModuleManager->Modules['Referrer']->Excludes[] = $System->Config['Web']['Host']; 148 $this->ModuleManager->RegisterModule(new ModuleTeam($System)); 149 $this->ModuleManager->RegisterModule(new ModuleDictionary($System)); 150 $this->ModuleManager->RegisterModule(new ModuleTranslation($System)); 151 $this->ModuleManager->RegisterModule(new ModuleImport($System)); 152 $this->ModuleManager->RegisterModule(new ModuleExport($System)); 153 $this->ModuleManager->RegisterModule(new ModuleServer($System)); 154 $this->ModuleManager->RegisterModule(new ModuleClientVersion($System)); 155 $this->ModuleManager->RegisterModule(new ModuleShoutBox($System)); 156 $this->ModuleManager->RegisterModule(new ModuleNews($System)); 157 $this->ModuleManager->RegisterModule(new ModuleWiki($System)); 158 $this->ModuleManager->RegisterModule(new ModuleSearch($System)); 159 $this->ModuleManager->RegisterModule(new ModuleFrontPage($System)); 160 $this->ModuleManager->RegisterModule(new ModuleDownload($System)); 161 $this->ModuleManager->RegisterModule(new ModuleForum($System)); 162 $this->ModuleManager->RegisterModule(new ModuleRedirection($System)); 137 $this->ModuleManager->RegisterModule(new ModuleError($this)); 138 $this->ModuleManager->Modules['Error']->ErrorHandler->ShowError = $Config['Web']['ShowPHPError']; 139 $this->ModuleManager->RegisterModule(new ModuleLog($this)); 140 $this->ModuleManager->RegisterModule(new ModuleUser($this)); 141 $this->ModuleManager->RegisterModule(new ModuleAoWoW($this)); 142 $this->ModuleManager->RegisterModule(new ModuleReferrer($this)); 143 $this->ModuleManager->Modules['Referrer']->Excludes[] = $this->Config['Web']['Host']; 144 $this->ModuleManager->RegisterModule(new ModuleTeam($this)); 145 $this->ModuleManager->RegisterModule(new ModuleDictionary($this)); 146 $this->ModuleManager->RegisterModule(new ModuleTranslation($this)); 147 $this->ModuleManager->RegisterModule(new ModuleImport($this)); 148 $this->ModuleManager->RegisterModule(new ModuleExport($this)); 149 $this->ModuleManager->RegisterModule(new ModuleServer($this)); 150 $this->ModuleManager->RegisterModule(new ModuleClientVersion($this)); 151 $this->ModuleManager->RegisterModule(new ModuleShoutBox($this)); 152 $this->ModuleManager->RegisterModule(new ModuleNews($this)); 153 $this->ModuleManager->RegisterModule(new ModuleWiki($this)); 154 $this->ModuleManager->RegisterModule(new ModuleSearch($this)); 155 $this->ModuleManager->RegisterModule(new ModuleFrontPage($this)); 156 $this->ModuleManager->RegisterModule(new ModuleDownload($this)); 157 $this->ModuleManager->RegisterModule(new ModuleForum($this)); 158 $this->ModuleManager->RegisterModule(new ModuleRedirection($this)); 159 $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php'; 160 // TODO: Allow control from web which modules should be installed 161 $this->ModuleManager->InstallAll(); 163 162 $this->ModuleManager->StartAll(); 164 163 … … 276 275 if($this->System->User->Licence(LICENCE_USER)) 277 276 { 278 //$DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);277 //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team); 279 278 //$Team = $DbResult->fetch_assoc(); 280 279 //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>'; -
trunk/index.php
r816 r838 3 3 include_once('includes/global.php'); 4 4 5 $System = new System();5 $System = new Core(); 6 6 $System->Run(); -
trunk/locale/cs.php
r837 r838 237 237 'Creation of new export' => 'Vytvoření nového exportu', 238 238 'Identification' => 'Označení', 239 'You can\'t create another export. Max for one user is ' => 'Nemůžete vytvářet další export. Max. počet na uživatele je',239 'You can\'t create another export. Max for one user is %d.' => 'Nemůžete vytvářet další export. Max. počet na uživatele je %d.', 240 240 'Create' => 'Vytvořit', 241 241 'New export created.<br />Direct link to export' => 'Nový export vytvořen.<br/>Přímý odkaz na tento export',
Note:
See TracChangeset
for help on using the changeset viewer.