From d6889066c0d285bf59e89b484800443304585b68 Mon Sep 17 00:00:00 2001
From: mensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Fri, 5 Dec 2008 07:25:04 +0000
Subject: Major Refactoring: finish transforming  into object . Put  and  into
 header.inc.php.

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@199 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 tag2tagadd.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'tag2tagadd.php')

diff --git a/tag2tagadd.php b/tag2tagadd.php
index 07ce3a9..15ee6af 100644
--- a/tag2tagadd.php
+++ b/tag2tagadd.php
@@ -23,8 +23,6 @@ require_once('header.inc.php');
 
 /* Service creation: only useful services are created */
 $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', '');
@@ -33,8 +31,6 @@ isset($_POST['tag1']) ? define('POST_TAG1', $_POST['tag1']): define('POST_TAG1',
 isset($_POST['linkType']) ? define('POST_LINKTYPE', $_POST['linkType']): define('POST_LINKTYPE', '');
 isset($_POST['tag2']) ? define('POST_TAG2', $_POST['tag2']): define('POST_TAG2', '');
 
-/* Managing current logged user */
-$currentObjectUser = $userservice->getCurrentObjectUser();
 
 //permissions
 if(!$userservice->isLoggedOn()) {
@@ -50,19 +46,19 @@ if (POST_CONFIRM != '') {
     $tag1 = POST_TAG1;
     $linkType = POST_LINKTYPE;
     $tag2 = POST_TAG2;
-    if ($tag2tagservice->addLinkedTags($tag1, $tag2, $linkType, $currentObjectUser->getId())) {
+    if ($tag2tagservice->addLinkedTags($tag1, $tag2, $linkType, $currentUser->getId())) {
         $tplVars['msg'] = T_('Tag link created');
-        header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername()));
+        header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
     } else {
         $tplVars['error'] = T_('Failed to create the link');
         $templateservice->loadTemplate('error.500.tpl', $tplVars);
         exit();
     }
 } elseif (POST_CANCEL) {
-    header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername() .'/'. $tags));
+    header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
 }
 
-$tplVars['links']	= $tag2tagservice->getLinks($currentObjectUser->getId());
+$tplVars['links']	= $tag2tagservice->getLinks($currentUser->getId());
 
 $tplVars['tag1']		= $tag1;
 $tplVars['tag2']		= '';
-- 
cgit v1.2.3