--- /tmp/dsg/dolibarr/htdocs/support/github_19.0.3_inc.php +++ /tmp/dsg/dolibarr/htdocs/support/client_inc.php @@ -28,5 +28,2 @@ -if (!defined('DOL_DOCUMENT_ROOT')) { - define('DOL_DOCUMENT_ROOT', '..'); -} - -require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php'; +if (!defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); + @@ -38 +35,6 @@ -$conf = new Conf(); +// Avoid warnings with strict mode E_STRICT +$conf = new stdClass(); // instantiate $conf explicitely +$conf->global = new stdClass(); +$conf->file = new stdClass(); +$conf->db = new stdClass(); +$conf->syslog = new stdClass(); @@ -45 +47,2 @@ -if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) { +if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) +{ @@ -58,2 +61,2 @@ -/* -if (!file_exists($conffile)) { +if (!file_exists($conffile)) +{ @@ -63 +66 @@ -*/ + @@ -66 +69,2 @@ -if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) { // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line +if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line +{ @@ -68,4 +72,3 @@ - if ($result) { - if (empty($dolibarr_main_db_type)) { - $dolibarr_main_db_type = 'mysql'; // For backward compatibility - } + if ($result) + { + if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type = 'mysql'; // For backward compatibility @@ -78,3 +81 @@ - if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) { - $dolibarr_main_db_port = '3306'; // For backward compatibility - } + if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) $dolibarr_main_db_port = '3306'; // For backward compatibility @@ -83,5 +84,5 @@ - $dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : ''; - $dolibarr_main_url_root = isset($dolibarr_main_url_root) ? trim($dolibarr_main_url_root) : ''; - $dolibarr_main_url_root_alt = isset($dolibarr_main_url_root_alt) ? trim($dolibarr_main_url_root_alt) : ''; - $dolibarr_main_document_root = isset($dolibarr_main_document_root) ? trim($dolibarr_main_document_root) : ''; - $dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ? trim($dolibarr_main_document_root_alt) : ''; + $dolibarr_main_data_root = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : ''; + $dolibarr_main_url_root = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : ''; + $dolibarr_main_url_root_alt = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : ''; + $dolibarr_main_document_root = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : ''; + $dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : ''; @@ -90,15 +91,5 @@ - if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) { - $dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root); - } - if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root)) { - $dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root); - } - if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root)) { - $dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root); - } - if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt)) { - $dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt); - } - if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt)) { - $dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt); - } + if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) $dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root); + if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root)) $dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root); + if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root)) $dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root); + if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt)) $dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt); + if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt)) $dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt); @@ -107,2 +98,3 @@ - if (!empty($dolibarr_main_document_root)) { - $result = loadconf($dolibarr_main_document_root); + if (!empty($dolibarr_main_document_root)) + { + $result = conf($dolibarr_main_document_root); @@ -111,2 +103,4 @@ - if ($result) { - if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type)) { + if ($result) + { + if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type)) + { @@ -114 +108,2 @@ - if (!$result) { + if (!$result) + { @@ -118 +113,3 @@ - } else { + } + else + { @@ -121 +118,3 @@ - } else { + } + else + { @@ -128,3 +127 @@ -if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) { - $dolibarr_main_db_prefix = 'llx_'; -} +if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) $dolibarr_main_db_prefix = 'llx_'; @@ -138,3 +135 @@ -if ($suburi == '/') { - $suburi = ''; // If $suburi is /, it is now '' -} +if ($suburi == '/') $suburi = ''; // If $suburi is /, it is now '' @@ -143,3 +138 @@ -if (empty($character_set_client)) { - $character_set_client = "UTF-8"; -} +if (empty($character_set_client)) $character_set_client = "UTF-8"; @@ -147,3 +140 @@ -if (empty($dolibarr_main_db_character_set)) { - $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : ''); // Old installation -} +if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysql' ? 'latin1' : ''); // Old installation @@ -151,3 +142 @@ -if (empty($dolibarr_main_db_collation)) { - $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation -} +if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysql' ? 'latin1_swedish_ci' : ''); // Old installation @@ -155,3 +144 @@ -if (empty($dolibarr_main_db_encryption)) { - $dolibarr_main_db_encryption = 0; -} +if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0; @@ -159,3 +146 @@ -if (empty($dolibarr_main_db_cryptkey)) { - $dolibarr_main_db_cryptkey = ''; -} +if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = ''; @@ -164,3 +149 @@ -if (empty($conf->db->user)) { - $conf->db->user = ''; -} +if (empty($conf->db->user)) $conf->db->user = ''; @@ -171,5 +154,2 @@ -if (GETPOST('lang', 'aZ09')) { - $langs->setDefaultLang(GETPOST('lang', 'aZ09')); -} else { - $langs->setDefaultLang('auto'); -} +if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); +else $langs->setDefaultLang('auto'); @@ -185,3 +165,3 @@ - * @return int Return integer <0 if KO, >0 if OK - */ -function loadconf($dolibarr_main_document_root) + * @return int <0 if KO, >0 if OK + */ +function conf($dolibarr_main_document_root) @@ -198,7 +178,2 @@ - $return = 1; - if (!class_exists('Conf')) { - $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php'; - } - if (!$return) { - return -1; - } + $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php'; + if (!$return) return -1; @@ -214,3 +189 @@ - if (empty($conf->db->dolibarr_main_db_collation)) { - $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci'; - } + if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci'; @@ -232,3 +205,4 @@ - global $conf, $langs; - - $langs->loadLangs(array("main", "admin")); + global $conf; + global $langs; + $langs->load("main"); + $langs->load("admin"); @@ -238,2 +211,0 @@ - - // Security options @@ -241 +212,0 @@ - header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks) @@ -243,0 +215 @@ + print '<html manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n"; @@ -250 +222 @@ - print '<link rel="stylesheet" type="text/css" href="../install/default.css">'."\n"; + print '<link rel="stylesheet" type="text/css" href="default.css">'."\n"; --- /tmp/dsg/dolibarr/htdocs/support/github_19.0.3_index.php +++ /tmp/dsg/dolibarr/htdocs/support/client_index.php @@ -5 +4,0 @@ - * add german links 2020 Udo Tamm <dev@dolibit.de> @@ -32 +30,0 @@ - @@ -35,4 +33,2 @@ -if ($pos == '/') { - $pos = ''; // si $pos vaut /, on le met a '' -} -if (!defined('DOL_URL_ROOT')) { +if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' +if (!defined('DOL_URL_ROOT')) @@ -40 +35,0 @@ -} @@ -42,2 +37 @@ -$langs->loadLangs(array("other", "help")); - +$langs->loadLangs(array("other", $langs->load("help"))); @@ -51,2 +45,2 @@ -print '<br><span class="opacitymedium">'.$langs->trans("HelpCenterDesc1")."<br>\n"; -print $langs->trans("HelpCenterDesc2")."</span><br>\n"; +print '<br>'.$langs->trans("HelpCenterDesc1")."<br>\n"; +print $langs->trans("HelpCenterDesc2")."<br>\n"; @@ -57,16 +51,5 @@ -if (GETPOST('dol_hide_toptmenu')) { - $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_toptmenu=1'; -} -if (GETPOST('dol_hide_leftmenu')) { - $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_leftmenu=1'; -} -if (GETPOST('dol_no_mouse_hover')) { - $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_no_mouse_hover=1'; -} -if (GETPOST('dol_use_jmobile')) { - $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_use_jmobile=1'; -} -// If a global var $dolibarr_main_url_root exists, install is done and complete, we can show the link to home page -if (!empty($dolibarr_main_url_root)) { - print $langs->trans("ToGoBackToDolibarr", $homeurl); -} +if (GETPOST('dol_hide_toptmenu')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_toptmenu=1'; +if (GETPOST('dol_hide_leftmenu')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_leftmenu=1'; +if (GETPOST('dol_no_mouse_hover')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_no_mouse_hover=1'; +if (GETPOST('dol_use_jmobile')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_use_jmobile=1'; +print $langs->trans("ToGoBackToDolibarr", $homeurl); @@ -84,2 +67,2 @@ -print '<table class="login tablesupport" width="100%" style="margin-top: 20px">'; -print '<tr class="title tablesupport-title" valign="top">'; +print '<table class="login tablesupport" width="100%">'; +print '<tr class="title" valign="top">'; @@ -88 +71 @@ -print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle paddingright"', 1).'</td><td>'; +print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valigntextbottom"', 1).'</td><td>'; @@ -90,11 +73,4 @@ -print '<span style="'.$style1.'">'.$langs->trans("CommunitySupport").'</span>'; -print '<span class="small">'; -print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> '; -print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</span>'; -print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span> '; -print $langs->trans("TypeHelpDev"); -print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span> '; -print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1); -print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> '; -print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1); -print '</span>'; +print '<font style="'.$style1.'">'.$langs->trans("CommunitySupport").'</font>'; +print '<br>'.$langs->trans("TypeOfSupport").': <font style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</font>'; +print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '; +print $langs->trans("TypeHelpDev").'/'.img_picto_common('', 'redstar', 'class="valigntextbottom"', 1).img_picto_common('', 'redstar', 'class="valigntextbottom"', 1).'/'.img_picto_common('', 'star', 'class="valigntextbottom"', 1).img_picto_common('', 'star', 'class="valigntextbottom"', 1).img_picto_common('', 'star', 'class="valigntextbottom"', 1).img_picto_common('', 'star', 'class="valigntextbottom"', 1); @@ -112,10 +88,2 @@ -if (preg_match('/fr/i', $langs->defaultlang)) { - $urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil'; -} -if (preg_match('/es/i', $langs->defaultlang)) { - $urlwiki = 'https://wiki.dolibarr.org/index.php/Portada'; -} -if (preg_match('/de/i', $langs->defaultlang)) { - $urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite'; -} -print '<div class="wordbreak">'; +if (preg_match('/fr/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil'; +if (preg_match('/es/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Portada'; @@ -126,15 +94,4 @@ -if (preg_match('/fr/i', $langs->defaultlang)) { - $urlforumlocal = 'https://www.dolibarr.fr/forum/'; -} -if (preg_match('/es/i', $langs->defaultlang)) { - $urlforumlocal = 'https://www.dolibarr.es/foro/'; -} -if (preg_match('/it/i', $langs->defaultlang)) { - $urlforumlocal = 'http://www.dolibarr.it/forum/'; -} -if (preg_match('/gr/i', $langs->defaultlang)) { - $urlforumlocal = 'https://www.dolibarr.gr/forum/'; -} -if (preg_match('/de/i', $langs->defaultlang)) { - $urlforumlocal = 'https://www.dolibarr.de/forum/'; -} +if (preg_match('/fr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.fr/forum/'; +if (preg_match('/es/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.es/foro/'; +if (preg_match('/it/i', $langs->defaultlang)) $urlforumlocal = 'http://www.dolibarr.it/forum/'; +if (preg_match('/gr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.gr/forum/'; @@ -142,4 +99 @@ -if ($urlforumlocal != $urlforum) { - print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>'; -} -print '</div>'; +if ($urlforumlocal != $urlforum) print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>'; @@ -155,2 +109,2 @@ -print '<table class="login tablesupport" width="100%" style="margin-top: 20px">'; -print '<tr class="title tablesupport-title" valign="top">'; +print '<table class="login tablesupport" width="100%">'; +print '<tr class="title" valign="top">'; @@ -159 +113 @@ -print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle paddingright"', 1).'</td><td>'; +print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valigntextbottom"', 1).'</td><td>'; @@ -161,11 +115,4 @@ -print '<span style="'.$style1.'">'.$langs->trans("EMailSupport").'</span>'; -print '<span class="small">'; -print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> '; -print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>'; -print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span>'; -print $langs->trans("TypeHelpOnly"); -print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>'; -print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1); -print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> '; -print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1); -print '</span>'; +print '<font style="'.$style1.'">'.$langs->trans("EMailSupport").'</font>'; +print '<br>'.$langs->trans("TypeOfSupport").': <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>'; +print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '; +print $langs->trans("TypeHelpOnly").'/'.img_picto_common('', 'redstar', 'class="valigntextbottom"', 1).img_picto_common('', 'redstar', 'class="valigntextbottom"', 1).img_picto_common('', 'redstar', 'class="valigntextbottom"', 1).'/'.img_picto_common('', 'star', 'class="valigntextbottom"', 1).img_picto_common('', 'star', 'class="valigntextbottom"', 1); @@ -181,2 +128 @@ -print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>'; -print '<br>'; +print '<br>'.$langs->trans("ToSeeListOfAvailableRessources").'<br>'; @@ -184 +130 @@ -print '<br>'; +print '<br><br>'; @@ -196,2 +142,2 @@ -print '<table class="login tablesupport" width="100%" style="margin-top: 20px">'; -print '<tr class="title tablesupport-title">'; +print '<table class="login tablesupport" width="100%">'; +print '<tr class="title">'; @@ -200 +146 @@ -print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle paddingright"', 1).'</td><td>'; +print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valigntextbottom"', 1).'</td><td>'; @@ -202,11 +148,5 @@ -print '<span style="'.$style1.'">'.$langs->trans("OtherSupport").'</span>'; -print '<span class="small">'; -print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> '; -print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>'; -print '<br><span class="opacitymedium wordbreak">'.$langs->trans("TypeOfHelp").':</span>'; -print $langs->trans("TypeHelpDevForm"); -print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>'; -print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1); -print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> '; -print img_picto_common('', 'star', 'class="valignmiddle"', 1); -print '</span>'; +print '<font style="'.$style1.'">'.$langs->trans("OtherSupport").'</font>'; +print '<br>'.$langs->trans("TypeOfSupport").': <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>'; +//print '<br>'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '.img_picto_common('','redstar').img_picto_common('','redstar').img_picto_common('','redstar').' / '.img_picto_common('','star'); +print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '; +print $langs->trans("TypeHelpDevForm").'/?/?'; @@ -222,2 +162 @@ -print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>'; -print '<br>'; +print '<br>'.$langs->trans("ToSeeListOfAvailableRessources").'<br>'; @@ -225 +164 @@ -print '<br>'; +print '<br><br>';