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

Синхронизация с сервером

Browse source
This commit is contained in:
Origami11 2020-01-14 10:40:01 +03:00
parent 4c01398cab
commit aa61c2ddc1
11 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Controller/Component.php
View file

@ -23,7 +23,8 @@ class ComponentRequest {
if ($key == 'active_page') {
return $this->r->get($key);
}
if ($arr = $this->r->get($key)) {
$arr = $this->r->get($key);
if ($arr !== NULL) {
if (is_array($arr)) {
return Arr::get($arr, $this->component_id, $default);
} else {

9
src/Controller/Service.php
View file

@ -61,5 +61,14 @@ class Controller_Service
}
return $result;
}
function getInfo() {
$filename = Path::join($this->viewPath[0], 'install.json');
if (file_exists($filename)) {
$settings = json_decode(File::getContents($filename), true);
return $settings;
}
return array();
}
}

6
src/Database.php
View file

@ -13,8 +13,14 @@ class Database extends PDO
{
parent::__construct($dsn, $username, $password);
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Database_PDOStatement', array()));
}
function prepare($sql, $args = []) {
$result = parent::prepare($sql, $args);
return $result;
}
public function getDSN()
{

8
src/Database/PDOStatement.php
View file

@ -74,7 +74,7 @@ class Database_PDOStatement extends PDOStatement implements IteratorAggregate
}
function getString($name) {
return $this->fields[$name];
return isset($this->fields[$name]) ? $this->fields[$name]: null;
}
function getBoolean($name) {
@ -92,4 +92,10 @@ class Database_PDOStatement extends PDOStatement implements IteratorAggregate
function getRecordCount() {
return count($this->cache);
}
function execute($args = null) {
$result = parent::execute($args);
return $result;
}
}

18
src/Database/Statement.php
View file

@ -17,33 +17,27 @@ class Database_Statement
$this->conn = $conn;
}
function setInt($n, $value)
{
function setInt($n, $value) {
$this->binds [] = array($n, $value, PDO::PARAM_INT);
}
function setString($n, $value)
{
function setString($n, $value) {
$this->binds [] = array($n, $value, PDO::PARAM_STR);
}
function setBlob($n, $value)
{
function setBlob($n, $value) {
$this->binds [] = array($n, $value, PDO::PARAM_LOB);
}
function setLimit($limit)
{
function setLimit($limit) {
$this->limit = $limit;
}
function setOffset($offset)
{
function setOffset($offset) {
$this->offset = $offset;
}
function executeQuery()
{
function executeQuery() {
if ($this->limit) {
$this->query .= " LIMIT {$this->limit} OFFSET {$this->offset}";
}

2
src/Excel/Number.php
View file

@ -6,7 +6,7 @@ class Excel_Number
function __construct($value)
{
$this->value = intval($value);
$this->value = (int)($value);
}
function getString()

16
src/Filter/Login.php
View file

@ -13,13 +13,18 @@ class Filter_Login extends Filter_Filter
const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#';
const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign';
public $mode = 'ajax';
public $user;
//AJAX-Реквесты для которых не требуется авторизация, потребовалось для сбора статистики
public $whiteRequestList = [['module' => "requiredcontent", "action" => "getcount"],
['module' => "requiredcontent", "action" => "teststructure"],
['module' => "requiredcontent", "action" => "specialdump"],
['module' => "requiredcontent", "action" => "MDOUMonitoring"]
];
public $whiteRequestList = [
['module' => "requiredcontent", "action" => "getcount"],
['module' => "requiredcontent", "action" => "teststructure"],
['module' => "requiredcontent", "action" => "specialdump"],
['module' => "requiredcontent", "action" => "OrgMonitoring"],
['module' => "requiredcontent", "action" => "OrgMonitoringSchema"],
['module' => "appeals", "action" => "changestatus"],
['module' => "appeals", "action" => "savestatus"]
];
/**
* Проверка авторизации
* @return Boolean Авторизовани пользователь или нет
@ -30,6 +35,7 @@ class Filter_Login extends Filter_Filter
session_start();
$db = $this->getConnection();
Filter_UserAccess::setUp($db); // Соединение
switch ($request->getAction()) {
// Авторизация по постоянному паролю
case 'login':

2
src/Filter/UserAccess.php
View file

@ -62,7 +62,7 @@ class Filter_UserAccess
$time = time();
if ($time - $lasttime > self::LIFE_TIME) return null; // Вышло время сессии
$id = self::$id;
self::$db->executeQuery("UPDATE users SET lasttime = $time WHERE id_user = $id"); // Время последнего обращения входа
// self::$db->executeQuery("UPDATE users SET lasttime = $time WHERE id_user = $id"); // Время последнего обращения входа
}
return $result;
}

2
src/Tools/TemplateImage.php
View file

@ -134,7 +134,7 @@ class Tools_TemplateImage
}
if ($value->valign[0]) {
$valign = Drawing::ALIGN_TOP;
$valign = Tools_Drawing::ALIGN_TOP;
} elseif ($value->valign[1]) {
$valign = Tools_Drawing::ALIGN_CENTER;
} else {

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

@ -15,6 +15,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]));
}

4
src/View/Page.php
View file

@ -8,7 +8,7 @@ class View_Page extends View_View
function __construct($data)
{
// Вставка компонентов на странице
$pattern = '/<(\w+)(\s+[a-zA-Z\-]+=\"[^\"]*\")*\s+tal:replace="structure\s+component:([^\"]*)"[^>]*>/u';
$pattern = '/<(\w+)(\s+[a-zA-Z\-]+(=\"[^\"]*\")?)*\s+tal:replace="structure\s+component:([^\"]*)"[^>]*>/u';
$matches = array();
preg_match_all($pattern, $data, $matches, PREG_OFFSET_CAPTURE, 0);
@ -20,7 +20,7 @@ class View_Page extends View_View
$split[] = array('type' => 'page-text', 'content' => $text, 'component' => '', 'module' => '');
}
$offset = $match[1] + strlen($match[0]);
$split[] = $this->replaceContent($matches[3][$key][0], $matches[3][$key][1]);
$split[] = $this->replaceContent($matches[4][$key][0], $matches[4][$key][1]);
}
$text = $this->fixHTML(substr($data, $offset));
if (trim($text)) {