';
@@ -873,9 +857,6 @@ if ($step == 4 && $datatoexport)
llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
- /*
- * Affichage onglets
- */
$stepoffset=0;
$h = 0;
@@ -901,7 +882,7 @@ if ($step == 4 && $datatoexport)
$hselected=$h;
$h++;
- dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
+ dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
print '
';
print '
';
@@ -1121,9 +1102,6 @@ if ($step == 5 && $datatoexport)
llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
- /*
- * Affichage onglets
- */
$h = 0;
$stepoffset=0;
@@ -1153,7 +1131,7 @@ if ($step == 5 && $datatoexport)
$hselected=$h;
$h++;
- dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
+ dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
/*
* Confirmation suppression fichier
diff --git a/htdocs/includes/swiftmailer/autoload.php b/htdocs/includes/swiftmailer/autoload.php
new file mode 100644
index 00000000000..b796c9cf3e8
--- /dev/null
+++ b/htdocs/includes/swiftmailer/autoload.php
@@ -0,0 +1,13 @@
+register();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php b/htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php
new file mode 100644
index 00000000000..06339e869bf
--- /dev/null
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php
@@ -0,0 +1,82 @@
+
+ */
+class EguliasAutoLoader
+{
+ /**
+ * @var string The namespace prefix for this instance.
+ */
+ protected $namespace = '';
+
+ /**
+ * @var string The filesystem prefix to use for this instance
+ */
+ protected $path = '';
+
+ /**
+ * Build the instance of the autoloader
+ *
+ * @param string $namespace The prefixed namespace this instance will load
+ * @param string $path The filesystem path to the root of the namespace
+ */
+ public function __construct($namespace, $path)
+ {
+ $this->namespace = ltrim($namespace, '\\');
+ $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+ }
+
+ /**
+ * Try to load a class
+ *
+ * @param string $class The class name to load
+ *
+ * @return boolean If the loading was successful
+ */
+ public function load($class)
+ {
+ $class = ltrim($class, '\\');
+ if (strpos($class, $this->namespace) === 0) {
+ $nsparts = explode('\\', $class);
+ $class = array_pop($nsparts);
+ $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
+ $max=count($nsparts);
+ for ($i=2; $i<$max;$i++) {
+ $path .= $nsparts[$i].'/';
+ }
+ $nsparts = array();
+ $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+ if (file_exists($path)) {
+ require $path;
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Register the autoloader to PHP
+ *
+ * @return boolean The status of the registration
+ */
+ public function register()
+ {
+ return spl_autoload_register(array($this, 'load'));
+ }
+
+ /**
+ * Unregister the autoloader to PHP
+ *
+ * @return boolean The status of the unregistration
+ */
+ public function unregister()
+ {
+ return spl_autoload_unregister(array($this, 'load'));
+ }
+}
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index 6a3447625a5..3e5c0ca31ba 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -18,15 +18,15 @@
*/
if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIREDB')) define('NOREQUIREDB','1');
+if (!defined('NOREQUIREDB')) define('NOREQUIREDB', '1');
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
if (!defined('NOLOGIN')) define('NOLOGIN', 1);
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
/**
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index 79280868ecb..99123cc45ef 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -20,13 +20,13 @@
* \brief Fichier de javascript de traduction pour JSGantt
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
require_once __DIR__.'/../main.inc.php';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1baf1650494..068a7bddcc8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2369,6 +2369,11 @@ div.tabBar div.titre {
padding-top: 20px;
}
+div.tabBar.tabBarNoTop {
+ padding-top: 0;
+ border-top: 0;
+}
+
/* tabBar used for creation/update/send forms */
div.tabBarWithBottom {
padding-bottom: 18px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6f22cf2746d..aa4c6fa38fe 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2304,6 +2304,12 @@ div.tabBar {
div.tabBar div.titre {
padding-top: 10px;
}
+
+div.tabBar.tabBarNoTop {
+ padding-top: 0;
+ border-top: 0;
+}
+
div.tabBarWithBottom {
padding-bottom: 18px;
border-bottom: 1px solid #aaa;
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index bb33032a4a5..a84a78a7c75 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -18,9 +18,9 @@
/**
* \file test/phpunit/JsonLibTest.php
- * \ingroup test
+ * \ingroup test
* \brief PHPUnit test
- * \remarks To run this script as CLI: phpunit filename.php
+ * \remarks To run this script as CLI: phpunit filename.php
*/
global $conf,$user,$langs,$db;
@@ -122,7 +122,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
/**
* testJsonEncode
*
- * @return void
+ * @return void
*/
public function testJsonEncode()
{