From a81ad1655fd7043c1734109c87b04d98badd5bc8 Mon Sep 17 00:00:00 2001
From: mensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Mon, 16 Feb 2009 10:38:11 +0000
Subject: [PATCH] Interface fix: remove admin colors on watchlist page.

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@279 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 bookmarks.php               | 2 +-
 constants.inc.php           | 1 +
 templates/bookmarks.tpl.php | 2 +-
 watchlist.php               | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookmarks.php b/bookmarks.php
index 43c2275..6f2463e 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -185,7 +185,7 @@ if ($templatename == 'editbookmark.tpl') {
 			);
 			$tplVars['tags'] = POST_TAGS;
 		} else {			
-			$tplVars['row'] = $bookmarkservice->getBookmark($_GET['copyOf'], true);
+			$tplVars['row'] = $bookmarkservice->getBookmark(GET_COPYOF, true);
 			if(!$currentUser->isAdmin()) {
 				$tplVars['row']['bPrivateNote'] = ''; //only admin can copy private note
 			}		
diff --git a/constants.inc.php b/constants.inc.php
index 8078141..681a141 100644
--- a/constants.inc.php
+++ b/constants.inc.php
@@ -39,6 +39,7 @@ define('CRITICAL_ERROR', 204);
 // Page name
 define('PAGE_INDEX', "index");
 define('PAGE_BOOKMARKS', "bookmarks");
+define('PAGE_WATCHLIST', "watchlist");
 
 
 // Miscellanous
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 1bc6f61..777e7ca 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -21,7 +21,7 @@ include('search.inc.php');
 <?php endif?>
 
 
-<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?>
+<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?>
 <div style="width:70%;text-align:center;">
 <img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/>
 </div>
diff --git a/watchlist.php b/watchlist.php
index a64315f..cd3a000 100644
--- a/watchlist.php
+++ b/watchlist.php
@@ -108,6 +108,7 @@ if ($user) {
     $tplVars['pagetitle'] = $title;
     $tplVars['subtitle'] = $title;
     $tplVars['range'] = 'watchlist';
+    $tplVars['pageName'] = PAGE_WATCHLIST;
 
     $tplVars['rsschannels'] = array(
         array(filter($sitename .': '. $title), createURL('rss', 'watchlist/'. filter($user, 'url')))