[Tikiwiki-cvs] tiki tiki-admin_hotwords.php,1.4.4.3,1.4.4.4 tiki-admin_links.php,1.7.2.2,1.7.2.3 tiki-admin_menu_options.php,1.6.4.2,1.6.4.3 tiki-admin_menus.php,1.5.4.2,1.5.4.3 tiki-assignpermission.php,1.9.4.2,1.9.4.3 tiki-blog_post.php,1.19.2.3,1.19.2.4 tiki-calendar.php,1.12.2.3,1.12.2.4 tiki-directory_admin_sites.php,1.3.4.5,1.3.4.6 tiki-editpage.php,1.35.2.11,1.35.2.12 tiki-forum_queue.php,1.2.2.2,1.2.2.3 tiki-index.php,1.56.2.11,1.56.2.12 tiki-list_file_gallery.php,1.11.2.2,1.11.2.3 tiki-live_support_admin.php,1.4.2.2,1.4.2.3 tiki-rollback.php,1.5.2.2,1.5.2.3

[<dam...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4720

Modified Files:
      Tag: release_eta_carinea_rc1
	tiki-admin_hotwords.php tiki-admin_links.php 
	tiki-admin_menu_options.php tiki-admin_menus.php 
	tiki-assignpermission.php tiki-blog_post.php tiki-calendar.php 
	tiki-directory_admin_sites.php tiki-editpage.php 
	tiki-forum_queue.php tiki-index.php tiki-list_file_gallery.php 
	tiki-live_support_admin.php tiki-rollback.php 
Log Message:
More goodies in the form of the tikits

Index: tiki-admin_hotwords.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_hotwords.php,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -u -d -r1.4.4.3 -r1.4.4.4
--- tiki-admin_hotwords.php	28 Mar 2004 09:59:50 -0000	1.4.4.3
+++ tiki-admin_hotwords.php	31 Mar 2004 10:53:27 -0000	1.4.4.4
@@ -36,8 +36,13 @@
 }
 
 if(isset($_REQUEST["remove"])&&!empty($_REQUEST["remove"])) {
-	check_ticket('admin-hotwords');
-  $hotwordlib->remove_hotword($_REQUEST["remove"]);
+	$area = 'delhotword';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$hotwordlib->remove_hotword($_REQUEST["remove"]);
+	} else {
+		key_get($area);
+	}
 }
 
 

Index: tiki-admin_links.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_links.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- tiki-admin_links.php	28 Mar 2004 09:59:50 -0000	1.7.2.2
+++ tiki-admin_links.php	31 Mar 2004 10:53:27 -0000	1.7.2.3
@@ -61,7 +61,13 @@
 }
 
 if(isset($_REQUEST["remove"])) {
-  $flinkslib->remove_featured_link($_REQUEST["remove"]);
+	area = 'dellink';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$flinkslib->remove_featured_link($_REQUEST["remove"]);
+	} else {	
+		key_get($area);
+	}
 }
 
 $links=$tikilib->get_featured_links(999999);

