Changeset 1667

Timestamp:

08/21/2007 11:27:35 PM (17 months ago)

Author:

driehle

Message:

first step to solution of #137

Location:

trunk

Files:

• admin/update.php (modified) (1 diff)
• scripts/settings.class.php (modified) (6 diffs)
• scripts/update.php (modified) (1 diff)
• scripts/version.inc.php (added)
• setup.php (modified) (5 diffs)

trunk/admin/update.php

@@ -2 +2 @@
 ### update.php  Jlog 1.0.2 => Jlog 1.1.0
 
- define("JLOG_ADMIN", true);
- define("JLOG_UPDATE", true);
- require('..'.DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php');
-
- $c['meta']['title'] = "Update";
- $c['main'] = "<h2>Update von <var>1.0.2</var> auf <var>1.1.0</var></h2>";
-
-        require(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."update.php");
-        
- $c['main'] .= "<p>Update erfolgreich, <a href='../'>Viel Spaß</a>!</p>";
-
+  define("JLOG_ADMIN", true);
+  define("JLOG_UPDATE", true);
+  
+  // read prefered language from browser
+  $dir = opendir('..'.DIRECTORY_SEPARATOR.'lang');
+  $languages = array();
+  while(($file = readdir($dir)) !== false) {
+    if($file == '.' OR $file == '..') continue;
+    if(!preg_match('/lang\.([a-zA-z0-9]+)\.inc\.php/', $file, $matches)) continue;
+    $languages[] = $matches[1];
+  }
+  // define language if not already done
+  if(!defined('JLOG_LANGUAGE')) {
+    define('JLOG_LANGUAGE', 'de');
+  }
+  error_reporting(E_ALL);
+  
+  require('..'.DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php');
+  require('..'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'version.inc.php');
+  
+ 
+  $c['meta']['title'] = "Update";
+  $c['main'] = "<h2>Update von <var>1.0.2</var> auf <var>1.1.0</var></h2>";
+ 
+  if(!isset($_POST['update'])) {
+    $c['main'] .= "<form action='".$_SERVER['PHP_SELF']."' method='post'>
+       <p><label for='language'>Bitte wÀhlen Sie die gewÌnschte Sprache fÌr Ihren Weblog:</label><br />
+          <select class='userdata' id='language' name='jlog_language'>"; 
+    foreach($languages as $lang) {
+      $c['main'] .= "<option";
+      if($lang == JLOG_LANGUAGE) $c['main'] .= " selected='selected'";
+      $c['main'] .= ">$lang</option>";
+    }
+    $c['main'] .= "</select>
+       </p>
+       <p>Möchten Sie Ihre alten Sprachdateien behalten, oder diese durch neue ersetzen lassen?
+          Solange Sie an den alten Sprachdateien keine VerÀnderungen vorgenommen haben empfehlen wir dringenst, die neuen 
+          Sprachdateien zu installieren.<br />
+          <label><input type='radio' name='languagekeep' value='yes' /> Ja, alte Dateien behalten.</label>
+          <label><input type='radio' name='languagekeep' value='no' /> Nein, neue Dateien installieren.</label></p>
+       <p><input type='submit' name='update' value='Update starten' /></p>
+       </form>";
+  }
+  else {
+    require(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."settings.class.php");
+    
+    $update = new Settings($l);
+    $update->get_data();
+    $update->get_userdata();
+    $errors = $update->do_settings();
+    
+    if($_POST['languagekeep'] == 'yes') {
+      rename(JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang.inc.php", JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang.OldLanguage.inc.php");
+      rename(JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang-admin.inc.php", JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang-admin.OldLanguage.inc.php");
+    }
+    else {
+      unlink(JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang.inc.php");
+      unlink(JLOG_BASEPATH."lang".DIRECTORY_SEPARATOR."lang-admin.inc.php");
+    }
+    
+    if(empty($errors)) {
+      require(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."update.php");
+      $c['main'] .= "<p>Update erfolgreich, <a href='../'>Viel Spaß</a>!</p>";
+    }
+    else {
+      $c['main'] .= '<p>Fehler beim Update:</p><ul>';
+      foreach($errors as $error) {
+        $c['main'] .= '<li>'.htmlspecialchars($error).'</li>';
+      }
+      $c['main'] .= '</ul>';
+    }
+  }
 
 require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');

trunk/scripts/settings.class.php

@@ -5 +5 @@
 
 class Settings {
-
+    
+    var $d = array();
+    
     function Settings($l) {
      # no return
@@ -29 +31 @@
                         'JLOG_VERSION',
                         'JLOG_LOGIN',
-                        'JLOG_LANGUAGE'
+                        'JLOG_SOFTWARE_VERSION',
+                        'JLOG_SOFTWARE_URL',
+                        'JLOG_SOFTWARE_PHPV',
+                        'JLOG_SOFTWARE_MYSQLV'
                      );
     
@@ -46 +51 @@
     
      // get the data from users $d array and put it into the class
-     $this->d = $d;
+      if($d !== false) {
+        if($exclusiv) $this->d = $d;
+        else $this->d = array_merge($this->d, $d);
+      }
    
       if(JLOG_ADMIN === true) {
@@ -62 +70 @@
           $this->d['jlog_admin_password_again'] = md5($this->d['jlog_admin_password_again']);
         }
+        $this->d['jlog_installed_version'] = JLOG_INSTALLED_VERSION;
+        $this->d['jlog_installed_url'] = JLOG_INSTALLED_URL;
+        $this->d['jlog_installed_phpv'] = JLOG_INSTALLED_PHPV;
+        $this->d['jlog_installed_mysqlv'] = JLOG_INSTALLED_MYSQLV;
       }
       else {
         $this->d['jlog_admin_password'] = md5($this->d['jlog_admin_password']);
         $this->d['jlog_admin_password_again'] = md5($this->d['jlog_admin_password_again']);
+      }
+      
+      if((defined('JLOG_SETUP') AND JLOG_SETUP === true) OR (defined('JLOG_UPDATE') AND JLOG_UPDATE === true)) {
+        $this->d['jlog_installed_version'] = JLOG_SOFTWARE_VERSION;
+        $this->d['jlog_installed_url'] = JLOG_SOFTWARE_URL;
+        $this->d['jlog_installed_phpv'] = JLOG_SOFTWARE_PHPV;
+        $this->d['jlog_installed_mysqlv'] = JLOG_SOFTWARE_MYSQLV;
       }
     }
@@ -133 +152 @@
      <form action='".$_SERVER['PHP_SELF']."' method='post'>
       <fieldset><legend>".$this->l['admin']['m_metadata']."</legend>
-       <p><label for='website'>".$this->l['admin']['m_language']."</label><br />
+       <p><label for='language'>".$this->l['admin']['m_language']."</label><br />
           <select class='userdata' id='language' name='jlog_language'>";
      foreach($languages as $lang) {
       $form .= "<option";
-      if($lang == JLOG_LANGUAGE) $form .= " selected='selected'";
+      if((isset($_POST['jlog_language']) AND $lang = $_POST['jlog_language']) OR $lang == JLOG_LANGUAGE)
+        $form .= " selected='selected'";
       $form .= ">$lang</option>";
      }
@@ -180 +200 @@
      ";
 
-     if(JLOG_SETUP === true) {
+     if(defined('JLOG_SETUP') AND JLOG_SETUP === true) {
      $form .=
      "

trunk/scripts/update.php

@@ -25 +25 @@
      }
 if(defined('JLOG_ADMIN') AND !defined('JLOG_COMMENTS')) {
-    $data['rss'] = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+    $data['rss'] = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?" . ">
     <rss version=\"2.0\">
        <channel>

trunk/setup.php

@@ -11 +11 @@
  define("JLOG_NEW_VERSION", '1.1.0');
  define("JLOG_SETUP", true);
- define("JLOG_PHPV", "4.1.1");
- define("JLOG_MYSQLV", "4.1.0");
+ define("JLOG_ADMIN", true);
  $basepath = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
 
@@ -18 +17 @@
  define("JLOG_WEBSITE", $_SERVER["HTTP_HOST"]);
  define("JLOG_PATH", dirname("http://".$_SERVER["HTTP_HOST"].$_SERVER["PHP_SELF"]));
-  
+
+ // read prefered language from browser
  $dir = opendir('.'.DIRECTORY_SEPARATOR.'lang');
  $languages = array();
@@ -29 +29 @@
  define('JLOG_LANGUAGE', $lang);
  
+ // load required scripts and libraries
  require('.'.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.'lang.'.$lang.'.inc.php');
  require('.'.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.'lang-admin.'.$lang.'.inc.php');
@@ -35 +36 @@
  require('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'settings.class.php');
  require('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'url_syntax.php');
+ require('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'version.inc.php');
+ 
+ define("JLOG_NEW_VERSION", JLOG_SOFTWARE_VERSION);
+ define("JLOG_PHPV", JLOG_SOFTWARE_PHPV);
+ define("JLOG_MYSQLV", JLOG_SOFTWARE_MYSQLV);
+ 
  $errors = array();
  
@@ -57 +64 @@
        $c .= "<li>".$l['admin']['s_personal_ok']."</li>\n";
 
-       // build settings.php
+       // build settings.inc.php
        if(count($errors = $setup->do_settings()) == 0) $c .= "<li>".$l['admin']['master_ok']."</li>\n";
       }