Changeset 511 for trunk

Timestamp:

Feb 16, 2013, 4:23:29 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Konfigurační soubor se bude dále generovat ze skriptu z vyplněného formuláře s nastavením přímo do souboru namísto kopírováním šablony config.sample.php.

Location:

trunk

Files:

• admin/install.php (modified) (1 diff)
• includes/Update.php (modified) (1 diff)
• includes/Version.php (added)
• includes/global.php (modified) (4 diffs)
• index.php (modified) (1 diff)

trunk/admin/install.php

@@ -1 +1 @@
 <?php
 
-$StopAfterUpdateManager = true;
-include_once('../includes/global.php');
-include_once('UpdateTrace.php');
-$UpdateManager->Trace = $Updates;
-$UpdateManager->InstallMethod = 'FullInstall';
+include_once(dirname(__FILE__).'/../includes/Database.php');
+include_once(dirname(__FILE__).'/../includes/system.php');
+include_once(dirname(__FILE__).'/../includes/Update.php');
+if(file_exists(dirname(__FILE__).'/../includes/config.php'))
+  include_once(dirname(__FILE__).'/../includes/config.php');
+include_once(dirname(__FILE__).'/UpdateTrace.php');
+include_once(dirname(__FILE__).'/../includes/Version.php');
 
 function ControlPanel()
 {
-        global $UpdateManager;
+  global $UpdateManager;
         
-        $YesNo = array(false => 'Ne', true => 'Ano');
-        $Output = '<h3>Správa instance</h3>'.
-                        'Je instalováno: '.$YesNo[$UpdateManager->IsInstalled()].'<br/>';
-        if($UpdateManager->IsInstalled())
-                $Output .= 'Je aktuální: '.$YesNo[$UpdateManager->IsUpToDate()].'<br/>'.
-                'Verze databáze: '.$UpdateManager->GetDbVersion().'<br/>';
-        $Output .= 'Verze kódu: '.$UpdateManager->Revision.'<br/>'.
-                        '<form action="?" method="post">';
-        if($UpdateManager->IsInstalled())
-        {
-                if(!$UpdateManager->IsUpToDate())
-                        $Output .= '<input type="submit" name="update" value="Aktualizovat"/>';
-        $Output .= '<input type="submit" name="uninstall" value="Odinstalovat"/>';
-        } else $Output .= '<input type="submit" name="install" value="Instalovat"/>';
-        $Output .= '</form>';
-        return($Output);
+  $YesNo = array(false => 'Ne', true => 'Ano');
+  $Output = '<h3>Správa instance</h3>'.
+    'Je instalováno: '.$YesNo[$UpdateManager->IsInstalled()].'<br/>';
+  if($UpdateManager->IsInstalled())
+    $Output .= 'Je aktuální: '.$YesNo[$UpdateManager->IsUpToDate()].'<br/>'.
+    'Verze databáze: '.$UpdateManager->GetDbVersion().'<br/>';
+  $Output .= 'Verze kódu: '.$UpdateManager->Revision.'<br/>'.
+    '<form action="?" method="post">';
+  if($UpdateManager->IsInstalled())
+  {
+    if(!$UpdateManager->IsUpToDate())
+      $Output .= '<input type="submit" name="update" value="Aktualizovat"/>';
+    $Output .= '<input type="submit" name="uninstall" value="Odinstalovat"/>';
+  } else $Output .= '<input type="submit" name="install" value="Instalovat"/>';
+  $Output .= '</form>';
+  return($Output);
 }
 
-$Output = '<?xml version="1.0" encoding="'.$System->Config['Web']['Charset'].'"?>
+function PrepareConfig()
+{
+  $Output = '<h3>Nastavení systému</h3>';
+  $Output .= '<form action="" method="post">';
+  $Output .= 'Adresa serveru: <input type="text" name="hostname"/><br/>';
+  $Output .= 'Přihlašovací jméno: <input type="text" name="username"/><br/>';
+  $Output .= 'Heslo: <input type="password" name="UserName"/><br/>';
+  $Output .= 'Schéma: <input type="password" name="Schema"/><br/>';
+  $Output .= 'Titulek webu: <input type="text" name="Title"/><br/>';
+  $Output .= 'Email správce: <input type="text" name="AdminEmail"/><br/>';
+  $Output .= '<input type="submit" name="configure" value="Nastavit"/>';
+  $Output .= '</form>';
+  return($Output);
+}
+
+function CreateConfig($Config)
+{
+  $Output = "<?php
+
+  \$IsDeveloper = in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));
+
+  \$Config = array(
+  'Database' => array(
+    'Host' => 'localhost',
+    'User' => 'root',
+    'Password' => '',
+    'Database' => 'wowpreklad',
+    'DatabaseAoWoW' => 'wowpreklad_mangos',
+    'Prefix' => '',
+    'Charset' => 'utf8',
+    'MangosPrefix' => '',
+  ),
+  'Style' => 'maron',
+  'Web' => array(
+    'Title' => 'Projekt překládání textů hry WoW',
+    'Charset' => 'utf-8',
+    'Host' => 'localhost',
+    'BaseURL' => '',
+    'AdminEmail' => 'admin@localhost',
+    'Authors' => 'autor',
+    'ShowSQLQuery' => false,
+    'ShowSQLError' => \$IsDeveloper,
+    'ShowPHPError' => \$IsDeveloper,
+    'ShowRuntimeInfo' => \$IsDeveloper,
+    'FormatOutput' => \$IsDeveloper,
+        'ItemsPerPage' => 40,
+    'TempFolder' => '../tmp/',
+    'GameVersion' => '3.3.5a',
+    'VisiblePagingItems' => 20,
+    'WebCounter' => '',
+    'Timezone' => 'Europe/Prague',
+  ),
+  'ExportTaskProcessPeriod' => 10,
+  'MaxExportPerUser' => 10,
+  'AoWoWExportId' => 1,
+);
+
+?>";
+  return($Output);
+}
+
+$Output = '<?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cz">'.
 '<head>'.
