? :wq ? analyze.sh ? apache.conf ? filedetails ? filelist ? patch.csrf ? patch2.csrf ? patch3.csrf Index: INSTALL =================================================================== RCS file: /cvsroot/tikiwiki/tiki/INSTALL,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -w -u -r1.1.2.6 -r1.1.2.7 --- INSTALL 27 Oct 2003 21:22:51 -0000 1.1.2.6 +++ INSTALL 19 Dec 2003 11:49:42 -0000 1.1.2.7 @@ -1,4 +1,4 @@ -TikiWiki installation v1.7.4 +TikiWiki installation v1.7.5 ----------------------------- $Header$ @@ -44,11 +44,11 @@ Unpack the archive to the directory where you want tiki installed (we use in our examples a subdir of /var/www) - mv tikiwiki-1.7.4.tar.bz2 /var/www/tiki + mv tikiwiki-1.7.5.tar.bz2 /var/www/tiki cd /var/www/tiki to uncompress bz2 file use - tar xvjf tikiwiki-1.7.4.tar.bz2 + tar xvjf tikiwiki-1.7.5.tar.bz2 If not done already make setup.sh executable chmod 755 setup.sh Index: README =================================================================== RCS file: /cvsroot/tikiwiki/tiki/README,v retrieving revision 1.1.8.9 retrieving revision 1.1.8.10 diff -u -w -u -r1.1.8.9 -r1.1.8.10 --- README 27 Oct 2003 21:21:49 -0000 1.1.8.9 +++ README 19 Dec 2003 11:50:23 -0000 1.1.8.10 @@ -1,4 +1,4 @@ -TikiWiki Guidelines v1.7.4 +TikiWiki Guidelines v1.7.5 ----------------------------- $Header$ @@ -17,8 +17,8 @@ * Tikiwiki is also a community irc.freenode.net channel #tikiwiki -* Details about the 1.7.4 release - http://tikiwiki.org/ReleaseNotes174 +* Details about the 1.7.5 release + http://tikiwiki.org/ReleaseNotes175 Index: comments.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/comments.php,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -w -u -r1.10.2.1 -r1.10.2.2 --- comments.php 26 Sep 2003 04:10:45 -0000 1.10.2.1 +++ comments.php 22 Dec 2003 12:26:11 -0000 1.10.2.2 @@ -8,6 +8,15 @@ // cannot be aliased by normal tiki variables. // Traverse each _REQUEST data adn put them in an array +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],"comments.php")!=FALSE) { + //smarty is not there - we need setup + require_once('tiki-setup.php'); + $smarty->assign('msg',tra("This script cannot be called directly")); + $smarty->display("error.tpl"); + die; +} + require_once('lib/tikilib.php'); # httpScheme() if(!isset($comments_per_page)) { Index: messu-broadcast.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-broadcast.php,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -w -u -r1.11.2.2 -r1.11.2.3 --- messu-broadcast.php 19 Oct 2003 11:02:32 -0000 1.11.2.2 +++ messu-broadcast.php 24 Dec 2003 23:01:20 -0000 1.11.2.3 @@ -59,6 +59,7 @@ if(isset($_REQUEST['send'])) { + check_ticket('messu-broadcast'); $smarty->assign('sent',1); $message = ''; // Validation: @@ -106,6 +107,8 @@ $smarty->assign('message',$message); } + +ask_ticket('messu-broadcast'); $groups = $userlib->get_groups(0,-1,'groupName_asc',''); $smarty->assign_by_ref('groups',$groups["data"]); Index: messu-compose.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-compose.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.5 diff -u -w -u -r1.8.2.3 -r1.8.2.5 --- messu-compose.php 19 Oct 2003 11:02:32 -0000 1.8.2.3 +++ messu-compose.php 24 Dec 2003 23:01:20 -0000 1.8.2.5 @@ -32,7 +32,7 @@ // Strip Re:Re:Re: from subject if(isset($_REQUEST['reply'])||isset($_REQUEST['replyall'])) { - $_REQUEST['subject'] = tra("Re:") . ereg_replace("^(".tra("Re:").")+", "", $_REQUEST['subject']); + $_REQUEST['subject'] = tra("Re:") . trim(ereg_replace(tra("Re:"), "", $_REQUEST['subject'])); } $smarty->assign('to',$_REQUEST['to']); @@ -52,6 +52,7 @@ if(isset($_REQUEST['send'])) { + check_ticket('messu-compose'); $smarty->assign('sent',1); $message = ''; @@ -156,6 +157,7 @@ $section='user_messages'; include_once('tiki-section_options.php'); +ask_ticket('messu-compose'); include_once('tiki-mytiki_shared.php'); Index: messu-mailbox.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-mailbox.php,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -w -u -r1.7.2.1 -r1.7.2.2 --- messu-mailbox.php 19 Oct 2003 11:02:32 -0000 1.7.2.1 +++ messu-mailbox.php 24 Dec 2003 23:01:22 -0000 1.7.2.2 @@ -34,6 +34,7 @@ // Delete messages if the delete button was pressed if(isset($_REQUEST["delete"]) && isset($_REQUEST["msg"])) { + check_ticket('messu-mailbox'); foreach(array_keys($_REQUEST["msg"]) as $msg) { $messulib->delete_message($user, $msg); } @@ -77,7 +78,7 @@ include_once('tiki-section_options.php'); include_once('tiki-mytiki_shared.php'); - +ask_ticket('messu-mailbox'); $smarty->assign('mid','messu-mailbox.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: messu-read.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-read.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -w -u -r1.8.2.1 -r1.8.2.2 --- messu-read.php 19 Oct 2003 11:02:32 -0000 1.8.2.1 +++ messu-read.php 24 Dec 2003 23:01:22 -0000 1.8.2.2 @@ -22,6 +22,7 @@ } if(isset($_REQUEST["delete"])) { + check_ticket('messu-read'); $messulib->delete_message($user,$_REQUEST['msgdel']); } @@ -59,6 +60,8 @@ // Get the message and assign its data to template vars $msg = $messulib->get_message($user,$_REQUEST['msgId']); $smarty->assign('msg',$msg); + +ask_ticket('messu-read'); $section='user_messages'; include_once('tiki-section_options.php'); Index: setup.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/Attic/setup.php,v retrieving revision 1.15.2.4 retrieving revision 1.15.2.5 diff -u -w -u -r1.15.2.4 -r1.15.2.5 --- setup.php 20 Oct 2003 06:25:16 -0000 1.15.2.4 +++ setup.php 24 Dec 2003 23:01:22 -0000 1.15.2.5 @@ -6,6 +6,7 @@ session_start(); require_once("db/tiki-db.php"); +require_once("lib/tikiticketlib.php"); error_reporting(E_ALL); ini_set("arg_separator.output","&"); Index: tiki-admin.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin.php,v retrieving revision 1.88.2.6 retrieving revision 1.88.2.7 diff -u -w -u -r1.88.2.6 -r1.88.2.7 --- tiki-admin.php 24 Jul 2003 22:05:09 -0000 1.88.2.6 +++ tiki-admin.php 9 Nov 2003 22:12:26 -0000 1.88.2.7 @@ -39,6 +39,8 @@ if (isset($_REQUEST[$feature])) { if (strlen($pref) > 0) { $tikilib->set_preference( $pref, $_REQUEST[$feature] ); + // also assign the ref appareantly --gongo + $smarty->assign_by_ref( $pref, $_REQUEST[$feature] ); } else { $tikilib->set_preference( $feature, $_REQUEST[$feature] ); } Index: tiki-admin_banning.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_banning.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -w -u -r1.1 -r1.1.2.1 --- tiki-admin_banning.php 15 May 2003 20:44:07 -0000 1.1 +++ tiki-admin_banning.php 24 Dec 2003 23:01:24 -0000 1.1.2.1 @@ -35,15 +35,18 @@ $smarty->assign_by_ref('info',$info); if(isset($_REQUEST['remove'])) { + check_ticket('admin-banning'); $banlib->remove_rule($_REQUEST['remove']); } if(isset($_REQUEST['del']) && isset($_REQUEST['delsec'])) { + check_ticket('admin-banning'); foreach(array_keys($_REQUEST['delsec']) as $sec) { $banlib->remove_rule($sec); } } if(isset($_REQUEST['save'])) { + check_ticket('admin-banning'); $_REQUEST['use_dates']=isset($_REQUEST['use_dates'])?'y':'n'; $_REQUEST['date_from']=mktime(0,0,0,$_REQUEST['date_fromMonth'],$_REQUEST['date_fromDay'],$_REQUEST['date_fromYear']); $_REQUEST['date_to']=mktime(0,0,0,$_REQUEST['date_toMonth'],$_REQUEST['date_toDay'],$_REQUEST['date_toYear']); @@ -96,6 +99,8 @@ $sections=Array('wiki','galleries','file_galleries','cms','blogs','forums','chat','categories','games','faqs','html_pages','quizzes','surveys','webmail','trackers','featured_links','directory','user_messages','newsreader','mytiki','workflow','charts'); $smarty->assign('sections',$sections); + +ask_ticket('admin-banning'); $smarty->assign('mid','tiki-admin_banning.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_calendars.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_calendars.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -w -u -r1.4.2.1 -r1.4.2.2 --- tiki-admin_calendars.php 9 Aug 2003 01:50:06 -0000 1.4.2.1 +++ tiki-admin_calendars.php 24 Dec 2003 23:01:24 -0000 1.4.2.2 @@ -15,11 +15,13 @@ if(isset($_REQUEST["drop"])) { + check_ticket('admin-calendars'); $calendarlib->drop_calendar($_REQUEST["drop"]); $_REQUEST["calendarId"] = 0; } if(isset($_REQUEST["save"])) { + check_ticket('admin-calendars'); $customflags["customlanguages"] = $_REQUEST["customlanguages"]; $customflags["customlocations"] = $_REQUEST["customlocations"]; $customflags["customcategories"] = $_REQUEST["customcategories"]; @@ -73,6 +75,7 @@ $cat_objid = $_REQUEST["calendarId"]; include_once("categorize_list.php"); +ask_ticket('admin-calendars'); // Display the template $smarty->assign('mid','tiki-admin_calendars.tpl'); Index: tiki-admin_categories.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_categories.php,v retrieving revision 1.10.4.13 retrieving revision 1.10.4.14 diff -u -w -u -r1.10.4.13 -r1.10.4.14 --- tiki-admin_categories.php 31 Jul 2003 19:04:28 -0000 1.10.4.13 +++ tiki-admin_categories.php 24 Dec 2003 23:01:24 -0000 1.10.4.14 @@ -35,6 +35,7 @@ $smarty->assign('parentId',$_REQUEST["parentId"]); if(isset($_REQUEST["addpage"])) { + check_ticket('admin-categories'); // Here we categorize a page // $categlib->categorize_page($_REQUEST["pageName"],$_REQUEST["parentId"]); // add multiple pages at once @@ -43,39 +44,48 @@ } } if(isset($_REQUEST["addpoll"])) { + check_ticket('admin-categories'); // Here we categorize a poll $categlib->categorize_poll($_REQUEST["pollId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addfaq"])) { + check_ticket('admin-categories'); // Here we categorize a faq $categlib->categorize_faq($_REQUEST["faqId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addquiz"])) { + check_ticket('admin-categories'); // Here we categorize a quiz $categlib->categorize_quiz($_REQUEST["quizId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addforum"])) { + check_ticket('admin-categories'); // Here we categorize a forum $categlib->categorize_forum($_REQUEST["forumId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addgallery"])) { + check_ticket('admin-categories'); // Here we categorize an image gallery $categlib->categorize_gallery($_REQUEST["galleryId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addfilegallery"])) { + check_ticket('admin-categories'); // Here we categorize a file gallery $categlib->categorize_file_gallery($_REQUEST["file_galleryId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addarticle"])) { + check_ticket('admin-categories'); // Here we categorize an article $categlib->categorize_article($_REQUEST["articleId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["addblog"])) { + check_ticket('admin-categories'); // Here we categorize a blog $categlib->categorize_blog($_REQUEST["blogId"],$_REQUEST["parentId"]); } if(isset($_REQUEST["adddirectory"])) { + check_ticket('admin-categories'); // Here we categorize a directory category $categlib->categorize_directory($_REQUEST["directoryId"],$_REQUEST["parentId"]); } @@ -90,14 +100,17 @@ } if(isset($_REQUEST["removeObject"])) { + check_ticket('admin-categories'); $categlib->remove_object_from_category($_REQUEST["removeObject"],$_REQUEST["parentId"]); } if(isset($_REQUEST["removeCat"])) { + check_ticket('admin-categories'); $categlib->remove_category($_REQUEST["removeCat"]); } if(isset($_REQUEST["save"])&& isset($_REQUEST["name"]) && strlen($_REQUEST["name"])>0) { + check_ticket('admin-categories'); // Save if($_REQUEST["categId"]) { $categlib->update_category($_REQUEST["categId"],$_REQUEST["name"],$_REQUEST["description"],$_REQUEST["parentId"]); @@ -224,6 +237,8 @@ $directories = $dirlib->dir_list_all_categories(0,-1,'name_asc', $find_objects); $smarty->assign_by_ref('directories',$directories["data"]); + +ask_ticket('admin-categories'); // Display the template $smarty->assign('mid','tiki-admin_categories.tpl'); Index: tiki-admin_chart_items.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_chart_items.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-admin_chart_items.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-admin_chart_items.php 24 Dec 2003 23:01:26 -0000 1.3.2.1 @@ -42,6 +42,7 @@ $smarty->assign('itemId',$_REQUEST['itemId']); $smarty->assign('info',$info); if(isset($_REQUEST["delete"])) { + check_ticket('admin-chart-items'); foreach(array_keys($_REQUEST["item"]) as $item) { $chartlib->remove_chart_item($item); } @@ -50,6 +51,7 @@ if(isset($_REQUEST['save'])) { + check_ticket('admin-chart-items'); $vars = Array(); $vars['chartId']=$_REQUEST['chartId']; $_REQUEST['created']=date("U"); @@ -88,6 +90,8 @@ $smarty->assign_by_ref('items',$items["data"]); $sameurl_elements = Array('offset','sort_mode','where','find','chartId','itemId'); + +ask_ticket('admin-chart-items'); $smarty->assign('mid','tiki-admin_chart_items.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_charts.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_charts.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-admin_charts.php 30 Apr 2003 21:19:15 -0000 1.5 +++ tiki-admin_charts.php 24 Dec 2003 23:01:26 -0000 1.5.2.1 @@ -43,12 +43,14 @@ $smarty->assign('chartId',$_REQUEST['chartId']); $smarty->assign('info',$info); if(isset($_REQUEST["delete"])) { + check_ticket('admin-charts'); foreach(array_keys($_REQUEST["chart"]) as $item) { $chartlib->remove_chart($item); } } if(isset($_REQUEST['save'])) { + check_ticket('admin-charts'); $vars = Array(); $_REQUEST['singleItemVotes']=isset($_REQUEST['singleItemVotes'])?'y':'n'; $_REQUEST['isActive']=isset($_REQUEST['isActive'])?'y':'n'; @@ -118,6 +120,8 @@ $smarty->assign_by_ref('items',$items["data"]); $sameurl_elements = Array('offset','sort_mode','where','find','chartId'); + +ask_ticket('admin-charts'); $smarty->assign('mid','tiki-admin_charts.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_chat.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_chat.php,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -w -u -r1.4 -r1.4.4.1 --- tiki-admin_chat.php 21 Mar 2003 18:55:20 -0000 1.4 +++ tiki-admin_chat.php 24 Dec 2003 23:01:26 -0000 1.4.4.1 @@ -29,10 +29,12 @@ $smarty->assign('refresh',$info["refresh"]); if(isset($_REQUEST["remove"])) { + check_ticket('admin-chat'); $chatlib->remove_channel($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-chat'); if(isset($_REQUEST["active"]) && $_REQUEST["active"]=='on') { $active = 'y'; } else { @@ -82,6 +84,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-chat'); // Display the template $smarty->assign('mid','tiki-admin_chat.tpl'); Index: tiki-admin_content_templates.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_content_templates.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-admin_content_templates.php 4 May 2003 21:10:33 -0000 1.6 +++ tiki-admin_content_templates.php 24 Dec 2003 23:01:26 -0000 1.6.2.1 @@ -49,10 +49,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-content-templates'); $templateslib->remove_template($_REQUEST["remove"]); } if(isset($_REQUEST["removesection"])) { + check_ticket('admin-content-templates'); $templateslib->remove_template_from_section($_REQUEST["rtemplateId"],$_REQUEST["removesection"]); } @@ -90,6 +92,7 @@ } if(isset($_REQUEST["save"])) { + check_ticket('admin-content-templates'); $tid = $templateslib->replace_template($_REQUEST["templateId"], $_REQUEST["name"],$_REQUEST["content"]); $smarty->assign("templateId",'0'); @@ -163,6 +166,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-content-templates'); // Display the template $smarty->assign('mid','tiki-admin_content_templates.tpl'); Index: tiki-admin_cookies.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_cookies.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-admin_cookies.php 30 May 2003 03:52:26 -0000 1.4 +++ tiki-admin_cookies.php 24 Dec 2003 23:01:26 -0000 1.4.2.1 @@ -25,14 +25,17 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-cookies'); $taglinelib->remove_cookie($_REQUEST["remove"]); } if(isset($_REQUEST["removeall"])) { + check_ticket('admin-cookies'); $taglinelib->remove_all_cookies(); } if(isset($_REQUEST["upload"])) { + check_ticket('admin-cookies'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"r"); while(!feof($fp)) { @@ -55,6 +58,7 @@ if(isset($_REQUEST["save"])) { + check_ticket('admin-cookies'); $taglinelib->replace_cookie($_REQUEST["cookieId"], $_REQUEST["cookie"]); $smarty->assign("cookieId",'0'); @@ -101,6 +105,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-cookies'); // Display the template $smarty->assign('mid','tiki-admin_cookies.tpl'); Index: tiki-admin_drawings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_drawings.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-admin_drawings.php 14 May 2003 15:40:49 -0000 1.4 +++ tiki-admin_drawings.php 24 Dec 2003 23:01:26 -0000 1.4.2.1 @@ -16,14 +16,17 @@ } if(isset($_REQUEST["remove"])) { + check_ticket('admin-drawings'); $drawlib->remove_drawing($_REQUEST["remove"]); } if(isset($_REQUEST["removeall"])) { + check_ticket('admin-drawings'); $drawlib->remove_all_drawings($_REQUEST["removeall"]); } if(isset($_REQUEST['del'])) { + check_ticket('admin-drawings'); foreach(array_keys($_REQUEST['draw']) as $id) { $drawlib->remove_drawing($id); } @@ -65,6 +68,8 @@ if($offset>0) { $smarty->assign('prev_offset',$offset - $maxRecords); } else { $smarty->assign('prev_offset',-1); } $smarty->assign_by_ref('items',$items["data"]); +ask_ticket('admin-drawings'); + $smarty->assign('mid','tiki-admin_drawings.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-admin_dsn.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_dsn.php,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -w -u -r1.1 -r1.1.4.1 --- tiki-admin_dsn.php 26 Mar 2003 23:30:49 -0000 1.1 +++ tiki-admin_dsn.php 24 Dec 2003 23:01:26 -0000 1.1.4.1 @@ -27,11 +27,13 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-dsn'); $adminlib->remove_dsn($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-dsn'); $adminlib->replace_dsn($_REQUEST["dsnId"], $_REQUEST["dsn"],$_REQUEST['name']); $info = Array(); @@ -81,7 +83,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); - +ask_ticket('admin-dsn'); // Display the template $smarty->assign('mid','tiki-admin_dsn.tpl'); Index: tiki-admin_external_wikis.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_external_wikis.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-admin_external_wikis.php 19 Jun 2003 21:18:52 -0000 1.2 +++ tiki-admin_external_wikis.php 24 Dec 2003 23:01:26 -0000 1.2.2.1 @@ -27,11 +27,13 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-external-wikis'); $adminlib->remove_extwiki($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-external-wikis'); $adminlib->replace_extwiki($_REQUEST["extwikiId"], $_REQUEST["extwiki"],$_REQUEST['name']); $info = Array(); @@ -81,6 +83,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-external-wikis'); // Display the template @@ -89,4 +92,3 @@ ?> - Index: tiki-admin_forums.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_forums.php,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -w -u -r1.12.2.1 -r1.12.2.2 --- tiki-admin_forums.php 25 Jul 2003 00:33:34 -0000 1.12.2.1 +++ tiki-admin_forums.php 24 Dec 2003 23:01:26 -0000 1.12.2.2 @@ -144,10 +144,12 @@ $smarty->assign_by_ref('users',$users); if(isset($_REQUEST["remove"])) { + check_ticket('admin-forums'); $commentslib->remove_forum($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-forums'); if(isset($_REQUEST["controlFlood"])&&$_REQUEST["controlFlood"]=='on') { $controlFlood='y'; } else { @@ -379,6 +381,8 @@ $sections = $tikilib->get_forum_sections(); $smarty->assign_by_ref('sections',$sections); + +ask_ticket('admin-forums'); // Display the template $smarty->assign('mid','tiki-admin_forums.tpl'); Index: tiki-admin_hotwords.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_hotwords.php,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -w -u -r1.4 -r1.4.4.1 --- tiki-admin_hotwords.php 21 Mar 2003 18:55:20 -0000 1.4 +++ tiki-admin_hotwords.php 24 Dec 2003 23:01:28 -0000 1.4.4.1 @@ -20,10 +20,12 @@ // Process the form to add a user here if(isset($_REQUEST["add"])) { + check_ticket('admin-hotwords'); $hotwordlib->add_hotword($_REQUEST["word"],$_REQUEST["url"]); } if(isset($_REQUEST["remove"])&&!empty($_REQUEST["remove"])) { + check_ticket('admin-hotwords'); $hotwordlib->remove_hotword($_REQUEST["remove"]); } @@ -74,6 +76,8 @@ // Get users (list of users) $smarty->assign_by_ref('words',$words["data"]); +ask_ticket('admin-hotwords'); + // Display the template $smarty->assign('mid','tiki-admin_hotwords.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_html_page_content.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_html_page_content.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-admin_html_page_content.php 20 Mar 2003 19:59:36 -0000 1.3 +++ tiki-admin_html_page_content.php 24 Dec 2003 23:01:28 -0000 1.3.4.1 @@ -47,6 +47,7 @@ */ if(isset($_REQUEST["editmany"])) { + check_ticket('admin-html-page-content'); $zones = $htmlpageslib->list_html_page_content($_REQUEST["pageName"],0,-1,'zone_asc',''); for($i=0;$ireplace_html_page_content($_REQUEST["pageName"], $_REQUEST["zone"],$_REQUEST["content"]); $smarty->assign('zone',''); @@ -103,6 +105,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-html-page-content'); // Display the template $smarty->assign('mid','tiki-admin_html_page_content.tpl'); Index: tiki-admin_html_pages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_html_pages.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-admin_html_pages.php 20 Mar 2003 19:59:36 -0000 1.3 +++ tiki-admin_html_pages.php 24 Dec 2003 23:01:28 -0000 1.3.4.1 @@ -34,6 +34,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-html-pages'); $htmlpageslib->remove_html_page($_REQUEST["remove"]); } @@ -57,6 +58,7 @@ } if(isset($_REQUEST["save"]) && !empty($_REQUEST["pageName"])) { + check_ticket('admin-html-pages'); $tid = $htmlpageslib->replace_html_page($_REQUEST["pageName"], $_REQUEST["type"],$_REQUEST["content"],$_REQUEST["refresh"]); $smarty->assign("pageName",''); $info["pageName"]=''; @@ -111,6 +113,7 @@ } $smarty->assign_by_ref('templates',$templates["data"]); +ask_ticket('admin-html-pages'); // Display the template $smarty->assign('mid','tiki-admin_html_pages.tpl'); Index: tiki-admin_include_blogs.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_blogs.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_blogs.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_blogs.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,11 +1,13 @@ set_preference("home_blog",$_REQUEST["homeBlog"]); $smarty->assign('home_blog',$_REQUEST["homeBlog"]); } if(isset($_REQUEST["blogfeatures"])) { + check_ticket('admin-inc-blogs'); if(isset($_REQUEST["feature_blog_rankings"]) && $_REQUEST["feature_blog_rankings"]=="on") { $tikilib->set_preference("feature_blog_rankings",'y'); $smarty->assign("feature_blog_rankings",'y'); @@ -45,6 +47,7 @@ } if(isset($_REQUEST['bloglistconf'])) { + check_ticket('admin-inc-blogs'); if(isset($_REQUEST["blog_list_title"]) && $_REQUEST["blog_list_title"]=="on") { $tikilib->set_preference("blog_list_title",'y'); $smarty->assign("blog_list_title",'y'); @@ -116,6 +119,7 @@ } if(isset($_REQUEST["blogcomprefs"])) { + check_ticket('admin-inc-blogs'); if(isset($_REQUEST["blog_comments_per_page"])) { $tikilib->set_preference("blog_comments_per_page",$_REQUEST["blog_comments_per_page"]); $smarty->assign('blog_comments_per_page',$_REQUEST["blog_comments_per_page"]); @@ -125,6 +129,8 @@ $smarty->assign('blog_comments_default_ordering',$_REQUEST["blog_comments_default_ordering"]); } } + +ask_ticket('admin-inc-blogs'); $blogs=$tikilib->list_blogs(0,-1,'created_desc',''); $smarty->assign_by_ref('blogs',$blogs["data"]); Index: tiki-admin_include_cms.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_cms.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_cms.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_cms.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference("feature_cms_rankings",'y'); @@ -36,6 +37,7 @@ } if(isset($_REQUEST["cmsprefs"])) { + check_ticket('admin-inc-cms'); if(isset($_REQUEST["maxArticles"])) { $tikilib->set_preference("maxArticles",$_REQUEST["maxArticles"]); $smarty->assign('maxArticles',$_REQUEST["maxArticles"]); @@ -44,6 +46,7 @@ } if(isset($_REQUEST["articlecomprefs"])) { + check_ticket('admin-inc-cms'); if(isset($_REQUEST["article_comments_per_page"])) { $tikilib->set_preference("article_comments_per_page",$_REQUEST["article_comments_per_page"]); $smarty->assign('article_comments_per_page',$_REQUEST["article_comments_per_page"]); @@ -55,6 +58,7 @@ } if(isset($_REQUEST['artlist'])) { + check_ticket('admin-inc-cms'); if(isset($_REQUEST['art_list_title'])) { $tikilib->set_preference('art_list_title','y'); } else { @@ -98,5 +102,7 @@ } $smarty->assign('art_list_img',isset($_REQUEST['art_list_img'])?'y':'n'); } + +ask_ticket('admin-inc-cms'); ?> Index: tiki-admin_include_directory.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_directory.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_directory.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_directory.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference('directory_validate_urls','y'); $smarty->assign('directory_validate_urls','y'); @@ -15,5 +16,5 @@ $smarty->assign('directory_links_per_page',$_REQUEST['directory_links_per_page']); $smarty->assign('directory_open_links',$_REQUEST['directory_open_links']); } - +ask_ticket('admin-inc-directory'); ?> Index: tiki-admin_include_faqs.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_faqs.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_faqs.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_faqs.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference("faq_comments_per_page",$_REQUEST["faq_comments_per_page"]); $smarty->assign('faq_comments_per_page',$_REQUEST["faq_comments_per_page"]); @@ -17,5 +18,5 @@ $smarty->assign("feature_faq_comments",'n'); } } - +ask_ticket('admin-inc-faqs'); ?> Index: tiki-admin_include_features.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_features.php,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.7 diff -u -w -u -r1.1.2.5 -r1.1.2.7 --- tiki-admin_include_features.php 24 Jul 2003 22:05:10 -0000 1.1.2.5 +++ tiki-admin_include_features.php 24 Dec 2003 23:01:28 -0000 1.1.2.7 @@ -14,6 +14,7 @@ "feature_chat", "feature_comm", "feature_contact", + "contact_anon", "feature_custom_home", "feature_debug_console", "feature_directory", @@ -69,9 +70,10 @@ // Process Features form(s) if (isset($_REQUEST["features"])) { + check_ticket('admin-inc-features'); foreach ($features_toggles as $toggle) { simple_set_toggle( $toggle ); } } - +ask_ticket('admin-inc-features'); ?> \ No newline at end of file Index: tiki-admin_include_fgal.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_fgal.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_fgal.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_fgal.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,11 +1,13 @@ set_preference("home_file_gallery",$_REQUEST["homeFileGallery"]); $smarty->assign('home_file_gallery',$_REQUEST["homeFileGallery"]); } if(isset($_REQUEST["filegalfeatures"])) { + check_ticket('admin-inc-fgal'); if(isset($_REQUEST["feature_file_galleries_rankings"]) && $_REQUEST["feature_file_galleries_rankings"]=="on") { $tikilib->set_preference("feature_file_galleries_rankings",'y'); @@ -35,6 +37,7 @@ } if(isset($_REQUEST["filegallistprefs"])) { + check_ticket('admin-inc-fgal'); if(isset($_REQUEST["fgal_list_name"])) { $tikilib->set_preference("fgal_list_name",'y'); $smarty->assign('fgal_list_name','y'); @@ -87,6 +90,7 @@ } if(isset($_REQUEST["filegalcomprefs"])) { + check_ticket('admin-inc-fgal'); if(isset($_REQUEST["file_galleries_comments_per_page"])) { $tikilib->set_preference("file_galleries_comments_per_page",$_REQUEST["file_galleries_comments_per_page"]); $smarty->assign('file_galleries_comments_per_page',$_REQUEST["file_galleries_comments_per_page"]); @@ -103,4 +107,5 @@ $smarty->assign( "fgal_match_regex", $tikilib->get_preference( "fgal_match_regex", '' ) ); +ask_ticket('admin-inc-fgal'); ?> Index: tiki-admin_include_forums.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_forums.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_forums.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_forums.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,11 +1,13 @@ set_preference("home_forum",$_REQUEST["homeForum"]); $smarty->assign('home_forum',$_REQUEST["homeForum"]); } if(isset($_REQUEST["forumprefs"])) { + check_ticket('admin-inc-forums'); if(isset($_REQUEST["feature_forum_rankings"]) && $_REQUEST["feature_forum_rankings"]=="on") { $tikilib->set_preference("feature_forum_rankings",'y'); $smarty->assign("feature_forum_rankings",'y'); @@ -44,6 +46,7 @@ } if(isset($_REQUEST["forumlistprefs"])) { + check_ticket('admin-inc-forums'); if(isset($_REQUEST["forum_list_topics"]) && $_REQUEST["forum_list_topics"]=="on") { $tikilib->set_preference("forum_list_topics",'y'); $smarty->assign("forum_list_topics",'y'); @@ -94,4 +97,5 @@ $forums = $commentslib->list_forums(0,-1,'name_desc',''); $smarty->assign_by_ref('forums',$forums["data"]); +ask_ticket('admin-inc-forums'); ?> Index: tiki-admin_include_gal.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_gal.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_gal.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_gal.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -3,11 +3,13 @@ include_once('lib/imagegals/imagegallib.php'); if(isset($_REQUEST["galset"])&&isset($_REQUEST["homeGallery"])) { + check_ticket('admin-inc-gal'); $tikilib->set_preference("home_gallery",$_REQUEST["homeGallery"]); $smarty->assign('home_gallery',$_REQUEST["homeGallery"]); } if(isset($_REQUEST["galfeatures"])) { + check_ticket('admin-inc-gal'); if(isset($_REQUEST["feature_gal_rankings"]) && $_REQUEST["feature_gal_rankings"]=="on") { $tikilib->set_preference("feature_gal_rankings",'y'); @@ -39,10 +41,12 @@ } if(isset($_REQUEST["rmvorphimg"])) { + check_ticket('admin-inc-gal'); $adminlib->remove_orphan_images(); } if(isset($_REQUEST['imagegallistprefs'])) { + check_ticket('admin-inc-gal'); if(isset($_REQUEST["gal_list_name"]) && $_REQUEST["gal_list_name"]=="on") { $tikilib->set_preference("gal_list_name",'y'); $smarty->assign("gal_list_name",'y'); @@ -96,6 +100,7 @@ } if(isset($_REQUEST["imagegalcomprefs"])) { + check_ticket('admin-inc-gal'); if(isset($_REQUEST["image_galleries_comments_per_page"])) { $tikilib->set_preference("image_galleries_comments_per_page",$_REQUEST["image_galleries_comments_per_page"]); $smarty->assign('image_galleries_comments_per_page',$_REQUEST["image_galleries_comments_per_page"]); @@ -111,5 +116,5 @@ $smarty->assign( "gal_match_regex", $tikilib->get_preference( "gal_match_regex", '' ) ); - +ask_ticket('admin-inc-gal'); ?> Index: tiki-admin_include_general.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_general.php,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -w -u -r1.1.2.5 -r1.1.2.6 --- tiki-admin_include_general.php 10 Aug 2003 20:46:24 -0000 1.1.2.5 +++ tiki-admin_include_general.php 24 Dec 2003 23:01:28 -0000 1.1.2.6 @@ -6,6 +6,7 @@ // Handle Update if (isset( $_REQUEST["prefs"] )) { + check_ticket('admin-inc-general'); $pref_toggles = array( "anonCanEdit", @@ -73,6 +74,7 @@ // Handle Password Change Request else if (isset($_REQUEST["newadminpass"])) { + check_ticket('admin-inc-general'); if ($_REQUEST["adminpass"] <> $_REQUEST["again"]) { $smarty->assign( "msg", tra("The passwords dont match") ); @@ -205,4 +207,5 @@ $short_time_format = $tikilib->get_preference( "short_time_format", "%H:%M %Z" ); $smarty->assign_by_ref( "short_time_format", $short_time_format ); +ask_ticket('admin-inc-general'); ?> Index: tiki-admin_include_login.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_login.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -w -u -r1.1.2.2 -r1.1.2.3 --- tiki-admin_include_login.php 15 Aug 2003 18:55:52 -0000 1.1.2.2 +++ tiki-admin_include_login.php 24 Dec 2003 23:01:28 -0000 1.1.2.3 @@ -1,6 +1,7 @@ set_preference("change_theme",'y'); $smarty->assign('change_theme','y'); @@ -152,6 +153,7 @@ } if(isset($_REQUEST["auth_pear"])) { + check_ticket('admin-inc-login'); if(isset($_REQUEST["auth_create_user_tiki"]) && $_REQUEST["auth_create_user_tiki"]=="on") { $tikilib->set_preference("auth_create_user_tiki",'y'); @@ -266,4 +268,5 @@ $tikilib->get_preference( "forgotPass", 'n' ) ); +ask_ticket('admin-inc-login'); ?> Index: tiki-admin_include_polls.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_polls.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_polls.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_polls.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference("poll_comments_per_page",$_REQUEST["poll_comments_per_page"]); $smarty->assign('poll_comments_per_page',$_REQUEST["poll_comments_per_page"]); @@ -17,5 +18,5 @@ $smarty->assign("feature_poll_comments",'n'); } } - +ask_ticket('admin-inc-polls'); ?> Index: tiki-admin_include_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_rss.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_rss.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_rss.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference('max_rss_articles',$_REQUEST["max_rss_blogs"]); $smarty->assign("max_rss_blogs",$_REQUEST["max_rss_blogs"]); $tikilib->set_preference('max_rss_image_galleries',$_REQUEST["max_rss_image_galleries"]); @@ -104,4 +105,5 @@ $smarty->assign("max_rss_image_gallery", $tikilib->get_preference("max_rss_image_gallery",10)); } +ask_ticket('admin-inc-rss'); ?> Index: tiki-admin_include_trackers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_trackers.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_trackers.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_trackers.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,10 +1,11 @@ set_preference('t_use_db',$_REQUEST["t_use_db"]); $tikilib->set_preference('t_use_dir',$_REQUEST["t_use_dir"]); $smarty->assign('t_use_db',$_REQUEST["t_use_db"]); $smarty->assign('t_use_dir',$_REQUEST["t_use_dir"]); } - +ask_ticket('admin-inc-trackers'); ?> Index: tiki-admin_include_userfiles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_userfiles.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_userfiles.php 22 Jul 2003 17:41:07 -0000 1.1.2.1 +++ tiki-admin_include_userfiles.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -1,6 +1,7 @@ set_preference("uf_use_db",$_REQUEST["uf_use_db"]); $tikilib->set_preference("uf_use_dir",$_REQUEST["uf_use_dir"]); $tikilib->set_preference("userfiles_quota",$_REQUEST["userfiles_quota"]); @@ -8,5 +9,5 @@ $smarty->assign('uf_use_dir',$_REQUEST["uf_use_dir"]); $smarty->assign('userfiles_quota',$_REQUEST['userfiles_quota']); } - +ask_ticket('admin-inc-userfiles'); ?> Index: tiki-admin_include_webmail.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_webmail.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- tiki-admin_include_webmail.php 22 Jul 2003 17:41:08 -0000 1.1.2.1 +++ tiki-admin_include_webmail.php 24 Dec 2003 23:01:28 -0000 1.1.2.2 @@ -3,6 +3,7 @@ include_once ("lib/webmail/htmlMimeMail.php"); if(isset($_REQUEST["webmail"])) { + check_ticket('admin-inc-webmail'); if(isset($_REQUEST["webmail_view_html"]) && $_REQUEST["webmail_view_html"]=="on") { $tikilib->set_preference("webmail_view_html",'y'); $smarty->assign('webmail_view_html','y'); @@ -13,5 +14,5 @@ $tikilib->set_preference('webmail_max_attachment',$_REQUEST["webmail_max_attachment"]); $smarty->assign('webmail_max_attachment',$_REQUEST["webmail_max_attachment"]); } - +ask_ticket('admin-inc-webmail'); ?> Index: tiki-admin_include_wiki.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_wiki.php,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -w -u -r1.1.2.4 -r1.1.2.5 --- tiki-admin_include_wiki.php 20 Sep 2003 09:13:01 -0000 1.1.2.4 +++ tiki-admin_include_wiki.php 24 Dec 2003 23:01:28 -0000 1.1.2.5 @@ -1,6 +1,7 @@ tag_exists($_REQUEST["tagname"])) { $smarty->assign('msg',tra("Tag already exists")); @@ -21,6 +23,7 @@ } if(isset($_REQUEST["restoretag"])) { + check_ticket('admin-inc-wiki'); // Check existance if(!$adminlib->tag_exists($_REQUEST["tagname"])) { $smarty->assign('msg',tra("Tag not found")); @@ -31,6 +34,7 @@ } if(isset($_REQUEST["removetag"])) { + check_ticket('admin-inc-wiki'); // Check existance $adminlib->remove_tag($_REQUEST["tagname"]); } @@ -47,6 +51,7 @@ } if(isset($_REQUEST["wikiattprefs"])) { + check_ticket('admin-inc-wiki'); $tikilib->set_preference('w_use_db',$_REQUEST["w_use_db"]); $tikilib->set_preference('w_use_dir',$_REQUEST["w_use_dir"]); $smarty->assign('w_use_db',$_REQUEST["w_use_db"]); @@ -61,15 +66,18 @@ } if(isset($_REQUEST["rmvunusedpic"])) { + check_ticket('admin-inc-wiki'); $adminlib->remove_unused_pictures(); } if(isset($_REQUEST["setwikihome"])) { + check_ticket('admin-inc-wiki'); $tikilib->set_preference('wikiHomePage',$_REQUEST["wikiHomePage"]); $smarty->assign('wikiHomePage',$_REQUEST["wikiHomePage"]); } if(isset($_REQUEST["wikidiscussprefs"])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST["feature_wiki_discuss"])) { $tikilib->set_preference('feature_wiki_discuss','y'); $smarty->assign('feature_wiki_discuss','y'); @@ -96,11 +104,13 @@ } if(isset($_REQUEST["setwikiregex"])) { + check_ticket('admin-inc-wiki'); $tikilib->set_preference('wiki_page_regex',$_REQUEST["wiki_page_regex"]); $smarty->assign('wiki_page_regex',$_REQUEST["wiki_page_regex"]); } if(isset($_REQUEST['wikilistprefs'])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST['wiki_list_name'])) { $tikilib->set_preference('wiki_list_name','y'); } else { @@ -190,6 +200,7 @@ } if(isset($_REQUEST["wikifeatures"])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST["feature_lastChanges"]) && $_REQUEST["feature_lastChanges"]=="on") { $tikilib->set_preference("feature_lastChanges",'y'); $smarty->assign("feature_lastChanges",'y'); @@ -416,6 +427,7 @@ } if(isset($_REQUEST["wikisetprefs"])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST["maxVersions"])) { $tikilib->set_preference("maxVersions",$_REQUEST["maxVersions"]); } @@ -426,6 +438,7 @@ } if(isset($_REQUEST["wikisetcopyright"])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST["wiki_feature_copyrights"]) && $_REQUEST["wiki_feature_copyrights"]=="on") { $tikilib->set_preference("wiki_feature_copyrights",'y'); $smarty->assign("wiki_feature_copyrights",'y'); @@ -444,6 +457,7 @@ } if(isset($_REQUEST["wikisetwatch"])) { + check_ticket('admin-inc-wiki'); if(isset($_REQUEST["wiki_watch_author"]) && $_REQUEST["wiki_watch_author"]=="on") { $tikilib->set_preference("wiki_watch_author",'y'); $smarty->assign("wiki_watch_author",'y'); @@ -477,5 +491,5 @@ $smarty->assign( "keep_versions", $tikilib->get_preference( "keep_versions", 1 ) ); - +ask_ticket('admin-inc-wiki'); ?> Index: tiki-admin_layout.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_layout.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-admin_layout.php 15 May 2003 20:44:07 -0000 1.6 +++ tiki-admin_layout.php 24 Dec 2003 23:01:28 -0000 1.6.2.1 @@ -33,6 +33,7 @@ foreach($sections as $section) { if(isset($_REQUEST["${section}_layout"])) { + check_ticket('admin-layout'); if(isset($_REQUEST["${section}_left_column"]) && $_REQUEST["${section}_left_column"]=="on") { $tikilib->set_preference("${section}_left_column",'y'); @@ -77,10 +78,10 @@ } $smarty->assign('sections',$sections_smt); +ask_ticket('admin-layout'); // Display the template $smarty->assign('mid','tiki-admin_layout.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); - ?> Index: tiki-admin_links.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_links.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-admin_links.php 16 May 2003 18:33:05 -0000 1.7 +++ tiki-admin_links.php 24 Dec 2003 23:01:28 -0000 1.7.2.1 @@ -22,6 +22,7 @@ $smarty->assign('position',1); if(isset($_REQUEST["generate"])) { + check_ticket('admin-links'); $flinkslib->generate_featured_links_positions(); } @@ -43,6 +44,7 @@ $smarty->assign('editurl',$_REQUEST["editurl"]); if(isset($_REQUEST["add"])) { + check_ticket('admin-links'); if(!empty($_REQUEST["url"]) && !empty($_REQUEST["url"])) { if($_REQUEST["editurl"]==0) { $flinkslib->add_featured_link($_REQUEST["url"],$_REQUEST["title"],'',$_REQUEST["position"],$_REQUEST["type"]); @@ -59,6 +61,7 @@ $links=$tikilib->get_featured_links(999999); $smarty->assign_by_ref('links',$links); +ask_ticket('admin-links'); $smarty->assign('mid','tiki-admin_links.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_mailin.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_mailin.php,v retrieving revision 1.2 retrieving revision 1.2.2.2 diff -u -w -u -r1.2 -r1.2.2.2 --- tiki-admin_mailin.php 19 Jun 2003 21:18:52 -0000 1.2 +++ tiki-admin_mailin.php 24 Dec 2003 23:01:28 -0000 1.2.2.2 @@ -4,14 +4,22 @@ require_once('tiki-setup.php'); include_once('lib/mailin/mailinlib.php'); +if ($tiki_p_admin_mailin != 'y' and $tiki_p_admin != 'y') { + $smarty->assign('msg', tra("You dont have permission to use this feature")); + $smarty->display("error.tpl"); + die; +} + // Add a new mail account for the user here if(!isset($_REQUEST["accountId"])) $_REQUEST["accountId"]=0; $smarty->assign('accountId',$_REQUEST["accountId"]); if(isset($_REQUEST["new_acc"])) { + check_ticket('admin-mailin'); $mailinlib->replace_mailin_account($_REQUEST["accountId"],$_REQUEST["account"],$_REQUEST["pop"],$_REQUEST["port"],$_REQUEST["username"],$_REQUEST["pass"],$_REQUEST["smtp"],$_REQUEST["useAuth"],$_REQUEST["smtpPort"],$_REQUEST["type"],$_REQUEST["active"]); $_REQUEST["accountId"]=0; } if(isset($_REQUEST["remove"])) { + check_ticket('admin-mailin'); $mailinlib->remove_mailin_account($_REQUEST["remove"]); } if($_REQUEST["accountId"]) { @@ -32,6 +40,8 @@ // List $accounts = $mailinlib->list_mailin_accounts(0,-1,'account_asc',''); $smarty->assign('accounts',$accounts["data"]); + +ask_ticket('admin-mailin'); $smarty->assign('mid','tiki-admin_mailin.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_menu_options.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_menu_options.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-admin_menu_options.php 21 Mar 2003 14:42:43 -0000 1.6 +++ tiki-admin_menu_options.php 24 Dec 2003 23:01:28 -0000 1.6.4.1 @@ -42,12 +42,14 @@ $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); } if(isset($_REQUEST["save"])) { + check_ticket('admin-menu-options'); $menulib->replace_menu_option($_REQUEST["menuId"], $_REQUEST["optionId"], $_REQUEST["name"], $_REQUEST["url"], $_REQUEST["type"],$_REQUEST["position"]); $smarty->assign('position',$_REQUEST["position"]+1); $smarty->assign('name',''); @@ -95,6 +97,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-menu-options'); // Display the template $smarty->assign('mid','tiki-admin_menu_options.tpl'); Index: tiki-admin_menus.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_menus.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-admin_menus.php 21 Mar 2003 14:42:43 -0000 1.5 +++ tiki-admin_menus.php 24 Dec 2003 23:01:28 -0000 1.5.4.1 @@ -28,10 +28,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-menus'); $menulib->remove_menu($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-menus'); $menulib->replace_menu($_REQUEST["menuId"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["type"]); $smarty->assign('name',''); @@ -81,6 +83,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-menus'); // Display the template $smarty->assign('mid','tiki-admin_menus.tpl'); Index: tiki-admin_modules.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_modules.php,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -w -u -r1.21 -r1.21.2.1 --- tiki-admin_modules.php 24 Jun 2003 21:04:46 -0000 1.21 +++ tiki-admin_modules.php 24 Dec 2003 23:01:28 -0000 1.21.2.1 @@ -52,6 +52,7 @@ $smarty->assign('assign_params',''); if(isset($_REQUEST["clear_cache"])) { + check_ticket('admin-modules'); $h = opendir("modules/cache/$tikidomain"); while (($file = readdir($h)) !== false) { if(substr($file,0,3)=='mod') { @@ -65,6 +66,7 @@ $module_groups=Array(); if(isset($_REQUEST["edit_assign"])) { + check_ticket('admin-modules'); $_REQUEST["edit_assign"]=urldecode($_REQUEST["edit_assign"]); $info = $modlib->get_assigned_module($_REQUEST["edit_assign"]); $grps=''; @@ -93,16 +95,19 @@ } if(isset($_REQUEST["unassign"])) { + check_ticket('admin-modules'); $_REQUEST["unassign"]=urldecode($_REQUEST["unassign"]); $modlib->unassign_module($_REQUEST["unassign"]); } if(isset($_REQUEST["modup"])) { + check_ticket('admin-modules'); $_REQUEST["modup"]=urldecode($_REQUEST["modup"]); $modlib->module_up($_REQUEST["modup"]); } if(isset($_REQUEST["moddown"])) { + check_ticket('admin-modules'); $_REQUEST["moddown"]=urldecode($_REQUEST["moddown"]); $modlib->module_down($_REQUEST["moddown"]); } @@ -110,6 +115,7 @@ /* Edit or delete a user module */ if(isset($_REQUEST["um_update"])) { + check_ticket('admin-modules'); $_REQUEST["um_update"]=urldecode($_REQUEST["um_update"]); $smarty->assign_by_ref('um_name',$_REQUEST["um_name"]); $smarty->assign_by_ref('um_title',$_REQUEST["um_title"]); @@ -160,6 +166,7 @@ } if(isset($_REQUEST["assign"])) { + check_ticket('admin-modules'); $_REQUEST["assign"]=urldecode($_REQUEST["assign"]); $smarty->assign_by_ref('assign_name',$_REQUEST["assign_name"]); //$smarty->assign_by_ref('assign_title',$_REQUEST["assign_title"]); @@ -179,6 +186,7 @@ } if(isset($_REQUEST["um_remove"])) { + check_ticket('admin-modules'); $_REQUEST["um_remove"]=urldecode($_REQUEST["um_remove"]); $modlib->remove_user_module($_REQUEST["um_remove"]); } @@ -232,6 +240,8 @@ $sameurl_elements = Array('offset','sort_mode','where','find'); +ask_ticket('admin-modules'); + $smarty->assign('mid','tiki-admin_modules.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_newsletter_subscriptions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_newsletter_subscriptions.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-admin_newsletter_subscriptions.php 2 Jan 2003 17:23:37 -0000 1.3 +++ tiki-admin_newsletter_subscriptions.php 24 Dec 2003 23:01:30 -0000 1.3.6.1 @@ -53,14 +53,17 @@ $smarty->assign('nl_info',$info); if(isset($_REQUEST["remove"])) { + check_ticket('admin-nl-subsriptions'); $nllib->remove_newsletter_subscription($_REQUEST["remove"],$_REQUEST["email"]); } if(isset($_REQUEST["add_all"])) { + check_ticket('admin-nl-subsriptions'); $nllib->add_all_users($_REQUEST["nlId"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-nl-subsriptions'); $sid = $nllib->newsletter_subscribe($_REQUEST["nlId"],$_REQUEST["email"]); } @@ -120,7 +123,7 @@ $cat_objid = $_REQUEST["nlId"]; include_once("categorize_list.php"); */ - +ask_ticket('admin-nl-subsriptions'); // Display the template $smarty->assign('mid','tiki-admin_newsletter_subscriptions.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_newsletters.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_newsletters.php,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -w -u -r1.2 -r1.2.6.1 --- tiki-admin_newsletters.php 1 Jan 2003 23:15:04 -0000 1.2 +++ tiki-admin_newsletters.php 24 Dec 2003 23:01:30 -0000 1.2.6.1 @@ -52,10 +52,12 @@ $smarty->assign('info',$info); if(isset($_REQUEST["remove"])) { + check_ticket('admin-nl'); $nllib->remove_newsletter($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-nl'); if(isset($_REQUEST["allowAnySub"])&&$_REQUEST["allowAnySub"]=='on') { $_REQUEST["allowAnySub"]='y'; } else { @@ -135,6 +137,8 @@ $cat_objid = $_REQUEST["nlId"]; include_once("categorize_list.php"); */ + +ask_ticket('admin-nl'); // Display the template $smarty->assign('mid','tiki-admin_newsletters.tpl'); Index: tiki-admin_notifications.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_notifications.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-admin_notifications.php 21 Mar 2003 17:34:51 -0000 1.3 +++ tiki-admin_notifications.php 24 Dec 2003 23:01:30 -0000 1.3.4.1 @@ -10,10 +10,12 @@ } if(isset($_REQUEST["add"])) { + check_ticket('admin-notif'); $notificationlib->add_mail_event($_REQUEST["event"],'*',$_REQUEST["email"]); } if(isset($_REQUEST["removeevent"])) { + check_ticket('admin-notif'); $notificationlib->remove_mail_event($_REQUEST["removeevent"],$_REQUEST["object"],$_REQUEST["email"]); } @@ -60,8 +62,7 @@ $admin_mail=$tikilib->get_user_email('admin'); $smarty->assign('admin_mail',$admin_mail); - - +ask_ticket('admin-notif'); // Display the template $smarty->assign('mid','tiki-admin_notifications.tpl'); Index: tiki-admin_poll_options.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_poll_options.php,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -w -u -r1.8 -r1.8.4.1 --- tiki-admin_poll_options.php 4 Apr 2003 21:19:24 -0000 1.8 +++ tiki-admin_poll_options.php 24 Dec 2003 23:01:30 -0000 1.8.4.1 @@ -42,10 +42,12 @@ $smarty->assign('votes',$info["votes"]); if(isset($_REQUEST["remove"])) { + check_ticket('admin-poll-options'); $polllib->remove_poll_option($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-poll-options'); $polllib->replace_poll_option($_REQUEST["pollId"], $_REQUEST["optionId"], $_REQUEST["title"]); } @@ -88,6 +90,7 @@ $smarty->assign('ownurl',httpPrefix().$_SERVER["REQUEST_URI"]); $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-poll-options'); // Display the template $smarty->assign('mid','tiki-admin_poll_options.tpl'); Index: tiki-admin_polls.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_polls.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-admin_polls.php 4 Apr 2003 21:19:24 -0000 1.6 +++ tiki-admin_polls.php 24 Dec 2003 23:01:30 -0000 1.6.4.1 @@ -19,12 +19,15 @@ $smarty->assign('pollId',$_REQUEST["pollId"]); if(isset($_REQUEST["setlast"])) { + check_ticket('admin-polls'); $polllib->set_last_poll(); } if(isset($_REQUEST["closeall"])) { + check_ticket('admin-polls'); $polllib->close_all_polls(); } if(isset($_REQUEST["activeall"])) { + check_ticket('admin-polls'); $polllib->active_all_polls(); } @@ -43,10 +46,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-polls'); $polllib->remove_poll($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-polls'); $publishDate = mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0, $_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"]); @@ -104,7 +109,7 @@ $cat_objid = $_REQUEST["pollId"]; include_once("categorize_list.php"); - +ask_ticket('admin-polls'); // Display the template $smarty->assign('mid','tiki-admin_polls.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_rssmodules.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_rssmodules.php,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -w -u -r1.8 -r1.8.4.1 --- tiki-admin_rssmodules.php 4 Apr 2003 21:19:24 -0000 1.8 +++ tiki-admin_rssmodules.php 24 Dec 2003 23:01:30 -0000 1.8.4.1 @@ -43,10 +43,12 @@ $smarty->assign('refresh',$info["refresh"]); if(isset($_REQUEST["remove"])) { + check_ticket('admin-rssmodules'); $rsslib->remove_rss_module($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-rssmodules'); $rsslib->replace_rss_module($_REQUEST["rssId"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["url"], $_REQUEST["refresh"]); $smarty->assign('rssId',0); $smarty->assign('name',''); @@ -96,6 +98,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-rssmodules'); // Display the template $smarty->assign('mid','tiki-admin_rssmodules.tpl'); Index: tiki-admin_structures.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_structures.php,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -w -u -r1.6.2.2 -r1.6.2.3 --- tiki-admin_structures.php 16 Oct 2003 20:21:32 -0000 1.6.2.2 +++ tiki-admin_structures.php 24 Dec 2003 23:01:30 -0000 1.6.2.3 @@ -11,17 +11,21 @@ } if(isset($_REQUEST['rremove'])) { + check_ticket('admin-structures'); $structlib->s_remove_page($_REQUEST["rremove"],false); } if(isset($_REQUEST['rremovex'])) { + check_ticket('admin-structures'); $structlib->s_remove_page($_REQUEST["rremovex"],true); } if(isset($_REQUEST['export'])) { + check_ticket('admin-structures'); $structlib->s_export_structure($_REQUEST['export']); } if(isset($_REQUEST['export_tree'])) { + check_ticket('admin-structures'); header("content-type: text/plain"); $structlib->s_export_structure_tree($_REQUEST['export_tree']); die; @@ -30,6 +34,7 @@ $smarty->assign('askremove','n'); if(isset($_REQUEST['remove'])) { + check_ticket('admin-structures'); $smarty->assign('askremove','y'); $smarty->assign('remove',$_REQUEST['remove']); } @@ -48,6 +53,7 @@ // I.e. level depth parser too stupid... :() // if(isset($_REQUEST["create_from_tree"])) { + check_ticket('admin-structures'); $tree_lines = explode("\n",$_REQUEST["tree"]); $parents = Array(''); $previous = Array(''); @@ -107,7 +113,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); - +ask_ticket('admin-structures'); // Display the template $smarty->assign('mid','tiki-admin_structures.tpl'); Index: tiki-admin_survey_questions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_survey_questions.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-admin_survey_questions.php 3 Jan 2003 14:40:22 -0000 1.4 +++ tiki-admin_survey_questions.php 24 Dec 2003 23:01:33 -0000 1.4.6.1 @@ -63,10 +63,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('admin-survey-questions'); $srvlib->remove_survey_question($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-survey-questions'); $srvlib->replace_survey_question($_REQUEST["questionId"], $_REQUEST["question"], $_REQUEST["type"], $_REQUEST["surveyId"],$_REQUEST["position"],$_REQUEST["options"]); $info["question"]=''; $info["type"]=''; @@ -123,7 +125,7 @@ for($i=1;$i<100;$i++) $positions[]=$i; $smarty->assign('positions',$positions); - +ask_ticket('admin-survey-questions'); // Display the template $smarty->assign('mid','tiki-admin_survey_questions.tpl'); Index: tiki-admin_surveys.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_surveys.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-admin_surveys.php 3 Jan 2003 14:40:22 -0000 1.4 +++ tiki-admin_surveys.php 24 Dec 2003 23:01:33 -0000 1.4.6.1 @@ -51,10 +51,12 @@ $smarty->assign('info',$info); if(isset($_REQUEST["remove"])) { + check_ticket('admin-surveys'); $srvlib->remove_survey($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-surveys'); $sid = $srvlib->replace_survey($_REQUEST["surveyId"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["status"]); @@ -148,6 +150,7 @@ $cat_objid = $_REQUEST["surveyId"]; include_once("categorize_list.php"); +ask_ticket('admin-surveys'); // Display the template $smarty->assign('mid','tiki-admin_surveys.tpl'); Index: tiki-admin_topics.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_topics.php,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -w -u -r1.6.2.1 -r1.6.2.2 --- tiki-admin_topics.php 25 Sep 2003 15:01:48 -0000 1.6.2.1 +++ tiki-admin_topics.php 24 Dec 2003 23:01:33 -0000 1.6.2.2 @@ -19,6 +19,7 @@ if(isset($_REQUEST["addtopic"])) { + check_ticket('admin-topics'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = fread($fp,filesize($_FILES['userfile1']['tmp_name'])); @@ -40,14 +41,17 @@ } if(isset($_REQUEST["remove"])) { + check_ticket('admin-topics'); $artlib->remove_topic($_REQUEST["remove"]); } if(isset($_REQUEST["activate"])) { + check_ticket('admin-topics'); $artlib->activate_topic($_REQUEST["activate"]); } if(isset($_REQUEST["deactivate"])) { + check_ticket('admin-topics'); $artlib->deactivate_topic($_REQUEST["deactivate"]); } @@ -74,6 +78,8 @@ $smarty->assign('topics',$topics); +ask_ticket('admin-topics'); + $smarty->assign('mid','tiki-admin_topics.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-admin_tracker_fields.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_tracker_fields.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-admin_tracker_fields.php 7 Mar 2003 20:15:11 -0000 1.5 +++ tiki-admin_tracker_fields.php 24 Dec 2003 23:01:33 -0000 1.5.4.1 @@ -57,10 +57,12 @@ $smarty->assign('isTblVisible',$info["isTblVisible"]); if(isset($_REQUEST["remove"])) { + check_ticket('admin-tracker-fields'); $trklib->remove_tracker_field($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-tracker-fields'); if(isset($_REQUEST["isMain"])&&$_REQUEST["isMain"]=='on') { $isMain='y'; } else { @@ -116,6 +118,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-tracker-fields'); // Display the template $smarty->assign('mid','tiki-admin_tracker_fields.tpl'); Index: tiki-admin_trackers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_trackers.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-admin_trackers.php 3 Jan 2003 14:40:23 -0000 1.3 +++ tiki-admin_trackers.php 24 Dec 2003 23:01:33 -0000 1.3.6.1 @@ -47,10 +47,12 @@ $smarty->assign('useAttachments',$info["useAttachments"]); if(isset($_REQUEST["remove"])) { + check_ticket('admin-trackers'); $trklib->remove_tracker($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('admin-trackers'); if(isset($_REQUEST["showCreated"])&&$_REQUEST["showCreated"]=='on') { $showCreated='y'; } else { @@ -133,6 +135,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('admin-trackers'); // Display the template $smarty->assign('mid','tiki-admin_trackers.tpl'); Index: tiki-admingroups.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admingroups.php,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -w -u -r1.6.2.1 -r1.6.2.2 --- tiki-admingroups.php 21 Jul 2003 17:57:50 -0000 1.6.2.1 +++ tiki-admingroups.php 24 Dec 2003 23:01:33 -0000 1.6.2.2 @@ -13,6 +13,7 @@ // Process the form to add a group if(isset($_REQUEST["newgroup"])) { + check_ticket('admin-groups'); // Check if the user already exists if($userlib->group_exists($_REQUEST["name"])) { $smarty->assign('msg',tra("Group already exists")); @@ -33,6 +34,7 @@ // modification if(isset($_REQUEST["save"]) and isset($_REQUEST["olgroup"])) { + check_ticket('admin-groups'); $userlib->change_group(addslashes($_REQUEST["olgroup"]),addslashes($_REQUEST["name"]),addslashes($_REQUEST["desc"])); $userlib->remove_all_inclusions($_REQUEST["name"]); if (isset($_REQUEST["include_groups"])) { @@ -47,6 +49,7 @@ // Process a form to remove a group if(isset($_REQUEST["action"])) { + check_ticket('admin-groups'); if($_REQUEST["action"]=='delete') { $userlib->remove_group($_REQUEST["group"]); } @@ -126,6 +129,9 @@ } // Assign the list of groups $smarty->assign_by_ref('users',$users["data"]); + +ask_ticket('admin-groups'); + // Display the template for group administration $smarty->assign('mid','tiki-admingroups.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-adminusers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-adminusers.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -w -u -r1.8.2.1 -r1.8.2.2 --- tiki-adminusers.php 24 Sep 2003 17:58:19 -0000 1.8.2.1 +++ tiki-adminusers.php 24 Dec 2003 23:01:33 -0000 1.8.2.2 @@ -82,6 +82,7 @@ // Process the form to add a user here if(isset($_REQUEST["newuser"])) { + check_ticket('admin-users'); // if no user data entered, check if it's a batch upload if ((!$_REQUEST["name"]) and (is_uploaded_file($_FILES['csvlist']['tmp_name']))) { batchImportUsers(); @@ -107,6 +108,7 @@ // Process actions here // Remove user or remove user from group if(isset($_REQUEST["action"])) { + check_ticket('admin-users'); if($_REQUEST["action"]=='delete') { $userlib->remove_user($_REQUEST["user"]); } @@ -166,6 +168,8 @@ // Get users (list of users) $smarty->assign_by_ref('users',$users["data"]); + +ask_ticket('admin-users'); // Display the template $smarty->assign('mid','tiki-adminusers.tpl'); Index: tiki-assignpermission.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-assignpermission.php,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -w -u -r1.9 -r1.9.4.1 --- tiki-assignpermission.php 21 Mar 2003 19:56:40 -0000 1.9 +++ tiki-assignpermission.php 24 Dec 2003 23:01:33 -0000 1.9.4.1 @@ -28,6 +28,7 @@ if(isset($_REQUEST['allper'])) { + check_ticket('admin-perms'); if($_REQUEST['oper']=='assign') { $userlib->assign_level_permissions($group,$_REQUEST['level']); } else { @@ -37,6 +38,7 @@ if(isset($_REQUEST["action"])) { + check_ticket('admin-perms'); if($_REQUEST["action"]=='assign') { $userlib->assign_permission_to_group($_REQUEST["perm"],$group); } @@ -79,6 +81,7 @@ $smarty->assign('type',$_REQUEST["type"]); if(isset($_REQUEST["createlevel"])) { + check_ticket('admin-perms'); $userlib->create_dummy_level($_REQUEST['level']); } @@ -115,6 +118,8 @@ // Get users (list of users) $smarty->assign_by_ref('perms',$perms["data"]); +ask_ticket('admin-perms'); + // Display the template $smarty->assign('mid','tiki-assignpermission.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-assignuser.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-assignuser.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-assignuser.php 1 Jan 2003 23:15:04 -0000 1.3 +++ tiki-assignuser.php 24 Dec 2003 23:01:33 -0000 1.3.6.1 @@ -28,6 +28,7 @@ } if(isset($_REQUEST["action"])) { + check_ticket('admin-assign-user'); if($_REQUEST["action"]=='assign') { $userlib->assign_user_to_group($_REQUEST["assign_user"],$_REQUEST["group"]); } @@ -82,6 +83,8 @@ // Get users (list of users) $smarty->assign_by_ref('users',$users["data"]); +ask_ticket('admin-assign-user'); + // Display the template $smarty->assign('mid','tiki-assignuser.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-backlinks.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-backlinks.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-backlinks.php 27 May 2003 20:34:08 -0000 1.4 +++ tiki-backlinks.php 24 Dec 2003 23:01:33 -0000 1.4.2.1 @@ -47,6 +47,7 @@ $backlinks = $wikilib->get_backlinks($page); $smarty->assign_by_ref('backlinks',$backlinks); +ask_ticket('backlinks'); // Display the template $smarty->assign('mid','tiki-backlinks.tpl'); Index: tiki-backup.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-backup.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-backup.php 6 Jul 2003 10:24:16 -0000 1.6 +++ tiki-backup.php 24 Dec 2003 23:01:33 -0000 1.6.2.1 @@ -22,15 +22,18 @@ } if(isset($_REQUEST["rrestore"])) { + check_ticket('backup'); $backuplib->restore_database("backups/$tikidomain".$_REQUEST["rrestore"]); } if(isset($_REQUEST["remove"])) { + check_ticket('backup'); $filename = "backups/$tikidomain".$_REQUEST["remove"]; unlink($filename); } if(isset($_REQUEST["upload"])) { + check_ticket('backup'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"r"); $fw = fopen("backups/$tikidomain".$_FILES['userfile1']['name'],"w"); @@ -65,6 +68,8 @@ closedir($h); $smarty->assign_by_ref('backups',$backups); $smarty->assign('tikidomain',$tikidomain); + +ask_ticket('backup'); $smarty->assign('mid','tiki-backup.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-blog_post.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-blog_post.php,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -u -w -u -r1.19.2.1 -r1.19.2.2 --- tiki-blog_post.php 23 Jul 2003 14:14:34 -0000 1.19.2.1 +++ tiki-blog_post.php 24 Dec 2003 23:01:33 -0000 1.19.2.2 @@ -45,6 +45,7 @@ $smarty->assign_by_ref('blog_data',$blog_data); if(isset($_REQUEST['remove_image'])) { + check_ticket('blog-post'); $bloglib->remove_post_image($_REQUEST['remove_image']); } @@ -73,6 +74,7 @@ if($postId) { + check_ticket('blog-post'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = ''; @@ -116,6 +118,7 @@ if(isset($_REQUEST["save"])||isset($_REQUEST['save_exit'])) { + check_ticket('blog-post'); include_once("lib/imagegals/imagegallib.php"); $smarty->assign('individual','n'); if($userlib->object_has_one_permission($_REQUEST["blogId"],'blog')) { @@ -204,6 +207,9 @@ $smarty->assign_by_ref('blogs',$blogs); $section='blogs'; include_once('tiki-section_options.php'); + +ask_ticket('blog-post'); + // Display the Index Template $smarty->assign('mid','tiki-blog_post.tpl'); $smarty->assign('show_page_bar','n'); Index: tiki-blog_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-blog_rankings.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -w -u -r1.5.2.1 -r1.5.2.2 --- tiki-blog_rankings.php 31 Jul 2003 17:38:04 -0000 1.5.2.1 +++ tiki-blog_rankings.php 24 Dec 2003 23:01:33 -0000 1.5.2.2 @@ -57,7 +57,7 @@ $rank["y"]=$rk["y"]; $rankings[] = $rank; - +ask_ticket('blog-rankings'); $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-blog_rankings.php'); Index: tiki-browse_categories.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-browse_categories.php,v retrieving revision 1.7.4.5 retrieving revision 1.7.4.6 diff -u -w -u -r1.7.4.5 -r1.7.4.6 --- tiki-browse_categories.php 22 Oct 2003 22:56:53 -0000 1.7.4.5 +++ tiki-browse_categories.php 24 Dec 2003 23:01:33 -0000 1.7.4.6 @@ -110,6 +110,7 @@ $section='categories'; include_once('tiki-section_options.php'); +ask_ticket('browse-categories'); // Display the template $smarty->assign('mid','tiki-browse_categories.tpl'); Index: tiki-browse_gallery.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-browse_gallery.php,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -w -u -r1.11.2.1 -r1.11.2.2 --- tiki-browse_gallery.php 26 Jul 2003 00:24:37 -0000 1.11.2.1 +++ tiki-browse_gallery.php 24 Dec 2003 23:01:33 -0000 1.11.2.2 @@ -83,6 +83,7 @@ $imagegallib->add_gallery_hit($_REQUEST["galleryId"]); if(isset($_REQUEST["remove"])) { + check_ticket('browse-gallery'); // To remove an image the user must be the owner or admin if(($tiki_p_admin_galleries != 'y') && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot remove images from this gallery")); @@ -93,6 +94,7 @@ } if(isset($_REQUEST["rebuild"])) { + check_ticket('browse-gallery'); // To rebuild thumbnails the user must be the owner or admin if(($tiki_p_admin_galleries != 'y') && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot rebuild thumbnails in this gallery")); @@ -103,6 +105,7 @@ } if(isset($_REQUEST["rotateright"])) { + check_ticket('browse-gallery'); // To rotate an image the user must be the owner or admin if(($tiki_p_admin_galleries != 'y') && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot rotate images in this gallery")); @@ -113,6 +116,7 @@ } if(isset($_REQUEST["rotateleft"])) { + check_ticket('browse-gallery'); // To rotate an image the user must be the owner or admin if(($tiki_p_admin_galleries != 'y') && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot rotate images in this gallery")); @@ -234,6 +238,7 @@ include('tiki-tc.php'); } +ask_ticket('browse-gallery'); // Display the template $smarty->assign('mid','tiki-browse_gallery.tpl'); Index: tiki-browse_image.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-browse_image.php,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -w -u -r1.18.2.1 -r1.18.2.2 --- tiki-browse_image.php 22 Aug 2003 21:30:17 -0000 1.18.2.1 +++ tiki-browse_image.php 24 Dec 2003 23:01:35 -0000 1.18.2.2 @@ -174,6 +174,7 @@ // Everybody can browse images if(isset($_REQUEST["move_image"])) { + check_ticket('browse-image'); if($tiki_p_admin_galleries!='y' && (!$user || $user!=$gal_info["user"]) ) { $smarty->assign('msg',tra("Permission denied you cannot move images from this gallery")); $smarty->display("styles/$style_base/error.tpl"); @@ -229,6 +230,8 @@ $smarty->assign('feature_right_column','n'); $smarty->assign('feature_bot_bar','n'); } + +ask_ticket('browse-image'); // Display the template $smarty->assign('mid','tiki-browse_image.tpl'); Index: tiki-calendar.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-calendar.php,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -w -u -r1.12.2.1 -r1.12.2.2 --- tiki-calendar.php 16 Jul 2003 01:47:56 -0000 1.12.2.1 +++ tiki-calendar.php 24 Dec 2003 23:01:35 -0000 1.12.2.2 @@ -214,6 +214,7 @@ $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; } @@ -230,11 +231,13 @@ if (!isset($_REQUEST["status"])) $_REQUEST["status"] = 0; if (isset($_REQUEST["copy"]) and ($_REQUEST["copy"])) { + check_ticket('calendar'); $_REQUEST["calitemId"] = 0; $_REQUEST["save"] = true; } if (isset($_REQUEST["save"]) and ($_REQUEST["save"])) { + check_ticket('calendar'); if (!isset($_REQUEST["name"]) or !(trim($_REQUEST["name"]))) { $_REQUEST["name"] = tra("event without name"); } @@ -377,6 +380,7 @@ if(isset($_REQUEST['drop'])) { + check_ticket('calendar'); if (is_array($_REQUEST['drop'])) { foreach ($_REQUEST['drop'] as $dropme) { $calendarlib->drop_item($user, $dropme); @@ -510,6 +514,8 @@ $smarty->assign('daysnames',$daysnames); $smarty->assign('cell',$cell); $smarty->assign('var',''); + +ask_ticket('calendar'); $smarty->assign('mid','tiki-calendar.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-change_password.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-change_password.php,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -u -w -u -r1.4.4.2 -r1.4.4.3 --- tiki-change_password.php 19 Oct 2003 11:10:34 -0000 1.4.4.2 +++ tiki-change_password.php 24 Dec 2003 23:01:36 -0000 1.4.4.3 @@ -8,6 +8,7 @@ $smarty->assign('oldpass',$_REQUEST["oldpass"]); if(isset($_REQUEST["change"])) { + check_ticket('change-password'); if($_REQUEST["pass"]!=$_REQUEST["pass2"]) { $smarty->assign('msg',tra("The passwords didn't match")); @@ -52,6 +53,8 @@ $smarty->assign_by_ref('user',$user); header("location: $tikiIndex"); } + +ask_ticket('change-password'); // Display the template $smarty->assign('mid','tiki-change_password.tpl'); Index: tiki-charts.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-charts.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -w -u -r1.2.2.1 -r1.2.2.2 --- tiki-charts.php 22 Oct 2003 22:56:53 -0000 1.2.2.1 +++ tiki-charts.php 24 Dec 2003 23:01:36 -0000 1.2.2.2 @@ -35,6 +35,8 @@ $sameurl_elements = Array('offset','sort_mode','where','find','chartId'); +ask_ticket('charts'); + $smarty->assign('mid','tiki-charts.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> Index: tiki-chat_box.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-chat_box.php,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -w -u -r1.4 -r1.4.4.1 --- tiki-chat_box.php 21 Mar 2003 18:55:20 -0000 1.4 +++ tiki-chat_box.php 24 Dec 2003 23:01:36 -0000 1.4.4.1 @@ -13,6 +13,7 @@ // else write the message into messages // use send_message(userId,channelId,data) if(isset($_REQUEST["channelId"]) && isset($_REQUEST["nickname"])) { + check_ticket('chat'); if(isset($_REQUEST["data"])) { $data = $_REQUEST["data"]; // Recognize a private message Index: tiki-chatroom.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-chatroom.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-chatroom.php 21 Mar 2003 18:55:20 -0000 1.5 +++ tiki-chatroom.php 24 Dec 2003 23:01:36 -0000 1.5.4.1 @@ -60,6 +60,7 @@ $section='chat'; include_once('tiki-section_options.php'); +ask_ticket('chat'); // Display the template $smarty->assign('mid','tiki-chatroom.tpl'); Index: tiki-cms_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-cms_rankings.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-cms_rankings.php 16 May 2003 18:33:04 -0000 1.5 +++ tiki-cms_rankings.php 24 Dec 2003 23:01:36 -0000 1.5.2.1 @@ -57,7 +57,7 @@ $rank["y"]=$rk["y"]; $rankings[] = $rank; - +ask_ticket('cms_rankings'); $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-cms_rankings.php'); Index: tiki-config_pdf.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-config_pdf.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -w -u -r1.1 -r1.1.2.1 --- tiki-config_pdf.php 30 May 2003 03:52:26 -0000 1.1 +++ tiki-config_pdf.php 24 Dec 2003 23:01:36 -0000 1.1.2.1 @@ -107,6 +107,8 @@ $pages = $tikilib->list_pages(0, -1, 'pageName_asc',$find); $smarty->assign_by_ref('pages',$pages["data"]); +ask_ticket('pdf'); + $smarty->assign('mid','tiki-config_pdf.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> Index: tiki-contact.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-contact.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-contact.php 19 May 2003 21:52:07 -0000 1.4 +++ tiki-contact.php 24 Dec 2003 23:01:36 -0000 1.4.2.1 @@ -24,6 +24,8 @@ if($user and $feature_messages == 'y' and $tiki_p_messages == 'y') { $smarty->assign('sent',0); if(isset($_REQUEST['send'])) { + check_ticket('contact'); + $smarty->assign('sent',1); $message = ''; @@ -41,6 +43,8 @@ $smarty->assign('message',$message); } } + +ask_ticket('contact'); $smarty->assign('priority',3); Index: tiki-directory_add_site.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_add_site.php,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -w -u -r1.1.4.2 -r1.1.4.3 --- tiki-directory_add_site.php 21 Sep 2003 18:22:50 -0000 1.1.4.2 +++ tiki-directory_add_site.php 24 Dec 2003 23:01:36 -0000 1.1.4.3 @@ -62,6 +62,7 @@ $smarty->assign('save','n'); // Replace (add or edit) a site if(isset($_REQUEST["save"])) { + check_ticket('dir-add-site'); $smarty->assign('save','y'); if(empty($_REQUEST["name"])) { $smarty->assign('msg',tra("Must enter a name to add a site")); @@ -156,6 +157,8 @@ } closedir($h); $smarty->assign_by_ref('countries',$countries); + +ask_ticket('dir-add-site'); // Display the template $smarty->assign('mid','tiki-directory_add_site.tpl'); Index: tiki-directory_admin_categories.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_admin_categories.php,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -u -w -u -r1.3.4.3 -r1.3.4.4 --- tiki-directory_admin_categories.php 30 Jul 2003 07:13:24 -0000 1.3.4.3 +++ tiki-directory_admin_categories.php 24 Dec 2003 23:01:36 -0000 1.3.4.4 @@ -54,11 +54,13 @@ // Remove a category if(isset($_REQUEST["remove"])) { + check_ticket('dir-add-categ'); $dirlib->dir_remove_category($_REQUEST["remove"]); } // Replace (add or edit) a category if(isset($_REQUEST["save"])) { + check_ticket('dir-add-categ'); if(isset($_REQUEST["allowSites"])&&$_REQUEST["allowSites"]=='on') $_REQUEST["allowSites"]='y'; else $_REQUEST["allowSites"]='n'; if(isset($_REQUEST["showCount"])&&$_REQUEST["showCount"]=='on') $_REQUEST["showCount"]='y'; else $_REQUEST["showCount"]='n'; $categId = $dirlib->dir_replace_category($_REQUEST["parent"],$_REQUEST["categId"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["childrenType"], $_REQUEST["viewableChildren"], $_REQUEST["allowSites"], $_REQUEST["showCount"], $_REQUEST["editorGroup"]); @@ -102,6 +104,8 @@ $cat_objid = $_REQUEST['categId']; include_once("categorize_list.php"); +ask_ticket('dir-add-categ'); + // Display the template $smarty->assign('mid','tiki-directory_admin_categories.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-directory_admin_related.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_admin_related.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-directory_admin_related.php 18 Feb 2003 17:01:52 -0000 1.3 +++ tiki-directory_admin_related.php 24 Dec 2003 23:01:36 -0000 1.3.4.1 @@ -35,17 +35,20 @@ // Remove a relationship if(isset($_REQUEST["remove"])) { + check_ticket('dir-admin-related'); $dirlib->dir_remove_related($_REQUEST["parent"],$_REQUEST["categId"]); } // Update a relationship if(isset($_REQUEST["update"])) { + check_ticket('dir-admin-related'); $dirlib->dir_remove_related($_REQUEST["parent"],$_REQUEST["oldcategId"]); $dirlib->dir_add_categ_rel($_REQUEST["parent"],$_REQUEST["categId"]); } // Add a relationship if(isset($_REQUEST["add"])) { + check_ticket('dir-admin-related'); $dirlib->dir_add_categ_rel($_REQUEST["parent"],$_REQUEST["categId"]); if(isset($_REQUEST["mutual"])&&$_REQUEST["mutual"]=='on') { $dirlib->dir_add_categ_rel($_REQUEST["categId"],$_REQUEST["parent"]); @@ -76,6 +79,8 @@ $all_categs = $dirlib->dir_get_all_categories(0,-1,'name asc',$find); $smarty->assign('all_categs',$all_categs); +ask_ticket('dir-admin-related'); + // Display the template $smarty->assign('mid','tiki-directory_admin_related.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-directory_admin_sites.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_admin_sites.php,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -u -w -u -r1.3.4.3 -r1.3.4.4 --- tiki-directory_admin_sites.php 22 Sep 2003 12:37:15 -0000 1.3.4.3 +++ tiki-directory_admin_sites.php 24 Dec 2003 23:01:36 -0000 1.3.4.4 @@ -61,11 +61,13 @@ // Remove a category if(isset($_REQUEST["remove"])) { + check_ticket('dir-admin-sites'); $dirlib->dir_remove_site($_REQUEST["remove"]); } // Replace (add or edit) a category if(isset($_REQUEST["save"])) { + check_ticket('dir-admin-sites'); if(empty($_REQUEST["name"])) { $smarty->assign('msg',tra("Must enter a name to add a site")); $smarty->display("styles/$style_base/error.tpl"); @@ -145,6 +147,7 @@ closedir($h); $smarty->assign_by_ref('countries',$countries); +ask_ticket('dir-admin-sites'); // Display the template $smarty->assign('mid','tiki-directory_admin_sites.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-directory_browse.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_browse.php,v retrieving revision 1.2 retrieving revision 1.2.4.2 diff -u -w -u -r1.2 -r1.2.4.2 --- tiki-directory_browse.php 21 Mar 2003 20:14:51 -0000 1.2 +++ tiki-directory_browse.php 24 Dec 2003 23:01:36 -0000 1.2.4.2 @@ -79,11 +79,11 @@ $smarty->assign_by_ref('sort_mode',$sort_mode); $smarty->assign('find',$find); $items = $dirlib->dir_list_sites($_REQUEST['parent'],$offset,$directory_links_per_page,$sort_mode,'','y'); - $cant_pages = ceil($items["cant"] / $maxRecords); + $cant_pages = ceil($items["cant"] / $directory_links_per_page); $smarty->assign_by_ref('cant_pages',$cant_pages); - $smarty->assign('actual_page',1+($offset/$maxRecords)); - if($items["cant"] > ($offset+$maxRecords)) { $smarty->assign('next_offset',$offset + $maxRecords);} else { $smarty->assign('next_offset',-1); } - if($offset>0) { $smarty->assign('prev_offset',$offset - $maxRecords); } else { $smarty->assign('prev_offset',-1); } + $smarty->assign('actual_page',1+($offset/$directory_links_per_page)); + if($items["cant"] > ($offset+$directory_links_per_page)) { $smarty->assign('next_offset',$offset + $directory_links_per_page);} else { $smarty->assign('next_offset',-1); } + if($offset>0) { $smarty->assign('prev_offset',$offset - $directory_links_per_page); } else { $smarty->assign('prev_offset',-1); } $smarty->assign_by_ref('items',$items["data"]); } @@ -96,6 +96,8 @@ $stats = $dirlib->dir_stats(); $smarty->assign_by_ref('stats',$stats); + +ask_ticket('dir-browse'); $smarty->assign('mid','tiki-directory_browse.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-directory_ranking.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_ranking.php,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -w -u -r1.2 -r1.2.4.1 --- tiki-directory_ranking.php 21 Mar 2003 20:14:51 -0000 1.2 +++ tiki-directory_ranking.php 24 Dec 2003 23:01:36 -0000 1.2.4.1 @@ -37,6 +37,7 @@ $section='directory'; include_once('tiki-section_options.php'); +ask_ticket('dir-ranking'); // Display the template $smarty->assign('mid','tiki-directory_ranking.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-directory_validate_sites.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-directory_validate_sites.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-directory_validate_sites.php 4 May 2003 21:10:33 -0000 1.5 +++ tiki-directory_validate_sites.php 24 Dec 2003 23:01:36 -0000 1.5.2.1 @@ -17,17 +17,20 @@ if(isset($_REQUEST["validate"])&&isset($_REQUEST['sites'])) { + check_ticket('dir-validate'); foreach(array_keys($_REQUEST["sites"]) as $siteId) { $dirlib->dir_validate_site($siteId); } } if(isset($_REQUEST["remove"])) { + check_ticket('dir-validate'); $dirlib->dir_remove_site($_REQUEST["remove"]); } if(isset($_REQUEST["del"])&&isset($_REQUEST['sites'])) { + check_ticket('dir-validate'); foreach(array_keys($_REQUEST["sites"]) as $siteId) { $dirlib->dir_remove_site($siteId); } @@ -59,6 +62,8 @@ $smarty->assign('all_categs',$all_categs); */ +ask_ticket('dir-validate'); + // Display the template $smarty->assign('mid','tiki-directory_validate_sites.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-download_file.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-download_file.php,v retrieving revision 1.9.4.2 retrieving revision 1.9.4.3 diff -u -w -u -r1.9.4.2 -r1.9.4.3 --- tiki-download_file.php 2 Sep 2003 07:50:43 -0000 1.9.4.2 +++ tiki-download_file.php 9 Nov 2003 12:25:12 -0000 1.9.4.3 @@ -71,7 +71,7 @@ // Added by Jenolan 31/8/2003 ///////////////////////////////////////////// // File galleries should always be attachments (files) not inline (textual) -header( "Content-Disposition: attachment; filename=$file" ); +header( "Content-Disposition: attachment; filename=\"$file\"" ); //header( "Content-Disposition: inline; filename=$file" ); if( $info["path"] ) Index: tiki-edit_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_article.php,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -u -w -u -r1.17.2.5 -r1.17.2.6 --- tiki-edit_article.php 12 Aug 2003 07:45:28 -0000 1.17.2.5 +++ tiki-edit_article.php 24 Dec 2003 23:01:36 -0000 1.17.2.6 @@ -216,6 +216,7 @@ // Pro if(isset($_REQUEST["save"])) { + check_ticket('edit-article'); include_once("lib/imagegals/imagegallib.php"); # convert from the displayed 'site' time to 'server' time $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0, $_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"])); @@ -324,6 +325,8 @@ $smarty->assign('publishDate', $publishDate); $smarty->assign('publishDateSite', $dc->getDisplayDateFromServerDate($publishDate)); $smarty->assign('siteTimeZone', $dc->getTzName()); + +ask_ticket('edit-article'); // Display the Index Template $smarty->assign('mid','tiki-edit_article.tpl'); Index: tiki-edit_banner.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_banner.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -w -u -r1.8 -r1.8.2.1 --- tiki-edit_banner.php 10 Jun 2003 14:25:59 -0000 1.8 +++ tiki-edit_banner.php 24 Dec 2003 23:01:36 -0000 1.8.2.1 @@ -104,11 +104,13 @@ } if(isset($_REQUEST["removeZone"])) { + check_ticket('edit-banner'); $bannerlib->banner_remove_zone($_REQUEST["removeZone"]); } // Now assign if the set button was pressed if(isset($_REQUEST["save"]) || isset($_REQUEST["create_zone"])) { + check_ticket('edit-banner'); $fromDate = mktime(0,0,0,$_REQUEST["fromDate_Month"],$_REQUEST["fromDate_Day"],$_REQUEST["fromDate_Year"]); $toDate = mktime(0,0,0,$_REQUEST["toDate_Month"],$_REQUEST["toDate_Day"],$_REQUEST["toDate_Year"]); $fromTime = $_REQUEST["fromTimeHour"].$_REQUEST["fromTimeMinute"]; @@ -243,6 +245,7 @@ $clients = $userlib->get_users(0,-1,'login_desc', ''); $smarty->assign_by_ref('clients',$clients["data"]); +ask_ticket('edit-banner'); // Display the template $smarty->assign('mid','tiki-edit_banner.tpl'); Index: tiki-edit_blog.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_blog.php,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -u -w -u -r1.10.2.3 -r1.10.2.4 --- tiki-edit_blog.php 12 Aug 2003 08:29:14 -0000 1.10.2.3 +++ tiki-edit_blog.php 24 Dec 2003 23:01:36 -0000 1.10.2.4 @@ -108,6 +108,7 @@ if(isset($_REQUEST["save"])) { + check_ticket('edit-blog'); if(isset($_REQUEST["public"])&&$_REQUEST["public"]=='on') { $public = 'y'; } else { @@ -133,6 +134,7 @@ $cat_objid = $blogId; include_once("categorize_list.php"); +ask_ticket('edit-blog'); // Display the Index Template $smarty->assign('mid','tiki-edit_blog.tpl'); Index: tiki-edit_css.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_css.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -w -u -r1.2.2.1 -r1.2.2.2 --- tiki-edit_css.php 18 Jul 2003 14:40:03 -0000 1.2.2.1 +++ tiki-edit_css.php 24 Dec 2003 23:01:36 -0000 1.2.2.2 @@ -60,6 +60,7 @@ // $data = implode("",file("$styledir/$editstyle.css")); $data = load_css2_file("$styledir/$editstyle.css", $styledir); } elseif (isset($_REQUEST["save"]) and $_REQUEST["save"]) { + check_ticket('edit-css'); $action = 'display'; $data = ''; $file = str_replace("-$user","",$editstyle); @@ -96,6 +97,7 @@ $list = $csslib->list_css($styledir); $smarty->assign('list',$list); +ask_ticket('edit-css'); $smarty->assign('mid','tiki-edit_css.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> Index: tiki-edit_image.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_image.php,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -w -u -r1.4 -r1.4.4.1 --- tiki-edit_image.php 23 Mar 2003 12:59:40 -0000 1.4 +++ tiki-edit_image.php 24 Dec 2003 23:01:36 -0000 1.4.4.1 @@ -30,6 +30,7 @@ $smarty->assign('url_show',httpPrefix().$foo2); if (isset($_REQUEST["editimage"])) { + check_ticket('edit-image'); $smarty->assign('individual','n'); if($userlib->object_has_one_permission($_REQUEST["galleryId"],'image gallery')) { $smarty->assign('individual','y'); @@ -87,6 +88,8 @@ $smarty->assign_by_ref('galleryId',$info['galleryId']); $smarty->assign_by_ref('name',$info['name']); $smarty->assign_by_ref('description',$info['description']); + +ask_ticket('edit-image'); // Display the template $smarty->assign('mid','tiki-edit_image.tpl'); Index: tiki-edit_languages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_languages.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-edit_languages.php 16 May 2003 21:39:42 -0000 1.3 +++ tiki-edit_languages.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -20,6 +20,7 @@ // Create a language if(isset($_REQUEST["createlang"])) { + check_ticket('edit-languages'); $_REQUEST["cr_lang_short"]=addslashes($_REQUEST["cr_lang_short"]); if (strlen($_REQUEST["cr_lang_short"]) != 2) { $crerror=true; @@ -79,6 +80,7 @@ // Adding strings if (isset($_REQUEST["add_tran"])) { + check_ticket('edit-languages'); $add_tran_source=$_REQUEST["add_tran_source"]; $add_tran_tran=$_REQUEST["add_tran_tran"]; if (strlen($add_tran_source) != 0 && strlen($add_tran_tran) != 0) { @@ -103,6 +105,7 @@ } if ($whataction == "edit_rec_sw" || $whataction == "edit_tran_sw") { + check_ticket('edit-languages'); //check if user has translated something if (isset($_REQUEST["tr_recnum"])) { @@ -224,6 +227,7 @@ } +ask_ticket('edit-languages'); $smarty->assign('mid','tiki-edit_languages.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-edit_programmed_content.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_programmed_content.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-edit_programmed_content.php 4 Apr 2003 21:31:01 -0000 1.6 +++ tiki-edit_programmed_content.php 24 Dec 2003 23:01:36 -0000 1.6.4.1 @@ -35,6 +35,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('edit-programmed-content'); $dcslib->remove_programmed_content($_REQUEST["remove"]); } @@ -45,6 +46,7 @@ if(isset($_REQUEST["save"])) { + check_ticket('edit-programmed-content'); $publishDate = mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0,$_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"]); $id=$dcslib->replace_programmed_content($_REQUEST["pId"],$_REQUEST["contentId"],$publishDate,$_REQUEST["data"]); $smarty->assign('data',$_REQUEST["data"]); @@ -121,6 +123,7 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); +ask_ticket('edit-programmed-content'); // Display the template $smarty->assign('mid','tiki-edit_programmed_content.tpl'); Index: tiki-edit_question_options.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_question_options.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-edit_question_options.php 25 May 2003 19:08:41 -0000 1.4 +++ tiki-edit_question_options.php 24 Dec 2003 23:01:36 -0000 1.4.2.1 @@ -63,10 +63,12 @@ $smarty->assign('points',$info["points"]); if(isset($_REQUEST["remove"])) { + check_ticket('edit-question-options'); $quizlib->remove_quiz_question_option($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('edit-question-options'); $quizlib->replace_question_option($_REQUEST["optionId"],$_REQUEST["optionText"],$_REQUEST["points"],$_REQUEST["questionId"]); $smarty->assign('optionText',''); $smarty->assign('optionId',0); @@ -112,6 +114,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('edit-question-options'); // Display the template $smarty->assign('mid','tiki-edit_question_options.tpl'); Index: tiki-edit_quiz.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_quiz.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-edit_quiz.php 3 Jan 2003 14:40:24 -0000 1.3 +++ tiki-edit_quiz.php 24 Dec 2003 23:01:36 -0000 1.3.6.1 @@ -67,10 +67,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('edit-quiz'); $quizlib->remove_quiz($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('edit-quiz'); if(isset($_REQUEST["canRepeat"])&&$_REQUEST["canRepeat"]=='on') { $_REQUEST["canRepeat"]='y'; } else { @@ -184,6 +186,7 @@ $cat_objid = $_REQUEST["quizId"]; include_once("categorize_list.php"); +ask_ticket('edit-quiz'); // Display the template $smarty->assign('mid','tiki-edit_quiz.tpl'); Index: tiki-edit_quiz_questions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_quiz_questions.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-edit_quiz_questions.php 3 Jan 2003 14:40:24 -0000 1.3 +++ tiki-edit_quiz_questions.php 24 Dec 2003 23:01:36 -0000 1.3.6.1 @@ -63,16 +63,19 @@ $smarty->assign('position',$info["position"]); if(isset($_REQUEST["remove"])) { + check_ticket('edit-quiz-question'); $quizlib->remove_quiz_question($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('edit-quiz-question'); $quizlib->replace_quiz_question($_REQUEST["questionId"], $_REQUEST["question"], 'o', $_REQUEST["quizId"],$_REQUEST["position"]); $smarty->assign('question',''); $smarty->assign('questionId',0); } if(isset($_REQUEST["useQuestion"])) { + check_ticket('edit-quiz-question'); $info = $quizlib->get_quiz_question($_REQUEST["usequestionid"]); $qid = $quizlib->replace_quiz_question(0, $info["question"], $info["type"], $_REQUEST["quizId"],$_REQUEST["position"]); $options = $quizlib->list_quiz_question_options($info["questionId"],0,-1,'points_desc',''); @@ -128,7 +131,7 @@ for($i=1;$i<100;$i++) $positions[]=$i; $smarty->assign('positions',$positions); - +ask_ticket('edit-quiz-question'); // Display the template $smarty->assign('mid','tiki-edit_quiz_questions.tpl'); Index: tiki-edit_quiz_results.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_quiz_results.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-edit_quiz_results.php 3 Jan 2003 14:40:24 -0000 1.3 +++ tiki-edit_quiz_results.php 24 Dec 2003 23:01:36 -0000 1.3.6.1 @@ -63,10 +63,12 @@ $smarty->assign('toPoints',$info["toPoints"]); if(isset($_REQUEST["remove"])) { + check_ticket('edit-quiz-result'); $quizlib->remove_quiz_result($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('edit-quiz-result'); $quizlib->replace_quiz_result($_REQUEST["resultId"], $_REQUEST["quizId"], $_REQUEST["fromPoints"],$_REQUEST["toPoints"],$_REQUEST["answer"]); $smarty->assign('answer',''); $smarty->assign('resultId',0); @@ -119,7 +121,7 @@ for($i=1;$i<100;$i++) $positions[]=$i; $smarty->assign('positions',$positions); - +ask_ticket('edit-quiz-result'); // Display the template $smarty->assign('mid','tiki-edit_quiz_results.tpl'); Index: tiki-edit_structure.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_structure.php,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -u -w -u -r1.3.4.1 -r1.3.4.2 --- tiki-edit_structure.php 28 Jul 2003 00:10:34 -0000 1.3.4.1 +++ tiki-edit_structure.php 24 Dec 2003 23:01:36 -0000 1.3.4.2 @@ -24,6 +24,7 @@ $smarty->assign('pages',$pages); if(isset($_REQUEST["create"])) { + check_ticket('edit-structure'); if(!isset($_REQUEST["after"])) $_REQUEST["after"]=''; if(!(empty($_REQUEST['name']))) { $structlib->s_create_page($_REQUEST["page"],$_REQUEST["after"],$_REQUEST["name"]); @@ -43,9 +44,11 @@ } if(isset($_REQUEST["rremove"])) { + check_ticket('edit-structure'); $structlib->s_remove_page($_REQUEST["rremove"],false); } if(isset($_REQUEST["sremove"])) { + check_ticket('edit-structure'); $structlib->s_remove_page($_REQUEST["sremove"],true); } @@ -72,6 +75,8 @@ //print('
'.htmlspecialchars($html).'
'); $smarty->assign('html',$html); +ask_ticket('edit-structure'); + // Display the template $smarty->assign('mid','tiki-edit_structure.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-edit_submission.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_submission.php,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -w -u -r1.18.2.1 -r1.18.2.2 --- tiki-edit_submission.php 26 Jul 2003 20:54:10 -0000 1.18.2.1 +++ tiki-edit_submission.php 24 Dec 2003 23:01:36 -0000 1.18.2.2 @@ -131,6 +131,7 @@ $smarty->assign('preview',0); // If we are in preview mode then preview it! if(isset($_REQUEST["preview"])) { + check_ticket('edit-submission'); # convert from the displayed 'site' time to 'server' time $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0, $_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"])); @@ -234,6 +235,7 @@ // Pro if(isset($_REQUEST["save"])) { + check_ticket('edit-submission'); include_once("lib/imagegals/imagegallib.php"); # convert from the displayed 'site' time to 'server' time $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0, $_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"])); @@ -342,6 +344,8 @@ $smarty->assign('publishDate', $publishDate); $smarty->assign('publishDateSite', $dc->getDisplayDateFromServerDate($publishDate)); $smarty->assign('siteTimeZone', $dc->getTzName()); + +ask_ticket('edit-submission'); // Display the Index Template $smarty->assign('mid','tiki-edit_submission.tpl'); Index: tiki-edit_templates.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_templates.php,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -w -u -r1.5.4.1 -r1.5.4.2 --- tiki-edit_templates.php 17 Aug 2003 20:48:56 -0000 1.5.4.1 +++ tiki-edit_templates.php 24 Dec 2003 23:01:36 -0000 1.5.4.2 @@ -33,6 +33,7 @@ } if(isset($_REQUEST["save"])) { + check_ticket('edit-templates'); $fp = fopen($_REQUEST["template"],"w"); if(!$fp) { $smarty->assign('msg',tra("You dont have permission to write the template")); @@ -89,6 +90,7 @@ // Get templates from the templates/modules directori +ask_ticket('edit-templates'); $smarty->assign('mid','tiki-edit_templates.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-editpage.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v retrieving revision 1.35.2.9 retrieving revision 1.35.2.10 diff -u -w -u -r1.35.2.9 -r1.35.2.10 --- tiki-editpage.php 18 Oct 2003 16:57:40 -0000 1.35.2.9 +++ tiki-editpage.php 24 Dec 2003 23:01:36 -0000 1.35.2.10 @@ -32,6 +32,7 @@ if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { + check_ticket('edit-page'); require ("lib/webmail/mimeDecode.php"); $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = ''; @@ -204,6 +205,7 @@ $smarty->assign('parsed_footnote',$tikilib->parse_data($footnote)); if(isset($_REQUEST['footnote'])) { + check_ticket('edit-page'); $smarty->assign('parsed_footnote',$tikilib->parse_data($_REQUEST['footnote'])); $smarty->assign('footnote',$_REQUEST['footnote']); $smarty->assign('has_footnote','y'); @@ -329,6 +331,7 @@ // Pro // Check if the page has changed if(isset($_REQUEST["save"])) { + check_ticket('edit-page'); // Check if all Request values are delivered, and if not, set them // to avoid error messages. This can happen if some features are @@ -452,6 +455,8 @@ $smarty->assign('categ_checked','y'); } } + +ask_ticket('edit-page'); // Display the Index Template $smarty->assign('mid','tiki-editpage.tpl'); Index: tiki-eph.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-eph.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -w -u -r1.4.2.1 -r1.4.2.2 --- tiki-eph.php 22 Oct 2003 22:56:53 -0000 1.4.2.1 +++ tiki-eph.php 24 Dec 2003 23:01:36 -0000 1.4.2.2 @@ -97,9 +97,9 @@ $smarty->assign('tasks_useDates',$tasks_useDates); // end of existential question +ask_ticket('eph'); + $smarty->assign('mid','tiki-eph.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> - - Index: tiki-eph_admin.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-eph_admin.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-eph_admin.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-eph_admin.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -47,6 +47,7 @@ if(isset($_REQUEST['save'])) { + check_ticket('admin-eph'); // Process upload here $data=''; //$date = $tikilib->make_server_time(0,0,0,$_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"],$tikilib->get_display_timezone($user)); @@ -75,6 +76,7 @@ // Process removal here if(isset($_REQUEST["delete"])) { + check_ticket('admin-eph'); foreach(array_keys($_REQUEST["ephitem"]) as $item) { $ephlib->remove_eph($item); } @@ -121,6 +123,8 @@ $smarty->assign_by_ref('channels',$channels["data"]); $smarty->assign('tasks_useDates',$tasks_useDates); + +ask_ticket('admin-eph'); $smarty->assign('mid','tiki-eph_admin.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-error.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-error.php,v retrieving revision 1.2.6.1 retrieving revision 1.2.6.2 diff -u -w -u -r1.2.6.1 -r1.2.6.2 --- tiki-error.php 23 Oct 2003 00:16:14 -0000 1.2.6.1 +++ tiki-error.php 24 Dec 2003 23:01:36 -0000 1.2.6.2 @@ -3,6 +3,7 @@ require_once('tiki-setup.php'); +ask_ticket('error'); // Display the template $smarty->assign('msg',strip_tags($_REQUEST["error"])); Index: tiki-export_pdf.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-export_pdf.php,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -w -u -r1.4.2.2 -r1.4.2.3 --- tiki-export_pdf.php 29 Jul 2003 12:00:02 -0000 1.4.2.2 +++ tiki-export_pdf.php 24 Dec 2003 23:01:36 -0000 1.4.2.3 @@ -26,6 +26,8 @@ die; } +check_ticket('pdf'); + //defaults if(!isset($_REQUEST["font"])){ Index: tiki-faq_questions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-faq_questions.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-faq_questions.php 2 Jul 2003 18:21:19 -0000 1.6 +++ tiki-faq_questions.php 24 Dec 2003 23:01:36 -0000 1.6.2.1 @@ -43,6 +43,7 @@ // $smarty->assign('answer',$info["answer"]); AWC moved this if(isset($_REQUEST["remove"])) { + check_ticket('faq-questions'); $faqlib->remove_faq_question($_REQUEST["remove"]); } @@ -50,12 +51,14 @@ $smarty->assign('filter',$_REQUEST["filter"]); if(isset($_REQUEST["useq"])) { + check_ticket('faq-questions'); $quse = $faqlib->get_faq_question($_REQUEST["usequestionId"]); $faqlib->replace_faq_question($_REQUEST["faqId"], 0, $quse["question"], $quse["answer"]); $info = $faqlib->get_faq_question($_REQUEST["questionId"]); // AWC added } if(isset($_REQUEST["save"])) { + check_ticket('faq-questions'); $faqlib->replace_faq_question($_REQUEST["faqId"], $_REQUEST["questionId"], $_REQUEST["question"], $_REQUEST["answer"]); $info["question"]=''; $info["answer"]=''; @@ -121,7 +124,7 @@ $suggested = $faqlib->list_suggested_questions(0,-1,'created_desc',''); $smarty->assign_by_ref('suggested',$suggested["data"]); - +ask_ticket('faq-questions'); // Display the template $smarty->assign('mid','tiki-faq_questions.tpl'); Index: tiki-file_galleries.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-file_galleries.php,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -u -w -u -r1.12.2.2 -r1.12.2.3 --- tiki-file_galleries.php 19 Aug 2003 21:49:29 -0000 1.12.2.2 +++ tiki-file_galleries.php 24 Dec 2003 23:01:36 -0000 1.12.2.3 @@ -105,6 +105,7 @@ // Process the insertion or modification of a gallery here if(isset($_REQUEST["edit"])) { + check_ticket('fgal'); // Saving information // If the user is not gallery admin if($tiki_p_admin_file_galleries != 'y') { @@ -181,6 +182,7 @@ if(isset($_REQUEST["removegal"])) { + check_ticket('fgal'); if($tiki_p_admin_file_galleries != 'y') { $info = $filegallib->get_file_gallery_info($_REQUEST["removegal"]); if(!$user || $info["user"]!=$user) { @@ -278,6 +280,7 @@ include_once('tiki-section_options.php'); + ask_ticket('fgal'); // Display the template $smarty->assign('mid','tiki-file_galleries.tpl'); Index: tiki-file_galleries_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-file_galleries_rankings.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -w -u -r1.4.2.1 -r1.4.2.2 --- tiki-file_galleries_rankings.php 28 Jul 2003 16:16:56 -0000 1.4.2.1 +++ tiki-file_galleries_rankings.php 24 Dec 2003 23:01:36 -0000 1.4.2.2 @@ -58,6 +58,7 @@ $rankings[] = $rank; +ask_ticket('fgal-rankings'); $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-file_galleries_rankings.php'); Index: tiki-forum_queue.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forum_queue.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-forum_queue.php 15 May 2003 16:20:21 -0000 1.2 +++ tiki-forum_queue.php 24 Dec 2003 23:01:36 -0000 1.2.2.1 @@ -57,6 +57,7 @@ $smarty->assign('form','y'); if(isset($_REQUEST['remove_attachment'])) { + check_ticket('forum-queue'); $commentslib->remove_thread_attachment($_REQUEST['remove_attachment']); } @@ -64,6 +65,7 @@ if(isset($_REQUEST['qId'])) { if(isset($_REQUEST['save'])) { + check_ticket('forum-queue'); $smarty->assign('form','n'); if(!isset($_REQUEST['summary'])) $_REQUEST['summary']=''; if(!isset($_REQUEST['topic_smiley'])) $_REQUEST['topic_smiley']=''; @@ -79,6 +81,7 @@ } if(isset($_REQUEST['remove'])) { + check_ticket('forum-queue'); $smarty->assign('form','n'); $commentslib->remove_queued($_REQUEST['qId']); } @@ -86,6 +89,7 @@ if(isset($_REQUEST['saveapp'])) { + check_ticket('forum-queue'); $smarty->assign('form','n'); if(!isset($_REQUEST['summary'])) $_REQUEST['summary']=''; if(!isset($_REQUEST['topic_smiley'])) $_REQUEST['topic_smiley']=''; @@ -102,6 +106,7 @@ } if(isset($_REQUEST['topicize'])) { + check_ticket('forum-queue'); $smarty->assign('form','n'); // Convert to a topic if(!isset($_REQUEST['summary'])) $_REQUEST['summary']=''; @@ -116,12 +121,14 @@ } if(isset($_REQUEST['rej']) && isset($_REQUEST['msg'])) { + check_ticket('forum-queue'); foreach(array_keys($_REQUEST['msg']) as $msg) { $commentslib->remove_queued($msg); } } if(isset($_REQUEST['app']) && isset($_REQUEST['msg'])) { + check_ticket('forum-queue'); foreach(array_keys($_REQUEST['msg']) as $msg) { $commentslib->approve_queued($msg); @@ -165,6 +172,8 @@ $topics = $commentslib->get_forum_topics($_REQUEST['forumId']); $smarty->assign_by_ref('topics',$topics); +ask_ticket('forum-queue'); + // Display the template $smarty->assign('mid','tiki-forum_queue.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-forum_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forum_rankings.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-forum_rankings.php 16 May 2003 18:33:05 -0000 1.3 +++ tiki-forum_rankings.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -59,7 +59,7 @@ $rank["y"]=$rk["y"]; $rankings[] = $rank; - +ask_ticket('forum-rankings'); $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-forum_rankings.php'); Index: tiki-forums.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forums.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-forums.php 1 Jan 2003 23:15:05 -0000 1.4 +++ tiki-forums.php 24 Dec 2003 23:01:36 -0000 1.4.6.1 @@ -98,6 +98,7 @@ $section='forums'; include_once('tiki-section_options.php'); +ask_ticket('forums'); // Display the template $smarty->assign('mid','tiki-forums.tpl'); Index: tiki-forums_reported.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forums_reported.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -w -u -r1.1 -r1.1.2.1 --- tiki-forums_reported.php 20 May 2003 17:36:21 -0000 1.1 +++ tiki-forums_reported.php 24 Dec 2003 23:01:36 -0000 1.1.2.1 @@ -58,6 +58,7 @@ if(isset($_REQUEST['del']) && isset($_REQUEST['msg'])) { + check_ticket('forum-reported'); foreach(array_keys($_REQUEST['msg']) as $msg) { $commentslib->remove_reported($msg); } @@ -101,6 +102,7 @@ $topics = $commentslib->get_forum_topics($_REQUEST['forumId']); $smarty->assign_by_ref('topics',$topics); +ask_ticket('forum-reported'); // Display the template $smarty->assign('mid','tiki-forums_reported.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-g-admin_activities.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_activities.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -w -u -r1.2.2.1 -r1.2.2.2 --- tiki-g-admin_activities.php 13 Aug 2003 03:27:27 -0000 1.2.2.1 +++ tiki-g-admin_activities.php 24 Dec 2003 23:01:36 -0000 1.2.2.2 @@ -49,12 +49,14 @@ // Remove a role from the activity if(isset($_REQUEST['remove_role']) && $_REQUEST['activityId']) { + check_ticket('g-admin-activities'); $activityManager->remove_activity_role($_REQUEST['activityId'],$_REQUEST['remove_role']); } $role_to_add=0; // Add a role to the process if(isset($_REQUEST['addrole'])) { + check_ticket('g-admin-activities'); $isInteractive = (isset($_REQUEST['isInteractive'])&&$_REQUEST['isInteractive']=='on') ? 'y' : 'n'; $isAutoRouted = (isset($_REQUEST['isAutoRouted'])&&$_REQUEST['isAutoRouted']=='on') ? 'y' : 'n'; $info = Array( @@ -87,6 +89,7 @@ // Delete activities if(isset($_REQUEST["delete_act"])) { + check_ticket('g-admin-activities'); foreach(array_keys($_REQUEST["activity"]) as $item) { $activityManager->remove_activity($_REQUEST['pid'], $item); } @@ -96,6 +99,7 @@ // If we are adding an activity then add it! if(isset($_REQUEST['save_act'])) { + check_ticket('g-admin-activities'); $isInteractive = (isset($_REQUEST['isInteractive'])&&$_REQUEST['isInteractive']=='on') ? 'y' : 'n'; $isAutoRouted = (isset($_REQUEST['isAutoRouted'])&&$_REQUEST['isAutoRouted']=='on') ? 'y' : 'n'; $vars = Array( @@ -201,6 +205,7 @@ if(isset($_REQUEST['add_trans'])) { + check_ticket('g-admin-activities'); $activityManager->add_transition($_REQUEST['pid'],$_REQUEST['actFromId'],$_REQUEST['actToId']); } @@ -217,10 +222,12 @@ $valid = $activityManager->validate_process_activities($_REQUEST['pid']); $proc_info['isValid']=$valid?'y':'n'; if($valid && isset($_REQUEST['activate_proc'])) { + check_ticket('g-admin-activities'); $processManager->activate_process($_REQUEST['pid']); $proc_info['isActive']='y'; } if(isset($_REQUEST['deactivate_proc'])) { + check_ticket('g-admin-activities'); $processManager->deactivate_process($_REQUEST['pid']); $proc_info['isActive']='n'; } @@ -270,6 +277,8 @@ $activityManager->build_process_graph($_REQUEST['pid']); +ask_ticket('g-admin-activities'); + $smarty->assign('mid','tiki-g-admin_activities.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-admin_instance.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_instance.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-g-admin_instance.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-g-admin_instance.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -29,6 +29,7 @@ // this instance if(isset($_REQUEST['save'])) { + check_ticket('g-admin-instance'); //status, owner $instanceManager->set_instance_status($_REQUEST['iid'],$_REQUEST['status']); $instanceManager->set_instance_owner($_REQUEST['iid'],$_REQUEST['owner']); @@ -65,6 +66,7 @@ $props = $instanceManager->get_instance_properties($_REQUEST['iid']); if(isset($_REQUEST['unsetprop'])) { + check_ticket('g-admin-instance'); unset($props[$_REQUEST['unsetprop']]); $instanceManager->set_instance_properties($_REQUEST['iid'],$props); } @@ -72,12 +74,14 @@ if(!is_array($props)) $props=Array(); $smarty->assign_by_ref('props',$props); if(isset($_REQUEST['addprop'])) { + check_ticket('g-admin-instance'); $props[$_REQUEST['name']] = $_REQUEST['value']; $instanceManager->set_instance_properties($_REQUEST['iid'],$props); } if(isset($_REQUEST['saveprops'])) { + check_ticket('g-admin-instance'); foreach(array_keys($_REQUEST['props']) as $key) { $props[$key]=$_REQUEST['props'][$key]; } @@ -91,6 +95,7 @@ $instance->getInstance($_REQUEST['iid']); // Process comments if(isset($_REQUEST['__removecomment'])) { + check_ticket('g-admin-instance'); $__comment = $instance->get_instance_comment($_REQUEST['__removecomment']); if($__comment['user'] == $user or $tiki_p_admin_workflow == 'y') { @@ -100,11 +105,12 @@ $smarty->assign_by_ref('__comments',$__comments); if(!isset($_REQUEST['__cid'])) $_REQUEST['__cid']=0; if(isset($_REQUEST['__post'])) { + check_ticket('g-admin-instance'); $instance->replace_instance_comment($_REQUEST['__cid'], 0, '', $user, $_REQUEST['__title'], $_REQUEST['__comment']); } $__comments = $instance->get_instance_comments(); - +ask_ticket('g-admin-instance'); $smarty->assign('mid','tiki-g-admin_instance.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-g-admin_processes.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_processes.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -w -u -r1.3.2.1 -r1.3.2.2 --- tiki-g-admin_processes.php 13 Aug 2003 03:27:27 -0000 1.3.2.1 +++ tiki-g-admin_processes.php 24 Dec 2003 23:01:36 -0000 1.3.2.2 @@ -39,6 +39,7 @@ //Check here for an uploaded process if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { + check_ticket('g-admin-processes'); $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = ''; $fhash=''; @@ -63,20 +64,24 @@ if(isset($_REQUEST["delete"])) { + check_ticket('g-admin-processes'); foreach(array_keys($_REQUEST["process"]) as $item) { $processManager->remove_process($item); } } if(isset($_REQUEST['newminor'])) { + check_ticket('g-admin-processes'); $processManager->new_process_version($_REQUEST['newminor']); } if(isset($_REQUEST['newmajor'])) { + check_ticket('g-admin-processes'); $processManager->new_process_version($_REQUEST['newmajor'],false); } if(isset($_REQUEST['save'])) { + check_ticket('g-admin-processes'); $vars = Array( 'name' => $_REQUEST['name'], 'description' => $_REQUEST['description'], @@ -137,6 +142,7 @@ $smarty->assign_by_ref('items',$items["data"]); if($_REQUEST['pid']) { + check_ticket('g-admin-processes'); $valid = $activityManager->validate_process_activities($_REQUEST['pid']); $errors = Array(); if(!$valid) { @@ -151,6 +157,8 @@ $all_procs = $items = $processManager->list_processes(0,-1,'name_desc','',''); $smarty->assign_by_ref('all_procs',$all_procs['data']); +ask_ticket('g-admin-processes'); + $smarty->assign('mid','tiki-g-admin_processes.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-admin_roles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_roles.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -w -u -r1.3.2.1 -r1.3.2.2 --- tiki-g-admin_roles.php 13 Aug 2003 03:27:27 -0000 1.3.2.1 +++ tiki-g-admin_roles.php 24 Dec 2003 23:01:36 -0000 1.3.2.2 @@ -46,6 +46,7 @@ // Delete roles if(isset($_REQUEST["delete"])) { + check_ticket('g-admin-roles'); foreach(array_keys($_REQUEST["role"]) as $item) { $roleManager->remove_role($_REQUEST['pid'], $item); } @@ -53,6 +54,7 @@ // If we are adding an activity then add it! if(isset($_REQUEST['save'])) { + check_ticket('g-admin-roles'); $vars = Array( 'name' => $_REQUEST['name'], 'description' => $_REQUEST['description'], @@ -83,6 +85,7 @@ $smarty->assign_by_ref('roles',$roles['data']); if(isset($_REQUEST["delete_map"])) { + check_ticket('g-admin-roles'); foreach(array_keys($_REQUEST["map"]) as $item) { $parts = explode(':::',$item); $roleManager->remove_mapping($parts[0],$parts[1]); @@ -90,6 +93,7 @@ } if(isset($_REQUEST['mapg'])) { + check_ticket('g-admin-roles'); if($_REQUEST['op']=='add') { $users = $userlib->get_group_users($_REQUEST['group']); foreach($users as $a_user) { @@ -105,6 +109,7 @@ if(isset($_REQUEST['save_map'])) { + check_ticket('g-admin-roles'); if(isset($_REQUEST['user']) && isset($_REQUEST['role'])) { foreach($_REQUEST['user'] as $a_user) { foreach($_REQUEST['role'] as $role) { @@ -145,6 +150,9 @@ $smarty->assign('errors',$errors); $smarty->assign('proc_info',$proc_info); $sameurl_elements = Array('offset','sort_mode','where','find','offset2','find2','sort_mode2','where2','processId'); + +ask_ticket('g-admin-roles'); + $smarty->assign('mid','tiki-g-admin_roles.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> Index: tiki-g-admin_shared_source.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_shared_source.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -w -u -r1.2.2.1 -r1.2.2.2 --- tiki-g-admin_shared_source.php 13 Aug 2003 03:27:27 -0000 1.2.2.1 +++ tiki-g-admin_shared_source.php 24 Dec 2003 23:01:36 -0000 1.2.2.2 @@ -56,6 +56,7 @@ //First of all save if(isset($_REQUEST['source'])) { + check_ticket('g-admin-shared-source'); $fp = fopen($_REQUEST['source_name'],"w"); fwrite($fp,$_REQUEST['source']); fclose($fp); @@ -93,6 +94,7 @@ $activities = $activityManager->list_activities($_REQUEST['pid'],0,-1,'name_asc',''); $smarty->assign_by_ref('items',$activities['data']); +ask_ticket('g-admin-shared-source'); $smarty->assign('mid','tiki-g-admin_shared_source.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-g-monitor_activities.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-monitor_activities.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-g-monitor_activities.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-g-monitor_activities.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -60,6 +60,8 @@ $smarty->assign('stats', $processMonitor->monitor_stats()); $sameurl_elements = Array('offset','sort_mode','where','find','filter_isInteractive','filter_isAutoRouted','filter_activity','filter_type','processId','filter_process'); +ask_ticket('g-monitor-activities'); + $smarty->assign('mid','tiki-g-monitor_activities.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-monitor_instances.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-monitor_instances.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-g-monitor_instances.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-g-monitor_instances.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -24,6 +24,7 @@ $wheres=Array(); if(isset($_REQUEST['update'])) { + check_ticket('g-monitor-instances'); foreach($_REQUEST['update_status'] as $key => $val) { $processMonitor->update_instance_status($key,$val); } @@ -34,20 +35,24 @@ } if(isset($_REQUEST['delete'])) { + check_ticket('g-monitor-instances'); foreach(array_keys($_REQUEST['inst']) as $ins) { $processMonitor->remove_instance($ins); } } if(isset($_REQUEST['remove_aborted'])) { + check_ticket('g-monitor-instances'); $processMonitor->remove_aborted(); } if(isset($_REQUEST['remove_all'])) { + check_ticket('g-monitor-instances'); $processMonitor->remove_all($_REQUEST['filter_process']); } if(isset($_REQUEST['sendInstance'])) { + check_ticket('g-monitor-instances'); //activityId indicates the activity where the instance was //and we have to send it to some activity to be determined include_once('lib/Galaxia/src/API/Instance.php'); @@ -102,6 +107,8 @@ $sameurl_elements = Array('offset','sort_mode','where','find','filter_user','filter_status','filter_act_status','filter_type','processId','filter_process','filter_owner','filter_activity'); +ask_ticket('g-monitor-instances'); + $smarty->assign('statuses', $processMonitor->monitor_list_statuses()); $smarty->assign('users', $processMonitor->monitor_list_users()); $smarty->assign('owners', $processMonitor->monitor_list_owners()); Index: tiki-g-monitor_processes.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-monitor_processes.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-g-monitor_processes.php 1 May 2003 21:26:05 -0000 1.2 +++ tiki-g-monitor_processes.php 24 Dec 2003 23:01:36 -0000 1.2.2.1 @@ -49,6 +49,8 @@ $smarty->assign('stats', $processMonitor->monitor_stats()); +ask_ticket('g-monitor-processes'); + $smarty->assign('mid','tiki-g-monitor_processes.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-monitor_workitems.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-monitor_workitems.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-g-monitor_workitems.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-g-monitor_workitems.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -62,6 +62,8 @@ $smarty->assign('users', $processMonitor->monitor_list_wi_users()); +ask_ticket('g-monitor-workitems'); + $smarty->assign('mid','tiki-g-monitor_workitems.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-user_activities.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-user_activities.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-g-user_activities.php 1 May 2003 21:26:05 -0000 1.2 +++ tiki-g-user_activities.php 24 Dec 2003 23:01:36 -0000 1.2.2.1 @@ -53,6 +53,7 @@ include_once('tiki-section_options.php'); $sameurl_elements = Array('offset','sort_mode','where','find','filter_isInteractive','filter_isAutoRouted','filter_activity','filter_type','processId','filter_process'); +ask_ticket('g-user-activities'); $smarty->assign('mid','tiki-g-user_activities.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-user_instances.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-user_instances.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-g-user_instances.php 1 May 2003 21:26:05 -0000 1.2 +++ tiki-g-user_instances.php 24 Dec 2003 23:01:36 -0000 1.2.2.1 @@ -24,22 +24,27 @@ if(isset($_REQUEST['send'])) { + check_ticket('g-user-instances'); $GUI->gui_send_instance($user,$_REQUEST['aid'],$_REQUEST['iid']); } if(isset($_REQUEST['abort'])) { + check_ticket('g-user-instances'); $GUI->gui_abort_instance($user,$_REQUEST['aid'],$_REQUEST['iid']); } if(isset($_REQUEST['exception'])) { + check_ticket('g-user-instances'); $GUI->gui_exception_instance($user,$_REQUEST['aid'],$_REQUEST['iid']); } if(isset($_REQUEST['grab'])) { + check_ticket('g-user-instances'); $GUI->gui_grab_instance($user,$_REQUEST['aid'],$_REQUEST['iid']); } if(isset($_REQUEST['release'])) { + check_ticket('g-user-instances'); $GUI->gui_release_instance($user,$_REQUEST['aid'],$_REQUEST['iid']); } @@ -80,6 +85,8 @@ $sameurl_elements = Array('offset','sort_mode','where','find','filter_user','filter_status','filter_act_status','filter_type','processId','filter_process','filter_owner','filter_activity'); +ask_ticket('g-user-instances'); + $smarty->assign('mid','tiki-g-user_instances.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-user_processes.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-user_processes.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-g-user_processes.php 1 May 2003 21:26:05 -0000 1.2 +++ tiki-g-user_processes.php 24 Dec 2003 23:01:36 -0000 1.2.2.1 @@ -49,6 +49,8 @@ $sameurl_elements = Array('offset','sort_mode','where','find','filter_valid','filter_process','filter_active','processId'); +ask_ticket('g-user-processes'); + $smarty->assign('mid','tiki-g-user_processes.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-g-view_workitem.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-g-view_workitem.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-g-view_workitem.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-g-view_workitem.php 24 Dec 2003 23:01:36 -0000 1.3.2.1 @@ -26,6 +26,7 @@ $smarty->assign('stats', $processMonitor->monitor_stats()); +ask_ticket('g-view-workitem'); $sameurl_elements = Array('offset','sort_mode','where','find','itemId'); $smarty->assign('mid','tiki-g-view_workitem.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-galleries.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-galleries.php,v retrieving revision 1.14.2.3 retrieving revision 1.14.2.4 diff -u -w -u -r1.14.2.3 -r1.14.2.4 --- tiki-galleries.php 29 Sep 2003 06:47:26 -0000 1.14.2.3 +++ tiki-galleries.php 24 Dec 2003 23:01:36 -0000 1.14.2.4 @@ -81,6 +81,7 @@ // If we are editing an existing gallery prepare smarty variables if(isset($_REQUEST["edit_mode"])&&$_REQUEST["edit_mode"]) { + check_ticket('galleries'); // Get information about this galleryID and fill smarty variables $smarty->assign('edit_mode','y'); $smarty->assign('edited','y'); @@ -103,6 +104,7 @@ // Process the insertion or modification of a gallery here if(isset($_REQUEST["edit"])) { + check_ticket('galleries'); // Saving information // If the user is not gallery admin if($tiki_p_admin_galleries != 'y') { @@ -187,6 +189,7 @@ if(isset($_REQUEST["removegal"])) { + check_ticket('galleries'); if($tiki_p_admin_galleries != 'y') { $info = $imagegallib->get_gallery_info($_REQUEST["removegal"]); if(!$user || $info["user"]!=$user) { @@ -275,6 +278,7 @@ $section='galleries'; include_once('tiki-section_options.php'); +ask_ticket('galleries'); // Display the template $smarty->assign('mid','tiki-galleries.tpl'); Index: tiki-galleries_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-galleries_rankings.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -w -u -r1.4.2.1 -r1.4.2.2 --- tiki-galleries_rankings.php 28 Jul 2003 16:20:33 -0000 1.4.2.1 +++ tiki-galleries_rankings.php 24 Dec 2003 23:01:36 -0000 1.4.2.2 @@ -57,7 +57,7 @@ $rank["y"]=$rk["y"]; $rankings[] = $rank; - +ask_ticket('galleries-rankings'); $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-galleries_rankings.php'); Index: tiki-imexport_languages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-imexport_languages.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -w -u -r1.5.2.1 -r1.5.2.2 --- tiki-imexport_languages.php 3 Aug 2003 15:55:06 -0000 1.5.2.1 +++ tiki-imexport_languages.php 24 Dec 2003 23:01:36 -0000 1.5.2.2 @@ -45,6 +45,7 @@ // Import if (isset($_REQUEST["import"])) { + check_ticket('import-lang'); include_once('lang/'.$imp_language.'/language.php'); $impmsg="Included lang/".$imp_language."/language.php"; $query="insert into tiki_languages values ('".$imp_language."','')"; @@ -59,6 +60,7 @@ // Export if (isset($_REQUEST["export"])) { + check_ticket('import-lang'); $query="select source, tran from tiki_language where lang='".$exp_language."'"; $result=$tikilib->query($query); $data="assign('expmsg',$expmsg); } + +ask_ticket('import-lang'); $smarty->assign('mid','tiki-imexport_languages.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-import_phpwiki.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-import_phpwiki.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -w -u -r1.8 -r1.8.2.1 --- tiki-import_phpwiki.php 27 May 2003 15:37:13 -0000 1.8 +++ tiki-import_phpwiki.php 24 Dec 2003 23:01:36 -0000 1.8.2.1 @@ -55,6 +55,7 @@ $smarty->assign('result','y'); if(isset($_REQUEST["import"])) { + check_ticket('import-phpwiki'); $path = $_REQUEST["path"]; $h=opendir("$path/"); $lines=Array(); @@ -139,6 +140,9 @@ $smarty->assign('lines',$lines); $smarty->assign('result','y'); } + +ask_ticket('import-phpwiki'); + $smarty->assign('mid','tiki-import_phpwiki.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-index.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v retrieving revision 1.56.2.9 retrieving revision 1.56.2.10 diff -u -w -u -r1.56.2.9 -r1.56.2.10 --- tiki-index.php 18 Oct 2003 17:20:15 -0000 1.56.2.9 +++ tiki-index.php 24 Dec 2003 23:01:36 -0000 1.56.2.10 @@ -123,6 +123,7 @@ ($user and ($tiki_p_lock == 'y') and ($feature_wiki_usrlock == 'y')) ) { if(isset($_REQUEST["action"])) { + check_ticket('index'); if($_REQUEST["action"]=='lock') { $wikilib->lock_page($page); $info["flag"] = 'L'; @@ -137,6 +138,7 @@ ($user and ($user == $info['user']) and ($tiki_p_lock == 'y') and ($feature_wiki_usrlock == 'y')) ) { if(isset($_REQUEST["action"])) { + check_ticket('index'); if ($_REQUEST["action"]=='unlock') { $wikilib->unlock_page($page); $smarty->assign('lock',false); @@ -151,6 +153,7 @@ && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { + check_ticket('index'); $tikilib->replace_note($user,0,$page,$info['data']); } @@ -172,6 +175,7 @@ // 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); @@ -198,6 +202,7 @@ } if(isset($_REQUEST['refresh'])) { + check_ticket('index'); $tikilib->invalidate_cache($page); } // Here's where the data is parsed @@ -276,12 +281,14 @@ 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"]); } } if(isset($_REQUEST["attach"]) && ($tiki_p_wiki_admin_attachments == 'y' || $tiki_p_wiki_attach_files == 'y')) { + check_ticket('index'); // Process an attachment here if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); @@ -354,6 +361,7 @@ // Watches if($feature_user_watches == 'y') { if($user && isset($_REQUEST['watch_event'])) { + check_ticket('index'); if($_REQUEST['watch_action']=='add') { $tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],tra('Wiki page'),$page,"tiki-index.php?page=$page"); } else { @@ -423,6 +431,7 @@ // so it is needed to show comments & attachments panels $smarty->assign('show_page','y'); +ask_ticket('index'); // Display the Index Template $smarty->assign('dblclickedit','y'); $smarty->assign('print_page','n'); Index: tiki-index_p.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-index_p.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-index_p.php 27 Jun 2003 05:56:40 -0000 1.6 +++ tiki-index_p.php 24 Dec 2003 23:01:36 -0000 1.6.2.1 @@ -105,6 +105,7 @@ ) { if(isset($_REQUEST["action"])) { if($_REQUEST["action"]=='lock') { + check_ticket('index-p'); $wikilib->lock_page($page); } } @@ -117,6 +118,7 @@ ) { if(isset($_REQUEST["action"])) { if ($_REQUEST["action"]=='unlock') { + check_ticket('index-p'); $wikilib->unlock_page($page); } } @@ -129,6 +131,7 @@ && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { + check_ticket('index-p'); include_once('lib/notepad/notepadlib.php'); $notepadlib->replace_note($user,0,$_REQUEST['page'],$info['data']); } @@ -151,6 +154,7 @@ if(isset($_REQUEST['refresh'])) { + check_ticket('index-p'); $tikilib->invalidate_cache($page); } // Here's where the data is parsed @@ -235,6 +239,7 @@ include('tiki-tc.php'); } +ask_ticket('index-p'); // Display the Index Template $smarty->assign('dblclickedit','y'); Index: tiki-index_raw.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-index_raw.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -w -u -r1.8 -r1.8.2.1 --- tiki-index_raw.php 27 Jun 2003 05:56:40 -0000 1.8 +++ tiki-index_raw.php 24 Dec 2003 23:01:36 -0000 1.8.2.1 @@ -40,6 +40,7 @@ // for example lock/unlock if($tiki_p_admin_wiki == 'y') { if(isset($_REQUEST["action"])) { + check_ticket('index-raw'); if($_REQUEST["action"]=='lock') { $wikilib->lock_page($page); } elseif ($_REQUEST["action"]=='unlock') { @@ -163,6 +164,8 @@ $section='wiki'; include_once('tiki-section_options.php'); + +ask_ticket('index-raw'); // Display the Index Template $smarty->assign('dblclickedit','y'); Index: tiki-lastchanges.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-lastchanges.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-lastchanges.php 27 May 2003 20:34:06 -0000 1.6 +++ tiki-lastchanges.php 24 Dec 2003 23:01:36 -0000 1.6.2.1 @@ -85,6 +85,7 @@ $smarty->assign_by_ref('lastchanges',$lastchanges["data"]); +ask_ticket('lastchanges'); // Display the template $smarty->assign('mid','tiki-lastchanges.tpl'); Index: tiki-likepages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-likepages.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-likepages.php 27 May 2003 20:34:07 -0000 1.4 +++ tiki-likepages.php 24 Dec 2003 23:01:36 -0000 1.4.2.1 @@ -46,6 +46,7 @@ $likepages = $wikilib->get_like_pages($page); $smarty->assign_by_ref('likepages',$likepages); +ask_ticket('likepages'); // Display the template $smarty->assign('mid','tiki-likepages.tpl'); $smarty->assign('show_page_bar','y'); Index: tiki-list_articles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -w -u -r1.8.2.1 -r1.8.2.2 --- tiki-list_articles.php 16 Aug 2003 14:03:09 -0000 1.8.2.1 +++ tiki-list_articles.php 24 Dec 2003 23:01:36 -0000 1.8.2.2 @@ -28,6 +28,7 @@ */ if(isset($_REQUEST["remove"])) { + check_ticket('list-articles'); if($tiki_p_remove_article != 'y') { $smarty->assign('msg',tra("Permission denied you cannot remove articles")); $smarty->display("styles/$style_base/error.tpl"); @@ -122,6 +123,7 @@ $section='cms'; include_once('tiki-section_options.php'); +ask_ticket('list-articles'); // Display the template $smarty->assign('mid','tiki-list_articles.tpl'); Index: tiki-list_banners.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_banners.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-list_banners.php 4 Apr 2003 21:31:01 -0000 1.5 +++ tiki-list_banners.php 24 Dec 2003 23:01:36 -0000 1.5.4.1 @@ -25,6 +25,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('list-banners'); if($tiki_p_admin_banners != 'y') { $smarty->assign('msg',tra("Permission denied you cannot remove banners")); $smarty->display("styles/$style_base/error.tpl"); @@ -97,6 +98,7 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); +ask_ticket('list-banners'); // Display the template $smarty->assign('mid','tiki-list_banners.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-list_blogs.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_blogs.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -w -u -r1.11 -r1.11.2.1 --- tiki-list_blogs.php 9 Jul 2003 21:39:10 -0000 1.11 +++ tiki-list_blogs.php 24 Dec 2003 23:01:36 -0000 1.11.2.1 @@ -36,6 +36,7 @@ */ if(isset($_REQUEST["remove"])) { + check_ticket('list-blogs'); // Check if it is the owner $data = $tikilib->get_blog($_REQUEST["remove"]); if($data["user"]!=$user) { @@ -141,6 +142,7 @@ HAWTIKI_list_blogs($listpages, $tiki_p_read_blog); } +ask_ticket('list-blogs'); // Display the template $smarty->assign('mid','tiki-list_blogs.tpl'); Index: tiki-list_cache.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_cache.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-list_cache.php 1 Jan 2003 23:15:06 -0000 1.3 +++ tiki-list_cache.php 24 Dec 2003 23:01:36 -0000 1.3.6.1 @@ -20,10 +20,12 @@ */ if(isset($_REQUEST["remove"])) { + check_ticket('list-cache'); $tikilib->remove_cache($_REQUEST["remove"]); } if(isset($_REQUEST["refresh"])) { + check_ticket('list-cache'); $tikilib->refresh_cache($_REQUEST["refresh"]); } @@ -80,6 +82,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); + +ask_ticket('list-cache'); // Display the template $smarty->assign('mid','tiki-list_cache.tpl'); Index: tiki-list_contents.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_contents.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-list_contents.php 4 Apr 2003 21:31:01 -0000 1.5 +++ tiki-list_contents.php 24 Dec 2003 23:01:36 -0000 1.5.4.1 @@ -21,6 +21,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('list-contents'); $dcslib->remove_contents($_REQUEST["remove"]); } @@ -29,6 +30,7 @@ $smarty->assign('contentId',0); if(isset($_REQUEST["save"])) { + check_ticket('list-contents'); $smarty->assign('description',$_REQUEST["description"]); $id = $dcslib->replace_content($_REQUEST["contentId"],$_REQUEST["description"]); $smarty->assign('contentId',$id); @@ -92,6 +94,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); + +ask_ticket('list-contents'); // Display the template $smarty->assign('mid','tiki-list_contents.tpl'); Index: tiki-list_faqs.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_faqs.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-list_faqs.php 21 Mar 2003 13:17:47 -0000 1.5 +++ tiki-list_faqs.php 24 Dec 2003 23:01:36 -0000 1.5.4.1 @@ -35,6 +35,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('list-faqs'); if($tiki_p_admin_faqs != 'y') { $smarty->assign('msg',tra("You dont have permission to use this feature")); $smarty->display("styles/$style_base/error.tpl"); @@ -44,6 +45,7 @@ } if(isset($_REQUEST["save"])) { + check_ticket('list-faqs'); if($tiki_p_admin_faqs != 'y') { $smarty->assign('msg',tra("You dont have permission to use this feature")); $smarty->display("styles/$style_base/error.tpl"); @@ -116,6 +118,7 @@ $section='faqs'; include_once('tiki-section_options.php'); +ask_ticket('list-faqs'); // Display the template $smarty->assign('mid','tiki-list_faqs.tpl'); Index: tiki-list_file_gallery.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_file_gallery.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -w -u -r1.11 -r1.11.2.1 --- tiki-list_file_gallery.php 16 May 2003 14:17:06 -0000 1.11 +++ tiki-list_file_gallery.php 24 Dec 2003 23:01:36 -0000 1.11.2.1 @@ -61,12 +61,14 @@ $smarty->assign("tiki_p_create_file_galleries",'y'); if(isset($_REQUEST['delsel_x'])) { + check_ticket('list-fgal'); foreach(array_values($_REQUEST['file']) as $file) { $filegallib->remove_file($file); } } if(isset($_REQUEST['movesel'])) { + check_ticket('list-fgal'); foreach(array_values($_REQUEST['file']) as $file) { // To move a topic you just have to change the object $filegallib->set_file_gallery($file,$_REQUEST['moveto']); @@ -91,6 +93,7 @@ $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")); @@ -120,6 +123,7 @@ } if (isset($_REQUEST['edit'])) { + check_ticket('list-fgal'); if($tiki_p_admin_file_galleries != 'y') { if($tiki_p_upload_images != 'y') { // If you can't upload files then you can't edit a file you can't have a file @@ -233,6 +237,7 @@ $all_galleries = $filegallib->list_file_galleries(0,-1,'name_asc', $user,''); $smarty->assign('all_galleries',$all_galleries['data']); +ask_ticket('list-fgal'); // Display the template $smarty->assign('mid','tiki-list_file_gallery.tpl'); Index: tiki-list_gallery.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_gallery.php,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -w -u -r1.8 -r1.8.4.1 --- tiki-list_gallery.php 23 Mar 2003 12:59:40 -0000 1.8 +++ tiki-list_gallery.php 24 Dec 2003 23:01:36 -0000 1.8.4.1 @@ -93,6 +93,7 @@ $imagegallib->add_gallery_hit($_REQUEST["galleryId"]); if(isset($_REQUEST["remove"])) { + check_ticket('list-gal'); // To remove an image the user must be the owner or admin if($tiki_p_admin_galleries !='y' && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot remove images from this gallery")); @@ -103,6 +104,7 @@ } if(isset($_REQUEST["rebuild"])) { + check_ticket('list-gal'); // To remove an image the user must be the owner or admin if($tiki_p_admin_galleries!='y' && (!$user || $user!=$gal_info["user"])) { $smarty->assign('msg',tra("Permission denied you cannot remove images from this gallery")); @@ -190,6 +192,7 @@ } +ask_ticket('list-gal'); // Display the template $smarty->assign('mid','tiki-list_gallery.tpl'); Index: tiki-list_games.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_games.php,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -w -u -r1.9.2.1 -r1.9.2.2 --- tiki-list_games.php 16 Aug 2003 20:33:01 -0000 1.9.2.1 +++ tiki-list_games.php 24 Dec 2003 23:01:36 -0000 1.9.2.2 @@ -22,6 +22,7 @@ } if(isset($_REQUEST["upload"])) { + check_ticket('list-games'); if(isset($_FILES['userfile1']) && is_uploaded_file($_FILES['userfile1']['tmp_name']) && isset($_FILES['userfile2']) && is_uploaded_file($_FILES['userfile2']['tmp_name'])) { $name1 = $_FILES['userfile1']['name']; @@ -91,6 +92,7 @@ } if(isset($_REQUEST["save"]) && $tiki_p_admin_games=='y') { + check_ticket('list-games'); $file = $_REQUEST["editable"]; @$fp = fopen("games/thumbs/$file".'.txt',"wb"); if($fp) { @@ -100,6 +102,7 @@ } if(isset($_REQUEST["remove"]) && $tiki_p_admin_games=='y') { + check_ticket('list-games'); $game = $_REQUEST["remove"]; $parts=explode('.',$game); $source='games/flash/'.implode('.',Array($parts[0],$parts[1])); @@ -161,6 +164,8 @@ $section='games'; include_once('tiki-section_options.php'); +ask_ticket('list-games'); + // Display the template $smarty->assign('mid','tiki-list_games.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-list_posts.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_posts.php,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -w -u -r1.5 -r1.5.4.1 --- tiki-list_posts.php 21 Mar 2003 14:42:43 -0000 1.5 +++ tiki-list_posts.php 24 Dec 2003 23:01:36 -0000 1.5.4.1 @@ -35,6 +35,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('list-posts'); $bloglib->remove_post($_REQUEST["remove"]); } @@ -89,6 +90,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); + +ask_ticket('list-posts'); // Display the template $smarty->assign('mid','tiki-list_posts.tpl'); Index: tiki-list_quizzes.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_quizzes.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-list_quizzes.php 3 Jan 2003 14:40:24 -0000 1.4 +++ tiki-list_quizzes.php 24 Dec 2003 23:01:36 -0000 1.4.6.1 @@ -94,6 +94,7 @@ $section='quizzes'; include_once('tiki-section_options.php'); +ask_ticket('list-quizzes'); // Display the template $smarty->assign('mid','tiki-list_quizzes.tpl'); Index: tiki-list_submissions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_submissions.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -w -u -r1.5.2.1 -r1.5.2.2 --- tiki-list_submissions.php 17 Aug 2003 08:01:03 -0000 1.5.2.1 +++ tiki-list_submissions.php 24 Dec 2003 23:01:36 -0000 1.5.2.2 @@ -28,6 +28,7 @@ */ if(isset($_REQUEST["remove"])) { + check_ticket('list-submissions'); if($tiki_p_remove_submission != 'y') { $smarty->assign('msg',tra("Permission denied you cannot remove submissions")); $smarty->display("styles/$style_base/error.tpl"); @@ -37,6 +38,7 @@ } if(isset($_REQUEST["approve"])) { + check_ticket('list-submissions'); if($tiki_p_approve_submission != 'y') { $smarty->assign('msg',tra("Permission denied you cannot approve submissions")); $smarty->display("styles/$style_base/error.tpl"); @@ -112,6 +114,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); + +ask_ticket('list-submissions'); // Display the template $smarty->assign('mid','tiki-list_submissions.tpl'); Index: tiki-list_surveys.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_surveys.php,v retrieving revision 1.5.6.1 retrieving revision 1.5.6.2 diff -u -w -u -r1.5.6.1 -r1.5.6.2 --- tiki-list_surveys.php 22 Oct 2003 22:56:53 -0000 1.5.6.1 +++ tiki-list_surveys.php 24 Dec 2003 23:01:36 -0000 1.5.6.2 @@ -90,6 +90,7 @@ $section='surveys'; include_once('tiki-section_options.php'); +ask_ticket('list-surveys'); // Display the template $smarty->assign('mid','tiki-list_surveys.tpl'); Index: tiki-list_trackers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_trackers.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-list_trackers.php 3 Jan 2003 14:40:24 -0000 1.3 +++ tiki-list_trackers.php 24 Dec 2003 23:01:36 -0000 1.3.6.1 @@ -95,6 +95,8 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('list-trackers'); + // Display the template $smarty->assign('mid','tiki-list_trackers.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-listpages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-listpages.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-listpages.php 2 Jul 2003 03:41:24 -0000 1.6 +++ tiki-listpages.php 24 Dec 2003 23:01:36 -0000 1.6.2.1 @@ -31,6 +31,7 @@ if so, we call histlib's method remove_all_versions for all the checked pages. */ if(isset($_REQUEST["submit_mult"]) && isset($_REQUEST["checked"]) && $_REQUEST["submit_mult"] == "remove_pages") { + check_ticket('list-pages'); include_once("tiki-pagesetup.php"); // Now check permissions to remove the selected pages if($tiki_p_remove != 'y') { @@ -96,6 +97,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); + +ask_ticket('list-pages'); // Display the template $smarty->assign('mid','tiki-listpages.tpl'); Index: tiki-live_support_admin.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-live_support_admin.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-live_support_admin.php 13 May 2003 14:55:36 -0000 1.4 +++ tiki-live_support_admin.php 24 Dec 2003 23:01:36 -0000 1.4.2.1 @@ -24,9 +24,11 @@ if($tiki_p_live_support_admin == 'y') { if(isset($_REQUEST['adduser'])) { + check_ticket('ls-admin'); $lsadminlib->add_operator($_REQUEST['user']); } if(isset($_REQUEST['removeuser'])) { + check_ticket('ls-admin'); $lsadminlib->remove_operator($_REQUEST['removeuser']); } } @@ -61,6 +63,7 @@ $smarty->assign_by_ref('users',$ok_users); +ask_ticket('ls-admin'); // Display the template $smarty->assign('mid','tiki-live_support_admin.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-live_support_chat_window.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-live_support_chat_window.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 Index: tiki-minical.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-minical.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-minical.php 2 Jul 2003 22:00:58 -0000 1.7 +++ tiki-minical.php 24 Dec 2003 23:01:36 -0000 1.7.2.1 @@ -27,14 +27,17 @@ if(isset($_REQUEST['remove'])) { + check_ticket('minical'); $minicallib->minical_remove_event($user, $_REQUEST['remove']); } if(isset($_REQUEST['remove2'])) { + check_ticket('minical'); $minicallib->minical_remove_event($user, $_REQUEST['eventId']); } if(isset($_REQUEST['delete'])) { + check_ticket('minical'); foreach(array_keys($_REQUEST["event"]) as $ev) { $minicallib->minical_remove_event($user, $ev); } @@ -61,6 +64,7 @@ $smarty->assign('pdate_h',$pdate_h); if(isset($_REQUEST['removeold'])) { + check_ticket('minical'); $minicallib->minical_remove_old($user,$pdate_h); } // corrections by Wells Wang @@ -85,6 +89,7 @@ $smarty->assign('ev_pdate_h',$ev_pdate_h); if(isset($_REQUEST['save'])) { + check_ticket('minical'); $start = mktime($_REQUEST['Time_Hour'],$_REQUEST['Time_Minute'],0,$_REQUEST['Date_Month'],$_REQUEST['Date_Day'],$_REQUEST['Date_Year']); $start -= $tikilib->get_site_time_difference($user); $minicallib->minical_replace_event($user,$_REQUEST["eventId"],$_REQUEST["title"],$_REQUEST["description"],$start,($_REQUEST['duration_hours']*60*60)+($_REQUEST['duration_minutes']*60),$_REQUEST['topicId']); @@ -213,6 +218,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('minical'); $smarty->assign('mid','tiki-minical.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-minical_prefs.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-minical_prefs.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-minical_prefs.php 19 Jun 2003 21:18:52 -0000 1.7 +++ tiki-minical_prefs.php 24 Dec 2003 23:01:36 -0000 1.7.2.1 @@ -23,6 +23,7 @@ if(isset($_REQUEST['save'])) { + check_ticket('minical-prefs'); $tikilib->set_user_preference($user,'minical_interval',$_REQUEST['minical_interval']); $tikilib->set_user_preference($user,'minical_reminders',$_REQUEST['minical_reminders']); $tikilib->set_user_preference($user,'minical_upcoming',$_REQUEST['minical_upcoming']); @@ -72,10 +73,12 @@ $smarty->assign('upcoming',$upcoming); if(isset($_REQUEST['removetopic'])) { + check_ticket('minical-prefs'); $minicallib->minical_remove_topic($user,$_REQUEST['removetopic']); } if(isset($_REQUEST['import'])) { + check_ticket('minical-prefs'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $heading = fgetcsv ($fp, 1000, ","); @@ -93,6 +96,7 @@ // Process upload here if(isset($_REQUEST['addtopic'])) { + check_ticket('minical-prefs'); if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = ''; @@ -117,6 +121,8 @@ include_once('tiki-mytiki_shared.php'); + +ask_ticket('minical-prefs'); $smarty->assign('mid','tiki-minical_prefs.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-my_tiki.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-my_tiki.php,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -w -u -r1.3.2.2 -r1.3.2.3 --- tiki-my_tiki.php 14 Oct 2003 08:59:22 -0000 1.3.2.2 +++ tiki-my_tiki.php 24 Dec 2003 23:01:37 -0000 1.3.2.3 @@ -117,6 +117,7 @@ */ if(isset($_REQUEST['messprefs'])) { + check_ticket('my-tiki'); $tikilib->set_user_preference($userwatch,'mess_maxRecords',$_REQUEST['mess_maxRecords']); $tikilib->set_user_preference($userwatch,'minPrio',$_REQUEST['minPrio']); if(isset($_REQUEST['allowMsgs'])&&$_REQUEST['allowMsgs']=='on') { @@ -128,6 +129,7 @@ } if(isset($_REQUEST['tasksprefs'])) { + check_ticket('my-tiki'); $tikilib->set_user_preference($userwatch,'tasks_maxRecords',$_REQUEST['tasks_maxRecords']); if(isset($_REQUEST['tasks_useDates'])&&$_REQUEST['tasks_useDates']=='on') { $tikilib->set_user_preference($userwatch,'tasks_useDates','y'); @@ -255,6 +257,8 @@ $section='mytiki'; include_once('tiki-section_options.php'); +ask_ticket('my-tiki'); + $smarty->assign('uses_tabs','y'); $smarty->assign('mid','tiki-my_tiki.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-newsletters.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-newsletters.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-newsletters.php 11 Jul 2003 21:49:33 -0000 1.6 +++ tiki-newsletters.php 24 Dec 2003 23:01:37 -0000 1.6.2.1 @@ -11,6 +11,7 @@ } if(isset($_REQUEST["confirm_subscription"])) { + check_ticket('newsletters'); $conf = $nllib->confirm_subscription($_REQUEST["confirm_subscription"]); if($conf) { $smarty->assign('confirm','y'); @@ -19,6 +20,7 @@ } $smarty->assign('unsub','n'); if(isset($_REQUEST["unsubscribe"])) { + check_ticket('newsletters'); $conf = $nllib->unsubscribe($_REQUEST["unsubscribe"]); if($conf) { $smarty->assign('unsub','y'); @@ -76,6 +78,7 @@ if($tiki_p_subscribe_newsletters == 'y') { if(isset($_REQUEST["subscribe"])) { + check_ticket('newsletters'); $smarty->assign('subscribed','y'); if($tiki_p_subscribe_email != 'y') { $_REQUEST["email"] = $userlib->get_user_email($user); @@ -151,6 +154,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('newsletters'); // Display the template $smarty->assign('mid','tiki-newsletters.tpl'); Index: tiki-newsreader_groups.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-newsreader_groups.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -w -u -r1.8 -r1.8.2.1 --- tiki-newsreader_groups.php 19 Jun 2003 21:18:52 -0000 1.8 +++ tiki-newsreader_groups.php 24 Dec 2003 23:01:37 -0000 1.8.2.1 @@ -49,6 +49,8 @@ $section='newsreader'; include_once('tiki-section_options.php'); +ask_ticket('news-groups'); + $smarty->assign('mid','tiki-newsreader_groups.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-newsreader_news.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-newsreader_news.php,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -w -u -r1.12 -r1.12.2.1 --- tiki-newsreader_news.php 19 Jun 2003 21:18:52 -0000 1.12 +++ tiki-newsreader_news.php 24 Dec 2003 23:01:37 -0000 1.12.2.1 @@ -108,6 +108,8 @@ $section='newsreader'; include_once('tiki-section_options.php'); +ask_ticket('newsreader'); + $smarty->assign('mid','tiki-newsreader_news.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-newsreader_read.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-newsreader_read.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-newsreader_read.php 22 May 2003 20:24:13 -0000 1.7 +++ tiki-newsreader_read.php 24 Dec 2003 23:01:37 -0000 1.7.2.1 @@ -94,6 +94,7 @@ $tikilib->replace_note($user,0,$headers['Subject'],$body); } +ask_ticket('news-read'); $smarty->assign('mid','tiki-newsreader_read.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-newsreader_servers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-newsreader_servers.php,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -w -u -r1.9 -r1.9.4.1 --- tiki-newsreader_servers.php 22 Mar 2003 22:39:07 -0000 1.9 +++ tiki-newsreader_servers.php 24 Dec 2003 23:01:37 -0000 1.9.4.1 @@ -26,6 +26,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('news-server'); $newslib->remove_server($user, $_REQUEST['remove']); } @@ -40,6 +41,7 @@ } if(isset($_REQUEST['save'])) { + check_ticket('news-server'); $newslib->replace_server($user,$_REQUEST["serverId"],$_REQUEST["server"],$_REQUEST["port"],$_REQUEST['username'],$_REQUEST['password']); $info=Array(); $info['server']=''; @@ -99,6 +101,8 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('news-server'); + $smarty->assign('mid','tiki-newsreader_servers.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-notepad_list.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-notepad_list.php,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -w -u -r1.10 -r1.10.2.1 --- tiki-notepad_list.php 19 Jun 2003 21:18:52 -0000 1.10 +++ tiki-notepad_list.php 24 Dec 2003 23:01:37 -0000 1.10.2.1 @@ -23,6 +23,7 @@ // Process upload here if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { + check_ticket('notepad-list'); $fp = fopen($_FILES['userfile1']['tmp_name'],"rb"); $data = ''; while(!feof($fp)) { @@ -42,6 +43,7 @@ if(isset($_REQUEST["merge"])) { + check_ticket('notepad-list'); $merge = ''; $first=true; foreach(array_keys($_REQUEST["note"]) as $note) { $data_c = $notepadlib->get_note($user,$note); @@ -60,6 +62,7 @@ } if(isset($_REQUEST["delete"]) && isset($_REQUEST["note"])) { + check_ticket('notepad-list'); foreach(array_keys($_REQUEST["note"]) as $note) { $notepadlib->remove_note($user, $note); } @@ -126,6 +129,7 @@ include_once('tiki-mytiki_shared.php'); + check_ticket('notepad-list'); $smarty->assign('mid','tiki-notepad_list.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-notepad_read.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-notepad_read.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-notepad_read.php 2 Jun 2003 19:49:53 -0000 1.7 +++ tiki-notepad_read.php 24 Dec 2003 23:01:37 -0000 1.7.2.1 @@ -29,6 +29,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('notepad-read'); $notepadlib->remove_note($user, $_REQUEST['noteId']); header('location: tiki-notepad_list.php'); die; @@ -41,6 +42,7 @@ if($tiki_p_edit == 'y') { if(isset($_REQUEST['wikify'])) { + check_ticket('notepad-read'); if(empty($_REQUEST['wiki_name'])) { $smarty->assign('msg',tra("No name indicated for wiki page")); $smarty->display("styles/$style_base/error.tpl"); @@ -82,6 +84,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('notepad-read'); $smarty->assign('mid','tiki-notepad_read.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-notepad_write.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-notepad_write.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-notepad_write.php 19 Jun 2003 21:18:52 -0000 1.4 +++ tiki-notepad_write.php 24 Dec 2003 23:01:37 -0000 1.4.2.1 @@ -27,6 +27,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('notepad-write'); $notepadlib->remove_note($user, $_REQUEST['remove']); } @@ -39,6 +40,7 @@ } if(isset($_REQUEST['save'])) { + check_ticket('notepad-write'); $notepadlib->replace_note($user,$_REQUEST["noteId"],$_REQUEST["name"],$_REQUEST["data"]); //:TODO: replace this putting the code in notepad-list header('location: tiki-notepad_list.php'); @@ -49,6 +51,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('notepad-write'); $smarty->assign('mid','tiki-notepad_write.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-objectpermissions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-objectpermissions.php,v retrieving revision 1.2.6.3 retrieving revision 1.2.6.4 diff -u -w -u -r1.2.6.3 -r1.2.6.4 --- tiki-objectpermissions.php 26 Jul 2003 18:07:22 -0000 1.2.6.3 +++ tiki-objectpermissions.php 24 Dec 2003 23:01:37 -0000 1.2.6.4 @@ -37,11 +37,13 @@ // Process the form to assign a new permission to this page if(isset($_REQUEST["assign"])) { + check_ticket('object-perms'); $userlib->assign_object_permission($_REQUEST["group"],$_REQUEST["objectId"],$_REQUEST["objectType"],$_REQUEST["perm"]); } // Process the form to remove a permission from the page if(isset($_REQUEST["action"])) { + check_ticket('object-parms'); if($_REQUEST["action"] == 'remove') { $userlib->remove_object_permission($_REQUEST["group"],$_REQUEST["objectId"],$_REQUEST["objectType"],$_REQUEST["perm"]); } @@ -60,6 +62,8 @@ $perms = $userlib->get_permissions(0,-1,'permName_desc','',$_REQUEST["permType"]); $smarty->assign_by_ref('perms',$perms["data"]); +ask_ticket('object-perms'); + $smarty->assign('mid','tiki-objectpermissions.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-orphan_pages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-orphan_pages.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-orphan_pages.php 21 Mar 2003 17:34:51 -0000 1.3 +++ tiki-orphan_pages.php 24 Dec 2003 23:01:37 -0000 1.3.4.1 @@ -76,6 +76,8 @@ $smarty->assign_by_ref('listpages',$listpages["data"]); //print_r($listpages["data"]); +ask_ticket('orphan-pages'); + // Display the template $smarty->assign('mid','tiki-orphan_pages.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-page.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-page.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-page.php 20 Mar 2003 19:59:37 -0000 1.3 +++ tiki-page.php 24 Dec 2003 23:01:37 -0000 1.3.4.1 @@ -32,6 +32,7 @@ $section='html_pages'; include_once('tiki-section_options.php'); +ask_ticket('html-page'); // Display the template $smarty->assign('mid','tiki-page.tpl'); Index: tiki-pagehistory.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-pagehistory.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -w -u -r1.8.2.1 -r1.8.2.2 --- tiki-pagehistory.php 22 Sep 2003 06:03:33 -0000 1.8.2.1 +++ tiki-pagehistory.php 24 Dec 2003 23:01:37 -0000 1.8.2.2 @@ -48,6 +48,7 @@ } if(isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) { + check_ticket('page-history'); foreach(array_keys($_REQUEST["hist"]) as $version) { $histlib->remove_version($_REQUEST["page"],$version); } @@ -99,6 +100,8 @@ $history = $histlib->get_page_history($page); $smarty->assign_by_ref('history',$history); + +ask_ticket('page-history'); // Display the template $smarty->assign('mid','tiki-pagehistory.tpl'); Index: tiki-pagepermissions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-pagepermissions.php,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -w -u -r1.9 -r1.9.2.1 --- tiki-pagepermissions.php 2 Jul 2003 18:21:19 -0000 1.9 +++ tiki-pagepermissions.php 24 Dec 2003 23:01:37 -0000 1.9.2.1 @@ -44,9 +44,11 @@ if(isset($_REQUEST["addemail"])) { + check_ticket('page-perms'); $notificationlib->add_mail_event('wiki_page_changes','wikipage'.$_REQUEST["page"],$_REQUEST["email"]); } if(isset($_REQUEST["removeemail"])) { + check_ticket('page-perms'); $notificationlib->remove_mail_event('wiki_page_changes','wikipage'.$_REQUEST["page"],$_REQUEST["removeemail"]); } $emails=$notificationlib->get_mail_events('wiki_page_changes','wikipage'.$_REQUEST["page"]); @@ -87,6 +89,7 @@ $perms = $userlib->get_permissions(0,-1,'permName_desc','','wiki'); $smarty->assign_by_ref('perms',$perms["data"]); +ask_ticket('page-perms'); $smarty->assign('mid','tiki-pagepermissions.tpl'); $smarty->assign('show_page_bar','y'); Index: tiki-pick_avatar.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-pick_avatar.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -u -w -u -r1.8.2.2 -r1.8.2.3 --- tiki-pick_avatar.php 22 Jul 2003 13:34:47 -0000 1.8.2.2 +++ tiki-pick_avatar.php 24 Dec 2003 23:01:37 -0000 1.8.2.3 @@ -39,6 +39,7 @@ // Upload avatar is processed here if(isset($_FILES['userfile1'])&&is_uploaded_file($_FILES['userfile1']['tmp_name'])) { + check_ticket('pick-avatar'); $type = $_FILES['userfile1']['type']; $size = $_FILES['userfile1']['size']; $name = $_FILES['userfile1']['name']; @@ -81,6 +82,7 @@ if(isset($_REQUEST["uselib"])) { + check_ticket('pick-avatar'); $userprefslib->set_user_avatar($user,'l',$_REQUEST["avatar"],'','','',''); } @@ -100,6 +102,8 @@ $avatar = $tikilib->get_user_avatar($user); $smarty->assign('avatar',$avatar); + +ask_ticket('pick-avatar'); $smarty->assign('mid','tiki-pick_avatar.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-poll_form.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-poll_form.php,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -u -w -u -r1.6.4.1 -r1.6.4.2 --- tiki-poll_form.php 18 Oct 2003 01:48:29 -0000 1.6.4.1 +++ tiki-poll_form.php 24 Dec 2003 23:01:37 -0000 1.6.4.2 @@ -29,6 +29,8 @@ $smarty->assign_by_ref('channels',$options["data"]); //$smarty->assign('ownurl',httpPrefix().$_SERVER["REQUEST_URI"]); <- no more needed, already in tiki-setup.php which is required +ask_ticket('poll-form'); + // Display the template $smarty->assign('mid','tiki-poll_form.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-poll_results.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-poll_results.php,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -u -w -u -r1.4.4.1 -r1.4.4.2 --- tiki-poll_results.php 29 Sep 2003 18:50:15 -0000 1.4.4.1 +++ tiki-poll_results.php 24 Dec 2003 23:01:37 -0000 1.4.4.2 @@ -52,6 +52,8 @@ $smarty->assign_by_ref('polls',$polls["data"]); $smarty->assign_by_ref('options',$options["data"]); +ask_ticket('poll-results'); + // Display the template $smarty->assign('mid','tiki-poll_results.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-print.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-print.php,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -w -u -r1.9.2.4 -r1.9.2.5 --- tiki-print.php 21 Jul 2003 20:22:39 -0000 1.9.2.4 +++ tiki-print.php 24 Dec 2003 23:01:37 -0000 1.9.2.5 @@ -30,6 +30,7 @@ // Check if we have to perform an action for this page // for example lock/unlock if(isset($_REQUEST["action"])) { + check_ticket('print'); if($_REQUEST["action"]=='lock') { $wikilib->lock_page($page); } elseif ($_REQUEST["action"]=='unlock') { @@ -95,6 +96,7 @@ $smarty->assign('urlprefix',$prefix); } +ask_ticket('print'); // Display the Index Template Index: tiki-print_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-print_article.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-print_article.php 16 May 2003 18:33:04 -0000 1.3 +++ tiki-print_article.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -49,8 +49,7 @@ $smarty->assign('parsed_heading',$tikilib->parse_data($heading)); } - - +ask_ticket('print-article'); // Display the Index Template //$smarty->assign('mid','tiki-printread_article.tpl'); Index: tiki-print_blog_post.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-print_blog_post.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- tiki-print_blog_post.php 19 Jun 2003 21:18:52 -0000 1.2 +++ tiki-print_blog_post.php 24 Dec 2003 23:01:37 -0000 1.2.2.1 @@ -114,6 +114,8 @@ include('tiki-tc.php'); } +ask_ticket('print-blog-post'); + // Display the template $smarty->display("tiki-print_blog_post.tpl"); ?> Index: tiki-print_multi_pages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-print_multi_pages.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-print_multi_pages.php 18 May 2003 18:17:12 -0000 1.3 +++ tiki-print_multi_pages.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -18,6 +18,7 @@ if(isset($_REQUEST["print"])) { + check_ticket('multiprint'); // Create XMLRPC object $pages = Array(); foreach($printpages as $page) { @@ -41,6 +42,8 @@ } } $smarty->assign_by_ref('pages',$pages); + +ask_ticket('multiprint'); // Display the template $smarty->display("styles/$style_base/tiki-print_multi_pages.tpl"); Index: tiki-print_pages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-print_pages.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-print_pages.php 18 May 2003 18:17:12 -0000 1.3 +++ tiki-print_pages.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -49,6 +49,8 @@ $pages = $tikilib->list_pages(0, -1, 'pageName_asc',$find); $smarty->assign_by_ref('pages',$pages["data"]); +ask_ticket('print-pages'); + // Display the template $smarty->assign('mid','tiki-print_pages.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-quiz_result_stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-quiz_result_stats.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-quiz_result_stats.php 3 Jan 2003 14:40:24 -0000 1.4 +++ tiki-quiz_result_stats.php 24 Dec 2003 23:01:37 -0000 1.4.6.1 @@ -71,6 +71,7 @@ $section='quizzes'; include_once('tiki-section_options.php'); +ask_ticket('quiz-res-stats'); $smarty->assign('mid','tiki-quiz_result_stats.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-quiz_stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-quiz_stats.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-quiz_stats.php 3 Jan 2003 14:40:24 -0000 1.4 +++ tiki-quiz_stats.php 24 Dec 2003 23:01:37 -0000 1.4.6.1 @@ -100,6 +100,7 @@ $section='quizzes'; include_once('tiki-section_options.php'); +ask_ticket('quiz-stats'); // Display the template $smarty->assign('mid','tiki-quiz_stats.tpl'); Index: tiki-quiz_stats_quiz.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-quiz_stats_quiz.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-quiz_stats_quiz.php 3 Jan 2003 14:40:25 -0000 1.4 +++ tiki-quiz_stats_quiz.php 24 Dec 2003 23:01:37 -0000 1.4.6.1 @@ -44,10 +44,12 @@ $smarty->assign('quiz_info',$quiz_info); if(isset($_REQUEST["remove"]) && $tiki_p_admin_quizzes=='y') { + check_ticket('quiz-stats-quiz'); $quizlib->remove_quiz_stat($_REQUEST["remove"]); } if(isset($_REQUEST["clear"]) && $tiki_p_admin_quizzes=='y') { + check_ticket('quiz-stats-quiz'); $quizlib->clear_quiz_stats($_REQUEST["clear"]); } @@ -101,6 +103,8 @@ $section='quizzes'; include_once('tiki-section_options.php'); +ask_ticket('quiz-stats-quiz'); + // Display the template $smarty->assign('mid','tiki-quiz_stats_quiz.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-ranking.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-ranking.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-ranking.php 1 Jan 2003 23:15:06 -0000 1.3 +++ tiki-ranking.php 24 Dec 2003 23:01:37 -0000 1.3.6.1 @@ -37,6 +37,9 @@ $ranking = $tikilib->get_top_pages($limit); $smarty->assign_by_ref('ranking',$ranking); + +ask_ticket('rankings'); + // Display the template $smarty->assign('mid','tiki-ranking.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-read_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-read_article.php,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -w -u -r1.11.2.2 -r1.11.2.3 --- tiki-read_article.php 21 Jul 2003 20:22:39 -0000 1.11.2.2 +++ tiki-read_article.php 24 Dec 2003 23:01:37 -0000 1.11.2.3 @@ -119,6 +119,8 @@ include('tiki-tc.php'); } +ask_ticket('article-read'); + // Display the Index Template $smarty->assign('mid','tiki-read_article.tpl'); $smarty->assign('show_page_bar','n'); Index: tiki-received_articles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-received_articles.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-received_articles.php 16 May 2003 18:33:05 -0000 1.5 +++ tiki-received_articles.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -58,6 +58,7 @@ } if(isset($_REQUEST["accept"])) { + check_ticket('received-articles'); // CODE TO ACCEPT A PAGE HERE $publishDate = mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0,$_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"]); $commlib->update_received_article( @@ -119,10 +120,12 @@ $smarty->assign('parsed_body',$tikilib->parse_data($info["body"])); if(isset($_REQUEST["remove"])) { + check_ticket('received-articles'); $commlib->remove_received_article($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('received-articles'); $publishDate = mktime($_REQUEST["Time_Hour"],$_REQUEST["Time_Minute"],0,$_REQUEST["Date_Month"],$_REQUEST["Date_Day"],$_REQUEST["Date_Year"]); $commlib->update_received_article( $_REQUEST["receivedArticleId"], @@ -190,6 +193,8 @@ $topics = $artlib->list_topics(); $smarty->assign_by_ref('topics',$topics); +ask_ticket('received-articles'); + // Display the template $smarty->assign('mid','tiki-received_articles.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-received_pages.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-received_pages.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-received_pages.php 4 May 2003 21:10:34 -0000 1.5 +++ tiki-received_pages.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -25,6 +25,7 @@ $smarty->assign('receivedPageId',$_REQUEST["receivedPageId"]); if(isset($_REQUEST["accept"])) { + check_ticket('received-pages'); // CODE TO ACCEPT A PAGE HERE $commlib->accept_page($_REQUEST["accept"]); } @@ -60,10 +61,12 @@ if(isset($_REQUEST["remove"])) { + check_ticket('received-pages'); $commlib->remove_received_page($_REQUEST["remove"]); } if(isset($_REQUEST["save"])) { + check_ticket('received-pages'); $commlib->update_received_page($_REQUEST["receivedPageId"], $_REQUEST["pageName"], $_REQUEST["data"], $_REQUEST["comment"]); $smarty->assign('pageName',$_REQUEST["pageName"]); $smarty->assign('data',$_REQUEST["data"]); @@ -112,6 +115,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('received-pages'); // Display the template $smarty->assign('mid','tiki-received_pages.tpl'); Index: tiki-referer_stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-referer_stats.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-referer_stats.php 21 Mar 2003 15:48:15 -0000 1.3 +++ tiki-referer_stats.php 24 Dec 2003 23:01:37 -0000 1.3.4.1 @@ -18,18 +18,10 @@ } if(isset($_REQUEST["clear"])) { + check_ticket('referer-stats'); $refererlib->clear_referer_stats(); } -/* -if($tiki_p_take_quiz != 'y') { - $smarty->assign('msg',tra("You dont have permission to use this feature")); - $smarty->display("styles/$style_base/error.tpl"); - die; -} -*/ - - if(!isset($_REQUEST["sort_mode"])) { $sort_mode = 'hits_desc'; } else { @@ -72,6 +64,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('referer-stats'); // Display the template $smarty->assign('mid','tiki-referer_stats.tpl'); Index: tiki-register.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-register.php,v retrieving revision 1.20.2.6 retrieving revision 1.20.2.7 diff -u -w -u -r1.20.2.6 -r1.20.2.7 --- tiki-register.php 3 Oct 2003 08:31:17 -0000 1.20.2.6 +++ tiki-register.php 24 Dec 2003 23:01:37 -0000 1.20.2.7 @@ -20,6 +20,7 @@ } if(isset($_REQUEST["register"])) { + check_ticket('register'); if($novalidation != 'yes' and ($_REQUEST["pass"] <> $_REQUEST["pass2"])) { $smarty->assign('msg',tra("The passwords don't match")); $smarty->display("styles/$style_base/error.tpl"); @@ -145,6 +146,8 @@ } } + +ask_ticket('register'); $smarty->assign('mid','tiki-register.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-removepage.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-removepage.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -w -u -r1.4 -r1.4.2.1 --- tiki-removepage.php 16 May 2003 18:33:05 -0000 1.4 +++ tiki-removepage.php 24 Dec 2003 23:01:37 -0000 1.4.2.1 @@ -47,6 +47,7 @@ } if(isset($_REQUEST["remove"])) { + check_ticket('remove-page'); if(isset($_REQUEST["all"]) && $_REQUEST["all"]=='on') { $tikilib->remove_all_versions($_REQUEST["page"]); header("location: tiki-index.php"); @@ -62,6 +63,8 @@ } } +ask_ticket('remove-page'); + $smarty->assign('mid','tiki-removepage.tpl'); $smarty->assign('show_page_bar','y'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-rename_page.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-rename_page.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-rename_page.php 19 Jun 2003 21:18:52 -0000 1.3 +++ tiki-rename_page.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -36,6 +36,7 @@ } if(isset($_REQUEST["rename"])) { + check_ticket('rename-page'); if(!$wikilib->wiki_rename_page($_REQUEST['oldpage'],$_REQUEST['newpage'])) { $smarty->assign('msg',tra("Cannot rename page maybe new page already exists")); $smarty->display("styles/$style_base/error.tpl"); @@ -45,6 +46,8 @@ header("location: tiki-index.php?page=$newName"); } +ask_ticket('rename-page'); + $smarty->assign('mid','tiki-rename_page.tpl'); $smarty->assign('show_page_bar','y'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-rollback.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-rollback.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-rollback.php 27 May 2003 20:34:05 -0000 1.5 +++ tiki-rollback.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -58,11 +58,14 @@ } if(isset($_REQUEST["rollback"])) { + check_ticket('rollback'); $histlib->use_version($_REQUEST["page"],$_REQUEST["version"]); header("location: tiki-index.php"); die; } +ask_ticket('rollback'); + $smarty->assign('mid','tiki-rollback.tpl'); $smarty->assign('show_page_bar','y'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-search_stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-search_stats.php,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -w -u -r1.4 -r1.4.4.1 --- tiki-search_stats.php 21 Mar 2003 15:48:16 -0000 1.4 +++ tiki-search_stats.php 24 Dec 2003 23:01:37 -0000 1.4.4.1 @@ -16,6 +16,7 @@ } if(isset($_REQUEST["clear"])) { + check_ticket('search-stats'); $searchstatslib->clear_search_stats(); } @@ -63,6 +64,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('search-stats'); // Display the template $smarty->assign('mid','tiki-search_stats.tpl'); Index: tiki-searchresults.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-searchresults.php,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.3 diff -u -w -u -r1.16.2.1 -r1.16.2.3 --- tiki-searchresults.php 19 Aug 2003 23:07:38 -0000 1.16.2.1 +++ tiki-searchresults.php 24 Dec 2003 23:01:37 -0000 1.16.2.3 @@ -144,6 +144,7 @@ $results = $searchlib->$find_where(' ',$offset,$maxRecords,$fulltext); $smarty->assign('words',''); } else { + $words = strip_tags($_REQUEST["words"]); $results = $searchlib->$find_where($_REQUEST["words"],$offset,$maxRecords,$fulltext); $smarty->assign('words',$_REQUEST["words"]); } @@ -179,6 +180,7 @@ } +ask_ticket('searchresults'); // Find search results (build array) $smarty->assign_by_ref('results',$results["data"]); Index: tiki-send_blog_post.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-send_blog_post.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -w -u -r1.3.2.1 -r1.3.2.2 --- tiki-send_blog_post.php 16 Jul 2003 01:47:56 -0000 1.3.2.1 +++ tiki-send_blog_post.php 24 Dec 2003 23:01:37 -0000 1.3.2.2 @@ -120,6 +120,7 @@ $smarty->assign('addresses',$_REQUEST['addresses']); $smarty->assign('sent','n'); if(isset($_REQUEST['send'])) { + check_ticket('send-blog-post'); $emails = explode(',',$_REQUEST['addresses']); $foo = parse_url($_SERVER["REQUEST_URI"]); $machine =httpPrefix().str_replace('tiki-send_blog_post','tiki-view_blog_post',$foo["path"]).'?postId='.$postId.'&blogId='.$_REQUEST['blogId']; @@ -134,6 +135,8 @@ } $smarty->assign('sent','y'); } + +ask_ticket('send-blog-post'); // Display the template $smarty->assign('mid','tiki-send_blog_post.tpl'); Index: tiki-send_newsletters.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-send_newsletters.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -w -u -r1.3.2.1 -r1.3.2.2 --- tiki-send_newsletters.php 16 Jul 2003 01:47:56 -0000 1.3.2.1 +++ tiki-send_newsletters.php 24 Dec 2003 23:01:37 -0000 1.3.2.2 @@ -36,6 +36,7 @@ if(isset($_REQUEST["remove"])) { + check_ticket('send-newsletter'); $nllib->remove_edition($_REQUEST["remove"]); } @@ -58,6 +59,7 @@ $smarty->assign('presend','n'); if(isset($_REQUEST["save"]) ) { + check_ticket('send-newsletter'); // Now send the newsletter to all the email addresses and save it in sent_newsletters $smarty->assign('presend','y'); $subscribers = $nllib->get_subscribers($_REQUEST["nlId"]); @@ -70,6 +72,7 @@ $smarty->assign('emited','n'); if(isset($_REQUEST["send"])) { + check_ticket('send-newsletter'); $subscribers = $nllib->get_subscribers($_REQUEST["nlId"]); $mail = new htmlMimeMail(); $mail->setFrom('noreply@noreply.com'); @@ -136,10 +139,10 @@ } $smarty->assign_by_ref('templates',$templates["data"]); +ask_ticket('send-newsletter'); // Display the template $smarty->assign('mid','tiki-send_newsletters.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> -?> \ No newline at end of file Index: tiki-send_objects.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-send_objects.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-send_objects.php 14 Jun 2003 19:55:45 -0000 1.7 +++ tiki-send_objects.php 24 Dec 2003 23:01:37 -0000 1.7.2.1 @@ -72,6 +72,7 @@ $msg = ''; if(isset($_REQUEST["send"])) { + check_ticket('send-object'); // Create XMLRPC object $client = new xmlrpc_client($_REQUEST["path"], $_REQUEST["site"], 80); $client->setDebug(0); @@ -167,6 +168,8 @@ $smarty->assign_by_ref('pages',$pages["data"]); $smarty->assign_by_ref('articles',$articles["data"]); +ask_ticket('send-object'); + // Display the template $smarty->assign('mid','tiki-send_objects.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-setup.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v retrieving revision 1.110.2.28 retrieving revision 1.110.2.30 diff -u -w -u -r1.110.2.28 -r1.110.2.30 --- tiki-setup.php 18 Oct 2003 01:42:12 -0000 1.110.2.28 +++ tiki-setup.php 22 Dec 2003 13:00:23 -0000 1.110.2.30 @@ -7,6 +7,12 @@ /*! \static */ + +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],"tiki-setup.php")!=FALSE) { + die("This script cannot be called directly"); +} + class TikiSetup { /*! Return 'windows' if windows, otherwise 'unix' @@ -627,6 +633,9 @@ $default_sender_email = $tikilib->get_user_email($contact_user); $sender_email = $tikilib->get_preference('sender_email',$default_sender_email); $smarty->assign('sender_email',$sender_email); + +$contact_anon = 'n'; +$smarty->assign('contact_anon',$contact_anon); $webmail_view_html = 'y'; Index: tiki-setup_base.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-setup_base.php,v retrieving revision 1.20.2.11 retrieving revision 1.20.2.12 diff -u -w -u -r1.20.2.11 -r1.20.2.12 --- tiki-setup_base.php 24 Oct 2003 12:24:20 -0000 1.20.2.11 +++ tiki-setup_base.php 22 Dec 2003 13:00:25 -0000 1.20.2.12 @@ -1,4 +1,9 @@ elapsed()."
"); require_once("setup.php"); //print("tiki-setup_base 2:".$tiki_timer->elapsed()."
"); Index: tiki-shoutbox.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-shoutbox.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -w -u -r1.3 -r1.3.4.1 --- tiki-shoutbox.php 21 Mar 2003 17:34:53 -0000 1.3 +++ tiki-shoutbox.php 24 Dec 2003 23:01:37 -0000 1.3.4.1 @@ -39,6 +39,7 @@ if($tiki_p_admin_shoutbox == 'y') { if(isset($_REQUEST["remove"])) { + check_ticket('shoutbox'); $shoutboxlib->remove_shoutbox($_REQUEST["remove"]); } } @@ -47,6 +48,7 @@ if($tiki_p_post_shoutbox == 'y') { if(isset($_REQUEST["save"])) { + check_ticket('shoutbox'); $shoutboxlib->replace_shoutbox($_REQUEST["msgId"], $user,$_REQUEST["message"]); $smarty->assign("msgId",'0'); $smarty->assign('message',''); @@ -93,6 +95,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('shoutbox'); // Display the template $smarty->assign('mid','tiki-shoutbox.tpl'); Index: tiki-slideshow.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-slideshow.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -w -u -r1.8.2.1 -r1.8.2.2 --- tiki-slideshow.php 31 Jul 2003 20:30:18 -0000 1.8.2.1 +++ tiki-slideshow.php 24 Dec 2003 23:01:37 -0000 1.8.2.2 @@ -167,8 +167,7 @@ $section='wiki'; include_once('tiki-section_options.php'); - - +ask_ticket('slideshow'); $smarty->assign('wiki_extras','y'); Index: tiki-slideshow2.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-slideshow2.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-slideshow2.php 16 May 2003 22:18:04 -0000 1.3 +++ tiki-slideshow2.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -142,6 +142,7 @@ include_once('tiki-section_options.php'); +ask_ticket('slideshow2'); $smarty->assign('wiki_extras','y'); Index: tiki-stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-stats.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-stats.php 30 May 2003 17:44:43 -0000 1.5 +++ tiki-stats.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -51,6 +51,7 @@ $quiz_stats = $statslib->quiz_stats(); $smarty->assign_by_ref('quiz_stats',$quiz_stats); +ask_ticket('stats'); // Display the template $smarty->assign('mid','tiki-stats.tpl'); Index: tiki-survey_stats.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-survey_stats.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-survey_stats.php 3 Jan 2003 14:40:26 -0000 1.4 +++ tiki-survey_stats.php 24 Dec 2003 23:01:37 -0000 1.4.6.1 @@ -94,6 +94,7 @@ $section='surveys'; include_once('tiki-section_options.php'); +ask_ticket('survey-stats'); // Display the template $smarty->assign('mid','tiki-survey_stats.tpl'); Index: tiki-survey_stats_survey.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-survey_stats_survey.php,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -u -r1.4 -r1.4.6.1 --- tiki-survey_stats_survey.php 3 Jan 2003 14:40:26 -0000 1.4 +++ tiki-survey_stats_survey.php 24 Dec 2003 23:01:37 -0000 1.4.6.1 @@ -44,10 +44,12 @@ $smarty->assign('survey_info',$survey_info); if(isset($_REQUEST["remove"]) && $tiki_p_admin_surveys=='y') { + check_ticket('survey-stats-survey'); $srvlib->clear_survey_stats($_REQUEST["remove"]); } if(isset($_REQUEST["clear"]) && $tiki_p_admin_surveys=='y') { + check_ticket('survey-stats-survey'); $srvlib->clear_survey_stats($_REQUEST["clear"]); } @@ -94,6 +96,8 @@ $section='surveys'; include_once('tiki-section_options.php'); +ask_ticket('survey-stats-survey'); + // Display the template $smarty->assign('mid','tiki-survey_stats_survey.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-take_quiz.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-take_quiz.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-take_quiz.php 22 Mar 2003 22:39:07 -0000 1.6 +++ tiki-take_quiz.php 24 Dec 2003 23:01:37 -0000 1.6.4.1 @@ -104,6 +104,7 @@ $qid=$questions["data"][$i]["questionId"]; $max += $questions["data"][$i]["maxPoints"]; if(isset($_REQUEST["question_$qid"])) { + check_ticket('take-quiz'); $opt = $quizlib->get_quiz_question_option($_REQUEST["question_$qid"]); $points += $opt["points"]; // Register the answer for quiz stats @@ -119,6 +120,7 @@ $options = $quizlib->list_quiz_question_options($questions["data"][$i]["questionId"],0,-1,'optionText_desc',''); $qid=$questions["data"][$i]["questionId"]; if(isset($_REQUEST["question_$qid"])) { + check_ticket('take-quiz'); $quizlib->register_user_quiz_answer($userResultId,$_REQUEST["quizId"],$qid,$_REQUEST["question_$qid"]); } } @@ -149,6 +151,7 @@ include('tiki-tc.php'); } +ask_ticket('take-quiz'); // Display the template $smarty->assign('mid','tiki-take_quiz.tpl'); Index: tiki-take_survey.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-take_survey.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-take_survey.php 4 May 2003 21:10:34 -0000 1.5 +++ tiki-take_survey.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -62,6 +62,7 @@ $smarty->assign_by_ref('questions',$questions["data"]); if(isset($_REQUEST["ans"])) { + check_ticket('take-survey'); foreach($questions["data"] as $question) { $questionId=$question["questionId"]; //print("question: $questionId
"); @@ -96,6 +97,7 @@ $section='surveys'; include_once('tiki-section_options.php'); +ask_ticket('take-survey'); // Display the template $smarty->assign('mid','tiki-take_survey.tpl'); Index: tiki-theme_control.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-theme_control.php,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -w -u -r1.2.2.2 -r1.2.2.3 --- tiki-theme_control.php 10 Aug 2003 20:43:45 -0000 1.2.2.2 +++ tiki-theme_control.php 24 Dec 2003 23:01:37 -0000 1.2.2.3 @@ -33,6 +33,7 @@ if (isset($_REQUEST['assigcat'])) { if (isset($_REQUEST['categId'])) { + check_ticket('theme-control'); $tcontrollib->tc_assign_category($_REQUEST['categId'],$_REQUEST['theme']); } else { $smarty->assign('msg',tra("Please create a category first")); @@ -43,6 +44,7 @@ if (isset($_REQUEST["delete"])) { if (isset($_REQUEST["categ"])) { + check_ticket('theme-control'); foreach(array_keys($_REQUEST["categ"]) as $cat) { $tcontrollib->tc_remove_cat($cat); } @@ -91,6 +93,8 @@ //$sections=Array('wiki','galleries','file_galleries','cms','blogs','forums','chat','categories','games','faqs','html_pages','quizzes','surveys','webmail','trackers','featured_links','directory','user_messages','newsreader','mytiki'); +ask_ticket('theme-control'); + // Display the template $smarty->assign('mid','tiki-theme_control.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-theme_control_objects.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-theme_control_objects.php,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -w -u -r1.1 -r1.1.4.1 --- tiki-theme_control_objects.php 22 Mar 2003 22:39:07 -0000 1.1 +++ tiki-theme_control_objects.php 24 Dec 2003 23:01:37 -0000 1.1.4.1 @@ -96,11 +96,13 @@ $smarty->assign_by_ref('objects',$objects); if(isset($_REQUEST['assign'])) { + check_ticket('tc-objects'); list($id,$name) = explode('|',$_REQUEST['objdata']); $tcontrollib->tc_assign_object($id,$_REQUEST['theme'],$_REQUEST['type'],$name); } if(isset($_REQUEST["delete"])) { + check_ticket('tc-objects'); foreach(array_keys($_REQUEST["obj"]) as $obj) { $tcontrollib->tc_remove_object($obj); } @@ -148,6 +150,8 @@ //$sections=Array('wiki','galleries','file_galleries','cms','blogs','forums','chat','categories','games','faqs','html_pages','quizzes','surveys','webmail','trackers','featured_links','directory','user_messages','newsreader','mytiki'); +ask_ticket('tc-objects'); + // Display the template $smarty->assign('mid','tiki-theme_control_objects.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-theme_control_sections.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-theme_control_sections.php,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -w -u -r1.1 -r1.1.4.1 --- tiki-theme_control_sections.php 22 Mar 2003 22:39:07 -0000 1.1 +++ tiki-theme_control_sections.php 24 Dec 2003 23:01:37 -0000 1.1.4.1 @@ -28,10 +28,12 @@ $smarty->assign_by_ref('styles',$styles); if(isset($_REQUEST['assign'])) { + check_ticket('tc-sections'); $tcontrollib->tc_assign_section($_REQUEST['section'],$_REQUEST['theme']); } if(isset($_REQUEST["delete"])) { + check_ticket('tc-sections'); foreach(array_keys($_REQUEST["sec"]) as $sec) { $tcontrollib->tc_remove_section($sec); } @@ -45,6 +47,8 @@ sort($sections); $smarty->assign('sections',$sections); +ask_ticket('tc-sections'); + // Display the template $smarty->assign('mid','tiki-theme_control_sections.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-upload_file.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-upload_file.php,v retrieving revision 1.19.2.2 retrieving revision 1.19.2.3 diff -u -w -u -r1.19.2.2 -r1.19.2.3 --- tiki-upload_file.php 18 Jul 2003 15:17:59 -0000 1.19.2.2 +++ tiki-upload_file.php 24 Dec 2003 23:01:37 -0000 1.19.2.3 @@ -28,6 +28,7 @@ $smarty->assign('show','n'); // Process an upload here if(isset($_REQUEST["upload"])) { + check_ticket('upload-file'); // Check here if it is an upload or an URL $smarty->assign('individual','n'); if($userlib->object_has_one_permission($_REQUEST["galleryId"],'file gallery')) { @@ -205,6 +206,7 @@ $section='file_galleries'; include_once('tiki-section_options.php'); +ask_ticket('upload-file'); // Display the template $smarty->assign('mid','tiki-upload_file.tpl'); Index: tiki-upload_image.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-upload_image.php,v retrieving revision 1.18.2.4 retrieving revision 1.18.2.5 diff -u -w -u -r1.18.2.4 -r1.18.2.5 --- tiki-upload_image.php 18 Oct 2003 01:32:04 -0000 1.18.2.4 +++ tiki-upload_image.php 24 Dec 2003 23:01:37 -0000 1.18.2.5 @@ -25,6 +25,7 @@ $smarty->assign('show','n'); // Process an upload here if(isset($_REQUEST["upload"])) { + check_ticket('upload-image'); // Check here if it is an upload or an URL $smarty->assign('individual','n'); if($userlib->object_has_one_permission($_REQUEST["galleryId"],'image gallery')) { @@ -272,6 +273,7 @@ $section='galleries'; include_once('tiki-section_options.php'); +ask_ticket('upload-image'); // Display the template $smarty->assign('mid','tiki-upload_image.tpl'); Index: tiki-user_assigned_modules.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_assigned_modules.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-user_assigned_modules.php 22 May 2003 20:24:14 -0000 1.6 +++ tiki-user_assigned_modules.php 24 Dec 2003 23:01:37 -0000 1.6.2.1 @@ -25,34 +25,42 @@ } if(isset($_REQUEST["recreate"])) { + check_ticket('user-modules'); $usermoduleslib->create_user_assigned_modules($user); } if(!$usermoduleslib->user_has_assigned_modules($user)) { + check_ticket('user-modules'); $usermoduleslib->create_user_assigned_modules($user); } if(isset($_REQUEST["unassign"])) { + check_ticket('user-modules'); $usermoduleslib->unassign_user_module($_REQUEST["unassign"],$user); } if(isset($_REQUEST["assign"])) { + check_ticket('user-modules'); $usermoduleslib->assign_user_module($_REQUEST["module"],$_REQUEST["position"],$_REQUEST["order"],$user); } if(isset($_REQUEST["up"])) { + check_ticket('user-modules'); $usermoduleslib->up_user_module($_REQUEST["up"],$user); } if(isset($_REQUEST["down"])) { + check_ticket('user-modules'); $usermoduleslib->down_user_module($_REQUEST["down"],$user); } if(isset($_REQUEST["left"])){ + check_ticket('user-modules'); $usermoduleslib->set_column_user_module($_REQUEST["left"],$user,'l'); } if(isset($_REQUEST["right"])){ + check_ticket('user-modules'); $usermoduleslib->set_column_user_module($_REQUEST["right"],$user,'r'); } @@ -82,6 +90,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('user-modules'); $smarty->assign('mid','tiki-user_assigned_modules.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-user_bookmarks.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_bookmarks.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-user_bookmarks.php 4 May 2003 21:10:34 -0000 1.7 +++ tiki-user_bookmarks.php 24 Dec 2003 23:01:37 -0000 1.7.2.1 @@ -61,6 +61,7 @@ // Create a folder inside the parentFolder here if(isset($_REQUEST["addfolder"])) { + check_ticket('user-bookmarks'); if($_REQUEST["editfolder"]) { $bookmarklib->update_folder($_REQUEST["editfolder"],$_REQUEST["foldername"],$user); $smarty->assign('editfolder',0); @@ -70,14 +71,17 @@ } } if(isset($_REQUEST["removefolder"])) { + check_ticket('user-bookmarks'); $bookmarklib->remove_folder($_REQUEST["removefolder"],$user); } if(isset($_REQUEST["refreshurl"])) { + check_ticket('user-bookmarks'); $bookmarklib->refresh_url($_REQUEST["refreshurl"]); } if(isset($_REQUEST["addurl"])) { + check_ticket('user-bookmarks'); $urlid = $bookmarklib->replace_url($_REQUEST["editurl"],$_REQUEST["parentId"],$_REQUEST["urlname"],$_REQUEST["urlurl"],$user); if($_REQUEST["editurl"]==0 && $tiki_p_cache_bookmarks=='y') { $bookmarklib->refresh_url($urlid); @@ -87,6 +91,7 @@ $smarty->assign('urlurl',''); } if(isset($_REQUEST["removeurl"])) { + check_ticket('user-bookmarks'); $bookmarklib->remove_url($_REQUEST["removeurl"],$user); } @@ -108,6 +113,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('user-bookmarks'); // Display the template $smarty->assign('mid','tiki-user_bookmarks.tpl'); Index: tiki-user_information.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_information.php,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -w -u -r1.6.2.3 -r1.6.2.4 --- tiki-user_information.php 25 Sep 2003 09:11:46 -0000 1.6.2.3 +++ tiki-user_information.php 24 Dec 2003 23:01:37 -0000 1.6.2.4 @@ -36,6 +36,7 @@ if($user) { $smarty->assign('sent',0); if(isset($_REQUEST['send'])) { + check_ticket('user-information'); $smarty->assign('sent',1); $message = ''; @@ -104,6 +105,8 @@ $smarty->assign_by_ref('userinfo',$userinfo); $smarty->assign_by_ref('email_isPublic',$email_isPublic); +ask_ticket('user-information'); + $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-user_preferences.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_preferences.php,v retrieving revision 1.25.2.5 retrieving revision 1.25.2.6 diff -u -w -u -r1.25.2.5 -r1.25.2.6 --- tiki-user_preferences.php 10 Aug 2003 20:42:30 -0000 1.25.2.5 +++ tiki-user_preferences.php 24 Dec 2003 23:01:37 -0000 1.25.2.6 @@ -41,6 +41,7 @@ if(isset($_REQUEST["prefs"])) { + check_ticket('user-prefs'); // setting preferences // if (isset($_REQUEST["email"])) $userlib->change_user_email($userwatch,$_REQUEST["email"]); if($change_theme == 'y') { @@ -80,6 +81,7 @@ } if(isset($_REQUEST['chgemail'])) { + check_ticket('user-prefs'); // check user's password if(!$userlib->validate_user($userwatch,$_REQUEST['pass'],'','')) { $smarty->assign('msg',tra("Invalid password. You current password is required to change your email address.")); @@ -90,6 +92,7 @@ } if(isset($_REQUEST["chgpswd"])) { + check_ticket('user-prefs'); if($_REQUEST["pass1"]!=$_REQUEST["pass2"]) { $smarty->assign('msg',tra("The passwords didn't match")); $smarty->display("styles/$style_base/error.tpl"); @@ -123,6 +126,7 @@ } if(isset($_REQUEST['messprefs'])) { + check_ticket('user-prefs'); $tikilib->set_user_preference($userwatch,'mess_maxRecords',$_REQUEST['mess_maxRecords']); $tikilib->set_user_preference($userwatch,'minPrio',$_REQUEST['minPrio']); if(isset($_REQUEST['allowMsgs'])&&$_REQUEST['allowMsgs']=='on') { @@ -134,6 +138,7 @@ } if(isset($_REQUEST['mytikiprefs'])) { + check_ticket('user-prefs'); if(isset($_REQUEST['mytiki_pages'])&&$_REQUEST['mytiki_pages']=='on') { $tikilib->set_user_preference($userwatch,'mytiki_pages','y'); } else { @@ -176,6 +181,7 @@ if(isset($_REQUEST['tasksprefs'])) { + check_ticket('user-prefs'); $tikilib->set_user_preference($userwatch,'tasks_maxRecords',$_REQUEST['tasks_maxRecords']); if(isset($_REQUEST['tasks_useDates'])&&$_REQUEST['tasks_useDates']=='on') { $tikilib->set_user_preference($userwatch,'tasks_useDates','y'); @@ -273,6 +279,8 @@ if ($display_timezone != "UTC") $display_timezone = "Local"; $smarty->assign_by_ref('display_timezone',$display_timezone); +ask_ticket('user-prefs'); + $smarty->assign('mid','tiki-user_preferences.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-user_tasks.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_tasks.php,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -w -u -r1.9.2.1 -r1.9.2.2 --- tiki-user_tasks.php 26 Jul 2003 20:54:10 -0000 1.9.2.1 +++ tiki-user_tasks.php 24 Dec 2003 23:01:37 -0000 1.9.2.2 @@ -35,12 +35,14 @@ if(isset($_REQUEST["complete"]) && isset($_REQUEST["task"])) { + check_ticket('user-tasks'); foreach(array_keys($_REQUEST["task"]) as $task) { $tasklib->complete_task($user, $task); } } if(isset($_REQUEST["open"]) && isset($_REQUEST["task"])) { + check_ticket('user-tasks'); foreach(array_keys($_REQUEST["task"]) as $task) { $tasklib->open_task($user, $task); } @@ -48,6 +50,7 @@ if(isset($_REQUEST["delete"]) && isset($_REQUEST["task"])) { + check_ticket('user-tasks'); foreach(array_keys($_REQUEST["task"]) as $task) { $tasklib->remove_task($user, $task); } @@ -55,6 +58,7 @@ if(isset($_REQUEST["update"]) ) { + check_ticket('user-tasks'); foreach($_REQUEST["task_perc"] as $task => $perc) { $tasklib->update_task_percentage($user, $task, $perc); } @@ -167,6 +171,8 @@ $percs[]=$i; } $smarty->assign_by_ref('percs',$percs); + +ask_ticket('user-tasks'); $smarty->assign('mid','tiki-user_tasks.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-user_watches.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_watches.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- tiki-user_watches.php 22 May 2003 20:24:14 -0000 1.3 +++ tiki-user_watches.php 24 Dec 2003 23:01:37 -0000 1.3.2.1 @@ -14,10 +14,12 @@ } if(isset($_REQUEST['hash'])) { + check_ticket('user-watches'); $tikilib->remove_user_watch_by_hash($_REQUEST['hash']); } if(isset($_REQUEST["delete"])&&isset($_REQUEST['watch'])) { + check_ticket('user-watches'); foreach(array_keys($_REQUEST["watch"]) as $item) { $tikilib->remove_user_watch_by_hash($item); } @@ -37,6 +39,8 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('user-watches'); + $smarty->assign('mid','tiki-user_watches.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-userfiles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-userfiles.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -w -u -r1.7 -r1.7.2.1 --- tiki-userfiles.php 10 Jun 2003 14:25:58 -0000 1.7 +++ tiki-userfiles.php 24 Dec 2003 23:01:37 -0000 1.7.2.1 @@ -33,6 +33,7 @@ // Process upload here for($i=0;$i<5;$i++) { if(isset($_FILES["userfile$i"])&&is_uploaded_file($_FILES["userfile$i"]['tmp_name'])) { + check_ticket('user-files'); $fp = fopen($_FILES["userfile$i"]['tmp_name'],"rb"); $data = ''; $fhash=''; @@ -74,6 +75,7 @@ // Process removal here if(isset($_REQUEST["delete"]) && isset($_REQUEST["userfile"])) { + check_ticket('user-files'); foreach(array_keys($_REQUEST["userfile"]) as $file) { $userfileslib->remove_userfile($user, $file); } @@ -138,6 +140,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('user-files'); $smarty->assign('mid','tiki-userfiles.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-usermenu.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-usermenu.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -w -u -r1.3.2.1 -r1.3.2.2 --- tiki-usermenu.php 22 Sep 2003 15:43:52 -0000 1.3.2.1 +++ tiki-usermenu.php 24 Dec 2003 23:01:37 -0000 1.3.2.2 @@ -23,6 +23,7 @@ if(!isset($_REQUEST["menuId"])) $_REQUEST["menuId"]=0; if(isset($_REQUEST["delete"]) && isset($_REQUEST["menu"])) { + check_ticket('user-menu'); foreach(array_keys($_REQUEST["menu"]) as $men) { $usermenulib->remove_usermenu($user, $men); } @@ -31,6 +32,7 @@ } if(isset($_REQUEST['addbk'])) { + check_ticket('user-menu'); $usermenulib->add_bk($user); if(isset($_SESSION['usermenu'])) unset($_SESSION['usermenu']); @@ -48,6 +50,7 @@ } if(isset($_REQUEST['save'])) { + check_ticket('user-menu'); $usermenulib->replace_usermenu($user,$_REQUEST["menuId"],$_REQUEST["name"],$_REQUEST["url"],$_REQUEST['position'],$_REQUEST['mode']); $info=Array(); $info['name']=''; @@ -106,6 +109,7 @@ include_once('tiki-mytiki_shared.php'); +ask_ticket('user-menu'); $smarty->assign('mid','tiki-usermenu.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-userversions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-userversions.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -u -r1.5 -r1.5.2.1 --- tiki-userversions.php 27 May 2003 20:34:08 -0000 1.5 +++ tiki-userversions.php 24 Dec 2003 23:01:37 -0000 1.5.2.1 @@ -26,7 +26,7 @@ die; } -if(!user_exists($_REQUEST["ruser"])) { +if(!$tikilib->user_exists($_REQUEST["ruser"])) { $smarty->assign('msg',tra("Unexistant user")); $smarty->display("styles/$style_base/error.tpl"); die; @@ -47,6 +47,8 @@ $history = $histlib->get_user_versions($_REQUEST["ruser"]); $smarty->assign_by_ref('history',$history); +ask_ticket('userversion'); + $smarty->assign('mid','tiki-userversions.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> \ No newline at end of file Index: tiki-view_articles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_articles.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -u -w -u -r1.8.2.2 -r1.8.2.3 --- tiki-view_articles.php 9 Oct 2003 21:36:49 -0000 1.8.2.2 +++ tiki-view_articles.php 24 Dec 2003 23:01:37 -0000 1.8.2.3 @@ -35,6 +35,7 @@ } if (isset($_REQUEST["remove"])) { + check_ticket('view-article'); if ($tiki_p_remove_article != 'y') { $smarty->assign('msg', tra("Permission denied you cannot remove articles")); @@ -120,6 +121,8 @@ $section = 'cms'; include_once ('tiki-section_options.php'); +ask_ticket('view-article'); + // Display the template $smarty->assign('mid', 'tiki-view_articles.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-view_banner.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_banner.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -w -u -r1.11 -r1.11.2.1 --- tiki-view_banner.php 30 Jun 2003 13:13:53 -0000 1.11 +++ tiki-view_banner.php 24 Dec 2003 23:01:37 -0000 1.11.2.1 @@ -98,6 +98,8 @@ fclose($fp); } $smarty->assign_by_ref('raw',$raw); + +ask_ticket('view-banner'); $smarty->assign('mid','tiki-view_banner.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-view_blog.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_blog.php,v retrieving revision 1.23.2.2 retrieving revision 1.23.2.3 diff -u -w -u -r1.23.2.2 -r1.23.2.3 --- tiki-view_blog.php 16 Aug 2003 02:16:39 -0000 1.23.2.2 +++ tiki-view_blog.php 24 Dec 2003 23:01:37 -0000 1.23.2.3 @@ -78,6 +78,7 @@ $smarty->assign('activity',$blog_data["activity"]); if(isset($_REQUEST["remove"])) { + check_ticket('view-blog'); $data = $bloglib->get_post($_REQUEST["remove"]); if(!$ownsblog) { if(!$user || $data["user"]!=$user) { @@ -188,12 +189,14 @@ && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { + check_ticket('view-blog'); $post_info = $bloglib->get_post($_REQUEST['savenotepad']); $tikilib->replace_note($user,0,$post_info['title']?$post_info['title']:date("d/m/Y [h:i]",$post_info['created']),$post_info['data']); } if($feature_user_watches == 'y') { if($user && isset($_REQUEST['watch_event'])) { + check_ticket('view-blog'); if($_REQUEST['watch_action']=='add') { $post_info = $bloglib->get_post($_REQUEST['watch_object']); $tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],tra('blog'),$post_info['title'],"tiki-view_blog.php?blogId=".$_REQUEST['blogId']); @@ -212,6 +215,7 @@ HAWTIKI_view_blog($listpages, $blog_data); } +ask_ticket('view-blog'); // Display the template $smarty->assign('mid','tiki-view_blog.tpl'); Index: tiki-view_blog_post.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_blog_post.php,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -w -u -r1.14 -r1.14.2.1 --- tiki-view_blog_post.php 12 Jul 2003 15:29:36 -0000 1.14 +++ tiki-view_blog_post.php 24 Dec 2003 23:01:37 -0000 1.14.2.1 @@ -171,6 +171,7 @@ && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { + check_ticket('view-blog-post'); $tikilib->replace_note($user,0,$post_info['title']?$post_info['title']:date("d/m/Y [h:i]",$post_info['created']),$post_info['data']); } @@ -179,7 +180,7 @@ HAWTIKI_view_blog_post($post_info); } - +ask_ticket('view-blog-post'); // Display the template $smarty->assign('mid','tiki-view_blog_post.tpl'); Index: tiki-view_chart.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_chart.php,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -w -u -r1.7.2.1 -r1.7.2.2 --- tiki-view_chart.php 22 Oct 2003 22:56:53 -0000 1.7.2.1 +++ tiki-view_chart.php 24 Dec 2003 23:01:37 -0000 1.7.2.2 @@ -74,6 +74,9 @@ if(!isset($_REQUEST['find'])) $_REQUEST['find']=''; $all_items = $chartlib->list_chart_items(0,-1,'title_asc',$_REQUEST['find'],"chartId=".$chart_info['chartId']); $smarty->assign_by_ref('all_items',$all_items['data']); + +ask_ticket('view-chart'); + $smarty->assign('mid','tiki-view_chart.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); ?> Index: tiki-view_chart_item.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_chart_item.php,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -w -u -r1.3.2.2 -r1.3.2.3 --- tiki-view_chart_item.php 16 Jul 2003 20:10:48 -0000 1.3.2.2 +++ tiki-view_chart_item.php 24 Dec 2003 23:01:37 -0000 1.3.2.3 @@ -30,6 +30,7 @@ ($chart_info['singleItemVotes'] == 'n' || $user_voted_item == 'n')) ) { + check_ticket('view-chart-item'); if(!isset($_REQUEST['points'])) $_REQUEST['points']=0; $chartlib->user_vote($user,$_REQUEST['itemId'],$_REQUEST['points']); } @@ -48,6 +49,8 @@ $user_voted_item = $chartlib->user_has_voted_item($user,$info['itemId'])?'y':'n'; $sameurl_elements = Array('offset','sort_mode','where','find','chartId','itemId'); + +ask_ticket('view-chart-item'); $smarty->assign('mid','tiki-view_chart_item.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-view_faq.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_faq.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-view_faq.php 22 Mar 2003 22:39:07 -0000 1.6 +++ tiki-view_faq.php 24 Dec 2003 23:01:37 -0000 1.6.4.1 @@ -41,6 +41,7 @@ $smarty->assign_by_ref('channels',$channels["data"]); if(isset($_REQUEST["sugg"])) { + check_ticket('view-faq'); if($tiki_p_suggest_faq == 'y') { $faqlib->add_suggested_faq_question($_REQUEST["faqId"],$_REQUEST["suggested_question"],$_REQUEST["suggested_answer"],$user); } @@ -68,6 +69,8 @@ include('tiki-tc.php'); } +ask_ticket('view-faq'); + // Display the template $smarty->assign('mid','tiki-view_faq.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-view_forum.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_forum.php,v retrieving revision 1.22.2.3 retrieving revision 1.22.2.4 diff -u -w -u -r1.22.2.3 -r1.22.2.4 --- tiki-view_forum.php 31 Jul 2003 20:33:57 -0000 1.22.2.3 +++ tiki-view_forum.php 24 Dec 2003 23:01:37 -0000 1.22.2.4 @@ -79,6 +79,7 @@ if($tiki_p_forums_report == 'y') { if(isset($_REQUEST['report'])) { + check_ticket('view-forum'); $commentslib->report_post($_REQUEST['forumId'],0,$_REQUEST['report'],$user,''); } } @@ -86,12 +87,14 @@ if($tiki_p_admin_forum == 'y') { if(isset($_REQUEST['remove_attachment'])) { + check_ticket('view-forum'); $commentslib->remove_thread_attachment($_REQUEST['remove_attachment']); } if(isset($_REQUEST['delsel_x'])) { if (isset($_REQUEST['forumtopic'])) { + check_ticket('view-forum'); foreach(array_values($_REQUEST['forumtopic']) as $topic) { $commentslib->remove_comment($topic); $commentslib->register_remove_post($_REQUEST['forumId'], 0); @@ -101,6 +104,7 @@ if(isset($_REQUEST['locksel_x'])) { if (isset($_REQUEST['forumtopic'])) { + check_ticket('view-forum'); foreach(array_values($_REQUEST['forumtopic']) as $topic) { $commentslib->lock_comment($topic); } @@ -109,6 +113,7 @@ if(isset($_REQUEST['unlocksel_x'])) { if (isset($_REQUEST['forumtopic'])) { + check_ticket('view-forum'); foreach(array_values($_REQUEST['forumtopic']) as $topic) { $commentslib->unlock_comment($topic); } @@ -117,6 +122,7 @@ if(isset($_REQUEST['movesel'])) { if (isset($_REQUEST['forumtopic'])) { + check_ticket('view-forum'); foreach(array_values($_REQUEST['forumtopic']) as $topic) { // To move a topic you just have to change the object $obj = 'forum'.$_REQUEST['moveto']; @@ -128,6 +134,7 @@ if(isset($_REQUEST['mergesel'])) { if (isset($_REQUEST['forumtopic'])) { foreach(array_values($_REQUEST['forumtopic']) as $topic) { + check_ticket('view-forum'); // To move a topic you just have to change the object if($topic != $_REQUEST['mergetopic']) { $commentslib->set_parent($topic,$_REQUEST['mergetopic']); @@ -170,6 +177,7 @@ $smarty->assign('warning','n'); if($tiki_p_admin_forum == 'y' || $tiki_p_forum_post_topic == 'y') { if(isset($_REQUEST["comments_postComment"])) { + check_ticket('view-forum'); if( (!empty($_REQUEST["comments_title"])) && (!empty($_REQUEST["comments_data"])) ){ if($tiki_p_admin_forum=='y' || $commentslib->user_can_post_to_forum($user, $_REQUEST["forumId"])) { //Replace things between square brackets by links @@ -411,6 +419,7 @@ if($tiki_p_admin_forum=='y' || $tiki_p_forum_vote == 'y') { // Process a vote here if(isset($_REQUEST["comments_vote"])&&isset($_REQUEST["comments_threadId"])) { + check_ticket('view-forum'); $comments_show='y'; if(!$tikilib->user_has_voted($user,'comment'.$_REQUEST["comments_threadId"])) { $commentslib->vote_comment($_REQUEST["comments_threadId"],$user,$_REQUEST["comments_vote"]); @@ -453,6 +462,7 @@ if($tiki_p_admin_forum == 'y') { if(isset($_REQUEST["comments_remove"])&&isset($_REQUEST["comments_threadId"])) { + check_ticket('view-forum'); $comments_show='y'; $commentslib->remove_comment($_REQUEST["comments_threadId"]); $commentslib->register_remove_post($_REQUEST['forumId'], 0); @@ -461,6 +471,7 @@ $smarty->assign('comment_preview','n'); if(isset($_REQUEST["comments_previewComment"])) { + check_ticket('view-forum'); $smarty->assign('comments_preview_title',$_REQUEST["comments_title"]); $smarty->assign('comments_preview_data',($commentslib->parse_comment_data($_REQUEST["comments_data"]))); $smarty->assign('comment_title',$_REQUEST["comments_title"]); @@ -546,6 +557,7 @@ if($feature_user_watches == 'y') { if($user && isset($_REQUEST['watch_event'])) { + check_ticket('view-forum'); if($_REQUEST['watch_action']=='add') { $tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],tra('forum'),$forum_info['name'],"tiki-view_forum.php?forumId=".$_REQUEST['forumId']); } else { @@ -585,6 +597,8 @@ $smarty->assign('queued',$commentslib->get_num_queued($comments_objectId)); $smarty->assign('reported',$commentslib->get_num_reported($_REQUEST['forumId'])); } + +ask_ticket('view-forum'); // Display the template $smarty->assign('mid','tiki-view_forum.tpl'); Index: tiki-view_forum_thread.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_forum_thread.php,v retrieving revision 1.21.2.8 retrieving revision 1.21.2.9 diff -u -w -u -r1.21.2.8 -r1.21.2.9 --- tiki-view_forum_thread.php 17 Oct 2003 22:21:09 -0000 1.21.2.8 +++ tiki-view_forum_thread.php 24 Dec 2003 23:01:37 -0000 1.21.2.9 @@ -121,6 +121,7 @@ if($tiki_p_admin_forum == 'y') { if(isset($_REQUEST['delsel'])) { if (isset($_REQUEST['forumthread'])) { + check_ticket('view-forum-thread'); foreach(array_values($_REQUEST['forumthread']) as $thread) { $commentslib->remove_comment($thread); $commentslib->register_remove_post($_REQUEST['forumId'], $_REQUEST['comments_parentId']); @@ -129,11 +130,13 @@ } if(isset($_REQUEST['remove_attachment'])) { + check_ticket('view-forum-thread'); $commentslib->remove_thread_attachment($_REQUEST['remove_attachment']); } if(isset($_REQUEST['movesel'])) { if (isset($_REQUEST['forumthread'])) { + check_ticket('view-forum-thread'); foreach(array_values($_REQUEST['forumthread']) as $thread) { $commentslib->set_parent($thread,$_REQUEST['moveto']); } @@ -143,6 +146,7 @@ if($tiki_p_forums_report == 'y') { if(isset($_REQUEST['report'])) { + check_ticket('view-forum-thread'); $commentslib->report_post($_REQUEST['forumId'],$_REQUEST['comments_parentId'],$_REQUEST['report'],$user,''); } } @@ -185,6 +189,7 @@ if($tiki_p_admin_forum == 'y' || $tiki_p_forum_post == 'y') { if($thread_info["type"]<>'l' || $tiki_p_admin_forum == 'y') { if(isset($_REQUEST["comments_postComment"])) { + check_ticket('view-forum-thread'); if( !empty($_REQUEST["comments_data"]) ){ if( empty($_REQUEST["comments_title"]) ){ $_REQUEST["comments_title"] = tra('Re:').$thread_info["title"]; @@ -416,6 +421,7 @@ if($tiki_p_admin_forum == 'y' || $tiki_p_forum_vote == 'y') { // Process a vote here if(isset($_REQUEST["comments_vote"])&&isset($_REQUEST["comments_threadId"])) { + check_ticket('view-forum-thread'); $comments_show='y'; if(!$tikilib->user_has_voted($user,'comment'.$_REQUEST["comments_threadId"])) { $commentslib->vote_comment($_REQUEST["comments_threadId"],$user,$_REQUEST["comments_vote"]); @@ -472,6 +478,7 @@ if($tiki_p_admin_forum == 'y') { if(isset($_REQUEST["comments_remove"])&&isset($_REQUEST["comments_threadId"])) { + check_ticket('view-forum-thread'); $comments_show='y'; $commentslib->remove_comment($_REQUEST["comments_threadId"]); $commentslib->register_remove_post($_REQUEST["forumId"], $_REQUEST["comments_parentId"]); @@ -554,6 +561,7 @@ && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { + check_ticket('view-forum-thread'); $info = $commentslib->get_comment($_REQUEST['savenotepad']); $tikilib->replace_note($user,0,$info['title'],$info['data']); } @@ -561,6 +569,7 @@ if($feature_user_watches == 'y') { if($user && isset($_REQUEST['watch_event'])) { + check_ticket('view-forum-thread'); if($_REQUEST['watch_action']=='add') { $tikilib->add_user_watch($user,$_REQUEST['watch_event'],$_REQUEST['watch_object'],tra('forum topic'),$forum_info['name'].':'.$thread_info['title'],"tiki-view_forum_thread.php?forumId=".$_REQUEST['forumId']."&comments_parentId=".$_REQUEST['comments_parentId']); } else { @@ -607,6 +616,8 @@ $smarty->assign('queued',$commentslib->get_num_queued($comments_objectId)); $smarty->assign('reported',$commentslib->get_num_reported($_REQUEST['forumId'])); } + +ask_ticket('view-forum-thread'); // Display the template $smarty->assign('mid','tiki-view_forum_thread.tpl'); Index: tiki-view_tracker.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker.php,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -w -u -r1.6 -r1.6.4.1 --- tiki-view_tracker.php 21 Mar 2003 17:34:53 -0000 1.6 +++ tiki-view_tracker.php 24 Dec 2003 23:01:37 -0000 1.6.4.1 @@ -92,6 +92,7 @@ if($tiki_p_admin_trackers == 'y') { if(isset($_REQUEST["remove"])) { + check_ticket('view-trackers'); $trklib->remove_tracker_item($_REQUEST["remove"]); } } @@ -101,6 +102,7 @@ if($user) { if(isset($_REQUEST["monitor"])) { + check_ticket('view-trackers'); $user_email = $tikilib->get_user_email($user); $emails = $notificationlib->get_mail_events('tracker_modified',$_REQUEST["trackerId"]); if(in_array($user_email,$emails)) { @@ -136,6 +138,7 @@ if($tiki_p_create_tracker_items == 'y') { if(isset($_REQUEST["save"])) { + check_ticket('view-trackers'); // Save here the values for this item $trklib->replace_item($_REQUEST["trackerId"],$_REQUEST["itemId"],$ins_fields); for($i=0;$iassign('mid','tiki-view_tracker.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-view_tracker_item.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker_item.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -w -u -r1.8 -r1.8.2.1 --- tiki-view_tracker_item.php 10 Jun 2003 14:25:57 -0000 1.8 +++ tiki-view_tracker_item.php 24 Dec 2003 23:01:37 -0000 1.8.2.1 @@ -95,6 +95,7 @@ if($tiki_p_admin_trackers == 'y') { if(isset($_REQUEST["remove"])) { + check_ticket('view-trackers-items'); $trklib->remove_tracker_item($_REQUEST["remove"]); } } @@ -103,6 +104,7 @@ if($tiki_p_modify_tracker_items == 'y') { if(isset($_REQUEST["save"])) { + check_ticket('view-trackers-items'); // Save here the values for this item $trklib->replace_item($_REQUEST["trackerId"],$_REQUEST["itemId"],$ins_fields,$_REQUEST["status"]); for($i=0;$iassign('email_mon',''); if($user) { if(isset($_REQUEST["monitor"])) { + check_ticket('view-trackers-items'); $user_email = $tikilib->get_user_email($user); $emails = $notificationlib->get_mail_events('tracker_item_modified',$_REQUEST["itemId"]); if(in_array($user_email,$emails)) { @@ -205,6 +208,7 @@ if($tiki_p_admin_trackers == 'y') { if(isset($_REQUEST["remove_comment"])) { + check_ticket('view-trackers-items'); $trklib->remove_item_comment($_REQUEST["remove_comment"]); } } @@ -226,6 +230,7 @@ if($tiki_p_comment_tracker_items == 'y') { if(isset($_REQUEST["save_comment"])) { + check_ticket('view-trackers-items'); $trklib->replace_item_comment($_REQUEST["commentId"],$_REQUEST["itemId"],$_REQUEST["comment_title"],$_REQUEST["comment_data"],$user); $smarty->assign('comment_title',''); $smarty->assign('comment_data',''); @@ -240,6 +245,7 @@ if($tracker_info["useAttachments"] == 'y') { if(isset($_REQUEST["removeattach"])) { + check_ticket('view-trackers-items'); $owner = $trklib->get_item_attachment_owner($_REQUEST["removeattach"]); if( ($user && ($owner == $user) ) || ($tiki_p_wiki_admin_attachments == 'y') ) { $trklib->remove_item_attachment($_REQUEST["removeattach"]); @@ -287,6 +293,8 @@ $section='trackers'; include_once('tiki-section_options.php'); +ask_ticket('view-trackers-items'); + // Display the template $smarty->assign('mid','tiki-view_tracker_item.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-webmail.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-webmail.php,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -w -u -r1.11.2.1 -r1.11.2.2 --- tiki-webmail.php 8 Aug 2003 16:09:28 -0000 1.11.2.1 +++ tiki-webmail.php 24 Dec 2003 23:01:37 -0000 1.11.2.2 @@ -96,6 +96,7 @@ // Search if we have to add some contacts if (isset($_REQUEST["add_contacts"])) { if (isset($_REQUEST["add"])) { + check_ticket('webmail'); foreach (array_keys($_REQUEST["add"])as $i) { $webmaillib->replace_contact(0, $_REQUEST["addFirstName"][$i], $_REQUEST["addLastName"][$i], $_REQUEST["addemail"][$i], $_REQUEST["addNickname"][$i], $user); @@ -117,6 +118,7 @@ $pop3->Open(); if (isset($_REQUEST["delete_one"])) { + check_ticket('webmail'); $realmsgid = $pop3->GetMessageID($_REQUEST["msgdel"]); $webmaillib->remove_webmail_message($current["accountId"], $user, $realmsgid); @@ -271,6 +273,7 @@ if (isset($_REQUEST["delete"])) { if (isset($_REQUEST["msg"])) { + check_ticket('webmail'); // Now we can delete the messages foreach (array_keys($_REQUEST["msg"])as $msg) { $realmsgid = $pop3->GetMessageID($msg); @@ -282,6 +285,7 @@ } if (isset($_REQUEST["delete_one"])) { + check_ticket('webmail'); $realmsgid = $pop3->GetMessageID($_REQUEST["msgdel"]); $webmaillib->remove_webmail_message($current["accountId"], $user, $realmsgid); @@ -297,6 +301,7 @@ if (isset($_REQUEST["operate"])) { if (isset($_REQUEST["msg"])) { + check_ticket('webmail'); // Now we can operate the messages foreach (array_keys($_REQUEST["msg"])as $msg) { $realmsg = $_REQUEST["realmsg"][$msg]; @@ -471,12 +476,14 @@ $smarty->assign('accountId', $_REQUEST["accountId"]); if (isset($_REQUEST["new_acc"])) { + check_ticket('webmail'); $webmaillib->replace_webmail_account($_REQUEST["accountId"], $user, $_REQUEST["account"], $_REQUEST["pop"], $_REQUEST["port"], $_REQUEST["username"], $_REQUEST["pass"], $_REQUEST["msgs"], $_REQUEST["smtp"], $_REQUEST["useAuth"], $_REQUEST["smtpPort"]); $_REQUEST["accountId"] = 0; } if (isset($_REQUEST["remove"])) { + check_ticket('webmail'); $webmaillib->remove_webmail_account($user, $_REQUEST["remove"]); } @@ -517,6 +524,7 @@ // Send a message if (isset($_REQUEST["reply"]) || isset($_REQUEST["replyall"])) { + check_ticket('webmail'); $webmaillib->set_mail_flag($current["accountId"], $user, $_REQUEST["realmsgid"], 'isReplied', 'y'); } @@ -532,6 +540,7 @@ $mail->setSubject($_REQUEST["subject"]); if ($_REQUEST["attach1"]) { + check_ticket('webmail'); $a1 = $mail->getFile('temp/mail_attachs/' . $_REQUEST["attach1file"]); $mail->addAttachment($a1, $_REQUEST["attach1"], $_REQUEST["attach1type"]); @@ -539,6 +548,7 @@ } if ($_REQUEST["attach2"]) { + check_ticket('webmail'); $a2 = $mail->getFile('temp/mail_attachs/' . $_REQUEST["attach2file"]); $mail->addAttachment($a2, $_REQUEST["attach2"], $_REQUEST["attach2type"]); @@ -546,6 +556,7 @@ } if ($_REQUEST["attach3"]) { + check_ticket('webmail'); $a3 = $mail->getFile('temp/mail_attachs/' . $_REQUEST["attach3file"]); $mail->addAttachment($a3, $_REQUEST["attach3"], $_REQUEST["attach3type"]); @@ -605,6 +616,7 @@ } if (isset($_REQUEST["remove_attach1"])) { + check_ticket('webmail'); @unlink ($_REQUEST["attach1file"]); $_REQUEST["attach1"] = ''; @@ -613,6 +625,7 @@ } if (isset($_REQUEST["remove_attach2"])) { + check_ticket('webmail'); @unlink ($_REQUEST["attach2file"]); $_REQUEST["attach2"] = ''; @@ -621,6 +634,7 @@ } if (isset($_REQUEST["remove_attach3"])) { + check_ticket('webmail'); @unlink ($_REQUEST["attach3file"]); $_REQUEST["attach3"] = ''; @@ -631,6 +645,7 @@ if (isset($_REQUEST["attached"])) { // Now process the uploads if (isset($_FILES['userfile1']) && is_uploaded_file($_FILES['userfile1']['tmp_name'])) { + check_ticket('webmail'); $size = $_FILES['userfile1']['size']; if ($size < 1500000) { @@ -645,6 +660,7 @@ } if (isset($_FILES['userfile2']) && is_uploaded_file($_FILES['userfile2']['tmp_name'])) { + check_ticket('webmail'); $size = $_FILES['userfile2']['size']; if ($size < 1500000) { @@ -659,6 +675,7 @@ } if (isset($_FILES['userfile3']) && is_uploaded_file($_FILES['userfile3']['tmp_name'])) { + check_ticket('webmail'); $size = $_FILES['userfile3']['size']; if ($size < 1500000) { @@ -754,10 +771,12 @@ $smarty->assign('info', $info); if (isset($_REQUEST["remove"])) { + check_ticket('webmail'); $webmaillib->remove_contact($_REQUEST["remove"], $user); } if (isset($_REQUEST["save"])) { + check_ticket('webmail'); $webmaillib->replace_contact($_REQUEST["contactId"], $_REQUEST["firstName"], $_REQUEST["lastName"], $_REQUEST["email"], $_REQUEST["nickname"], $user); $info["firstName"] = ''; @@ -826,6 +845,8 @@ $section = 'webmail'; include_once ('tiki-section_options.php'); + +ask_ticket('webmail'); $smarty->assign('mid', 'tiki-webmail.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: tiki-webmail_contacts.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-webmail_contacts.php,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -u -r1.3 -r1.3.6.1 --- tiki-webmail_contacts.php 6 Jan 2003 18:21:17 -0000 1.3 +++ tiki-webmail_contacts.php 24 Dec 2003 23:01:37 -0000 1.3.6.1 @@ -24,10 +24,12 @@ $smarty->assign('info',$info); if(isset($_REQUEST["remove"])) { + check_ticket('webmail-contact'); $webmaillib->remove_contact($_REQUEST["remove"],$user); } if(isset($_REQUEST["save"])) { + check_ticket('webmail-contact'); $webmaillib->replace_contact($_REQUEST["contactId"], $_REQUEST["firstName"],$_REQUEST["lastName"],$_REQUEST["email"],$_REQUEST["nickname"],$user ); $info["firstName"]=''; $info["lastName"]=''; @@ -87,6 +89,8 @@ } $smarty->assign_by_ref('channels',$channels["data"]); +ask_ticket('webmail-contact'); + //$smarty->display("styles/$style_base/tiki-webmail_contacts.tpl"); $smarty->display("tiki-webmail_contacts.tpl"); Index: tiki-wiki_rankings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-wiki_rankings.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -w -u -r1.6 -r1.6.2.1 --- tiki-wiki_rankings.php 16 May 2003 18:33:05 -0000 1.6 +++ tiki-wiki_rankings.php 24 Dec 2003 23:01:37 -0000 1.6.2.1 @@ -60,6 +60,9 @@ $smarty->assign_by_ref('rankings',$rankings); $smarty->assign('rpage','tiki-wiki_rankings.php'); + +ask_ticket('wiki-rankings'); + // Display the template $smarty->assign('mid','tiki-ranking.tpl'); $smarty->display("styles/$style_base/tiki.tpl"); Index: db/tiki-db.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-db.php,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -w -u -r1.20.2.2 -r1.20.2.3 --- db/tiki-db.php 30 Jul 2003 02:47:41 -0000 1.20.2.2 +++ db/tiki-db.php 22 Dec 2003 11:03:27 -0000 1.20.2.3 @@ -62,6 +62,9 @@ if (file_exists($file)) require_once($file); +$pass_tiki=urlencode($pass_tiki); +$user_tiki=urlencode($user_tiki); +$dbs_tiki=urlencode($dbs_tiki); $dsn = "mysql://$user_tiki:$pass_tiki@$host_tiki/$dbs_tiki"; //$dsn = "mysql://$user_tiki@$pass_tiki(localhost)/$dbs_tiki"; $dbTiki = DB::connect($dsn); Index: lib/commentslib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/commentslib.php,v retrieving revision 1.29.2.6 retrieving revision 1.29.2.7 diff -u -w -u -r1.29.2.6 -r1.29.2.7 --- lib/commentslib.php 20 Sep 2003 09:02:51 -0000 1.29.2.6 +++ lib/commentslib.php 22 Dec 2003 12:26:12 -0000 1.29.2.7 @@ -723,6 +723,7 @@ $query = "select * from tiki_comments where threadId='$id'"; $result = $this->query($query); $res = $result->fetchRow(DB_FETCHMODE_ASSOC); + if($res) { $res["parsed"] = $this->parse_comment_data($res["data"]); $res['user_posts']=$this->getOne("select posts from tiki_user_postings where user='".$res['userName']."'"); @@ -740,6 +741,7 @@ if($res['userName']) { $res['user_online']=$this->getOne("select count(*) from tiki_sessions where user='".$res['userName']."'")?'y':'n'; } + } return $res; } Index: lib/tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.196.2.60 retrieving revision 1.196.2.62 diff -u -w -u -r1.196.2.60 -r1.196.2.62 --- lib/tikilib.php 26 Oct 2003 01:52:56 -0000 1.196.2.60 +++ lib/tikilib.php 9 Nov 2003 22:14:51 -0000 1.196.2.62 @@ -2638,7 +2638,7 @@ function get_preference($name, $default='') { - static $preferences; + global $preferences; if (!isset($preferences[$name])) { $query = "select value from tiki_preferences where name='$name'"; @@ -2859,6 +2859,7 @@ $data = preg_replace( "/~rsq~/i", "’", $data ); $data = preg_replace( "/~c~/i", "©", $data ); $data = preg_replace( "/~--~/", "—", $data ); + $data = preg_replace( "/ -- /", " — ", $data ); $data = preg_replace( "/~lt~/i", "<", $data ); $data = preg_replace( "/~gt~/i", ">", $data ); Index: lib/userslib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v retrieving revision 1.35.2.17 retrieving revision 1.35.2.18 diff -u -w -u -r1.35.2.17 -r1.35.2.18 --- lib/userslib.php 17 Aug 2003 19:12:06 -0000 1.35.2.17 +++ lib/userslib.php 29 Oct 2003 15:57:59 -0000 1.35.2.18 @@ -990,7 +990,8 @@ return true; } - function remove_all_inclusions($group) { + function remove_all_inclusions($group) + { if(!$this->group_exists($group)) return false; $group=addslashes($group); $query = "delete from tiki_group_inclusion where groupName='$group'"; @@ -998,7 +999,8 @@ return true; } - function set_user_fields($u) { + function set_user_fields($u) + { global $feature_clear_passwords; if (@$u['password']) { if ($feature_clear_passwords == 's') { Index: lib/ban/banlib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/ban/banlib.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -u -r1.1.2.1 -r1.1.2.2 --- lib/ban/banlib.php 26 Jul 2003 07:59:05 -0000 1.1.2.1 +++ lib/ban/banlib.php 17 Dec 2003 17:01:25 -0000 1.1.2.2 @@ -111,7 +111,7 @@ user='$user', date_from = $date_from, date_to = $date_to, - user_dates = '$use_dates', + use_dates = '$use_dates', message = '$message' where banId=$banId "; Index: lib/imagegals/imagegallib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/imagegals/imagegallib.php,v retrieving revision 1.18.2.5 retrieving revision 1.18.2.6 diff -u -w -u -r1.18.2.5 -r1.18.2.6 --- lib/imagegals/imagegallib.php 19 Sep 2003 15:59:29 -0000 1.18.2.5 +++ lib/imagegals/imagegallib.php 20 Dec 2003 23:48:29 -0000 1.18.2.6 @@ -1091,7 +1091,7 @@ $page_data = $data; foreach($merge as $img) { // This prevents caching images - if(!strstr($img,"show_image.php") && !strstr($img,"nocache")) { + if(!strstr($img,"show_image.php") && !strstr($img,"nocache") && @getimagesize($img)) { //print("Procesando: $img
"); @$fp = fopen($img,"r"); if($fp) { Index: lib/stats/statslib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/stats/statslib.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -w -u -r1.5.2.1 -r1.5.2.2 --- lib/stats/statslib.php 26 Jul 2003 07:59:02 -0000 1.5.2.1 +++ lib/stats/statslib.php 20 Nov 2003 21:50:22 -0000 1.5.2.2 @@ -52,6 +52,8 @@ $pageName = $res["pageName"]; $queryc = "select count(*) from tiki_links where toPage='".addslashes($pageName)."'"; $cant = $this->getOne($queryc); + $queryc = "select count(*) from tiki_structures where page='".addslashes($pageName)."'"; + $cant += $this->getOne($queryc); if($cant==0) { $num_or++; $aux = Array(); Index: lib/wiki-plugins/wikiplugin_copyright.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_copyright.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -u -r1.3 -r1.3.2.1 --- lib/wiki-plugins/wikiplugin_copyright.php 5 Jul 2003 17:33:10 -0000 1.3 +++ lib/wiki-plugins/wikiplugin_copyright.php 24 Dec 2003 14:30:41 -0000 1.3.2.1 @@ -36,11 +36,6 @@ $result=$result.$notice; } - global $tiki_p_edit_copyrights; - if((isset($tiki_p_edit_copyrights)) && ($tiki_p_edit_copyrights == 'y')) { - $result=$result."\nEdit copyrights for ((".$_REQUEST['copyrightpage']."))\n"; - } - return $result; } ?> \ No newline at end of file Index: lib/wiki-plugins/wikiplugin_dl.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_dl.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -w -u -r1.2 -r1.2.2.1 --- lib/wiki-plugins/wikiplugin_dl.php 19 Jun 2003 20:50:22 -0000 1.2 +++ lib/wiki-plugins/wikiplugin_dl.php 24 Dec 2003 14:25:14 -0000 1.2.2.1 @@ -1,4 +1,13 @@ 5) $level=5; if(empty($data)) $data=$page; $mapname=md5(uniqid(".")); $ret=''; Index: templates/tiki-admin-include-features.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-features.tpl,v retrieving revision 1.10.2.11 retrieving revision 1.10.2.12 diff -u -w -u -r1.10.2.11 -r1.10.2.12 --- templates/tiki-admin-include-features.tpl 21 Sep 2003 01:16:19 -0000 1.10.2.11 +++ templates/tiki-admin-include-features.tpl 30 Nov 2003 02:38:02 -0000 1.10.2.12 @@ -470,7 +470,13 @@   -   + {if $feature_help eq 'y'}{/if} + {tr}Contact Us (Anonymous){/tr} + {if $feature_help eq 'y'}{/if} + : + +


{tr}Welcome to the Tiki Chat Rooms{/tr}

+{if $channels[0] ne ""}

{tr}Please select a chat channel{/tr}

+{else} +

{tr}There are no channels setup, please contact a site admin{/tr}

+{/if}
Index: templates/tiki-contact.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-contact.tpl,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.4 diff -u -w -u -r1.4.2.2 -r1.4.2.4 --- templates/tiki-contact.tpl 25 Jul 2003 02:28:35 -0000 1.4.2.2 +++ templates/tiki-contact.tpl 21 Dec 2003 17:03:19 -0000 1.4.2.4 @@ -1,5 +1,5 @@ {tr}Contact us{/tr}

-{if $feature_messages eq 'y' and $tiki_p_messages eq 'y'} +{if $feature_messages eq 'y' and ($tiki_p_messages eq 'y' or $contact_anon eq 'y' )} {if $message} {$message} {/if} @@ -28,7 +28,13 @@ {/if} -

{tr}Contact us by email{/tr}

+ {if strlen($email)>0} -{mailto address="$email" encode="javascript" text="click here to send us an email" extra='class="link"'} +

{tr}Contact us by email{/tr}

+ + + + + +
 {mailto address="$email" encode="javascript" text="click here to send us an email" extra='class="link"'}
{/if} Index: templates/tiki-install.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-install.tpl,v retrieving revision 1.4.2.9 retrieving revision 1.4.2.11 diff -u -w -u -r1.4.2.9 -r1.4.2.11 --- templates/tiki-install.tpl 18 Oct 2003 21:48:50 -0000 1.4.2.9 +++ templates/tiki-install.tpl 15 Dec 2003 23:07:48 -0000 1.4.2.11 @@ -1,23 +1,7 @@
-

Tiki installer v1.7.3 -Eta Carinae- Tiki installer v1.7.5 -Eta Carinae- help

reload

-{* -{if $can_write eq 'n'} - We have problems!
- The following directories must be writeable by Tiki, please - check the permissions on those directories and then re-run - the install script.

- db/
- img/wiki
- img/wiki_up
- modules/cache
- templates_c
- backups
- dump
- temp

- try again! -*} {if $dbcon eq 'n'} Tiki cannot find a database connection
Please enter your database connection info

Index: templates/tiki-theme_control.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-theme_control.tpl,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -w -u -r1.3.2.2 -r1.3.2.3 --- templates/tiki-theme_control.tpl 20 Aug 2003 06:38:00 -0000 1.3.2.2 +++ templates/tiki-theme_control.tpl 15 Dec 2003 00:36:27 -0000 1.3.2.3 @@ -19,7 +19,7 @@ 5. {tr}Finally if the user didn't select a theme the default theme is used{/tr}


-[{tr}Control by Object{/tr} +[{tr}Control by Objects{/tr} | {tr}Control by Sections{/tr}]

{tr}Assign themes to categories{/tr}

Index: templates/tiki-theme_control_objects.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-theme_control_objects.tpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -w -u -r1.3.2.3 -r1.3.2.4 --- templates/tiki-theme_control_objects.tpl 18 Oct 2003 02:17:19 -0000 1.3.2.3 +++ templates/tiki-theme_control_objects.tpl 15 Dec 2003 00:36:27 -0000 1.3.2.4 @@ -19,7 +19,7 @@ 5. {tr}Finally if the user didn't select a theme the default theme is used{/tr}


-[{tr}Control by category{/tr} +[{tr}Control by Categories{/tr} | {tr}Control by Sections{/tr}]

{tr}Assign themes to objects{/tr}

Index: templates/tiki-theme_control_sections.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-theme_control_sections.tpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -w -u -r1.3.2.3 -r1.3.2.4 --- templates/tiki-theme_control_sections.tpl 20 Aug 2003 06:38:00 -0000 1.3.2.3 +++ templates/tiki-theme_control_sections.tpl 15 Dec 2003 00:36:27 -0000 1.3.2.4 @@ -19,8 +19,8 @@ 5. {tr}Finally if the user didn't select a theme the default theme is used{/tr}


-[{tr}Control by Object{/tr} -| {tr}Control by Categories{/tr}] +[{tr}Control by Categories{/tr} | +{tr}Control by Objects{/tr}]

{tr}Assign themes to sections{/tr}

Index: templates/tiki-top_bar.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-top_bar.tpl,v retrieving revision 1.17.2.8 retrieving revision 1.17.2.9 diff -u -w -u -r1.17.2.8 -r1.17.2.9 --- templates/tiki-top_bar.tpl 27 Oct 2003 21:20:52 -0000 1.17.2.8 +++ templates/tiki-top_bar.tpl 18 Dec 2003 00:47:37 -0000 1.17.2.9 @@ -1,4 +1,4 @@ -{tr}This is{/tr} Tiki v1.7.4 -Eta Carinae- (c)2002-2003 {tr}by the{/tr} +{tr}This is{/tr} Tiki v1.7.5 -Eta Carinae- (c)2002-2003 {tr}by the{/tr} Tiki community {if $feature_calendar eq 'y' and $tiki_p_view_calendar eq 'y'} {$smarty.now|tiki_short_datetime} Index: templates/modules/mod-application_menu.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/modules/mod-application_menu.tpl,v retrieving revision 1.53.2.21 retrieving revision 1.53.2.22 diff -u -w -u -r1.53.2.21 -r1.53.2.22 --- templates/modules/mod-application_menu.tpl 22 Oct 2003 22:56:54 -0000 1.53.2.21 +++ templates/modules/mod-application_menu.tpl 19 Dec 2003 21:53:04 -0000 1.53.2.22 @@ -541,6 +541,7 @@  {tr}phpinfo{/tr}
 {tr}DSN{/tr}
 {tr}External wikis{/tr}
+  {tr}System Admin{/tr}
{/if} {/if} Index: templates/styles/geo/tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/geo/tiki-show_page.tpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -w -u -r1.1.2.6 -r1.1.2.7 --- templates/styles/geo/tiki-show_page.tpl 17 Oct 2003 21:59:28 -0000 1.1.2.6 +++ templates/styles/geo/tiki-show_page.tpl 28 Nov 2003 19:40:13 -0000 1.1.2.7 @@ -32,7 +32,7 @@ -{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'}
{if $lock} {tr}locked{/tr} Index: templates/styles/moreneat/tiki-editpage.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/tiki-editpage.tpl,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -u -w -u -r1.1.2.15 -r1.1.2.16 --- templates/styles/moreneat/tiki-editpage.tpl 26 Oct 2003 22:59:03 -0000 1.1.2.15 +++ templates/styles/moreneat/tiki-editpage.tpl 28 Nov 2003 19:53:17 -0000 1.1.2.16 @@ -135,7 +135,7 @@ {/if} -{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'}
{/if} {/if} -{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {/if} {/if} -{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {/if}
{tr}Description{/tr}:
{tr}Edit{/tr}: Index: templates/styles/moreneat/tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/tiki-show_page.tpl,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -w -u -r1.1.2.17 -r1.1.2.18 --- templates/styles/moreneat/tiki-show_page.tpl 17 Oct 2003 22:03:13 -0000 1.1.2.17 +++ templates/styles/moreneat/tiki-show_page.tpl 28 Nov 2003 19:53:17 -0000 1.1.2.18 @@ -7,7 +7,7 @@ {if $is_categorized eq 'y' and $feature_categories eq 'y' and $feature_categorypath eq 'y'}
-{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {$description} {/if} {if $cached_page eq 'y'} @@ -21,7 +21,7 @@ {else}
-{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {$description} {/if} {if $cached_page eq 'y'} Index: templates/styles/moreneat/modules/mod-application_menu.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/modules/mod-application_menu.tpl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -w -u -r1.1.2.4 -r1.1.2.5 --- templates/styles/moreneat/modules/mod-application_menu.tpl 22 Oct 2003 23:03:49 -0000 1.1.2.4 +++ templates/styles/moreneat/modules/mod-application_menu.tpl 19 Dec 2003 21:56:01 -0000 1.1.2.5 @@ -412,6 +412,7 @@  {tr}phpinfo{/tr}
 {tr}Admin dsn{/tr}
 {tr}External wikis{/tr}
+  {tr}System Admin{/tr}
{/if} Index: templates/styles/mose/modules/mod-application_menu.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/mose/modules/mod-application_menu.tpl,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -w -u -r1.4.2.5 -r1.4.2.6 --- templates/styles/mose/modules/mod-application_menu.tpl 22 Oct 2003 23:03:50 -0000 1.4.2.5 +++ templates/styles/mose/modules/mod-application_menu.tpl 19 Dec 2003 21:56:01 -0000 1.4.2.6 @@ -511,6 +511,7 @@  {tr}phpinfo{/tr}
 {tr}Admin dsn{/tr}
 {tr}External wikis{/tr}
+  {tr}System Admin{/tr}
{/if} {/if} Index: templates/styles/neat/tiki-editpage.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/neat/tiki-editpage.tpl,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -w -u -r1.1.2.12 -r1.1.2.13 --- templates/styles/neat/tiki-editpage.tpl 26 Oct 2003 22:59:05 -0000 1.1.2.12 +++ templates/styles/neat/tiki-editpage.tpl 28 Nov 2003 20:34:13 -0000 1.1.2.13 @@ -135,7 +135,7 @@
{tr}Description{/tr}:
{tr}Edit{/tr}: Index: templates/styles/neat/tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/neat/tiki-show_page.tpl,v retrieving revision 1.5.2.11 retrieving revision 1.5.2.12 diff -u -w -u -r1.5.2.11 -r1.5.2.12 --- templates/styles/neat/tiki-show_page.tpl 17 Oct 2003 22:06:06 -0000 1.5.2.11 +++ templates/styles/neat/tiki-show_page.tpl 28 Nov 2003 19:54:14 -0000 1.5.2.12 @@ -7,7 +7,7 @@ {if $is_categorized eq 'y' and $feature_categories eq 'y' and $feature_categorypath eq 'y'}
-{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {$description} {/if} {if $cached_page eq 'y'} @@ -21,7 +21,7 @@ {else}
-{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {$description} {/if} {if $cached_page eq 'y'} Index: templates/styles/neat/modules/mod-application_menu.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/neat/modules/mod-application_menu.tpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -w -u -r1.7.2.3 -r1.7.2.4 --- templates/styles/neat/modules/mod-application_menu.tpl 22 Oct 2003 23:03:50 -0000 1.7.2.3 +++ templates/styles/neat/modules/mod-application_menu.tpl 19 Dec 2003 21:56:02 -0000 1.7.2.4 @@ -411,6 +411,7 @@  {tr}phpinfo{/tr}
 {tr}Admin dsn{/tr}
 {tr}External wikis{/tr}
+  {tr}System Admin{/tr}
{/if} Index: templates/styles/tiki/tiki-editpage.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/tiki/tiki-editpage.tpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -w -u -r1.1.2.6 -r1.1.2.7 --- templates/styles/tiki/tiki-editpage.tpl 26 Oct 2003 22:59:05 -0000 1.1.2.6 +++ templates/styles/tiki/tiki-editpage.tpl 28 Nov 2003 19:54:31 -0000 1.1.2.7 @@ -135,7 +135,7 @@
{tr}Description{/tr}:
{tr}Edit{/tr}: Index: templates/styles/tiki/tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/tiki/tiki-show_page.tpl,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -w -u -r1.1.2.5 -r1.1.2.6 --- templates/styles/tiki/tiki-show_page.tpl 17 Oct 2003 22:18:29 -0000 1.1.2.5 +++ templates/styles/tiki/tiki-show_page.tpl 28 Nov 2003 19:54:31 -0000 1.1.2.6 @@ -43,7 +43,7 @@ {/if}
-{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'} {$description} {/if} {if $cached_page eq 'y'} Index: templates/styles/tiki/modules/mod-application_menu.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/tiki/modules/mod-application_menu.tpl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -w -u -r1.1.2.4 -r1.1.2.5 --- templates/styles/tiki/modules/mod-application_menu.tpl 22 Oct 2003 23:03:50 -0000 1.1.2.4 +++ templates/styles/tiki/modules/mod-application_menu.tpl 19 Dec 2003 21:56:02 -0000 1.1.2.5 @@ -414,6 +414,7 @@
{tr}phpinfo{/tr}
{tr}Admin dsn{/tr}
{tr}External wikis{/tr}
+
{tr}System Admin{/tr}
{/if}
Index: templates/styles/trollparty/tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/styles/trollparty/tiki-show_page.tpl,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -w -u -r1.1.2.5 -r1.1.2.6 --- templates/styles/trollparty/tiki-show_page.tpl 17 Oct 2003 22:19:23 -0000 1.1.2.5 +++ templates/styles/trollparty/tiki-show_page.tpl 28 Nov 2003 19:54:41 -0000 1.1.2.6 @@ -32,7 +32,7 @@ -{if $feature_wiki_description} +{if $feature_wiki_description eq 'y'}
{if $lock} {tr}locked{/tr}