From 8e563565fc07d591b473679c813cec4ba6e2cd83 Mon Sep 17 00:00:00 2001 From: e107steved Date: Sun, 20 Dec 2009 22:47:35 +0000 Subject: [PATCH] Tidying up event calendar - work in progress --- e107_plugins/calendar_menu/admin_config.php | 370 ++++++++++-------- e107_plugins/calendar_menu/calendar.php | 12 +- e107_plugins/calendar_menu/calendar_menu.php | 13 +- e107_plugins/calendar_menu/calendar_setup.php | 14 +- .../calendar_menu/calendar_shortcodes.php | 20 +- .../calendar_menu/calendar_template.php | 27 +- e107_plugins/calendar_menu/e_bb.php | 14 +- e107_plugins/calendar_menu/e_cron.php | 12 +- e107_plugins/calendar_menu/e_list.php | 15 +- e107_plugins/calendar_menu/e_mailout.php | 11 +- e107_plugins/calendar_menu/e_notify.php | 30 +- e107_plugins/calendar_menu/e_rss.php | 12 +- e107_plugins/calendar_menu/e_search.php | 15 +- e107_plugins/calendar_menu/e_tagwords.php | 47 ++- .../calendar_menu/ec_mailout_template.php | 15 +- e107_plugins/calendar_menu/ec_pf_page.php | 13 +- e107_plugins/calendar_menu/ec_pf_template.php | 14 +- e107_plugins/calendar_menu/ecal_class.php | 17 +- e107_plugins/calendar_menu/event.php | 11 +- .../calendar_menu/languages/English.php | 18 +- .../languages/English_admin_calendar_menu.php | 14 +- .../calendar_menu/languages/English_class.php | 62 +++ .../calendar_menu/next_event_menu.php | 12 +- e107_plugins/calendar_menu/subscribe.php | 12 +- 24 files changed, 549 insertions(+), 251 deletions(-) create mode 100644 e107_plugins/calendar_menu/languages/English_class.php diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php index a6d9a30d0..da98e5b26 100644 --- a/e107_plugins/calendar_menu/admin_config.php +++ b/e107_plugins/calendar_menu/admin_config.php @@ -9,18 +9,26 @@ * Event calendar plugin - admin functions * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/admin_config.php,v $ - * $Revision: 1.16 $ - * $Date: 2009-12-06 10:45:49 $ + * $Revision: 1.17 $ + * $Date: 2009-12-20 22:47:10 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: admin_config.php,v 1.17 2009-12-20 22:47:10 e107steved Exp $; + */ + $eplug_admin = true; // Make sure we show admin theme $e_sub_cat = 'event_calendar'; require_once('../../class2.php'); -require_once(e_HANDLER."userclass_class.php"); +//require_once(e_HANDLER.'userclass_class.php'); if (!getperms('P')) { - header("location:".e_BASE."index.php"); + header('location:'.e_BASE.'index.php'); exit; } @@ -28,9 +36,10 @@ if (!getperms('P')) include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_admin_calendar_menu.php'); +$uc = e107::getUserClass(); // Userclass object pointer $message = ''; -$calendarmenu_text = ''; // Notice removal -$calendarmenu_msg = ''; // Notice removal +$calendarmenu_text = ''; +$calendarmenu_msg = ''; // Given an array of name => format, reads the $_POST variable of each name, applies the specified formatting, // identifies changes, writes back the changes, makes admin log entry @@ -110,12 +119,12 @@ $prefSettings = array( 'updateForthcoming' => array( 'eventpost_menuheading' => 2, // String 'eventpost_daysforward' => 1, // Integer - 'eventpost_numevents' => 1, // Integer + 'eventpost_numevents' => 1, // Integer 'eventpost_checkrecur' =>1, // Integer 'eventpost_linkheader' => 1, // Integer 'eventpost_fe_set' => 3, // Array of class values - 'eventpost_fe_hideifnone' => 1, // Integer - 'eventpost_fe_showrecent' => 1, // Integer + 'eventpost_fe_hideifnone' => 1, // Integer + 'eventpost_fe_showrecent' => 1, // Integer 'eventpost_showcaticon' => 1, // Integer 'eventpost_namelink' => 1 // Integer ) @@ -124,7 +133,7 @@ if (isset($_POST['updatesettings'])) { logPrefChanges(&$prefSettings['updateOptions'], 'EC_ADM_06'); $e107cache->clear('nq_event_cal'); // Clear cache as well, in case displays changed - $message = EC_ADLAN_A204; // "Calendar settings updated."; + $message = EC_ADLAN_A204; // "Calendar settings updated."; } // ****************** FORTHCOMING EVENTS ****************** @@ -132,12 +141,14 @@ if (isset($_POST['updateforthcoming'])) { logPrefChanges(&$prefSettings['updateForthcoming'], 'EC_ADM_07'); $e107cache->clear('nq_event_cal'); // Clear cache as well, in case displays changed - $message = EC_ADLAN_A109; // "Forthcoming Events settings updated."; + $message = EC_ADLAN_A109; // "Forthcoming Events settings updated."; } +$action = 'config'; // Default action - show preferences if (e_QUERY) { - $ec_qs = explode(".", e_QUERY); + $ec_qs = explode('.', e_QUERY); + $action = preg_replace('#\W#', '',$ec_qs[0]); } require_once('ecal_class.php'); @@ -148,23 +159,23 @@ $ecal_class = new ecal_class; // ****************** MAINTENANCE ****************** if (isset($_POST['deleteold']) && isset($_POST['eventpost_deleteoldmonths'])) { - $back_count = intval($_POST['eventpost_deleteoldmonths']); - if (($back_count >= 1) && ($back_count <= 12)) - { - $old_date = intval(mktime(0,0,0,$ecal_class->now_date['mon']-$back_count,1,$ecal_class->now_date['year'])); - $old_string = strftime("%d %B %Y",$old_date); -// $message = "Back delete {$back_count} months. Oldest date = {$old_string}"; - $ec_qs[0] = "confdel"; - $ec_qs[1] = $old_date; - } - else - $message = EC_ADLAN_A148; + $back_count = intval($_POST['eventpost_deleteoldmonths']); + if (($back_count >= 1) && ($back_count <= 12)) + { + $old_date = intval(mktime(0,0,0,$ecal_class->now_date['mon']-$back_count,1,$ecal_class->now_date['year'])); + $old_string = strftime("%d %B %Y",$old_date); + // $message = "Back delete {$back_count} months. Oldest date = {$old_string}"; + $action = 'confdel'; + $ec_qs[1] = $old_date; + } + else + $message = EC_ADLAN_A148; } if (isset($_POST['cache_clear'])) { - $ec_qs[0] = 'confcache'; + $action = 'confcache'; } @@ -177,14 +188,14 @@ if (!defined('USER_WIDTH')){ define('USER_WIDTH','width:auto'); } // Actually delete back events -if (isset($_POST['confirmdeleteold']) && isset($ec_qs[0]) && ($ec_qs[0] == "backdel")) +if (isset($_POST['confirmdeleteold']) && ($action == 'backdel')) { - $old_date = $ec_qs[1]; + $old_date = intval($ec_qs[1]); $old_string = strftime("%d %B %Y",$old_date); // Check both start and end dates to avoid problems with events originally entered under 0.617 $qry = "event_start < {$old_date} AND event_end < {$old_date} AND event_recurring = 0"; // $message = "Back delete {$back_count} months. Oldest date = {$old_string} Query = {$qry}"; - if ($sql -> db_Delete("event",$qry)) + if ($sql -> db_Delete('event',$qry)) { // Add in a log event $ecal_class->cal_log(4,"db_Delete - earlier than {$old_string} (past {$back_count} months)",$qry); @@ -195,21 +206,21 @@ if (isset($_POST['confirmdeleteold']) && isset($ec_qs[0]) && ($ec_qs[0] == "back $message = EC_ADLAN_A149." : ".$sql->mySQLresult; } - $ec_qs[0] = 'maint'; + $action = 'maint'; } // Actually empty cache -if (isset($_POST['confirmdelcache']) && isset($ec_qs[0]) &&($ec_qs[0] == "cachedel")) +if (isset($_POST['confirmdelcache']) && ($action == 'cachedel')) { $e107cache->clear('nq_event_cal'); $message = EC_ADLAN_A163; - $ec_qs[0] = "maint"; // Re-display maintenance menu + $action = 'maint'; // Re-display maintenance menu } // Prompt to delete back events -if(isset($ec_qs[0]) && ($ec_qs[0] == "confdel")) +if ($action == 'confdel') { $old_string = strftime("%d %B %Y",$ec_qs[1]); $text = "
@@ -226,7 +237,7 @@ if(isset($ec_qs[0]) && ($ec_qs[0] == "confdel")) // Prompt to clear cache -if (isset($ec_qs[0]) && ($ec_qs[0] == "confcache")) +if ($action == 'confcache') { $text = "
@@ -242,25 +253,26 @@ if (isset($ec_qs[0]) && ($ec_qs[0] == "confcache")) // Just delete odd email subscriptions -if (isset($ec_qs[0]) && isset($ec_qs[2]) && isset($ec_qs[3]) && ($ec_qs[0] == 'subs') && ($ec_qs[2] == 'del') && is_numeric($ec_qs[3])) +if (isset($ec_qs[2]) && isset($ec_qs[3]) && ($action == 'subs') && ($ec_qs[2] == 'del') && is_numeric($ec_qs[3])) { - if ($sql->db_Delete("event_subs","event_subid='{$ec_qs[3]}'")) - $message = EC_ADLAN_A180.$ec_qs[3]; - else - $message = EC_ADLAN_A181.$ec_qs[3]; + if ($sql->db_Delete('event_subs',"event_subid='{$ec_qs[3]}'")) + $message = EC_ADLAN_A180.$ec_qs[3]; + else + $message = EC_ADLAN_A181.$ec_qs[3]; } + if (isset($message) && ($message != "")) { - $ns->tablerender("", "
{$message}
"); - $message = ""; + $ns->tablerender('', "
{$message}
"); + $message = ''; } //category -$ecal_sendemail = 0; -if(isset($ec_qs[0]) && $ec_qs[0] == "cat") +$ecal_send_email = 0; +if($action == 'cat') { // This uses two hidden fields, preset from the category selection menu: // calendarmenu_action @@ -269,13 +281,13 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") // calendarmenu_id - the number of the category - zero indicates a new category // We may also have $_POST['send_email_1'] or $_POST['send_email_2'] set to generate a test email as well as doing update/save - if (is_readable(THEME."ec_mailout_template.php")) + if (is_readable(THEME.'ec_mailout_template.php')) { // Has to be require - require(THEME."ec_mailout_template.php"); + require(THEME.'ec_mailout_template.php'); } else { - require(e_PLUGIN."calendar_menu/ec_mailout_template.php"); + require(e_PLUGIN.'calendar_menu/ec_mailout_template.php'); } $calendarmenu_db = new DB; $calendarmenu_action = ''; @@ -307,7 +319,7 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") } else { - $calendarmenu_msg .= "".EC_ADLAN_A27.""; + $calendarmenu_msg .= "".EC_ADLAN_A27.""; } } else @@ -319,7 +331,7 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") } else { - $calendarmenu_msg .= "".EC_ADLAN_A29.""; + $calendarmenu_msg .= "".EC_ADLAN_A29.""; } } // Now see if we need to send a test email @@ -391,8 +403,8 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") // Create new record $calendarmenu_id = 0; // set all fields to zero/blank - $calendar_category_name = ""; - $calendar_category_description = ""; + $calendar_category_name = ''; + $calendar_category_description = ''; $calendarmenu_cap1 = EC_ADLAN_A23; $calendarmenu_edit = TRUE; $event_cat_name = ''; // Define some variables for notice removal @@ -412,26 +424,26 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") { // delete the record if ($_POST['calendarmenu_okdel'] == '1') { - if ($calendarmenu_db->db_Select("event", "event_id", " where event_category='{$calendarmenu_id}'", "nowhere")) - { - $calendarmenu_msg .= "".EC_ADLAN_A59.""; - } - else - { - if ($calendarmenu_db->db_Delete("event_cat", " event_cat_id='{$calendarmenu_id}'")) + if ($calendarmenu_db->db_Select('event', 'event_id', 'event_category='.$calendarmenu_id, 'nowhere')) { - $admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,''); - $calendarmenu_msg .= "".EC_ADLAN_A30.""; + $calendarmenu_msg .= "".EC_ADLAN_A59.""; } else { - $calendarmenu_msg .= "".EC_ADLAN_A32.""; + if ($calendarmenu_db->db_Delete('event_cat', 'event_cat_id='.$calendarmenu_id)) + { + $admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,''); + $calendarmenu_msg .= "".EC_ADLAN_A30.""; + } + else + { + $calendarmenu_msg .= "".EC_ADLAN_A32.""; + } } - } } else { - $calendarmenu_msg .= "".EC_ADLAN_A31.""; + $calendarmenu_msg .= "".EC_ADLAN_A31.""; } $calendarmenu_dodel = TRUE; $calendarmenu_edit = FALSE; @@ -440,43 +452,52 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") if (!$calendarmenu_dodel) { - require_once(e_HANDLER."file_class.php"); + require_once(e_HANDLER.'file_class.php'); $calendarmenu_text .= " - +
+
+ + + + + - {$calendarmenu_msg} - - + + - - + + - - + + - - + + - + - - + + - - + - - + + - - + + - - - - + +
{$calendarmenu_cap1} + {$calendarmenu_cap1} - +
".EC_ADLAN_A21."".EC_ADLAN_A21."
".EC_ADLAN_A121."".EC_ADLAN_A121."
".EC_ADLAN_A80."".r_userclass("event_cat_class", $event_cat_class, "off", 'public, nobody, member, admin, classes')."".EC_ADLAN_A80."".$uc->uc_dropdown('event_cat_class', $event_cat_class, 'public, nobody, member, admin, classes')."
".EC_ADLAN_A94."".r_userclass("event_cat_addclass", $event_cat_addclass, "off", 'public, nobody, member, admin, classes')."".EC_ADLAN_A94."".$uc->uc_dropdown('event_cat_addclass', $event_cat_addclass, 'public, nobody, member, admin, classes')."
".EC_ADLAN_A219." + ".EC_ADLAN_A219."
".EC_ADLAN_A81." 0?"checked='checked'":"")." />".EC_ADLAN_A81." 0?"checked='checked'":'')." />
".EC_ADLAN_A86."".EC_ADLAN_A86."
".EC_ADLAN_A82."".r_userclass("event_cat_force_class", $event_cat_force_class, "off", 'nobody, member, admin, classes')."".EC_ADLAN_A82."".$uc->uc_dropdown('event_cat_force_class', $event_cat_force_class, 'nobody, member, admin, classes')."
".EC_ADLAN_A83."".EC_ADLAN_A83."
".EC_ADLAN_A84; + ".EC_ADLAN_A84; if ($calendarmenu_do == 1) $calendarmenu_text .= "


