';
@@ -165,7 +163,6 @@ $name = "GD";
print "";
print "| ".$name." | ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -176,7 +173,6 @@ $name = "Curl";
print "
";
print "| ".$name." | ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -189,7 +185,6 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
print "
";
print "| ".$name." | ";
- //print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -201,7 +196,6 @@ $name = "xDebug";
print "
";
print "| ".$name." | ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -240,7 +234,7 @@ foreach ($phparray as $key => $value)
print '
';
} else {
print '';
- print '| '.$keyparam.' | ';
+ print ''.$keyparam.' | ';
$i = 0;
foreach ($keyvalue as $keyparam2 => $keyvalue2)
{
@@ -264,85 +258,6 @@ foreach ($phparray as $key => $value)
llxFooter();
$db->close();
-/**
- * Return all list with all activated, but possible not loaded PHP extensions
- *
- * @return array
- */
-function getActivatedExtensions()
-{
- $file = trim(getConfigFilePath());
- $handle = fopen($file, "r");
- $content = fread($handle, filesize($file));
-
- fclose($handle);
-
- $configLines = explode("\r", $content);
-
- // For compatibility with LF (Line Feed)
- if (empty($configLines) || count($configLines) < 2) {
- $configLines = explode("\n", $content);
- }
-
- $extensions = array();
- $lastLine = "";
-
- foreach ($configLines as $line)
- {
- $line = trim($line);
-
- // ignore comment lines
- if (substr($line, 0, 1) === ";" || empty($line))
- {
- continue;
- }
-
- // var_dump($line);
-
- // extension
- if (substr($line, 0, 9) === "extension" && substr($line, 0, 10) !== "extension_")
- {
- $value = trim(end(explode("=", $line)));
-
- $extensions[] = $value === "gd2" ? "gd" : $value;
- }
-
- // zend_extension
- if (substr($line, 0, 14) === "zend_extension")
- {
- $extensions[] = str_replace("[", "", str_replace("]", "", $lastLine));
- }
-
- $lastLine = $line;
- }
-
- return array_unique($extensions);
-}
-
-/**
- * Return the path to the current used php config file
- *
- * @return string
- */
-function getConfigFilePath()
-{
- $phparray = phpinfo_array();
-
- foreach ($phparray as $value)
- {
- foreach ($value as $keyparam => $keyvalue)
- {
- if (strtolower($keyparam) !== "loaded configuration file")
- {
- continue;
- }
-
- return $keyvalue;
- }
- }
-
- return "";
-}
/**
* Return a table column with a indicator (okay or warning), based on the given name and list
@@ -411,7 +326,7 @@ function getTableColumnFunction(array $functions)
* Return a result column with a translated result text
*
* @param string $name The name of the PHP extension
- * @param array $activated A list with all activated PHP extensions
+ * @param array $activated A list with all activated PHP extensions. Deprecated.
* @param array $loaded A list with all loaded PHP extensions
* @param array $functions A list with all PHP functions to check
*
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 8b9c6b34dee..34feb8bbe44 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -37,11 +37,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -55,7 +55,7 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
$endyear = $year;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1d00389534d..c37f9eff99f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -453,26 +453,15 @@ if (empty($reshook))
if (!$error)
{
$object_id = $object->create($user);
-
- // If some invoice's lines already known
- $NBLINES = 8;
- for ($i = 1; $i <= $NBLINES; $i++) {
- if ($_POST['idprod'.$i]) {
- $xid = 'idprod'.$i;
- $xqty = 'qty'.$i;
- $xremise = 'remise_percent'.$i;
- $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
- }
- }
}
}
// Insert default contacts if defined
if ($object_id > 0)
{
- if (GETPOST('contactid'))
+ if (GETPOST('contactid', 'int'))
{
- $result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
+ $result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
if ($result < 0) {
setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
$error++;
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 54846a32852..70eecf02bbf 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -38,11 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
if ($mode == 'customer' && !$user->rights->commande->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -302,11 +302,11 @@ if ($mode == 'customer')
Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
);
- print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
+ print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4);
}
if ($mode == 'supplier')
{
- $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status');
+ $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status');
}
print '
';
// Year
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 9cbd826b4a1..13378979932 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -44,7 +44,7 @@ $mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -59,7 +59,7 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear = $year - 2;
else $startyear = $year - 1;
$endyear = $year;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 17e0fed3fcb..75263093040 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4780,6 +4780,9 @@ function price2num($amount, $rounding = '', $option = 0)
// Convert value to universal number format (no thousand separator, '.' as decimal separator)
if ($option != 1) { // If not a PHP number or unknown, we change or clean format
//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'
';
+ if (!is_numeric($amount)) {
+ $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\-]/', '', $amount);
+ }
if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) { // It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123
$amount = str_replace($thousand, '', $amount);
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index b0e5c7aed95..f3a3e263fa7 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array('trips', 'companies'));
$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
-$object_status = GETPOST('object_status');
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
+$object_status = GETPOST('object_status', 'intcomma');
$userid = GETPOST('userid', 'int');
$socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
@@ -51,7 +51,7 @@ if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'expensereport', $id, '');
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
$endyear = $year;
@@ -229,7 +229,7 @@ print '';
// Status
print '| '.$langs->trans("Status").' | ';
$liststatus = $tmpexpensereport->statuts;
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
print ' |
';
// Year
print '| ';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 093e0e4e73d..19e7f86d8a0 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -42,12 +42,12 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
$endyear = $year;
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
// Load translation files required by the page
$langs->loadLangs(array('interventions', 'companies', 'other', 'suppliers'));
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 488548ae8b1..a234d4ad8f4 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -335,3 +335,6 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (72
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (722, 72, '18','0', '0.9', '1', 'VAT Rate 18+0.9', 1);
ALTER TABLE llx_expedition ADD COLUMN billed smallint DEFAULT 0;
+
+-- VMYSQL4.3 ALTER TABLE llx_mrp_mo MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 4273979d45e..045943bbfda 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -32,7 +32,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
if (!$user->rights->ticket->read) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$userid = GETPOST('userid', 'int');
$socid = GETPOST('socid', 'int');
@@ -44,7 +44,7 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
$endyear = $year;
@@ -235,7 +235,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
// Status
print ' |
| '.$langs->trans("Status").' | ';
$liststatus = $object->fields['fk_statut']['arrayofkeyval'];
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
print ' |
';
// Year
print '| '.$langs->trans("Year").' | ';
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 257e51a5891..4031ad60951 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1234,7 +1234,9 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
$newlangs->load("main");
$langs = $newlangs;
- $this->assertEquals(1000, price2num('1 000.0'));
+ $this->assertEquals(150, price2num('(SELECT/**/CASE/**/WHEN/**/(0<1)/**/THEN/**/SLEEP(5)/**/ELSE/**/SLEEP(0)/**/END)'));
+
+ $this->assertEquals(1000, price2num('1 000.0'));
$this->assertEquals(1000, price2num('1 000', 'MT'));
$this->assertEquals(1000, price2num('1 000', 'MU'));
@@ -1252,7 +1254,7 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
// Text can't be converted
$this->assertEquals('12.4$', price2num('12.4$'));
- $this->assertEquals('12r.4$', price2num('12r.4$'));
+ $this->assertEquals('12.4$', price2num('12r.4$'));
// For spanish language
$newlangs2 = new Translate('', $conf);
|