Note: this list is kept only as a demonstration for CVSNotice. For the latest CVS notices, see the Xaraya and Postnuke sites
View Statistics - Next Notice - Previous NoticeDirectory filter : [ all ] / postnuke_modules / postcalendar [ view in CVS ]
Date | Directory [filter] | File(s) [view] | Author [filter] |
07 Oct 2002 21:32:25 | postnuke_modules/postcalendar | pnadminapi.php,1.11,1.12 pnuser.php,1.63,1.64 pnuserapi.php,1.114,1.115 | Roger Raymond |
fixed loading of pnlang/{lang}/global.php |
Update of /home/cvsroot/postnuke_modules/postcalendar In directory ns7.hostnuke.net:/tmp/cvs-serv23883 Modified Files: pnadminapi.php pnuser.php pnuserapi.php Log Message: fixed loading of pnlang/{lang}/global.php Index: pnadminapi.php =================================================================== RCS file: /home/cvsroot/postnuke_modules/postcalendar/pnadminapi.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pnadminapi.php 2 Oct 2002 17:03:22 -0000 1.11 --- pnadminapi.php 7 Oct 2002 21:32:22 -0000 1.12 *************** *** 36,39 **** --- 36,43 ---- require_once("modules/$pcDir/common.api.php"); //========================================================================= + // grab the global language file + //========================================================================= + require_once("modules/$pcDir/pnlang/".pnUserGetLang()."/global.php"); + //========================================================================= // Setup Smarty defines //========================================================================= Index: pnuser.php =================================================================== RCS file: /home/cvsroot/postnuke_modules/postcalendar/pnuser.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** pnuser.php 4 Oct 2002 19:31:15 -0000 1.63 --- pnuser.php 7 Oct 2002 21:32:22 -0000 1.64 *************** *** 620,628 **** // PARSE event_sharing_block //================================================================= ! $data = array('0' => array('0',_PC_SHARE_PRIVATE), ! '1' => array('1',_PC_SHARE_PUBLIC), ! '2' => array('2',_PC_SHARE_SHOWBUSY)); if(pnSecAuthAction(0,'PostCalendar::', '::', ACCESS_ADMIN) || $pcAllowSiteWide) { ! array_push($data,array('3',_PC_SHARE_GLOBAL)); } $sharing = array(); --- 620,628 ---- // PARSE event_sharing_block //================================================================= ! $data = array('0' => array(SHARING_PRIVATE,_PC_SHARE_PRIVATE), ! '1' => array(SHARING_PUBLIC,_PC_SHARE_PUBLIC), ! '2' => array(SHARING_BUSY,_PC_SHARE_SHOWBUSY)); if(pnSecAuthAction(0,'PostCalendar::', '::', ACCESS_ADMIN) || $pcAllowSiteWide) { ! array_push($data,array(SHARING_GLOBAL,_PC_SHARE_GLOBAL)); } $sharing = array(); Index: pnuserapi.php =================================================================== RCS file: /home/cvsroot/postnuke_modules/postcalendar/pnuserapi.php,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** pnuserapi.php 4 Oct 2002 19:31:15 -0000 1.114 --- pnuserapi.php 7 Oct 2002 21:32:22 -0000 1.115 *************** *** 77,80 **** --- 77,85 ---- @define('REPEAT_ON_6MONTH', 4); @define('REPEAT_ON_YEAR', 5); + // event sharing values + define('SHARING_PRIVATE', 0); + define('SHARING_PUBLIC', 1); + define('SHARING_BUSY', 2); + define('SHARING_GLOBAL', 3); //========================================================================= // Require utility classes *************** *** 87,90 **** --- 92,99 ---- require_once("modules/$pcDir/common.api.php"); //========================================================================= + // grab the global language file + //========================================================================= + require_once("modules/$pcDir/pnlang/".pnUserGetLang()."/global.php"); + //========================================================================= // Setup Smarty defines //========================================================================= *************** *** 1164,1172 **** AND b.$catcolumn[catid] = a.$column[catid] "; // grab anonymous or global events if($userid == 0) { ! $sql .= "AND (((a.pc_aid = $userid OR a.pc_aid = '') AND (a.pc_sharing = 1 OR a.pc_sharing = 2 OR a.pc_sharing = '')) OR (a.pc_sharing = 3)) "; } else { ! $sql .= "AND (a.pc_aid = $userid AND (a.pc_sharing = 1 OR a.pc_sharing = 2 OR a.pc_sharing = 3)) "; } $sql .= "ORDER BY a.$column[eventDate], a.$column[startTime] ASC"; --- 1173,1185 ---- AND b.$catcolumn[catid] = a.$column[catid] "; // grab anonymous or global events + $private = SHARING_PRIVATE; + $public = SHARING_PUBLIC; + $busy = SHARING_BUSY; + $global = SHARING_GLOBAL; if($userid == 0) { ! $sql .= "AND (((a.pc_aid = $userid OR a.pc_aid = '') AND (a.pc_sharing = $public OR a.pc_sharing = $busy OR a.pc_sharing = '')) OR (a.pc_sharing = 3)) "; } else { ! $sql .= "AND (a.pc_aid = $userid AND (a.pc_sharing = $public OR a.pc_sharing = $busy OR a.pc_sharing = $global)) "; } $sql .= "ORDER BY a.$column[eventDate], a.$column[startTime] ASC";
View Statistics - Next Notice - Previous Notice
Visit Developer Site - Browse CVS Repository |
Syndicate via backend.rss (max. once per hour please) | Powered by CVSNotice 0.1.3 |