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

Fix: Bad url for cron

Browse Source 
Fix: must use html syntax, not xml
This commit is contained in:
Laurent Destailleur 2014-07-28 20:30:31 +02:00
parent c20256f702
commit bcd441cc1e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,10 +93,10 @@ function dol_print_cron_urls()
// 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>';

8
htdocs/cron/list.php
View File

@ -123,13 +123,13 @@ print $langs->trans('CronInfo');
if ($action == 'delete') if ($action == 'delete')
{ {
print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"),$langs->trans("CronConfirmDelete"),"confirm_delete",'','',1); print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"),$langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
} }
if ($action == 'execute') if ($action == 'execute')
{ {
print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
} }
// liste des jobs creer // liste des jobs creer
@ -218,13 +218,13 @@ if (count($object->lines) > 0)
print $langs->trans('CronObject').':'. $line->objectname.'<BR>'; print $langs->trans('CronObject').':'. $line->objectname.'<BR>';
print $langs->trans('CronMethod').':'. $line->methodename; print $langs->trans('CronMethod').':'. $line->methodename;
if(!empty($line->params)) { if(!empty($line->params)) {
print '<BR/>'.$langs->trans('CronArgs').':'. $line->params; print '<br>'.$langs->trans('CronArgs').':'. $line->params;
} }
}elseif ($line->jobtype=='command') { }elseif ($line->jobtype=='command') {
print $langs->trans('CronCommand').':'. dol_trunc($line->command); print $langs->trans('CronCommand').':'. dol_trunc($line->command);
if(!empty($line->params)) { if(!empty($line->params)) {
print '<BR/>'.$langs->trans('CronArgs').':'. $line->params; print '<br>'.$langs->trans('CronArgs').':'. $line->params;
} }
} }
print '</td>'; print '</td>';

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

@ -59,19 +59,19 @@ $langs->load("cron");
$key = GETPOST('securitykey','alpha'); $key = GETPOST('securitykey','alpha');
if (empty($key)) if (empty($key))
{ {
echo 'securitykey is require'; echo 'Securitykey is required. Check setup of cron jobs module.';
exit; exit;
} }
if($key != $conf->global->CRON_KEY) if($key != $conf->global->CRON_KEY)
{ {
echo 'securitykey is wrong'; echo 'Securitykey is wrong.';
exit; exit;
} }
// Check the key, avoid that a stranger starts cron // Check the key, avoid that a stranger starts cron
$userlogin = GETPOST('userlogin','alpha'); $userlogin = GETPOST('userlogin','alpha');
if (empty($userlogin)) if (empty($userlogin))
{ {
echo 'userlogin is require'; echo 'Userlogin is required.';
exit; exit;
} }
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@ -175,7 +175,7 @@ if (is_array($object->lines) && (count($object->lines)>0))
} }
else else
{ {
echo "No active jobs found"; echo "Result: No active jobs found.";
} }
$db->close(); $db->close();