libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Обьединение с namespace

Browse source
This commit is contained in:
CORP\phedor 2018-03-28 11:15:16 +03:00
commit 8b38b2a3cc
90 changed files with 601 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

4
composer.json
View file

@ -8,8 +8,8 @@
}
],
"autoload": {
"psr-0": {
"": "src/"
"psr-4": {
"ctiso\\": "src/"
}
}
}

3
src/Adapter.php
View file

@ -1,5 +1,8 @@
<?php
namespace ctiso;
/**
* Интерфейс к массиву и обьекту как к коллекции
*/

3
src/Arr.php
View file

@ -1,5 +1,8 @@
<?php
namespace ctiso;
class Arr {
static function get($data, $key, $default = null) {
return isset($data[$key]) ? $data[$key] : $default;

11
src/Collection.php
View file

@ -1,9 +1,12 @@
<?php
namespace ctiso;
/**
* Коллекция
*
*/
class Collection implements ArrayAccess
class Collection implements \ArrayAccess
{
/**
* Holds collective request data
@ -58,17 +61,17 @@ class Collection implements ArrayAccess
public function getInt($key, $default = 0)
{
return intval($this->get($key, $default));
return (int)$this->get($key, $default);
}
public function getString($key, $default = '')
{
return ((string) $this->get($key, $default));
return (string)$this->get($key, $default);
}
public function getNat($key, $default = 1)
{
$result = intval($this->get($key, $default));
$result = (int)$this->get($key, $default);
return (($result > 0) ? $result : $default);
}

5
src/Connection/HttpRequest.php
View file

@ -1,6 +1,9 @@
<?php
class Connection_HttpRequest
namespace ctiso\Connection;
use ctiso\File;
class HttpRequest
{
const POST = "POST";
const GET = "GET";

14
src/Connection/HttpResponse.php
View file

@ -3,7 +3,9 @@
/**
* Обрабатывает HTTP ответ
*/
class Connection_HttpResponse
namespace ctiso\Connection;
class HttpResponse
{
private $offset;
private $param = array ();
@ -36,12 +38,12 @@ class Connection_HttpResponse
if (isset($this->param['Transfer-Encoding']) && $this->param['Transfer-Encoding'] == 'chunked') {
//$this->data = substr($this->response, $this->offset);
$line = hexdec($this->getLine());
$index = hexdec($this->getLine());
$chunk = array();
while ($line > 0) {
$chunk [] = substr($this->response, $this->offset, $line);
$this->offset += $line;
$line = hexdec($this->getLine());
while ($index > 0) {
$chunk [] = substr($this->response, $this->offset, $index);
$this->offset += $index;
$index = hexdec($this->getLine());
}
$this->data = implode("", $chunk);

19
src/Controller/Action.php
View file

@ -1,5 +1,16 @@
<?php
namespace ctiso\Controller;
use ctiso\Shortcut,
Exception,
ctiso\Path,
ctiso\View\View,
ctiso\Model\Factory,
ctiso\HttpRequest,
ctiso\Functions,
ctiso\Settings,
ctiso\Controller\State;
function forceUrl($name)
{
if (is_callable($name)) {
@ -11,7 +22,7 @@ function forceUrl($name)
/**
* Контроллер страниц
*/
class Controller_Action
class Action
{
const TEMPLATE_EXTENSION = ".html"; // Расширение для шаблонов
@ -78,7 +89,7 @@ class Controller_Action
return Path::join(CMS_PATH, "modules", $name);
}
public function addSuggest(View_View $view, $name)
public function addSuggest(View $view, $name)
{
$suggest = array();
$file = Path::join($this->viewPath, 'help', $name . '.suggest');
@ -141,7 +152,7 @@ class Controller_Action
public function getModel($name)
{
if (!$this->factory) {
$this->factory = new Model_Factory($this->db, $this->_registry);
$this->factory = new Factory($this->db, $this->_registry);
}
return $this->factory->getModel($name);
}
@ -364,7 +375,7 @@ class Controller_Action
function _getActionPath()
{
return new Controller_State('index');
return new State('index');
}
// Тоже убрать в метод Controller_Model

64
src/Controller/Component.php
View file

@ -1,7 +1,20 @@
<?php
namespace ctiso\Controller;
use ctiso\HttpRequest,
ctiso\Arr,
ctiso\Path,
PHPTAL,
PHPTAL_PreFilter_Normalize,
ctiso\File,
ctiso\Form\Form,
ctiso\Form\OptionFactory,
ctiso\Database,
ctiso\Collection,
ctiso\Controller\Site;
function replaceContent($match) {
$result = phptal_component(htmlspecialchars_decode($match[3]));
$result = Tales\Component::phptal_component(htmlspecialchars_decode($match[3]));
return $result;
}
@ -38,10 +51,27 @@ class ComponentRequest {
}
}
class FakeTemplate {
public $_data = [];
public $_name = '';
function __construct($name) {
$this->_name = $name;
}
function __set($key, $value) {
$this->_data[$key] = $value;
}
function execute() {
return $this->_data;
}
}
/**
* Класс компонента
*/
class Controller_Component
class Component
{
public $viewPath = array();
public $webPath = array();
@ -56,6 +86,7 @@ class Controller_Component
public /*.Settings.*/$registry;
public /*.Database.*/$db;
public /*.Collection.*/$parameter;
public $output = 'html';
public $module;
public $item_module;
@ -86,6 +117,10 @@ class Controller_Component
public function getView($name)
{
if ($this->output == 'json') {
return new FakeTemplate($name);
}
//
/*.Settings.*/$registry = $this->registry;
$template = ($this->template) ? $this->template : $registry->readKey(array('system', 'template'));
@ -164,8 +199,18 @@ class Controller_Component
return $result;
}
function findFile($pathList, $name) {
foreach($pathList as $item) {
$filename = Path::join($item, $name);
if (file_exists($filename)) {
return $filename;
}
}
return null;
}
function getInfo() {
$filename = Path::join($this->viewPath[0], 'install.json');
$filename = $this->findFile($this->viewPath, 'install.json');
if (file_exists($filename)) {
$settings = json_decode(File::getContents($filename), true);
return $settings;
@ -178,8 +223,8 @@ class Controller_Component
*/
public function setParameters(/*.View_Composite.*/$view)
{
$form = new Form_Form();
$options = new Form_OptionFactory($this->db, $this->registry);
$form = new Form();
$options = new OptionFactory($this->db, $this->registry);
$settings = $this->getInfo();
$form->addFieldList($settings['parameter'], $options);
@ -262,14 +307,14 @@ class Controller_Component
}
$params = new Collection();
$params->import(array_merge($_GET, $arguments));
$params->import($arguments);
$component->parameter = $params;
$component->template = $params->get('template', false);
$editor = $component->getEditUrl();
if ($editor) {
if(class_exists("Controller_Site")){ //Если мы в CMS2
$instance = Controller_Site::getInstance();
if(class_exists("Controller_Site")) { //Если мы в CMS2
$instance = Site::getInstance();
$instance->componentsConfig[] = $editor;
} else {
global $componentsConfig;
@ -324,10 +369,9 @@ class Controller_Component
*/
function addRequireJsPath($name, $path, $shim = null) {
Controller_Site::addRequireJsPath($name, $path, $shim);
Site::addRequireJsPath($name, $path, $shim);
}
function actionIndex(/*.ComponentRequest.*/ $request) {
}
}

36
src/Controller/Front.php
View file

@ -4,7 +4,18 @@
* Первичный контроллер контроллер страниц
* @package system.controller
*/
class Controller_Front extends Controller_Action
namespace ctiso\Controller;
use ctiso\Controller\Action,
ctiso\Settings,
ctiso\Database,
ctiso\Collection,
ctiso\Filter\ActionAccess,
ctiso\Filter\ActionLogger,
ctiso\Path;
ctiso\UserMessageException,
ctiso\HttpRequest;
class Front extends Action
{
/** @var Shortcut */
@ -18,16 +29,14 @@ class Controller_Front extends Controller_Action
* @param Settings $_registry
* @param Shortcut $_shortcut
*/
public function __construct($db, $settings, $default) // $db, $installer, $shortcut
{
public function __construct($db, $settings, $default) {
parent::__construct();
$this->settings = $settings;
$this->db = $db;
$this->default = $default;
}
public function isLoaded($name)
{
public function isLoaded($name) {
return isset($this->modules[$name]);
}
@ -37,7 +46,7 @@ class Controller_Front extends Controller_Action
* @param request $request Имя модуля
* @return string
*/
public function loadModule($name, Collection $request, $controller = false)
public function loadModule($name, Collection $request, $controller = null)
{
if ($this->isLoaded($name)) {
$module = $this->modules[$name];
@ -47,7 +56,9 @@ class Controller_Front extends Controller_Action
$basePath = $this->settings['system']->readKey(['path', 'modules']);
$moduleFile = Path::join($basePath, $name, 'classes', $controller ? $controller : $name);
$module = $this->loadClass($moduleFile, null, 'Module_');
$ucname = ucfirst($name);
$moduleClass = "Module\\$ucname\\$ucname";
$module = new $moduleClass();
if ($module) {
// Инициализация модуля
$modPath = Path::join($basePath, $name);
@ -57,10 +68,10 @@ class Controller_Front extends Controller_Action
$module->settings = $this->settings;
$module->db = $this->db;
// Ведение лога
$logger = new Filter_ActionLogger($module);
$logger = new ActionLogger($module);
$logger->before = $this->loadSettings(Path::join($modPath, 'filter', 'logger.php'));
// Управление доступом
$module->access = new Filter_ActionAccess($logger);
$module->access = new ActionAccess($logger);
$module->access->access = $this->loadSettings(Path::join($modPath, 'filter', 'access.php'));
$module->setUp();
@ -72,13 +83,14 @@ class Controller_Front extends Controller_Action
return null; // throw new FileNotFoundException();
}
public function execute(HTTPRequest $request)
public function execute(HttpRequest $request)
{
$name = explode("_", $request->get('module', $this->default));
$name = explode("\\", $request->get('module', $this->default));
if (count($name) >= 2) {
$controller = $name[1];
} else {
$controller = false;
$controller = null;
}
try {
return $this->loadModule($name[0], $request, $controller);

13
src/Controller/Installer.php
View file

@ -1,6 +1,11 @@
<?php
class Controller_Installer
namespace ctiso\Controller;
use ctiso\Settings,
ctiso\Path,
ctiso\Database\JsonInstall;
class Installer
{
protected $db_manager;
protected $installPath;
@ -44,7 +49,7 @@ class Controller_Installer
function installSQL(array $sql, $version_new, $version_old, $name)
{
$result = [];
$json_installer = new Database_JsonInstall($this->db_manager);
$json_installer = new JsonInstall($this->db_manager);
foreach ($sql as $version => $install) {
if (version_compare($version, $version_new, "<=") && version_compare($version, $version_old, ">")) {
$file = Path::join(call_user_func($this->installPath, $name), "sql", $install);
@ -58,7 +63,7 @@ class Controller_Installer
function uninstall($name){
$uninstall = $this->getUninstallFile($name);
if (file_exists($uninstall)) {
$json_installer = new Database_JsonInstall($this->db_manager);
$json_installer = new JsonInstall($this->db_manager);
$json_installer->install($uninstall,null);
}
$this->_registry->removeKey($name);
@ -108,7 +113,7 @@ class Controller_Installer
}
function install($dbinit_path, $dbfill_path = null) {
$json_installer = new Database_JsonInstall($this->db_manager);
$json_installer = new JsonInstall($this->db_manager);
$json_installer->install($dbinit_path, $dbfill_path);
}
}

12
src/Controller/Request.php
View file

@ -1,13 +1,19 @@
<?php
class Controller_Request {
function __construct($request, $id) {
namespace ctiso\Controller;
class Request {
public $r;
public $id;
function __construct(/*.HttpRequest.*/$request, $id) {
$this->r = $request;
$this->id = $id;
}
function get($name) {
function get($name, $def) {
$v = $this->r->get($name);
$id = $this->id;
if ($id && is_array($v)) {
return isset($v[$id]) ? $v[$id] : $def;
}

12
src/Controller/Service.php
View file

@ -3,14 +3,20 @@
/**
* Класс сервиса = Упрощенный компонент
*/
class Controller_Service
namespace ctiso\Controller;
use ctiso\Path;
class Service
{
public $viewPath = array();
public $viewPath = [];
public $webPath = [];
public $registry; // Registry->getInstance
public $template;
public $templatePath;
public $COMPONENTS_WEB;
public $db;
public function getTemplatePath($name)
{
return Path::join($this->viewPath[0], 'templates', 'modern', $name);
@ -43,7 +49,7 @@ class Controller_Service
return $model;
}
public function options($key, $val, $res) {
public function options($key, $val, /*.Database_PDOStatement.*/$res) {
$result = array();
while($res->next()) {
$result[] = array('value' => $res->getInt($key), 'name' => $res->getString($val));

11
src/Controller/State.php
View file

@ -1,6 +1,9 @@
<?php
class Controller_State
namespace ctiso\Controller;
use ctiso\Controller\Action;
class State
{
public $action = '';
public $states = array();
@ -13,7 +16,7 @@ class Controller_State
static function make($action)
{
return new Controller_State($action);
return new State($action);
}
public function addTitle($name, $url = array())
@ -22,7 +25,7 @@ class Controller_State
return $this;
}
public function addState(Controller_State $state)
public function addState(State $state)
{
$this->states [$state->getAction()] = $state;
return $this;
@ -49,7 +52,7 @@ class Controller_State
return false;
}
function makeTitle(Controller_Action $module)
function makeTitle(Action $module)
{
foreach ($this->titles as $item) {
$module->path->addMenuItem($module->nUrl($this->action, $item[1]), $item[0]);

10
src/Database.php
View file

@ -1,6 +1,10 @@
<?php
///<reference path="Database/PDOStatement.php" />
require_once "Database/PDOStatement.php";
namespace ctiso;
use PDO,
ctiso\Database\Statement,
ctiso\Database\IdGenerator;
/**
* Класс оболочка для PDO для замены Creole
@ -64,7 +68,7 @@ class Database extends PDO
public function prepareStatement($query)
{
return new Database_Statement($query, $this);
return new Statement($query, $this);
}
// Для совместимости со старым представлением баз данных CIS
@ -161,7 +165,7 @@ class Database extends PDO
}
function getIdGenerator() {
return new Database_IdGenerator($this);
return new IdGenerator($this);
}
/**

7
src/Database/IdGenerator.php
View file

@ -1,6 +1,9 @@
<?php
class Database_IdGenerator {
namespace ctiso\Database;
use ctiso\Database;
class IdGenerator {
private $db;
function __construct(Database $db) {
@ -21,6 +24,6 @@ class Database_IdGenerator {
} else {
$result = $this->db->fetchOneArray("SELECT last_insert_rowid() AS nextval");
}
return intval($result['nextval']);
return (int)$result['nextval'];
}
}

7
src/Database/JsonInstall.php
View file

@ -1,11 +1,14 @@
<?php
//Действия с базой данных согласно json файлу.
class Database_JsonInstall {
namespace ctiso\Database;
use ctiso\Database\Manager;
class JsonInstall {
public $db_manager;
public $serialColumns;
public function __construct(Database_Manager $db_manager) {
public function __construct(Manager $db_manager) {
$this->db_manager = $db_manager;
}

10
src/Database/Manager.php
View file

@ -1,6 +1,12 @@
<?php
class Database_Manager
namespace ctiso\Database;
use ctiso\Database,
ctiso\Tools\SQLStatementExtractor,
ctiso\Path,
Exception;
class Manager
{
public /*.Database.*/$db;
@ -36,7 +42,7 @@ class Database_Manager
$file = $action["source"];
}
$stmtList = Tools_SQLStatementExtractor::extractFile(Path::join(dirname($db_file), $file));
$stmtList = SQLStatementExtractor::extractFile(Path::join(dirname($db_file), $file));
foreach($stmtList as $stmt) {
$this->db->executeQuery($stmt);
}

13
src/Database/PDOStatement.php
View file

@ -1,13 +1,20 @@
<?php
class Database_PDOStatement extends PDOStatement implements IteratorAggregate
namespace ctiso\Database\PDOStatement;
use ctiso\\PDOStatement,
ctiso\StatementIterator,
PDO;
use ctiso\Database\StatementIterator;
class PDOStatement extends \PDOStatement implements \IteratorAggregate
{
protected $cursorPos = 0;
public $cache = array();
public $fields;
function getIterator() {
return new Database_StatementIterator($this);
return new StatementIterator($this);
}
protected function __construct() {
@ -66,7 +73,7 @@ class Database_PDOStatement extends PDOStatement implements IteratorAggregate
}
function getInt($name) {
return intval($this->fields[$name]);
return (int)$this->fields[$name];
}
function getBlob($name) {

5
src/Database/Statement.php
View file

@ -3,7 +3,10 @@
/**
* Класс оболочка для PDOStatement для замены Creole
*/
class Database_Statement
namespace ctiso\Database;
use PDO;
class Statement
{
protected $limit = null;
protected $offset = null;

5
src/Database/StatementIterator.php
View file

@ -1,6 +1,9 @@
<?php
class Database_StatementIterator implements Iterator
namespace ctiso\Database;
use PDO;
class StatementIterator implements Iterator
{
private $result;

6
src/Excel/DataTime.php
View file

@ -1,12 +1,14 @@
<?php
class Excel_DateTime
namespace ctiso\Excel;
class DateTime
{
public $value;
function __construct($value)
{
$this->value = intval($value);
$this->value = (int)$value;
}
function getString()

6
src/Excel/Document.php
View file

@ -3,7 +3,11 @@
/**
* Документ
*/
class Excel_Document {
namespace ctiso\Excel;
use XMLWriter,
Exception;
class Document {
static $ns = "urn:schemas-microsoft-com:office:spreadsheet";
private $table = array ();
protected $styles = array();

6
src/Excel/Number.php
View file

@ -1,12 +1,14 @@
<?php
class Excel_Number
namespace ctiso\Excel;
class Number
{
public $value;
function __construct($value)
{
$this->value = intval($value);
$this->value = (int)$value;
}
function getString()

8
src/Excel/Table.php
View file

@ -3,6 +3,8 @@
/**
* Клетка таблицы
*/
namespace ctiso\Excel;
class TableCell
{
public $style = false;
@ -38,7 +40,7 @@ class TableRow
/**
* Таблица
*/
class Excel_Table
class Table
{
static $index;
private $name;
@ -50,7 +52,7 @@ class Excel_Table
function __construct()
{
$this->name = "Page " . intval(self::$index ++);
$this->name = "Page " . ((int)self::$index ++);
}
/**
@ -230,7 +232,7 @@ class Excel_Table
} else {
$doc->writeAttribute('ss:Type', "Number");
}
$doc->writeCData($this->encode($value));
$doc->writeCdata($this->encode($value));
}
$doc->endElement();
$doc->endElement();

3
src/File.php
View file

@ -1,5 +1,8 @@
<?php
namespace ctiso;
use Exception;
class File {
static function getContents($filename) {
$buffer = file_get_contents($filename);

8
src/Filter/ActionAccess.php
View file

@ -3,7 +3,11 @@
/**
* Фильтр действий
*/
class Filter_ActionAccess
namespace ctiso\Filter;
use ctiso\Filter\UserAccess,
ctiso\HttpRequest;
class ActionAccess
{
public $access = array();
public $processor;
@ -19,7 +23,7 @@ class Filter_ActionAccess
*/
function checkAction($action) {
// Импликация !! http://ru.wikipedia.org/wiki/Импликация
return (!isset($this->access[$action]) || in_array(Filter_UserAccess::$access, $this->access[$action]));
return (!isset($this->access[$action]) || in_array(UserAccess::$access, $this->access[$action]));
}
function execute(HttpRequest $request) {

9
src/Filter/ActionLogger.php
View file

@ -1,6 +1,11 @@
<?php
class Filter_ActionLogger
namespace ctiso\Filter;
use ctiso\Shortcut,
ctiso\HttpRequest,
ctiso\Filter\UserAccess;
class ActionLogger
{
public $before = array();
public $file;
@ -15,7 +20,7 @@ class Filter_ActionLogger
function execute(HttpRequest $request) {
$action = $request->getAction();
if(in_array($action, $this->before)) {
fwrite($this->file, "time: " . date("r", time()) . " query: ". json_encode(array_merge($_POST, $_GET)) . " by: " . Filter_UserAccess::$name . "\n");
fwrite($this->file, "time: " . date("r", time()) . " query: ". json_encode(array_merge($_POST, $_GET)) . " by: " . UserAccess::$name . "\n");
}
return $this->processor->execute($request);
}

4
src/Filter/Authorization.php
View file

@ -1,6 +1,8 @@
<?php
class Filter_Authorization {
namespace ctiso\Filter;
class Authorization {
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';

5
src/Filter/Filter.php
View file

@ -3,7 +3,10 @@
/**
* Попытка реализовать фильтр для запросов
*/
class Filter_Filter
namespace ctiso\Filter;
use ctiso\HttpRequest;
class Filter
{
public $processor;
public function __construct(/*.Controller_Action.*/$processor)

11
src/Filter/Login.php
View file

@ -8,11 +8,19 @@
*/
// В класс авторизации передавать обьект для управления пользователем
// Вынести в отдельный файл
class Filter_Login extends Filter_Filter
namespace ctiso\Filter;
use ctiso\Filter\Filter,
ctiso\HttpRequest,
ctiso\Settings,
ctiso\Database,
ctiso\Collection;
class Login extends Filter
{
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
public $mode = 'ajax';
public $user;
function __construct($processor, $role, $whitelist = []) {
parent::__construct($processor);
@ -33,6 +41,7 @@ class Filter_Login extends Filter_Filter
$login = $request->get('login');
$password = $request->get('password');
$result = $this->role->getUserByLogin($login); // Поиск по логину
if ($result) {
$userPassword = $this->role->getUserPassword($result);

5
src/Form/Color.php
View file

@ -3,6 +3,9 @@
/**
* Поле с цветом
*/
class Form_Color extends Form_Field
namespace ctiso\Form;
use ctiso\Form\Field;
class Color extends Field
{
}

5
src/Form/Date.php
View file

@ -2,5 +2,8 @@
/**
* Поле с датой
*/
class Form_Date extends Form_Field {
namespace ctiso\Form;
use ctiso\Form\Field;
class Date extends Field {
}

4
src/Form/Field.php
View file

@ -2,7 +2,9 @@
/**
* Элемент формы
*/
class Form_Field
namespace ctiso\Form;
class Field
{
public $hidden = false;
public $name;

26
src/Form/Form.php
View file

@ -4,7 +4,15 @@
* При рендеринге каждому классу соответствует шаблон (см. themes/maxim/templates/macros.html)
*/
class TCheckbox extends Form_Field
namespace ctiso\Form;
use ctiso\Form\Field,
ctiso\Form\Select,
ctiso\Form\Input,
ctiso\View\View,
ctiso\Validator\Validator,
ctiso\HttpRequest;
class TCheckbox extends Field
{
public $checked = false;
function setValue($value)
@ -14,7 +22,7 @@ class TCheckbox extends Form_Field
}
}
class TQuestionType extends Form_Select
class TQuestionType extends Select
{
function setValue($value)
{
@ -26,29 +34,29 @@ class TQuestionType extends Form_Select
}
}
class TDateTime extends Form_Input {
class TDateTime extends Input {
}
/**
* Поле для ввода пароля
*/
class TSecret extends Form_Field {
class TSecret extends Field {
}
class TUpload extends Form_Field {
class TUpload extends Field {
}
class THidden extends Form_Input {
class THidden extends Input {
public $hidden = true;
}
class TComponentBrowserInput extends Form_Input {
class TComponentBrowserInput extends Input {
}
/**
* Форма для ввода
*/
class Form_Form extends View_View {
class Form extends View {
public $field = array(); //Поля формы
public $fieldsets = array(); //Группы полей (fieldset). Некоторые поля могут не принадлежать никаким группам
@ -163,7 +171,7 @@ class Form_Form extends View_View {
/**
* Устанавливает ошибки после проверки
*/
function setError(Validator_Validator $validator)
function setError(Validator $validator)
{
foreach ($validator->getErrorMsg() as $name => $error)
{

5
src/Form/Input.php
View file

@ -3,5 +3,8 @@
/**
* Поле ввода Input
*/
class Form_Input extends Form_Field {
namespace ctiso\Form;
use ctiso\Form\Field;
class Input extends Field {
}

17
src/Form/OptionFactory.php
View file

@ -1,6 +1,11 @@
<?php
class Form_OptionFactory {
namespace ctiso\Form;
use ctiso\Form\Select,
ctiso\Model\Resources,
ctiso\Model\Factory;
class OptionFactory {
public $db;
public $registry;
function __construct($db, $registry = null) {
@ -8,23 +13,23 @@ class Form_OptionFactory {
$this->registry = $registry;
}
function create(Form_Select $field, $input) {
function create(Select $field, $input) {
if (isset($input['options.resid'])) {
$type = $input['options.resid'];
$res = new Model_Resources($this->db);
$res = new Resources($this->db);
$field->options = $this->optionsArray('id_section', 'title', $res->getSubsections('', $type));
} else if (isset($input['options.res'])) {
$type = $input['options.res'];
$res = new Model_Resources($this->db);
$res = new Resources($this->db);
$field->options = $this->optionsArray('path', 'title', $res->getSubsections('', $type));
} else if (isset($input['options.all_res'])) {
$type = $input['options.all_res'];
$res = new Model_Resources($this->db);
$res = new Resources($this->db);
$field->options = $this->optionsArray('id_resource', 'subtitle', $res->getAllResource($type));
} else if (isset($input['options.db'])) {
@ -39,7 +44,7 @@ class Form_OptionFactory {
} elseif (isset($input['options.pair'])) {
$field->options = $this->optionsPair($input['options.pair']);
} elseif (isset($input['options.model'])) {
$factory = new Model_Factory($this->db, $this->registry);
$factory = new Factory($this->db, $this->registry);
$model = $factory->getModel($input['options.model']);
$field->options = $model->getAllAsOptions();
} else {

5
src/Form/Select.php
View file

@ -1,6 +1,9 @@
<?php
class Form_Select extends Form_Field
namespace ctiso\Form;
use ctiso\Form\Field;
class Select extends Field
{
public $options = array();

5
src/Form/SelectMany.php
View file

@ -1,6 +1,9 @@
<?php
class Form_SelectMany extends Form_Select
namespace ctiso\Form;
use ctiso\Form\Select;
class SelectMany extends Select
{
function setValue($value)
{

5
src/Form/SelectOne.php
View file

@ -3,7 +3,10 @@
/**
* Выбор из одного элемента
*/
class Form_SelectOne extends Form_Select
namespace ctiso\Form;
use ctiso\Form\Select;
class SelectOne extends Select
{
function setValue($value)
{

5
src/Form/TextArea.php
View file

@ -3,7 +3,10 @@
/**
* Текстовое поле
*/
class Form_TextArea extends Form_Field {
namespace ctiso\Form;
use ctiso\Form\Field;
class TextArea extends Field {
function setValue($value)
{
$this->value = $value;

4
src/Form/ViewState.php
View file

@ -4,7 +4,9 @@
* http://www.alternateinterior.com/2006/09/a-viewstate-for-php.html
* Управление состоянием между страницами
*/
class Form_ViewState // extends Collection
namespace ctiso\Form;
class ViewState // extends Collection
{
private $values = array();

31
src/Functions.php
View file

@ -8,7 +8,9 @@
/**
* Эмуляция каррированой функции
*/
class __right {
namespace ctiso;
class right {
protected $params;
protected $fn;
@ -24,7 +26,7 @@ class __right {
}
}
class __left {
class left {
protected $params;
protected $fn;
@ -41,7 +43,7 @@ class __left {
}
define('__', '_ARGUMENT_PLACE_');
class __partial {
class partial {
protected $params;
protected $fn;
@ -53,7 +55,8 @@ class __partial {
function apply() {
$params = func_get_args();
$result = array();
for($i = 0, $j = 0; $i < count($this->params); $i++) {
$count = count($this->params);
for($i = 0, $j = 0; $i < $count; $i++) {
if ($this->params[$i] == __) {
$result [] = $params[$j];
$j++;
@ -68,7 +71,7 @@ class __partial {
/**
* Композиция функций
*/
class __compose {
class compose {
protected $fns;
function __construct($list) {
$this->fns = array_reverse($list);
@ -77,7 +80,8 @@ class __compose {
function apply () {
$params = func_get_args ();
$result = call_user_func_array($this->fns[0], $params);
for ($i = 1; $i < count($this->fns); $i++) {
$count = count($this->fns);
for ($i = 1; $i < $count; $i++) {
$result = call_user_func($this->fns[$i], $result);
}
return $result;
@ -86,8 +90,8 @@ class __compose {
class Functions {
static function partial() {
$closure = new __partial(func_get_args());
static function partial($_rest) {
$closure = new partial(func_get_args());
return array($closure, 'apply');
}
@ -99,8 +103,8 @@ class Functions {
*
* @return array[int]mixed
*/
static function compose() {
$closure = new __compose(func_get_args());
static function compose($_rest) {
$closure = new compose(func_get_args());
return array($closure, 'apply');
}
@ -110,7 +114,7 @@ class Functions {
* @return array[int]mixed
*/
static function rcurry($_rest) {
$closure = new __right(func_get_args ());
$closure = new right(func_get_args ());
return array($closure, 'apply');
}
@ -120,7 +124,7 @@ class Functions {
* @return array[int]mixed
*/
static function lcurry($_rest) {
$closure = new __left(func_get_args ());
$closure = new left(func_get_args ());
return array($closure, 'apply');
}
@ -306,7 +310,8 @@ class Functions {
assert(is_int($length));
$result = array();
for($i = 0; $i < count($array); $i += $length) {
$count = count($array);
for($i = 0; $i < $count; $i += $length) {
$result [] = array_slice($array, $i, $length);
}
return $result;

5
src/HttpRequest.php
View file

@ -3,6 +3,11 @@
/**
* Неверный запрос
*/
namespace ctiso;
use Exception,
ctiso\Collection,
ctiso\Session;
class WrongRequestException extends Exception
{
}

6
src/Layout/Empty.php
View file

@ -3,7 +3,11 @@
/**
* Самый простой макет
*/
class Layout_Empty extends Filter_Filter
namespace ctiso\Layout;
use ctiso\Filter\Filter,
ctiso\HttpRequest;
class Empty extends Filter
{
function execute(HttpRequest $request)
{

17
src/Layout/Manager.php
View file

@ -4,7 +4,12 @@
* Выбор макета страницы.
* Выбор оформления страницы осуществляется если было совпадение с каким либо условием
*/
class Layout_Manager extends Filter_Filter
namespace ctiso\Layout;
use ctiso\Filter\Filter,
ctiso\Functions,
ctiso\HttpRequest;
class Manager extends Filter
{
// Массив условий с их макетами
protected $condition = array();
@ -17,7 +22,7 @@ class Layout_Manager extends Filter_Filter
* addConditionGet(array('module' => 'personal'), 'personal')
* addConditionGet(array('module' => 'login'), 'login')
*/
public function addConditionGet($get, Filter_Filter $layout)
public function addConditionGet($get, Filter $layout)
{
$this->addCondition(Functions::rcurry(array($this, 'checkGet'), $get), $layout);
}
@ -25,12 +30,12 @@ class Layout_Manager extends Filter_Filter
/**
* Условие для аякс запросов. Тоже самое что и addConditionGet но еще проверяется является ли запрос ajax
*/
public function addConditionXHR($get, Filter_Filter $layout)
public function addConditionXHR($get, Filter $layout)
{
$this->addCondition(Functions::rcurry(array($this, 'checkXHR'), $get), $layout);
}
public function checkGet($request, $get)
public function checkGet(/*.HttpRequest.*/$request, $get)
{
if (is_array($get)) {
foreach ($get as $key => $value) {
@ -42,7 +47,7 @@ class Layout_Manager extends Filter_Filter
return true;
}
public function checkXHR($request, $get)
public function checkXHR(/*.HttpRequest.*/$request, $get)
{
return $request->isAjax() && $this->checkGet($request, $get);
}
@ -52,7 +57,7 @@ class Layout_Manager extends Filter_Filter
* @parma $get function(HttpRequest) Функция
* @parma $layout Layout Макет
*/
public function addCondition($get, Filter_Filter $layout)
public function addCondition($get, Filter $layout)
{
$this->condition [] = array($get, $layout);
}

4
src/Mail.php
View file

@ -4,6 +4,10 @@
* Класс для работы с почтой
* http://en.wikipedia.org/wiki/MIME
*/
namespace ctiso;
use ctiso\Path,
Exception;
class Mail
{
public $_from;

3
src/MailAlt.php
View file

@ -1,5 +1,8 @@
<?php
namespace ctiso;
use PHPMailer;
class MailAlt
{
public $mailer;

5
src/Model/Factory.php
View file

@ -1,6 +1,9 @@
<?php
class Model_Factory
namespace ctiso\Model;
use ctiso\Settings;
class Factory
{
static $shortcut = "model";
public $db;

5
src/Numbers.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
class Numbers
{
static function roman($i)
@ -15,7 +17,8 @@ class Numbers
static function prefix($prefix, array $array, $key = false)
{
$result = array();
for ($i = 0; $i < count($array); $i++) {
$count = count($array);
for ($i = 0; $i < $count; $i++) {
$result [] = call_user_func($prefix, $i + 1) . '. ' . $array[$i];
}
return $result;

21
src/Path.php
View file

@ -6,6 +6,8 @@
*
*/
namespace ctiso;
class Path
{
const SEPARATOR = "/";
@ -160,8 +162,9 @@ class Path
// Сравнение двух путей на равентство
public function equal(/*.Path.*/ $path)
{
if (count($this->path) == count($path->path)) {
for ($i = 0; $i < count($this->path); $i++) {
$count = count($this->path);
if ($count == count($path->path)) {
for ($i = 0; $i < $count; $i++) {
if ($this->path[$i] != $path->path[$i]) {
return false;
}
@ -207,8 +210,9 @@ class Path
if (isset($this->url['host']) && isset($path->url['host'])
&& ($this->url['host'] != $path->url['host'])) return false;
if (count($path->path) > count($this->path)) {
for ($i = 0; $i < count($this->path); $i++) {
$count = count($this->path);
if (count($path->path) > $count) {
for ($i = 0; $i < $count; $i++) {
if ($path->path[$i] != $this->path[$i]) {
return false;
}
@ -252,15 +256,18 @@ class Path
$list_path = $list->getParts();
$result = array();
for ($i = 0; $i < count($list_path); $i++) {
$count = count($list_path);
for ($i = 0; $i < $count; $i++) {
if (($i >= count($self_path)) || $list_path[$i] != $self_path[$i]) {
break;
}
}
for($j = $i; $j < count($list_path); $j++) {
$list_count = count($list_path);
for($j = $i; $j < $list_count; $j++) {
array_push($result, '..');
}
for($j = $i; $j < count($self_path); $j++) {
$self_count = count($self_path);
for($j = $i; $j < $self_count; $j++) {
array_push($result, $self_path[$j]);
}
return implode("/", $result);

8
src/Primitive.php
View file

@ -6,6 +6,8 @@
* @package system
*/
namespace ctiso;
class Primitive {
// varchar
public static function to_varchar($value)
@ -48,9 +50,9 @@ class Primitive {
if (!empty($tmp)) {
if (count($tmp) != 3) return $result;
$year = intval($tmp[2]);
$month = intval($tmp[1]);
$day = intval($tmp[0]);
$year = (int)$tmp[2];
$month = (int)$tmp[1];
$day = (int)$tmp[0];
if ($month != 0 && $day != 0 && $year != 0) {
if (checkdate($month, $day, $year)) {

18
src/Role/User.php
View file

@ -1,7 +1,11 @@
<?php
namespace ctiso;
use ctiso\Database,
ctiso\Database\Statement;
// Класс должен быть в библиотеке приложения
class Role_User
class User
{
const LIFE_TIME = 1800; // = 30min * 60sec;
@ -11,22 +15,20 @@ class Role_User
public $password;
public $id;
public $db;
public $groups;
protected function __construct()
{
protected function __construct($db, $groups) {
}
public function setDB(Database $db)
{
public function setDB(Database $db) {
$this->db = $db;
}
public function getUserByQuery(Database_Statement $stmt)
public function getUserByQuery(Statement $stmt)
{
global $GROUPS;
$result = $stmt->executeQuery();
if ($result->next()) {
$this->access = $GROUPS[$result->getString('access')];
$this->access = $this->groups[$result->getString('access')];
$this->name = $result->getString('login');
$this->id = $result->getInt('id_user');
$this->password = $result->getString('password');

2
src/Security.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
class Security {
static function generatePassword($length = 9, $strength = 0) {
$vowels = 'aeuy';

2
src/Session.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
class Session
{
function get($key)

5
src/Settings.php
View file

@ -9,6 +9,11 @@
* parameters1, parameters1 - Массивы с параметрами модуля
* Имя необходимо чтобы потом легко было удалить ненужные ветки дерева
*/
namespace ctiso;
use ctiso\Collection,
ctiso\File,
Exception;
class Settings extends Collection
{
protected $file;

8
src/Setup.php
View file

@ -7,6 +7,10 @@
* $setup->executeActions('install');
* </code>
*/
namespace ctiso;
use ZipArchive,
ctiso\Tools\SQLStatementExtractor;
class Setup
{
protected $actions = array();
@ -198,7 +202,7 @@ class Setup
*/
function batchSQLZip(/*.Database.*/ $conn, $file)
{
$stmtList = Tools_SQLStatementExtractor::extract($this->zip->getFromName($file));
$stmtList = SQLStatementExtractor::extract($this->zip->getFromName($file));
foreach ($stmtList as $stmt) {
$conn->executeQuery ($stmt);
}
@ -206,7 +210,7 @@ class Setup
static function batchSQL(/*.Database.*/ $conn, $file)
{
$stmtList = Tools_SQLStatementExtractor::extractFile($file);
$stmtList = SQLStatementExtractor::extractFile($file);
foreach ($stmtList as $stmt) {
$conn->executeQuery ($stmt);
}

2
src/SortRecord.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
class SortRecord
{
public $key;

51
src/Tales.php
View file

@ -3,34 +3,36 @@
/**
* Расширения для PHPTAL для отображения времени и даты
*/
class DateTime_Tales implements PHPTAL_Tales
namespace ctiso;
use PHPTAL_Php_TalesInternal,
ctiso\Controller\Site,
ctiso\Controller\Component,
ctiso\HttpRequest,
PHPTAL_TalesRegistry;
class Tales_DateTime_ implements PHPTAL_Tales
{
static public function date($expression, $nothrow = false)
{
return "Tales::phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")";
static public function date($expression, $nothrow = false) {
return "ctiso\\Tales::phptal_date(".PHPTAL_Php_TalesInternal::path ($expression).")";
}
static public function time($expression, $nothrow = false)
{
return "Tales::phptal_time(".PHPTAL_Php_TalesInternal::path ($expression).")";
static public function time($expression, $nothrow = false) {
return "ctiso\\Tales::phptal_time(".PHPTAL_Php_TalesInternal::path ($expression).")";
}
}
/**
* TALES для подключения компонентов
* component:name?param1=value1&param2=value2
*/
class Component_Tales implements PHPTAL_Tales
class Tales_Component implements PHPTAL_Tales
{
static public function component($expression, $nothrow = false)
{
$s = PHPTAL_Php_TalesInternal::string($expression);
return "Tales::phptal_component(" . $s . ")";
return "ctiso\\Tales::phptal_component(" . $s . ")";
}
}
class Tales {
static $db;
static $registry;
static function phptal_date ($e) {
return date("d.m.Y", $e);
@ -47,14 +49,12 @@ class Tales {
$begin = floatval(microtime(true));
/*.Controller_Component.*/$component = null;
if (class_exists("Controller_Site")) { //Если мы в CMS2
$component = Controller_Site::loadComponent($expression);
if (class_exists("ctiso\\Controller\\Site")) { //Если мы в CMS2
$component = Site::loadComponent($expression);
} else {
global $db, $registry; // Иначе обращаемся к глобальным переменным
$component = Controller_Component::loadComponent($expression, $db, $registry);
$component = Component::loadComponent($expression, self::$db, self::$registry);
}
$req = new HttpRequest();
$req = new HttpRequest();
$result = $component->execute($req);
echo "<!-- ", $expression, ", ", round(floatval(microtime(true)) - $begin, 4), "sec -->";
@ -62,11 +62,14 @@ class Tales {
}
static function register() {
static function register($db, $registry) {
self::$db = $db;
self::$registry = $registry;
/* Регистрация нового префикса для подключения компонента */
$tales = PHPTAL_TalesRegistry::getInstance();
$tales->registerPrefix('component', array('Component_Tales', 'component'));
$tales->registerPrefix('date', array('DateTime_Tales', 'date'));
$tales->registerPrefix('time', array('DateTime_Tales', 'time'));
$tales->registerPrefix('component', array('ctiso\\Component_Tales', 'component'));
$tales->registerPrefix('date', array('ctiso\\DateTime_Tales', 'date'));
$tales->registerPrefix('time', array('ctiso\\DateTime_Tales', 'time'));
}
}

7
src/Tools/Drawing.php
View file

@ -1,6 +1,8 @@
<?php
class Tools_Drawing
namespace ctiso\Tools;
class Drawing
{
const ALIGN_LEFT = "left";
const ALIGN_TOP = "top";
@ -40,7 +42,8 @@ class Tools_Drawing
$first_word = true;
$last_width = 0;
for ($i = 0; $i < count($words); $i++) {
$count = count($words);
for ($i = 0; $i < $count; $i++) {
$item = $words[$i];
$dimensions = imagettfbbox($size, $angle, $font, $current_line . ($first_word ? '' : ' ') . $item);
$line_width = $dimensions[2] - $dimensions[0];

4
src/Tools/Image.php
View file

@ -1,6 +1,8 @@
<?php
class Tools_Image
namespace ctiso\Tools;
class Image
{
static function load($uri)
{

9
src/Tools/SQLStatementExtractor.php
View file

@ -26,7 +26,10 @@
* @version $Revision: 1.5 $
* @package creole.util.sql
*/
class Tools_SQLStatementExtractor {
namespace ctiso\Tools;
use Exception;
class SQLStatementExtractor {
protected static $delimiter = ';';
@ -111,7 +114,7 @@ class Tools_SQLStatementExtractor {
if ($check === "" || $check === $string) {
return true;
} else {
return (strpos($string, $check) === 0) ? true : false;
return (strpos($string, $check) === 0);
}
}
@ -125,7 +128,7 @@ class Tools_SQLStatementExtractor {
if ($check === "" || $check === $string) {
return true;
} else {
return (strpos(strrev($string), strrev($check)) === 0) ? true : false;
return (strpos(strrev($string), strrev($check)) === 0);
}
}

8
src/Tools/String.php
View file

@ -1,6 +1,8 @@
<?php
class Tools_String {
namespace ctiso\Tools;
class String {
// from creole
static function strToArray($str) {
@ -15,7 +17,7 @@ class Tools_String {
if ($in_subarr > 0) { // already in sub-array?
$subarr[$in_subarr][] = $tok;
if ('}' === substr($tok, -1, 1)) { // check to see if we just added last component
$res[] = strToArray(implode(',', $subarr[$in_subarr]));
$res[] = self::strToArray(implode(',', $subarr[$in_subarr]));
$in_subarr--;
}
} elseif ($tok{0} === '{') { // we're inside a new sub-array
@ -25,7 +27,7 @@ class Tools_String {
$subarr[$in_subarr] = array();
$subarr[$in_subarr][] = $tok;
} else {
$res[] = strToArray($tok);
$res[] = self::strToArray($tok);
}
} else { // not sub-array
$val = trim($tok, '"'); // remove " (surrounding strings)

34
src/Tools/TemplateImage.php
View file

@ -3,7 +3,10 @@
/**
* Формат для композиции изображений
*/
class Tools_TemplateImage
namespace ctiso\Tools;
use ctiso\Tools\Drawing;
class TemplateImage
{
static $listfiles = array('jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png', 'bmp' => 'wbmp');
static $listfonts = array(
@ -33,13 +36,16 @@ class Tools_TemplateImage
protected $data = array();
protected $base = "c:\\windows\\fonts\\";
protected $image;
protected $prepare = true;
protected $_prepare = true;
public $debug = false;
function __construct ($template = false)
public $resource;
public $filename;
function __construct ($template = null)
{
// assert(is_string($src));
if($template) {
if ($template) {
$this->data = $template;
}
}
@ -116,7 +122,7 @@ class Tools_TemplateImage
return "";
}
function imageText($text, $value)
function imageText($text, /*.stdClass.*/$value)
{
assert(is_string($text));
@ -126,22 +132,22 @@ class Tools_TemplateImage
$color = intval(substr($value->color, 1), 16);
if ($value->align[0]) {
$align = Tools_Drawing::ALIGN_LEFT;
$align = Drawing::ALIGN_LEFT;
} elseif ($value->align[2]) {
$align = Tools_Drawing::ALIGN_RIGHT;
$align = Drawing::ALIGN_RIGHT;
} else {
$align = Tools_Drawing::ALIGN_CENTER;
$align = Drawing::ALIGN_CENTER;
}
if ($value->valign[0]) {
$valign = Drawing::ALIGN_TOP;
} elseif ($value->valign[1]) {
$valign = Tools_Drawing::ALIGN_CENTER;
$valign = Drawing::ALIGN_CENTER;
} else {
$valign = Tools_Drawing::ALIGN_BOTTOM;
$valign = Drawing::ALIGN_BOTTOM;
}
Tools_Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text,
Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text,
$value->width, $value->height,
$align, $valign);
}
@ -159,7 +165,7 @@ class Tools_TemplateImage
{
$width = imagesx($this->image);
$height = imagesy($this->image);
if($new_height == false) {
if ($new_height == null) {
$new_height = ceil($height * $new_width / $width);
}
@ -171,8 +177,8 @@ class Tools_TemplateImage
}
function prepare() {
if($this->prepare) {
$this->prepare = false;
if($this->_prepare) {
$this->_prepare = false;
foreach ($this->data as $value) {
$this->imageText($value->text, $value); // break;
}

2
src/UTF8.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
class UTF8 {
static function str_split($str, $split_length = 1) {
$split_length = (int) $split_length;

3
src/UserMessageException.php
View file

@ -8,6 +8,9 @@
* Исключение с понятным пользователю сообщением, которое имеет смысл ему показать.
* @see Controller_Front
*/
namespace ctiso;
use Exception;
class UserMessageException extends Exception {
public $userMessage;
public function __construct($message) {

5
src/Validator/Rule/Abstract.php
View file

@ -1,6 +1,9 @@
<?php
abstract class Validator_Rule_Abstract
abstract namespace ctiso\Validator\Rule;
use ctiso\Collection;
class Abstract
{
public $field;
protected $errorMsg;

6
src/Validator/Rule/Alpha.php
View file

@ -3,7 +3,11 @@
/**
* Проверка на число
*/
class Validator_Rule_Alpha extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Alpha extends Abstract
{
public function getErrorMsg()
{

9
src/Validator/Rule/Code.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата электронной почты
*/
class Validator_Rule_Code extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Code extends Abstract
{
public function getErrorMsg()
{
@ -25,7 +29,8 @@ class Validator_Rule_Code extends Validator_Rule_Abstract
$name = $this->field;
if (is_array($_POST[$name . '_code_genre'])) {
for($n = 0; $n < count($_POST[$name . '_code_genre']); $n++) {
$count = count($_POST[$name . '_code_genre']);
for($n = 0; $n < $count; $n++) {
$code = array(
$_POST[$name . '_code_genre'][$n],
$_POST[$name . '_code_f'][$n],

8
src/Validator/Rule/Count.php
View file

@ -3,10 +3,14 @@
/**
* Проверка формата даты
*/
class Validator_Rule_Count extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Count extends Abstract
{
public $size = 1;
public $max = false;
public $max = null;
public function getErrorMsg()
{

7
src/Validator/Rule/Date.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата даты
*/
class Validator_Rule_Date extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Date extends Abstract
{
private $split = "\\/";
@ -15,6 +19,7 @@ class Validator_Rule_Date extends Validator_Rule_Abstract
public function isValid(Collection $container, $status = null)
{
$pattern = "/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})$/";
$matches = [];
return (preg_match($pattern, $container->get($this->field), $matches)
&& checkdate($matches[2], $matches[1], $matches[3]));
}

6
src/Validator/Rule/Email.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата электронной почты
*/
class Validator_Rule_Email extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Email extends Abstract
{
public function getErrorMsg()
{

6
src/Validator/Rule/EmailList.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата электронной почты
*/
class Validator_Rule_EmailList extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class EmailList extends Abstract
{
public function getErrorMsg()
{

7
src/Validator/Rule/FileName.php
View file

@ -1,6 +1,11 @@
<?php
class Validator_Rule_FileName extends Validator_Rule_Abstract {
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection,
ctiso\Path;
class FileName extends Abstract {
public function getErrorMsg()
{

6
src/Validator/Rule/IsFile.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата времени
*/
class Validator_Rule_IsFile extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class IsFile extends Abstract
{
private $type = array();
private $maxsize = 1024;

6
src/Validator/Rule/Match.php
View file

@ -3,7 +3,11 @@
/**
* Проверка на равентство двух полей
*/
class Validator_Rule_Match extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Match extends Abstract
{
public $same;

6
src/Validator/Rule/Notnull.php
View file

@ -1,6 +1,10 @@
<?php
class Validator_Rule_Notnull extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Notnull extends Abstract
{
function skipEmpty() {
return false;

6
src/Validator/Rule/Numeric.php
View file

@ -3,7 +3,11 @@
/**
* Проверка на число
*/
class Validator_Rule_Numeric extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Numeric extends Abstract
{
public function getErrorMsg()
{

8
src/Validator/Rule/Time.php
View file

@ -3,7 +3,11 @@
/**
* Проверка формата времени
*/
class Validator_Rule_Time extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Time extends Abstract
{
private $split = ":";
@ -23,7 +27,7 @@ class Validator_Rule_Time extends Validator_Rule_Abstract
{
$tmp = explode($this->split, $container->get($this->field), 2);
if ($tmp) {
if (self::checktime ($tmp[0], $tmp[1])) {
if (self::checktime ((int)$tmp[0], (int)$tmp[1])) {
return true;
}
}

6
src/Validator/Rule/Unique.php
View file

@ -2,7 +2,11 @@
/**
*/
class Validator_Rule_Unique extends Validator_Rule_Abstract
namespace ctiso\Validator\Rule;
use ctiso\Validator\Rule\Abstract,
ctiso\Collection;
class Unique extends Abstract
{
public function getErrorMsg()
{

6
src/Validator/Validator.php
View file

@ -5,7 +5,11 @@
/**
* Проверка коллекции
*/
class Validator_Validator
namespace ctiso\Validator;
use Exception,
ctiso\Collection;
class Validator
{
protected $chain = array(); // Массив правил
protected $errorMsg = array(); // Массив ошибок

6
src/View/Composite.php
View file

@ -4,7 +4,11 @@
*/
// View_Base + PHPTAL = View_Template (View_Composite)
class View_Composite extends View_View
namespace ctiso\View;
use ctiso\View\View,
PHPTAL;
class Composite extends View
{
private $tal;

5
src/View/List.php
View file

@ -1,6 +1,9 @@
<?php
class View_List extends View_View
namespace ctiso\View;
use ctiso\View\View;
class List extends View
{
function execute()
{

12
src/View/Page.php
View file

@ -1,6 +1,12 @@
<?php
class View_Page extends View_View
namespace ctiso\View;
use ctiso\View\View,
ctiso\Controller\Site,
ctiso\Controller\Component,
ctiso\HttpRequest;
class Page extends View
{
private $counter;
public $text;
@ -52,10 +58,10 @@ class View_Page extends View_View
if(class_exists("Controller_Site")){ //Если мы в CMS2
$component = Controller_Site::loadComponent($match);
$component = Site::loadComponent($match);
} else {
global $db, $registry; //
$component = Controller_Component::loadComponent($match, $db, $registry);
$component = Component::loadComponent($match, $db, $registry);
}
$req = new HttpRequest();

4
src/View/Pages.php
View file

@ -3,7 +3,9 @@
* @package system.widgets
*/
class View_Pages
namespace ctiso\View;
class Pages
{
static $range = 5;
static function getPages($page, $onpage, $count, $prefix = '?')

4
src/View/Plain.php
View file

@ -6,7 +6,9 @@
/**
* @package system.view
*/
class View_Plain
namespace ctiso\View;
class Plain
{
protected $document;
protected $values = array();

5
src/View/Top.php
View file

@ -1,6 +1,9 @@
<?php
class View_Top extends View_Composite {
namespace ctiso\View;
use ctiso\View\Composite;
class Top extends Composite {
/**
* Общая строка заголовка
*/

5
src/View/View.php
View file

@ -1,6 +1,9 @@
<?php
class View_View
namespace ctiso\View;
use Exception;
class View
{
protected $_section = array(); // Вложенные шаблоны
// Блоки

3
src/ZipFile.php
View file

@ -3,6 +3,9 @@
/**
* Расширение класса ZipArchive с возможность архивирования директории
*/
namespace ctiso;
use ZipArchive;
class ZipFile extends ZipArchive
{
private $ignore = array('.', '..');

2
src/process.php
View file

@ -1,5 +1,7 @@
<?php
namespace ctiso;
if (!function_exists('str_getcsv')) {
function str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") {
$fiveMBs = 1024;

3
src/tabletree.php
View file

@ -16,6 +16,9 @@
* @param array $table Таблица
* @param Function $fn Функция которая применяется к каждой ветке дерева
*/
namespace ctiso;
use ctiso\Functions;
function tableTreeWalk($level, $table, $fn) {
if (empty ($level)) return $table;
$name = array_shift ($level);