mirror of
https://github.com/e107inc/e107.git
synced 2025-01-17 12:48:24 +01:00
Admin Preference form-field sizes. Debug Timing descriptions cleanup.
This commit is contained in:
Cameron
parent
ec36f1dc87
commit
5b63aa19d0
20
class2.php
20
class2.php
@ -382,7 +382,7 @@ require_once(e_HANDLER.'debug_handler.php');
|
||||
|
||||
if(E107_DEBUG_LEVEL && isset($db_debug) && is_object($db_debug))
|
||||
{
|
||||
$db_debug->Mark_Time('Start: Init ErrHandler');
|
||||
$db_debug->Mark_Time('Init ErrHandler');
|
||||
}
|
||||
|
||||
//
|
||||
@ -616,13 +616,13 @@ if(!empty($pref['redirectsiteurl']) && !empty($pref['siteurl'])) {
|
||||
/**
|
||||
* Set the User's Language
|
||||
*/
|
||||
$sql->db_Mark_Time('Start: Set User Language');
|
||||
// SESSION Needs to be started after:
|
||||
// - Site preferences are available
|
||||
// - Language detection (because of session.cookie_domain)
|
||||
// to avoid multi-language 'access-denied' issues.
|
||||
//session_start(); see e107::getSession() above
|
||||
e107::getSession(); //init core _SESSION - actually here for reference only, it's done by language handler set() method
|
||||
$sql->db_Mark_Time('Start: Set User Language Session');
|
||||
e107::getLanguage()->set(); // set e_LANGUAGE, USERLAN, Language Session / Cookies etc. requires $pref;
|
||||
|
||||
if(varset($pref['multilanguage']) && (e_LANGUAGE != $pref['sitelanguage']))
|
||||
@ -635,7 +635,7 @@ if(varset($pref['multilanguage']) && (e_LANGUAGE != $pref['sitelanguage']))
|
||||
// e107_include_once(e_LANGUAGEDIR.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
|
||||
// e107_include_once(e_LANGUAGEDIR.e_LANGUAGE.'/'.e_LANGUAGE.'_custom.php');
|
||||
// v1 Custom language File Path.
|
||||
|
||||
$sql->db_Mark_Time('Start: Include Global Core Language Files');
|
||||
if((e_ADMIN_AREA === true) && !empty($pref['adminlanguage']))
|
||||
{
|
||||
include(e_LANGUAGEDIR.$pref['adminlanguage'].'/'.$pref['adminlanguage'].'.php');
|
||||
@ -662,7 +662,7 @@ unset($customLan, $customLan2);
|
||||
|
||||
$lng->bcDefs(); // defined v1.x definitions for old templates.
|
||||
|
||||
$sql->db_Mark_Time('Start: Global Language Files');
|
||||
$sql->db_Mark_Time('Start: Include Global Plugin Language Files');
|
||||
if(isset($pref['lan_global_list']))
|
||||
{
|
||||
foreach($pref['lan_global_list'] as $path)
|
||||
@ -698,14 +698,15 @@ $override = e107::getSingleton('override', true); //TODO - find & replace $overr
|
||||
//DEPRECATED, BC, call the method only when needed, $e107->user_class caught by __get()
|
||||
$e_userclass = e107::getUserClass(); //TODO - find & replace $e_userclass, $e107->user_class
|
||||
|
||||
|
||||
$sql->db_Mark_Time('Start: Init Event Handler');
|
||||
e107::getEvent()->init();
|
||||
$sql->db_Mark_Time('Start: Register Core Events');
|
||||
e107::getNotify()->registerEvents();
|
||||
|
||||
//
|
||||
// O: Start user session
|
||||
//
|
||||
$sql -> db_Mark_Time('Start: Init session');
|
||||
$sql -> db_Mark_Time('Start: User session');
|
||||
init_session(); // Set up a lot of the user-related constants
|
||||
|
||||
|
||||
@ -1016,6 +1017,7 @@ $ns = e107::getRender(); //TODO - find & replace $ns, $e107->ns
|
||||
|
||||
// EONE-134 - bad e_module could destroy e107 instance
|
||||
$e107 = e107::getInstance(); // Is this needed now?
|
||||
$sql->db_Mark_Time('Start: IP Handler and Ban Check');
|
||||
e107::getIPHandler()->ban();
|
||||
|
||||
if(varset($pref['force_userupdate']) && USER && !isset($_E107['no_forceuserupdate']) && $_SERVER['QUERY_STRING'] !== 'logout')
|
||||
@ -1045,7 +1047,7 @@ if(!isset($_E107['no_prunetmp']))
|
||||
}
|
||||
|
||||
|
||||
$sql->db_Mark_Time('(Start: Login/logout/ban/tz)');
|
||||
$sql->db_Mark_Time('Start: Login/logout/ban/tz');
|
||||
|
||||
|
||||
if (isset($_POST['userlogin']) || isset($_POST['userlogin_x']))
|
||||
@ -1137,7 +1139,7 @@ define('TIMEOFFSET', $e_deltaTime);
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
$sql->db_Mark_Time('(Start: Find/Load Theme)');
|
||||
$sql->db_Mark_Time('Start: Find/Load Theme');
|
||||
|
||||
if(e_ADMIN_AREA) // Load admin phrases ASAP
|
||||
{
|
||||
@ -1173,7 +1175,7 @@ if(!defined('THEME'))
|
||||
|
||||
$theme_pref = varset($pref['sitetheme_pref']);
|
||||
// --------------------------------------------------------------
|
||||
$sql->db_Mark_Time('(Start: Find/Load Theme-Layout)'); // needs to run after checkvalidtheme() (for theme previewing).
|
||||
$sql->db_Mark_Time('Start: Find/Load Theme-Layout'); // needs to run after checkvalidtheme() (for theme previewing).
|
||||
|
||||
if(!defined("THEME_LAYOUT"))
|
||||
{
|
||||
|
||||
@ -382,14 +382,14 @@ $text .= "
|
||||
<tr>
|
||||
<td><label for='sitetag'>".PRFLAN_5."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('sitetag', $tp->toForm($pref['sitetag']), 3, 59)."
|
||||
".$frm->textarea('sitetag', $tp->toForm($pref['sitetag']), 3, 59, array('size'=>'xxlarge'))."
|
||||
<div class='field-help'>".PRFLAN_227."</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for='sitedescription'>".PRFLAN_6."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('sitedescription', $tp->toForm($pref['sitedescription']), 3, 80)."
|
||||
".$frm->textarea('sitedescription', $tp->toForm($pref['sitedescription']), 3, 80, array('size'=>'xxlarge'))."
|
||||
<div class='field-help'>".PRFLAN_228."</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -397,7 +397,7 @@ $text .= "
|
||||
<tr>
|
||||
<td><label for='sitedisclaimer'>".PRFLAN_9."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('sitedisclaimer',$tp->toForm( $pref['sitedisclaimer']), 3, 80)."
|
||||
".$frm->textarea('sitedisclaimer',$tp->toForm( $pref['sitedisclaimer']), 3, 80, array('size'=>'xxlarge'))."
|
||||
<div class='field-help'>".PRFLAN_229."</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -421,26 +421,26 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
|
||||
<tr>
|
||||
<td><label for='siteadmin'>".PRFLAN_7."</label></td>
|
||||
<td>
|
||||
".$frm->text('siteadmin', SITEADMIN, 100)."
|
||||
".$frm->text('siteadmin', SITEADMIN, 100, array('size'=>'xlarge'))."
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for='siteadminemail'>".PRFLAN_8."</label></td>
|
||||
<td>
|
||||
".$frm->text('siteadminemail', SITEADMINEMAIL, 100)."
|
||||
".$frm->text('siteadminemail', SITEADMINEMAIL, 100, array('size'=>'xlarge'))."
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for='replyto-name'>".PRFLAN_174."</label></td>
|
||||
<td>
|
||||
".$frm->text('replyto_name', $pref['replyto_name'], 100)."
|
||||
".$frm->text('replyto_name', $pref['replyto_name'], 100, array('size'=>'xlarge'))."
|
||||
<div class='smalltext field-help'>".PRFLAN_175."</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for='replyto-email'>".PRFLAN_176."</label></td>
|
||||
<td>
|
||||
".$frm->text('replyto_email', $pref['replyto_email'], 100)."
|
||||
".$frm->text('replyto_email', $pref['replyto_email'], 100, array('size'=>'xlarge'))."
|
||||
<div class='smalltext field-help'>".PRFLAN_177."</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -483,7 +483,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
|
||||
<tr>
|
||||
<td><label for='sitecontactinfo'>".PRFLAN_162."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('sitecontactinfo', $pref['sitecontactinfo'], 6, 59)."
|
||||
".$frm->textarea('sitecontactinfo', $pref['sitecontactinfo'], 6, 59, array('size'=>'xxlarge'))."
|
||||
<div class='smalltext field-help'>".PRFLAN_163."</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -789,7 +789,7 @@ $text .= "
|
||||
<tr>
|
||||
<td><label for='user-reg-veri'>".PRFLAN_154."</label></td>
|
||||
<td>
|
||||
".$frm->select_open('user_reg_veri');
|
||||
".$frm->select_open('user_reg_veri', array('size'=>'xlarge'));
|
||||
$veri_list = array(PRFLAN_152,PRFLAN_31,PRFLAN_153);
|
||||
|
||||
foreach($veri_list as $v => $v_title)
|
||||
@ -810,7 +810,7 @@ $text .= "
|
||||
|
||||
<tr>
|
||||
<td><label for='allowemaillogin'>".PRFLAN_184."</label></td>
|
||||
<td>".$frm->select_open('allowEmailLogin');
|
||||
<td>".$frm->select_open('allowEmailLogin', array('size'=>'xlarge'));
|
||||
// $login_list = array(PRFLAN_201,PRFLAN_202,PRFLAN_203);
|
||||
$login_list = array(
|
||||
2 => PRFLAN_203,
|
||||
@ -857,7 +857,7 @@ $text .= "
|
||||
<div class='field-help'>".PRFLAN_266."</div>
|
||||
</div>
|
||||
<div class='form-group clearfix'>".
|
||||
$frm->textarea('membersonly_exceptions', $pref['membersonly_exceptions'], 3, 1, 'placeholder='.PRFLAN_206)."
|
||||
$frm->textarea('membersonly_exceptions', $pref['membersonly_exceptions'], 3, 1, 'size=xxlarge&placeholder='.PRFLAN_206)."
|
||||
<div class='field-help'>".PRFLAN_207."</div></div>
|
||||
|
||||
</div>
|
||||
@ -1021,14 +1021,14 @@ $text .= "
|
||||
<tr>
|
||||
<td><label for='signup-text'>".PRFLAN_126."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('signup_text', $pref['signup_text'], 3, 80)."
|
||||
".$frm->textarea('signup_text', $pref['signup_text'], 3, 80, array('size'=>'xxlarge'))."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><label for='signup-text-after'>".PRFLAN_140."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('signup_text_after', $pref['signup_text_after'], 3, 80)."
|
||||
".$frm->textarea('signup_text_after', $pref['signup_text_after'], 3, 80, array('size'=>'xxlarge'))."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -1520,7 +1520,7 @@ $text .= "
|
||||
'asc' => PRFLAN_237
|
||||
);
|
||||
|
||||
$text .= $frm->select('comments_sort',$comment_sort, $pref['comments_moderate'])."
|
||||
$text .= $frm->select('comments_sort',$comment_sort, $pref['comments_moderate'], array('size'=>'xlarge'))."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user