diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php index 4d4f62767..bb4e1ca1b 100644 --- a/e107_plugins/banner/admin_banner.php +++ b/e107_plugins/banner/admin_banner.php @@ -41,7 +41,7 @@ $mes = e107::getMessage(); $tp = e107::getParser(); include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_admin_banner.php'); -include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_menu_banner.php'); +//include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_menu_banner.php'); if(e_QUERY) @@ -90,14 +90,14 @@ if (isset($_POST['update_menu'])) if (vartrue($_POST['createbanner']) || vartrue($_POST['updatebanner'])) { - $start_date = (!$_POST['startmonth'] || !$_POST['startday'] || !$_POST['startyear'] ? 0 : mktime (0, 0, 0, $_POST['startmonth'], $_POST['startday'], $_POST['startyear'])); - $end_date = (!$_POST['endmonth'] || !$_POST['endday'] || !$_POST['endyear'] ? 0 : mktime (0, 0, 0, $_POST['endmonth'], $_POST['endday'], $_POST['endyear'])); - $cli = $tp->toDB($_POST['client_name'] ? $_POST['client_name'] : $_POST['banner_client_sel']); - $cLogin = $tp->toDB($_POST['client_login']); - $cPassword = $tp->toDB($_POST['client_password']); - $banImage = $tp->toDB($_POST['banner_image']); - $banURL = $tp->toDB($_POST['click_url']); - $cam = $tp->toDB($_POST['banner_campaign'] ? $_POST['banner_campaign'] : $_POST['banner_campaign_sel']); + $start_date = (!$_POST['startmonth'] || !$_POST['startday'] || !$_POST['startyear'] ? 0 : mktime (0, 0, 0, $_POST['startmonth'], $_POST['startday'], $_POST['startyear'])); + $end_date = (!$_POST['endmonth'] || !$_POST['endday'] || !$_POST['endyear'] ? 0 : mktime (0, 0, 0, $_POST['endmonth'], $_POST['endday'], $_POST['endyear'])); + $cli = $tp->toDB($_POST['client_name'] ? $_POST['client_name'] : $_POST['banner_client_sel']); + $cLogin = $tp->toDB($_POST['client_login']); + $cPassword = $tp->toDB($_POST['client_password']); + $banImage = $tp->toDB($_POST['banner_image']); + $banURL = $tp->toDB($_POST['click_url']); + $cam = $tp->toDB($_POST['banner_campaign'] ? $_POST['banner_campaign'] : $_POST['banner_campaign_sel']); /* FIXME - can be removed? if ($_POST['banner_pages']) @@ -150,6 +150,8 @@ if (vartrue($action) == "delete" && $sub_action && varsettrue($_POST['delete_con { $mes->addSuccess(LAN_DELETED); banners_adminlog('04','Id: '.intval($sub_action)); + header('Location:'.e_SELF); + exit; } else // delete failed - redirect back to 'manage' and display message { @@ -206,8 +208,15 @@ if ($sql->db_Select("banner")) } -if (!$action) { - $text = " +if (!$action) +{ + if (!$banner_total = $sql->db_Select("banner")) + { + $mes->addInfo(BNRLAN_00); + } + else + { + $text = "
".LAN_MANAGE." @@ -224,25 +233,21 @@ if (!$action) { ".LAN_ID." - ".BNRLAN_9." - ".BNRLAN_10." - ".BNRLAN_11." - ".BNRLAN_12." - ".BNRLAN_13." - ".LAN_OPTIONS." + ".BNRLAN_1." + ".BNRLAN_2." + ".BNRLAN_3." + ".BNRLAN_4." + ".BNRLAN_5." + ".LAN_OPTIONS." - - "; + "; - if (!$banner_total = $sql->db_Select("banner")) { - $text .= "".BNRLAN_15.""; - } else { while ($banner_row = $sql->db_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_16); - $impressions_purchased = ($banner_row['banner_impurchased'] ? $banner_row['banner_impurchased'] : BNRLAN_16); + $impressions_left = ($banner_row['banner_impurchased'] ? $banner_row['banner_impurchased'] - $banner_row['banner_impressions'] : BNRLAN_6); + $impressions_purchased = ($banner_row['banner_impurchased'] ? $banner_row['banner_impurchased'] : BNRLAN_6); $start_date = ($banner_row['banner_startdate'] ? strftime("%d %B %Y", $banner_row['banner_startdate']) : LAN_NONE); $end_date = ($banner_row['banner_enddate'] ? strftime("%d %B %Y", $banner_row['banner_enddate']) : LAN_NONE); @@ -259,14 +264,14 @@ if (!$action) { ".$banner_row['banner_id']." - - ".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_66)." + + ".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_8)." @@ -280,7 +285,7 @@ if (!$action) { - "; + "; } } $text .= " @@ -307,15 +312,18 @@ if (!$action) { $ns->tablerender(LAN_PLUGIN_BANNER_NAME.SEP.LAN_MANAGE, $mes->render() . $text); } -if ($action == "create") { - - if ($sub_action == "edit" && $id) { - - if (!$sql->db_Select("banner", "*", "banner_id = '".$id."' " )) { - $text .= "
".BNRLAN_15."
"; - } else { - while ($banner_row = $sql->db_Fetch()) { - +if ($action == "create") +{ + if ($sub_action == "edit" && $id) + { + if (!$sql->db_Select("banner", "*", "banner_id = '".$id."'")) // FIXME check not working for some reason + { + $mes->addWarning(BNRLAN_01); + } + else + { + while ($banner_row = $sql->db_Fetch()) + { $_POST['client_name'] = $banner_row['banner_clientname']; $_POST['client_login'] = $banner_row['banner_clientlogin']; $_POST['client_password'] = $banner_row['banner_clientpassword']; @@ -363,7 +371,7 @@ if ($action == "create") { - ".BNRLAN_24." + ".BNRLAN_11." "; @@ -385,7 +393,7 @@ if ($action == "create") { unset($for_var); //TODO - ajax add campaign - FIXME currently not working as intended $text .= " - ".$frm->admin_button('add_new_campaign', BNRLAN_26a, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-campaign-cont', false); \$('banner_campaign_sel').selectedIndex=0; return false;\""))." + ".$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;\""))."
@@ -402,7 +410,7 @@ if ($action == "create") { ".BNRLAN_25." - ".BNRLAN_27." + ".BNRLAN_1." "; @@ -423,7 +431,7 @@ if ($action == "create") { unset($for_var); //TODO - ajax add client FIXME - currently not working as intended $text .= " - ".$frm->admin_button('add_new_client', BNRLAN_29a, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-client-cont', false); \$('banner_client_sel').selectedIndex=0; return false;\""))." + ".$frm->admin_button('add_new_client', BNRLAN_30, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-client-cont', false); \$('banner_client_sel').selectedIndex=0; return false;\""))."
@@ -476,22 +484,22 @@ if ($action == "create") { ".BNRLAN_28." - ".BNRLAN_30." + ".BNRLAN_12." - ".BNRLAN_31." + ".BNRLAN_13." - ".BNRLAN_32." + ".BNRLAN_14."
- +
-
- "; + "; $ns->tablerender(LAN_PLUGIN_BANNER_NAME.SEP.($sub_action == "edit" ? LAN_UPDATE : LAN_CREATE), $text); @@ -652,7 +659,7 @@ if ($action == "menu") $array_cat_in = explode("|", $menu_pref['banner_campaign']); if (!$menu_pref['banner_caption']) { - $menu_pref['banner_caption'] = BANNER_MENU_L1; + $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"); @@ -670,7 +677,7 @@ if ($action == "menu") $text = "