Changeset 512

Timestamp:

Feb 16, 2013, 7:10:55 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Vylepšena úprava základního nastavení systému.

Location:

trunk

Files:

• admin/DefaultConfig.php (added)
• admin/install.php (modified) (8 diffs)
• includes/Version.php (modified) (1 diff)
• includes/config.sample.php (deleted)
• includes/global.php (modified) (2 diffs)

trunk/admin/install.php

@@ -7 +7 @@
   include_once(dirname(__FILE__).'/../includes/config.php');
 include_once(dirname(__FILE__).'/UpdateTrace.php');
+include_once(dirname(__FILE__).'/DefaultConfig.php');
 include_once(dirname(__FILE__).'/../includes/Version.php');
 
@@ -27 +28 @@
     $Output .= '<input type="submit" name="uninstall" value="Odinstalovat"/>';
   } else $Output .= '<input type="submit" name="install" value="Instalovat"/>';
+  $Output .= '<input type="submit" name="configure" value="Nastavit"/>';
   $Output .= '</form>';
   return($Output);
 }
 
-function PrepareConfig()
+function PrepareConfig($Config)
 {
-  $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>';
+  $Output = '<h3>Nastavení systému</h3>'.
+    '<form action="" method="post">'.
+    '<table>'.  
+    '<tr><td>Adresa serveru:</td><td> <input type="text" name="Host" value="'.$Config['Database']['Host'].'"/></td></tr>'.
+    '<tr><td>Přihlašovací jméno:</td><td> <input type="text" name="User" value="'.$Config['Database']['User'].'"/></td></tr>'.
+    '<tr><td>Heslo:</td><td> <input type="password" name="Password"/></td></tr>'.
+    '<tr><td>Schéma:</td><td> <input type="text" name="Schema" value="'.$Config['Database']['Database'].'"/></td></tr>'.
+    '<tr><td>Relativní URL cesta:</td><td> <input type="text" name="BaseURL" value="'.$Config['Web']['BaseURL'].'"/></td></tr>'.
+    '<tr><td>Titulek webu:</td><td> <input type="text" name="Title" value="'.$Config['Web']['Title'].'"/></td></tr>'.
+    '<tr><td>Email správce:</td><td> <input type="text" name="AdminEmail" value="'.$Config['Web']['AdminEmail'].'"/></td></tr>'.
+    '<tr><td>Počet položek navigace stránkování:</td><td> <input type="text" name="VisiblePagingItems" value="'.$Config['Web']['VisiblePagingItems'].'"/></td></tr>'.
+    '<tr><td>Počet řádků tabulek na stránku:</td><td> <input type="text" name="ItemsPerPage" value="'.$Config['Web']['ItemsPerPage'].'"/></td></tr>'.
+    
+    '<tr><td colspan="2"><input type="submit" name="configure_save" value="Nastavit"/></td></tr>'.
+    '</table>'.  
+    '</form>';
   return($Output);
+}
+
+function ConfigSave($DefaultConfig)
+{
+  $Config = $DefaultConfig;
+  if(array_key_exists('Host', $_POST)) $Config['Database']['Host'] = $_POST['Host'];
+  if(array_key_exists('User', $_POST)) $Config['Database']['User'] = $_POST['User'];
+  if(array_key_exists('Password', $_POST) and ($_POST['Password'] != '')) $Config['Database']['Password'] = $_POST['Password'];
+  if(array_key_exists('Schema', $_POST)) $Config['Database']['Database'] = $_POST['Schema'];
+  if(array_key_exists('Title', $_POST)) $Config['Web']['Title'] = $_POST['Title'];
+  if(array_key_exists('BaseURL', $_POST)) $Config['Web']['BaseURL'] = $_POST['BaseURL'];
+  if(array_key_exists('AdminEmail', $_POST)) $Config['Web']['AdminEmail'] = $_POST['AdminEmail'];
+  if(array_key_exists('VisiblePagingItems', $_POST)) $Config['Web']['VisiblePagingItems'] = $_POST['VisiblePagingItems'];
+  if(array_key_exists('ItemsPerPage', $_POST)) $Config['Web']['ItemsPerPage'] = $_POST['ItemsPerPage'];
+  $ConfigText = CreateConfig($Config);
+  file_put_contents('../includes/config.php', $ConfigText);
+  $Output .= 'Konfigurace nastavena';
+  return($Output);      
 }
 
