1
0
mirror of https://github.com/e107inc/e107.git synced 2025-06-07 03:15:03 +02:00

$frm->selectbox() renamed to $frm->select(); for consistency.

This commit is contained in:
Cameron 2013-04-25 17:29:46 -07:00
parent 09d878b56a
commit 063bf2b200
25 changed files with 70 additions and 53 deletions

View File

@ -412,7 +412,7 @@ if($action == "config")
<tbody>
<tr>
<td>".RL_LAN_044."</td>
<td>".$frm->selectbox('sys_log_perpage', array(10, 20, 30, 40, 50), $pref['sys_log_perpage'])."<span class='field-help'>".RL_LAN_064."</span></td>
<td>".$frm->select('sys_log_perpage', array(10, 20, 30, 40, 50), $pref['sys_log_perpage'])."<span class='field-help'>".RL_LAN_064."</span></td>
</tr>
";
@ -757,7 +757,7 @@ if(isset($page_title[$action]))
case 'priority':
$text .= "
<td>".RL_LAN_058."</td>
<td>".$frm->selectbox('roll_pri_cond', array('xx' => '&nbsp;', 'gt' => '&gt;=', 'eq' => '==', 'lt' => '&lt;='), $pri_filter_cond)."
<td>".$frm->select('roll_pri_cond', array('xx' => '&nbsp;', 'gt' => '&gt;=', 'eq' => '==', 'lt' => '&lt;='), $pri_filter_cond)."
<input class='tbox' type='text' name='roll_pri_val' id='roll-pri-val' size='20' value='{$pri_filter_val}' maxlength='10' />
</td>
";

View File

@ -177,7 +177,7 @@ $text = "
</table>
<div class='buttons-bar'>
<div class='f-right'>".$frm->admin_button('submit_cache', CACLAN_2, 'update')."</div>
".$frm->selectbox('option_clear_cache', array(
".$frm->select('option_clear_cache', array(
'empty_all' => CACLAN_26,
'empty_contentcache' => CACLAN_5,
'empty_syscache' => CACLAN_16,

View File

@ -159,7 +159,7 @@ class comments_admin_form_ui extends e_admin_form_ui
if($mode == 'write')
{
return $frm->selectbox("comment_blocked", $blocked, $curVal);
return $frm->select("comment_blocked", $blocked, $curVal);
}

View File

