Major refactoring: transform user into object, define parameters used into each file, ...

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@173 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 54 insertions, 44 deletions

diff --git a/password.php b/password.php
index 1763fd2..e3a8721 100644
--- a/password.php
+++ b/password.php
@@ -1,68 +1,78 @@
 <?
 /***************************************************************************
-Copyright (C) 2005 Scuttle project
-https://sourceforge.net/projects/scuttle/
+ Copyright (C) 2005 Scuttle project
+ https://sourceforge.net/projects/scuttle/
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 
-This program 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.
+ This program 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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-***************************************************************************/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ***************************************************************************/
 
 require_once('header.inc.php');
+
+/* Service creation: only useful services are created */
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
+
+/* Managing all possible inputs */
+isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
+isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
+isset($_POST['email']) ? define('POST_EMAIL', $_POST['email']): define('POST_EMAIL', '');
+
+
 $tplVars = array();
 
 // IF SUBMITTED
-if (isset($_POST['submitted'])) {
+if (POST_SUBMITTED != '') {
 
-    // NO USERNAME
-    if (!$_POST['username']) {
-        $tplVars['error'] = T_('You must enter your username.');
+	// NO USERNAME
+	if (!POST_USERNAME) {
+		$tplVars['error'] = T_('You must enter your username.');
 
-    // NO E-MAIL
-    } elseif (!$_POST['email']) {
-        $tplVars['error'] = T_('You must enter your <abbr title="electronic mail">e-mail</abbr> address.');
+		// NO E-MAIL
+	} elseif (!POST_EMAIL) {
+		$tplVars['error'] = T_('You must enter your <abbr title="electronic mail">e-mail</abbr> address.');
 
-    // USERNAME AND E-MAIL
-    } else {
+		// USERNAME AND E-MAIL
+	} else {
 
-        // NO MATCH
-        if (!($userinfo = $userservice->getUserByUsername($_POST['username']))) {
-            $tplVars['error'] = T_('No matches found for that username.');
+		// NO MATCH
+		$userinfo = $userservice->getObjectUserByUsername(POST_USERNAME);
+		if ($userinfo == '') {
+			$tplVars['error'] = T_('No matches found for that username.');
 
-        } elseif ($_POST['email'] != $userinfo['email']) {
-            $tplVars['error'] = T_('No matches found for that combination of username and <abbr title="electronic mail">e-mail</abbr> address.');
+		} elseif (POST_EMAIL != $userinfo->getEmail()) {
+			$tplVars['error'] = T_('No matches found for that combination of username and <abbr title="electronic mail">e-mail</abbr> address.');
 
-        // MATCH
-        } else {
+			// MATCH
+		} else {
 
-            // GENERATE AND STORE PASSWORD
-            $password = $userservice->generatePassword($userinfo['uId']);
-            if (!($password = $userservice->generatePassword($userinfo['uId']))) {
-                $tplVars['error'] = T_('There was an error while generating your new password. Please try again.');    
+			// GENERATE AND STORE PASSWORD
+			$password = $userservice->generatePassword($userinfo->getId());
+			if (!($password = $userservice->generatePassword($userinfo->getId()))) {
+				$tplVars['error'] = T_('There was an error while generating your new password. Please try again.');
 
-            } else {
-                // SEND E-MAIL
-                $message = T_('Your new password is:') ."\n". $password ."\n\n". T_('To keep your bookmarks secure, you should change this password in your profile the next time you log in.');
-                $message = wordwrap($message, 70);
-                $headers = 'From: '. $adminemail;
-                $mail = mail($_POST['email'], sprintf(T_('%s Account Information'), $sitename), $message);
+			} else {
+				// SEND E-MAIL
+				$message = T_('Your new password is:') ."\n". $password ."\n\n". T_('To keep your bookmarks secure, you should change this password in your profile the next time you log in.');
+				$message = wordwrap($message, 70);
+				$headers = 'From: '. $adminemail;
+				$mail = mail(POST_EMAIL, sprintf(T_('%s Account Information'), $sitename), $message);
 
-                $tplVars['msg'] = sprintf(T_('New password generated and sent to %s'), $_POST['email']);
-            }
-        }
-    }
+				$tplVars['msg'] = sprintf(T_('New password generated and sent to %s'), POST_EMAIL);
+			}
+		}
+	}
 }
 
 $templatename = 'password.tpl';