Changeset 497 for trunk/services/password.php

Timestamp:

Sep 15, 2014 9:44:27 PM (10 years ago)

Author:

anonymous

Message:

Beginning the process of adapting codebase to foundation styles.

File:

• trunk/services/password.php (modified) (6 diffs)

trunk/services/password.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -25 +25 @@
  */
 
-// require_once dirname(__FILE__) . '/_config.inc.php';
+// Redefine include_path including the codebase/services but allow local templates override global ones.
+ini_set('include_path', join(PATH_SEPARATOR, array(
+    get_include_path(),
+    dirname(__FILE__) . '/templates'
+)));
 
 $auth->requireLogin();
 
 require_once 'codebase/lib/FormValidator.inc.php';
+require_once 'codebase/lib/HTML.inc.php';
 
 /******************************************************************************
@@ -36 +41 @@
 
 // Titles and navigation header.
-$nav->add(_("Change password"));
+$nav->add(sprintf(_("Change password for <em>%s</em>"), $auth->get('username')));
 
 // The object to validate form input from the user.
@@ -58 +63 @@
 
     // Validate the posted data.
-//  $fv->isEmpty('oldpassword', _("You did not specify the <strong>old password</strong>."));
-    $fv->checkRegex('oldpassword', '/^[[:alnum:][:punct:]]{0,128}$/i', true, _("The <strong>Old password</strong> specified is not valid."));
-    if (!$fv->isEmpty('newpassword', _("You did not specify the <strong>New password</strong>."))) {
-        $fv->checkRegex('newpassword', '/^[[:alnum:][:punct:]]{6,128}$/i', true, _("The <strong>New password</strong> specified is not valid. A password must be 6 or more characters."));
-        if ($frm['newpassword'] != $frm['newpassword2'] && !$fv->isEmpty('newpassword2', _("You need to type the <strong>New password</strong> twice."))) {
-            $fv->addError('newpassword', _("The <strong>New passwords</strong> do not match."));
-            $fv->addError('newpassword2');
+    if ($fv->notEmpty('oldpassword', _("You did not specify the <strong>old password</strong>."))) {
+        $fv->checkRegex('oldpassword', '/^\S{0,128}$/i', true, _("The <strong>old password</strong> specified is not valid."));
+    }
+    if ($fv->notEmpty('newpassword', _("You did not specify the <strong>new password</strong>."))) {
+        if ($fv->checkRegex('newpassword', '/^\S{8,128}$/i', true, _("The <strong>new password</strong> specified is not valid. A password must be eight or more characters."))) {
+            if ($fv->notEmpty('newpassword2', _("You need to type the <strong>new password</strong> twice.")) && $frm['newpassword'] != $frm['newpassword2']) {
+                $fv->addError('newpassword', _("The <strong>new passwords</strong> do not match."));
+                $fv->addError('newpassword2');
+            }
         }
     }
 
     if (!$fv->anyErrors() && false === $auth->authenticate($auth->get('username'), $frm['oldpassword'])) {
-        $fv->addError('oldpassword', _("Your <strong>Old password</strong> failed authentication."));
+        $fv->addError('oldpassword', _("Your <strong>old password</strong> failed authentication."));
         $app->logMsg(sprintf('Password change failed for %s, using (md5ed) password: %s', $auth->get('username'), md5($frm['oldpassword'])), LOG_NOTICE, __FILE__, __LINE__);
     }
@@ -84 +91 @@
 // Templates.
 include 'header.ihtml';
-include 'codebase/services/templates/password.ihtml';
+include 'password.ihtml';
 include 'footer.ihtml';