From 1c8cdec3ebc635d98f5864e14110c06a21c54acc Mon Sep 17 00:00:00 2001 From: lopar Date: Sat, 3 Mar 2018 22:51:37 +0200 Subject: [PATCH] Added nick class to remove bunch of nick{1-7} functions --- admin/test.php | 6 ++---- ch.php | 14 -------------- classes/n.php | 2 ++ classes/nick.php | 11 ++++++++--- classes/{u.php => users_row.php} | 14 +++++++------- config.php | 14 +++++++++++--- functions.php | 10 ++++++---- klan.php | 6 +++--- 8 files changed, 39 insertions(+), 38 deletions(-) rename classes/{u.php => users_row.php} (51%) diff --git a/admin/test.php b/admin/test.php index 95cfed8..d1cfaf7 100644 --- a/admin/test.php +++ b/admin/test.php @@ -23,8 +23,6 @@ echo '
'; //echo n::show(11263)."
".n::show(11221)->geninf(); echo '
'; -echo nick::search(11263)->geninf(); +echo nick::id(11263)->inf(); echo '
'; -echo nick::search(11221)->geninf(); -echo '
'; -echo nick::search(11263)->geninf(1); \ No newline at end of file +echo nick::id(11263)->geninf(1); \ No newline at end of file diff --git a/ch.php b/ch.php index 6d9a670..3513634 100644 --- a/ch.php +++ b/ch.php @@ -469,20 +469,6 @@ if (isset($_GET['online']) && $_GET['online'] != null) { $_GET['text'] = str_replace('private [pal]', '', $_GET['text']); } - if (strstr($_GET['text'], "/g_nologin") && (in_array($user['align'], $var_security['g_nologin']['align']) || in_array($user['id'], $var_security['g_nologin']['id']))) { - $temp = str_replace('/g_nologin', '', $_GET['text']); - AddChatSystem('' . $temp . ''); - $action = 1; - unset($temp); - } - - if (strstr($_GET['text'], "/g_login") && (in_array($user['align'], $var_security['g_login']['align']) || in_array($user['id'], $var_security['g_login']['id']))) { - $temp = str_replace('/g_login', '', $_GET['text']); - AddChatSystem('[' . $user['login'] . '] ' . $temp . ''); - $action = 1; - unset($temp); - } - unset($tmp); # Упростил тот Адъ и Израиль до одной нормальной строчки, которая вырежет все ссылки. if (!preg_match(GAMEDOMAIN, $_GET['text']) || !preg_match("/imgur.com/", $_GET['text'])) { diff --git a/classes/n.php b/classes/n.php index cfaf7d4..c65f2fe 100644 --- a/classes/n.php +++ b/classes/n.php @@ -5,6 +5,8 @@ * Project name: Battles-Game */ +/* @DEPRECATED */ + class n { private static $_instance = null; diff --git a/classes/nick.php b/classes/nick.php index 0f5626e..7b6faee 100644 --- a/classes/nick.php +++ b/classes/nick.php @@ -8,7 +8,7 @@ class nick { private $user_data; - + private $ /** * nick constructor. @@ -23,7 +23,7 @@ class nick } - public static function search($playerId) + public static function id($playerId) { return new self($playerId); } @@ -31,7 +31,7 @@ class nick /** * @param int $showInvisibility */ - public function geninf($showInvisibility = 0) + public function full($showInvisibility = 0) { $n =''; if ($showInvisibility) { @@ -51,4 +51,9 @@ class nick return $n; } + + public function short() + { + return $this->user_data['login']; + } } \ No newline at end of file diff --git a/classes/u.php b/classes/users_row.php similarity index 51% rename from classes/u.php rename to classes/users_row.php index fe4dc54..1905e90 100644 --- a/classes/u.php +++ b/classes/users_row.php @@ -5,19 +5,19 @@ * Project name: Battles-Game */ -class u +class users_row { - private $user_id; + private $row; /** - * u constructor. + * users_row constructor. * @param $playerId */ public function __construct($playerId) { - if (!$this->user_id) { - $this->user_id = db::c()->query('SELECT * FROM `users` WHERE `id` = ?i',$playerId)->fetch_assoc(); + if (!$this->row) { + $this->row = db::c()->query('SELECT * FROM `users` WHERE `id` = ?i', $playerId)->fetch_assoc(); } } @@ -25,8 +25,8 @@ class u /** * @return array */ - public function i() + public function result() { - return $this->user_id; + return $this->row; } } \ No newline at end of file diff --git a/config.php b/config.php index 1e87dc2..2fc171d 100644 --- a/config.php +++ b/config.php @@ -9,9 +9,17 @@ ini_set('display_errors', 'On'); error_reporting(E_ALL); define("GAMEDOMAIN","combats.loc"); -$var_security = array('g_login' => array('align' => array(2.99), 'id' => array(10022)), 'g_nologin' => array('align' => array(2.99), 'id' => array(10022))); - +/** + * Классы для работы с базой данных. + */ require_once('Database/Mysql.php'); require_once('Database/Exception.php'); require_once('Database/Statement.php'); -require_once('Database/db.php'); \ No newline at end of file +require_once('Database/db.php'); + +/** + * Автозагрузка классов. + */ +spl_autoload_register(function ($class_name) { + include_once 'classes/' . $class_name . '.php'; +}); diff --git a/functions.php b/functions.php index e16ed2d..03e149a 100644 --- a/functions.php +++ b/functions.php @@ -6,11 +6,13 @@ */ require_once 'config.php'; -require_once 'classes/u.php'; -$u = new u($_SESSION['uid']); -/** Бля, если это сработает... */ -$user = $u->i(); +/** + * Класс-заглушка для работы глобальных переменных в функциях. + * Возвращает массив данных таблицы users. + */ +$u = new users_row($_SESSION['uid']); +$user = $u->result(); define("HPADDICTIONEFFECT", 33); diff --git a/klan.php b/klan.php index f205ae9..1cdf586 100644 --- a/klan.php +++ b/klan.php @@ -230,8 +230,8 @@ $polno = unserialize($klan['vozm']); $data = db::c()->query('SELECT `id`, `login`, `status`, `level`, `room`, `align`, (select `id` from `online` WHERE `date` >= ?i AND `id` = users.`id`) AS `online` FROM `users` WHERE `klan` = ?i ORDER BY `online` DESC , `login` ASC', (time()-60), $klan['id']); while ($row = $data->fetch_assoc()) { if ($row['online'] > 0) { - echo ''; - nickname($row['id']); + echo ''; + echo nick::id($row['id'])->full(); #nick2($row['id']); if ($row['id'] == $klan['glava']) { echo ' - Глава клана'; @@ -246,7 +246,7 @@ $polno = unserialize($klan['vozm']); echo ' - ', $rrm, '
'; } else if ($row['online'] < 1) { echo ''; - nickname($row['id']); + echo nick::id($row['id'])->full(); #nick2($row['id']); if ($row['id'] == $klan['glava']) { echo ' - Глава клана';