Index: tiki-admin_menu_options.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_menu_options.php,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -d -r1.6.4.2 -r1.6.4.3
--- tiki-admin_menu_options.php	28 Mar 2004 09:59:50 -0000	1.6.4.2
+++ tiki-admin_menu_options.php	31 Mar 2004 10:53:27 -0000	1.6.4.3
@@ -48,10 +48,15 @@
 $smarty->assign('position',$info["position"]);
 
 if(isset($_REQUEST["remove"])) {
-	check_ticket('admin-menu-options');
-  $menulib->remove_menu_option($_REQUEST["remove"]);
-  $maxPos = $menulib->get_max_option($_REQUEST["menuId"]);
-   $smarty->assign('position',$maxPos+1);
+	$area = 'delmenuoption';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$menulib->remove_menu_option($_REQUEST["remove"]);
+		$maxPos = $menulib->get_max_option($_REQUEST["menuId"]);
+		$smarty->assign('position',$maxPos+1);
+	} else {
+		key_get($area);
+	}
 }
 
 if(isset($_REQUEST["save"])) {

Index: tiki-admin_menus.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_menus.php,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -d -r1.5.4.2 -r1.5.4.3
--- tiki-admin_menus.php	28 Mar 2004 09:59:50 -0000	1.5.4.2
+++ tiki-admin_menus.php	31 Mar 2004 10:53:27 -0000	1.5.4.3
@@ -34,8 +34,13 @@
 
 
 if(isset($_REQUEST["remove"])) {
-	check_ticket('admin-menus');
-  $menulib->remove_menu($_REQUEST["remove"]);
+	$area = 'delmenu';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$menulib->remove_menu($_REQUEST["remove"]);
+	} else {
+		key_get($area);
+	}
 }
 
 if(isset($_REQUEST["save"])) {

Index: tiki-assignpermission.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-assignpermission.php,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -u -d -r1.9.4.2 -r1.9.4.3
--- tiki-assignpermission.php	28 Mar 2004 09:59:50 -0000	1.9.4.2
+++ tiki-assignpermission.php	31 Mar 2004 10:53:27 -0000	1.9.4.3
@@ -44,12 +44,17 @@
 
 
 if(isset($_REQUEST["action"])) {
-	check_ticket('admin-perms');
   if($_REQUEST["action"]=='assign') {
     $userlib->assign_permission_to_group($_REQUEST["perm"],$group);  
   }  
   if($_REQUEST["action"]=='remove') {
-    $userlib->remove_permission_from_group($_REQUEST["permission"],$group); 
+	$area = 'delpermassign';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$userlib->remove_permission_from_group($_REQUEST["permission"],$group); 
+	} else {
+		key_get($area);
+	}
   }
 }
 

Index: tiki-blog_post.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-blog_post.php,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -d -r1.19.2.3 -r1.19.2.4
--- tiki-blog_post.php	28 Mar 2004 09:59:50 -0000	1.19.2.3
+++ tiki-blog_post.php	31 Mar 2004 10:53:27 -0000	1.19.2.4
@@ -51,8 +51,13 @@
 $smarty->assign_by_ref('blog_data',$blog_data);
 
 if(isset($_REQUEST['remove_image'])) {
-	check_ticket('blog-post');
-  $bloglib->remove_post_image($_REQUEST['remove_image']);
+	$area = 'delblogimage';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$bloglib->remove_post_image($_REQUEST['remove_image']);
+	} else {
+		key_get($area);
+	}
 }
 
 // If the articleId is passed then get the article data

Index: tiki-calendar.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-calendar.php,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -d -r1.12.2.3 -r1.12.2.4
--- tiki-calendar.php	28 Mar 2004 09:59:50 -0000	1.12.2.3
+++ tiki-calendar.php	31 Mar 2004 10:53:27 -0000	1.12.2.4
@@ -220,9 +220,14 @@
 $smarty->assign('viewmode',$_SESSION['CalendarViewMode']);
 
 if (isset($_REQUEST["delete"]) and ($_REQUEST["delete"]) and isset($_REQUEST["calitemId"])) {
-	check_ticket('calendar');
-	$calendarlib->drop_item($user,$_REQUEST["calitemId"]);
-	$_REQUEST["calitemId"] = 0;
+	$area = 'delcalendaritem';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$calendarlib->drop_item($user,$_REQUEST["calitemId"]);
+		$_REQUEST["calitemId"] = 0;
+	} else {
+		key_get($area);
+	}
 }
 
 if (!isset($_REQUEST["calitemId"])) $_REQUEST["calitemId"] = 0;

