Changeset 838 for trunk/Modules/Export/Export.php

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.

File:

• trunk/Modules/Export/Export.php (modified) (7 diffs)

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');