diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 80b71d1d919..ac36247fdba 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -762,7 +762,7 @@ if ($id > 0 || ! empty($ref)) print ""; - print "\n"; + print "\n"; dol_fiche_end(); diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php index b66060e3607..4a81457afe1 100644 --- a/htdocs/core/lib/cron.lib.php +++ b/htdocs/core/lib/cron.lib.php @@ -75,53 +75,53 @@ function cron_prepare_head($object) return $head; } - -/** - * Show information with URLs to launch jobs - * - * @return int 0 - */ -function dol_print_cron_urls() -{ - global $conf, $langs, $user; - global $dolibarr_main_url_root; - - // Define $urlwithroot - $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file - //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current - - // Cron launch - print ''.$langs->trans("URLToLaunchCronJobs").':
'; - $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login; - print img_picto('','object_globe.png').' '.$url."
\n"; - print ' '.$langs->trans("OrToLaunchASpecificJob").'
'; - $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid'; - print img_picto('','object_globe.png').' '.$url."
\n"; - print '
'; - - - print ''.$langs->trans("FileToLaunchCronJobs").':
'; - - $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]'; - print '
\n"; - print '
'; + +/** + * Show information with URLs to launch jobs + * + * @return int 0 + */ +function dol_print_cron_urls() +{ + global $conf, $langs, $user; + global $dolibarr_main_url_root; + + // Define $urlwithroot + $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); + $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current + + // Cron launch + print ''.$langs->trans("URLToLaunchCronJobs").':
'; + $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login; + print img_picto('','object_globe.png').' '.$url."
\n"; + print ' '.$langs->trans("OrToLaunchASpecificJob").'
'; + $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid'; + print img_picto('','object_globe.png').' '.$url."
\n"; + print '
'; + + + print ''.$langs->trans("FileToLaunchCronJobs").':
'; + + $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]'; + print '
\n"; + print '
'; // Add note - $linuxlike=1; - if (preg_match('/^win/i',PHP_OS)) $linuxlike=0; - if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0; - print $langs->trans("Note").': '; - if ($linuxlike) - { - print $langs->trans("CronExplainHowToRunUnix"); - } - else - { - print $langs->trans("CronExplainHowToRunWin"); - } - - return 0; -} + $linuxlike=1; + if (preg_match('/^win/i',PHP_OS)) $linuxlike=0; + if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0; + print $langs->trans("Note").': '; + if ($linuxlike) + { + print $langs->trans("CronExplainHowToRunUnix"); + } + else + { + print $langs->trans("CronExplainHowToRunWin"); + } + + return 0; +} diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 2cdd27862b3..bad9171d5d4 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -456,7 +456,7 @@ if (($action=="create") || ($action=="edit")) print ""; print "\n"; - print ''; + print ''; print '

'; print ''; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 09e1f2fb1a8..7eb253c9ade 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -144,8 +144,8 @@ if ($result < 0) print "

"; -print '
'."\n"; -print ''; +print ''."\n"; +print ''; print ''; print ''; @@ -190,8 +190,8 @@ print ''; print ''; -if (count($object->lines) > 0) -{ +if (count($object->lines) > 0) +{ // Loop on each active job $style='impair'; foreach($object->lines as $line) @@ -291,7 +291,7 @@ else print '
'; -print ''; +print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 9c942cf2b99..e4a22c97285 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -679,7 +679,7 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme','alpha',1); $conf->css = "/theme/".$conf->theme."/style.css.php"; } - + // Set javascript option if (! GETPOST('nojs')) // If javascript was not disabled on URL @@ -703,18 +703,18 @@ if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1; } -// Disabled bugged themes -if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) -{ - $conf->theme='eldy'; - $conf->css = "/theme/".$conf->theme."/style.css.php"; +// Disabled bugged themes +if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) +{ + $conf->theme='eldy'; + $conf->css = "/theme/".$conf->theme."/style.css.php"; } -// Disabled bugged themes -if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) -{ - $conf->theme='eldy'; - $conf->css = "/theme/".$conf->theme."/style.css.php"; +// Disabled bugged themes +if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) +{ + $conf->theme='eldy'; + $conf->css = "/theme/".$conf->theme."/style.css.php"; } if (! defined('NOREQUIRETRAN')) diff --git a/htdocs/opensurvey/public/index.php b/htdocs/opensurvey/public/index.php index 73e7c672e20..2c78a86cb9d 100755 --- a/htdocs/opensurvey/public/index.php +++ b/htdocs/opensurvey/public/index.php @@ -50,12 +50,12 @@ print '

'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'


'; -print $langs->trans("OrganizeYourMeetingEasily").' -
-
+print $langs->trans("OrganizeYourMeetingEasily").' +
+
-
-
+
+
'; llxFooterSurvey(); diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php index 79eaf5e7013..8fc1d97d23d 100644 --- a/htdocs/public/cron/cron_run_jobs.php +++ b/htdocs/public/cron/cron_run_jobs.php @@ -43,10 +43,10 @@ dol_include_once("/cron/class/cronjob.class.php"); global $langs, $conf; -// Language Management -$langs->load("admin"); -$langs->load("cron"); - +// Language Management +$langs->load("admin"); +$langs->load("cron"); + @@ -101,9 +101,9 @@ if (! empty($id)) { if (! is_numeric($id)) { - echo "Error: Bad value for parameter job id"; - dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING); - exit; + echo "Error: Bad value for parameter job id"; + dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING); + exit; } $filter=array(); $filter['t.rowid']=$id; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 08f6198da6b..869c1976ffd 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -58,9 +58,9 @@ $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11'; -$path=''; // This value may be used in future for external module to overwrite theme -$theme='bureau2crea'; // Value of theme -if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } +$path=''; // This value may be used in future for external module to overwrite theme +$theme='bureau2crea'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files $fontlist='arial, sans-serif, verdana, helvetica'; diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index 63d9c1b8733..96e97e13771 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -124,12 +124,12 @@ if ($resql) if (empty($obj->email)) print "Warning: Customer ".$customer." has no email. Notice disabled.\n"; } - // Define line content - $outputlangs=new Translate('',$conf); - $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer - $outputlangs->load("bills"); + // Define line content + $outputlangs=new Translate('',$conf); + $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer + $outputlangs->load("bills"); $outputlangs->load("main"); - $outputlangs->load("contracts"); + $outputlangs->load("contracts"); if (dol_strlen($oldemail)) { diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index ace84fa0582..08d068685e3 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -125,11 +125,11 @@ if ($resql) if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n"; } - // Define line content - $outputlangs=new Translate('',$conf); - $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative - $outputlangs->load("bills"); - $outputlangs->load("main"); + // Define line content + $outputlangs=new Translate('',$conf); + $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative + $outputlangs->load("bills"); + $outputlangs->load("main"); if (dol_strlen($obj->email)) { diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 0b2b9413002..c4051728aab 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -69,8 +69,8 @@ $error=0; print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); -$duration_value=isset($argv[3])?$argv[3]:'none'; -$duration_value2=isset($argv[4])?$argv[4]:'none'; +$duration_value=isset($argv[3])?$argv[3]:'none'; +$duration_value2=isset($argv[4])?$argv[4]:'none'; $error = 0; print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"").(is_numeric($duration_value2)?" after=".$duration_value2:"")."\n";