From 12cb34d153eb946b4ef520044a4d5f770c83c87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vale=CC=81rian=20Saliou?= Date: Sat, 2 May 2015 11:28:36 +0200 Subject: Replace BackLinks content ads (now defunct) w/ DO link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Valérian Saliou --- app/images/banners/digitalocean.png | Bin 0 -> 4132 bytes i18n/en/LC_MESSAGES/main.pot | 3 --- server/desktop.php | 8 +++++--- server/form-main.php | 4 +--- server/functions-advertising.php | 19 +++++++------------ server/post-main.php | 8 -------- server/read-main.php | 4 +--- server/vars-main.php | 1 - 8 files changed, 14 insertions(+), 33 deletions(-) create mode 100644 app/images/banners/digitalocean.png diff --git a/app/images/banners/digitalocean.png b/app/images/banners/digitalocean.png new file mode 100644 index 00000000..dcfb059c Binary files /dev/null and b/app/images/banners/digitalocean.png differ diff --git a/i18n/en/LC_MESSAGES/main.pot b/i18n/en/LC_MESSAGES/main.pot index 21aa7f68..d2c7e221 100644 --- a/i18n/en/LC_MESSAGES/main.pot +++ b/i18n/en/LC_MESSAGES/main.pot @@ -2046,9 +2046,6 @@ msgstr "" msgid "Standard ads key" msgstr "" -msgid "Content ads key" -msgstr "" - msgid "AdSense client ID" msgstr "" diff --git a/server/desktop.php b/server/desktop.php index ed9c8a3e..ea31f26b 100644 --- a/server/desktop.php +++ b/server/desktop.php @@ -112,14 +112,16 @@ if(!anonymousMode() && !httpAuthEnabled()) { ?> - +
- + + +
@@ -128,7 +130,7 @@ if(!anonymousMode() && !httpAuthEnabled()) { ?>
- +
diff --git a/server/form-main.php b/server/form-main.php index fe62d8df..f1e2a34f 100644 --- a/server/form-main.php +++ b/server/form-main.php @@ -215,12 +215,10 @@ if($ads_enable == 'on') { -
+
- -
diff --git a/server/functions-advertising.php b/server/functions-advertising.php index df2f502e..a06c4cc4 100644 --- a/server/functions-advertising.php +++ b/server/functions-advertising.php @@ -14,16 +14,11 @@ Author: Valérian Saliou */ -// Get the adverts for the given advertising type -function getAdverts($type) { +// Get the adverts +function getAdverts() { // Available pages - if($type == 'content') { - $script = 'enginec.php'; - $key = ADS_CONTENT; - } else { - $script = 'engine.php'; - $key = ADS_STANDARD; - } + $script = 'engine.php'; + $key = ADS_STANDARD; // Not available? if(!$key) { @@ -58,10 +53,10 @@ function getAdverts($type) { return $code; } -// Display the adverts for the given advertising type -function displayAdverts($type, $refer) { +// Display the adverts +function displayAdverts($refer) { // Get content ads - $ads_content = getAdverts($type); + $ads_content = getAdverts(); if(strpos(strtolower($ads_content), '')) { echo($ads_content); diff --git a/server/post-main.php b/server/post-main.php index 591e3156..1f4ced1e 100644 --- a/server/post-main.php +++ b/server/post-main.php @@ -191,13 +191,6 @@ if(isset($_POST['ads_standard']) && !empty($_POST['ads_standard'])) { $ads_standard = stripslashes(htmlspecialchars($main_default['ads_standard'])); } -// Advertising (content) -if(isset($_POST['ads_content']) && !empty($_POST['ads_content'])) { - $ads_content = stripslashes(htmlspecialchars(trim($_POST['ads_content']))); -} else { - $ads_content = stripslashes(htmlspecialchars($main_default['ads_content'])); -} - // Google AdSense Client ID if(isset($_POST['gads_client']) && !empty($_POST['gads_client'])) { $gads_client = stripslashes(htmlspecialchars(trim($_POST['gads_client']))); @@ -273,7 +266,6 @@ $conf_xml = '.$analytics_id.' '.$ads_enable.' '.$ads_standard.' - '.$ads_content.' '.$gads_client.' '.$gads_slot.' '.$multi_files.' diff --git a/server/read-main.php b/server/read-main.php index a2401b19..4c728e56 100644 --- a/server/read-main.php +++ b/server/read-main.php @@ -43,7 +43,6 @@ $main_conf = array( 'analytics_id' => '', 'ads_enable' => 'off', 'ads_standard' => '', - 'ads_content' => '', 'gads_client' => '', 'gads_slot' => '', 'multi_files' => 'off', @@ -101,7 +100,6 @@ define('ANALYTICS_URL', $main_conf['analytics_url']); define('ANALYTICS_ID', $main_conf['analytics_id']); define('ADS_ENABLE', $main_conf['ads_enable']); define('ADS_STANDARD', $main_conf['ads_standard']); -define('ADS_CONTENT', $main_conf['ads_content']); define('GADS_CLIENT', $main_conf['gads_client']); define('GADS_SLOT', $main_conf['gads_slot']); define('MULTI_FILES', $main_conf['multi_files']); @@ -111,4 +109,4 @@ define('REGISTER_API', $main_conf['register_api']); define('XMPPD_CTL', $main_conf['xmppd_ctl']); define('XMPPD', $main_conf['xmppd']); -?> \ No newline at end of file +?> diff --git a/server/vars-main.php b/server/vars-main.php index ef3ef551..425e045e 100644 --- a/server/vars-main.php +++ b/server/vars-main.php @@ -42,7 +42,6 @@ $analytics_url = htmlspecialchars(ANALYTICS_URL); $analytics_id = htmlspecialchars(ANALYTICS_ID); $ads_enable = htmlspecialchars(ADS_ENABLE); $ads_standard = htmlspecialchars(ADS_STANDARD); -$ads_content = htmlspecialchars(ADS_CONTENT); $gads_client = htmlspecialchars(GADS_CLIENT); $gads_slot = htmlspecialchars(GADS_SLOT); $multi_files = htmlspecialchars(MULTI_FILES); -- cgit v1.2.3