| ".$order." |
@@ -338,7 +344,7 @@ class frontpage
{
$text .= "
- ".$frm->admin_button('fp_add_new', FRTLAN_42, 'create')."
+ ".$this->frm->admin_button('fp_add_new', FRTLAN_42, 'create')."
";
}
@@ -346,21 +352,26 @@ class frontpage
";
- return ($show_button ? $emessage->render() : '').$text;
+ return $text;
}
+
+
+ /**
+ * Display form to add/edit rules
+ *
+ * @param array $rule_info - initial data (must be preset if new rule)
+ *
+ * @return string - text for display
+ */
function edit_rule($rule_info)
- { // Display form to add/edit rules
- global $front_page, $frm;
- // $rule_info contains existing data as an array, or a set of defaults otherwise ('order', 'class', 'page', 'force')
-
-
+ {
$is_other_home = TRUE;
$is_other_force = TRUE;
//$force_checked = $rule_info['force'] ? " checked='checked'" : '';
- $text_tmp_1 = "";
- $text_tmp_2 = "";
- foreach($front_page as $front_key => $front_value)
+ $text_tmp_1 = '';
+ $text_tmp_2 = '';
+ foreach($this->frontPage as $front_key => $front_value)
{
//$type_selected = FALSE;
@@ -425,10 +436,10 @@ class frontpage
- ".$frm->hidden('fp_order', $rule_info['order'])."
- ".FRTLAN_43.r_userclass('class', $rule_info['class'], 'off', 'public,guest,member,admin,main,classes')."
- ".$frm->admin_button('fp_save_new', FRTLAN_12, 'update')."
- ".$frm->admin_button('fp_cancel', LAN_CANCEL, 'cancel')."
+ ".$this->frm->hidden('fp_order', $rule_info['order'])."
+ ".FRTLAN_43.e107::getUserClass()->uc_dropdown('class', $rule_info['class'], 'public,guest,member,admin,main,classes')."
+ ".$this->frm->admin_button('fp_save_new', FRTLAN_12, 'update')."
+ ".$this->frm->admin_button('fp_cancel', LAN_CANCEL, 'cancel')."
@@ -436,11 +447,18 @@ class frontpage
return $text;
}
- // Given a path string, returns the 'type' (title) for it
+
+
+ /**
+ * Given a path string related to a choice, returns the 'type' (title) for it
+ *
+ * @param string $path
+ *
+ * @return string - title of option
+ */
function lookup_path($path)
{
- global $front_page;
- foreach($front_page as $front_value)
+ foreach($this->frontPage as $front_value)
{
if(is_array($front_value['page']))
{ // Its a URL with multiple options
@@ -467,14 +485,26 @@ class frontpage
return FRTLAN_52; // 'None'
}
+
+
+ /**
+ * Show the selection options for a possible target of a rule
+ *
+ * @param string $ob_name - name of the radio button which selects this element
+ * @param string $front_key
+ * @param array|string $front_value - array of choices, or a single value
+ * @param boolean $is_other - passed by reference - set if some other option is selected
+ * @param string $current_setting - current value
+ *
+ * @return string - text for display
+ */
function show_front_val($ob_name, $front_key, $front_value, &$is_other, $current_setting)
{
- global $frm;
-
$type_selected = FALSE;
$text = '';
- if(is_array($front_value['page']))
+ // First, work out if the selection os one of these options
+ if (is_array($front_value['page']))
{ // Its a URL with multiple options
foreach($front_value['page'] as $multipage)
{
@@ -494,29 +524,30 @@ class frontpage
}
}
- if(is_array($front_value['page']))
+ // Now generate the display text - two table cells worth
+ if (is_array($front_value['page']))
{ // Multiple options for same page name
$text .= "
- ".$frm->radio($ob_name, $front_key, $type_selected)."
- ".$frm->label($front_value['title'], $ob_name, $front_key)."
+ ".$this->frm->radio($ob_name, $front_key, $type_selected)."
+ ".$this->frm->label($front_value['title'], $ob_name, $front_key)."
|
";
- $text .= $frm->select_open($ob_name.'_multipage['.$front_key.']');
+ $text .= $this->frm->select_open($ob_name.'_multipage['.$front_key.']');
foreach($front_value['page'] as $multipage_key => $multipage_value)
{
- $text .= "\n".$frm->option($multipage_value['title'], $multipage_key, ($current_setting == $multipage_value['page']))."\n";
+ $text .= "\n".$this->frm->option($multipage_value['title'], $multipage_key, ($current_setting == $multipage_value['page']))."\n";
}
- $text .= $frm->select_close();
+ $text .= $this->frm->select_close();
$text .= " | ";
}
else
{ // Single option for URL
$text .= "
- ".$frm->radio($ob_name, $front_key, $type_selected)."
- ".$frm->label($front_value['title'], $ob_name, $front_key)."
+ ".$this->frm->radio($ob_name, $front_key, $type_selected)."
+ ".$this->frm->label($front_value['title'], $ob_name, $front_key)."
|
| ";
@@ -524,23 +555,40 @@ class frontpage
return $text;
}
+
+
+ /**
+ * Provide the text for an 'other' option - a text box for URL entry
+ *
+ * @param string $ob_name - name of the radio button which selects this element
+ * @param string $front_key
+ * @param string $curval - current 'selected' value
+ * @param string $cur_page - probably the secondary (e.g. custom page) value for any option that has one
+ *
+ * @return string - text for display
+ */
function add_other($ob_name, $cur_val, $cur_page)
{
- global $frm;
return "
- ".$frm->radio($ob_name, 'other', $cur_val)." ".$frm->label(FRTLAN_15, $ob_name, 'other')." |
- ".$frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")." |
+ ".$this->frm->radio($ob_name, 'other', $cur_val)." ".$this->frm->label(FRTLAN_15, $ob_name, 'other')." |
+ ".$this->frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")." |
";
}
}
require_once ('footer.php');
-// Log event to admin log
+/**
+ * Log event to admin log
+ *
+ * @param string $msg_num - exactly two numeric characters corresponding to a log message
+ * @param string $woffle - information for the body of the log entre
+ *
+ * @return none
+ */
function frontpage_adminlog($msg_num = '00', $woffle = '')
{
- global $pref, $admin_log;
- $admin_log->log_event('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
+ e107::getAdminLog()->log_event('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
}
/**
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index e611b03bb..7d5c5226b 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,9 +9,9 @@
* Administration - Site Preferences
*
* $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
- * $Revision: 1.38 $
- * $Date: 2009-11-18 01:04:26 $
- * $Author: e107coders $
+ * $Revision: 1.39 $
+ * $Date: 2009-12-19 17:54:00 $
+ * $Author: e107steved $
*
*/
require_once ("../class2.php");
@@ -48,9 +48,9 @@ $frm = new e_form(true); //enable inner tabindex counter
$emessage = &eMessage::getInstance();
/* RESET DISPLAY NAMES */
-if($_POST['submit_resetdisplaynames'])
+if(isset($_POST['submit_resetdisplaynames']))
{
- $e107->sql->db_Update("user", "user_name=user_loginname");
+ $e107->sql->db_Update('user', 'user_name=user_loginname');
$emessage->add(PRFLAN_157);
}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 2ee1c4827..bf62a12ed 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
* Form Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.99 $
- * $Date: 2009-12-13 21:52:31 $
+ * $Revision: 1.100 $
+ * $Date: 2009-12-19 17:54:00 $
* $Author: e107steved $
*
*/
@@ -280,7 +280,7 @@ class e_form
// auto-height support
if(!vartrue($options['noresize']))
{
- $options['class'] = $options['class'] ? $options['class'].' e-autoheight' : 'tbox textarea e-autoheight';
+ $options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox textarea e-autoheight';
}
$options = $this->format_options('textarea', $name, $options);
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 6c84e6aaf..64c397f59 100644
--- a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
+++ b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
@@ -9,12 +9,12 @@
* 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.3 $
- * $Date: 2009-11-22 10:11:32 $
+ * $Revision: 1.4 $
+ * $Date: 2009-12-19 17:54:00 $
* $Author: e107steved $
*/
-
-define('EC_ADLAN_1', "Event Calendar");
+
+define('EC_ADLAN_1', 'Event Calendar');
define('EC_LAN_12', "Monday");
define('EC_LAN_13', "Tuesday");
@@ -168,7 +168,9 @@ define('EC_LAN_159', "Display ");
define('EC_LAN_160', "Print ");
define('EC_LAN_161', "PDF ");
define('EC_LAN_162', "Print this page");
+*/
define('EC_LAN_163', "Event Listing");
+/*
define('EC_LAN_164', "Printable Lists");
define('EC_LAN_165', "Default Listing");
define('EC_LAN_166', "Tabular List no lines");
@@ -192,7 +194,7 @@ define('EC_LAN_VIEWALLEVENTS', "View all events");
define('EC_LAN_ALLEVENTS', "All events");
*/
-
+define('EC_ADLAN_A09', 'Main Calendar');
define('EC_ADLAN_A10', "Configuration");
define('EC_ADLAN_A11', "Categories");
define('EC_ADLAN_A12', "Calendar");
@@ -239,7 +241,7 @@ define('EC_ADLAN_A93', "Email from email address");
define('EC_ADLAN_A94', "Add new event class");
define('EC_ADLAN_A95', "Enable manual subscriptions");
define('EC_ADLAN_A96', "Disabling this removes the subscriptions button and overrides the category manual subscription setting.");
-//define('EC_ADLAN_A97', "If set to force subscriptions this category will not be displayed in the available subscription list for the user.");
+
define('EC_ADLAN_A100', "Forthcoming Events");
define('EC_ADLAN_A101', "Days to look forward:");
diff --git a/e107_plugins/forum/e_frontpage.php b/e107_plugins/forum/e_frontpage.php
index 748c86d68..389bd9f78 100644
--- a/e107_plugins/forum/e_frontpage.php
+++ b/e107_plugins/forum/e_frontpage.php
@@ -4,6 +4,9 @@ if (!defined('e107_INIT')) { exit; }
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_frontpage.php');
+/**
+ * @todo - extend array to allow selection of any main forum, as well as the forum front page
+ */
$front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => FOR_FP_1);
?>
\ No newline at end of file
diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin_import.php
index e3da96d69..7e5d1bbed 100644
--- a/e107_plugins/import/languages/English_admin_import.php
+++ b/e107_plugins/import/languages/English_admin_import.php
@@ -9,14 +9,14 @@
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $
- * $Revision: 1.2 $
- * $Date: 2009-11-18 02:03:35 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.3 $
+ * $Date: 2009-12-19 17:54:00 $
+ * $Author: e107steved $
*/
if (!defined('e107_INIT')) { exit; }
-define('LAN_CONTINUE','Continue');
+//define('LAN_CONTINUE','Continue'); Now global definition
define('LAN_CONVERT_01','Import into e107');
define('LAN_CONVERT_02','This module allows you to import various data into E107');