Index: tiki-directory_admin_sites.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_admin_sites.php,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -d -r1.3.4.5 -r1.3.4.6
--- tiki-directory_admin_sites.php	28 Mar 2004 09:59:50 -0000	1.3.4.5
+++ tiki-directory_admin_sites.php	31 Mar 2004 10:53:27 -0000	1.3.4.6
@@ -67,8 +67,13 @@
 
 // Remove a category
 if(isset($_REQUEST["remove"])) {
-	check_ticket('dir-admin-sites');
-  $dirlib->dir_remove_site($_REQUEST["remove"]);
+	$area = 'deldirsite';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$dirlib->dir_remove_site($_REQUEST["remove"]);
+	} else {
+		key_get($area);
+	}
 }
 
 // Replace (add or edit) a category

Index: tiki-editpage.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v
retrieving revision 1.35.2.11
retrieving revision 1.35.2.12
diff -u -d -r1.35.2.11 -r1.35.2.12
--- tiki-editpage.php	28 Mar 2004 09:59:51 -0000	1.35.2.11
+++ tiki-editpage.php	31 Mar 2004 10:53:27 -0000	1.35.2.12
@@ -357,7 +357,7 @@
 
     $page = $_REQUEST["page"];
 
-    if(isset($_REQUEST["allowhtml"]) && $_REQUEST["allowhtml"]=="on") {
+    if($feature_wiki_allowhtml == 'y' and $tiki_p_use_HTML == 'y' and (isset($_REQUEST["allowhtml"]) && $_REQUEST["allowhtml"]=="on")) {
       $edit = $_REQUEST["edit"];  
     } else {
 //      $edit = strip_tags($_REQUEST["edit"]);

Index: tiki-forum_queue.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-forum_queue.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- tiki-forum_queue.php	28 Mar 2004 09:59:51 -0000	1.2.2.2
+++ tiki-forum_queue.php	31 Mar 2004 10:53:27 -0000	1.2.2.3
@@ -63,8 +63,13 @@
 $smarty->assign('form','y');
 
 if(isset($_REQUEST['remove_attachment'])) {
-	check_ticket('forum-queue');
-	$commentslib->remove_thread_attachment($_REQUEST['remove_attachment']);
+	$area = 'delthreadatt';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		$commentslib->remove_thread_attachment($_REQUEST['remove_attachment']);
+	} else {
+		key_get($area);
+	}
 }
 
 
@@ -87,9 +92,14 @@
 	}
 	
 	if(isset($_REQUEST['remove'])) {
-	check_ticket('forum-queue');
-		$smarty->assign('form','n');
-		$commentslib->remove_queued($_REQUEST['qId']);
+		$area = 'delforumq';
+		if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+	                key_check($area);
+			$smarty->assign('form','n');
+			$commentslib->remove_queued($_REQUEST['qId']);
+		} else {
+			key_get($area);
+		}
 	}
 	
 

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.56.2.11
retrieving revision 1.56.2.12
diff -u -d -r1.56.2.11 -r1.56.2.12
--- tiki-index.php	28 Mar 2004 09:59:51 -0000	1.56.2.11
+++ tiki-index.php	31 Mar 2004 10:53:27 -0000	1.56.2.12
@@ -181,16 +181,21 @@
 
 // Process an undo here
 if(isset($_REQUEST["undo"])) {
-	check_ticket('index');
 if($tiki_p_admin_wiki == 'y' || ($info["flag"]!='L' && ( ($tiki_p_edit == 'y' && $info["user"]==$user)||($tiki_p_remove=='y')) )) {
-  // Remove the last version	
-  $wikilib->remove_last_version($page);
-  // If page was deleted then re-create
-  if(!$tikilib->page_exists($page)) {
-    $tikilib->create_page($page,0,'',date("U"),'Tiki initialization'); 
-  }
-  // Restore page information
-  $info = $tikilib->get_page_info($page);  	
+	$area = 'wikiundo';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		  // Remove the last version	
+		  $wikilib->remove_last_version($page);
+		  // If page was deleted then re-create
+		  if(!$tikilib->page_exists($page)) {
+		    $tikilib->create_page($page,0,'',date("U"),'Tiki initialization'); 
+		  }
+		  // Restore page information
+		  $info = $tikilib->get_page_info($page);  	
+	} else {
+		key_get($area);
+	}
 }
 }
 
