new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity

Отказ от абсолютных ссылок https://new-combats.com/* к относительным /*. Замена https://img.new-combats.com на //img.new-combats.tech.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-03-31 21:30:14 +03:00
parent 1b5bf26294
commit 01b504e677
346 changed files with 3507 additions and 4221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adminion/balance.php
+1 -1
View File
@@ -12,7 +12,7 @@ if (isset($_GET['connect'])) {
die('balance.php');
}
if ($u->info['admin'] < 1 && !isset($_COOKIE['adminionself'])) {
header('location: https://new-combats.com/');
header('location: /');
die();
}
adminion/dn_editor.php
+13 -13
View File
@@ -8,7 +8,7 @@ define('IP', UserIp::get());
$u = User::start();
if (!$u->info['admin']) {
die('<meta http-equiv="refresh" content="0; URL=https://new-combats.com/">');
die('<meta http-equiv="refresh" content="0; URL=/">');
}
if (isset($_GET['id'])) {
@@ -235,7 +235,7 @@ if (!isset($_GET['look'])) {
<html>
<head>
<title>Визуальный редактор Лабиринтов &copy; new-combats.com</title>
<title>Визуальный редактор Лабиринтов</title>
<script type="text/javascript" src="../js/jquery.js"></script>
<script type="text/javascript" src="../js/jqueryrotate.js"></script>
@@ -243,7 +243,7 @@ if (!isset($_GET['look'])) {
<script type="text/javascript" src="../js/jquery.cookie.js"></script>
<script type="text/javascript" src="../js/title.js"></script>
<link href="https://img.new-combats.com/css/dungeon_<?= $d->point['css']; ?>.css" rel="stylesheet"
<link href="//img.new-combats.tech/css/dungeon_<?= $d->point['css']; ?>.css" rel="stylesheet"
type="text/css">
<script>
@@ -813,11 +813,11 @@ if (!isset($_GET['look'])) {
actionNow = 'location=\'main.php?take_obj=' + v[0] + '&rnd=' + 0.28626200682069150 + '\';';
}
}
zfloor0[rz] = '<img id="obj_true_' + v[0] + '_2" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v + '\',\'' + iii + '\'); return false" title="' + v[1] + '" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v + '\')" src="https://img.new-combats.com/1x1.gif" style="cursor:pointer;position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />' + zfloor0[rz];
zfloor0[rz] = '<img id="obj_true_' + v[0] + '_2" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v + '\',\'' + iii + '\'); return false" title="' + v[1] + '" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v + '\')" src="//img.new-combats.tech/1x1.gif" style="cursor:pointer;position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />' + zfloor0[rz];
} else {
zfloor0[rz] = '<img id="obj_true_' + v[0] + '_2" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v + '\',\'' + iii + '\'); return false" title="' + v[1] + '" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v + '\')" src="https://img.new-combats.com/1x1.gif" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />' + zfloor0[rz];
zfloor0[rz] = '<img id="obj_true_' + v[0] + '_2" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v + '\',\'' + iii + '\'); return false" title="' + v[1] + '" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v + '\')" src="//img.new-combats.tech/1x1.gif" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />' + zfloor0[rz];
}
r = '<img id="obj_true_' + v[0] + '" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v[1] + '\',\'' + iii + '\'); return false" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v[1] + '\')" title="obj" src="https://img.new-combats.com/i/sprites/' + v[4] + '" class="dObj" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
r = '<img id="obj_true_' + v[0] + '" rz="' + rz + '" oncontextmenu="top.editObjResize(\'#obj_true_' + v[0] + '\',\'' + v[1] + '\',\'' + iii + '\'); return false" onClick="top.editObj(\'#obj_true_' + v[0] + '\',\'' + v[1] + '\')" title="obj" src="//img.new-combats.tech/i/sprites/' + v[4] + '" class="dObj" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
}
return r;
}
@@ -877,11 +877,11 @@ if (!isset($_GET['look'])) {
if (v[5] == 'bot' || 0 > 0) {
action = 'dialogMenu(' + v[0] + ',1,' + v[7] + ',0,0,event);';
}
zfloor0[rz] += '<img title="' + v[1] + '" onClick="' + action + '" src="https://img.new-combats.com/1x1.gif" style="cursor:pointer;position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
zfloor0[rz] += '<img title="' + v[1] + '" onClick="' + action + '" src="//img.new-combats.tech/1x1.gif" style="cursor:pointer;position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
} else {
zfloor0[rz] += '<img title="' + v[1] + '" src="https://img.new-combats.com/1x1.gif" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
zfloor0[rz] += '<img title="' + v[1] + '" src="//img.new-combats.tech/1x1.gif" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
}
r = '<img title="user" src="https://img.new-combats.com/chars/' + v[3] + '/' + v[4] + '.png" class="dUser" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
r = '<img title="user" src="//img.new-combats.tech/chars/' + v[3] + '/' + v[4] + '.png" class="dUser" style="position:absolute;top:' + new_top + 'px;left:' + new_left + 'px;width:' + new_w + 'px;height:' + new_h + 'px;" />';
}
return r;
}
@@ -993,7 +993,7 @@ if (!isset($_GET['look'])) {
}
#pline1 {
background-image: url(https://img.new-combats.com/wait3.gif);
background-image: url(//img.new-combats.tech/wait3.gif);
height: 9px;
z-index: 1000;
}
@@ -1162,7 +1162,7 @@ if (!isset($_GET['look'])) {
} ?>">
<?php if ($u->info['admin'] == 0){ ?>
<div>
<img src="https://img.new-combats.com/i/1x1.gif"
<img src="//img.new-combats.tech/i/1x1.gif"
usemap="#ObjectsMap"
border="0"/>
</div>
@@ -1394,7 +1394,7 @@ if (!isset($_GET['look'])) {
$style .= 'padding-right:1px;';
}
$map[$pl['x']][$pl['y']] = '<img class="cq" onClick="top.goPix(' . $pl['id'] . ',' . $pl['x'] . ',' . $pl['y'] . ');" id="px_' . $pl['id'] . '" style="' . $style . '" width="20" height="20" src="https://img.new-combats.com/1x1.gif" title="X: ' . $pl['x'] . ', Y: ' . $pl['y'] . '">';
$map[$pl['x']][$pl['y']] = '<img class="cq" onClick="top.goPix(' . $pl['id'] . ',' . $pl['x'] . ',' . $pl['y'] . ');" id="px_' . $pl['id'] . '" style="' . $style . '" width="20" height="20" src="//img.new-combats.tech/1x1.gif" title="X: ' . $pl['x'] . ', Y: ' . $pl['y'] . '">';
}
echo '<center><b>Карта пещеры</b> (X: [' . $min_x . '] - [' . $max_x . '] , Y: [' . $min_y . '] - [' . $max_y . '])</center><br><br>';
@@ -1408,7 +1408,7 @@ if (!isset($_GET['look'])) {
if (isset($map[$j][$i])) {
$r .= '<td>' . $map[$j][$i] . '</td>';
} else {
$r .= '<td><img style="vertical-align:bottom" width="1" height="1" src="https://img.new-combats.com/1x1.gif"></td>';
$r .= '<td><img style="vertical-align:bottom" width="1" height="1" src="//img.new-combats.tech/1x1.gif"></td>';
}
$j++;
}
adminion/dn_editor_bots.php
+1 -1
View File
@@ -8,7 +8,7 @@ define('IP', UserIp::get());
$u = User::start();
if (!$u->info['admin']) {
die('<meta http-equiv="refresh" content="0; URL=https://new-combats.com/">');
die('<meta http-equiv="refresh" content="0; URL=/">');
}
if (isset($_GET['id_dn'])) {
adminion/dn_editor_botsAll.php
+1 -1
View File
@@ -8,7 +8,7 @@ define('IP', UserIp::get());
$u = User::start();
if (!isset($u->info['id']) || $u->info['ip'] != IP || !$u->info['admin']) {
die('<meta http-equiv="refresh" content="0; URL=https://new-combats.com/">');
die('<meta http-equiv="refresh" content="0; URL=/">');
}
if (isset($_GET['id_dn'])) {
adminion/dn_editor_bots_itms.php
+1 -1
View File
@@ -8,7 +8,7 @@ define('IP', UserIp::get());
$u = User::start();
if (!$u->info['admin']) {
die('<meta http-equiv="refresh" content="0; URL=https://new-combats.com/">');
die('<meta http-equiv="refresh" content="0; URL=/">');
}
?>
adminion/editor_shop.php
+3 -3
View File
@@ -18,7 +18,7 @@ $r = round((int)$_GET['r']);
<head>
<title>Редактор предметов в магазине</title>
<link href="https://img.new-combats.com/css/main.css" rel="stylesheet" type="text/css">
<link href="//img.new-combats.tech/css/main.css" rel="stylesheet" type="text/css">
<script type="text/javascript">
function MM_jumpMenu(targ, selObj, restore) { //v3.0
eval(targ + ".location='" + selObj.options[selObj.selectedIndex].value + "'");
@@ -133,7 +133,7 @@ $r = round((int)$_GET['r']);
cellspacing="0" cellpadding="10">
<tr>
<td width="200" align="center" valign="middle">
<img src="https://img.new-combats.com/i/items/<?= $itm['img'] ?>"><br>
<img src="//img.new-combats.tech/i/items/<?= $itm['img'] ?>"><br>
Кол-во: <input value="<?= $pl['kolvo'] ?>" type="text"
name="itm_<?= $pl['iid'] ?>_x"><br>
#<?= $pl['item_id'] ?>
@@ -141,7 +141,7 @@ $r = round((int)$_GET['r']);
<input type="submit" value="Сохранить изменения">
</td>
<td valign="top">
<a href="https://new-combats.com/item/<?= $itm['id'] ?>"><?= $itm['name'] ?></a><br>
<a href="/item/<?= $itm['id'] ?>"><?= $itm['name'] ?></a><br>
Цена в базе: <input value="<?= $itm['price1'] ?>" type="text"
name="itm_<?= $pl['iid'] ?>_b1"> кр.<br>
Цена в базе: <input value="<?= $itm['price2'] ?>" type="text"
adminion/index.php
-4
View File
@@ -273,10 +273,6 @@ if($u->info['admin']=0){
}
?></td>
</tr>
<tr>
<td><div align="center" class="стиль2">new-combats.com <BR>
All rights reserved.</div></td>
</tr>
</table>
</body>
</html>
adminion/item_edit_data.php
+1 -1
View File
@@ -14,7 +14,7 @@ include('_incl_data/class/__db_connect.php');
$u = User::start();
if (!$u->info['admin']) {
header('location: https://new-combats.com/');
header('location: /');
exit();
}
$itm = mysql_fetch_array(
adminion/items_editor.php
+2 -2
View File
@@ -213,7 +213,7 @@ if (isset($_POST['it_name'])) {
};
//Левая часть
html_l += '<img src="https://img.new-combats.com/i/items/' + this.data.img + '">';
html_l += '<img src="//img.new-combats.tech/i/items/' + this.data.img + '">';
//Правая часть
html_r = '<a href="#">' + this.data.name + '</a>';
@@ -236,7 +236,7 @@ if (isset($_POST['it_name'])) {
}
};
</script>
<link href="https://img.new-combats.com/css/main.css" rel="stylesheet" type="text/css">
<link href="//img.new-combats.tech/css/main.css" rel="stylesheet" type="text/css">
</head>
<body>
adminion/mod/dungeon_bots.php
+2 -2
View File
@@ -215,11 +215,11 @@ if( isset($sBot) ){
'mpProc':'Уровень маны (%)'
};
function linkGif (th){
$('#linkGo').attr('href', 'https://img.new-combats.com/i/obraz/0/'+$('input[name=obraz]').val()).html('Open '+$(th).val()).click();
$('#linkGo').attr('href', '//img.new-combats.tech/i/obraz/0/'+$('input[name=obraz]').val()).html('Open '+$(th).val()).click();
}
function linkPng (th){
var t = $('input[name=obraz]').val(); t = t.split('.');
$('#linkGo').attr('href', 'https://img.new-combats.com/chars/0/'+t[0]+'.png').html('Open '+$(th).val()).click();
$('#linkGo').attr('href', '//img.new-combats.tech/chars/0/'+t[0]+'.png').html('Open '+$(th).val()).click();
}
</script>
<form method="post" action="../../adminion/mod/index.php?mod=dungeon_bots"><hr>
adminion/mult.php
+1 -1
View File
@@ -6,7 +6,7 @@ include('_incl_data/class/__db_connect.php');
$u = User::start();
if (!$u->info['admin']) {
header('location: https://new-combats.com/');
header('location: /');
die();
}
$html = '';
adminion/recovery.php
+1 -1
View File
@@ -7,7 +7,7 @@ include('_incl_data/class/__db_connect.php');
$u = User::start();
if(!$u->info['admin']) {
header('location: https://new-combats.com/');
header('location: /');
die();
}
adminion/shop_editor.php
+3 -3
View File
@@ -18,7 +18,7 @@ $r = round((int)$_GET['r']);
<head>
<title>Рредактор предметов в магазине</title>
<link href="https://img.new-combats.com/css/main.css" rel="stylesheet" type="text/css">
<link href="//img.new-combats.tech/css/main.css" rel="stylesheet" type="text/css">
<script type="text/javascript">
function MM_jumpMenu(targ,selObj,restore){ //v3.0
eval(targ+".location='"+selObj.options[selObj.selectedIndex].value+"'");
@@ -117,14 +117,14 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
<table name="itm_<?=$pl['iid']?>" id="itm_<?=$pl['iid']?>" width="100%" border="0" cellspacing="0" cellpadding="10">
<tr>
<td width="200" align="center" valign="middle">
<img src="https://img.new-combats.com/i/items/<?=$itm['img']?>"><br>
<img src="//img.new-combats.tech/i/items/<?=$itm['img']?>"><br>
Кол-во: <input value="<?=$pl['kolvo']?>" type="text" name="itm_<?=$pl['iid']?>_x"><br>
#<?=$pl['item_id']?>
<br>
<input type="submit" value="Ссохранить изменения">
</td>
<td valign="top">
<a href="https://new-combats.com/item/<?=$itm['id']?>"><?=$itm['name']?></a><br>
<a href="/item/<?=$itm['id']?>"><?=$itm['name']?></a><br>
Цена в базе: <input value="<?=$itm['price1']?>" type="text" name="itm_<?=$pl['iid']?>_b1"> кр.<br>
Цена в базе: <input value="<?=$itm['price2']?>" type="text" name="itm_<?=$pl['iid']?>_b2"> екр.<hr>
Цена в магазине: <input value="<?=$pl['price_1']?>" type="text" name="itm_<?=$pl['iid']?>_p1"> кр.<br>
adminion/testing.php
+7 -7
View File
@@ -6,7 +6,7 @@ include('_incl_data/class/__db_connect.php');
$u = User::start();
if (!$u->info['admin']) {
header('location: https://new-combats.com/');
header('location: /');
die();
}
@@ -24,11 +24,11 @@ while ($i < 100) {
<head>
<title>Тестирование ботов</title>
<script src="https://img.new-combats.com/js/Lite/gameEngine.js" type="text/javascript"></script>
<script src="//img.new-combats.tech/js/Lite/gameEngine.js" type="text/javascript"></script>
<script src="js/jquery-1.11.3.min.js"></script>
<script src="js/ion.rangeSlider.js"></script>
<script type="text/javascript" src="js/title.js"></script>
<link href="https://img.new-combats.com/css/main.css" rel="stylesheet" type="text/css">
<link href="//img.new-combats.tech/css/main.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="css/normalize.css"/>
<link rel="stylesheet" href="css/ion.rangeSlider.css"/>
<link rel="stylesheet" href="css/ion.rangeSlider.skinFlat.css"/>
@@ -137,7 +137,7 @@ while ($i < 100) {
border: 1px solid #6F6B5E;
}
</style>
<link href="https://img.new-combats.com/css/main.css" rel="stylesheet" type="text/css">
<link href="//img.new-combats.tech/css/main.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="js/jquery.js"></script>
<script>
function eff(user, id) {
@@ -249,7 +249,7 @@ while ($i < 100) {
{
if (isset($id['id'])) {
file_get_contents(
'https://new-combats.com/jx/battle/refresh.php?uid=' . $id['id'] . '&cron_core=' . md5(
'/jx/battle/refresh.php?uid=' . $id['id'] . '&cron_core=' . md5(
$id['id'] . '_brfCOreW@!_' . $id['pass']
) . '&pass=' . $id['pass']
);
@@ -266,7 +266,7 @@ while ($i < 100) {
inuser_go_btl($user1);
}
//
$error = 'Бой между <u>' . $user1['login'] . '</u> [' . $user1['level'] . '] <a target="_blank" href="/inf.php?' . $bot1 . '"><img src="https://img.new-combats.com/i/inf_capitalcity.gif"></a> и <u>' . $user2['login'] . '</u> [' . $user2['level'] . '] <a href="/inf.php?' . $bot2 . '" target="_blank"><img src="https://img.new-combats.com/i/inf_capitalcity.gif"></a> начался! <a href="/logs.php?log=' . $logid . '" target="_blank">Лог боя</a>';
$error = 'Бой между <u>' . $user1['login'] . '</u> [' . $user1['level'] . '] <a target="_blank" href="/inf.php?' . $bot1 . '"><img src="//img.new-combats.tech/i/inf_capitalcity.gif"></a> и <u>' . $user2['login'] . '</u> [' . $user2['level'] . '] <a href="/inf.php?' . $bot2 . '" target="_blank"><img src="//img.new-combats.tech/i/inf_capitalcity.gif"></a> начался! <a href="/logs.php?log=' . $logid . '" target="_blank">Лог боя</a>';
} else {
$error = 'Один из персонажей не найден в базе.';
}
@@ -306,7 +306,7 @@ while ($i < 100) {
$ei .= '<br><i>Информация:</i><br>' . $e['info'];
}
//
$ef = '<img onmouseover="hi(this,\'<b>' . $pl['mname'] . '</b>' . $ei . '\',event,3,1,1,1,\'\');" onMouseOut="hic();" onMouseDown="hic();" src="https://img.new-combats.com/i/eff/' . $pl['img'] . '" width="40" height="25">';
$ef = '<img onmouseover="hi(this,\'<b>' . $pl['mname'] . '</b>' . $ei . '\',event,3,1,1,1,\'\');" onMouseOut="hic();" onMouseDown="hic();" src="//img.new-combats.tech/i/eff/' . $pl['img'] . '" width="40" height="25">';
$ef1 .= '<input id="eu1_' . $pl['id2'] . '" name="eu1_' . $pl['id2'] . '" value="0" type="hidden"><span class="nprsl0" id="e1_' . $pl['id2'] . '" onclick="eff(1,' . $pl['id2'] . ');">' . $ef . '</span>';
$ef2 .= '<input id="eu2_' . $pl['id2'] . '" name="eu2_' . $pl['id2'] . '" value="0" type="hidden"><span class="nprsl0" id="e2_' . $pl['id2'] . '" onclick="eff(2,' . $pl['id2'] . ');">' . $ef . '</span>';
}