From 3268dcbab8e32e18ab5080e0cdc86bfed887d8d5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 18 Apr 2010 14:43:47 +0000
Subject: [PATCH] Fix: missing google ad

---
 htdocs/core/tpl/login.tpl.php | 4 ++--
 htdocs/lib/security.lib.php   | 2 +-
 htdocs/public/demo/index.php  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index da2260c1ec3..eee90141f7a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -165,9 +165,9 @@ function donnefocus() {
 	<?php if ($main_google_ad_client) { ?>
 		<div align="center">
 			<script type="text/javascript"><!--
-				google_ad_client = <?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>;
+				google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 				/* <?php echo $conf->global->MAIN_GOOGLE_AD_NAME; ?> */
-				google_ad_slot = <?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>;
+				google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 				google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 				google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
 				//-->
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 6a423e150c4..f01922f9f27 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -206,7 +206,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	$main_home=nl2br($conf->global->MAIN_HOME);
 	
 	// Google AD
-	$main_google_ad_client = (!empty($conf->global->MAIN_GOOGLE_AD_CLIENT)?1:0);
+	$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
 
 	$dol_loginmesg = $_SESSION["dol_loginmesg"];
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 8feb5fccade..c5bacccf4c1 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -269,7 +270,7 @@ if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN
 	print '<div align="center">'."\n";
 	print '<script type="text/javascript"><!--'."\n";
 	print 'google_ad_client = "'.$conf->global->MAIN_GOOGLE_AD_CLIENT.'";'."\n";
-	print '/* '.$conf->global->MAIN_GOOGLE_AD_WIDTH.'x'.$conf->global->MAIN_GOOGLE_AD_HEIGHT.', '.$conf->global->MAIN_GOOGLE_AD_NAME.' */'."\n";
+	print '/* '.$conf->global->MAIN_GOOGLE_AD_NAME.' */'."\n";
 	print 'google_ad_slot = "'.$conf->global->MAIN_GOOGLE_AD_SLOT.'";'."\n";
 	print 'google_ad_width = '.$conf->global->MAIN_GOOGLE_AD_WIDTH.';'."\n";
 	print 'google_ad_height = '.$conf->global->MAIN_GOOGLE_AD_HEIGHT.';'."\n";