From 5f47747ab6da20e578f99cfbe5d42651bbe178b2 Mon Sep 17 00:00:00 2001 From: liwenrui Date: Wed, 31 Jan 2024 10:25:37 +0800 Subject: [PATCH] * fix various sql errors for zentaoclient. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a771d54212..d2fb5ee45a 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,6 @@ zentaoxx: sed -i "/foreach(\$$users as \$$user)/i \$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\$$adminArray = explode(',', \$$admins);" zentaoxx/extension/xuan/im/model/user.php sed -i "/if(\!isset(\$$user->signed)) \$$user->signed = 0;/a \$$user->admin = in_array(\$$user->account, \$$adminArray) ? 'super' : '';" zentaoxx/extension/xuan/im/model/user.php sed -i "/updateUser->ping/d" zentaoxx/extension/xuan/im/model/user.php - sed -i "s/updateUser->last\s*=\s*helper::now/updateUser->last = time/" zentaoxx/extension/xuan/im/model/user.php sed -i "s/\$$user = \$$this->user->login(\$$account, \$$user->password);/\$$user = \$$this->user->login(\$$user);\n\$$url .= \$$this->config->requestType == 'GET' ? '\&' : '?';\n\$$url .= \"{\$$this->config->sessionVar}={\$$this->app->sessionID}\";\n/" zentaoxx/extension/xuan/im/control.php sed -i "s/\$$file->fullURL/\$$file->webPath/" zentaoxx/extension/xuan/im/control.php sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/_0_xuanxuan.php @@ -131,6 +130,7 @@ zentaoxx: sed -i "/loadModel('push')/d" zentaoxx/extension/xuan/im/control.php sed -i "/this->push/d" zentaoxx/extension/xuan/im/control.php sed -i "s/(int)(microtime/(double)(microtime/" zentaoxx/extension/xuan/im/control.php + sed -i -z 's/class im extends control\n{/class im extends control\n{ public function __construct($$moduleName = '', $$methodName = '') { parent::__construct($$moduleName, $$methodName); $$this->dao->exec("SET @@sql_mode=''"); }/' zentaoxx/extension/xuan/im/control.php # use strict mode later. sed -i "s/'yahoo', //g" zentaoxx/extension/xuan/im/config.php sed -i "s/'gtalk', //g" zentaoxx/extension/xuan/im/config.php sed -i "s/'wangwang', //g" zentaoxx/extension/xuan/im/config.php