"; $calendarmenu_text .= "		"; + "; if ($event_cat_name != EC_DEFAULT_CATEGORY) $calendarmenu_text .= "
".EC_ADLAN_A189.""; $calendarmenu_text .= "
".EC_ADLAN_A117; + ".EC_ADLAN_A117; if ($calendarmenu_do == 1) $calendarmenu_text .= "


"; $calendarmenu_text .= "		"; + "; if ($event_cat_name != EC_DEFAULT_CATEGORY) $calendarmenu_text .= "
".EC_ADLAN_A189.""; $calendarmenu_text .= "
+
"; } } @@ -541,10 +565,10 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") $calendarmenu2_db = new DB; $calendarmenu_catopt = ''; if (!isset($calendarmenu_id)) $calendarmenu_id = -1; - if ($calendarmenu2_db->db_Select("event_cat", "event_cat_id,event_cat_name", " order by event_cat_name", "nowhere")) + if ($calendarmenu2_db->db_Select('event_cat', 'event_cat_id,event_cat_name', ' order by event_cat_name', 'nowhere')) { - while ($row = $calendarmenu2_db->db_Fetch()){ - //extract($calendarmenu_row); + while ($row = $calendarmenu2_db->db_Fetch()) + { $calendarmenu_catopt .= ""; } } @@ -582,7 +606,7 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") } if(isset($calendarmenu_text)) { - $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A19."
", $calendarmenu_text); + $ns->tablerender("
".EC_ADLAN_1.' - '.EC_ADLAN_A19.'
', $calendarmenu_text); } } @@ -590,15 +614,15 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") // FORTHCOMING EVENTS OPTIONS // ==================================================== -if((isset($ec_qs[0]) && $ec_qs[0] == "forthcoming")) +if($action == 'forthcoming') { -if (!isset($pref['eventpost_menuheading'])) $pref['eventpost_menuheading'] = EC_ADLAN_A100; -if (!isset($pref['eventpost_daysforward'])) $pref['eventpost_daysforward'] = 30; -if (!isset($pref['eventpost_numevents'])) $pref['eventpost_numevents'] = 3; -if (!isset($pref['eventpost_checkrecur'])) $pref['eventpost_checkrecur'] = '1'; -if (!isset($pref['eventpost_linkheader'])) $pref['eventpost_linkheader'] = '0'; -if (!isset($pref['eventpost_namelink'])) $pref['eventpost_namelink'] = '1'; + if (!isset($pref['eventpost_menuheading'])) $pref['eventpost_menuheading'] = EC_ADLAN_A100; + if (!isset($pref['eventpost_daysforward'])) $pref['eventpost_daysforward'] = 30; + if (!isset($pref['eventpost_numevents'])) $pref['eventpost_numevents'] = 3; + if (!isset($pref['eventpost_checkrecur'])) $pref['eventpost_checkrecur'] = '1'; + if (!isset($pref['eventpost_linkheader'])) $pref['eventpost_linkheader'] = '0'; + if (!isset($pref['eventpost_namelink'])) $pref['eventpost_namelink'] = '1'; $text = "
@@ -696,15 +720,17 @@ if (!isset($pref['eventpost_namelink'])) $pref['eventpost_namelink'] = '1'; // MAINTENANCE OPTIONS // ==================================================== -if((isset($ec_qs[0]) && $ec_qs[0] == "maint")) +if(($action == 'maint')) { $text = "
- - +
+
".EC_ADLAN_A144."
+ + - - + - -
".EC_ADLAN_A144."
".EC_ADLAN_A142." + ".EC_ADLAN_A142."


"; + +


"; $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A141."
", $text); $text = "
- +
+
+ - -
".EC_ADLAN_A160."
"; + +
"; $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A159."
", $text); @@ -742,15 +770,15 @@ if((isset($ec_qs[0]) && $ec_qs[0] == "maint")) // SUBSCRIPTIONS OPTIONS // ==================================================== -if((isset($ec_qs[0]) && $ec_qs[0] == "subs")) +if($action == 'subs') { - $from = 0; - $amount = 20; // Number per page - could make configurable later if required - if (isset($ec_qs[1])) $from = $ec_qs[1]; + $from = 0; + $amount = 20; // Number per page - could make configurable later if required + if (isset($ec_qs[1])) $from = intval($ec_qs[1]); - $num_entry = $sql->db_Count("event_subs", "(*)", ""); // Just count the lot - - $qry = "SELECT es.*, u.user_id, u.user_name, u.user_class, ec.event_cat_id, ec.event_cat_name, ec.event_cat_class FROM #event_subs AS es + $num_entry = $sql->db_Count("event_subs", "(*)", ""); // Just count the lot + + $qry = "SELECT es.*, u.user_id, u.user_name, u.user_class, ec.event_cat_id, ec.event_cat_name, ec.event_cat_class FROM #event_subs AS es LEFT JOIN #user AS u ON es.event_userid = u.user_id LEFT JOIN #event_cat AS ec ON es.event_cat = ec.event_cat_id ORDER BY u.user_id @@ -760,11 +788,11 @@ if((isset($ec_qs[0]) && $ec_qs[0] == "subs"))
- - - - - + + + + + "; if (!$sql->db_Select_gen($qry)) @@ -774,36 +802,36 @@ if((isset($ec_qs[0]) && $ec_qs[0] == "subs")) } else { - $text .= " - "; - while ($row = $sql->db_Fetch()) - { - // Columns - UID, User name, Category name, Action - $problems = ""; - if (!isset($row['user_id']) || ($row['user_id'] == 0) || (!isset($row['user_name'])) || ($row['user_name'] == "")) - $problems = EC_ADLAN_A198; - if (!check_class($row['event_cat_class'],$row['user_class'])) + $text .= " + "; + while ($row = $sql->db_Fetch()) { - if ($problems != "") $problems .= "
"; - $problems .= EC_ADLAN_A197; + // Columns - UID, User name, Category name, Action + $problems = ""; + if (!isset($row['user_id']) || ($row['user_id'] == 0) || (!isset($row['user_name'])) || ($row['user_name'] == "")) + $problems = EC_ADLAN_A198; + if (!check_class($row['event_cat_class'],$row['user_class'])) + { + if ($problems != "") $problems .= "
"; + $problems .= EC_ADLAN_A197; + } + $text .= " + + + + + + + "; + } // End while + + // Next-Previous. ========================== + if ($num_entry > $amount) + { + $parms = "{$num_entry},{$amount},{$from},".e_SELF."?".$action.'.[FROM]'; + $text .= "'); } - $text .= " - - - - - - - "; - } // End while - -// Next-Previous. ========================== - if ($num_entry > $amount) - { - $parms = "{$num_entry},{$amount},{$from},".e_SELF."?".$ec_qs[0].".[FROM]"; - $text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}"); - } } $text .= "
".EC_ADLAN_A175."".EC_ADLAN_A176."".EC_ADLAN_A177."".EC_ADLAN_A178."".EC_ADLAN_A179."
".EC_ADLAN_A175."".EC_ADLAN_A176."".EC_ADLAN_A177."".EC_ADLAN_A178."".EC_ADLAN_A179."
".$row['user_id']."".$row['user_name']."".$row['event_cat_name']."".$problems." + ".LAN_DELETE."
".$tp->parseTemplate("{NEXTPREV={$parms}}".'
".$row['user_id']."".$row['user_name']."".$row['event_cat_name']."".$problems." - ".LAN_DELETE."
"; @@ -811,25 +839,27 @@ if((isset($ec_qs[0]) && $ec_qs[0] == "subs")) $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A173."
", $text); } + + + + // ======================================================== // MAIN OPTIONS MENU // ======================================================== - - -if(!isset($ec_qs[0]) || (isset($ec_qs[0]) && $ec_qs[0] == "config")) +if($action == 'config') { - function select_day_start($val) - { - if ($val == 'sun') $val = 0; elseif ($val == 'mon') $val = 1; // Legacy values - $ret = "\n"; + foreach (array(EC_LAN_18,EC_LAN_12,EC_LAN_13,EC_LAN_14,EC_LAN_15,EC_LAN_16,EC_LAN_17) as $k => $v) + { + $sel = ($val == $k) ? " selected='selected'" : ''; + $ret .= "\n"; + } + $ret .= "\n"; + return $ret; } - $ret .= "\n"; - return $ret; - } $text = "
@@ -839,14 +869,14 @@ if(!isset($ec_qs[0]) || (isset($ec_qs[0]) && $ec_qs[0] == "config")) ".EC_ADLAN_A207." ".EC_ADLAN_A208." - ". r_userclass("eventpost_admin", $pref['eventpost_admin'], "off", 'public, nobody, member, admin, classes')." + ". $uc->uc_dropdown('eventpost_admin', $pref['eventpost_admin'], 'public, nobody, member, admin, classes')." "; $text .= " ".EC_ADLAN_A211." - ". r_userclass("eventpost_super", $pref['eventpost_super'], "off", 'public, nobody, member, admin, classes')." + ". $uc->uc_dropdown('eventpost_super', $pref['eventpost_super'], 'public, nobody, member, admin, classes')." diff --git a/e107_plugins/calendar_menu/calendar.php b/e107_plugins/calendar_menu/calendar.php index 76431b676..a5f4ca327 100644 --- a/e107_plugins/calendar_menu/calendar.php +++ b/e107_plugins/calendar_menu/calendar.php @@ -9,11 +9,19 @@ * Event calendar plugin - large calendar display * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar.php,v $ - * $Revision: 1.8 $ - * $Date: 2009-12-18 20:49:55 $ + * $Revision: 1.9 $ + * $Date: 2009-12-20 22:47:19 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: calendar.php,v 1.9 2009-12-20 22:47:19 e107steved Exp $; + */ + require_once('../../class2.php'); $e107 = e107::getInstance(); if (!$e107->isInstalled('calendar_menu')) header('Location: '.e_BASE.'index.php'); diff --git a/e107_plugins/calendar_menu/calendar_menu.php b/e107_plugins/calendar_menu/calendar_menu.php index 1814c95a3..0ce092142 100644 --- a/e107_plugins/calendar_menu/calendar_menu.php +++ b/e107_plugins/calendar_menu/calendar_menu.php @@ -9,10 +9,19 @@ * Forthcoming events menu handler for event calendar * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_menu.php,v $ - * $Revision: 1.8 $ - * $Date: 2009-12-18 20:49:55 $ + * $Revision: 1.9 $ + * $Date: 2009-12-20 22:47:20 $ * $Author: e107steved $ */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: calendar_menu.php,v 1.9 2009-12-20 22:47:20 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } $e107 = e107::getInstance(); if (!$e107->isInstalled('calendar_menu')) return ''; diff --git a/e107_plugins/calendar_menu/calendar_setup.php b/e107_plugins/calendar_menu/calendar_setup.php index 921cd170f..af7b8b70d 100644 --- a/e107_plugins/calendar_menu/calendar_setup.php +++ b/e107_plugins/calendar_menu/calendar_setup.php @@ -11,13 +11,21 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_setup.php,v $ -| $Revision: 1.3 $ -| $Date: 2009-11-18 01:05:23 $ -| $Author: e107coders $ +| $Revision: 1.4 $ +| $Date: 2009-12-20 22:47:20 $ +| $Author: e107steved $ | +----------------------------------------------------------------------------+ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: calendar_setup.php,v 1.4 2009-12-20 22:47:20 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/calendar_menu/calendar_shortcodes.php b/e107_plugins/calendar_menu/calendar_shortcodes.php index 8e689608e..7da745d39 100644 --- a/e107_plugins/calendar_menu/calendar_shortcodes.php +++ b/e107_plugins/calendar_menu/calendar_shortcodes.php @@ -9,19 +9,25 @@ * Shortcodes for event calendar * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $ - * $Revision: 1.16 $ - * $Date: 2009-12-17 22:47:20 $ + * $Revision: 1.17 $ + * $Date: 2009-12-20 22:47:22 $ * $Author: e107steved $ * */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: calendar_shortcodes.php,v 1.17 2009-12-20 22:47:22 e107steved Exp $; + */ + /* TODO: - 1. Could make date/month arrays 1-based instead of 0-based - might simplify maths - 2. Good way of reading categories - - 4. Have 'currentMonth' flag (means 'current day' if $ds == 'one') ? - 5. Check whether $prop should be calculated better + 1. Good way of reading categories + 2. Have 'currentMonth' flag (means 'current day' if $ds == 'one') ? + 3. Check whether $prop should be calculated better */ if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/calendar_menu/calendar_template.php b/e107_plugins/calendar_menu/calendar_template.php index 4b472f35b..e747bf8be 100644 --- a/e107_plugins/calendar_menu/calendar_template.php +++ b/e107_plugins/calendar_menu/calendar_template.php @@ -9,12 +9,21 @@ * Templates for event calendar displays * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $ - * $Revision: 1.10 $ - * $Date: 2009-11-22 10:11:29 $ + * $Revision: 1.11 $ + * $Date: 2009-12-20 22:47:26 $ * $Author: e107steved $ */ -// TODO: Replace expandit on events with latest auto-management +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: calendar_template.php,v 1.11 2009-12-20 22:47:26 e107steved Exp $; + * + * @todo Replace expandit on events with latest auto-management + */ + if (!defined('e107_INIT')) { exit; } if (!defined('USER_WIDTH')){ define('USER_WIDTH','width:auto'); } @@ -42,14 +51,14 @@ $sc_style['EC_CURRENT_MONTH']['post'] = ""; $sc_style['EC_NEXT_MONTH']['pre'] = ""; $sc_style['EC_NEXT_MONTH']['post'] = ""; -$sc_style['EC_PREV_YEAR']['pre'] = ""; -$sc_style['EC_PREV_YEAR']['post'] = ""; +$sc_style['EC_PREV_YEAR']['pre'] = ''; +$sc_style['EC_PREV_YEAR']['post'] = ''; -$sc_style['EC_MONTH_LIST']['pre'] = ""; -$sc_style['EC_MONTH_LIST']['post'] = ""; +$sc_style['EC_MONTH_LIST']['pre'] = ''; +$sc_style['EC_MONTH_LIST']['post'] = ''; -$sc_style['EC_NEXT_YEAR']['pre'] = ""; -$sc_style['EC_NEXT_YEAR']['post'] = ""; +$sc_style['EC_NEXT_YEAR']['pre'] = ''; +$sc_style['EC_NEXT_YEAR']['post'] = ''; $CALENDAR_TIME_TABLE = " diff --git a/e107_plugins/calendar_menu/e_bb.php b/e107_plugins/calendar_menu/e_bb.php index ca89bad59..e7606701f 100644 --- a/e107_plugins/calendar_menu/e_bb.php +++ b/e107_plugins/calendar_menu/e_bb.php @@ -9,9 +9,17 @@ * BBCode template for calendar menu (pretend we're custom page) * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_bb.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-11-18 01:05:23 $ - * $Author: e107coders $ + * $Revision: 1.5 $ + * $Date: 2009-12-20 22:47:27 $ + * $Author: e107steved $ + */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_bb.php,v 1.5 2009-12-20 22:47:27 e107steved Exp $; */ $temp['event'] = " diff --git a/e107_plugins/calendar_menu/e_cron.php b/e107_plugins/calendar_menu/e_cron.php index 0ffb5678a..29c094d77 100644 --- a/e107_plugins/calendar_menu/e_cron.php +++ b/e107_plugins/calendar_menu/e_cron.php @@ -9,12 +9,20 @@ * Plugin configuration module - gsitemap * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_cron.php,v $ - * $Revision: 1.2 $ - * $Date: 2009-11-23 21:06:00 $ + * $Revision: 1.3 $ + * $Date: 2009-12-20 22:47:27 $ * $Author: e107steved $ * */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_cron.php,v 1.3 2009-12-20 22:47:27 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/calendar_menu/e_list.php b/e107_plugins/calendar_menu/e_list.php index ce73da70a..c88be1a8c 100644 --- a/e107_plugins/calendar_menu/e_list.php +++ b/e107_plugins/calendar_menu/e_list.php @@ -9,11 +9,20 @@ * Calendar e_list Handler * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_list.php,v $ - * $Revision: 1.6 $ - * $Date: 2009-11-18 01:05:23 $ - * $Author: e107coders $ + * $Revision: 1.7 $ + * $Date: 2009-12-20 22:47:28 $ + * $Author: e107steved $ * */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_list.php,v 1.7 2009-12-20 22:47:28 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } class list_calendar_menu diff --git a/e107_plugins/calendar_menu/e_mailout.php b/e107_plugins/calendar_menu/e_mailout.php index b58638687..42b4128f2 100644 --- a/e107_plugins/calendar_menu/e_mailout.php +++ b/e107_plugins/calendar_menu/e_mailout.php @@ -9,12 +9,19 @@ * Administration - Site Maintenance * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_mailout.php,v $ - * $Revision: 1.7 $ - * $Date: 2009-12-01 20:05:54 $ + * $Revision: 1.8 $ + * $Date: 2009-12-20 22:47:28 $ * $Author: e107steved $ * */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_mailout.php,v 1.8 2009-12-20 22:47:28 e107steved Exp $; + */ if (!defined('e107_INIT')) { exit(); } diff --git a/e107_plugins/calendar_menu/e_notify.php b/e107_plugins/calendar_menu/e_notify.php index d6e94315f..fb0789947 100644 --- a/e107_plugins/calendar_menu/e_notify.php +++ b/e107_plugins/calendar_menu/e_notify.php @@ -9,35 +9,46 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_notify.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-11-18 01:05:23 $ - * $Author: e107coders $ + * $Revision: 1.5 $ + * $Date: 2009-12-20 22:47:28 $ + * $Author: e107steved $ + */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_notify.php,v 1.5 2009-12-20 22:47:28 e107steved Exp $; */ if (!defined('e107_INIT')) { exit; } if(defined('ADMIN_PAGE') && ADMIN_PAGE === true) { - include_lan(e_PLUGIN."calendar_menu/languages/".e_LANGUAGE.".php"); + include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'.php'); $config_category = NT_LAN_EC_1; $config_events = array('ecalnew' => NT_LAN_EC_7, 'ecaledit' => NT_LAN_EC_2); } if (!function_exists('notify_ecalnew')) { - function notify_ecalnew($data) { + function notify_ecalnew($data) + { global $nt; - include_lan(e_PLUGIN."calendar_menu/languages/".e_LANGUAGE.".php"); + include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'.php'); $message = NT_LAN_EC_3.': '.USERNAME.' ('.NT_LAN_EC_4.': '.$data['ip'].' )
'; $message .= NT_LAN_EC_5.':
'.$data['cmessage'].'

'; $nt -> send('ecaledit', NT_LAN_EC_6, $message); } } -if (!function_exists('notify_ecaledit')) { - function notify_ecaledit($data) { +if (!function_exists('notify_ecaledit')) +{ + function notify_ecaledit($data) + { global $nt; - include_lan(e_PLUGIN."calendar_menu/languages/".e_LANGUAGE.".php"); + include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'.php'); $message = NT_LAN_EC_3.': '.USERNAME.' ('.NT_LAN_EC_4.': '.$data['ip'].' )
'; $message .= NT_LAN_EC_5.':
'.$data['cmessage'].'

'; $nt -> send('ecaledit', NT_LAN_EC_8, $message); @@ -46,5 +57,4 @@ if (!function_exists('notify_ecaledit')) { - ?> \ No newline at end of file diff --git a/e107_plugins/calendar_menu/e_rss.php b/e107_plugins/calendar_menu/e_rss.php index 354f851a8..746fb9324 100644 --- a/e107_plugins/calendar_menu/e_rss.php +++ b/e107_plugins/calendar_menu/e_rss.php @@ -9,11 +9,19 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_rss.php,v $ - * $Revision: 1.5 $ - * $Date: 2009-12-03 22:32:34 $ + * $Revision: 1.6 $ + * $Date: 2009-12-20 22:47:29 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_rss.php,v 1.6 2009-12-20 22:47:29 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } if (!e107::isInstalled('calendar_menu')) return; diff --git a/e107_plugins/calendar_menu/e_search.php b/e107_plugins/calendar_menu/e_search.php index c0da2bc66..1927f3060 100644 --- a/e107_plugins/calendar_menu/e_search.php +++ b/e107_plugins/calendar_menu/e_search.php @@ -9,10 +9,19 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/e_search.php,v $ - * $Revision: 1.2 $ - * $Date: 2009-11-19 10:09:58 $ - * $Author: marj_nl_fr $ + * $Revision: 1.3 $ + * $Date: 2009-12-20 22:47:29 $ + * $Author: e107steved $ */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: e_search.php,v 1.3 2009-12-20 22:47:29 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit(); } include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_search.php'); diff --git a/e107_plugins/calendar_menu/e_tagwords.php b/e107_plugins/calendar_menu/e_tagwords.php index 1e84f692e..665546fd1 100644 --- a/e107_plugins/calendar_menu/e_tagwords.php +++ b/e107_plugins/calendar_menu/e_tagwords.php @@ -1,4 +1,26 @@ settings = array(); - $this->settings['plugin'] = "calendar_menu"; - $this->settings['table'] = "event"; - $this->settings['db_id'] = "event_id"; - $this->settings['caption'] = "calendar"; + $this->settings['plugin'] = 'calendar_menu'; + $this->settings['table'] = 'event'; + $this->settings['db_id'] = 'event_id'; + $this->settings['caption'] = 'calendar'; } function getLink($id) { - global $tp; if($this->row=='') { - $this->row = $this->getRecord($id); + if ($this->row = $this->getRecord($id)) + { + $url = e_PLUGIN."calendar_menu/event.php?{$this->row['event_start']}.event.{$this->row['event_id']}"; + return "".e107::getParser()->toHTML($this->row['event_title'], TRUE, '').""; + } } - $url = e_PLUGIN."calendar_menu/event.php?{$this->row['event_start']}.event.{$this->row['event_id']}"; - return "".$tp->toHTML($this->row['event_title'], TRUE, '').""; + return ''; } + function getRecord($id) { - global $sql; + $sql = e107::getDb(); $this->row = ''; - $qry = "SELECT * FROM #event as e WHERE e.event_id='{$id}'"; if($sql->db_Select_gen($qry)) { $this->row=$sql->db_Fetch(); + return $this->row; } - return $this->row; + return FALSE; } } diff --git a/e107_plugins/calendar_menu/ec_mailout_template.php b/e107_plugins/calendar_menu/ec_mailout_template.php index 7536080af..8e991ffc9 100644 --- a/e107_plugins/calendar_menu/ec_mailout_template.php +++ b/e107_plugins/calendar_menu/ec_mailout_template.php @@ -9,10 +9,19 @@ * Event calendar mailout - template file * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ec_mailout_template.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-11-22 10:11:29 $ + * $Revision: 1.5 $ + * $Date: 2009-12-20 22:47:31 $ * $Author: e107steved $ */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: ec_mailout_template.php,v 1.5 2009-12-20 22:47:31 e107steved Exp $; + */ + /* This template is used during the subscription mailouts - it is inserted at the front of the text defined for each category. @@ -23,6 +32,8 @@ Language constants should be in the English_mailer.php file if (!defined('e107_INIT')) { exit; } +include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_mailer.php'); + global $sc_style; $sc_style['EC_MAIL_HEADING_DATE']['pre'] = ''; diff --git a/e107_plugins/calendar_menu/ec_pf_page.php b/e107_plugins/calendar_menu/ec_pf_page.php index 46ef06615..48e5eb9ae 100644 --- a/e107_plugins/calendar_menu/ec_pf_page.php +++ b/e107_plugins/calendar_menu/ec_pf_page.php @@ -9,10 +9,19 @@ * Event calendar - generate lists * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ec_pf_page.php,v $ - * $Revision: 1.9 $ - * $Date: 2009-12-18 20:49:55 $ + * $Revision: 1.10 $ + * $Date: 2009-12-20 22:47:32 $ * $Author: e107steved $ */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: ec_pf_page.php,v 1.10 2009-12-20 22:47:32 e107steved Exp $; + */ + /* | | Generate a printer-friendly page of calendar events diff --git a/e107_plugins/calendar_menu/ec_pf_template.php b/e107_plugins/calendar_menu/ec_pf_template.php index d265525cd..40e07baf7 100644 --- a/e107_plugins/calendar_menu/ec_pf_template.php +++ b/e107_plugins/calendar_menu/ec_pf_template.php @@ -9,10 +9,19 @@ * Event calendar - template file for list generator * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ec_pf_template.php,v $ - * $Revision: 1.2 $ - * $Date: 2009-11-22 10:11:30 $ + * $Revision: 1.3 $ + * $Date: 2009-12-20 22:47:32 $ * $Author: e107steved $ */ + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: ec_pf_template.php,v 1.3 2009-12-20 22:47:32 e107steved Exp $; + */ + /* Templates file for the event calendar listings (display/print/pdf). There can be more than one template defined, in which case they are selectable. @@ -30,7 +39,6 @@ There are two ways of managing the styling of the various shortcodes: for all templates, or where you can set a 'default' styling which applies to most uses of the shortcode b) An $ec_template_styles array sets styles for an individual template. This need only contain the styles which override a default $sc_style entry. - */ if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/calendar_menu/ecal_class.php b/e107_plugins/calendar_menu/ecal_class.php index 2808da895..4a4bd79a2 100644 --- a/e107_plugins/calendar_menu/ecal_class.php +++ b/e107_plugins/calendar_menu/ecal_class.php @@ -11,11 +11,18 @@ * Implements functions used in most of the code * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ecal_class.php,v $ - * $Revision: 1.12 $ - * $Date: 2009-11-22 10:11:30 $ + * $Revision: 1.13 $ + * $Date: 2009-12-20 22:47:32 $ * $Author: e107steved $ */ - + +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: ecal_class.php,v 1.13 2009-12-20 22:47:32 e107steved Exp $; + */ /* Preferences used: @@ -28,6 +35,8 @@ if (!defined('e107_INIT')) { exit; } if (!defined('EC_DEFAULT_CATEGORY')) { define('EC_DEFAULT_CATEGORY','Default'); } +include_lan(e_PLUGIN.'calendar_menu/languages/'.e_LANGUAGE.'_class.php'); + class ecal_class { // Useful time/date variables - set up on creation, and available externally @@ -734,7 +743,7 @@ class ecal_class { if ($recurring >= 100) { - return $this->recur_week[100*intval($recurring/100)]." ".$this->recur_type[100+($recurring % 10)]; + return $this->recur_week[100*intval($recurring/100)].' '.$this->recur_type[100+($recurring % 10)]; } else { diff --git a/e107_plugins/calendar_menu/event.php b/e107_plugins/calendar_menu/event.php index 56e7b1208..509f30e6b 100644 --- a/e107_plugins/calendar_menu/event.php +++ b/e107_plugins/calendar_menu/event.php @@ -9,11 +9,18 @@ * Calender plugin - event listing and event entry * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/event.php,v $ - * $Revision: 1.16 $ - * $Date: 2009-12-12 10:15:24 $ + * $Revision: 1.17 $ + * $Date: 2009-12-20 22:47:32 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: event.php,v 1.17 2009-12-20 22:47:32 e107steved Exp $; + */ require_once('../../class2.php'); $e107 = e107::getInstance(); diff --git a/e107_plugins/calendar_menu/languages/English.php b/e107_plugins/calendar_menu/languages/English.php index 56107c3fe..166432641 100644 --- a/e107_plugins/calendar_menu/languages/English.php +++ b/e107_plugins/calendar_menu/languages/English.php @@ -9,11 +9,21 @@ * These messages are for the 'user' pages of the event calendar (including event entry/editing) * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English.php,v $ - * $Revision: 1.11 $ - * $Date: 2009-12-13 21:52:32 $ + * $Revision: 1.12 $ + * $Date: 2009-12-20 22:47:33 $ * $Author: e107steved $ */ - + +/** + * e107 Event calendar plugin + * + * Language file - 'user' pages + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: English.php,v 1.12 2009-12-20 22:47:33 e107steved Exp $; + */ + define('EC_ADLAN_1', 'Event Calendar'); define('EC_ADLAN_2', 'Configure Event Calendar'); define('EC_LAN_TODAY', 'today'); @@ -249,6 +259,7 @@ define('EC_LAN_VIEWCALENDAR', 'View Calendar'); define('EC_LAN_VIEWALLEVENTS', 'View all events'); define('EC_LAN_ALLEVENTS', "All events"); +/* // Recurring events texts - the numeric part of each define is the internal value assigned define('EC_LAN_RECUR_00', 'no'); define('EC_LAN_RECUR_01', 'annual'); @@ -282,6 +293,7 @@ define('NT_LAN_EC_5', 'Message'); define('NT_LAN_EC_6', 'Event Calendar - Event added'); define('NT_LAN_EC_7', 'New event posted'); define('NT_LAN_EC_8', 'Event Calendar - Event modified'); +*/ // Prefs - language defines can be used in various places where text is set through the admin screens define('EC_MAILOUT_SUBJECT', "Advice of calendar event"); // Use shortcode EC_MAIL_SUBJECT diff --git a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php index 64c397f59..2baf12ae6 100644 --- a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php +++ b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php @@ -9,11 +9,21 @@ * Messages for admin pages of event calendar * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-12-19 17:54:00 $ + * $Revision: 1.5 $ + * $Date: 2009-12-20 22:47:33 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * Language file - 'admin' pages + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: English_admin_calendar_menu.php,v 1.5 2009-12-20 22:47:33 e107steved Exp $; + */ + define('EC_ADLAN_1', 'Event Calendar'); define('EC_LAN_12', "Monday"); diff --git a/e107_plugins/calendar_menu/languages/English_class.php b/e107_plugins/calendar_menu/languages/English_class.php new file mode 100644 index 000000000..863d35f41 --- /dev/null +++ b/e107_plugins/calendar_menu/languages/English_class.php @@ -0,0 +1,62 @@ + \ No newline at end of file diff --git a/e107_plugins/calendar_menu/next_event_menu.php b/e107_plugins/calendar_menu/next_event_menu.php index 12f24eecd..82565e4c5 100644 --- a/e107_plugins/calendar_menu/next_event_menu.php +++ b/e107_plugins/calendar_menu/next_event_menu.php @@ -9,11 +9,19 @@ * Forthcoming events menu handler for event calendar * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/next_event_menu.php,v $ - * $Revision: 1.8 $ - * $Date: 2009-11-22 10:11:30 $ + * $Revision: 1.9 $ + * $Date: 2009-12-20 22:47:33 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: next_event_menu.php,v 1.9 2009-12-20 22:47:33 e107steved Exp $; + */ + if (!defined('e107_INIT')) { exit; } $e107 = e107::getInstance(); diff --git a/e107_plugins/calendar_menu/subscribe.php b/e107_plugins/calendar_menu/subscribe.php index 35d97a2a4..cbd79b97b 100644 --- a/e107_plugins/calendar_menu/subscribe.php +++ b/e107_plugins/calendar_menu/subscribe.php @@ -9,11 +9,19 @@ * Event calendar plugin - mail subscription to events notification * * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/subscribe.php,v $ - * $Revision: 1.7 $ - * $Date: 2009-11-22 10:11:31 $ + * $Revision: 1.8 $ + * $Date: 2009-12-20 22:47:33 $ * $Author: e107steved $ */ +/** + * e107 Event calendar plugin + * + * @package e107_plugins + * @subpackage event_calendar + * @version $Id: subscribe.php,v 1.8 2009-12-20 22:47:33 e107steved Exp $; + */ + require_once('../../class2.php'); $e107 = e107::getInstance();