[geeklog-cvs] geeklog-1.3/public_html/admin event.php,1.47,1.48

dhaun at iowaoutdoors.org dhaun at iowaoutdoors.org
Mon Jul 26 05:57:38 EDT 2004


Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv2623/public_html/admin

Modified Files:
	event.php 
Log Message:
Added parameter filtering, google paging, row numbers to the Admin's event editor. The list of events is also sorted by newest event first now. Moved error messages to the language file.


Index: event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** event.php	8 Feb 2004 19:00:49 -0000	1.47
--- event.php	26 Jul 2004 09:57:35 -0000	1.48
***************
*** 43,46 ****
--- 43,49 ----
  // COM_debug($HTTP_POST_VARS);
  
+ // number of events to list per page
+ define ('EVENTS_PER_PAGE', 50);
+ 
  $display = '';
  
***************
*** 65,78 ****
  * Shows event editor
  *
! * $mode         string      Indicates if this is a submission or an regular entry
! * $eid          string      ID of event to edit
  *
  */
! function editevent($mode, $A) 
  {
!     global $_TABLES, $LANG30, $LANG22, $_CONF, $LANG_ACCESS, $_USER, $LANG12, $_STATES;
  
      $retval = '';
  
      $event_templates = new Template($_CONF['path_layout'] . 'admin/event');
      $event_templates->set_file('editor','eventeditor.thtml');
--- 68,90 ----
  * Shows event editor
  *
! * @param    string  $mode   Indicates if this is a submission or a regular entry
! * @param    array   $A      array holding the event's details
! * @param    string  $msg    an optional error message to display
! * @return   string          HTML for event editor or error message
  *
  */
! function editevent ($mode, $A, $msg = '') 
  {
!     global $_CONF, $_TABLES, $_USER, $LANG12, $LANG22, $LANG30, $LANG_ACCESS, $_STATES;
  
      $retval = '';
  
+     if (!empty ($msg)) {
+         $retval .= COM_startBlock ($LANG22[2], '',
+                         COM_getBlockTemplate ('_msg_block', 'header'));
+         $retval .= $msg;
+         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+     }
+ 
      $event_templates = new Template($_CONF['path_layout'] . 'admin/event');
      $event_templates->set_file('editor','eventeditor.thtml');
***************
*** 81,88 ****
      $event_templates->set_var('layout_url',$_CONF['layout_url']);
  
! 	if ($mode <> 'editsubmission' AND !empty($A['eid'])) {
! 		// Get what level of access user has to this object
! 		$access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
! 		if ($access == 0 OR $access == 2) {
              // Uh, oh!  User doesn't have access to this object
              $retval .= COM_startBlock ($LANG22[16], '',
--- 93,100 ----
      $event_templates->set_var('layout_url',$_CONF['layout_url']);
  
!     if ($mode <> 'editsubmission' AND !empty($A['eid'])) {
!         // Get what level of access user has to this object
!         $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
!         if ($access == 0 OR $access == 2) {
              // Uh, oh!  User doesn't have access to this object
              $retval .= COM_startBlock ($LANG22[16], '',
***************
*** 103,107 ****
      }
  
! 	$retval .= COM_startBlock($LANG22[1], '',
                                COM_getBlockTemplate ('_admin_block', 'header'));
  
--- 115,119 ----
      }
  
!     $retval .= COM_startBlock($LANG22[1], '',
                                COM_getBlockTemplate ('_admin_block', 'header'));
  
***************
*** 124,128 ****
          $catdd .= '<option value="' . current($types) . '"';
          if ($A['event_type'] == current($types)) {
!             $catdd .= ' selected="SELECTED"';
          }
          $catdd .= '>' . current($types) . '</option>';
--- 136,140 ----
          $catdd .= '<option value="' . current($types) . '"';
          if ($A['event_type'] == current($types)) {
!             $catdd .= ' selected="selected"';
          }
          $catdd .= '>' . current($types) . '</option>';
***************
*** 157,163 ****
      if ($start_hour > 12) {
          $start_hour = $start_hour - 12;
!         $event_templates->set_var('startpm_selected','selected="SELECTED"');
      } else {
!         $event_templates->set_var('startam_selected','selected="SELECTED"');
      }
      $end_hour = date('H', $end_stamp);
--- 169,175 ----
      if ($start_hour > 12) {
          $start_hour = $start_hour - 12;
!         $event_templates->set_var('startpm_selected','selected="selected"');
      } else {
!         $event_templates->set_var('startam_selected','selected="selected"');
      }
      $end_hour = date('H', $end_stamp);
***************
*** 169,175 ****
      }
      if ($ampm == 'pm') {
!         $event_templates->set_var('endpm_selected', 'selected="SELECTED"');
      } else {
!         $event_templates->set_var('endam_selected', 'selected="SELECTED"');
      }
  
--- 181,187 ----
      }
      if ($ampm == 'pm') {
!         $event_templates->set_var('endpm_selected', 'selected="selected"');
      } else {
!         $event_templates->set_var('endam_selected', 'selected="selected"');
      }
  
***************
*** 201,214 ****
      switch ($start_minute) {
      case '00':
!         $event_templates->set_var('startminuteoption1_selected', 'selected="SELECTED"');
          break;
      case '15':
!         $event_templates->set_var('startminuteoption2_selected', 'selected="SELECTED"');
          break;
      case '30':
!         $event_templates->set_var('startminuteoption3_selected', 'selected="SELECTED"');
          break;
      case '45':
!         $event_templates->set_var('startminuteoption4_selected', 'selected="SELECTED"');
          break;
      }
--- 213,226 ----
      switch ($start_minute) {
      case '00':
!         $event_templates->set_var('startminuteoption1_selected', 'selected="selected"');
          break;
      case '15':
!         $event_templates->set_var('startminuteoption2_selected', 'selected="selected"');
          break;
      case '30':
!         $event_templates->set_var('startminuteoption3_selected', 'selected="selected"');
          break;
      case '45':
!         $event_templates->set_var('startminuteoption4_selected', 'selected="selected"');
          break;
      }
***************
*** 217,230 ****
      switch ($end_minute) {
      case '00':
!         $event_templates->set_var('endminuteoption1_selected', 'selected="SELECTED"');
          break;
      case '15':
!         $event_templates->set_var('endminuteoption2_selected', 'selected="SELECTED"');
          break;
      case '30':
!         $event_templates->set_var('endminuteoption3_selected', 'selected="SELECTED"');
          break;
      case '45':
!         $event_templates->set_var('endminuteoption4_selected', 'selected="SELECTED"');
          break;
      }
--- 229,242 ----
      switch ($end_minute) {
      case '00':
!         $event_templates->set_var('endminuteoption1_selected', 'selected="selected"');
          break;
      case '15':
!         $event_templates->set_var('endminuteoption2_selected', 'selected="selected"');
          break;
      case '30':
!         $event_templates->set_var('endminuteoption3_selected', 'selected="selected"');
          break;
      case '45':
!         $event_templates->set_var('endminuteoption4_selected', 'selected="selected"');
          break;
      }
***************
*** 253,257 ****
          $state_options .= '<option value="' . key($_STATES) . '" ';
          if (key($_STATES) == $A['state']) {
!             $state_options .= 'selected="SELECTED"';
          }
          $state_options .= '>' . current($_STATES) . '</option>';
--- 265,269 ----
          $state_options .= '<option value="' . key($_STATES) . '" ';
          if (key($_STATES) == $A['state']) {
!             $state_options .= 'selected="selected"';
          }
          $state_options .= '>' . current($_STATES) . '</option>';
***************
*** 268,272 ****
      $event_templates->set_var('lang_cancel', $LANG22[21]);
  
! 	// user access info
      $event_templates->set_var('lang_accessrights',$LANG_ACCESS['accessrights']);
      $event_templates->set_var('lang_owner', $LANG_ACCESS['owner']);
--- 280,284 ----
      $event_templates->set_var('lang_cancel', $LANG22[21]);
  
!     // user access info
      $event_templates->set_var('lang_accessrights',$LANG_ACCESS['accessrights']);
      $event_templates->set_var('lang_owner', $LANG_ACCESS['owner']);
***************
*** 277,282 ****
      $groupdd = '';
      $usergroups = SEC_getUserGroups();
! 	if ($access == 3) {
! 		$groupdd .= '<select name="group_id">';
          for ($i = 0; $i < count($usergroups); $i++) {
              $groupdd .= '<option value="' . $usergroups[key($usergroups)] . '"';
--- 289,294 ----
      $groupdd = '';
      $usergroups = SEC_getUserGroups();
!     if ($access == 3) {
!         $groupdd .= '<select name="group_id">';
          for ($i = 0; $i < count($usergroups); $i++) {
              $groupdd .= '<option value="' . $usergroups[key($usergroups)] . '"';
***************
*** 288,296 ****
          }
          $groupdd.= '</select>';
! 	} else {
! 		// they can't set the group then
          $groupdd .= DB_getItem($_TABLES['groups'],'grp_name',"grp_id = {$A['group_id']}");
! 		$groupdd .= '<input type="hidden" name="group_id" value="' . $A['group_id'] . '">';
! 	}
      $event_templates->set_var('group_dropdown', $groupdd);
      $event_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
--- 300,308 ----
          }
          $groupdd.= '</select>';
!     } else {
!         // they can't set the group then
          $groupdd .= DB_getItem($_TABLES['groups'],'grp_name',"grp_id = {$A['group_id']}");
!         $groupdd .= '<input type="hidden" name="group_id" value="' . $A['group_id'] . '">';
!     }
      $event_templates->set_var('group_dropdown', $groupdd);
      $event_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
***************
*** 299,303 ****
      $event_templates->parse('output', 'editor');
      $retval .= $event_templates->finish($event_templates->get_var('output'));
! 	$retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
--- 311,315 ----
      $event_templates->parse('output', 'editor');
      $retval .= $event_templates->finish($event_templates->get_var('output'));
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
***************
*** 307,328 ****
  * Saves an event to the database
  *
! * @eid          string          Event ID
! * @title        string          Event Title
! * @url          string          URL for the event
! * @datestart    string          Date the event begins on
! * @dateend      string          Date the event ends on
! * @location     string          Where the event will be held at
! * @description  string          Description about the event
! * @owner_id     string          ID of owner
! * @group_id     string          ID of group event belongs to
! * @perm_owner   string          Permissions the owner has on event
! * @perm_group   string          Permissions the groups has on the event
! * @perm_members string          Permisssions members have on the event
! * @perm_anon    string          Permissions anonymous users have
  *
  */
! function saveevent($eid,$title,$event_type,$url,$allday,$start_month, $start_day, $start_year, $start_hour, $start_minute, $start_ampm, $end_month, $end_day, $end_year, $end_hour, $end_minute, $end_ampm, $location, $address1, $address2, $city, $state, $zipcode,$description,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$mode) 
  {
!     global $_TABLES, $_CONF, $LANG22;
  
      // Convert array values to numeric permission values
--- 319,343 ----
  * Saves an event to the database
  *
! * @param    string  $eid            Event ID
! * @param    string  $title          Event Title
! * @param    string  $url            URL for the event
! * @param    string  $datestart      Date the event begins on
! * @param    string  $dateend        Date the event ends on
! * @param    string  $location       Where the event will be held at
! * @param    string  $description    Description about the event
! * @param    string  $owner_id       ID of owner
! * @param    string  $group_id       ID of group event belongs to
! * @param    string  $perm_owner     Permissions the owner has on event
! * @param    string  $perm_group     Permissions the groups has on the event
! * @param    string  $perm_members   Permisssions members have on the event
! * @param    string  $perm_anon      Permissions anonymous users have
! * @return   string                  HTML redirect or error message
  *
  */
! function saveevent ($eid, $title, $event_type, $url, $allday, $start_month, $start_day, $start_year, $start_hour, $start_minute, $start_ampm, $end_month, $end_day, $end_year, $end_hour, $end_minute, $end_ampm, $location, $address1, $address2, $city, $state, $zipcode, $description, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon, $mode) 
  {
!     global $_CONF, $_TABLES, $_USER, $LANG22;
! 
!     $retval = '';
  
      // Convert array values to numeric permission values
***************
*** 341,353 ****
      }
      if (($access < 3) || !SEC_inGroup ($group_id)) {
!         $display .= COM_siteHeader('menu');
!         $display .= COM_startBlock ($MESSAGE[30], '',
                              COM_getBlockTemplate ('_msg_block', 'header'));
!         $display .= $MESSAGE[31];
!         $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!         $display .= COM_siteFooter();
!         COM_accessLog("User {$_USER['username']} tried to illegally submit or edit event $eid.");
!         echo $display;
!         exit;
      }
  
--- 356,367 ----
      }
      if (($access < 3) || !SEC_inGroup ($group_id)) {
!         $retval .= COM_siteHeader('menu');
!         $retval .= COM_startBlock ($MESSAGE[30], '',
                              COM_getBlockTemplate ('_msg_block', 'header'));
!         $retval .= $MESSAGE[31];
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!         $retval .= COM_siteFooter();
!         COM_accessLog ("User {$_USER['username']} tried to illegally submit or edit event $eid.");
!         return $retval;
      }
  
***************
*** 359,377 ****
  
      // Make sure start date is before end date
!     if (checkdate($start_month, $start_day, $start_year)) {
          $datestart = $start_year . '-' . $start_month . '-' . $start_day;
          $timestart = $start_hour . ':' . $start_minute . ':00';
      } else {
!         return COM_errorLog("Bad start date",2);
      }
!     if (checkdate($end_month, $end_day, $end_year)) {
          $dateend = $end_year . '-' . $end_month . '-' . $end_day;
          $timeend = $end_hour . ':' . $end_minute . ':00';
      } else {
!         return COM_errorLog("Bad end date", 2);
      }
      if ($allday == 0) {
          if ($dateend < $datestart) {
!             return COM_errorLog("End date is before start date");
          }
      } else {
--- 373,412 ----
  
      // Make sure start date is before end date
!     if (checkdate ($start_month, $start_day, $start_year)) {
          $datestart = $start_year . '-' . $start_month . '-' . $start_day;
          $timestart = $start_hour . ':' . $start_minute . ':00';
      } else {
!         $retval .= COM_siteHeader ('menu');
!         $retval .= COM_startBlock ($LANG22[2], '',
!                             COM_getBlockTemplate ('_msg_block', 'header'));
!         $retval .= $LANG22[23];
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!         $retval .= COM_siteFooter ();
! 
!         return $retval;
      }
!     if (checkdate ($end_month, $end_day, $end_year)) {
          $dateend = $end_year . '-' . $end_month . '-' . $end_day;
          $timeend = $end_hour . ':' . $end_minute . ':00';
      } else {
!         $retval .= COM_siteHeader ('menu');
!         $retval .= COM_startBlock ($LANG22[2], '',
!                             COM_getBlockTemplate ('_msg_block', 'header'));
!         $retval .= $LANG22[24];
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!         $retval .= COM_siteFooter ();
! 
!         return $retval;
      }
      if ($allday == 0) {
          if ($dateend < $datestart) {
!             $retval .= COM_siteHeader ('menu');
!             $retval .= COM_startBlock ($LANG22[2], '',
!                                 COM_getBlockTemplate ('_msg_block', 'header'));
!             $retval .= $LANG22[25];
!             $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!             $retval .= COM_siteFooter ();
! 
!             return $retval;
          }
      } else {
***************
*** 382,393 ****
      }
  
! 	// clean 'em up 
! 	$description = addslashes(COM_checkHTML(COM_checkWords($description)));
! 	$title = addslashes(COM_checkHTML(COM_checkWords($title)));
! 	$location = addslashes(COM_checkHTML(COM_checkWords($location)));
! 	$address1 = addslashes(COM_checkHTML(COM_checkWords($address1)));
! 	$address2 = addslashes(COM_checkHTML(COM_checkWords($address2)));
!     $city = addslashes(COM_checkHTML(COM_checkWords($city)));
!     $zipcode =  addslashes(COM_checkHTML(COM_checkWords($zipcode)));
      if ($allday == 0) {
          // Add 12 to make time on 24 hour clock if needed
--- 417,428 ----
      }
  
!     // clean 'em up 
!     $description = addslashes (COM_checkHTML (COM_checkWords ($description)));
!     $title = addslashes (COM_checkHTML (COM_checkWords ($title)));
!     $location = addslashes (COM_checkHTML (COM_checkWords ($location)));
!     $address1 = addslashes (COM_checkHTML (COM_checkWords ($address1)));
!     $address2 = addslashes (COM_checkHTML (COM_checkWords ($address2)));
!     $city = addslashes (COM_checkHTML (COM_checkWords ($city)));
!     $zipcode =  addslashes (COM_checkHTML (COM_checkWords ($zipcode)));
      if ($allday == 0) {
          // Add 12 to make time on 24 hour clock if needed
***************
*** 411,416 ****
      }
  
! 	if (!empty($eid) AND !empty($description) AND !empty($title)) {
! 		DB_delete($_TABLES['eventsubmission'],'eid',$eid);
  
          DB_save($_TABLES['events'],'eid,title,event_type,url,allday,datestart,dateend,timestart,timeend,location,address1,address2,city,state,zipcode,description,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',"$eid,'$title','$event_type','$url',$allday,'$datestart','$dateend','$timestart','$timeend','$location','$address1','$address2','$city','$state','$zipcode','$description',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
--- 446,451 ----
      }
  
!     if (!empty ($eid) AND !empty ($description) AND !empty ($title)) {
!         DB_delete ($_TABLES['eventsubmission'], 'eid', $eid);
  
          DB_save($_TABLES['events'],'eid,title,event_type,url,allday,datestart,dateend,timestart,timeend,location,address1,address2,city,state,zipcode,description,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon',"$eid,'$title','$event_type','$url',$allday,'$datestart','$dateend','$timestart','$timeend','$location','$address1','$address2','$city','$state','$zipcode','$description',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
***************
*** 427,437 ****
  
          return COM_refresh ($_CONF['site_admin_url'] . '/event.php?msg=17');
! 	} else {
! 		$retval .= COM_siteHeader('menu');
! 		$retval .= COM_errorLog($LANG22[10],2);
! 		$retval .= editevent($mode,$A);
! 		$retval .= COM_siteFooter();
          return $retval;
! 	}
  }
  
--- 462,475 ----
  
          return COM_refresh ($_CONF['site_admin_url'] . '/event.php?msg=17');
!     } else {
!         $retval .= COM_siteHeader ('menu');
!         $retval .= COM_startBlock ($LANG22[2], '',
!                             COM_getBlockTemplate ('_msg_block', 'header'));
!         $retval .= $LANG22[10];
!         $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!         $retval .= COM_siteFooter ();
! 
          return $retval;
!     }
  }
  
***************
*** 439,450 ****
  * lists all the events in the system
  *
  */
! function listevents() 
  {
! 	global $_TABLES, $LANG22, $_CONF, $LANG_ACCESS;
  
      $retval = '';
  
! 	$retval .= COM_startBlock ($LANG22[11], '',
                                 COM_getBlockTemplate ('_admin_block', 'header'));
  
--- 477,495 ----
  * lists all the events in the system
  *
+ * @param    int     $page   page number to display 
+ * @return   string          HTML for list of events
+ *
  */
! function listevents ($page = 1) 
  {
!     global $_CONF, $_TABLES, $LANG22, $LANG_ACCESS;
  
      $retval = '';
  
!     if ($page < 1) {
!         $page = 1;
!     }
! 
!     $retval .= COM_startBlock ($LANG22[11], '',
                                 COM_getBlockTemplate ('_admin_block', 'header'));
  
***************
*** 462,468 ****
      $event_templates->set_var('layout_url',$_CONF['layout_url']);
  
! 	$result = DB_query("SELECT * FROM {$_TABLES['events']} ORDER BY datestart");
! 	$nrows = DB_numRows($result);
! 	for ($i = 0; $i < $nrows; $i++) {
          $A = DB_fetchArray($result);
          $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
--- 507,515 ----
      $event_templates->set_var('layout_url',$_CONF['layout_url']);
  
!     $limit = (EVENTS_PER_PAGE * ($page - 1));
!     $result = DB_query("SELECT * FROM {$_TABLES['events']} ORDER BY datestart DESC LIMIT $limit," . EVENTS_PER_PAGE);
!     $nrows = DB_numRows($result);
!     for ($i = 0; $i < $nrows; $i++) {
!         $ecount = (EVENTS_PER_PAGE * ($page - 1)) + $i + 1;
          $A = DB_fetchArray($result);
          $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
***************
*** 481,489 ****
          $event_templates->set_var('event_startdate', $A['datestart']);
          $event_templates->set_var('event_enddate', $A['dateend']); 
          $event_templates->parse('event_row', 'row', true);
! 	}
      $event_templates->parse('output', 'list');
      $retval .= $event_templates->finish($event_templates->get_var('output'));
! 	$retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
--- 528,550 ----
          $event_templates->set_var('event_startdate', $A['datestart']);
          $event_templates->set_var('event_enddate', $A['dateend']); 
+         $event_templates->set_var('row_num', $ecount);
          $event_templates->parse('event_row', 'row', true);
!     }
! 
!     $eresult = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['events']}" . COM_getPermSQL ());
!     $N = DB_fetchArray ($eresult);
!     $numevents = $N['count'];
!     if ($numevents > EVENTS_PER_PAGE) {
!         $baseurl = $_CONF['site_admin_url'] . '/event.php';
!         $numpages = ceil ($numevents / EVENTS_PER_PAGE);
!         $event_templates->set_var ('google_paging',
!                 COM_printPageNavigation ($baseurl, $page, $numpages));
!     } else {
!         $event_templates->set_var ('google_paging', '');
!     }
! 
      $event_templates->parse('output', 'list');
      $retval .= $event_templates->finish($event_templates->get_var('output'));
!     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
***************
*** 493,496 ****
--- 554,559 ----
  * Delete an event
  *
+ * @param    string  $eid    id of event to delete
+ * @param    string          HTML redirect
  */
  function deleteEvent ($eid)
***************
*** 514,521 ****
  
  // MAIN
  
  if (($mode == $LANG22[22]) && !empty ($LANG22[22])) { // delete
      if (!isset ($eid) || empty ($eid) || ($eid == 0)) {
!         COM_errorLog ('Attempted to delete event eid=' . $eid);
          $display .= COM_refresh ($_CONF['site_admin_url'] . '/event.php');
      } else {
--- 577,592 ----
  
  // MAIN
+ if (count ($HTTP_POST_VARS) == 0) {
+     $http_input_vars = $HTTP_GET_VARS;
+ } else {
+     $http_input_vars = $HTTP_POST_VARS;
+ }   
+ $mode = $http_input_vars['mode'];
  
  if (($mode == $LANG22[22]) && !empty ($LANG22[22])) { // delete
+     $eid = COM_applyFilter ($http_input_vars['eid']);
      if (!isset ($eid) || empty ($eid) || ($eid == 0)) {
!         COM_errorLog ('Attempted to delete event eid=\''
!                       . $http_input_vars['eid'] . "'");
          $display .= COM_refresh ($_CONF['site_admin_url'] . '/event.php');
      } else {
***************
*** 523,559 ****
      }
  } else if (($mode == $LANG22[20]) && !empty ($LANG22[20])) { // save
!     $display .= saveevent ($eid, $title, $event_type, $url, $allday,
!         $start_month, $start_day, $start_year, $start_hour, $start_minute,
!         $start_ampm, $end_month, $end_day, $end_year, $end_hour, $end_minute,
!         $end_ampm, $location, $address1, $address2, $city, $state, $zipcode,
!         $description, $owner_id,$group_id,$perm_owner,$perm_group,$perm_members,
!         $perm_anon, $mode);
  } else if ($mode == 'editsubmission') {
!     $result = DB_query("SELECT * FROM {$_TABLES['eventsubmission']} WHERE eid ='$id'");
!     $A = DB_fetchArray($result);
!     $display .= COM_siteHeader('menu');
!     $display .= editevent($mode,$A);
!     $display .= COM_siteFooter();
  } else if ($mode == 'clone') {
      $result = DB_query ("SELECT * FROM {$_TABLES['events']} WHERE eid ='$eid'");
      $A = DB_fetchArray ($result);
      $A['eid'] = COM_makesid ();
-     $eid = $A['eid'];
      $display .= COM_siteHeader ('menu');
      $display .= editevent ($mode, $A);
      $display .= COM_siteFooter ();
  } else if ($mode == 'edit') {
!     $result = DB_query("SELECT * FROM {$_TABLES['events']} WHERE eid ='$eid'");
!     $A = DB_fetchArray($result);
!     $display .= COM_siteHeader('menu');
!     $display .= editevent($mode,$A);
!     $display .= COM_siteFooter();
  } else { // 'cancel' or no mode at all
!     $display .= COM_siteHeader('menu');
!     if (isset ($msg)) {
!         $display .= COM_showMessage($msg);
      }
!     $display .= listevents();
!     $display .= COM_siteFooter();
  }
  
--- 594,643 ----
      }
  } else if (($mode == $LANG22[20]) && !empty ($LANG22[20])) { // save
!     $display .= saveevent (COM_applyFilter ($HTTP_POST_VARS['eid']),
!             $HTTP_POST_VARS['title'], $HTTP_POST_VARS['event_type'],
!             $HTTP_POST_VARS['url'], $HTTP_POST_VARS['allday'],
!             $HTTP_POST_VARS['start_month'], $HTTP_POST_VARS['start_day'],
!             $HTTP_POST_VARS['start_year'], $HTTP_POST_VARS['start_hour'],
!             $HTTP_POST_VARS['start_minute'], $HTTP_POST_VARS['start_ampm'],
!             $HTTP_POST_VARS['end_month'], $HTTP_POST_VARS['end_day'],
!             $HTTP_POST_VARS['end_year'], $HTTP_POST_VARS['end_hour'],
!             $HTTP_POST_VARS['end_minute'], $HTTP_POST_VARS['end_ampm'],
!             $HTTP_POST_VARS['location'], $HTTP_POST_VARS['address1'],
!             $HTTP_POST_VARS['address2'], $HTTP_POST_VARS['city'],
!             $HTTP_POST_VARS['state'], $HTTP_POST_VARS['zipcode'],
!             $HTTP_POST_VARS['description'], $HTTP_POST_VARS['owner_id'],
!             $HTTP_POST_VARS['group_id'], $HTTP_POST_VARS['perm_owner'],
!             $HTTP_POST_VARS['perm_group'], $HTTP_POST_VARS['perm_members'],
!             $HTTP_POST_VARS['perm_anon'], $mode);
  } else if ($mode == 'editsubmission') {
!     $id = COM_applyFilter ($http_input_vars['id']);
!     $result = DB_query ("SELECT * FROM {$_TABLES['eventsubmission']} WHERE eid ='$id'");
!     $A = DB_fetchArray ($result);
!     $display .= COM_siteHeader ('menu');
!     $display .= editevent ($mode, $A);
!     $display .= COM_siteFooter ();
  } else if ($mode == 'clone') {
+     $eid = COM_applyFilter ($http_input_vars['eid']);
      $result = DB_query ("SELECT * FROM {$_TABLES['events']} WHERE eid ='$eid'");
      $A = DB_fetchArray ($result);
      $A['eid'] = COM_makesid ();
      $display .= COM_siteHeader ('menu');
      $display .= editevent ($mode, $A);
      $display .= COM_siteFooter ();
  } else if ($mode == 'edit') {
!     $eid = COM_applyFilter ($http_input_vars['eid']);
!     $result = DB_query ("SELECT * FROM {$_TABLES['events']} WHERE eid ='$eid'");
!     $A = DB_fetchArray ($result);
!     $display .= COM_siteHeader ('menu');
!     $display .= editevent ($mode, $A);
!     $display .= COM_siteFooter ();
  } else { // 'cancel' or no mode at all
!     $display .= COM_siteHeader ('menu');
!     if (isset ($http_input_vars['msg'])) {
!         $display .= COM_showMessage (COM_applyFilter ($http_input_vars['msg'],
!                                                       true));
      }
!     $display .= listevents (COM_applyFilter ($http_input_vars['page'], true));
!     $display .= COM_siteFooter ();
  }
  




More information about the geeklog-cvs mailing list