diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 80b71d1d91990dbfccc35bd44460b0e076a0bf94..ac36247fdbabce584c63d45820a76cb01c18def4 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -762,7 +762,7 @@ if ($id > 0 || ! empty($ref))
print "</table>";
- print "</form>\n";
+ print "</form>\n";
dol_fiche_end();
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index b66060e36073de9af23568187b67d9f3c6265c6a..4a81457afe16476b7388c7ff6d1ff9b0faa05b83 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 '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
- $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').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
- print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
- $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').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
- print '<br>';
-
-
- print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
-
- $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]';
- print '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n";
- print '<br>';
+
+/**
+ * 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 '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
+ $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').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+ print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
+ $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').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+ print '<br>';
+
+
+ print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
+
+ $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]';
+ print '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n";
+ print '<br>';
// 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 2cdd27862b3eb1396a019c6d9105b2f2f595d1cf..bad9171d5d491ee3c1d2eb3003b85891671d37b0 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -456,7 +456,7 @@ if (($action=="create") || ($action=="edit"))
print "</td>";
print "</tr>\n";
- print '</table>';
+ print '</table>';
print '<div align="center"><br>';
print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 09e1f2fb1a8974c3e420d838070d33d7ec080b32..7eb253c9ade3d161d54ebd99574c1a8705b26f63 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -144,8 +144,8 @@ if ($result < 0)
print "<br><br>";
-print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n";
-print '<input type="hidden" name="status" value="'.$status.'" >';
+print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n";
+print '<input type="hidden" name="status" value="'.$status.'" >';
print '<table class="noborder">';
print '<tr class="liste_titre">';
@@ -190,8 +190,8 @@ print '</td>';
print '</tr>';
-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 '</table>';
-print '</from>';
+print '</from>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9c942cf2b997acfc46164539c198555814fc4936..e4a22c972859c70e72e1bdf64358a5524d30faa4 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 73e7c672e20eb20363fbcacf2acf6cfaa9fb154d..2c78a86cb9d9a537ad775d400b1ee6619b47a709 100755
--- a/htdocs/opensurvey/public/index.php
+++ b/htdocs/opensurvey/public/index.php
@@ -50,12 +50,12 @@ print '<center>
<div id="interface-header" style="">
<p id="application-description" class="pp-gris-fonce2">'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'</p>
</div><br>';
-print $langs->trans("OrganizeYourMeetingEasily").'
-<div class="corps">
-<br>
+print $langs->trans("OrganizeYourMeetingEasily").'
+<div class="corps">
+<br>
<div class="index_date"><div><img class="opacity" src="images/date.png" onclick="document.formulaire.date.click()"></div><button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"><img src="images/calendar-32.png" alt=""><strong> '.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'</strong></button></div>
-<div class="index_sondage"><div><img class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="images/chart-32.png" alt=""><strong> '.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></div>
-</div>
+<div class="index_sondage"><div><img class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="images/chart-32.png" alt=""><strong> '.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></div>
+</div>
</form></center>';
llxFooterSurvey();
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 79eaf5e701383a08a47a2ea7037c914e51212003..8fc1d97d23d5e443e2168cdc6f8030de1521b2f8 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 08f6198da6ba9a557b75d7e298c710226998973b..869c1976ffd755b8a954ec5a6d79acbcad4ff13e 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';