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, 57 insertions, 45 deletions

diff --git a/tagrename.php b/tagrename.php
index 29b44fb..3dde296 100644
--- a/tagrename.php
+++ b/tagrename.php
@@ -1,68 +1,80 @@
 <?php
 /***************************************************************************
-Copyright (C) 2006 - 2007 Scuttle project
-http://sourceforge.net/projects/scuttle/
-http://scuttle.org/
+ Copyright (C) 2006 - 2007 Scuttle project
+ http://sourceforge.net/projects/scuttle/
+ http://scuttle.org/
 
-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 */
 $b2tservice       = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
 $tagservice   = & ServiceFactory :: getServiceInstance('TagService');
 $tag2tagservice   = & ServiceFactory :: getServiceInstance('Tag2tagService');
 $templateservice  = & ServiceFactory :: getServiceInstance('TemplateService');
 $userservice      = & ServiceFactory :: getServiceInstance('UserService');
 
+/* Managing all possible inputs */
+isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
+isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
+isset($_POST['old']) ? define('POST_OLD', $_POST['old']): define('POST_OLD', '');
+isset($_POST['new']) ? define('POST_NEW', $_POST['new']): define('POST_NEW', '');
+
+/* Managing current logged user */
+$currentUser = $userservice->getCurrentObjectUser();
+
+/* Managing path info */
 list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
 //$tag        = isset($_GET['query']) ? $_GET['query'] : NULL;
 $template   = 'tagrename.tpl';
 
-if ($_POST['confirm']) {
-   if (isset($_POST['old']) && trim($_POST['old']) != '')
-       $old = trim($_REQUEST['old']);
-   else
-       $old = NULL;
+if (POST_CONFIRM) {
+	if (trim(POST_OLD) != '') {
+		$old = trim(POST_OLD);
+	} else {
+		$old = NULL;
+	}
 
-   if (isset($_POST['new']) && trim($_POST['new']) != '')
-       $new = trim($_POST['new']);
-   else
-       $new = NULL;
+	if (trim(POST_NEW) != '') {
+		$new = trim(POST_NEW);
+	} else {
+		$new = NULL;
+	}
 
-   if (
-      !is_null($old) &&
-      !is_null($new) &&
-      $tagservice->renameTag($userservice->getCurrentUserId(), $old, $new) &&
-      $b2tservice->renameTag($userservice->getCurrentUserId(), $old, $new) &&
-      $tag2tagservice->renameTag($userservice->getCurrentUserId(), $old, $new)
-   ) {
-      $tplVars['msg'] = T_('Tag renamed');
-      $logged_on_user = $userservice->getCurrentUser();
-      header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')]));
-   } else {
-      $tplVars['error'] = T_('Failed to rename the tag');
-      $template         = 'error.500.tpl';
-   }
-} elseif ($_POST['cancel']) {
-    $logged_on_user = $userservice->getCurrentUser();
-    header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags));
+	if (
+	!is_null($old) &&
+	!is_null($new) &&
+	$tagservice->renameTag($currentUser->getId(), $old, $new) &&
+	$b2tservice->renameTag($currentUser->getId(), $old, $new) &&
+	$tag2tagservice->renameTag($currentUser->getId(), $old, $new)
+	) {
+		$tplVars['msg'] = T_('Tag renamed');
+		header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
+	} else {
+		$tplVars['error'] = T_('Failed to rename the tag');
+		$template         = 'error.500.tpl';
+	}
+} elseif (POST_CANCEL) {
+	header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
 } else {
-   $tplVars['subtitle']    = T_('Rename Tag') .': '. $tag;
-   $tplVars['formaction']  = $_SERVER['SCRIPT_NAME'] .'/'. $tag;
-   $tplVars['referrer']    = $_SERVER['HTTP_REFERER'];
-   $tplVars['old']         = $tag;
+	$tplVars['subtitle']    = T_('Rename Tag') .': '. $tag;
+	$tplVars['formaction']  = $_SERVER['SCRIPT_NAME'] .'/'. $tag;
+	$tplVars['referrer']    = $_SERVER['HTTP_REFERER'];
+	$tplVars['old']         = $tag;
 }
 $templateservice->loadTemplate($template, $tplVars);
 ?>