diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php
index da98e5b26..49e43d614 100644
--- a/e107_plugins/calendar_menu/admin_config.php
+++ b/e107_plugins/calendar_menu/admin_config.php
@@ -9,8 +9,8 @@
* Event calendar plugin - admin functions
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/admin_config.php,v $
- * $Revision: 1.17 $
- * $Date: 2009-12-20 22:47:10 $
+ * $Revision: 1.18 $
+ * $Date: 2009-12-21 19:52:48 $
* $Author: e107steved $
*/
@@ -19,7 +19,7 @@
*
* @package e107_plugins
* @subpackage event_calendar
- * @version $Id: admin_config.php,v 1.17 2009-12-20 22:47:10 e107steved Exp $;
+ * @version $Id: admin_config.php,v 1.18 2009-12-21 19:52:48 e107steved Exp $;
*/
$eplug_admin = true; // Make sure we show admin theme
@@ -35,6 +35,8 @@ if (!getperms('P'))
include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_admin_calendar_menu.php');
+require_once(e_HANDLER.'form_handler.php');
+$frm = new e_form();
$uc = e107::getUserClass(); // Userclass object pointer
$message = '';
@@ -356,111 +358,106 @@ if($action == 'cat')
switch ($calendarmenu_do)
{
case '1': // Edit existing record
- {
- // We edit the record
- $calendarmenu_db->db_Select('event_cat', '*', 'event_cat_id='.$calendarmenu_id);
- $calendarmenu_row = $calendarmenu_db->db_Fetch() ;
- extract($calendarmenu_row);
- $calendarmenu_cap1 = EC_ADLAN_A24;
- $calendarmenu_edit = TRUE;
- if ($ecal_send_email != 0)
- { // Need to send a test email
- // First, set up a dummy event
- global $thisevent;
- $thisevent = array('event_start' => $ecal_class->time_now, 'event_end' => ($ecal_class->time_now)+3600,
- 'event_title' => 'Test event', 'event_details' => EC_ADLAN_A191,
- 'event_cat_name' => $event_cat_name, 'event_location' => EC_ADLAN_A192,
- 'event_contact' => USEREMAIL,
- 'event_thread' => SITEURL.'dodgypage',
- 'event_id' => '6');
-
- // *************** SEND EMAIL HERE **************
- require_once(e_PLUGIN.'calendar_menu/calendar_shortcodes.php');
- require_once(e_HANDLER . 'mail.php');
- switch ($ecal_send_email)
- {
- case 1 : $cal_msg = $event_cat_msg1;
- break;
- case 2 : $cal_msg = $event_cat_msg2;
- break;
- }
- $cal_msg = $tp -> parseTemplate($cal_msg, TRUE);
- $cal_title = $tp -> parseTemplate($pref['eventpost_mailsubject'], TRUE);
- $user_email = USEREMAIL;
- $user_name = USERNAME;
-// $cal_msg = str_replace("\r","\n",$cal_msg);
-// echo $cal_msg."
";
- $send_result = sendemail($user_email, $cal_title, $cal_msg, $user_name, $pref['eventpost_mailaddress'], $pref['eventpost_mailfrom']);
- if ($send_result)
- $calendarmenu_msg .= "
";
- else
- $calendarmenu_msg .= "
";
- }
- break;
- }
+ // We edit the record
+ $calendarmenu_db->db_Select('event_cat', '*', 'event_cat_id='.$calendarmenu_id);
+ $calendarmenu_row = $calendarmenu_db->db_Fetch() ;
+ extract($calendarmenu_row);
+ $calendarmenu_cap1 = EC_ADLAN_A24;
+ $calendarmenu_edit = TRUE;
+ if ($ecal_send_email != 0)
+ { // Need to send a test email
+ // First, set up a dummy event
+ global $thisevent;
+ $thisevent = array('event_start' => $ecal_class->time_now, 'event_end' => ($ecal_class->time_now)+3600,
+ 'event_title' => 'Test event', 'event_details' => EC_ADLAN_A191,
+ 'event_cat_name' => $event_cat_name, 'event_location' => EC_ADLAN_A192,
+ 'event_contact' => USEREMAIL,
+ 'event_thread' => SITEURL.'dodgypage',
+ 'event_id' => '6');
+
+ // *************** SEND EMAIL HERE **************
+ require_once(e_PLUGIN.'calendar_menu/calendar_shortcodes.php');
+ require_once(e_HANDLER . 'mail.php');
+ switch ($ecal_send_email)
+ {
+ case 1 : $cal_msg = $event_cat_msg1;
+ break;
+ case 2 : $cal_msg = $event_cat_msg2;
+ break;
+ }
+ $cal_msg = $tp -> parseTemplate($cal_msg, TRUE);
+ $cal_title = $tp -> parseTemplate($pref['eventpost_mailsubject'], TRUE);
+ $user_email = USEREMAIL;
+ $user_name = USERNAME;
+ $send_result = sendemail($user_email, $cal_title, $cal_msg, $user_name, $pref['eventpost_mailaddress'], $pref['eventpost_mailfrom']);
+ if ($send_result)
+ $calendarmenu_msg .= "
";
+ else
+ $calendarmenu_msg .= "
";
+ }
+ break;
+
case '2': // New category
+ // Create new record
+ $calendarmenu_id = 0;
+ // set all fields to zero/blank
+ $calendar_category_name = '';
+ $calendar_category_description = '';
+ $calendarmenu_cap1 = EC_ADLAN_A23;
+ $calendarmenu_edit = TRUE;
+ $event_cat_name = ''; // Define some variables for notice removal
+ $event_cat_description = '';
+ $event_cat_class = e_UC_MEMBER;
+ $event_cat_addclass = e_UC_ADMIN;
+ $event_cat_icon = '';
+ $event_cat_subs = 0;
+ $event_cat_notify = 0;
+ $event_cat_force_class = '';
+ $event_cat_ahead = 5;
+ $event_cat_msg1 = '';
+ $event_cat_msg2 = '';
+ break;
+
+ case '3': // Delete record
+ if ($_POST['calendarmenu_okdel'] == '1')
{
- // Create new record
- $calendarmenu_id = 0;
- // set all fields to zero/blank
- $calendar_category_name = '';
- $calendar_category_description = '';
- $calendarmenu_cap1 = EC_ADLAN_A23;
- $calendarmenu_edit = TRUE;
- $event_cat_name = ''; // Define some variables for notice removal
- $event_cat_description = '';
- $event_cat_class = e_UC_MEMBER;
- $event_cat_addclass = e_UC_ADMIN;
- $event_cat_icon = '';
- $event_cat_subs = 0;
- $event_cat_notify = 0;
- $event_cat_force_class = '';
- $event_cat_ahead = 5;
- $event_cat_msg1 = '';
- $event_cat_msg2 = '';
- break;
- }
- case '3':
- { // delete the record
- if ($_POST['calendarmenu_okdel'] == '1')
+ if ($calendarmenu_db->db_Select('event', 'event_id', 'event_category='.$calendarmenu_id, 'nowhere'))
{
- if ($calendarmenu_db->db_Select('event', 'event_id', 'event_category='.$calendarmenu_id, 'nowhere'))
- {
- $calendarmenu_msg .= "".EC_ADLAN_A59." |
";
- }
- else
- {
- if ($calendarmenu_db->db_Delete('event_cat', 'event_cat_id='.$calendarmenu_id))
- {
- $admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,'');
- $calendarmenu_msg .= "
";
- }
- else
- {
- $calendarmenu_msg .= "".EC_ADLAN_A32." |
";
- }
- }
+ $calendarmenu_msg .= "".EC_ADLAN_A59." |
";
}
else
{
- $calendarmenu_msg .= "".EC_ADLAN_A31." |
";
+ if ($calendarmenu_db->db_Delete('event_cat', 'event_cat_id='.$calendarmenu_id))
+ {
+ $admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,'');
+ $calendarmenu_msg .= "
";
+ }
+ else
+ {
+ $calendarmenu_msg .= "".EC_ADLAN_A32." |
";
+ }
}
- $calendarmenu_dodel = TRUE;
- $calendarmenu_edit = FALSE;
+ }
+ else
+ {
+ $calendarmenu_msg .= "".EC_ADLAN_A31." |
";
}
+ $calendarmenu_dodel = TRUE;
+ $calendarmenu_edit = FALSE;
+ break;
}
if (!$calendarmenu_dodel)
{
- require_once(e_HANDLER.'file_class.php');
+ //require_once(e_HANDLER.'file_class.php');
$calendarmenu_text .= "