diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6d0aa119316..b0b67b2fb8d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -37,6 +37,7 @@
include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
+
/**
* Function to return value of a static property when class
* name is dynamically defined (not hard coded).
@@ -595,30 +596,34 @@ function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NU
/**
* Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
- * This prefix is unique for instance and avoid conflict between multi-instances,
- * even when having two instances with one root dir or two instances in virtual servers.
+ * This prefix is valid in a web context only and is unique for instance and avoid conflict
+ * between multi-instances, even when having two instances with one root dir or two instances
+ * in virtual servers.
*
- * @param string $mode '' (prefix for session name) or 'email' (prefix for email id)
- * @return string A calculated prefix
+ * @param string $mode '' (prefix for session name) or 'email' (prefix for email id)
+ * @return string A calculated prefix
*/
-function dol_getprefix($mode='')
+if (! function_exists('dol_getprefix'))
{
- global $conf;
-
- // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
- if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ function dol_getprefix($mode='')
{
- if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
- else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
- }
+ global $conf;
- if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
- {
- return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
- // Use this for a "clear" cookie name
- //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
+ if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ {
+ if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+ else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+ }
+
+ if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
+ {
+ return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ // Use this for a "readable" cookie name
+ //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ }
+ else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
}
- else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
}
/**
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 7d305ded7d4..fab2a15b674 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -126,179 +126,182 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod
* @param Societe $mysoc Company object
* @return void
*/
-function dol_loginfunction($langs,$conf,$mysoc)
+if (! function_exists('dol_loginfunction'))
{
- global $dolibarr_main_demo,$db;
- global $smartphone,$hookmanager;
-
- // Instantiate hooks of thirdparty module only if not already define
- $hookmanager->initHooks(array('mainloginpage'));
-
- $langs->load("main");
- $langs->load("other");
- $langs->load("help");
- $langs->load("admin");
-
- $main_authentication=$conf->file->main_authentication;
- $session_name=session_name();
-
- $dol_url_root = DOL_URL_ROOT;
-
- // Title
- $appli=constant('DOL_APPLICATION_TITLE');
- $title=$appli.' '.constant('DOL_VERSION');
- if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
- $titletruedolibarrversion=constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
-
- // Note: $conf->css looks like '/theme/eldy/style.css.php'
- $conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
- $themepath=dol_buildpath($conf->css,1);
- if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application
+ function dol_loginfunction($langs,$conf,$mysoc)
{
- foreach($conf->modules_parts['theme'] as $reldir)
+ global $dolibarr_main_demo,$db;
+ global $smartphone,$hookmanager;
+
+ $langs->loadLangs(array("main","other","help","admin"));
+
+ // Instantiate hooks of thirdparty module only if not already define
+ $hookmanager->initHooks(array('mainloginpage'));
+
+ $main_authentication=$conf->file->main_authentication;
+
+ $session_name=session_name(); // Get current session name
+
+ $dol_url_root = DOL_URL_ROOT;
+
+ // Title
+ $appli=constant('DOL_APPLICATION_TITLE');
+ $title=$appli.' '.constant('DOL_VERSION');
+ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
+ $titletruedolibarrversion=constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
+
+ // Note: $conf->css looks like '/theme/eldy/style.css.php'
+ /*
+ $conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+ $themepath=dol_buildpath($conf->css,1);
+ if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application
{
- if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+ foreach($conf->modules_parts['theme'] as $reldir)
{
- $themepath=dol_buildpath($reldir.$conf->css, 1);
- break;
+ if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+ {
+ $themepath=dol_buildpath($reldir.$conf->css, 1);
+ break;
+ }
}
}
- }
- $conf_css = $themepath."?lang=".$langs->defaultlang;
+ $conf_css = $themepath."?lang=".$langs->defaultlang;
+ */
- // Select templates dir
- if (! empty($conf->modules_parts['tpl'])) // Using this feature slow down application
- {
- $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
- foreach($dirtpls as $reldir)
+ // Select templates dir
+ if (! empty($conf->modules_parts['tpl'])) // Using this feature slow down application
{
- $tmp=dol_buildpath($reldir.'login.tpl.php');
- if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+ $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
+ foreach($dirtpls as $reldir)
+ {
+ $tmp=dol_buildpath($reldir.'login.tpl.php');
+ if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+ }
}
- }
- else
- {
- $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
- }
-
- // Set cookie for timeout management
- $prefix=dol_getprefix();
- $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
- if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
-
- if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
- else unset($_SESSION["urlfrom"]);
-
- if (! GETPOST("username",'alpha')) $focus_element='username';
- else $focus_element='password';
-
- $demologin='';
- $demopassword='';
- if (! empty($dolibarr_main_demo))
- {
- $tab=explode(',',$dolibarr_main_demo);
- $demologin=$tab[0];
- $demopassword=$tab[1];
- }
-
- // Execute hook getLoginPageOptions (for table)
- $parameters=array('entity' => GETPOST('entity','int'));
- $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
- if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
- $morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
- } else {
- $morelogincontent = $hookmanager->resPrint;
- }
-
- // Execute hook getLoginPageExtraOptions (eg for js)
- $parameters=array('entity' => GETPOST('entity','int'));
- $reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
- $moreloginextracontent = $hookmanager->resPrint;
-
- // Login
- $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
- $password = $demopassword;
-
- // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
- $width=0;
- $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
-
- if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
- {
- $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
- }
- elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
- {
- $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
- $width=128;
- }
- elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
- {
- $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
- }
- elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
- {
- $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
- }
-
- // Security graphical code
- $captcha=0;
- $captcha_refresh='';
- if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
- {
- $captcha=1;
- $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
- }
-
- // Extra link
- $forgetpasslink=0;
- $helpcenterlink=0;
- if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
- {
- if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+ else
{
- $forgetpasslink=1;
+ $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
}
- if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ // Set cookie for timeout management
+ $prefix=dol_getprefix('');
+ $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
+ if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+
+ if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
+ else unset($_SESSION["urlfrom"]);
+
+ if (! GETPOST("username",'alpha')) $focus_element='username';
+ else $focus_element='password';
+
+ $demologin='';
+ $demopassword='';
+ if (! empty($dolibarr_main_demo))
{
- $helpcenterlink=1;
+ $tab=explode(',',$dolibarr_main_demo);
+ $demologin=$tab[0];
+ $demopassword=$tab[1];
}
+
+ // Execute hook getLoginPageOptions (for table)
+ $parameters=array('entity' => GETPOST('entity','int'));
+ $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
+ if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
+ $morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
+ } else {
+ $morelogincontent = $hookmanager->resPrint;
+ }
+
+ // Execute hook getLoginPageExtraOptions (eg for js)
+ $parameters=array('entity' => GETPOST('entity','int'));
+ $reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
+ $moreloginextracontent = $hookmanager->resPrint;
+
+ // Login
+ $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
+ $password = $demopassword;
+
+ // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
+ $width=0;
+ $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
+
+ if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+ {
+ $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+ }
+ elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+ {
+ $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+ $width=128;
+ }
+ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+ {
+ $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+ }
+ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+ {
+ $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+ }
+
+ // Security graphical code
+ $captcha=0;
+ $captcha_refresh='';
+ if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+ {
+ $captcha=1;
+ $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+ }
+
+ // Extra link
+ $forgetpasslink=0;
+ $helpcenterlink=0;
+ if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ {
+ if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+ {
+ $forgetpasslink=1;
+ }
+
+ if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ {
+ $helpcenterlink=1;
+ }
+ }
+
+ // Home message
+ $main_home='';
+ if (! empty($conf->global->MAIN_HOME))
+ {
+ $substitutionarray=getCommonSubstitutionArray($langs);
+ complete_substitutions_array($substitutionarray, $langs);
+ $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+
+ $main_home=dol_htmlcleanlastbr($texttoshow);
+ }
+
+ // Google AD
+ $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
+
+ // Set jquery theme
+ $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
+ $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+ if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+ $jquerytheme = 'smoothness';
+ if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+
+ // Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
+ $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
+ $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
+ $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
+ $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
+ $dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+
+ // Include login page template
+ include $template_dir.'login.tpl.php';
+
+
+ $_SESSION["dol_loginmesg"] = '';
}
-
- // Home message
- $main_home='';
- if (! empty($conf->global->MAIN_HOME))
- {
- $substitutionarray=getCommonSubstitutionArray($langs);
- complete_substitutions_array($substitutionarray, $langs);
- $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
-
- $main_home=dol_htmlcleanlastbr($texttoshow);
- }
-
- // Google AD
- $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
-
- // Set jquery theme
- $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
- $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
- if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
- $jquerytheme = 'smoothness';
- if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-
- // Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
- $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
- $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
- $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
- $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
- $dol_use_jmobile=GETPOST('dol_use_jmobile','int');
-
- // Include login page template
- include $template_dir.'login.tpl.php';
-
-
- $_SESSION["dol_loginmesg"] = '';
}
/**
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 62200405c60..35145db8320 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -46,6 +46,7 @@ $disablenofollow=1;
if (! preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenofollow=0;
print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);
+
?>
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1cf0a18e3a1..e593068826b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -153,7 +153,11 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
// Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU'))
+{
+ print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
+ exit;
+}
// Sanity check on URL
if (! empty($_SERVER["PHP_SELF"]))
@@ -204,7 +208,7 @@ if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
}
// Init session. Name of session is specific to Dolibarr instance.
-$prefix=dol_getprefix();
+$prefix=dol_getprefix('');
$sessionname='DOLSESSID_'.$prefix;
$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
@@ -479,6 +483,7 @@ if (! defined('NOLOGIN'))
include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
$langs=new Translate("",$conf);
$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+ if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
$langs->setDefaultLang($langcode);
}
@@ -1164,6 +1169,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
}
}
}
+
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print ''."\n";
if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print ''."\n".''."\n";
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 8aac6037f65..5958c71f295 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -63,7 +63,7 @@ if (GETPOST('dol_no_mouse_hover')) $url.=(preg_match('/\?/',$url)?'&':'?')
if (GETPOST('dol_use_jmobile')) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_use_jmobile=1';
// Destroy session
-$prefix=dol_getprefix();
+$prefix=dol_getprefix('');
$sessionname='DOLSESSID_'.$prefix;
$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 43cb5097bba..4f93a0d2401 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -169,6 +169,7 @@ else
}
// Note: $conf->css looks like '/theme/eldy/style.css.php'
+/*
$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
$themepath=dol_buildpath($conf->css,1);
if (! empty($conf->modules_parts['theme'])) // This slow down
@@ -183,6 +184,7 @@ if (! empty($conf->modules_parts['theme'])) // This slow down
}
}
$conf_css = $themepath."?lang=".$langs->defaultlang;
+*/
$jquerytheme = 'smoothness';
if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;