From 75b096c6b202fe5fec9a3ef2a4cf949343e85b5b Mon Sep 17 00:00:00 2001 From: pzinovkin Date: Sun, 26 Apr 2009 20:15:02 +0000 Subject: [PATCH 02/11] removed nakon related stuff git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@78 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Env.class.php | 16 ----- classes/User.class.php | 166 ------------------------------------------------- 2 files changed, 182 deletions(-) delete mode 100644 classes/User.class.php diff --git a/classes/Env.class.php b/classes/Env.class.php index b3104ab..f9d8a9b 100644 --- a/classes/Env.class.php +++ b/classes/Env.class.php @@ -87,21 +87,5 @@ final class Env $res = isset($_FILES[$name]) ? $_FILES[$name] : $default; return $param ? $res[$param] : $res; } - - /** - * Получить цену ставки - * - * @param integer $dis - некое число от кооторого считается скидка - */ - static public function getBidCost($dis = 0) - { - $settings_model = new SettingsModel(); - $cost = $settings_model->get('bid_base_price'); - if ($dis > 0 && $dis <= 100) { - return $cost - intval($dis); - } - - return $cost; - } } ?> \ No newline at end of file diff --git a/classes/User.class.php b/classes/User.class.php deleted file mode 100644 index 687204d..0000000 --- a/classes/User.class.php +++ /dev/null @@ -1,166 +0,0 @@ -isBanned()) { - return false; - } - - if(self::$user->pass != $password){ - return false; - } - - self::setSession(); - $model = new UserDataModel(); - $model->loginUpdate($login); - - return true; - } - - static function logout() - { - Env::setCookie(session_name(), '', 0); - Env::setCookie('login', '', 0); - Env::setCookie('login_hash', '', 0); - Env::setCookie('login_ipbhash', '', 0); - if (session_id()) { - session_destroy(); - } - } - - static function process() - { - if (Env::getCookie(session_name())) { //есть сессия - @session_start(); - self::setInfo(Env::Session('user')); - } elseif (Env::getCookie('login') && Env::getCookie('login_hash')) { - self::remember(); - } - } - - static function setSession() - { - $hash = self::getHash(); - Env::setCookie('login', self::$user->login, TIME_NOW + LOGIN_COOKIE_TTL); - Env::setCookie('login_hash', $hash, TIME_NOW + LOGIN_COOKIE_TTL); - Env::setCookie('login_ipbhash', self::getIPBHash($hash), TIME_NOW + LOGIN_COOKIE_TTL); - - @session_start(); - - $_SESSION['user'] = self::$user; - } - - static function remember() - { - self::setInfo(self::getByLogin(Env::getCookie('login'))); - - if (!self::getInfo()) { - self::logout(); - } - - if (Env::getCookie('login_hash') == self::getHash()) { - self::setSession(); - } else { - self::logout(); - } - } - - static function getHash() - { - return md5(self::$user->id.'hckrz'.self::$user->login.'mst'.self::$user->pass.'dai'); - } - - /** - * Создает хеш для проверки хеша в в IPB - * - */ - static public function getIPBHash($hash) - { - return md5($hash . strtolower(self::$user->login) . 'brainfuck'); - } - - static function getInfo() - { - return Env::Session('user', self::$user); - } - - static function setInfo($data) - { - self::$user = $data; - } - - static function isGuest() - { - return ! (bool) Env::Session('user'); - } - - static function getByLogin($login) - { - $model = new UserDataModel(); - return $model->getByLogin($login); - } - - static function getById($id) - { - $model = new UserDataModel(); - return $model->getById($id); - } - - - /** - * отправляет письмо для активации - * - * @param string $mail - * @param string $login - * - */ - static function sendActivateMail($mail, $login) - { - $settings = Env::getParam('site_settings'); - $model = new UserActivateModel(); - $link = 'http://' . $settings['host_name'] . '/activate/?key=' . $model->generateKey($login, $mail); - - $text = new SettingsTextModel(); - $message = $text->getText('mail_activate'); - - $replaces = array( - 'link' => $link, - 'host' => $settings['site_url'], - 'email' => $mail, - ); - - if (!$message) { - return false; - } - - foreach ($replaces as $key => $val) { - $message->text = str_replace('%' . $key . '%', $val, $message->text); - } - $mailer = new Mailer(); - return $mailer->sendMessage($mail, 'Подтверждение E-mail ' . $settings['host_name'], $message->text); - } -} -?> \ No newline at end of file From ace883d1682215b5b8e430efbc633042d27ece6a Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 27 Apr 2009 15:09:50 +0000 Subject: [PATCH 03/11] first action git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@79 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/pg_DBConnector.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/pg_DBConnector.class.php b/classes/pg_DBConnector.class.php index c70e52e..2550de9 100644 --- a/classes/pg_DBConnector.class.php +++ b/classes/pg_DBConnector.class.php @@ -38,10 +38,10 @@ class DBConnector return self::$handlers[$handler_name]; } - if (!$handler = pg_connect("host='".$db_settings['host']."' dbname='".$db_settings['database']."' user='".$db_settings['user'].'" password="'.$db_settings['password']."'")) { - throw new MJException('Can\'t connect to DB '.pg_last_error($handler), 2); + if (!$handler = pg_connect("host='".$db_settings['host']."' dbname='".$db_settings['database']."' user='".$db_settings['user']."' password='".$db_settings['password']."'")) { + throw new MJException('Can\'t connect to DB '.pg_last_error(), 2); } - + return self::$handlers[$handler_name] = $handler; } From 3a08bd457f6c04303e3db41dd9ff9411da7afa76 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 27 Apr 2009 19:12:10 +0000 Subject: [PATCH 04/11] user git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@80 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/User.class.php | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 classes/User.class.php diff --git a/classes/User.class.php b/classes/User.class.php new file mode 100644 index 0000000..75093ae --- /dev/null +++ b/classes/User.class.php @@ -0,0 +1,119 @@ +isBanned()) { + return false; + } + + if(self::$user->pass != $password){ + return false; + } + + self::setSession(); + + return true; + } + + static function logout() + { + Env::setCookie(session_name(), '', 0); + Env::setCookie('login', '', 0); + Env::setCookie('login_hash', '', 0); + if (session_id()) { + session_destroy(); + } + } + + static function process() + { + if (Env::getCookie(session_name())) { //есть сессия + @session_start(); + self::setInfo(Env::Session('user')); + } elseif (Env::getCookie('login') && Env::getCookie('login_hash')) { + self::remember(); + } + } + + static function setSession() + { + $hash = self::getHash(); + Env::setCookie('login', self::$user->login, TIME_NOW + LOGIN_COOKIE_TTL); + Env::setCookie('login_hash', $hash, TIME_NOW + LOGIN_COOKIE_TTL); + + @session_start(); + + $_SESSION['user'] = self::$user; + } + + static function remember() + { + self::setInfo(self::getByLogin(Env::getCookie('login'))); + + if (!self::getInfo()) { + self::logout(); + } + + if (Env::getCookie('login_hash') == self::getHash()) { + self::setSession(); + } else { + self::logout(); + } + } + + static function getHash() + { + return md5(self::$user->id.'hckrz'.self::$user->login.'mst'.self::$user->pass.'dai'); + } + + static function getInfo() + { + return Env::Session('user', self::$user); + } + + static function setInfo($data) + { + self::$user = $data; + } + + static function isGuest() + { + return ! (bool) Env::Session('user'); + } + + static function getByLogin($login) + { + $model = new UserDataModel(); + return $model->getByLogin($login); + } + + static function getById($id) + { + $model = new UserDataModel(); + return $model->getById($id); + } +} +?> \ No newline at end of file From 7782797923bfaa67971810d8f8fec5b8545e9b51 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 27 Apr 2009 21:13:18 +0000 Subject: [PATCH 05/11] user class git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@81 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/User.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/User.class.php b/classes/User.class.php index 75093ae..e2efaa7 100644 --- a/classes/User.class.php +++ b/classes/User.class.php @@ -25,7 +25,7 @@ class User } self::setInfo(self::getByLogin($login)); - if (!self::getInfo() || self::$user->isBanned()) { + if (!self::getInfo()) { return false; } From 0520bca6f14670f6bb0175a5953719cb8f4d3ff4 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 27 Apr 2009 22:11:31 +0000 Subject: [PATCH 06/11] insert standart git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@83 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Model.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/Model.class.php b/classes/Model.class.php index 0a767b7..eabd935 100644 --- a/classes/Model.class.php +++ b/classes/Model.class.php @@ -96,11 +96,14 @@ abstract class Model function insert($data, $postfix = '') { - $sql = ''; + $keys = array(); + $values = array(); + foreach ($data as $key => $val) { - $sql .= $key.'="'.$this->escape($val).'", '; + $keys[] = $key; + $values[] = $this->escape($val); } - return $this->query('INSERT '.$this->table.' SET '.rtrim($sql, ', ').' '.$postfix); + return $this->query('INSERT INTO '.$this->table.' ('.implode(',', $keys).") VALUES('".implode("','", $values)."') ".$postfix); } function delete($id) From 4a6e5d4cab0998148389b444ae480189134b0b85 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 27 Apr 2009 22:23:23 +0000 Subject: [PATCH 07/11] pg connector fix git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@84 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/DBConnector.class.php | 2 +- classes/Model.class.php | 12 ++++++------ classes/pg_DBConnector.class.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/DBConnector.class.php b/classes/DBConnector.class.php index c26f3e8..51b5528 100644 --- a/classes/DBConnector.class.php +++ b/classes/DBConnector.class.php @@ -83,7 +83,7 @@ class DBConnector return mysqli_num_rows($result); } - static public function affectedRows($handler) + static public function affectedRows($handler, $result) { return mysqli_affected_rows($handler); } diff --git a/classes/Model.class.php b/classes/Model.class.php index eabd935..889e47c 100644 --- a/classes/Model.class.php +++ b/classes/Model.class.php @@ -61,9 +61,9 @@ abstract class Model return new ModelSelectResult($res); case 'insert': case 'replac': - return new ModelInsertResult($this->handler); + return new ModelInsertResult($this->handler, $res); //$res for postgreSQL default: - return new ModelChangeResult($this->handler); + return new ModelChangeResult($this->handler, $res); //$res for postgreSQL } } @@ -202,9 +202,9 @@ class ModelChangeResult extends ModelResult { public $affected; - function __construct($resource) + function __construct($resource, $result) { - $this->affected = DBConnector::affectedRows($resource); + $this->affected = DBConnector::affectedRows($resource, $result); } function count() @@ -217,9 +217,9 @@ class ModelInsertResult extends ModelChangeResult { public $id; - function __construct($resource) + function __construct($resource, $result) { - parent::__construct($resource); + parent::__construct($resource, $result); $this->id = DBConnector::getId($resource); } diff --git a/classes/pg_DBConnector.class.php b/classes/pg_DBConnector.class.php index 2550de9..68335f1 100644 --- a/classes/pg_DBConnector.class.php +++ b/classes/pg_DBConnector.class.php @@ -82,9 +82,9 @@ class DBConnector return pg_num_rows($result); } - static public function affectedRows($handler) + static public function affectedRows($handler, $result) { - return pg_affected_rows($handler); + return pg_affected_rows($result); } static public function getId($handler) From f5d6d9680dedc0843a4236750882b0388868674f Mon Sep 17 00:00:00 2001 From: akulikov Date: Tue, 28 Apr 2009 15:30:12 +0000 Subject: [PATCH 08/11] pg connector fix git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@85 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/pg_DBConnector.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/pg_DBConnector.class.php b/classes/pg_DBConnector.class.php index 68335f1..3288482 100644 --- a/classes/pg_DBConnector.class.php +++ b/classes/pg_DBConnector.class.php @@ -89,7 +89,7 @@ class DBConnector static public function getId($handler) { - return pg_last_oid($handler); + return -1; //DISABLED FORM postgreSQL } static public function autocommit($handler, $switch) From 49ad9009ac5ac40ae90b949c3eea7b72b75c5260 Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 25 May 2009 09:30:30 +0000 Subject: [PATCH 09/11] Format class improved #31 git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@90 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Format.class.php | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/classes/Format.class.php b/classes/Format.class.php index 842a008..03ee5cd 100644 --- a/classes/Format.class.php +++ b/classes/Format.class.php @@ -19,9 +19,11 @@ class Format { /* Date & time */ - static protected $time_format = 'H:i:s'; - static protected $date_format = 'd.m.Y'; - static protected $date_time_format = 'H:i d.m.Y'; + static protected $time_format = 'H:i:s'; + static protected $date_format = 'd.m.Y'; + static protected $today_format = 'Сегодня'; + static protected $date_time_format = 'H:i d.m.Y'; + static protected $today_time_format = 'H:i Сегодня'; static protected $timezone_offset = 0; /* money */ @@ -71,8 +73,8 @@ class Format $minutes = floor(($timestamp / 60) - ($hours * 60)); $seconds = $timestamp - ($hours * 3600) - ($minutes * 60); - return ($hours < 10 ? ('0' . $hours) : $hours) - . ':' . ($minutes < 10 ? ('0' . $minutes) : $minutes) + return ($hours < 10 ? ('0' . $hours) : $hours) + . ':' . ($minutes < 10 ? ('0' . $minutes) : $minutes) . ':' . ($seconds < 10 ? ('0' . $seconds) : $seconds); } @@ -85,15 +87,18 @@ class Format */ static public function int2date($timestamp = 0, $hours = true) { - $date = date(($hours) ? self::$date_time_format : self::$date_format , $timestamp); - return $date; + if (date('Ymd') == date('Ymd', $timestamp)) { + return date(($hours) ? self::$today_time_format : self::$today_format , $timestamp); + } + + return date(($hours) ? self::$date_time_format : self::$date_format , $timestamp); } static public function int2rusDate($timestamp = 0, $hours = false) { - $month = array('января', 'февраля', 'марта', - 'апреля', 'мая', 'июня', - 'июля', 'августа', 'сентября', + $month = array('января', 'февраля', 'марта', + 'апреля', 'мая', 'июня', + 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'); $date = ($hours) ? date('H:i d', $timestamp) . ' ' . $month[date('m', $timestamp) - 1] . ' ' .date('Y', $timestamp) : date('d', $timestamp) . ' ' . $month[date('m', $timestamp) - 1] . ' ' .date('Y', $timestamp); return $date; @@ -110,6 +115,18 @@ class Format } /** + * Установка форматов даты + * + */ + static public function setDateTimeFormat($date_time_format, $today_time_format = false) + { + self::$date_time_format = $date_time_format; + if ($today_time_format) { + self::$today_time_format = $today_time_format; + } + } + + /** * Преобразует время в секунды. * * @param string $time From b3f7afa799415184c744de82c0e0d59a3ecac68a Mon Sep 17 00:00:00 2001 From: akulikov Date: Mon, 25 May 2009 09:35:51 +0000 Subject: [PATCH 10/11] Format class improved #31 git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@91 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Format.class.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/classes/Format.class.php b/classes/Format.class.php index 03ee5cd..8a96362 100644 --- a/classes/Format.class.php +++ b/classes/Format.class.php @@ -21,9 +21,9 @@ class Format /* Date & time */ static protected $time_format = 'H:i:s'; static protected $date_format = 'd.m.Y'; - static protected $today_format = 'Сегодня'; + static protected $today_format = 'd.m.Y'; //disabled by default static protected $date_time_format = 'H:i d.m.Y'; - static protected $today_time_format = 'H:i Сегодня'; + static protected $today_time_format = 'H:i d.m.Y'; //disabled by default static protected $timezone_offset = 0; /* money */ @@ -118,11 +118,23 @@ class Format * Установка форматов даты * */ - static public function setDateTimeFormat($date_time_format, $today_time_format = false) + static public function setDateFormat($date_time_format, $date_format = false) { self::$date_time_format = $date_time_format; - if ($today_time_format) { - self::$today_time_format = $today_time_format; + if ($date_format) { + self::$date_format = $date_format; + } + } + + /** + * Установка форматов даты для текущего дня + * + */ + static public function setTodayFormat($today_time_format, $today_format = false) + { + self::$today_time_format = $today_time_format; + if ($today_format) { + self::$today_format = $today_format; } } From 83fdd4ce93b9203fb656963f3c8d194cc68d3ed7 Mon Sep 17 00:00:00 2001 From: pzinovkin Date: Wed, 27 May 2009 12:51:02 +0000 Subject: [PATCH 11/11] copyright, #3 git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/legacy@92 4cb57b5f-5bbd-dd11-951b-001d605cbbc5 --- classes/Action.class.php | 4 ++-- classes/Cache.class.php | 4 ++-- classes/DBConnector.class.php | 4 ++-- classes/Decorator.class.php | 4 ++-- classes/DynamicPageException.class.php | 4 ++-- classes/Env.class.php | 4 ++-- classes/Format.class.php | 4 ++-- classes/Load.class.php | 4 ++-- classes/MJException.class.php | 4 ++-- classes/Mailer.class.php | 4 ++-- classes/Model.class.php | 4 ++-- classes/PageController.class.php | 4 ++-- classes/Pager.class.php | 4 ++-- classes/Router.class.php | 4 ++-- classes/StaticPageException.class.php | 4 ++-- classes/Sublimer.class.php | 4 ++-- classes/User.class.php | 4 ++-- classes/pg_DBConnector.class.php | 4 ++-- init/init.inc.php | 4 ++-- init/sys.inc.php | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/classes/Action.class.php b/classes/Action.class.php index 115aabb..9990012 100644 --- a/classes/Action.class.php +++ b/classes/Action.class.php @@ -3,7 +3,7 @@ * Рутовый класс для любого действия. * Описывает основной функционал для работы с классами действий. * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Action @@ -106,4 +106,4 @@ abstract class Action } } } -?> \ No newline at end of file +?> diff --git a/classes/Cache.class.php b/classes/Cache.class.php index 4770abe..dd45faa 100644 --- a/classes/Cache.class.php +++ b/classes/Cache.class.php @@ -3,7 +3,7 @@ * Класс кеша. * Отвечает за кеширование результатов выполнения действий. * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Cache @@ -67,4 +67,4 @@ final class Cache } } -?> \ No newline at end of file +?> diff --git a/classes/DBConnector.class.php b/classes/DBConnector.class.php index 51b5528..388ac25 100644 --- a/classes/DBConnector.class.php +++ b/classes/DBConnector.class.php @@ -3,7 +3,7 @@ * Класс базы данных. * Возвращает идентификатор соединения * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage DB @@ -108,4 +108,4 @@ class DBConnector return mysqli_rollback($handler); } } -?> \ No newline at end of file +?> diff --git a/classes/Decorator.class.php b/classes/Decorator.class.php index 82122d8..4a21d34 100644 --- a/classes/Decorator.class.php +++ b/classes/Decorator.class.php @@ -2,7 +2,7 @@ /** * Родительский класс для всех декораторов. Содержит основной функционал. * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Decorator @@ -59,4 +59,4 @@ abstract class Decorator */ abstract function exec(); } -?> \ No newline at end of file +?> diff --git a/classes/DynamicPageException.class.php b/classes/DynamicPageException.class.php index d4ae9f4..35ec89a 100644 --- a/classes/DynamicPageException.class.php +++ b/classes/DynamicPageException.class.php @@ -3,7 +3,7 @@ /** * Эксепшен для выводя результата работы класса * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -13,4 +13,4 @@ */ class DynamicPageException extends Exception {} -?> \ No newline at end of file +?> diff --git a/classes/Env.class.php b/classes/Env.class.php index f9d8a9b..1e51f59 100644 --- a/classes/Env.class.php +++ b/classes/Env.class.php @@ -2,7 +2,7 @@ /** * Класс для работы с переменными окружения. * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -88,4 +88,4 @@ final class Env return $param ? $res[$param] : $res; } } -?> \ No newline at end of file +?> diff --git a/classes/Format.class.php b/classes/Format.class.php index 8a96362..17b2bd5 100644 --- a/classes/Format.class.php +++ b/classes/Format.class.php @@ -2,7 +2,7 @@ /** * Format * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -197,4 +197,4 @@ class Format * Оффсет с учетом летнего/зимнего времени */ Format::setTimezoneOffset(date('Z') - ((date('I') ? 60*60 : 0 ))); -?> \ No newline at end of file +?> diff --git a/classes/Load.class.php b/classes/Load.class.php index 8fd2779..eb11f16 100644 --- a/classes/Load.class.php +++ b/classes/Load.class.php @@ -2,7 +2,7 @@ /** * * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Load @@ -42,4 +42,4 @@ class Load return self::$router ? self::$router : self::$router = new Router; } } -?> \ No newline at end of file +?> diff --git a/classes/MJException.class.php b/classes/MJException.class.php index 586abdc..bc6aa91 100644 --- a/classes/MJException.class.php +++ b/classes/MJException.class.php @@ -2,7 +2,7 @@ /** * Обработчик эксепшенов * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -63,4 +63,4 @@ class MJException extends Exception return $return . ''; } } -?> \ No newline at end of file +?> diff --git a/classes/Mailer.class.php b/classes/Mailer.class.php index da0f508..6632010 100644 --- a/classes/Mailer.class.php +++ b/classes/Mailer.class.php @@ -2,7 +2,7 @@ /** * Класс для отправки мыла * -* @copyright +* @copyright netmonsters.ru * @link * @package Nakon * @subpackage face @@ -77,4 +77,4 @@ class Mailer return mail($email, $encoded_subject, $content, $this->headers); } } -?> \ No newline at end of file +?> diff --git a/classes/Model.class.php b/classes/Model.class.php index 889e47c..da8d254 100644 --- a/classes/Model.class.php +++ b/classes/Model.class.php @@ -2,7 +2,7 @@ /** * Класс модели данных * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage DB @@ -228,4 +228,4 @@ class ModelInsertResult extends ModelChangeResult return $this->id; } } -?> \ No newline at end of file +?> diff --git a/classes/PageController.class.php b/classes/PageController.class.php index 3784bac..c7eb1a2 100644 --- a/classes/PageController.class.php +++ b/classes/PageController.class.php @@ -2,7 +2,7 @@ /** * * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage PageController @@ -43,4 +43,4 @@ final class PageController } } } -?> \ No newline at end of file +?> diff --git a/classes/Pager.class.php b/classes/Pager.class.php index 0ea6bdb..eeaac8a 100644 --- a/classes/Pager.class.php +++ b/classes/Pager.class.php @@ -2,7 +2,7 @@ /** * PagerAction * - * @copyright + * @copyright netmonsters.ru * @link * @package Nakon * @subpackage face @@ -65,4 +65,4 @@ class Pager extends Action $this->templater->assign('count', $this->count); } } -?> \ No newline at end of file +?> diff --git a/classes/Router.class.php b/classes/Router.class.php index d866511..dbab7af 100644 --- a/classes/Router.class.php +++ b/classes/Router.class.php @@ -2,7 +2,7 @@ /** * Класс для работы с роутерами * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -128,4 +128,4 @@ final class Route return true; } } -?> \ No newline at end of file +?> diff --git a/classes/StaticPageException.class.php b/classes/StaticPageException.class.php index da6359e..4729a84 100644 --- a/classes/StaticPageException.class.php +++ b/classes/StaticPageException.class.php @@ -3,7 +3,7 @@ /** * Эксепшен для вывода статических шаблонов * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Core @@ -15,4 +15,4 @@ class StaticPageException extends Exception { } -?> \ No newline at end of file +?> diff --git a/classes/Sublimer.class.php b/classes/Sublimer.class.php index 2e0723b..6bd13c4 100644 --- a/classes/Sublimer.class.php +++ b/classes/Sublimer.class.php @@ -3,7 +3,7 @@ * Простейший шаблонизатор. * Зато быстрый. * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Decorator @@ -132,4 +132,4 @@ final class Sublimer } -?> \ No newline at end of file +?> diff --git a/classes/User.class.php b/classes/User.class.php index e2efaa7..43519ae 100644 --- a/classes/User.class.php +++ b/classes/User.class.php @@ -2,7 +2,7 @@ /** * Класс для работы с пользователями * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage Decorator @@ -116,4 +116,4 @@ class User return $model->getById($id); } } -?> \ No newline at end of file +?> diff --git a/classes/pg_DBConnector.class.php b/classes/pg_DBConnector.class.php index 3288482..6ebc2ff 100644 --- a/classes/pg_DBConnector.class.php +++ b/classes/pg_DBConnector.class.php @@ -3,7 +3,7 @@ * Класс базы данных. * Возвращает идентификатор соединения * - * @copyright + * @copyright netmonsters.ru * @link * @package Majestic * @subpackage DB @@ -107,4 +107,4 @@ class DBConnector throw new MJException('Rollback disabled for postgreSQL Connector' ,1); } } -?> \ No newline at end of file +?> diff --git a/init/init.inc.php b/init/init.inc.php index 010bf59..8bfa784 100644 --- a/init/init.inc.php +++ b/init/init.inc.php @@ -2,7 +2,7 @@ /** * Файл роутеров * - * @copyright + * @copyright netmonsters.ru * @link * @package Nakon * @subpackage Config @@ -25,4 +25,4 @@ require(CONFIG_PATH.'/routers.inc.php'); define('E_404', 404); define('E_403', 403); -?> \ No newline at end of file +?> diff --git a/init/sys.inc.php b/init/sys.inc.php index c979baf..48e1619 100644 --- a/init/sys.inc.php +++ b/init/sys.inc.php @@ -4,7 +4,7 @@ * Если вы не меняли стандартное расположение файлов, * то ничего тут править не надо. * - * @copyright + * @copyright netmonsters.ru * @link * @package Nakon * @subpackage System @@ -97,4 +97,4 @@ function __autoload($name) require(LIB_PATH.'/'.$name.'.lib.php'); } } -?> \ No newline at end of file +?>