lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: convert lines delimiters

Browse Source
This commit is contained in:
Regis Houssin 2013-06-24 17:36:33 +02:00
parent ba606bf2e9
commit 4cd6ae6bbd
8 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/account.php
View File

@ -762,7 +762,7 @@ if ($id > 0 || ! empty($ref))
print "</table>"; print "</table>";
print "</form>\n"; print "</form>\n";
dol_fiche_end(); dol_fiche_end();

92
htdocs/core/lib/cron.lib.php
View File

@ -75,53 +75,53 @@ function cron_prepare_head($object)
return $head; return $head;
} }
/** /**
* Show information with URLs to launch jobs * Show information with URLs to launch jobs
* *
* @return int 0 * @return int 0
*/ */
function dol_print_cron_urls() function dol_print_cron_urls()
{ {
global $conf, $langs, $user; global $conf, $langs, $user;
global $dolibarr_main_url_root; global $dolibarr_main_url_root;
// Define $urlwithroot // Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); $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=$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 //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
// Cron launch // Cron launch
print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>'; 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; $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 img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>'; 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'; $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 img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print '<br>'; print '<br>';
print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><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]'; $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 '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n";
print '<br>'; print '<br>';
// Add note // Add note
$linuxlike=1; $linuxlike=1;
if (preg_match('/^win/i',PHP_OS)) $linuxlike=0; if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0; if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
print $langs->trans("Note").': '; print $langs->trans("Note").': ';
if ($linuxlike) if ($linuxlike)
{ {
print $langs->trans("CronExplainHowToRunUnix"); print $langs->trans("CronExplainHowToRunUnix");
} }
else else
{ {
print $langs->trans("CronExplainHowToRunWin"); print $langs->trans("CronExplainHowToRunWin");
} }
return 0; return 0;
} }

2
htdocs/cron/card.php
View File

@ -456,7 +456,7 @@ if (($action=="create") || ($action=="edit"))
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '</table>'; print '</table>';
print '<div align="center"><br>'; print '<div align="center"><br>';
print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">'; print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';

10
htdocs/cron/list.php
View File

@ -144,8 +144,8 @@ if ($result < 0)
print "<br><br>"; print "<br><br>";
print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n"; print '<form method="GET" action="'.$url_form.'" name="search_form">'."\n";
print '<input type="hidden" name="status" value="'.$status.'" >'; print '<input type="hidden" name="status" value="'.$status.'" >';
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -190,8 +190,8 @@ print '</td>';
print '</tr>'; print '</tr>';
if (count($object->lines) > 0) if (count($object->lines) > 0)
{ {
// Loop on each active job // Loop on each active job
$style='impair'; $style='impair';
foreach($object->lines as $line) foreach($object->lines as $line)
@ -291,7 +291,7 @@ else
print '</table>'; print '</table>';
print '</from>'; print '</from>';

22
htdocs/main.inc.php
View File

@ -679,7 +679,7 @@ if (GETPOST('theme'))
$conf->theme=GETPOST('theme','alpha',1); $conf->theme=GETPOST('theme','alpha',1);
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
// Set javascript option // Set javascript option
if (! GETPOST('nojs')) // If javascript was not disabled on URL 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; $conf->dol_no_mouse_hover=1;
} }
// Disabled bugged themes // Disabled bugged themes
if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo')))
{ {
$conf->theme='eldy'; $conf->theme='eldy';
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
// Disabled bugged themes // Disabled bugged themes
if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo')))
{ {
$conf->theme='eldy'; $conf->theme='eldy';
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
if (! defined('NOREQUIRETRAN')) if (! defined('NOREQUIRETRAN'))

10
htdocs/opensurvey/public/index.php
View File

@ -50,12 +50,12 @@ print '<center>
<div id="interface-header" style=""> <div id="interface-header" style="">
<p id="application-description" class="pp-gris-fonce2">'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'</p> <p id="application-description" class="pp-gris-fonce2">'.$langs->trans("OpenSurveyDesc").' '.$langs->trans("OpenSurveyNoRegistration").'</p>
</div><br>'; </div><br>';
print $langs->trans("OrganizeYourMeetingEasily").' print $langs->trans("OrganizeYourMeetingEasily").'
<div class="corps"> <div class="corps">
<br> <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>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'</strong></button></div> <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>&nbsp;'.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>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></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>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></div>
</div> </div>
</form></center>'; </form></center>';
llxFooterSurvey(); llxFooterSurvey();

14
htdocs/public/cron/cron_run_jobs.php
View File

@ -43,10 +43,10 @@ dol_include_once("/cron/class/cronjob.class.php");
global $langs, $conf; global $langs, $conf;
// Language Management // Language Management
$langs->load("admin"); $langs->load("admin");
$langs->load("cron"); $langs->load("cron");
@ -101,9 +101,9 @@ if (! empty($id))
{ {
if (! is_numeric($id)) if (! is_numeric($id))
{ {
echo "Error: Bad value for parameter job id"; echo "Error: Bad value for parameter job id";
dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING); dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
exit; exit;
} }
$filter=array(); $filter=array();
$filter['t.rowid']=$id; $filter['t.rowid']=$id;

6
htdocs/theme/bureau2crea/style.css.php
View File

@ -58,9 +58,9 @@ $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12';
$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$path=''; // This value may be used in future for external module to overwrite theme $path=''; // This value may be used in future for external module to overwrite theme
$theme='bureau2crea'; // Value of 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; } 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 // Define image path files
$fontlist='arial, sans-serif, verdana, helvetica'; $fontlist='arial, sans-serif, verdana, helvetica';