Merge branch 'fix_feedback_1694' into 'master'

* Fix feedback #1694.

See merge request easycorp/zentaopms!6502

module/common/model.php

@@ -395,9 +395,9 @@ class commonModel extends model
     /**
      * Deny access.
      *
-     * @param  varchar  $module
-     * @param  varchar  $method
-     * @param  bool     $reload
+     * @param  string  $module
+     * @param  string  $method
+     * @param  bool    $reload
      * @access public
      * @return mixed
      */
@@ -2486,6 +2486,8 @@ EOD;
         }
         catch(EndResponseException $endResponseException)
         {
+            if($this->app->getViewType() == 'json' || (defined('RUN_MODE') && RUN_MODE == 'api')) die($endResponseException->getContent());
+
             echo $endResponseException->getContent();
         }
     }

module/user/control.php

@@ -1090,8 +1090,7 @@ class user extends control
         }
 
         /* Remove the real path for security reason. */
-        $pathPos       = strrpos($this->app->getBasePath(), DIRECTORY_SEPARATOR, -2);
-        $resetFileName = substr($resetFileName, $pathPos + 1);
+        $resetFileName = str_replace($this->app->getBasePath(), '', $resetFileName);
 
         $this->view->title          = $this->lang->user->resetPassword;
         $this->view->status         = 'reset';