diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php index 50fcdd1268..a4491fc604 100644 --- a/lib/base/filter/filter.class.php +++ b/lib/base/filter/filter.class.php @@ -751,7 +751,7 @@ class baseValidater global $filter; if(strpos($rule, '::') !== false) list($operator, $param) = explode('::', $rule); - if(strpos($rule,'::') === false) list($operator, $param) = array($rule, ''); + if(strpos($rule, '::') === false) list($operator, $param) = array($rule, ''); if($operator == 'reg' and isset($filter->rules->$param)) $param = $filter->rules->$param; return array($operator, $param); diff --git a/module/file/model.php b/module/file/model.php index d8a6265862..bab81be066 100644 --- a/module/file/model.php +++ b/module/file/model.php @@ -627,7 +627,8 @@ class fileModel extends model public function processImgURL($data, $editorList, $uid = '') { if(is_string($editorList)) $editorList = explode(',', str_replace(' ', '', $editorList)); - $readLinkReg = basename(helper::createLink('file', 'read', 'fileID=(%fileID%)', '(\w+)')); + $readLinkReg = helper::createLink('file', 'read', 'fileID=(%fileID%)', '(\w+)'); + $readLinkReg = str_replace($this->config->webRoot, '', $readLinkReg); $readLinkReg = str_replace(array('%fileID%', '?'), array('[0-9]+', '\?'), $readLinkReg); foreach($editorList as $editorID) { diff --git a/module/report/view/dailyreminder.html.php b/module/report/view/dailyreminder.html.php index 714817473e..2c42f4106f 100755 --- a/module/report/view/dailyreminder.html.php +++ b/module/report/view/dailyreminder.html.php @@ -6,7 +6,7 @@
| - | + | webRoot, $url . $config->webRoot, 'target="_blank"');?> |