@ -204,7 +204,7 @@ class file_inspector {
<td style='width: 35%'>
".FC_LAN_3." ".FC_LAN_5.":
</td>
<td colspan='2' style='width: 65%'>".$frm->selectbox('core',$coreOpts,$_POST['core'])." </td>
<td colspan='2' style='width: 65%'>".$frm->select('core',$coreOpts,$_POST['core'])." </td>
</tr>";
@ -213,7 +213,7 @@ class file_inspector {
<td style='width: 35%'>
".FC_LAN_14.":
</td>
<td colspan='2' style='width: 65%'>".$frm->selectbox('type', $dispOpt, $_POST['type'])." </td>
<td colspan='2' style='width: 65%'>".$frm->select('type', $dispOpt, $_POST['type'])." </td>
</td>
</tr>";

View File

@ -475,7 +475,7 @@ function multilang_prefs()
$sellan = preg_replace("/lan_*.php/i", "", $pref['sitelanguage']);
$text .= $frm->selectbox('mainsitelanguage',$lanlist,$sellan,"useValues=1");
$text .= $frm->select('mainsitelanguage',$lanlist,$sellan,"useValues=1");
$text .= "
</td>
</tr>
@ -519,7 +519,7 @@ function multilang_prefs()
{
if($val != $pref['sitelanguage'])
{
$opt .= "<tr><td class='middle' style='width:5%'>".$val."</td><td class='left'><input type='text' name='multilanguage_domain[".$val."]' value=\"".$pref['multilanguage_domain'][$val]."\" /></td></tr>";
$opt .= "<tr><td class='middle' style='width:5%'>".$val."</td><td class='left inline-text'><input type='text' name='multilanguage_domain[".$val."]' value=\"".$pref['multilanguage_domain'][$val]."\" /></td></tr>";
}
}
@ -812,7 +812,7 @@ function show_tools()
$text .= "
</select>".
$frm->selectbox('deprecatedLansReverse',$depOptions,$_POST['deprecatedLansReverse']).
$frm->select('deprecatedLansReverse',$depOptions,$_POST['deprecatedLansReverse']).
$frm->admin_button('searchDeprecated',"Check",'other')."
<span class='field-help'>".(count($lans) + count($plugs))." files found</span>
</td>

View File

@ -2125,14 +2125,14 @@ class admin_newspost
}
else
{
// $text .= $frm->selectbox("cat_id",$this->news_category,$_POST['cat_id']);
// $text .= $frm->select("cat_id",$this->news_category,$_POST['cat_id']);
$catopt = array();
foreach ($this->news_categories as $row)
{
$catopt[$row['category_id']] = $tp->toHTML($row['category_name'], FALSE, "LINKTEXT");
}
$text .= $frm->selectbox("cat_id", $catopt, $_POST['cat_id']);
$text .= $frm->select("cat_id", $catopt, $_POST['cat_id']);
/*
$text .= $frm->select_open('cat_id');
@ -2174,7 +2174,7 @@ class admin_newspost
";
//XXX multiple -selections at once. (comma separated) - working
$text .= $frm->selectbox('news_render_type', $this->news_renderTypes, vartrue($_POST['news_render_type']), "multiple=1")."
$text .= $frm->select('news_render_type', $this->news_renderTypes, vartrue($_POST['news_render_type']), "multiple=1")."
<div class='field-help'>
".NWSLAN_74."
</div>
@ -2916,7 +2916,7 @@ class admin_newspost
function ajax_exec_pref_archnum()
{
$frm = e107::getForm();
echo $frm->selectbox('newsposts_archive', $this->_optrange(intval($this->getSubAction()) - 1), intval(e107::getPref('newsposts_archive')), 'class=tbox&tabindex='.intval($this->getId()));
echo $frm->select('newsposts_archive', $this->_optrange(intval($this->getSubAction()) - 1), intval(e107::getPref('newsposts_archive')), 'class=tbox&tabindex='.intval($this->getId()));
}
/*
@ -2969,13 +2969,13 @@ class admin_newspost
<tr>
<td>".NWSLAN_87."</td>
<td>
".$frm->selectbox('nbr_cols', $this->_optrange(6, false), $pref['nbr_cols'], 'class=tbox')."
".$frm->select('nbr_cols', $this->_optrange(6, false), $pref['nbr_cols'], 'class=tbox')."
</td>
</tr>
<tr>
<td>".NWSLAN_88."</td>
<td>
".$frm->selectbox('newsposts', $this->_optrange(50, false), $pref['newsposts'], 'class=tbox')."
".$frm->select('newsposts', $this->_optrange(50, false), $pref['newsposts'], 'class=tbox')."
</td>
</tr>
";
@ -2989,7 +2989,7 @@ class admin_newspost
<tr>
<td>".NWSLAN_115."</td>
<td id='newsposts-archive-cont'>
".$frm->selectbox('newsposts_archive', $this->_optrange(intval($pref['newsposts']) - 1), intval($pref['newsposts_archive']), 'class=tbox')."
".$frm->select('newsposts_archive', $this->_optrange(intval($pref['newsposts']) - 1), intval($pref['newsposts_archive']), 'class=tbox')."
<div class='field-help'>".NWSLAN_116."</div>
</td>
</tr>

View File

@ -1328,7 +1328,7 @@ class pluginManager{
if(is_writable(e_PLUGIN.$plug['plugin_path']))
{
$del_text = $frm->selectbox('delete_files','yesno',0);
$del_text = $frm->select('delete_files','yesno',0);
}
else
{
@ -1430,7 +1430,7 @@ class pluginManager{
{
$text .= "<tr>\n<td class='top'>".$tp->toHTML($val['label'],FALSE,'TITLE');
$text .= varset($val['preview']) ? "<div class='indent'>".$val['preview']."</div>" : "";
$text .= "</td>\n<td>".$frm->selectbox($key,$val['itemList'],$val['itemDefault']);
$text .= "</td>\n<td>".$frm->select($key,$val['itemList'],$val['itemDefault']);
$text .= varset($val['helpText']) ? "<div class='field-help'>".$val['helpText']."</div>" : "";
$text .= "</td>\n</tr>\n";
}
@ -1596,7 +1596,7 @@ class pluginBuilder
</colgroup>
<tr>
<td>Select your plugin's folder</td>
<td>".$frm->selectbox("newplugin",$newDir)."</td>
<td>".$frm->select("newplugin",$newDir)."</td>
</tr>";
@ -1951,7 +1951,7 @@ class pluginBuilder
'about' => 'about'
);
$text = $frm->selectbox($name, $options,'','required=1&class=null', true);
$text = $frm->select($name, $options,'','required=1&class=null', true);
break;
@ -2073,7 +2073,7 @@ TEMPLATE;
$text .= "
<tr>
<td>Mode</td>
<td>".$frm->selectbox($this->table."[mode]",$modes, $defaultMode[$table], 'required=1&class=null', true)."</td>
<td>".$frm->select($this->table."[mode]",$modes, $defaultMode[$table], 'required=1&class=null', true)."</td>
</tr>
";
@ -2225,7 +2225,7 @@ TEMPLATE;
// asort($array);
$fname = $this->table."[fields][".$name."][type]";
return $frm->selectbox($fname, $array, $this->guess($name, $val),'required=1&class=null', true);
return $frm->select($fname, $array, $this->guess($name, $val),'required=1&class=null', true);
}

View File

@ -391,7 +391,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
<tr>
<td>".LAN_MAILOUT_110."<br /></td>
<td>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
<td class='form-inline'>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
<input name='testaddress' class='tbox' placeholder='user@yoursite.com' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
</td>
</tr>
@ -503,7 +503,7 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
'texthtml' => LAN_MAILOUT_126,
'texttheme' => LAN_MAILOUT_127
);
$text .= $frm->selectbox('mail_sendstyle', $emFormat, vartrue($pref['mail_sendstyle']));
$text .= $frm->select('mail_sendstyle', $emFormat, vartrue($pref['mail_sendstyle']));
$text .= "
</td>
</tr>
@ -731,9 +731,9 @@ $text .= "
<tr>
<td>Date/Time Input-Field format: </td>
<td>
".$frm->selectbox('inputdate',$inputdate, e107::getPref('inputdate'));
".$frm->select('inputdate',$inputdate, e107::getPref('inputdate'));
$text .= $frm->selectbox('inputtime',$inputtime, e107::getPref('inputtime'));
$text .= $frm->select('inputtime',$inputtime, e107::getPref('inputtime'));
$text .= "
</td>
@ -1495,7 +1495,7 @@ $text .= " <tr>
$text .= "
<td>".PRFLAN_178."</td>
<td>".$frm->selectbox('password_CHAP',$CHAP_list,$pref['password_CHAP'] );
<td>".$frm->select('password_CHAP',$CHAP_list,$pref['password_CHAP'] );
//." ".$frm->select_open('password_CHAP');
//TODO - user tracking session name - visible only if Cookie is enabled (JS)
@ -1623,7 +1623,7 @@ $text .= "
'asc' => "Most recent comments last"
);
$text .= $frm->selectbox('comments_sort',$comment_sort, $pref['comments_moderate'])."
$text .= $frm->select('comments_sort',$comment_sort, $pref['comments_moderate'])."
</td>
</tr>

View File

@ -249,7 +249,7 @@ class theme_builder
</colgroup>
<tr>
<td>Select your theme's folder</td>
<td>".$frm->selectbox("newtheme",$newDir)."</td>
<td>".$frm->select("newtheme",$newDir)."</td>
</tr>";
/*
@ -612,7 +612,7 @@ TEMPLATE;
sort($allowedCategories);
$text = $frm->selectbox($name, $allowedCategories,'','useValues=1&required=1', true);
$text = $frm->select($name, $allowedCategories,'','useValues=1&required=1', true);
break;

View File

@ -1255,7 +1255,7 @@ class users_admin_ui extends e_admin_ui
<tr>
<td>Notification and user status</td>
<td>
".$frm->selectbox('sendconfemail', array('0' => "Activate, Don't Notify", '1' => 'Activate, Notify (password)', '2' => 'Require Activation, Notify (password and activation link)'), (int) varset($_POST['sendconfemail'], 0))."
".$frm->select('sendconfemail', array('0' => "Activate, Don't Notify", '1' => 'Activate, Notify (password)', '2' => 'Require Activation, Notify (password and activation link)'), (int) varset($_POST['sendconfemail'], 0))."
<div class='field-help'>".USRLAN_181."</div>
</td>
</tr>";
@ -1895,7 +1895,7 @@ class users_admin_form_ui extends e_admin_form_ui
if($mode == 'write')
{
$frm = e107::getForm();
return $frm->selectbox('user_ban',$bo,$curval);
return $frm->select('user_ban',$bo,$curval);
}
return vartrue($bo[$curval],' '); // ($curval == 1) ? ADMIN_TRUE_ICON : '';
@ -1916,7 +1916,7 @@ class users_admin_form_ui extends e_admin_form_ui
if($mode == 'write') //FIXME userclasses are NOT be saved since they are an array.
{
return $frm->selectbox('user_class', $list, $curval, 'description=1&multiple=1');
return $frm->select('user_class', $list, $curval, 'description=1&multiple=1');
// return $frm->uc_select('user_class[]', $curval, 'admin,classes', 'description=1&multiple=1');// doesn't work correctly.
}

View File

@ -758,7 +758,7 @@ class users_ext
<select class='tbox e-select' name='user_required'>
";
$_r = array('0' => EXTLAN_65, '1' => EXTLAN_66, '2' => EXTLAN_67);
foreach($_r as $k => $v) //FIXME change to $frm->selectbox()
foreach($_r as $k => $v) //FIXME change to $frm->select()
{
$sel = (varset($current['user_extended_struct_required']) == $k ? " selected='selected' " : "");
$text .= "<option value='{$k}' {$sel}>{$v}</option>\n";

View File

@ -602,7 +602,7 @@ class admin_shortcodes
if(!e107::isInstalled('pm')) return;
$sql = e107::getDb();
$count = $sql->count('private_msg','(*)','WHERE pm_read = 0');
$count = $sql->count('private_msg','(*)','WHERE pm_read = 0 AND pm_to='.USERID);
if ($count >0)
{

View File

@ -2132,7 +2132,7 @@ class e_admin_controller
//prevent cache
header('Cache-Control: private, no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
header('Pragma: no-cache');
// header('Pragma: no-cache');
$url = $path.'?'.$request->buildQueryString($merge_query, false, $exclude_query);
// Transfer all messages to session

View File

@ -844,7 +844,13 @@ class e_form
{
if(is_string($options)) parse_str($options, $options);
// auto-height support
if(!vartrue($options['noresize']))
if(vartrue($options['size']) && !is_numeric($options['size']))
{
$options['class'] .= " input-".$options['size'];
unset($options['size']); // don't include in html 'size='.
}
elseif(!vartrue($options['noresize']))
{
$options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox span7 e-autoheight';
}
@ -1211,6 +1217,17 @@ class e_form
return "<select name='{$name}'".$this->get_attributes($options, $name).">";
}
/**
* @DEPRECATED - use select() instead.
*/
function selectbox($name, $option_array, $selected = false, $options = array(), $defaultBlank= false)
{
return $this->select($name, $option_array, $selected, $options, $defaultBlank);
}
/**
*
* @param string $name
@ -1220,7 +1237,7 @@ class e_form
* @param boolean|string $defaultBlank [optional] set to TRUE if the first entry should be blank, or to a string to use it for the blank description.
* @return string HTML text for display
*/
function selectbox($name, $option_array, $selected = false, $options = array(), $defaultBlank= false)
function select($name, $option_array, $selected = false, $options = array(), $defaultBlank= false)
{
if(!is_array($options)) parse_str($options, $options);

View File

@ -783,7 +783,7 @@ class mailoutAdminClass extends e107MailManager
* @param $name name of item
* @return text for display
*/
//FIXME use $frm->selectbox() instead.
//FIXME use $frm->select() instead.
public function sendStyleSelect($curval = '', $name = 'email_send_style', $incTemplates = TRUE)
{

View File

@ -275,7 +275,7 @@ class core_mailout
$u_array = array('user_name'=>LAN_MAILOUT_43,'user_login'=>LAN_MAILOUT_44,'user_email'=>LAN_MAILOUT_45);
$var[0]['html'] = $admin->userClassesTotals('email_to', varset($selectVals['email_to'], ''));
$var[1]['html'] = $frm->selectbox('user_search_name', $u_array, varset($selectVals['user_search_name'], ''),'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', varset($selectVals['user_search_value'], ''));
$var[1]['html'] = $frm->select('user_search_name', $u_array, varset($selectVals['user_search_name'], ''),'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', varset($selectVals['user_search_value'], ''));
//$var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$frm->text('last_visit_date', varset($selectVals['last_visit_date'], 0));
$var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$admin->makeCalendar('last_visit_date', varset($selectVals['last_visit_date'], 0));
$var[1]['caption'] = LAN_MAILOUT_46; // User Search Field.

View File

@ -331,7 +331,7 @@ class plugin_blank_admin_form_ui extends e_admin_form_ui
return $types;
}
return $frm->selectbox('blank_type', $types, $curVal);
return $frm->select('blank_type', $types, $curVal);
}
}

View File

@ -352,7 +352,7 @@ if ($action == "create")
if (count($campaigns))
{
$text .= $frm->selectbox('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT);
$text .= $frm->select('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT);
$text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign'));
}
else
@ -370,7 +370,7 @@ if ($action == "create")
if (count($clients))
{
$text .= $frm->selectbox('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT);
$text .= $frm->select('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT);
$text .= $frm->text('client_name','','',array('placeholder'=> 'Or enter a new client'));

View File

@ -97,7 +97,7 @@ $text = "
</colgroup>
<tr>
<td>".CHBLAN_11.":</td>
<td>".$frm->selectbox('chatbox_posts', array(5, 10, 15, 20, 25), $pref['chatbox_posts'])."<span class='field-help'>".CHBLAN_12."</span></td>
<td>".$frm->select('chatbox_posts', array(5, 10, 15, 20, 25), $pref['chatbox_posts'])."<span class='field-help'>".CHBLAN_12."</span></td>
</tr>
<tr>
<td>".CHBLAN_32.": </td>
@ -120,7 +120,7 @@ $text = "
$text .= "
<tr>
<td>".LAN_PRUNE.":</td>
<td>".CHBLAN_23.$frm->selectbox('chatbox_prune', array(86400 => CHBLAN_24, 604800 => CHBLAN_25, 2592000 => CHBLAN_26, 1 => CHBLAN_27), '', '', true).$frm->admin_button('prune', LAN_PRUNE, 'other')."<span class='field-help'>".CHBLAN_22."</span></td>
<td>".CHBLAN_23.$frm->select('chatbox_prune', array(86400 => CHBLAN_24, 604800 => CHBLAN_25, 2592000 => CHBLAN_26, 1 => CHBLAN_27), '', '', true).$frm->admin_button('prune', LAN_PRUNE, 'other')."<span class='field-help'>".CHBLAN_22."</span></td>
</tr>
<tr>
<td>".CHBLAN_34.":</td>

View File

@ -1510,11 +1510,11 @@ class adminDownload extends download
</tr>
<tr>
<td>".DOWLAN_56."</td>
<td>".$frm->selectbox('download_order', $order_options, $pref['download_order'])."</td>
<td>".$frm->select('download_order', $order_options, $pref['download_order'])."</td>
</tr>
<tr>
<td>".LAN_ORDER."</td>
<td>".$frm->selectbox('download_sort', $sort_options, $pref['download_sort'])."</td>
<td>".$frm->select('download_sort', $sort_options, $pref['download_sort'])."</td>
</tr>
<tr>
<td>".DOWLAN_160."</td>

View File

@ -1986,11 +1986,11 @@ $columnInfo = array(
</tr>
<tr>
<td>".DOWLAN_56."</td>
<td>".$frm->selectbox('download_order', $order_options, $pref['download_order'])."</td>
<td>".$frm->select('download_order', $order_options, $pref['download_order'])."</td>
</tr>
<tr>
<td>".LAN_ORDER."</td>
<td>".$frm->selectbox('download_sort', $sort_options, $pref['download_sort'])."</td>
<td>".$frm->select('download_sort', $sort_options, $pref['download_sort'])."</td>
</tr>
<tr>
<td>".DOWLAN_160."</td>

View File

@ -229,7 +229,7 @@ class html_import extends base_import_class
$text .= "
<td>
".$frm->selectbox('add__'.$key,array('news'=>'News','page'=>'Page','0'=>'Ignore'))."
".$frm->select('add__'.$key,array('news'=>'News','page'=>'Page','0'=>'Ignore'))."
</td>
</tr>";
}

View File

@ -45,7 +45,7 @@ $text = "
</colgroup>
<tr>
<td>".NFPM_L4."</td>
<td>".$frm->selectbox('nfp_display', array(0 => NFPM_L5, 1 => NFPM_L6, 2 => NFPM_L7), $pref['nfp_display'])."</td>
<td>".$frm->select('nfp_display', array(0 => NFPM_L5, 1 => NFPM_L6, 2 => NFPM_L7), $pref['nfp_display'])."</td>
</tr>
<tr>
<td>".NFPM_L8.":</td>

View File

@ -146,7 +146,7 @@ class rss_form_ui extends e_admin_form_ui
break;
case 'write': // Edit Page
return $frm->selectbox('rss_class',$array, $curVal);
return $frm->select('rss_class',$array, $curVal);
break;
case 'filter':

View File

@ -439,7 +439,7 @@ class e_bootstrap
$sel = array(''=>'Dark Gray','icon-white'=>'White');
$text .= "<div class='area'>";
$text .= "<div class='inline-form'>Color: ".$frm->selectbox('glyph-color',$sel)." Custom: ".$frm->text('glyph-custom','').$frm->button('glyph-save','Go')."</div>";
$text .= "<div class='inline-form'>Color: ".$frm->select('glyph-color',$sel)." Custom: ".$frm->text('glyph-custom','').$frm->button('glyph-save','Go')."</div>";
$text .= "<ul class='glyphicons well clearfix'>";