12 files changed, 69 insertions, 15 deletions
diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index 2b673b7..1768928 100644
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -1,9 +1,9 @@
 <?php
 
 /* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
-$cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$cdservice =SemanticScuttle_Service_Factory::getServiceInstance('CommonDescription');
 
 
 $pageName = isset($pageName)?$pageName:"";
@@ -13,7 +13,7 @@ $currenttag = isset($currenttag)?$currenttag:"";
 
 $this->includeTemplate($GLOBALS['top_include']);
 
-include('search.inc.php');
+include('search.menu.php');
 ?>
 
 <?php if($pageName == PAGE_INDEX && $GLOBALS['welcomeMessage']):?>
diff --git a/data/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php
index c6b0d16..c1a589f 100644
--- a/data/templates/dynamictags.inc.php
+++ b/data/templates/dynamictags.inc.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 /* Service creation: only useful services are created */
-$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
+$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 
diff --git a/data/templates/search.menu.php b/data/templates/search.menu.php
new file mode 100644
index 0000000..ce57aea
--- /dev/null
+++ b/data/templates/search.menu.php
@@ -0,0 +1,54 @@
+<?php
+
+
+/* Managing all possible inputs */
+$select_watchlist = isset($select_watchlist)?$select_watchlist:'';
+$select_all = isset($select_all)?$select_all:'';
+
+$selected = ' selected="selected"';
+?>
+
+
+<form id="search" action="<?php echo createURL('search'); ?>" method="post">
+    <table>
+    <tr>
+        <?php
+        $currentUser = $currentUsername = null;
+        if ($userservice->isLoggedOn()) {
+            $currentUser = $userservice->getCurrentObjectUser();
+            $currentUsername = $currentUser->getUsername();
+        }
+        if ($userservice->isLoggedOn() || isset($user)) {
+        ?>
+        
+        <td><input type="text" name="terms" size="30" value="<?php $terms=!isset($terms)?T_('Search...'):$terms; echo filter($terms); ?>" onfocus="if (this.value == '<?php echo T_('Search...') ?>') this.value = '';" onblur="if (this.value == '') this.value = '<?php echo T_('Search...') ?>';"/></td>
+        <td><?php echo T_('in') ?></td>
+        <td>
+            <select name="range">                      
+                <?php
+                if ($range == 'user' && $user!=$currentUsername) {
+                ?>
+                <option value="<?php echo $user ?>"><?php echo T_("this user's bookmarks"); ?></option>
+                <?php
+                }
+                if ($userservice->isLoggedOn()) {
+                ?>
+                <option value="<?php echo $currentUsername; ?>"><?php echo T_('my bookmarks'); ?></option>
+                <option value="watchlist" <?php echo ($range == 'watchlist')?$selected:''?> ><?php echo T_('my watchlist'); ?></option>
+                <?php
+                }
+                ?>
+                <option value="all" <?php echo ($range == 'all' || $range == '')?$selected:'' ?> ><?php echo T_('all bookmarks'); ?></option>
+            </select>
+        </td>        
+        <?php
+        } else {
+        ?>
+        <td><input type="hidden" name="range" value="all" /></td>
+        <?php
+        }
+        ?>        
+        <td><input type="submit" value="<?php echo T_('Search' /* Submit button */); ?>" /></td>
+    </tr>
+    </table>
+</form>
diff --git a/data/templates/sidebar.block.common.php b/data/templates/sidebar.block.common.php
index 6f1e9f7..7fbc782 100644
--- a/data/templates/sidebar.block.common.php
+++ b/data/templates/sidebar.block.common.php
@@ -1,5 +1,5 @@
 <?php
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 $commonTags =& $b2tservice->getRelatedTagsByHash($hash);
 $commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc');
 
diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php
index 0fa36c9..6802051 100644
--- a/data/templates/sidebar.block.linked.php
+++ b/data/templates/sidebar.block.linked.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
+$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 
 require_once('sidebar.linkedtags.inc.php');
 
diff --git a/data/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php
index ed1069a..6ab5a95 100644
--- a/data/templates/sidebar.block.menu.php
+++ b/data/templates/sidebar.block.menu.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
+$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 
 
 require_once('sidebar.linkedtags.inc.php');
diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php
index 8329ef3..fbab636 100644
--- a/data/templates/sidebar.block.menu2.php
+++ b/data/templates/sidebar.block.menu2.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
+$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 
 require_once('sidebar.linkedtags.inc.php');
 
diff --git a/data/templates/sidebar.block.popular.php b/data/templates/sidebar.block.popular.php
index 4279620..3f5e8ca 100644
--- a/data/templates/sidebar.block.popular.php
+++ b/data/templates/sidebar.block.popular.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 
 
 if(!isset($user)) {
diff --git a/data/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php
index 71f9aa9..4831208 100644
--- a/data/templates/sidebar.block.recent.php
+++ b/data/templates/sidebar.block.recent.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 
 /* Manage input */
 $userid = isset($userid)?$userid:NULL;
diff --git a/data/templates/sidebar.block.related.php b/data/templates/sidebar.block.related.php
index 182ea83..559c648 100644
--- a/data/templates/sidebar.block.related.php
+++ b/data/templates/sidebar.block.related.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 
 
 if(!isset($user)) $user="";
diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php
index 4e3c801..ed79f28 100644
--- a/data/templates/sidebar.block.search.php
+++ b/data/templates/sidebar.block.search.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$searchhistoryservice =& ServiceFactory::getServiceInstance('SearchHistoryService');
+$searchhistoryservice =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 if ($logged_on_userid === false) {
diff --git a/data/templates/sidebar.linkedtags.inc.php b/data/templates/sidebar.linkedtags.inc.php
index 555eafc..f978339 100644
--- a/data/templates/sidebar.linkedtags.inc.php
+++ b/data/templates/sidebar.linkedtags.inc.php
@@ -9,8 +9,8 @@ function displayLinkedTags($tag, $linkType, $uId, $cat_url, $user, $editingMode
 	return array('output' => '', 'stoplist' => $stopList);
     }
 
-    $tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
-    $tagstatservice =& ServiceFactory::getServiceInstance('TagStatService');
+    $tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+    $tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 
     // link '>'
     if($level>1) {