Code formatting
This commit is contained in:
@ -51,7 +51,7 @@ abstract class Action
|
|||||||
protected function getTemplate()
|
protected function getTemplate()
|
||||||
{
|
{
|
||||||
$class = get_class($this);
|
$class = get_class($this);
|
||||||
$template = ($this->template) ? $this->template : substr($class, 0, -6/*strlen('Action')*/);
|
$template = ($this->template) ? $this->template : substr($class, 0, -6 /*strlen('Action')*/);
|
||||||
$dir = array_slice(explode('/', Load::getFilePath($class)), -2, 1);
|
$dir = array_slice(explode('/', Load::getFilePath($class)), -2, 1);
|
||||||
return '/actions/' . array_pop($dir) . '/' . $template;
|
return '/actions/' . array_pop($dir) . '/' . $template;
|
||||||
}
|
}
|
||||||
|
@ -12,11 +12,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* базовый класс для всей экшенов выполняющихся по аякс-запросу
|
* базовый класс для всей экшенов выполняющихся по аякс-запросу
|
||||||
*/
|
*/
|
||||||
abstract class AjaxAction extends Action
|
abstract class AjaxAction extends Action
|
||||||
{
|
{
|
||||||
public $data = 1;
|
public $data = 1;
|
||||||
|
|
||||||
protected $encode = true;
|
protected $encode = true;
|
||||||
|
|
||||||
function __construct()
|
function __construct()
|
||||||
|
@ -12,8 +12,11 @@
|
|||||||
class PagerAction extends Action
|
class PagerAction extends Action
|
||||||
{
|
{
|
||||||
public $page = 1;
|
public $page = 1;
|
||||||
|
|
||||||
public $last_page = 1;
|
public $last_page = 1;
|
||||||
|
|
||||||
protected $offset = 0;
|
protected $offset = 0;
|
||||||
|
|
||||||
protected $limit;
|
protected $limit;
|
||||||
|
|
||||||
public function __construct($limit = 20)
|
public function __construct($limit = 20)
|
||||||
@ -48,7 +51,7 @@ class PagerAction extends Action
|
|||||||
|
|
||||||
protected function getTemplate()
|
protected function getTemplate()
|
||||||
{
|
{
|
||||||
$template = ($this->template) ? $this->template : substr(get_class($this), 0, -6/*strlen('Action')*/);
|
$template = ($this->template) ? $this->template : substr(get_class($this), 0, -6 /*strlen('Action')*/);
|
||||||
return '/actions/' . $template;
|
return '/actions/' . $template;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -14,7 +14,7 @@ abstract class StaticAction extends Action
|
|||||||
|
|
||||||
protected function getTemplate()
|
protected function getTemplate()
|
||||||
{
|
{
|
||||||
$template = ($this->template) ? $this->template : substr(get_class($this), 0, -6/*strlen('Action')*/);
|
$template = ($this->template) ? $this->template : substr(get_class($this), 0, -6 /*strlen('Action')*/);
|
||||||
return '/static/' . $template;
|
return '/static/' . $template;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
1
cache/CacheKey.php
vendored
1
cache/CacheKey.php
vendored
@ -21,6 +21,7 @@ class CacheKey
|
|||||||
* @var CacheKey
|
* @var CacheKey
|
||||||
*/
|
*/
|
||||||
protected $key;
|
protected $key;
|
||||||
|
|
||||||
protected $expire = 0;
|
protected $expire = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
1
cache/Cacher.php
vendored
1
cache/Cacher.php
vendored
@ -19,7 +19,6 @@ class Cacher
|
|||||||
*/
|
*/
|
||||||
static protected $caches = array();
|
static protected $caches = array();
|
||||||
|
|
||||||
|
|
||||||
static public function get($cacher, $config = null)
|
static public function get($cacher, $config = null)
|
||||||
{
|
{
|
||||||
if (!isset(self::$caches[$cacher])) {
|
if (!isset(self::$caches[$cacher])) {
|
||||||
|
@ -13,7 +13,9 @@ class Captcha
|
|||||||
{
|
{
|
||||||
|
|
||||||
protected $font_size = 38;
|
protected $font_size = 38;
|
||||||
|
|
||||||
protected $width = 200;
|
protected $width = 200;
|
||||||
|
|
||||||
protected $height = 70;
|
protected $height = 70;
|
||||||
|
|
||||||
|
|
||||||
@ -48,7 +50,7 @@ class Captcha
|
|||||||
imagettftext($image, $this->font_size, 0,
|
imagettftext($image, $this->font_size, 0,
|
||||||
rand($i + 2, $i + 4), ($this->font_size + $this->height) / 2,
|
rand($i + 2, $i + 4), ($this->font_size + $this->height) / 2,
|
||||||
$color, $font, $letter);
|
$color, $font, $letter);
|
||||||
$i = $i + $step ;
|
$i = $i + $step;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,7 +73,7 @@ class Captcha
|
|||||||
|
|
||||||
public function checkCode($token, $code)
|
public function checkCode($token, $code)
|
||||||
{
|
{
|
||||||
if (Session::get('_ctoken') == $token && Session::get('_ccode') == strtoupper($code)){
|
if (Session::get('_ctoken') == $token && Session::get('_ccode') == strtoupper($code)) {
|
||||||
// Housekeeping
|
// Housekeeping
|
||||||
Session::del('_ccode');
|
Session::del('_ccode');
|
||||||
Session::del('_ctoken');
|
Session::del('_ctoken');
|
||||||
|
@ -17,7 +17,7 @@ class ErrorHandler
|
|||||||
set_error_handler(array('ErrorHandler', 'error_handler'));
|
set_error_handler(array('ErrorHandler', 'error_handler'));
|
||||||
}
|
}
|
||||||
|
|
||||||
static public function error_handler($errno, $errstr, $errfile, $errline )
|
static public function error_handler($errno, $errstr, $errfile, $errline)
|
||||||
{
|
{
|
||||||
ob_clean();
|
ob_clean();
|
||||||
throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
|
throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
|
||||||
@ -28,16 +28,16 @@ class ErrorHandler
|
|||||||
{
|
{
|
||||||
$code = array();
|
$code = array();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach(file($file) as $line) {
|
foreach (file($file) as $line) {
|
||||||
$i++;
|
$i++;
|
||||||
if($i >= $hiline - 10 && $i <= $hiline + 10) {
|
if ($i >= $hiline - 10 && $i <= $hiline + 10) {
|
||||||
if ($i == $hiline) {
|
if ($i == $hiline) {
|
||||||
$code[] = '<tr class="error"><th>' . $i . '</th><td><span class="specific">' . htmlentities($line, ENT_QUOTES, 'UTF-8') . '</span></td></tr>';
|
$code[] = '<tr class="error"><th>' . $i . '</th><td><span class="specific">' . htmlentities($line, ENT_QUOTES, 'UTF-8') . '</span></td></tr>';
|
||||||
}else{
|
} else {
|
||||||
$code[] = '<tr><th>' . $i . '</th><td>' . htmlentities($line, ENT_QUOTES, 'UTF-8') . '</td></tr>';
|
$code[] = '<tr><th>' . $i . '</th><td>' . htmlentities($line, ENT_QUOTES, 'UTF-8') . '</td></tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($i > $hiline + 10) {
|
if ($i > $hiline + 10) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -88,7 +88,7 @@ class ErrorHandler
|
|||||||
$cookies = self::wrapArray(Env::Cookie(), 'COOKIE');
|
$cookies = self::wrapArray(Env::Cookie(), 'COOKIE');
|
||||||
$server = self::wrapArray(Env::Server(), 'SERVER');
|
$server = self::wrapArray(Env::Server(), 'SERVER');
|
||||||
|
|
||||||
$message =<<<EOD
|
$message = <<<EOD
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
|
Reference in New Issue
Block a user