diff --git a/framework/control.class.php b/framework/control.class.php index d0ce254678..848194f79b 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -11,13 +11,13 @@ * May you share freely, never taking more than you give. */ -include dirname(__FILE__) . '/base/control.class.php'; /** * control基类继承与baseControl,所有模块的control类都派生于它。 * The base class of control extends baseControl. * * @package framework */ +include dirname(__FILE__) . '/base/control.class.php'; class control extends baseControl { } diff --git a/framework/helper.class.php b/framework/helper.class.php index 120aa4e161..d1414e0fe4 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -11,13 +11,13 @@ * May you share freely, never taking more than you give. */ -include dirname(__FILE__) . '/base/helper.class.php'; /** * 该类实现了一些常用的方法 * The helper class, contains the tool functions. * * @package framework */ +include dirname(__FILE__) . '/base/helper.class.php'; class helper extends baseHelper { } diff --git a/framework/model.class.php b/framework/model.class.php index f60df75833..678b85047d 100644 --- a/framework/model.class.php +++ b/framework/model.class.php @@ -11,13 +11,13 @@ * May you share freely, never taking more than you give. */ -include dirname(__FILE__) . '/base/model.class.php'; /** * model基类。 * The base class of model. * * @package framework */ +include dirname(__FILE__) . '/base/model.class.php'; class model extends baseModel { /** diff --git a/framework/router.class.php b/framework/router.class.php index d502e01606..17e4e114cf 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -11,13 +11,13 @@ * May you share freely, never taking more than you give. */ -include dirname(__FILE__) . '/base/router.class.php'; /** * router类。 * The router class. * * @package framework */ +include dirname(__FILE__) . '/base/router.class.php'; class router extends baseRouter { /** diff --git a/lib/base/filter/filter.class.php b/lib/base/filter/filter.class.php index 310ef7ebae..d59b62cb69 100644 --- a/lib/base/filter/filter.class.php +++ b/lib/base/filter/filter.class.php @@ -198,7 +198,7 @@ class baseValidater * IP checking. * * @param ip $var - * @param string $range all|public|static|public + * @param string $range all|public|static|private * @static * @access public * @return bool @@ -207,7 +207,7 @@ class baseValidater { if($range == 'all') return filter_var($var, FILTER_VALIDATE_IP); if($range == 'public static') return filter_var($var, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE); - if($range == 'public') + if($range == 'private') { if($var == '127.0.0.1' or filter_var($var, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE) === false) return true; return false;