[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16413] trunk

[<lph...@us...>]

Revision: 16413
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16413&view=rev
Author:   lphuberdeau
Date:     2009-01-26 19:19:56 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
[FIX]?\194?\160Group watch & watch remove

Modified Paths:
--------------
    trunk/lib/tikilib.php
    trunk/styles/transitions/2.0to3.0.css
    trunk/tiki-index.php

Modified: trunk/lib/tikilib.php
===================================================================
--- trunk/lib/tikilib.php	2009-01-26 19:19:05 UTC (rev 16412)
+++ trunk/lib/tikilib.php	2009-01-26 19:19:56 UTC (rev 16413)
@@ -5394,11 +5394,11 @@
 						if( $this->plugin_is_editable( $plugin_name ) && (empty($options['print']) || !$options['print']) ) {
 							include_once('lib/smarty_tiki/function.icon.php');
 							global $headerlib, $page;
-							$id = $plugin_name . $current_index;
+							$id = 'plugin-edit-' . $plugin_name . $current_index;
 							$headerlib->add_jsfile( 'tiki-jsplugin.php?plugin=' . urlencode( $plugin_name ) );
 							$headerlib->add_js( "
 window.addEvent('domready', function() {
-	$('$id').addEvent( 'click', function(event) {
+	if( $('$id') ) $('$id').addEvent( 'click', function(event) {
 		popup_plugin_form("
 			. json_encode($plugin_name) 
 			. ', ' 

Modified: trunk/styles/transitions/2.0to3.0.css
===================================================================
--- trunk/styles/transitions/2.0to3.0.css	2009-01-26 19:19:05 UTC (rev 16412)
+++ trunk/styles/transitions/2.0to3.0.css	2009-01-26 19:19:56 UTC (rev 16413)
@@ -493,6 +493,7 @@
 	border: solid thin black;
 	background: white;
 	color: black;
+	display: none;
 }
 
 span.categpath {

Modified: trunk/tiki-index.php
===================================================================
--- trunk/tiki-index.php	2009-01-26 19:19:05 UTC (rev 16412)
+++ trunk/tiki-index.php	2009-01-26 19:19:56 UTC (rev 16413)
@@ -411,13 +411,15 @@
 if ($prefs['feature_user_watches'] == 'y') {
 	if($user && isset($_REQUEST['watch_event']) && !isset($_REQUEST['watch_group'])) {
 		check_ticket('index');
-		if (($_REQUEST['watch_action'] == 'add_desc' || $_REQUEST['watch_action'] == 'del_desc') && $tiki_p_watch_structure != 'y') {
+		if (($_REQUEST['watch_action'] == 'add_desc' || $_REQUEST['watch_action'] == 'remove_desc') && $tiki_p_watch_structure != 'y') {
 			$access->display_error( $page, tra('Permission denied'), '403');
 		}
 		if($_REQUEST['watch_action']=='add') {
 			$tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],'wiki page',$page,"tiki-index.php?page=$page");
 		} elseif($_REQUEST['watch_action'] == 'add_desc') {
 			$tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],'structure',$page,"tiki-index.php?page=$page&structure=$struct");
+		} elseif($_REQUEST['watch_action'] == 'remove_desc') {
+			$tikilib->remove_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],'structure');
 		} else {
 			$tikilib->remove_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object']);
 		}
@@ -426,12 +428,14 @@
 
 if ($prefs['feature_group_watches'] == 'y'
 	&& ( $tiki_p_admin == 'y' || $tiki_p_admin_users == 'y' ) ) {
-	if(!empty($_REQUEST['watch_event'])) {
+	if(isset( $_REQUEST['watch_group'] ) && isset($_REQUEST['watch_event'])) {
 		check_ticket('index');
 		if($_REQUEST['watch_action']=='add') {
 			$tikilib->add_group_watch($_REQUEST['watch_group'],$_REQUEST['watch_event'],$_REQUEST['watch_object'],'wiki page',$page,"tiki-index.php?page=$page");
 		} elseif($_REQUEST['watch_action'] == 'add_desc') {
 			$tikilib->add_group_watch($_REQUEST['watch_group'],$_REQUEST['watch_event'],$_REQUEST['watch_object'],'structure',$page,"tiki-index.php?page=$page&structure=$struct");
+		} elseif($_REQUEST['watch_action'] == 'remove_desc') {
+			$tikilib->remove_group_watch($_REQUEST['watch_group'],$_REQUEST['watch_event'],$_REQUEST['watch_object'], 'structure');
 		} else {
 			$tikilib->remove_group_watch($_REQUEST['watch_group'],$_REQUEST['watch_event'],$_REQUEST['watch_object']);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.