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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
daitingting
2018-07-03 09:41:46 +08:00
parent fd2754f293 7a37f6eaf4
commit c7164b95b0
13 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+5 -5
View File
@@ -71,7 +71,7 @@ class baseControl
* $post对象，用户可以通过$this->post->key来引用$_POST变量。
* The $post object, useer can access a post var by $this->post->key.
*
* @var ojbect
* @var object
* @access public
*/
public $post;
@@ -80,7 +80,7 @@ class baseControl
* $get对象，用户可以通过$this->get->key来引用$_GET变量。
* The $get object, useer can access a get var by $this->get->key.
*
* @var ojbect
* @var object
* @access public
*/
public $get;
@@ -89,7 +89,7 @@ class baseControl
* $session对象，用户可以通过$this->session->key来引用$_SESSION变量。
* The $session object, useer can access a session var by $this->session->key.
*
* @var ojbect
* @var object
* @access public
*/
public $session;
@@ -98,7 +98,7 @@ class baseControl
* $server对象，用户可以通过$this->server->key来引用$_SERVER变量。
* The $server object, useer can access a server var by $this->server->key.
*
* @var ojbect
* @var object
* @access public
*/
public $server;
@@ -107,7 +107,7 @@ class baseControl
* $cookie对象，用户可以通过$this->cookie->key来引用$_COOKIE变量。
* The $cookie object, useer can access a cookie var by $this->cookie->key.
*
* @var ojbect
* @var object
* @access public
*/
public $cookie;
framework/base/model.class.php
+6 -6
View File
@@ -72,7 +72,7 @@ class baseModel
* $post对象，用于访问$_POST变量。
* The $post object, used to access the $_POST var.
*
* @var ojbect
* @var object
* @access public
*/
public $post;
@@ -81,7 +81,7 @@ class baseModel
* $get对象，用于访问$_GET变量。
* The $get object, used to access the $_GET var.
*
* @var ojbect
* @var object
* @access public
*/
public $get;
@@ -90,7 +90,7 @@ class baseModel
* $session对象，用于访问$_SESSION变量。
* The $session object, used to access the $_SESSION var.
*
* @var ojbect
* @var object
* @access public
*/
public $session;
@@ -99,7 +99,7 @@ class baseModel
* $server对象，用于访问$_SERVER变量。
* The $server object, used to access the $_SERVER var.
*
* @var ojbect
* @var object
* @access public
*/
public $server;
@@ -108,7 +108,7 @@ class baseModel
* $cookie对象，用于访问$_COOKIE变量。
* The $cookie object, used to access the $_COOKIE var.
*
* @var ojbect
* @var object
* @access public
*/
public $cookie;
@@ -117,7 +117,7 @@ class baseModel
* $global对象，用于访问$_GLOBAL变量。
* The $global object, used to access the $_GLOBAL var.
*
* @var ojbect
* @var object
* @access public
*/
public $global;
framework/base/router.class.php
+6 -6
View File
@@ -270,7 +270,7 @@ class baseRouter
* $post对象，用于访问$_POST变量。
* The $post object, used to access the $_POST var.
*
* @var ojbect
* @var object
* @access public
*/
public $post;
@@ -279,7 +279,7 @@ class baseRouter
* $get对象，用于访问$_GET变量。
* The $get object, used to access the $_GET var.
*
* @var ojbect
* @var object
* @access public
*/
public $get;
@@ -288,7 +288,7 @@ class baseRouter
* $session对象，用于访问$_SESSION变量。
* The $session object, used to access the $_SESSION var.
*
* @var ojbect
* @var object
* @access public
*/
public $session;
@@ -297,7 +297,7 @@ class baseRouter
* $server对象，用于访问$_SERVER变量。
* The $server object, used to access the $_SERVER var.
*
* @var ojbect
* @var object
* @access public
*/
public $server;
@@ -306,7 +306,7 @@ class baseRouter
* $cookie对象，用于访问$_COOKIE变量。
* The $cookie object, used to access the $_COOKIE var.
*
* @var ojbect
* @var object
* @access public
*/
public $cookie;
@@ -2042,7 +2042,7 @@ class baseRouter
* @param string $moduleName the module name
* @param string $appName the app name
* @access public
* @return bool|ojbect the lang object or false.
* @return bool|object the lang object or false.
*/
public function loadLang($moduleName, $appName = '')
{
framework/router.class.php
+1 -1
View File
@@ -27,7 +27,7 @@ class router extends baseRouter
* @param string $moduleName the module name
* @param string $appName the app name
* @access public
* @return bool|ojbect the lang object or false.
* @return bool|object the lang object or false.
*/
public function loadLang($moduleName, $appName = '')
{
lib/base/dao/dao.class.php
+1 -1
View File
@@ -1618,7 +1618,7 @@ class baseSQL
*
* @param int $count
* @access public
* @return ojbect the sql object.
* @return object the sql object.
*/
public function markLeft($count = 1)
{
lib/base/filter/filter.class.php
+1 -1
View File
@@ -804,7 +804,7 @@ class baseFixer
* 处理的数据。
* The data to be fixed.
*
* @var ojbect
* @var object
* @access public
*/
public $data;
module/doc/model.php
+4 -3
View File
@@ -880,12 +880,13 @@ class docModel extends model
if($type == 'product' or $type == 'project')
{
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id');
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$fields = $type == 'product' ? "createdBy, createdDate" : "openedBy AS createdBy, openedDate AS createdDate";
$libs = $this->dao->select("id, name, `order`, {$fields}")->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id');
}
else
{
$libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id');
$libs = $this->dao->select('id, name, collector')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id');
}
return $libs;
module/git/model.php
+1 -1
View File
@@ -323,7 +323,7 @@ class gitModel extends model
*
* @param object $log
* @access public
* @return ojbect
* @return object
*/
public function convertLog($log)
{
module/svn/model.php
+1 -1
View File
@@ -311,7 +311,7 @@ class svnModel extends model
*
* @param object $log
* @access public
* @return ojbect
* @return object
*/
public function convertLog($log)
{
www/js/kindeditor/plugins/flash/flash.js
+3 -3
View File
@@ -24,9 +24,9 @@ KindEditor.plugin('flash', function(K) {
'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
'<span class="ke-button-common ke-button-outer">',
'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
'</span>',
//'<span class="ke-button-common ke-button-outer">',
//'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
//'</span>',
'</div>',
//width
'<div class="ke-dialog-row">',
www/js/kindeditor/plugins/image/image.js
+3 -3
View File
@@ -46,9 +46,9 @@ KindEditor.plugin('image', function(K) {
'<div class="ke-dialog-row">',
'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
'<span class="ke-button-common ke-button-outer">',
'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
'</span>',
//'<span class="ke-button-common ke-button-outer">',
//'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
//'</span>',
'</div>',
//size
'<div class="ke-dialog-row">',
www/js/kindeditor/plugins/insertfile/insertfile.js
+3 -3
View File
@@ -26,9 +26,9 @@ KindEditor.plugin('insertfile', function(K) {
'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
'<span class="ke-button-common ke-button-outer">',
'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
'</span>',
//'<span class="ke-button-common ke-button-outer">',
//'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
//'</span>',
'</div>',
//title
'<div class="ke-dialog-row">',
www/js/kindeditor/plugins/media/media.js
+3 -3
View File
@@ -24,9 +24,9 @@ KindEditor.plugin('media', function(K) {
'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
'<span class="ke-button-common ke-button-outer">',
'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
'</span>',
//'<span class="ke-button-common ke-button-outer">',
//'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
//'</span>',
'</div>',
//width
'<div class="ke-dialog-row">',