@@ -287,10 +292,15 @@
 
 if($feature_wiki_attachments == 'y') {
   if(isset($_REQUEST["removeattach"])) {
-	check_ticket('index');
     $owner = $wikilib->get_attachment_owner($_REQUEST["removeattach"]);
     if( ($user && ($owner == $user) ) || ($tiki_p_wiki_admin_attachments == 'y') ) {
-      $wikilib->remove_wiki_attachment($_REQUEST["removeattach"]);
+	$area = 'wikidelatt';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+	      $wikilib->remove_wiki_attachment($_REQUEST["removeattach"]);
+	} else {
+		key_get($area);
+	}
     }
   }
   if(isset($_REQUEST["attach"]) && ($tiki_p_wiki_admin_attachments == 'y' || $tiki_p_wiki_attach_files == 'y')) {

Index: tiki-list_file_gallery.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-list_file_gallery.php,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- tiki-list_file_gallery.php	28 Mar 2004 09:59:52 -0000	1.11.2.2
+++ tiki-list_file_gallery.php	31 Mar 2004 10:53:28 -0000	1.11.2.3
@@ -99,14 +99,19 @@
 $tikilib->add_file_gallery_hit($_REQUEST["galleryId"]);
 
 if(isset($_REQUEST["remove"])) {
-	check_ticket('list-fgal');
   // To remove an image the user must be the owner or admin
   if($tiki_p_admin_file_galleries != 'y' && (!$user || $user!=$gal_info["user"])) {
     $smarty->assign('msg',tra("Permission denied you cannot remove files from this gallery"));
     $smarty->display("styles/$style_base/error.tpl");
     die;  
   }
-  $filegallib->remove_file($_REQUEST["remove"]);
+  $area = 'delfile';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+	 	$filegallib->remove_file($_REQUEST["remove"]);
+	} else {
+		key_get($area);
+	}
 }
 
 $foo = parse_url($_SERVER["REQUEST_URI"]);

Index: tiki-live_support_admin.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-live_support_admin.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- tiki-live_support_admin.php	28 Mar 2004 09:59:52 -0000	1.4.2.2
+++ tiki-live_support_admin.php	31 Mar 2004 10:53:28 -0000	1.4.2.3
@@ -34,8 +34,13 @@
 		$lsadminlib->add_operator($_REQUEST['user']);
 	}
 	if(isset($_REQUEST['removeuser'])) {
-	check_ticket('ls-admin');
-		$lsadminlib->remove_operator($_REQUEST['removeuser']);
+		$area = 'lsremoveuser';
+		if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+	                key_check($area);
+			$lsadminlib->remove_operator($_REQUEST['removeuser']);
+		} else {
+			key_get($area);
+		}
 	}
 }
 

Index: tiki-rollback.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-rollback.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- tiki-rollback.php	28 Mar 2004 09:59:53 -0000	1.5.2.2
+++ tiki-rollback.php	31 Mar 2004 10:53:28 -0000	1.5.2.3
@@ -64,10 +64,15 @@
 }
 
 if(isset($_REQUEST["rollback"])) {
-  check_ticket('rollback');
-  $histlib->use_version($_REQUEST["page"],$_REQUEST["version"]);
-  header("location: tiki-index.php");
-  die;  
+	$area = 'wikirollback';
+	if (isset($_POST['daconfirm']) and isset($_SESSION["ticket_$area"])) {
+                key_check($area);
+		  $histlib->use_version($_REQUEST["page"],$_REQUEST["version"]);
+		  header("location: tiki-index.php");
+		  die;  
+	} else {
+		key_get($area);
+	}
 }
 
 ask_ticket('rollback');