Merge remote-tracking branch 'svnexport/master'

list-virtual.php

@@ -434,7 +434,8 @@ if(empty($_GET['domain'])) {
     $_GET['domain'] = '';
 }
 $smarty->assign ('admin_list', array());
-$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false);
+$smarty->assign ('domain_list', $list_domains);
+$smarty->assign ('domain_selected', $fDomain);
 $smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()), false);
 $smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()), false);
 

smarty.inc.php

@@ -75,16 +75,6 @@ $smarty->assign ('version', $version);
 $smarty->assign ('boolconf_alias_domain', Config::bool('alias_domain'));
 $smarty->assign ('authentication_has_role', array ('global_admin' => authentication_has_role ('global-admin'), 'admin' => authentication_has_role ('admin'), 'user' => authentication_has_role ('user')));
 
-function select_options($aValues, $aSelected) {
-    $ret_val = '';
-    foreach ($aValues as $val) {
-        $ret_val .= '<option value="'.htmlentities($val).'"';
-        if (in_array ($val, $aSelected))
-            $ret_val .= ' selected="selected"';
-        $ret_val .= '>'.htmlentities($val).'</option>';
-    }
-    return $ret_val;
-}
 function eval_size ($aSize) {
 	if ($aSize == 0)	{$ret_val = Config::Lang('pOverview_unlimited'); }
 	elseif ($aSize < 0)	{$ret_val = Config::Lang('pOverview_disabled');  }

templates/list-virtual.tpl

@@ -1,9 +1,7 @@
 {assign var="file" value=$smarty.config.url_list_virtual}
 <div id="overview">
 <form name="frmOverview" method="get" action="{$smarty.config.url_list_virtual}">
-	<select name="domain" onchange="this.form.submit();">
-		{$select_options}
-	</select>
+	{html_options name='domain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
 	<input type="hidden" name="limit" value="0" />
 	<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
 </form>

templates/viewlog.tpl

@@ -1,6 +1,6 @@
 <div id="overview">
 <form name="frmOverview" method="post" action="">
-	<select name="fDomain" onchange="this.form.submit();">{$select_options}</select>
+	{html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
 	<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}" /></noscript>
 </form>
 </div>

viewlog.php

@@ -77,7 +77,8 @@ if ($error != 1)
 for ($i = 0; $i < count ($tLog); $i++)
 	$tLog[$i]['action'] = $PALANG ['pViewlog_action_'.$tLog [$i]['action']];
 
-$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false);
+$smarty->assign ('domain_list', $list_domains);
+$smarty->assign ('domain_selected', $fDomain);
 $smarty->assign ('tLog', $tLog,false);
 $smarty->assign ('fDomain', $fDomain);
 $smarty->assign ('smarty_template', 'viewlog');