lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: strict mode again

Browse Source
This commit is contained in:
Regis Houssin 2012-07-11 15:55:56 +02:00
parent 6935598ced
commit e18d3c6e18
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/admin.lib.php
View File

@ -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);

22
htdocs/webservices/admin/webservices.php
View File

@ -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>';

2
htdocs/webservices/server_invoice.php
View File

@ -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:''));
?>