Changeset 1629

Timestamp:

01/09/2007 03:37:23 AM (2 years ago)

Author:

driehle

Message:

implemented password confirmation (closes #9)

Location:

trunk

Files:

• lang/lang-admin.inc.php (modified) (2 diffs)
• scripts/settings.class.php (modified) (4 diffs)

trunk/lang/lang-admin.inc.php

@@ -150 +150 @@
 "m_publisher"              => "Name des Verfassers der Einträge",
 "m_admin_password"         => "Administrationscenter Passwort",
+"m_admin_password_again"   => "Passwort bestätigen",
 "m_admin_password_admin"   => "(leer lassen falls unverändert)",
 "m_email"                  => "E-Mail des Betreibers des Weblogs",
@@ -181 +182 @@
 "e_publisher"              => "Bitte Namen des Betreibers eingeben",
 "e_admin_password"         => "Bitte Administrationscenter Passwort eingeben",
+"e_admin_password_again"   => "Bitte Administrationscenter Passwort bestätigen",
 "e_email"                  => "E-Mail Adresse des Betreibers scheint falsch zu sein",
 "e_description"            => "Bitte eine Beschreibung des Weblogs eingeben",

trunk/scripts/settings.class.php

@@ -57 +57 @@
         $this->d['jlog_basepath'] = JLOG_BASEPATH;
         if($this->d['jlog_admin_password'] == '') $this->jlog_admin_password = JLOG_ADMIN_PASSWORD;
-        else $this->d['jlog_admin_password'] = md5( $this->d['jlog_admin_password'] );
-      }
-      else $this->d['jlog_admin_password'] = md5( $this->d['jlog_admin_password'] );
+        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']);
+        }
+      }
+      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']);
+      }
     }
     
@@ -123 +129 @@
        <p><label for='admin_password'>".$this->l['admin']['m_admin_password'].$admincenter_password."</label><br />
           <input class='userdata' id='admin_password' name='jlog_admin_password' type='password' size='20' maxlength='255' /></p>
+       <p><label for='admin_password_again'>".$this->l['admin']['m_admin_password_again'].$admincenter_password."</label><br />
+          <input class='userdata' id='admin_password_again' name='jlog_admin_password_again' type='password' size='20' maxlength='255' /></p>
        <p><label for='email'>".$this->l['admin']['m_email']."</label><br />
           <input class='userdata' id='email' name='jlog_email' type='text' size='20' maxlength='255' value='".$this->get_value($data, 'jlog_email')."' /></p>
@@ -185 +193 @@
 
      $errors = array();
-
+     
        // paths
        if(empty($this->d['jlog_path']) OR (check_url($this->d['jlog_path'], array ('http')) === false)) $errors[] = $this->l['admin']['e_path'];
@@ -193 +201 @@
        if(empty($this->d['jlog_website'])) $errors[] = $this->l['admin']['e_website'];
        if(empty($this->d['jlog_publisher'])) $errors[] = $this->l['admin']['e_publisher'];
-       if(defined('JLOG_SETUP') AND JLOG_SETUP AND $this->d['jlog_admin_password'] == md5("")) $errors[] = $this->l['admin']['e_admin_password'];
+       if(defined('JLOG_SETUP') AND JLOG_SETUP) {
+         if($this->d['jlog_admin_password'] == md5("")) 
+           $errors[] = $this->l['admin']['e_admin_password'];
+         elseif($this->d['jlog_admin_password'] !== $this->d['jlog_admin_password_again']) 
+           $errors[] = $this->l['admin']['e_admin_password_again'];
+       }
+       elseif(!empty($this->d['jlog_admin_password']) AND $this->d['jlog_admin_password'] !== $this->d['jlog_admin_password_again']) {
+         $errors[] = $this->l['admin']['e_admin_password_again'];
+       }
        if(empty($this->d['jlog_email']) OR !strpos($this->d['jlog_email'], '@')) $errors[] = $this->l['admin']['e_email'];
        if(empty($this->d['jlog_description'])) $errors[] = $this->l['admin']['e_description'];