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

Fix datadir not defined

Browse Source 
Fix can't use the cron script on cloud services since the admin user may
have different values.
This commit is contained in:
Laurent Destailleur 2016-07-06 22:49:08 +02:00
parent d22ef4f371
commit 16e3a3d294
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/exe/doliwamp/doliwamp.iss
View File

@ -314,6 +314,7 @@ function NextButtonClick(CurPageID: Integer): Boolean;
var myResult: Integer; var myResult: Integer;
var res: Boolean; var res: Boolean;
var paramok: Boolean; var paramok: Boolean;
var datadir: String;
var exedirold: String; var exedirold: String;
var exedirnew: String; var exedirnew: String;
var themessage: String; var themessage: String;

23
scripts/cron/cron_run_jobs.php
View File

@ -80,6 +80,23 @@ if ($key != $conf->global->CRON_KEY)
exit(-1); exit(-1);
} }
// If param userlogin is reserved word 'firstadmin'
if ($userlogin == 'firstadmin')
{
$sql='SELECT login from '.MAIN_DB_PREFIX.'user WHERE admin = 1 ORDER BY entity LIMIT 1';
$resql=$db->query($sql);
if ($resql)
{
$obj=$db->fetch_object($resql);
if ($obj)
{
$userlogin = $obj->login;
echo "First admin user found is login '".$userlogin."'\n<br>";
}
}
else dol_print_error($db);
}
// Check user login // Check user login
$user=new User($db); $user=new User($db);
$result=$user->fetch('',$userlogin); $result=$user->fetch('',$userlogin);
@ -93,8 +110,8 @@ else
{ {
if (empty($user->id)) if (empty($user->id))
{ {
echo " User user login: ".$userlogin." do not exists"; echo "User user login: ".$userlogin." does not exists";
dol_syslog(" User user login:".$userlogin." do not exists", LOG_ERR); dol_syslog("User user login:".$userlogin." does not exists", LOG_ERR);
exit(-1); exit(-1);
} }
} }
@ -178,7 +195,7 @@ function usage($path,$script_file)
{ {
global $conf; global $conf;
print "Usage: ".$script_file." securitykey userlogin [cronjobid]\n"; print "Usage: ".$script_file." securitykey userlogin|'firstadmin' [cronjobid]\n";
print "The script return 0 when everything worked successfully.\n"; print "The script return 0 when everything worked successfully.\n";
print "\n"; print "\n";
print "On Linux system, you can have cron jobs ran automatically by adding an entry into cron.\n"; print "On Linux system, you can have cron jobs ran automatically by adding an entry into cron.\n";