mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Banner GUI fixes.

Browse Source
This commit is contained in:
Cameron
2013-03-16 21:20:39 -07:00
parent 1830401b08
commit 8ae11ba079
2 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/form_handler.php
View File

@@ -1166,7 +1166,7 @@ class e_form
* @param array $option_array * @param array $option_array
* @param boolean $selected [optional] * @param boolean $selected [optional]
* @param string|array $options [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 * @return string HTML text for display
*/ */
function selectbox($name, $option_array, $selected = false, $options = array(), $defaultBlank= false) function selectbox($name, $option_array, $selected = false, $options = array(), $defaultBlank= false)
@@ -1192,7 +1192,8 @@ class e_form
} }
elseif($defaultBlank) elseif($defaultBlank)
{ {
$text .= $this->option(' ', ''); $diz = is_string($defaultBlank) ? $defaultBlank : ' ';
$text .= $this->option($diz, '');
} }
if(varset($options['useValues'])) // use values as keys. if(varset($options['useValues'])) // use values as keys.

110
e107_plugins/banner/admin_banner.php
View File

@@ -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) { if (strpos($banner_row['banner_campaign'], "^") !== FALSE) {
$campaignsplit = explode("^", $banner_row['banner_campaign']); $campaignsplit = explode("^", $banner_row['banner_campaign']);
$banner_row['banner_campaign'] = $campaignsplit[0]; $banner_row['banner_campaign'] = $campaignsplit[0];
} }
if ($banner_row['banner_campaign']) { if ($banner_row['banner_campaign'])
$campaigns[] = $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']; $logins[] = $banner_row['banner_clientlogin'];
} }
if ($banner_row['banner_clientpassword']) {
if ($banner_row['banner_clientpassword'])
{
$passwords[] = $banner_row['banner_clientpassword']; $passwords[] = $banner_row['banner_clientpassword'];
} }
} }
@@ -187,7 +194,7 @@ if ($sql->db_Select("banner"))
if (!$action) if (!$action)
{ {
if (!$banner_total = $sql->db_Select("banner")) if (!$banner_total = $sql->select("banner"))
{ {
$mes->addInfo(BNRLAN_00); $mes->addInfo(BNRLAN_00);
} }
@@ -220,7 +227,8 @@ if (!$action)
</thead> </thead>
<tbody>"; <tbody>";
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)."%" : "-"); $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); $impressions_left = ($banner_row['banner_impurchased'] ? $banner_row['banner_impurchased'] - $banner_row['banner_impressions'] : BNRLAN_6);
@@ -256,10 +264,10 @@ if (!$action)
<td class='center'>".$clickpercentage."</td> <td class='center'>".$clickpercentage."</td>
<td class='center'>".$impressions_purchased."</td> <td class='center'>".$impressions_purchased."</td>
<td class='center'>".$impressions_left."</td> <td class='center'>".$impressions_left."</td>
<td class='center'> <td class='center options'>
<a href='".e_SELF."?create.edit.".$banner_row['banner_id']."'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-large' href='".e_SELF."?create.edit.".$banner_row['banner_id']."'>".ADMIN_EDIT_ICON."</a>
<a class='action delete' id='banner-delete-{$banner_row['banner_id']}' href='".e_SELF."?delete.".$banner_row['banner_id']."' rel='no-confirm' title='".LAN_CONFDELETE."'>".ADMIN_DELETE_ICON."</a> <a class='btn btn-large action delete' id='banner-delete-{$banner_row['banner_id']}' href='".e_SELF."?delete.".$banner_row['banner_id']."' rel='no-confirm' title='".LAN_CONFDELETE."'>".ADMIN_DELETE_ICON."</a>
</td> </td>
</tr> </tr>
"; ";
@@ -293,13 +301,13 @@ if ($action == "create")
{ {
if ($sub_action == "edit" && $id) 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); $mes->addWarning(BNRLAN_01);
} }
else else
{ {
while ($banner_row = $sql->db_Fetch()) while ($banner_row = $sql->fetch())
{ {
$_POST['client_name'] = $banner_row['banner_clientname']; $_POST['client_name'] = $banner_row['banner_clientname'];
$_POST['client_login'] = $banner_row['banner_clientlogin']; $_POST['client_login'] = $banner_row['banner_clientlogin'];
@@ -356,47 +364,36 @@ if ($action == "create")
<td> <td>
"; ";
if (count($campaigns)) {
$for_var = array();
$text .= "
<div class='field-spacer'>
<select name='banner_campaign_sel' id='banner_campaign_sel' class='tbox'>
<option>".LAN_SELECT."</option>
";
$c = 0;
while ($campaigns[$c]) {
if (!isset($for_var[$campaigns[$c]])) {
$text .= "<option".(($_POST['banner_campaign'] == $campaigns[$c]) ? " selected='selected'" : "").">".$campaigns[$c]."</option>";
$for_var[$campaigns[$c]] = $campaigns[$c];
}
$c++;
}
unset($for_var);
//TODO - ajax add campaign - FIXME currently not working as intended
$text .= "
</select> ".$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;\""))."
</div>
<div class='field-spacer e-hideme' id='add-new-campaign-cont'> if (count($campaigns))
<input class='tbox' type='text' size='30' maxlength='100' name='banner_campaign' value='' /> {
<span class='field-help'>".BNRLAN_26."</span> $text .= $frm->selectbox('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT);
</div> $text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign'));
";
} }
else else
{ {
$text .= "<input class='tbox' type='text' size='30' maxlength='100' name='banner_campaign' value='' />"; $text .= $frm->text('banner_campaign');
} }
$text .= " $text .= "<span class='field-help'>".BNRLAN_25."</span>
<span class='field-help'>".BNRLAN_25."</span></td> </td>
</tr> </tr>
<tr>
<td>".BNRLAN_1."</td> <tr>
<td> <td>".BNRLAN_1."</td>
<td>
"; ";
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 .= " $text .= "
<div class='field-spacer'> <div class='field-spacer'>
<select name='banner_client_sel' id='banner_client_sel' class='tbox' onchange=\"Banner_Change_Details()\"> <select name='banner_client_sel' id='banner_client_sel' class='tbox' onchange=\"Banner_Change_Details()\">
<option>".LAN_SELECT."</option> <option>".LAN_SELECT."</option>
@@ -452,13 +449,14 @@ if ($action == "create")
} }
</script> </script>
"; ";
*/
} }
else else
{ {
$text .= "
<input class='tbox' type='text' size='30' maxlength='100' name='client_name' value='' /> $text .= $frm->text('client_name',$_POST['client_name']);
<span class='field-help'>".BNRLAN_29."</span> $text .= "<span class='field-help'>".BNRLAN_29."</span>";
";
} }
$text .= " $text .= "
@@ -470,7 +468,7 @@ if ($action == "create")
</tr> </tr>
<tr> <tr>
<td>".BNRLAN_13."</td> <td>".BNRLAN_13."</td>
<td>".$frm->text('client_password', $_POST['client_password'], '50')."</td> <td>".$frm->password('client_password', $_POST['client_password'], '50','strength=1&generate=1&required=0')."</td>
</tr> </tr>
<tr> <tr>
<td>".BNRLAN_14."</td> <td>".BNRLAN_14."</td>
@@ -554,7 +552,9 @@ if ($action == "create")
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class='buttons-bar center'>"; <div class='buttons-bar center'>";
if ($sub_action == "edit" && $id) if ($sub_action == "edit" && $id)
{ {
$text .= $frm->admin_button('updatebanner','no-value','create', LAN_UPDATE); $text .= $frm->admin_button('updatebanner','no-value','create', LAN_UPDATE);
@@ -587,8 +587,8 @@ if ($action == "menu")
$menu_pref['banner_caption'] = BNRLAN_38; $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"); $category_total = $sql -> select("banner", "DISTINCT(banner_campaign) as banner_campaign", "ORDER BY banner_campaign", "mode=no_where");
while ($banner_row = $sql -> db_Fetch()) while ($banner_row = $sql -> fetch())
{ {
$all_catname[] = $banner_row['banner_campaign']; $all_catname[] = $banner_row['banner_campaign'];