From e18d3c6e185b9f02f86ba7b93c1459d97e790005 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 11 Jul 2012 15:55:56 +0200
Subject: [PATCH] Fix: strict mode again

---
 htdocs/core/lib/admin.lib.php            |  4 ++--
 htdocs/webservices/admin/webservices.php | 22 +++++++++++-----------
 htdocs/webservices/server_invoice.php    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index c829933bf42..952b386643a 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -719,7 +719,7 @@ function activateModule($value,$withdeps=1)
 
     if (! $ret && $withdeps)
     {
-        if (is_array($objMod->depends) && ! empty($objMod->depends))
+        if (isset($objMod->depends) && is_array($objMod->depends) && ! empty($objMod->depends))
         {
             // Activation des modules dont le module depend
             $num = count($objMod->depends);
@@ -735,7 +735,7 @@ function activateModule($value,$withdeps=1)
             }
         }
 
-        if (is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
+        if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
         {
             // Desactivation des modules qui entrent en conflit
             $num = count($objMod->conflictwith);
diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php
index 7cd3340f047..800fd9cc6af 100644
--- a/htdocs/webservices/admin/webservices.php
+++ b/htdocs/webservices/admin/webservices.php
@@ -28,10 +28,10 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 
 $langs->load("admin");
 
-if (!$user->admin)
-  accessforbidden();
+if (! $user->admin) accessforbidden();
 
 $actionsave=GETPOST("save");
+$mesg='';
 
 // Sauvegardes parametres
 if ($actionsave)
@@ -69,26 +69,26 @@ print "<br>\n";
 
 print '<form name="agendasetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<table class=\"noborder\" width=\"100%\">";
+print '<table class="noborder" width="100%">';
 
-print "<tr class=\"liste_titre\">";
+print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 //print "<td>".$langs->trans("Examples")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print "<tr class=\"impair\">";
-print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"WEBSERVICES_KEY\" value=\"". ($_POST["WEBSERVICES_KEY"]?$_POST["WEBSERVICES_KEY"]:$conf->global->WEBSERVICES_KEY) . "\" size=\"20\"></td>";
-print "<td>&nbsp;</td>";
-print "</tr>";
+print '<tr class="impair">';
+print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess").'</td>';
+print '<td><input type="text" class="flat" name="WEBSERVICES_KEY" value="'. (GETPOST('WEBSERVICES_KEY')?GETPOST('WEBSERVICES_KEY'):(! empty($conf->global->WEBSERVICES_KEY)?$conf->global->WEBSERVICES_KEY:'')) . '" size="20"></td>';
+print '<td>&nbsp;</td>';
+print '</tr>';
 
 print '</table>';
 
 print '<br><center>';
-print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
-print "</center>";
+print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
+print '</center>';
 
 print '</form>';
 
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 611cda4c244..3694e8a52f8 100755
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -568,6 +568,6 @@ function createInvoice($authentication,$invoice)
 
 
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
+$server->service((isset($HTTP_RAW_POST_DATA)?$HTTP_RAW_POST_DATA:''));
 
 ?>