Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'cyy_bug' into 'master'

Browse Source 
* Fix unlink file error.

See merge request easycorp/zentaopms!3115
This commit is contained in:
李玉春
2022-04-26 03:11:42 +00:00
parent 5acdc8964c 2df290f018
commit 2aa57d045b
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+3 -3
View File
@@ -2670,7 +2670,7 @@ EOD;
if($isFreepasswd) return print(js::locate($this->config->webRoot));
$this->session->set('ENTRY_CODE', $this->get->code);
$this->session->set('VALID_ENTRY', md5(md5($this->get->code) . $this->server->remote_addr));
$this->session->set('VALID_ENTRY', md5(md5($this->get->code) . helper::getRemoteIp()));
$this->loadModel('entry')->saveLog($entry->id, $this->server->request_uri);
/* Add for task #5384. */
@@ -2837,7 +2837,7 @@ EOD;
commonModel::$requestErrors = array();
if(!is_array($headers)) $headers = (array)$headers;
$headers[] = "API-RemoteIP: " . zget($_SERVER, 'REMOTE_ADDR', '');
$headers[] = "API-RemoteIP: " . helper::getRemoteIp();
$curl = curl_init();
curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
@@ -2924,7 +2924,7 @@ EOD;
commonModel::$requestErrors = array();
if(!is_array($headers)) $headers = (array)$headers;
$headers[] = "API-RemoteIP: " . zget($_SERVER, 'REMOTE_ADDR', '');
$headers[] = "API-RemoteIP: " . helper::getRemoteIp();
if($dataType == 'json')
{
$headers[] = 'Content-Type: application/json;charset=utf-8';
module/extension/model.php
+7 -4
View File
@@ -599,11 +599,11 @@ class extensionModel extends model
$file = $appRoot . $file;
if(!file_exists($file)) continue;
if(md5_file($file) != $savedMD5)
if(!is_writable($file) or @md5_file($file) != $savedMD5)
{
$removeCommands[] = PHP_OS == 'Linux' ? "rm -fr $file #changed" : "del $file :changed";
}
elseif(!@unlink($file))
elseif(!is_writable($file) or !@unlink($file))
{
$removeCommands[] = PHP_OS == 'Linux' ? "rm -fr $file" : "del $file";
}
@@ -617,7 +617,7 @@ class extensionModel extends model
foreach($dirs as $dir)
{
if(!is_dir($appRoot . $dir)) continue;
if(!rmdir($appRoot . $dir)) $removeCommands[] = PHP_OS == 'Linux' ? "rm -fr $appRoot$dir" : "rmdir $appRoot$dir /s /q";
if(!is_writable($appRoot . $dir) or !rmdir($appRoot . $dir)) $removeCommands[] = PHP_OS == 'Linux' ? "rm -fr $appRoot$dir" : "rmdir $appRoot$dir /s /q";
}
}
@@ -636,7 +636,10 @@ class extensionModel extends model
public function cleanModelCache()
{
$modelCacheFiles = glob($this->app->getTmpRoot() . 'model/*');
foreach($modelCacheFiles as $cacheFile) @unlink($cacheFile);
foreach($modelCacheFiles as $cacheFile)
{
if(is_writable($cacheFile) and !is_dir($cacheFile)) @unlink($cacheFile);
}
}
/**
module/sso/control.php
+3 -3
View File
@@ -26,7 +26,7 @@ class sso extends control
$this->app->loadConfig('sso');
if(!$this->config->sso->turnon) return print($this->locate($locate));
$userIP = $this->server->remote_addr;
$userIP = helper::getRemoteIp();
$code = $this->config->sso->code;
$key = $this->config->sso->key;
if($type != 'return')
@@ -135,7 +135,7 @@ class sso extends control
if($type != 'return')
{
$code = $this->config->sso->code;
$userIP = $this->server->remote_addr;
$userIP = helper::getRemoteIp();
$token = $this->get->token;
$key = $this->config->sso->key;
$auth = md5($code . $userIP . $token . $key);
@@ -199,7 +199,7 @@ class sso extends control
if(!$this->session->ssoData) return;
$ssoData = $this->session->ssoData;
$userIP = $this->server->remote_addr;
$userIP = helper::getRemoteIp();
$code = $this->config->sso->code;
$key = $this->config->sso->key;
if($ssoData->auth != md5($code . $userIP . $ssoData->token . $key)) return;
module/user/model.php
+1 -1
View File
@@ -888,7 +888,7 @@ class userModel extends model
if($user)
{
$ip = $this->server->remote_addr;
$ip = helper::getRemoteIp();
$last = $this->server->request_time;
$user->lastTime = $user->last;