@@ -54 +80 @@
   \$Config = array(
   'Database' => array(
-    'Host' => 'localhost',
-    'User' => 'root',
-    'Password' => '',
-    'Database' => 'wowpreklad',
+    'Host' => '".$Config['Database']['Host']."',
+    'User' => '".$Config['Database']['User']."',
+    'Password' => '".$Config['Database']['Password']."',
+    'Database' => '".$Config['Database']['Database']."',
     'DatabaseAoWoW' => 'wowpreklad_mangos',
     'Prefix' => '',
@@ -65 +91 @@
   'Style' => 'maron',
   'Web' => array(
-    'Title' => 'Projekt překládání textů hry WoW',
+    'Title' => '".$Config['Web']['Title']."',
     'Charset' => 'utf-8',
     'Host' => 'localhost',
-    'BaseURL' => '',
-    'AdminEmail' => 'admin@localhost',
+    'BaseURL' => '".$Config['Web']['BaseURL']."',
+    'AdminEmail' => '".$Config['Web']['AdminEmail']."',
     'Authors' => 'autor',
     'ShowSQLQuery' => false,
@@ -76 +102 @@
     'ShowRuntimeInfo' => \$IsDeveloper,
     'FormatOutput' => \$IsDeveloper,
-        'ItemsPerPage' => 40,
+        'ItemsPerPage' => ".$Config['Web']['ItemsPerPage'].",
     'TempFolder' => '../tmp/',
     'GameVersion' => '3.3.5a',
-    'VisiblePagingItems' => 20,
+    'VisiblePagingItems' => ".$Config['Web']['VisiblePagingItems'].",
     'WebCounter' => '',
     'Timezone' => 'Europe/Prague',
@@ -105 +131 @@
   $UpdateManager = new UpdateManager();
   $UpdateManager->Database = $System->Database;
-  $UpdateManager->Revision = $Revision;
+  $UpdateManager->Revision = $DatabaseRevision;
   $UpdateManager->Trace = $Updates;
   $UpdateManager->InstallMethod = 'FullInstall';
@@ -127 +153 @@
   $Output .= ControlPanel();
 } else
+if(array_key_exists('configure_save', $_POST))
+{
+  $Output .= ConfigSave($Config);
+  $Output .= ControlPanel();    
+} else 
+if(array_key_exists('configure', $_POST))
+{
+  $Output .= PrepareConfig($Config);
+} else
 {
   $Output .= ControlPanel();    
@@ -132 +167 @@
 } else 
 {
-  if(array_key_exists('configure', $_POST))
+  if(array_key_exists('configure_save', $_POST))
   {
-        $Config = array();
-        $ConfigText = CreateConfig($Config);
-        file_put_contents('../includes/config.php', $ConfigText);
-        $Output .= 'Konfigurace nastavena';
-  } else $Output .= PrepareConfig();
+    $Output .= PrepareConfig($Config);
+    $Output .= ControlPanel();  
+  } else {
+        $Output .= PrepareConfig($DefaultConfig);
+  }
 }
 $Output .= '</body></html>';

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 510; // Subversion revision
-$ReleaseTime = '2013-02-15';
-
+$Revision = 512; // Subversion revision
+$DatabaseRevision = 510; 
+$ReleaseTime = '2013-02-16';
 
 ?>

trunk/includes/global.php

@@ -17 +17 @@
 {
   global $System, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,
-        $UpdateManager, $Config;
+        $UpdateManager, $Config, $DatabaseRevision;
 
   $ScriptStartTime = GetMicrotime();
@@ -32 +32 @@
   $UpdateManager = new UpdateManager();
   $UpdateManager->Database = $System->Database;
-  $UpdateManager->Revision = $Revision;
+  $UpdateManager->Revision = $DatabaseRevision;
   if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze.');
   if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');