diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 2b72a4395ca76f131d5ed962537309cd922244bf..df082ed488100dcb653df0effc15bf4fff491cc5 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -90,7 +90,7 @@ if (! empty($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE))
}
else
{
- if (function_exists('geoip_country_code_by_name')) $geointernal=true;
+ if (function_exists('geoip_country_code_by_name')) $geointernal=true;
}
// Mode
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index f0f95b62d152e1e35a25c48c4c18b90861d0260a..9a270d2a5c213ed1ad66ae7a6d5a038c753b951b 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -22,8 +22,8 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
$langs->load("admin");
$langs->load("install");
@@ -55,18 +55,18 @@ print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.p
print '<br>';
print '<strong>'.$langs->trans("XDebug").'</strong>: ';
$test=!function_exists('xdebug_is_enabled');
-if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled");
else
{
print img_picto('','warning').' '.$langs->trans("XDebugInstalled");
print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xdebug.php'.'">XDebug admin page</a>';
-}
-print '<br>';
+}
+print '<br>';
// Applicative cache
-print '<br>';
-print '<strong>'.$langs->trans("ApplicativeCache").'</strong>: ';
-$test=!empty($conf->memcached->enabled);
+print '<br>';
+print '<strong>'.$langs->trans("ApplicativeCache").'</strong>: ';
+$test=!empty($conf->memcached->enabled);
if ($test)
{
if (!empty($conf->global->MEMCACHED_SERVER))
@@ -78,28 +78,28 @@ if ($test)
{
print img_picto('','warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
}
-}
-else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable");
+}
+else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable");
print '</br>';
// OPCode cache
-print '<br>';
+print '<br>';
print '<strong>'.$langs->trans("OPCodeCache").'</strong>: ';
-$test1=function_exists('xcache_info');
+$test1=function_exists('xcache_info');
if ($test1)
{
print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled");
- print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xcache.php'.'">Xcache admin page</a>';
-}
+ print $langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xcache.php'.'">Xcache admin page</a>';
+}
else
{
$test2=function_exists('eaccelerator_info');
if ($test2) print img_picto('','tick.png').' '.$langs->trans("EAcceleratorInstalled");
else print $langs->trans("NoOPCodeCacheFound");
-}
-print '<br>';
+}
+print '<br>';
-// HTTPCacheStaticResources
+// HTTPCacheStaticResources
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
var getphpurl;
@@ -360,28 +360,28 @@ print '<div id="httpcachejsphpko">'.img_picto('','warning.png').' '.$langs->tran
print '<br>';
print '<strong>'.$langs->trans("HTTPCacheStaticResources").' - ';
print $langs->trans("CacheByClient").':</strong><br>';
-print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
+print $langs->trans("TestNotPossibleWithCurrentBrowsers").'<br>';
-// Compressions
-print '<br>';
+// Compressions
+print '<br>';
print '<strong>'.$langs->trans("CompressionOfResources").'</strong>: ';
//$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
-print '<br>';
-// on PHP
-print '<div id="httpcompphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'php (.php)').'</div>';
-print '<div id="httpcompphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
-// on rest
-print '<div id="httpcompcssok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css)').'</div>';
-print '<div id="httpcompcssko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css)').'</div>';
-print '<div id="httpcompcssphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css.php)').'</div>';
-print '<div id="httpcompcssphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css.php)').'</div>';
-//print '<div id="httpcompimgok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'</div>';
-//print '<div id="httpcompimgko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'</div>';
-print '<div id="httpcompjsok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js)').'</div>';
-print '<div id="httpcompjsko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js)').'</div>';
-print '<div id="httpcompjsphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js.php)').'</div>';
-print '<div id="httpcompjsphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js.php)').'</div>';
+print '<br>';
+// on PHP
+print '<div id="httpcompphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'php (.php)').'</div>';
+print '<div id="httpcompphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'</div>';
+// on rest
+print '<div id="httpcompcssok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css)').'</div>';
+print '<div id="httpcompcssko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css)').'</div>';
+print '<div id="httpcompcssphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'css (.css.php)').'</div>';
+print '<div id="httpcompcssphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'css (.css.php)').'</div>';
+//print '<div id="httpcompimgok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'</div>';
+//print '<div id="httpcompimgko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'</div>';
+print '<div id="httpcompjsok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js)').'</div>';
+print '<div id="httpcompjsko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js)').'</div>';
+print '<div id="httpcompjsphpok">'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeCompressed",'javascript (.js.php)').'</div>';
+print '<div id="httpcompjsphpko">'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'javascript (.js.php)').'</div>';
// Database driver
print '<br>';
@@ -389,60 +389,60 @@ print '<strong>'.$langs->trans("DriverType").'</strong>: ';
print '<br>';
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
- $test=($conf->db->type == 'mysqli');
- if ($test)
- {
- print img_picto('','tick.png').' '.$langs->trans("YouUseBestDriver",$conf->db->type);
- }
- else
- {
+ $test=($conf->db->type == 'mysqli');
+ if ($test)
+ {
+ print img_picto('','tick.png').' '.$langs->trans("YouUseBestDriver",$conf->db->type);
+ }
+ else
+ {
print img_picto('','warning.png').' '.$langs->trans("YouDoNotUseBestDriver",$conf->db->type,'mysqli');
- }
- print '<br>';
+ }
+ print '<br>';
}
-
-// Product search
-print '<br>';
-print '<strong>'.$langs->trans("ProductSearch").'</strong>: ';
+
+// Product search
print '<br>';
-$tab = array();
-$sql = "SELECT COUNT(*) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-$resql=$db->query($sql);
-if ($resql)
+print '<strong>'.$langs->trans("ProductSearch").'</strong>: ';
+print '<br>';
+$tab = array();
+$sql = "SELECT COUNT(*) as nb";
+$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+$resql=$db->query($sql);
+if ($resql)
{
$limitforoptim=10000;
- $num=$db->num_rows($resql);
+ $num=$db->num_rows($resql);
if ($nb > $limitforoptim)
{
- if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
- {
- print img_picto('','warning.png').' '.$langs->trans("YouHaveXProductUseSearchOptim",$num);
- }
- else
- {
- print img_picto('','tick.png').' '.$langs->trans("YouHaveXProductAndSearchOptimOn",$num);
- }
+ if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
+ {
+ print img_picto('','warning.png').' '.$langs->trans("YouHaveXProductUseSearchOptim",$num);
+ }
+ else
+ {
+ print img_picto('','tick.png').' '.$langs->trans("YouHaveXProductAndSearchOptimOn",$num);
+ }
}
else
{
print img_picto('','tick.png').' '.$langs->trans("NbOfProductIsLowerThanNoPb",$limitforoptim);
}
print '<br>';
- $db->free($resql);
-}
+ $db->free($resql);
+}
// Browser
-print '<br>';
-print '<strong>'.$langs->trans("Browser").'</strong>: ';
+print '<br>';
+print '<strong>'.$langs->trans("Browser").'</strong>: ';
var_dump($conf->browser);
-print '<br>';
+print '<br>';
// Database statistics update
-print '<br>';
-print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
-print '<br>';
-
+print '<br>';
+print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
+print '<br>';
+
llxFooter();
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 7b6b63995878f2e12d53c6fa7bc88e9cd5afec5c..12abe3ea88a0a1a570a034c2370a283dc7a1d2f2 100755
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -556,20 +556,20 @@ class InterfaceActionsAuto
}
// Projects
- elseif ($action == 'PROJECT_CREATE')
- {
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
- $langs->load("other");
- $langs->load("projects");
- $langs->load("agenda");
-
- $object->actiontypecode='AC_OTH_AUTO';
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
- $object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
- $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
- $object->sendtoid=0;
- $ok=1;
+ elseif ($action == 'PROJECT_CREATE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ $langs->load("other");
+ $langs->load("projects");
+ $langs->load("agenda");
+
+ $object->actiontypecode='AC_OTH_AUTO';
+ if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+ $object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
+ $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+ $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+ $object->sendtoid=0;
+ $ok=1;
}
// If not found
diff --git a/htdocs/includes/jquery/plugins/flot/Makefile b/htdocs/includes/jquery/plugins/flot/Makefile
index c3aba861c50d917def251a1a175a69d6569edd67..2e070d0c3c03417df83c6fd217eea8393887b16f 100644
--- a/htdocs/includes/jquery/plugins/flot/Makefile
+++ b/htdocs/includes/jquery/plugins/flot/Makefile
@@ -1,12 +1,12 @@
-# Makefile for generating minified files
-
-.PHONY: all
-
-# we cheat and process all .js files instead of an exhaustive list
-all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
-
-%.min.js: %.js
- yui-compressor $< -o $@
-
-test:
- ./node_modules/.bin/jshint *jquery.flot.js
+# Makefile for generating minified files
+
+.PHONY: all
+
+# we cheat and process all .js files instead of an exhaustive list
+all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
+
+%.min.js: %.js
+ yui-compressor $< -o $@
+
+test:
+ ./node_modules/.bin/jshint *jquery.flot.js