From: <sy...@us...> - 2008-11-25 21:21:06
|
Revision: 15757 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15757&view=rev Author: sylvieg Date: 2008-11-25 21:20:55 +0000 (Tue, 25 Nov 2008) Log Message: ----------- notice Modified Paths: -------------- trunk/categorize.php trunk/lib/categories/categlib.php trunk/templates/tiki-admin_calendars.tpl trunk/templates/tiki-assignuser.tpl trunk/tiki-admin_calendars.php trunk/tiki-calendar_edit_item.php Modified: trunk/categorize.php =================================================================== --- trunk/categorize.php 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/categorize.php 2008-11-25 21:20:55 UTC (rev 15757) @@ -41,7 +41,7 @@ $_REQUEST['cat_categories'][] = $prefs['wikiapproval_outofsync_category']; } } - $categlib->update_object_categories($_REQUEST['cat_categories'], $cat_objid, $cat_type, $cat_desc, $cat_name, $cat_href); + $categlib->update_object_categories(isset($_REQUEST['cat_categories'])?$_REQUEST['cat_categories']:'', $cat_objid, $cat_type, $cat_desc, $cat_name, $cat_href); $cats = $categlib->get_object_categories($cat_type, $cat_objid); if (isset($section) && $section == 'wiki' && $prefs['feature_wiki_mandatory_category'] > 0) Modified: trunk/lib/categories/categlib.php =================================================================== --- trunk/lib/categories/categlib.php 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/lib/categories/categlib.php 2008-11-25 21:20:55 UTC (rev 15757) @@ -1514,7 +1514,7 @@ } foreach ($removed_categories as $categId) { $category = $this->get_category($categId); - $values= array('categoryId'=>$categId, 'categoryName'=>$category['name'], 'categoryPath'=>$this->get_category_path_string_with_root($cat), + $values= array('categoryId'=>$categId, 'categoryName'=>$category['name'], 'categoryPath'=>$this->get_category_path_string_with_root($categId), 'description'=>$category['description'], 'parentId'=>$category['parentId'], 'parentName'=>$this->get_category_name($category['parentId']), 'action'=>'object leaved category', 'objectName'=>$name, 'objectType'=>$objType, 'objectUrl'=>$href); $this->notify($values); Modified: trunk/templates/tiki-admin_calendars.tpl =================================================================== --- trunk/templates/tiki-admin_calendars.tpl 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/templates/tiki-admin_calendars.tpl 2008-11-25 21:20:55 UTC (rev 15757) @@ -1,10 +1,14 @@ -{title admpage="calendar"}{tr}Admin Calendars{/tr}{/title} - -{if $calendarId} - <div class="navbar"> - {button _text="{tr}Create Calendar{/tr}" href="tiki-admin_calendars.php?show=mod"} - </div> +{if !empty($calendarId)} + {title url="tiki-admin_calendars.php?calendarId=$calendarId" admpage="calendar"}{tr}Admin Calendars{/tr}{/title} +{else} + {title url="tiki-admin_calendars.php" admpage="calendar"}{tr}Admin Calendars{/tr}{/title} {/if} +<div class="navbar"> +{if !empty($calendarId)} + {button _text="{tr}Create Calendar{/tr}" href="tiki-admin_calendars.php?show=mod"} +{/if} +{button _text="{tr}View Calendars{/tr}" href="tiki-calendar.php"} +</div> {if $prefs.feature_tabs eq 'y'} {cycle name=tabs values="1,2,3" print=false advance=false reset=true} Modified: trunk/templates/tiki-assignuser.tpl =================================================================== --- trunk/templates/tiki-assignuser.tpl 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/templates/tiki-assignuser.tpl 2008-11-25 21:20:55 UTC (rev 15757) @@ -26,7 +26,7 @@ {foreach from=$user_info.groups item=what key=grp} {if $what eq 'included'}<i>{/if}{$grp}{if $what eq 'included'}</i>{/if} {if $grp != "Anonymous" && $grp != "Registered"} -<a class="link" href="tiki-assignuser.php?{if $offset}offset={$offset}&{/if}maxRecords={$prefs.maxRecords}&sort_mode={$sort_mode}{if $assign_user}&assign_user={$assign_user|escape:url}{/if}&action=removegroup&group={$grp|escape:url}" title="Remove">{icon _id='cross' alt='{tr}Remove{/tr}' style="vertical-align:middle"}</a>{if !user_info.groups.last},{/if} +<a class="link" href="tiki-assignuser.php?{if $offset}offset={$offset}&{/if}maxRecords={$prefs.maxRecords}&sort_mode={$sort_mode}{if $assign_user}&assign_user={$assign_user|escape:url}{/if}&action=removegroup&group={$grp|escape:url}" title="Remove">{icon _id='cross' alt='{tr}Remove{/tr}' style="vertical-align:middle"}</a>{if !$user_info.groups.last},{/if} {/if} {/foreach} </td></tr> Modified: trunk/tiki-admin_calendars.php =================================================================== --- trunk/tiki-admin_calendars.php 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/tiki-admin_calendars.php 2008-11-25 21:20:55 UTC (rev 15757) @@ -62,7 +62,7 @@ } } $_REQUEST["calendarId"] = $calendarlib->set_calendar($_REQUEST["calendarId"],$user,$_REQUEST["name"],$_REQUEST["description"],$customflags,$options); - $groupalertlib->AddGroup ('calendar',$_REQUEST["calendarId"],$_REQUEST['groupforAlert'],$_REQUEST['showeachuser']); + $groupalertlib->AddGroup ('calendar',$_REQUEST["calendarId"],$_REQUEST['groupforAlert'], !empty($_REQUEST['showeachuser'])?$_REQUEST['showeachuser']:'n'); if ($_REQUEST['personal'] == 'y') { $userlib->assign_object_permission("Registered", $_REQUEST["calendarId"], "calendar", "tiki_p_view_calendar"); $userlib->assign_object_permission("Registered", $_REQUEST["calendarId"], "calendar", "tiki_p_view_events"); Modified: trunk/tiki-calendar_edit_item.php =================================================================== --- trunk/tiki-calendar_edit_item.php 2008-11-25 21:10:19 UTC (rev 15756) +++ trunk/tiki-calendar_edit_item.php 2008-11-25 21:20:55 UTC (rev 15757) @@ -128,10 +128,15 @@ -if ( ! isset($_REQUEST["calendarId"]) ) - $calID=$calendarlib->get_calendarid($_REQUEST["calitemId"]); - else +if ( ! isset($_REQUEST["calendarId"]) ) { + if (isset($_REQUEST['calitemId'])) { + $calID = $calendarlib->get_calendarid($_REQUEST['calitemId']); + } elseif (isset(S_REQUEST['viewcalitemId'])) { + $calID = $calendarlib->get_calendarid($_REQUEST['viewcalitemId']); + } +} elseif (isset($_REQUEST['calendarId'])) { $calID=$_REQUEST["calendarId"]; +} $groupforalert=$groupalertlib->GetGroup ('calendar',$calID); if ( $groupforalert != "" ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |