various small
This commit is contained in:
parent
b483b79df5
commit
68fe6ec13e
@ -1880,7 +1880,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
|
||||
private function __construct()
|
||||
{
|
||||
if (!empty($_SESSION['uid'])) {
|
||||
$this->info = Db::getRow(
|
||||
$user = Db::getRow(
|
||||
'select
|
||||
*,
|
||||
users.id as id,
|
||||
@ -1898,7 +1898,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
|
||||
[$_SESSION['uid']]
|
||||
);
|
||||
} else {
|
||||
$this->info = Db::getRow(
|
||||
$user = Db::getRow(
|
||||
'select
|
||||
*,
|
||||
users.id as id,
|
||||
@ -1917,9 +1917,10 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`
|
||||
);
|
||||
}
|
||||
|
||||
if (empty($this->info)) {
|
||||
$this->info = [];
|
||||
if (!empty($user) && is_array($user)) {
|
||||
$this->info = $user;
|
||||
}
|
||||
unset($user);
|
||||
|
||||
Database::init(); // для всяких mysql_*
|
||||
|
||||
|
||||
43
buttons.php
43
buttons.php
@ -1,13 +1,22 @@
|
||||
<?php
|
||||
const GAME = true;
|
||||
|
||||
use Core\Config;
|
||||
use Core\Database;
|
||||
|
||||
if (!defined('GAME_VERSION')) {
|
||||
require_once '_incl_data/autoload.php';
|
||||
}
|
||||
|
||||
|
||||
function er($e)
|
||||
{
|
||||
global $c;
|
||||
exit('<html><head><meta name="msapplication-config" content="browserconfig.xml"><meta http-equiv="Content-Language" content="ru"><TITLE>Произошла ошибка</TITLE></HEAD><BODY text="#FFFFFF"><p><font color=black>Произошла ошибка: <pre>' . $e . '</pre><b><p><a href="https://' . $c[0] . '/">Назад</b></a><HR><p align="right">(c) <a href="https://' . $c[0] . '/">' . $c[1] . '</a></p></body></html>');
|
||||
}
|
||||
|
||||
include_once('_incl_data/__config.php');
|
||||
include_once('_incl_data/class/__db_connect.php');
|
||||
Config::init();
|
||||
Database::init();
|
||||
|
||||
define('IP', UserIp::get());
|
||||
$u = User::start();
|
||||
$filter = new Filter();
|
||||
@ -24,9 +33,7 @@ if ($u->info['joinIP'] == 1 && $u->info['ip'] != IP) {
|
||||
er('#Пожалуйста авторизируйтесь с главной страницы');
|
||||
} elseif (isset($_GET['exit'])) {
|
||||
setcookie('login', '', time() - 60 * 60 * 24 * 30, '', $c['host']);
|
||||
setcookie('pass', '', time() - 60 * 60 * 24 * 30, '', $c['host']);
|
||||
setcookie('login', '', time() - 60 * 60 * 24 * 30);
|
||||
setcookie('pass', '', time() - 60 * 60 * 24 * 30);
|
||||
mysql_query('UPDATE `users` SET `online` = ' . (time() - 420) . ' WHERE `id` = ' . $u->info['id']); //520
|
||||
die('<script>top.location = "https://' . $c['host'] . '/";</script>');
|
||||
} elseif (!isset($u->info['id'])) {
|
||||
@ -62,12 +69,12 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![endif]-->
|
||||
<script>
|
||||
var des = 1;
|
||||
var c = {
|
||||
let des = 1;
|
||||
let c = {
|
||||
noEr: 0,
|
||||
noErTmr: 0,
|
||||
url: '<?=$c['host']?>',
|
||||
img: 'img.new-combats.com',
|
||||
url: '<?= Config::get('host') ?>',
|
||||
img: '<?= Config::get('img') ?>',
|
||||
uid: <?=(0 + $u->info['id'])?>,
|
||||
login: '<?=$u->info['login']?>',
|
||||
city: '<?=$u->info['city']?>',
|
||||
@ -84,14 +91,14 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
}, sd4key = "<?=$u->info['nextAct']?>", lafstReg = {}, enterUse = 0;
|
||||
|
||||
function ctest(city) {
|
||||
if (city != c['city']) {
|
||||
if (city !== c['city']) {
|
||||
top.location = '/bk';
|
||||
}
|
||||
}
|
||||
|
||||
function testKey(event) {
|
||||
if (event.keyCode == 10 || event.keyCode == 13) {
|
||||
if (top.enterUse == 0) {
|
||||
if (event.keyCode === 10 || event.keyCode === 13) {
|
||||
if (top.enterUse === 0) {
|
||||
chat.subSend();
|
||||
top.enterUse = 1;
|
||||
setTimeout('top.enterUse = 0', 1000);
|
||||
@ -107,10 +114,10 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
$(window).error(function () {
|
||||
return true;
|
||||
});
|
||||
var iusrno = {};
|
||||
let iusrno = {};
|
||||
|
||||
function ignoreUser(u) {
|
||||
if (iusrno[u] == undefined || iusrno[u] == 0) {
|
||||
if (iusrno[u] === undefined || iusrno[u] === 0) {
|
||||
$('#main').attr({'src': 'main.php?friends=1&ignore=' + u + ''});
|
||||
} else {
|
||||
$('#main').attr({'src': 'main.php?friends=1&ignore=' + u + ''});
|
||||
@ -137,7 +144,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
|
||||
if (!isset($_COOKIE['d1c'])) {
|
||||
$detect = new MobileDetect;
|
||||
$deviceType = ($detect->isMobile() ? ($detect->isTablet() ? 'tablet' : 'phone') : 'computer');
|
||||
$deviceType = $detect->isMobile() ? $detect->isTablet() ? 'tablet' : 'phone' : 'computer';
|
||||
$_COOKIE['d1c'] = $deviceType;
|
||||
setcookie('d1c', $deviceType, (time() + 86400));
|
||||
} else {
|
||||
@ -147,7 +154,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
if ($deviceType == 'tablet' || $deviceType == 'phone') {
|
||||
echo '<script type="text/javascript" src="js/jquery.nicescroll.js"></script>';
|
||||
?>
|
||||
<style type="text/css">
|
||||
<style>
|
||||
#touchmain {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
@ -167,7 +174,7 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
|
||||
<link href="./js/trainingModals/registration/trainingModalStyles.css" rel="stylesheet" type="text/css"/>
|
||||
|
||||
<style type="text/css">
|
||||
<style>
|
||||
/* Additional classes examples */
|
||||
.woman a {
|
||||
color: #C33;
|
||||
@ -1305,4 +1312,4 @@ $u->stats = $u->getStats($u->info['id'], 0);
|
||||
</body>
|
||||
</html>
|
||||
<?php
|
||||
unset($db);
|
||||
unset($db);
|
||||
|
||||
@ -134,7 +134,7 @@ if (!isset($user) || $user['id'] != $u->info['id']) {
|
||||
$inf = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "' . $idve . '" LIMIT 1'));
|
||||
$titm = mysql_query(
|
||||
'INSERT INTO `actions` (`uid`,`time`,`city`,`room`,`vars`,`ip`,`vals`) VALUES ("' . $user['id'] . '","' . time(
|
||||
) . '","' . loto . '","' . $user['room'] . '","' . $idve . '","' . mysql_real_escape_string(
|
||||
) . '","' . $user['city'] . '","' . $user['room'] . '","' . $idve . '","' . mysql_real_escape_string(
|
||||
$_SERVER['HTTP_X_REAL_IP']
|
||||
) . '","loto")'
|
||||
);
|
||||
|
||||
55
main.php
55
main.php
@ -264,47 +264,6 @@ if (isset($_GET['atak_user']) && $u->info['battle'] == 0 && $_GET['atak_user'] !
|
||||
if ($ul == 1) {
|
||||
$act = 1;
|
||||
}
|
||||
if ($u->info['repass'] > 0) {
|
||||
define('IP', UserIp::get());
|
||||
|
||||
if (isset($_POST['renpass']) && $_POST['renpass'] == $_POST['renpass2'] && md5(
|
||||
$_POST['renpass']
|
||||
) != $u->info['pass']) {
|
||||
if ($u->info['ip'] == IP) {
|
||||
$u->info['pass'] = md5($_POST['renpass']);
|
||||
setcookie('pass', $u->info['pass'], time() + 30 * 60 * 60 * 24, '', 'new-combats.com');
|
||||
mysql_query(
|
||||
'UPDATE `users` SET `pass` = "' . mysql_real_escape_string(
|
||||
$u->info['pass']
|
||||
) . '",`repass` = "0",`type_pers` = "0",`bot_room` = "0" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1'
|
||||
);
|
||||
mysql_query('UPDATE `stats` SET `bot` = "0" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1');
|
||||
} else {
|
||||
die('<font color="red"><b>Внимание!</b> Смена пароля привязана к ip %' . $u->info['ip'] . '.<br>Для восстановления контроля войдите с данного IP, либо обратитесь к Администрации проекта через нового персонажа. Приносим извинения за неудобства!</font>');
|
||||
}
|
||||
} else {
|
||||
if (isset($_POST['renpass'])) {
|
||||
if ($u->info['pass'] == md5($_POST['renpass'])) {
|
||||
echo '<font color="red"><b>Внимание!</b>Ваш новый пароль должен различаться со старым.</font>';
|
||||
} elseif ($_POST['renpass'] != $_POST['renpass2']) {
|
||||
echo '<font color="red"><b>Внимание!</b>Пароли не совпадают.</font>';
|
||||
}
|
||||
}
|
||||
die(
|
||||
'<br><br><br><font color="red"><b>Смените пожалуйста пароль от персонажа!</b><br>Данная смена проходит, если пароль не менялся более 2 месяцев.</font><br><br><hr>
|
||||
<form action="main.php" method="post">
|
||||
<fieldset>
|
||||
<legend><b>Сменить пароль</b></legend>
|
||||
<table>
|
||||
<tr><td align=right>Новый пароль:</td><td><input type=password name="renpass"></td></tr>
|
||||
<tr><td align=right>Новый пароль (еще раз):</td><td><input type=password name="renpass2"></td></tr>
|
||||
<tr><td align=right><input type=submit value="Сменить пароль" name="changepsw"></td><td></td></tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
</font>'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/*-----------------------*/
|
||||
if ($u->info['battle'] == 0) {
|
||||
@ -334,23 +293,23 @@ if (isset($btl_last['id']) && $u->info['battle'] == 0) {
|
||||
if (!isset($u->tfer['id']) && $u->room['block_all'] == 0) {
|
||||
//Одеть/снять предмет
|
||||
if (isset($_GET['rstv']) && isset($_GET['inv'])) {
|
||||
$act = $u->freeStatsMod($_GET['rstv'], $_GET['mf'], $u->info['id']);
|
||||
$u->freeStatsMod($_GET['rstv'], $_GET['mf'], $u->info['id']);
|
||||
} elseif (isset($_GET['ufs2']) && isset($_GET['inv'])) {
|
||||
$act = $u->freeStats2Item($_GET['itmid'], $_GET['ufs2'], $u->info['id'], 1);
|
||||
$u->freeStats2Item($_GET['itmid'], $_GET['ufs2'], $u->info['id'], 1);
|
||||
} elseif (isset($_GET['ufs2mf']) && isset($_GET['inv'])) {
|
||||
$act = $u->freeStats2Item($_GET['itmid'], $_GET['ufs2mf'], $u->info['id'], 2);
|
||||
$u->freeStats2Item($_GET['itmid'], $_GET['ufs2mf'], $u->info['id'], 2);
|
||||
} elseif (isset($_GET['ufsmst']) && isset($_GET['inv'])) {
|
||||
$act = $u->itemsSmSave($_GET['itmid'], $_GET['ufsmst'], $u->info['id']);
|
||||
$u->itemsSmSave($_GET['itmid'], $_GET['ufsmst'], $u->info['id']);
|
||||
} elseif (isset($_GET['ufsms']) && isset($_GET['inv'])) {
|
||||
$act = $u->itemsSmSave($_GET['itmid'], $_GET['ufsms'] + 100, $u->info['id']);
|
||||
$u->itemsSmSave($_GET['itmid'], $_GET['ufsms'] + 100, $u->info['id']);
|
||||
} elseif (isset($_GET['ufs']) && isset($_GET['inv'])) {
|
||||
$act = $u->freeStatsItem($_GET['itmid'], $_GET['ufs'], $u->info['id']);
|
||||
$u->freeStatsItem($_GET['itmid'], $_GET['ufs'], $u->info['id']);
|
||||
} elseif (isset($_GET['sid']) && isset($_GET['inv'])) {
|
||||
$act = $u->snatItem($_GET['sid'], $u->info['id']);
|
||||
} elseif (isset($_GET['oid']) && isset($_GET['inv'])) {
|
||||
$act = $u->odetItem($_GET['oid'], $u->info['id']);
|
||||
} elseif (isset($_GET['item_rune']) && isset($_GET['inv'])) {
|
||||
$act = $u->runeItem(null);
|
||||
$u->runeItem(null);
|
||||
} elseif (isset($_GET['remitem'], $_GET['inv'])) {
|
||||
$act = $u->snatItemAll($u->info['id']);
|
||||
} elseif (isset($_GET['delete']) && isset($_GET['inv']) && $u->newAct($_GET['sd4'])) {
|
||||
|
||||
@ -2221,8 +2221,6 @@ $tma = '';
|
||||
$st[6]['pzm'] += 7;
|
||||
}
|
||||
$b8name = '';
|
||||
//Духовность
|
||||
//if($u->stats['s7']>24){ $b8name = 'Духовная Защита'; $b[8] .= ' • Жизнь после смерти дает вам прием "Призрачная Защита"<img src="https://img.new-combats.com/i/eff/spirit_block25.gif"><br>'; }
|
||||
if ($u->stats['s7'] > 49) {
|
||||
$b8name = 'Духовное Исцеление';
|
||||
$b[8] .= ' • Каждый бой вы начинаете под действием магии "Спасение"<img src="https://img.new-combats.com/i/eff/preservation.gif"><br>';
|
||||
@ -2274,10 +2272,10 @@ $tma = '';
|
||||
$i++;
|
||||
}
|
||||
if (isset($sti['complect'])) {
|
||||
$coms[count($coms)]['id'] = $sti['complect'];
|
||||
$coms[]['id'] = $sti['complect'];
|
||||
if (!isset($coms['com'][$sti['complect']])) {
|
||||
$coms['com'][$sti['complect']] = 0;
|
||||
$coms['new'][count($coms['new'])] = $sti['complect'];
|
||||
$coms['new'][] = $sti['complect'];
|
||||
}
|
||||
$coms['com'][$sti['complect']]++;
|
||||
if ($pl['2h'] > 0) {
|
||||
@ -2285,10 +2283,10 @@ $tma = '';
|
||||
}
|
||||
}
|
||||
if (isset($sti['complect2'])) {
|
||||
$coms[count($coms)]['id'] = $sti['complect2'];
|
||||
$coms[]['id'] = $sti['complect2'];
|
||||
if (!isset($coms['com'][$sti['complect2']])) {
|
||||
$coms['com'][$sti['complect2']] = 0;
|
||||
$coms['new'][count($coms['new'])] = $sti['complect2'];
|
||||
$coms['new'][] = $sti['complect2'];
|
||||
}
|
||||
$coms['com'][$sti['complect2']]++;
|
||||
if ($pl['2h'] > 0) {
|
||||
@ -2322,7 +2320,6 @@ $tma = '';
|
||||
$sti = $u->lookStats($plc['data']);
|
||||
while ($ij < count($ia)) {
|
||||
if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) {
|
||||
//$st[$ia[$ij]] += $sti[$ia[$ij]];
|
||||
$mad = $sti[$ia[$ij]];
|
||||
if ($mad > 0) {
|
||||
$mad = '+' . $mad;
|
||||
@ -2593,10 +2590,10 @@ $tma = '';
|
||||
);
|
||||
if (isset($sf['id'])) {
|
||||
$sfe = $u->lookStats($sf['vals']);
|
||||
$sf[0] = $u->info['exp'] - $sfe['e'];
|
||||
$sf[1] = $u->info['win'] - $sfe['w'];
|
||||
$sf[2] = $u->info['lose'] - $sfe['l'];
|
||||
$sf[3] = $u->info['nich'] - $sfe['n'];
|
||||
$sf[0] = $u->info['exp'] - (int)$sfe['e'];
|
||||
$sf[1] = $u->info['win'] - (int)$sfe['w'];
|
||||
$sf[2] = $u->info['lose'] - (int)$sfe['l'];
|
||||
$sf[3] = $u->info['nich'] - (int)$sfe['n'];
|
||||
unset($sfe);
|
||||
} else {
|
||||
$sf = [0 => 0, 1 => 0, 2 => 0, 3 => 0];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user