-'<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$System->Config['Web']['Charset'].'" />'.
+'<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />'.
 '<title>Správa instance</title>'.
 '</head><body>';
+if(isset($Config))
+{
+  $System = new System();
+  $System->Init();
+  $UpdateManager = new UpdateManager();
+  $UpdateManager->Database = $System->Database;
+  $UpdateManager->Revision = $Revision;
+  $UpdateManager->Trace = $Updates;
+  $UpdateManager->InstallMethod = 'FullInstall';
+
 if(array_key_exists('update', $_POST))
 {
-        $Output .= 'Aktualizace';
-        $UpdateManager->Update();
-        $Output .= ControlPanel();
+  $Output .= '<h3>Aktualizace</h3>';
+  $UpdateManager->Update();
+  $Output .= ControlPanel();
 } else
 if(array_key_exists('install', $_POST))
 {
-        $Output .= 'Instalace';
-        $UpdateManager->Install();
-        $Output .= ControlPanel();
+  $Output .= '<h3>Instalace</h3>';
+  $UpdateManager->Install();
+  $Output .= ControlPanel();
 } else
 if(array_key_exists('uninstall', $_POST))
 {
-        $Output .= 'Odinstalace';
-        $UpdateManager->Uninstall();
-        $Output .= ControlPanel();
+  $Output .= '<h3>Odinstalace</h3>';
+  $UpdateManager->Uninstall();
+  $Output .= ControlPanel();
 } else
 {
-        $Output .= ControlPanel();      
+  $Output .= ControlPanel();    
+}
+} else 
+{
+  if(array_key_exists('configure', $_POST))
+  {
+        $Config = array();
+        $ConfigText = CreateConfig($Config);
+        file_put_contents('../includes/config.php', $ConfigText);
+        $Output .= 'Konfigurace nastavena';
+  } else $Output .= PrepareConfig();
 }
 $Output .= '</body></html>';

trunk/includes/Update.php

@@ -1 +1 @@
 <?php
-
-include_once('global.php');
 
 class UpdateManager

trunk/includes/global.php

@@ -8 +8 @@
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/error.php');
+if(file_exists(dirname(__FILE__).'/config.php')) 
+  include_once(dirname(__FILE__).'/config.php');
+include_once(dirname(__FILE__).'/Version.php');
 
 GlobalInit();
@@ -13 +16 @@
 function GlobalInit()
 {
-        global $System, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,
-          $UpdateManager, $Config;
+  global $System, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,
+        $UpdateManager, $Config;
 
   $ScriptStartTime = GetMicrotime();
@@ -20 +23 @@
   if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-  if(file_exists(dirname(__FILE__).'/config.php')) include_once(dirname(__FILE__).'/config.php');
-    else die('Nenalezen konfigurační soubor config.php ve složce includes. '.
-          'Vytvořte jej zkopírováním vzoru config.sample.php.');
+  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']);
-  
-  $Revision = 510; // Subversion revision
-  $ReleaseTime = '2013-02-15';  
   
   $System = new System();
@@ -35 +33 @@
   $UpdateManager->Database = $System->Database;
   $UpdateManager->Revision = $Revision;
-  if(isset($StopAfterUpdateManager)) return;
   if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze.');
   if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');

trunk/index.php

@@ -81 +81 @@
   }
 
-  // Echo text even if it is hidden because of caching of external searching engines
+  // Echo text even if it is hidden because of caching by external searching engines
   return('<div style="'.$HideWelcome.'">'.
   '<div id="bannertitle">'.$Config['Web']['Title'].'</div>'.