mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Tidy up front page admin; kill some notices and globals

Browse Source
This commit is contained in:
e107steved
2009-12-19 17:54:00 +00:00
parent cf2978b82c
commit 45fef35aea
6 changed files with 143 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
e107_admin/frontpage.php
View File

@@ -9,12 +9,20 @@
* Administration Area - Front page * Administration Area - Front page
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $
* $Revision: 1.15 $ * $Revision: 1.16 $
* $Date: 2009-11-18 01:04:25 $ * $Date: 2009-12-19 17:54:00 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
/**
* e107 Front page administration
*
* @package e107
* @subpackage admin
* @version $Id: frontpage.php,v 1.16 2009-12-19 17:54:00 e107steved Exp $;
*/
require_once ('../class2.php'); require_once ('../class2.php');
if(! getperms('G')) if(! getperms('G'))
{ {
@@ -27,8 +35,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$e_sub_cat = 'frontpage'; $e_sub_cat = 'frontpage';
require_once ('auth.php'); require_once ('auth.php');
require_once (e_HANDLER.'form_handler.php'); require_once (e_HANDLER.'form_handler.php');
require_once (e_HANDLER."message_handler.php"); require_once (e_HANDLER.'message_handler.php');
$frm = new e_form();
$emessage = &eMessage::getInstance(); $emessage = &eMessage::getInstance();
require_once (e_HANDLER.'userclass_class.php'); require_once (e_HANDLER.'userclass_class.php');
@@ -38,7 +45,7 @@ $front_page['news'] = array('page' => 'news.php', 'title' => ADLAN_0);
$front_page['download'] = array('page' => 'download.php', 'title' => ADLAN_24); $front_page['download'] = array('page' => 'download.php', 'title' => ADLAN_24);
$front_page['wmessage'] = array('page' => 'index.php', 'title' => ADLAN_28); $front_page['wmessage'] = array('page' => 'index.php', 'title' => ADLAN_28);
if($sql->db_Select("page", "*", "page_theme=''")) if($sql->db_Select('page', 'page_id, page_title', "page_theme=''"))
{ {
$front_page['custom']['title'] = 'Custom Page'; $front_page['custom']['title'] = 'Custom Page';
while($row = $sql->db_Fetch()) while($row = $sql->db_Fetch())
@@ -52,9 +59,9 @@ if(varset($pref['e_frontpage_list']))
{ {
foreach($pref['e_frontpage_list'] as $val) foreach($pref['e_frontpage_list'] as $val)
{ {
if(is_readable(e_PLUGIN.$val."/e_frontpage.php")) if(is_readable(e_PLUGIN.$val.'/e_frontpage.php'))
{ {
require_once (e_PLUGIN.$val."/e_frontpage.php"); require_once (e_PLUGIN.$val.'/e_frontpage.php');
} }
} }
} }
@@ -230,63 +237,62 @@ if($fp_update_prefs)
for($i = 1; $i <= count($fp_settings); $i ++) for($i = 1; $i <= count($fp_settings); $i ++)
{ {
$fp_list[$fp_settings[$i]['class']] = $fp_settings[$i]['page']; $fp_list[$fp_settings[$i]['class']] = $fp_settings[$i]['page'];
// $fp_force[$fp_settings[$i]['class']] = intval($fp_settings[$i]['force']);
$fp_force[$fp_settings[$i]['class']] = $fp_settings[$i]['force']; $fp_force[$fp_settings[$i]['class']] = $fp_settings[$i]['force'];
} }
// if (($fp_list != $pref['frontpage']) || ($fp_force != $pref['frontpage_force']))
// {
$pref['frontpage'] = $fp_list; $pref['frontpage'] = $fp_list;
$pref['frontpage_force'] = $fp_force; $pref['frontpage_force'] = $fp_force;
save_prefs(); save_prefs();
//$ns->tablerender(LAN_UPDATED, "<div style='text-align:center'><b>".FRTLAN_1."</b></div>");
$emessage->add(FRTLAN_1, E_MESSAGE_SUCCESS); $emessage->add(FRTLAN_1, E_MESSAGE_SUCCESS);
// }
// else
// {
// $ns -> tablerender(LAN_UPDATED, "<div style='text-align:center'><b>".FRTLAN_45."</b></div>");
// }
} }
/* For reference:
define("e_UC_PUBLIC", 0);
define("e_UC_MAINADMIN", 250);
define("e_UC_READONLY", 251);
define("e_UC_GUEST", 252);
define("e_UC_MEMBER", 253);
define("e_UC_ADMIN", 254);
define("e_UC_NOBODY", 255);
*/
$fp = new frontpage();
// All updates complete now - latest data is in the $fp_settings, $fp_list and $fp_force arrays
$fp = new frontpage($front_page);
if(isset($_POST['fp_add_new'])) if(isset($_POST['fp_add_new']))
{ {
$text = $fp->edit_rule(array('order' => 0, 'class' => e_UC_PUBLIC, 'page' => 'news.php', 'force' => FALSE)); // Display edit form as well $text = $fp->edit_rule(array('order' => 0, 'class' => e_UC_PUBLIC, 'page' => 'news.php', 'force' => FALSE)); // Display edit form as well
$text .= $fp->select_class(FALSE); $text .= $fp->select_class($fp_settings, FALSE);
$e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_42, $text); $e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_42, $text);
} }
elseif(isset($_POST['fp_edit_rule'])) elseif(isset($_POST['fp_edit_rule']))
{ {
$text = $fp->edit_rule($fp_settings[key($_POST['fp_edit_rule'])]); // Display edit form as well $text = $fp->edit_rule($fp_settings[key($_POST['fp_edit_rule'])]); // Display edit form as well
$text .= $fp->select_class(FALSE); $text .= $fp->select_class($fp_settings, FALSE);
$e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_46, $text); $e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_46, $text);
} }
else else
{ // Just show existing rules { // Just show existing rules
$e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_13, $fp->select_class(TRUE)); $e107->ns->tablerender(FRTLAN_PAGE_TITLE." - ".FRTLAN_13, $emessage->render().$fp->select_class($fp_settings, TRUE));
} }
class frontpage class frontpage
{ {
function select_class($show_button = TRUE) protected $frm;
{ // Display existing data protected $frontPage = array(); // List of options for front page
global $fp_settings, $frm, $emessage;
//Inline Page Help Info - system message for now public function __construct($fp)
//TODO - inline tooltip help system {
//$emessage->add(FRTLAN_38.". ".FRTLAN_39.". ".FRTLAN_41."."); - moved to a help file $this->frm = new e_form();
$this->frontPage = $fp;
}
/**
* Show a list of existing rules, with edit/delete/move buttons, and optional button to add a new rule
*
* @param boolean $show_button - show the 'Add new rule' button if true
*
* @return string text for display
*/
function select_class(&$fp_settings, $show_button = TRUE)
{
// List of current settings // List of current settings
$show_legend = $show_button ? " class='e-hideme'" : ''; $show_legend = $show_button ? " class='e-hideme'" : '';
$text = " $text = "
@@ -315,7 +321,7 @@ class frontpage
foreach($fp_settings as $order => $current_value) foreach($fp_settings as $order => $current_value)
{ {
$title = r_userclass_name($current_value['class']); $title = e107::getUserClass()->uc_get_classname($current_value['class']);
$text .= " $text .= "
<tr> <tr>
<td class='right'>".$order."</td> <td class='right'>".$order."</td>
@@ -338,7 +344,7 @@ class frontpage
{ {
$text .= " $text .= "
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$frm->admin_button('fp_add_new', FRTLAN_42, 'create')." ".$this->frm->admin_button('fp_add_new', FRTLAN_42, 'create')."
</div>"; </div>";
} }
@@ -346,21 +352,26 @@ class frontpage
</fieldset> </fieldset>
</form>"; </form>";
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) 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_home = TRUE;
$is_other_force = TRUE; $is_other_force = TRUE;
//$force_checked = $rule_info['force'] ? " checked='checked'" : ''; //$force_checked = $rule_info['force'] ? " checked='checked'" : '';
$text_tmp_1 = ""; $text_tmp_1 = '';
$text_tmp_2 = ""; $text_tmp_2 = '';
foreach($front_page as $front_key => $front_value) foreach($this->frontPage as $front_key => $front_value)
{ {
//$type_selected = FALSE; //$type_selected = FALSE;
@@ -425,10 +436,10 @@ class frontpage
</table> </table>
</div> </div>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$frm->hidden('fp_order', $rule_info['order'])." ".$this->frm->hidden('fp_order', $rule_info['order'])."
".FRTLAN_43.r_userclass('class', $rule_info['class'], 'off', 'public,guest,member,admin,main,classes')." ".FRTLAN_43.e107::getUserClass()->uc_dropdown('class', $rule_info['class'], 'public,guest,member,admin,main,classes')."
".$frm->admin_button('fp_save_new', FRTLAN_12, 'update')." ".$this->frm->admin_button('fp_save_new', FRTLAN_12, 'update')."
".$frm->admin_button('fp_cancel', LAN_CANCEL, 'cancel')." ".$this->frm->admin_button('fp_cancel', LAN_CANCEL, 'cancel')."
</div> </div>
</fieldset> </fieldset>
</form> </form>
@@ -436,11 +447,18 @@ class frontpage
return $text; 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) function lookup_path($path)
{ {
global $front_page; foreach($this->frontPage as $front_value)
foreach($front_page as $front_value)
{ {
if(is_array($front_value['page'])) if(is_array($front_value['page']))
{ // Its a URL with multiple options { // Its a URL with multiple options
@@ -467,13 +485,25 @@ class frontpage
return FRTLAN_52; // 'None' 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) function show_front_val($ob_name, $front_key, $front_value, &$is_other, $current_setting)
{ {
global $frm;
$type_selected = FALSE; $type_selected = FALSE;
$text = ''; $text = '';
// First, work out if the selection os one of these options
if (is_array($front_value['page'])) if (is_array($front_value['page']))
{ // Its a URL with multiple options { // Its a URL with multiple options
foreach($front_value['page'] as $multipage) foreach($front_value['page'] as $multipage)
@@ -494,29 +524,30 @@ class frontpage
} }
} }
// Now generate the display text - two table cells worth
if (is_array($front_value['page'])) if (is_array($front_value['page']))
{ // Multiple options for same page name { // Multiple options for same page name
$text .= " $text .= "
<td> <td>
".$frm->radio($ob_name, $front_key, $type_selected)."&nbsp; ".$this->frm->radio($ob_name, $front_key, $type_selected)."&nbsp;
".$frm->label($front_value['title'], $ob_name, $front_key)." ".$this->frm->label($front_value['title'], $ob_name, $front_key)."
</td> </td>
<td> <td>
"; ";
$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) 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 .= "</td>"; $text .= "</td>";
} }
else else
{ // Single option for URL { // Single option for URL
$text .= " $text .= "
<td> <td>
".$frm->radio($ob_name, $front_key, $type_selected)."&nbsp; ".$this->frm->radio($ob_name, $front_key, $type_selected)."&nbsp;
".$frm->label($front_value['title'], $ob_name, $front_key)." ".$this->frm->label($front_value['title'], $ob_name, $front_key)."
</td> </td>
<td>&nbsp;</td>"; <td>&nbsp;</td>";
@@ -524,23 +555,40 @@ class frontpage
return $text; 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) function add_other($ob_name, $cur_val, $cur_page)
{ {
global $frm;
return " return "
<td>".$frm->radio($ob_name, 'other', $cur_val)."&nbsp;".$frm->label(FRTLAN_15, $ob_name, 'other')."</td> <td>".$this->frm->radio($ob_name, 'other', $cur_val)."&nbsp;".$this->frm->label(FRTLAN_15, $ob_name, 'other')."</td>
<td>".$frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")."</td> <td>".$this->frm->text($ob_name.'_other', ($cur_val ? $cur_page : ''), 150, "size=50&id={$ob_name}-other-txt")."</td>
"; ";
} }
} }
require_once ('footer.php'); 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 = '') function frontpage_adminlog($msg_num = '00', $woffle = '')
{ {
global $pref, $admin_log; e107::getAdminLog()->log_event('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
$admin_log->log_event('FRONTPG_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
} }
/** /**

10
e107_admin/prefs.php
View File

@@ -9,9 +9,9 @@
* Administration - Site Preferences * Administration - Site Preferences
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
* $Revision: 1.38 $ * $Revision: 1.39 $
* $Date: 2009-11-18 01:04:26 $ * $Date: 2009-12-19 17:54:00 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
require_once ("../class2.php"); require_once ("../class2.php");
@@ -48,9 +48,9 @@ $frm = new e_form(true); //enable inner tabindex counter
$emessage = &eMessage::getInstance(); $emessage = &eMessage::getInstance();
/* RESET DISPLAY NAMES */ /* 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); $emessage->add(PRFLAN_157);
} }

6
e107_handlers/form_handler.php
View File

@@ -9,8 +9,8 @@
* Form Handler * Form Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.99 $ * $Revision: 1.100 $
* $Date: 2009-12-13 21:52:31 $ * $Date: 2009-12-19 17:54:00 $
* $Author: e107steved $ * $Author: e107steved $
* *
*/ */
@@ -280,7 +280,7 @@ class e_form
// auto-height support // auto-height support
if(!vartrue($options['noresize'])) 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); $options = $this->format_options('textarea', $name, $options);

12
e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
View File

@@ -9,12 +9,12 @@
* Messages for admin pages of event calendar * Messages for admin pages of event calendar
* *
* $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php,v $ * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php,v $
* $Revision: 1.3 $ * $Revision: 1.4 $
* $Date: 2009-11-22 10:11:32 $ * $Date: 2009-12-19 17:54:00 $
* $Author: e107steved $ * $Author: e107steved $
*/ */
define('EC_ADLAN_1', "Event Calendar"); define('EC_ADLAN_1', 'Event Calendar');
define('EC_LAN_12', "Monday"); define('EC_LAN_12', "Monday");
define('EC_LAN_13', "Tuesday"); define('EC_LAN_13', "Tuesday");
@@ -168,7 +168,9 @@ define('EC_LAN_159', "Display ");
define('EC_LAN_160', "Print "); define('EC_LAN_160', "Print ");
define('EC_LAN_161', "PDF "); define('EC_LAN_161', "PDF ");
define('EC_LAN_162', "Print this page"); define('EC_LAN_162', "Print this page");
*/
define('EC_LAN_163', "Event Listing"); define('EC_LAN_163', "Event Listing");
/*
define('EC_LAN_164', "Printable Lists"); define('EC_LAN_164', "Printable Lists");
define('EC_LAN_165', "Default Listing"); define('EC_LAN_165', "Default Listing");
define('EC_LAN_166', "Tabular List no lines"); 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_LAN_ALLEVENTS', "All events");
*/ */
define('EC_ADLAN_A09', 'Main Calendar');
define('EC_ADLAN_A10', "Configuration"); define('EC_ADLAN_A10', "Configuration");
define('EC_ADLAN_A11', "Categories"); define('EC_ADLAN_A11', "Categories");
define('EC_ADLAN_A12', "Calendar"); 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_A94', "Add new event class");
define('EC_ADLAN_A95', "Enable manual subscriptions"); 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_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_A100', "Forthcoming Events");
define('EC_ADLAN_A101', "Days to look forward:"); define('EC_ADLAN_A101', "Days to look forward:");

3
e107_plugins/forum/e_frontpage.php
View File

@@ -4,6 +4,9 @@ if (!defined('e107_INIT')) { exit; }
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_frontpage.php'); 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); $front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => FOR_FP_1);
?> ?>

8
e107_plugins/import/languages/English_admin_import.php
View File

@@ -9,14 +9,14 @@
* *
* *
* $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $ * $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $
* $Revision: 1.2 $ * $Revision: 1.3 $
* $Date: 2009-11-18 02:03:35 $ * $Date: 2009-12-19 17:54:00 $
* $Author: marj_nl_fr $ * $Author: e107steved $
*/ */
if (!defined('e107_INIT')) { exit; } 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_01','Import into e107');
define('LAN_CONVERT_02','This module allows you to import various data into E107'); define('LAN_CONVERT_02','This module allows you to import various data into E107');