From e6c4c7796f5bfb215e4fe36dfebc65f9a40e3408 Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 14 Nov 2012 07:00:12 -0500 Subject: [PATCH] - Removed billing module cron jobs from cron_daily.sh and added billing module container cron job script cron_daily_billing.sh which contains all billing module related daily cron jobs. --- server/plugins-available/mysql_clientdb_plugin.inc.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index df840ee..101b2cc 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -364,7 +364,7 @@ } - if($data['old']['database_user'] == $data['new']['database_user'] && $data['old']['database_password'] == $data['new']['database_password']) { + if($data['old']['database_user'] == $data['new']['database_user'] && ($data['old']['database_password'] == $data['new']['database_password'] || $data['new']['database_password'] == '')) { return; } @@ -390,7 +390,7 @@ $app->log('Renaming MySQL user: '.$data['old']['database_user'].' to '.$data['new']['database_user'],LOGLEVEL_DEBUG); } - if($data['new']['database_password'] != $data['old']['database_password']) { + if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') { $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed $app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG); } -- Gitblit v1.9.1