diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 8db7400b2..83d6d8c12 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1166,7 +1166,7 @@ class e_form * @param array $option_array * @param boolean $selected [optional] * @param string|array $options [optional] - * @param boolean $defaultBlank [optional] set to TRUE if the first entry should be blank + * @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) @@ -1192,7 +1192,8 @@ class e_form } elseif($defaultBlank) { - $text .= $this->option(' ', ''); + $diz = is_string($defaultBlank) ? $defaultBlank : ' '; + $text .= $this->option($diz, ''); } if(varset($options['useValues'])) // use values as keys. diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php index 6fe51abf8..628b5f08b 100644 --- a/e107_plugins/banner/admin_banner.php +++ b/e107_plugins/banner/admin_banner.php @@ -160,25 +160,32 @@ elseif ($action == "delete" && $sub_action) // confirm delete } -if ($sql->db_Select("banner")) +if ($sql->select("banner")) { - while ($banner_row = $sql->db_Fetch()) + while ($banner_row = $sql->fetch()) { if (strpos($banner_row['banner_campaign'], "^") !== FALSE) { $campaignsplit = explode("^", $banner_row['banner_campaign']); $banner_row['banner_campaign'] = $campaignsplit[0]; } - if ($banner_row['banner_campaign']) { - $campaigns[] = $banner_row['banner_campaign']; + if ($banner_row['banner_campaign']) + { + $campaigns[$banner_row['banner_campaign']] = $banner_row['banner_campaign']; } - if ($banner_row['banner_clientname']) { - $clients[] = $banner_row['banner_clientname']; + + if ($banner_row['banner_clientname']) + { + $clients[$banner_row['banner_clientname']] = $banner_row['banner_clientname']; } - if ($banner_row['banner_clientlogin']) { + + if ($banner_row['banner_clientlogin']) + { $logins[] = $banner_row['banner_clientlogin']; } - if ($banner_row['banner_clientpassword']) { + + if ($banner_row['banner_clientpassword']) + { $passwords[] = $banner_row['banner_clientpassword']; } } @@ -187,7 +194,7 @@ if ($sql->db_Select("banner")) if (!$action) { - if (!$banner_total = $sql->db_Select("banner")) + if (!$banner_total = $sql->select("banner")) { $mes->addInfo(BNRLAN_00); } @@ -220,7 +227,8 @@ if (!$action) "; - while ($banner_row = $sql->db_Fetch()) { + while ($banner_row = $sql->fetch()) + { $clickpercentage = ($banner_row['banner_clicks'] && $banner_row['banner_impressions'] ? round(($banner_row['banner_clicks'] / $banner_row['banner_impressions']) * 100)."%" : "-"); $impressions_left = ($banner_row['banner_impurchased'] ? $banner_row['banner_impurchased'] - $banner_row['banner_impressions'] : BNRLAN_6); @@ -256,10 +264,10 @@ if (!$action) ".$clickpercentage." ".$impressions_purchased." ".$impressions_left." - + - ".ADMIN_EDIT_ICON." - + ".ADMIN_EDIT_ICON." + "; @@ -293,13 +301,13 @@ if ($action == "create") { if ($sub_action == "edit" && $id) { - if (!$sql->db_Select("banner", "*", "banner_id = '".$id."'")) // FIXME check not working for some reason + if (!$sql->select("banner", "*", "banner_id = '".$id."'")) // FIXME check not working for some reason { $mes->addWarning(BNRLAN_01); } else { - while ($banner_row = $sql->db_Fetch()) + while ($banner_row = $sql->fetch()) { $_POST['client_name'] = $banner_row['banner_clientname']; $_POST['client_login'] = $banner_row['banner_clientlogin']; @@ -356,47 +364,36 @@ if ($action == "create") "; - if (count($campaigns)) { - $for_var = array(); - $text .= " -
- ".$frm->admin_button('add_new_campaign', BNRLAN_27, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-campaign-cont', false); \$('banner_campaign_sel').selectedIndex=0; return false;\""))." -
-
- - ".BNRLAN_26." -
- "; + if (count($campaigns)) + { + $text .= $frm->selectbox('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT); + $text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign')); } else { - $text .= ""; + $text .= $frm->text('banner_campaign'); } - $text .= " - ".BNRLAN_25." - - - ".BNRLAN_1." - + $text .= "".BNRLAN_25." + + + + + ".BNRLAN_1." + "; - if (count($clients)) { + if (count($clients)) + { + $text .= $frm->selectbox('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT); + $text .= $frm->text('client_name','','',array('placeholder'=> 'Or enter a new client')); + + + /* + + $text .= " +
- ".BNRLAN_29." - "; + + $text .= $frm->text('client_name',$_POST['client_name']); + $text .= "".BNRLAN_29.""; } $text .= " @@ -470,7 +468,7 @@ if ($action == "create") ".BNRLAN_13." - ".$frm->text('client_password', $_POST['client_password'], '50')." + ".$frm->password('client_password', $_POST['client_password'], '50','strength=1&generate=1&required=0')." ".BNRLAN_14." @@ -554,7 +552,9 @@ if ($action == "create") +
"; + if ($sub_action == "edit" && $id) { $text .= $frm->admin_button('updatebanner','no-value','create', LAN_UPDATE); @@ -587,8 +587,8 @@ if ($action == "menu") $menu_pref['banner_caption'] = BNRLAN_38; } - $category_total = $sql -> db_Select("banner", "DISTINCT(banner_campaign) as banner_campaign", "ORDER BY banner_campaign", "mode=no_where"); - while ($banner_row = $sql -> db_Fetch()) + $category_total = $sql -> select("banner", "DISTINCT(banner_campaign) as banner_campaign", "ORDER BY banner_campaign", "mode=no_where"); + while ($banner_row = $sql -> fetch()) { $all_catname[] = $banner_row['banner_campaign'];