Autofix small errors

4 years ago · 094b8a6027
313 changed files with 744 additions and 2288 deletions
--- a/_unused-files/h.js
+++ b/_unused-files/h.js
@ -43,21 +43,21 @@ H.prototype.get = function(key, defaultValue){
 H.prototype.setHP = function(id, curHP, maxHP){
    curHP = curHP || 0;
    maxHP = maxHP || 0;
-    var hp = this.getMainBox().find('#hpKey_'+id);
+    const hp = this.getMainBox().find('#hpKey_' + id);
    if(hp.length < 1){
      return false;
    }
-    var hpA = $('img:eq(1)', hp);
-    var hpB = $('img:eq(2)', hp);
-    var redHP    = 0.33; // меньше 30% красный цвет
-    var yellowHP = 0.66; // меньше 60% желтый цвет, иначе зеленый
+    const hpA = $('img:eq(1)', hp);
+    const hpB = $('img:eq(2)', hp);
+    const redHP = 0.33; // меньше 30% красный цвет
+    const yellowHP = 0.66; // меньше 60% желтый цвет, иначе зеленый
    if(curHP > maxHP){
        curHP = maxHP;
    }
-    var text = curHP + '/' + maxHP;
-    var lengthHP = 170 - (text.length - 1) * 8;
-    var sizeFirst  = Math.round((lengthHP / maxHP) * curHP);
-    var sizeSecond = lengthHP - sizeFirst;
+    const text = curHP + '/' + maxHP;
+    const lengthHP = 170 - (text.length - 1) * 8;
+    const sizeFirst = Math.round((lengthHP / maxHP) * curHP);
+    const sizeSecond = lengthHP - sizeFirst;
    hpA.attr('width', sizeFirst);
    hpB.attr('width', sizeSecond);
    if(curHP / maxHP < redHP){
@ -116,15 +116,19 @@ H.prototype.sdOptionsDefault = {

 H.prototype._sd = function(options){
  options = $.extend({}, this.sdOptionsDefault, options);
-  var m = $('<div class="sd-container"></div>').css('width',options.width);
-  var t = $('<div class="sd-title">').text(options.title);
-  var c = $('<img class="sd-closer" src="/i/clear.gif" title="Закрыть окно" alt="X">')
-            .click(function(){return options.onClose.call($(this).closest('div.sd-container'))});
-  var f = $('<form class="sd-form"></form>')
-            .attr('method', options.formMethod)
-            .attr('action', options.formAction)
-            .submit(function(){return options.onSubmit.call($(this).closest('div.sd-container'))});
-  for(var i in options.data){
+    const m = $('<div class="sd-container"></div>').css('width', options.width);
+    const t = $('<div class="sd-title">').text(options.title);
+    const c = $('<img class="sd-closer" src="/i/clear.gif" title="Закрыть окно" alt="X">')
+        .click(function () {
+            return options.onClose.call($(this).closest('div.sd-container'))
+        });
+    const f = $('<form class="sd-form"></form>')
+        .attr('method', options.formMethod)
+        .attr('action', options.formAction)
+        .submit(function () {
+            return options.onSubmit.call($(this).closest('div.sd-container'))
+        });
+    for(let i in options.data){
    $('<input type=hidden>').attr('name',i).val(options.data[i]).appendTo(f);
  }
  if(options.formClass){
@ -135,18 +139,18 @@ H.prototype._sd = function(options){
 }

 H.prototype.sd = function(options){
-  var tmp = this._sd(options);
-  return this.getMainBox().append(tmp);
+    const tmp = this._sd(options);
+    return this.getMainBox().append(tmp);
 }

 H.prototype.sdOneInput = function(options){
-  var onSubmit2 = options.onSubmit;
-  options = $.extend({},this.sdOptionsDefault, {inputName: 'target', inputValue: '', grabber: null}, options);
-  var i = $('<input type="text" class="text">')
-              .css({'width': options.width - 45})
-              .attr('name',options.inputName)
-              .val(options.inputValue);
-  if(options.grabber &&  this[options.grabber] instanceof Grabber){
+    let onSubmit2 = options.onSubmit;
+    options = $.extend({},this.sdOptionsDefault, {inputName: 'target', inputValue: '', grabber: null}, options);
+    const i = $('<input type="text" class="text">')
+        .css({'width': options.width - 45})
+        .attr('name', options.inputName)
+        .val(options.inputValue);
+    if(options.grabber &&  this[options.grabber] instanceof Grabber){
    this[options.grabber].set(i);
  }else{
    i.select();
@ -155,8 +159,8 @@ H.prototype.sdOneInput = function(options){
                          .append(i)
                          .append('<input type="submit" class="button" style="width:33px;" value=" »» ">'));
  options.onSubmit = function(){
-    var v = i.val($.trim(i.val())).val();
-    if(v.length <= 0){
+      const v = i.val($.trim(i.val())).val();
+      if(v.length <= 0){
      alert('Не заполнено обязательное поле');
      return false
    }
@ -216,7 +220,7 @@ H.prototype.msgPopup = function(type, text){
    if(this._popupConfig[type] == undefined){
      type = 'w';
    }
-    var conf = this._popupConfig[type];
+    const conf = this._popupConfig[type];
    $.jGrowl(text,{
             header: '<img src="/i/jgrowl_moover.png" alt="<>" class="jgrowl-moover" title="Передвинуть"> ' + conf[1],
             glue:   'before',
@ -251,10 +255,10 @@ Grabber.prototype.isActive = function(){
 }

 Grabber.prototype.set = function(input){
-  var obj = this;
-  this.clear();
-  var tmp = $(input);
-  if(tmp.length > 0){
+    const obj = this;
+    this.clear();
+    const tmp = $(input);
+    if(tmp.length > 0){
    this.input = tmp.get(0);
    $(this.input)
       .addClass(this.options.inputClass)
--- a/admin/admin.php
+++ b/admin/admin.php
@ -1043,17 +1043,17 @@ if ($_POST['login'] && $_POST['krest']) {
 ?>

 <script type="text/javascript">
-    var xmlHttpp = [];
+    const xmlHttpp = [];

    function ajax_func(func, iid, getpar, postpar) {
        xmlHttpp[iid] = GetXmlHttpObject1();
        if (xmlHttpp[iid] == null) {
-            alert("Browser does not support HTTP Request")
+            alert("Browser does not support HTTP Request");
            return
        }
        document.getElementById(iid).innerHTML = "<img src='../i/loading2.gif' />";
-        var url = "./ajax/" + func + ".php"
-        url = url + "?" + getpar
+        var url = "./ajax/" + func + ".php";
+        url = url + "?" + getpar;
        xmlHttpp[iid].open("POST", url, true);
        xmlHttpp[iid].onreadystatechange = function () {
            if (xmlHttpp[iid].readyState == 4 || xmlHttpp[iid].readyState == "complete") {
@ -1063,13 +1063,13 @@ if ($_POST['login'] && $_POST['krest']) {
                    document.getElementById(iid).innerHTML = xmlHttpp[iid].responseText;
                document.getElementById('chat').scrollTop = document.getElementById('chat').scrollHeight + 10;
            }
-        }
+        };
        xmlHttpp[iid].setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
        xmlHttpp[iid].send(postpar);
    }

    function GetXmlHttpObject1() {
-        var xmlHttp1 = null;
+        let xmlHttp1 = null;
        try {
            xmlHttp1 = new XMLHttpRequest();
        }
@ -1085,7 +1085,7 @@ if ($_POST['login'] && $_POST['krest']) {
    }

    function show(ele) {
-        var srcElement = document.getElementById(ele);
+        const srcElement = document.getElementById(ele);
        if (srcElement != null) {
            if (srcElement.style.display == "block") {
                srcElement.style.display = 'none';
@ -1095,8 +1095,8 @@ if ($_POST['login'] && $_POST['krest']) {
        }
    }

-    var Hint3Name = '';
-    var Hint3Closed = false;
+    let Hint3Name = '';
+    let Hint3Closed = false;

    function runmagic0(title, magic, name) {
        document.all("hint3").innerHTML = '<table width=100% cellspacing=1 cellpadding=0 bgcolor=CCC3AA><tr><td align=center><B>' + title + '</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint3();"><BIG><B>x</b></BIG></td></tr><tr><td colspan=2>' +
@ -1248,17 +1248,17 @@ if ($_POST['login'] && $_POST['krest']) {
 </script>

 <script>
-    var xmlHttpp = []
+    var xmlHttpp = [];

    function ajax_func(func, iid, getpar, postpar) {
-        xmlHttpp[iid] = GetXmlHttpObject1()
+        xmlHttpp[iid] = GetXmlHttpObject1();
        if (xmlHttpp[iid] == null) {
-            alert("Browser does not support HTTP Request")
+            alert("Browser does not support HTTP Request");
            return
        }
        document.getElementById(iid).innerHTML = "<img src='../i/loading2.gif' />";
-        var url = "./ajax/" + func + ".php"
-        url = url + "?" + getpar
+        var url = "./ajax/" + func + ".php";
+        url = url + "?" + getpar;
        xmlHttpp[iid].open("POST", url, true);
        xmlHttpp[iid].onreadystatechange = function () {
            if (xmlHttpp[iid].readyState == 4 || xmlHttpp[iid].readyState == "complete") {
@ -1268,13 +1268,13 @@ if ($_POST['login'] && $_POST['krest']) {
                    document.getElementById(iid).innerHTML = xmlHttpp[iid].responseText;
                document.getElementById('chat').scrollTop = document.getElementById('chat').scrollHeight + 10;
            }
-        }
+        };
        xmlHttpp[iid].setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
        xmlHttpp[iid].send(postpar);
    }

    function GetXmlHttpObject1() {
-        var xmlHttp1 = null;
+        let xmlHttp1 = null;
        try {
            // Firefox, Opera 8.0+, Safari
            xmlHttp1 = new XMLHttpRequest();
--- a/admin/reset_clan_rates.php
+++ b/admin/reset_clan_rates.php
@ -26,4 +26,3 @@ while($check++ < $clans) {
  }
 }

-?>
--- a/admin/test_stats.php
+++ b/admin/test_stats.php
@ -184,4 +184,4 @@ if($res[0]!=$res2[0])


 }
-?>
+
--- a/ahero_shop.php
+++ b/ahero_shop.php
@ -255,8 +255,8 @@ if ($_POST['sale']) {
            </TD>
            <TD valign=top width=280>
                <div style="MARGIN-LEFT:15px; MARGIN-TOP: 10px;">
-                    <CENTER><B>Масса всех ваших вещей: <?= getItemsMassaInfo() ?><BR>
-                            У вас в наличии: <span style="color: blue"><?=$user['doblest']?></span> реп.</B></CENTER>
+                    <div style="text-align: center;"><B>Масса всех ваших вещей: <?= getItemsMassaInfo() ?><BR>
+                            У вас в наличии: <span style="color: blue"><?=$user['doblest']?></span> реп.</B></div>
                    <hr>
                    <a href=shop.php>ГОС. МАГАЗИН</a>
                    <hr>
--- a/buttons.php
+++ b/buttons.php
@ -123,13 +123,13 @@ if ($header) {
    </style>
    <script>
        function S(name) {
-            var sData = top.frames['bottom'].window.document;
+            const sData = top.frames['bottom'].window.document;
            sData.F1.text.focus();
            sData.F1.text.value = sData.F1.text.value + ':' + name + ': ';
        }

-        var currenttab = 1;
-        var viewmask = [1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        let currenttab = 1;
+        const viewmask = [1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];

        function ctab(n) {
            if (n === currenttab) return;
@ -256,17 +256,17 @@ if ($header) {

        top.ChatTranslit = false;

-        var map_en = ['s`h', 'S`h', 'S`H', 's`Х', 'sh`', 'Sh`', 'SH`', "'o", 'yo', "'O", 'Yo', 'YO', 'zh', 'w', 'Zh', 'ZH', 'W', 'ch', 'Ch', 'CH', 'sh', 'Sh', 'SH', 'e`', 'E`', "'u", 'yu', "'U", 'Yu', "YU", "'a", 'ya', "'A", 'Ya', 'YA', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D', 'e', 'E', 'z', 'Z', 'i', 'I', 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N', 'o', 'O', 'p', 'P', 'r', 'R', 's', 'S', 't', 'T', 'u', 'U', 'f', 'F', 'h', 'H', 'c', 'C', '`', 'y', 'Y', "'"];
-        var map_ru = ['сх', 'Сх', 'СХ', 'сХ', 'щ', 'Щ', 'Щ', 'ё', 'ё', 'Ё', 'Ё', 'Ё', 'ж', 'ж', 'Ж', 'Ж', 'Ж', 'ч', 'Ч', 'Ч', 'ш', 'Ш', 'Ш', 'э', 'Э', 'ю', 'ю', 'Ю', 'Ю', 'Ю', 'я', 'я', 'Я', 'Я', 'Я', 'а', 'А', 'б', 'Б', 'в', 'В', 'г', 'Г', 'д', 'Д', 'е', 'Е', 'з', 'З', 'и', 'И', 'й', 'Й', 'к', 'К', 'л', 'Л', 'м', 'М', 'н', 'Н', 'о', 'О', 'п', 'П', 'р', 'Р', 'с', 'С', 'т', 'Т', 'у', 'У', 'ф', 'Ф', 'х', 'Х', 'ц', 'Ц', 'ъ', 'ы', 'Ы', 'ь'];
+        const map_en = ['s`h', 'S`h', 'S`H', 's`Х', 'sh`', 'Sh`', 'SH`', "'o", 'yo', "'O", 'Yo', 'YO', 'zh', 'w', 'Zh', 'ZH', 'W', 'ch', 'Ch', 'CH', 'sh', 'Sh', 'SH', 'e`', 'E`', "'u", 'yu', "'U", 'Yu', "YU", "'a", 'ya', "'A", 'Ya', 'YA', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D', 'e', 'E', 'z', 'Z', 'i', 'I', 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N', 'o', 'O', 'p', 'P', 'r', 'R', 's', 'S', 't', 'T', 'u', 'U', 'f', 'F', 'h', 'H', 'c', 'C', '`', 'y', 'Y', "'"];
+        const map_ru = ['сх', 'Сх', 'СХ', 'сХ', 'щ', 'Щ', 'Щ', 'ё', 'ё', 'Ё', 'Ё', 'Ё', 'ж', 'ж', 'Ж', 'Ж', 'Ж', 'ч', 'Ч', 'Ч', 'ш', 'Ш', 'Ш', 'э', 'Э', 'ю', 'ю', 'Ю', 'Ю', 'Ю', 'я', 'я', 'Я', 'Я', 'Я', 'а', 'А', 'б', 'Б', 'в', 'В', 'г', 'Г', 'д', 'Д', 'е', 'Е', 'з', 'З', 'и', 'И', 'й', 'Й', 'к', 'К', 'л', 'Л', 'м', 'М', 'н', 'Н', 'о', 'О', 'п', 'П', 'р', 'Р', 'с', 'С', 'т', 'Т', 'у', 'У', 'ф', 'Ф', 'х', 'Х', 'ц', 'Ц', 'ъ', 'ы', 'Ы', 'ь'];

        function convert(str) {
-            for (var i = 0; i < map_en.length; ++i) while (str.indexOf(map_en[i]) >= 0) str = str.replace(map_en[i], map_ru[i]);
+            for (let i = 0; i < map_en.length; ++i) while (str.indexOf(map_en[i]) >= 0) str = str.replace(map_en[i], map_ru[i]);
            return str;
        }

        function defPosition2(event) {
-            var isIE11 = navigator.userAgent.match(/Trident\/7.0.*rv.*11\.0/);
-            var x = y = 0;
+            const isIE11 = navigator.userAgent.match(/Trident\/7.0.*rv.*11\.0/);
+            let x = y = 0;
            if (document.attachEvent != null || isIE11) {
                x = window.event.clientX + (document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft);
                y = window.event.clientY + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop);
@ -290,9 +290,9 @@ if ($header) {
        }

        function trns() {
-            var strarr;
+            let strarr;
            strarr = document.F1.text.value.split(' ');
-            for (var k = 0; k < strarr.length; k++) {
+            for (let k = 0; k < strarr.length; k++) {
                if (strarr[k].indexOf("http://") < 0 && strarr[k].indexOf('@') < 0 && strarr[k].indexOf("www.") < 0 && !(strarr[k].charAt(0) == ":" && strarr[k].charAt(strarr[k].length - 1) == ":")) {
                    if ((k < strarr.length - 1) && (strarr[k] == "to" || strarr[k] == "private") && (strarr[k + 1].charAt(0) == "[")) {
                        while ((k < strarr.length - 1) && (strarr[k].charAt(strarr[k].length - 1) != "]")) k++;
@ -341,12 +341,12 @@ if ($header) {

        function smiles() {
            if (document.all && document.all.item && !window.opera && !document.layers) {
-                var x = event.screenX - 150;
-                var y = event.screenY - 320;
-                var sFeatures = 'dialogLeft:' + x + 'px;dialogTop:' + y + 'px;dialogHeight:310px;dialogWidth:300px;help:no;status:no;unadorned:yes';
+                const x = event.screenX - 150;
+                const y = event.screenY - 320;
+                const sFeatures = 'dialogLeft:' + x + 'px;dialogTop:' + y + 'px;dialogHeight:310px;dialogWidth:300px;help:no;status:no;unadorned:yes';
                window.showModelessDialog("smiles.html", window, sFeatures);
            } else {
-                var sm = ["horse", 60, 40, "hug", 48, 20, "laugh", 15, 15, "susel", 70, 34, "fingal", 22, 15, "eek", 15, 15, "flowers", 28, 29, "smoke", 20, 20, "hi", 31, 28, "bye", 15, 15,
+                const sm = ["horse", 60, 40, "hug", 48, 20, "laugh", 15, 15, "susel", 70, 34, "fingal", 22, 15, "eek", 15, 15, "flowers", 28, 29, "smoke", 20, 20, "hi", 31, 28, "bye", 15, 15,
                    "king", 21, 22, "king2", 28, 24, "boks2", 28, 21, "boks", 62, 28, "gent", 15, 21, "lady", 15, 19, "tongue", 15, 15, "smil", 16, 16, "rotate", 15, 15,
                    "ponder", 21, 15, "bow", 15, 21, "smile", 18, 18, "angel", 42, 23, "angel2", 26, 25, "hello", 25, 27, "dont", 26, 26, "idea", 26, 27, "mol", 27, 22, "super", 26, 28,
                    "beer", 15, 15, "drink", 19, 17, "baby", 15, 18, "tongue2", 15, 15, "sword", 49, 18, "agree", 37, 15, "loveya", 27, 15, "kiss", 15, 15, "kiss2", 15, 15, "kiss3", 15, 15, "kiss4", 37, 15, "rose", 15, 15, "love", 27, 28,
@ -357,11 +357,11 @@ if ($header) {
                    "smile44", 27, 26, "smile70", 50, 32];

                function createMessage(body) {
-                    var container = document.createElement('div');
-                    var i = 0;
+                    const container = document.createElement('div');
+                    let i = 0;
                    body = '';
                    while (i < sm.length) {
-                        var s = sm[i++];
+                        const s = sm[i++];
                        body += '<a class="hoversmile" href="javascript: void(0);" onClick="SSm(\'' + s + '\')"><IMG SRC=i/smiles/' + s + '.gif WIDTH=' + sm[i++] + ' HEIGHT=' + sm[i++] + ' BORDER=0 ALT="" ></a>';
                    }
                    container.innerHTML = '<div id="ssmsmilediv" class="ssm-smile"><div class="ssm-smile-body">' + body + '</div><input class="ssm-smile-ok" type="button" value="Закрыть"/></div>';
@ -369,7 +369,7 @@ if ($header) {
                }

                function positionMessage(elem) {
-                    var ua = navigator.userAgent.toLowerCase();
+                    const ua = navigator.userAgent.toLowerCase();
                    if (ua.indexOf("msie") != -1 && ua.indexOf("opera") == -1 && ua.indexOf("webtv") == -1) {
                        IsIE(elem);
                    } else {
@ -380,14 +380,14 @@ if ($header) {
                }

                function addCloseOnClick(messageElem) {
-                    var input = messageElem.getElementsByTagName('INPUT')[0];
+                    const input = messageElem.getElementsByTagName('INPUT')[0];
                    input.onclick = function () {
                        messageElem.parentNode.removeChild(messageElem);
                    }
                }

                function setupMessageButton(title, body) {
-                    var messageElem = createMessage(title, body);
+                    const messageElem = createMessage(title, body);
                    positionMessage(messageElem);
                    addCloseOnClick(messageElem);
                    top.frames['chat'].document.body.appendChild(messageElem);
@ -405,7 +405,7 @@ if ($header) {
        }

        function rslength() { // изменяет размер строки ввода текста
-            var size = document.body.clientWidth - (2 * 30) - 66 - 256 - 30;
+            let size = document.body.clientWidth - (2 * 30) - 66 - 256 - 30;
            if (size < 100) {
                size = 100
            }
@ -420,7 +420,7 @@ if ($header) {
                    evt = evt || window.event;
                    evt.cancelBubble = true;

-                    var html = '<p style="margin: 10px;"><input type="button" style="cursor: pointer;" onclick="clearfull();" value="Очистить весь чат" /><br style="margin-top: 5px;"> \
+                    const html = '<p style="margin: 10px;"><input type="button" style="cursor: pointer;" onclick="clearfull();" value="Очистить весь чат" /><br style="margin-top: 5px;"> \
 				  <input type="button" style="font-weight: bold; cursor: pointer;" onclick="clearpanel();" value="Очистить текущую вкладку" /><br style="margin-top: 5px;"> \
 		          <input type="button" style="cursor: pointer;" value="Отменить" onclick="top.frames[\'chat\'].document.getElementById(\'ClearMenu\').style.display=\'none\';" /><br style="margin-top: 5px;"></p> \
      ';
@ -483,18 +483,18 @@ if ($header) {
    </TABLE>

    <script language="JavaScript">
-        var user = top.getCookie("ChatColor");
+        const user = top.getCookie("ChatColor");
        if ((user != null) && (user != "")) document.F1.color.value = user;

        function smiles() {
            if (document.all && document.all.item && !window.opera && !document.layers) {
-                var x = event.screenX - 150;
-                var y = event.screenY - 320;
-                var sFeatures = 'dialogLeft:' + x + 'px;dialogTop:' + y + 'px;dialogHeight:310px;dialogWidth:300px;help:no;status:no;unadorned:yes';
+                const x = event.screenX - 150;
+                const y = event.screenY - 320;
+                const sFeatures = 'dialogLeft:' + x + 'px;dialogTop:' + y + 'px;dialogHeight:310px;dialogWidth:300px;help:no;status:no;unadorned:yes';
                window.showModelessDialog("smiles.html?", window, sFeatures);
            }
            else {
-                var sm = ["horse", 60, 40, "hug", 48, 20, "laugh", 15, 15, "susel", 70, 34, "fingal", 22, 15, "eek", 15, 15, "flowers", 28, 29, "smoke", 20, 20, "hi", 31, 28, "bye", 15, 15,
+                const sm = ["horse", 60, 40, "hug", 48, 20, "laugh", 15, 15, "susel", 70, 34, "fingal", 22, 15, "eek", 15, 15, "flowers", 28, 29, "smoke", 20, 20, "hi", 31, 28, "bye", 15, 15,
                    "king", 21, 22, "king2", 28, 24, "boks2", 28, 21, "boks", 62, 28, "gent", 15, 21, "lady", 15, 19, "tongue", 15, 15, "smil", 16, 16, "rotate", 15, 15,
                    "ponder", 21, 15, "bow", 15, 21, "smile", 18, 18, "angel", 42, 23, "angel2", 26, 25, "hello", 25, 27, "dont", 26, 26, "idea", 26, 27, "mol", 27, 22, "super", 26, 28,
                    "beer", 15, 15, "drink", 19, 17, "baby", 15, 18, "tongue2", 15, 15, "sword", 49, 18, "agree", 37, 15, "loveya", 27, 15, "kiss", 15, 15, "kiss2", 15, 15, "kiss3", 15, 15, "kiss4", 37, 15, "rose", 15, 15, "love", 27, 28,
@ -505,11 +505,11 @@ if ($header) {
                    "smile44", 27, 26, "smile70", 50, 32];

                function createMessage(body) {
-                    var container = document.createElement('div');
-                    var i = 0;
+                    const container = document.createElement('div');
+                    let i = 0;
                    body = '';
                    while (i < sm.length) {
-                        var s = sm[i++];
+                        const s = sm[i++];
                        body += '<a class="hoversmile" href="javascript:void(0)" onClick="SSm(\'' + s + '\')"><IMG SRC=i/smiles/' + s + '.gif WIDTH=' + sm[i++] + ' HEIGHT=' + sm[i++] + ' BORDER=0 ALT="" ></a>';
                    }
                    container.innerHTML = '<div id="ssmsmilediv" class="ssm-smile"><div class="ssm-smile-body">' + body + '</div><input class="ssm-smile-ok" type="button" value="Закрыть"/></div>';
@ -517,7 +517,7 @@ if ($header) {
                }

                function positionMessage(elem) {
-                    var ua = navigator.userAgent.toLowerCase();
+                    const ua = navigator.userAgent.toLowerCase();
                    if (ua.indexOf("msie") != -1 && ua.indexOf("opera") == -1 && ua.indexOf("webtv") == -1) {
                        IsIE(elem);
                    }
@ -530,14 +530,14 @@ if ($header) {
                }

                function addCloseOnClick(messageElem) {
-                    var input = messageElem.getElementsByTagName('INPUT')[0];
+                    const input = messageElem.getElementsByTagName('INPUT')[0];
                    input.onclick = function () {
                        messageElem.parentNode.removeChild(messageElem);
                    }
                }

                function setupMessageButton(title, body) {
-                    var messageElem = createMessage(title, body);
+                    const messageElem = createMessage(title, body);
                    positionMessage(messageElem);
                    addCloseOnClick(messageElem);
                    top.frames['chat'].document.body.appendChild(messageElem);
--- a/c_forest.php
+++ b/c_forest.php
@ -102,16 +102,16 @@ if($_GET['move'] == 'true') {
  <div id="systemMsg" class="system-msg"></div>
  <div style="position: relative; width: 780px; height: 350px; background-image: url('forest/<?=$forest['room'];?>.jpg');">
    <? if($map_user['Right'] == 1) { ?>
-    <img style="position: absolute; bottom: 30px; left: 740px; cursor: pointer; width: 20px; height: 117px; border: 0px solid blue;" class="pngimg" src="i/forest/pointer_2.png" title="<?=$var_map['cell_'.($forest['room_id']+1)];?>" onclick="location.href='?move=true&Dir=Right';" />
+    <img style="position: absolute; bottom: 30px; left: 740px; cursor: pointer; width: 20px; height: 117px; border: 0 solid blue;" class="pngimg" src="i/forest/pointer_2.png" title="<?=$var_map['cell_'.($forest['room_id']+1)];?>" onclick="location.href='?move=true&Dir=Right';" />
    <? } ?>
    <? if($map_user['Left'] == 1) { ?>
-    <img style="position: absolute; bottom: 30px; left: 20px; cursor: pointer; width: 20px; height: 117px; border: 0px solid blue;" class="pngimg" src="i/forest/pointer_6.png" title="<?=$var_map['cell_'.($forest['room_id']-1)];?>" onclick="location.href='?move=true&Dir=Left';" />
+    <img style="position: absolute; bottom: 30px; left: 20px; cursor: pointer; width: 20px; height: 117px; border: 0 solid blue;" class="pngimg" src="i/forest/pointer_6.png" title="<?=$var_map['cell_'.($forest['room_id']-1)];?>" onclick="location.href='?move=true&Dir=Left';" />
    <? } ?>
    <? if($map_user['Down'] == 1) { ?>
-    <img style="position: absolute; bottom: 10px; left: 332px; cursor: pointer; width: 117px; height: 20px; border: 0px solid blue;" class="pngimg" src="i/forest/pointer_4.png" title="<?=$var_map['cell_'.($forest['room_id']+5)];?>" onclick="location.href='?move=true&Dir=Down';" />
+    <img style="position: absolute; bottom: 10px; left: 332px; cursor: pointer; width: 117px; height: 20px; border: 0 solid blue;" class="pngimg" src="i/forest/pointer_4.png" title="<?=$var_map['cell_'.($forest['room_id']+5)];?>" onclick="location.href='?move=true&Dir=Down';" />
    <? } ?>
    <? if($map_user['Up'] == 1) { ?>
-    <img style="position: absolute; bottom: 127px; left: 332px; cursor: pointer; width: 117px; height: 20px; border: 0px solid blue;" class="pngimg" src="i/forest/pointer_8.png" title="<?=$var_map['cell_'.($forest['room_id']-5)];?>" onclick="location.href='?move=true&Dir=Up';" />
+    <img style="position: absolute; bottom: 127px; left: 332px; cursor: pointer; width: 117px; height: 20px; border: 0 solid blue;" class="pngimg" src="i/forest/pointer_8.png" title="<?=$var_map['cell_'.($forest['room_id']-5)];?>" onclick="location.href='?move=true&Dir=Up';" />
    <? } ?>
  </div>
  <? if($error != '') { echo '<center><b style=\'color: Red;\'>'.$error.'</b></center>'; } ?>
--- a/c_haos.php
+++ b/c_haos.php
@ -196,7 +196,7 @@ elseif ($in_haos['status']==0)
            }
                
            else echo('  <em>(Создать новую группу)</em>');
-            echo '<BR />';
+            echo '<BR>';
        }                
                                        
        
--- a/c_haos_in.php
+++ b/c_haos_in.php
@ -351,8 +351,6 @@ $tm=time();
                $p_id=$priz_high[$rand_k];
                $p_shop="shop";
            }
-            else
-            {};
        }
        elseif($in_haos['room']==30)
        {
@ -365,12 +363,9 @@ $tm=time();
            $p_id=$priz_low[$rand_k];
            $p_shop="shop";
            }
-            else
-            {}
-            
+
        }
-        else
-        {};
+
        //выбираем получателя
        $all_get=array();
        $gr_raw=mysql_query("SELECT * FROM `cit_haos_status` WHERE `group` = '{$in_haos['group']}';");
--- a/canalizaciya.php
+++ b/canalizaciya.php
@ -54,7 +54,7 @@ print "<script>location.href='vxod.php'</script>"; exit();
 <meta http-equiv="Content-Language" content="ru">
 <link rel=stylesheet type="text/css" href="css/main.css">
 <SCRIPT LANGUAGE="JavaScript" >
-var Hint3Name = '';
+let Hint3Name = '';
 // Заголовок, название скрипта, имя поля с логином
 function findlogin(title, script, name){
 	document.all("hint3").innerHTML = '<form action="'+script+'" method=GET style="margin:0;"><table width=100% cellspacing=1 cellpadding=0 bgcolor=CCC3AA><tr><td align=center><B style="font-size:11px">'+title+'</td><td width=20 align=right valign=top style="cursor: pointer" onclick="closehint3();"><BIG><B>x</td></tr><tr><td colspan=2>'+
@ -572,26 +572,27 @@ echo build_move_image($mesto, $vektor, 1, $glava);
  </tr>
 </table>
 <script language="javascript" type="text/javascript">
-var progressEnd = 32;		// set to number of progress <span>'s.
-var progressColor = '#00CC00';	// set to progress bar color
-var mtime = parseInt('<?=($_SESSION['time']-time())?>');
+const progressEnd = 32;		// set to number of progress <span>'s.
+let progressColor = '#00CC00';	// set to progress bar color
+let mtime = parseInt('<?=($_SESSION['
 if (!mtime || mtime<=0) {mtime=0;}
-var progressInterval = Math.round(mtime*1000/progressEnd);	// set to time between updates (milli-seconds)
-var is_accessible = true;
-var progressAt = progressEnd;
-var progressTimer;
+const progressInterval = Math.round(mtime * 1000 / progressEnd);	// set to time between updates (milli-seconds)
+let is_accessible = true;
+let progressAt = progressEnd;
+let progressTimer;
+
 function progress_clear() {
-	for (var i = 1; i <= progressEnd; i++) document.getElementById('progress'+i).style.backgroundColor = 'transparent';
+	for (let i = 1; i <= progressEnd; i++) document.getElementById('progress'+i).style.backgroundColor = 'transparent';
 	progressAt = 0;
 	
-	for (var t = 1; t <= 8; t++) {
+	for (let t = 1; t <= 8; t++) {
 		if (document.getElementById('m'+t) ) {
-			var tempname = document.getElementById('m'+t).children[0].src;
-			if (tempname.match(/b\.gif$/)) {
+            const tempname = document.getElementById('m' + t).children[0].src;
+            if (tempname.match(/b\.gif$/)) {
 					document.getElementById('m'+t).children[0].id = 'backend';
 			}
-			var newname;
-			newname = tempname.replace(/(b)?\.gif$/,'i.gif');
+            let newname;
+            newname = tempname.replace(/(b)?\.gif$/,'i.gif');

 			document.getElementById('m'+t).children[0].src = newname;
 		}
@ -605,11 +606,11 @@ function progress_update() {
 	//if (progressAt > progressEnd) progress_clear();
 	if (progressAt > progressEnd) {
 		
-		for (var t = 1; t <= 8; t++) {
+		for (let t = 1; t <= 8; t++) {
 			if (document.getElementById('m'+t) ) {
-				var tempname = document.getElementById('m'+t).children[0].src;
-				var newname;
-				newname = tempname.replace(/i\.gif$/,'.gif');
+                let tempname = document.getElementById('m' + t).children[0].src;
+                let newname;
+                newname = tempname.replace(/i\.gif$/,'.gif');
 				if (document.getElementById('m'+t).children[0].id == 'backend') {
 					tempname = newname.replace(/\.gif$/,'b.gif');
 					newname = tempname;
@ -643,7 +644,7 @@ function check_access () {
 }
 function ch_counter_color (color) {
 	progressColor = color;
-	for (var i = 1; i <= progressAt; i++) {
+	for (let i = 1; i <= progressAt; i++) {
 		document.getElementById('progress'+i).style.backgroundColor = progressColor;
 	}
 }
@ -711,8 +712,9 @@ color: #000000;

 <LINK REL=StyleSheet HREF='css/style.css' TYPE='text/css'>
 <script>
-var rnd = Math.random();
-function sunduk(n)
+    const rnd = Math.random();
+
+    function sunduk(n)
 {
 document.location.href="?act=sunduk&n="+n+"&rnd="+Math.random();
 }
@ -741,10 +743,10 @@ function dialog()
 document.location.href="?act=luka&rnd="+Math.random();
 }
 function OpenMenu(n,e){
-         var el, x, y;
-         el = document.all("oMenu");
-         var event = (window.event) ? window.event : e;
-         x = event.clientX + document.documentElement.scrollLeft +document.body.scrollLeft - 5;
+    let el, x, y;
+    el = document.all("oMenu");
+    const event = (window.event) ? window.event : e;
+    x = event.clientX + document.documentElement.scrollLeft +document.body.scrollLeft - 5;
         y = event.clientY + document.documentElement.scrollTop + document.body.scrollTop-5;
         if (event.clientY + 72 > document.body.clientHeight) { y-=62 } else { y-=2 }
         el.innerHTML = '<div style="color:#000; cursor: pointer; height: 11px; margin: 2px; width: 45px;" class=menuItem onmouseout="this.className=\'menuItem\';" onmouseover="this.className=\'menuItem2\';" onclick="this.disabled = true;attack('+n+');closeMenu(event);">Напасть </div>';
@ -754,10 +756,10 @@ function OpenMenu(n,e){
         el.style.visibility = "visible";
 }
 function Opendialog(n,e){
-         var el, x, y;
-         el = document.all("oMenu");
-         var event = (window.event) ? window.event : e;
-         x = event.clientX + document.documentElement.scrollLeft +document.body.scrollLeft - 5;
+    let el, x, y;
+    el = document.all("oMenu");
+    const event = (window.event) ? window.event : e;
+    x = event.clientX + document.documentElement.scrollLeft +document.body.scrollLeft - 5;
         y = event.clientY + document.documentElement.scrollTop + document.body.scrollTop-5;
         if (event.clientY + 72 > document.body.clientHeight) { y-=62 } else { y-=2 }
         el.innerHTML = '<div style="color:#000; cursor: pointer;" class=menuItem onmouseout="this.className=\'menuItem\';" onmouseover="this.className=\'menuItem2\';" onclick="this.disabled = true;attack('+n+');"> &nbsp;Напасть </div><div style="color:#000; cursor: pointer;" class=menuItem onmouseout="this.className=\'menuItem\';" onmouseover="this.className=\'menuItem2\';" onclick="this.disabled = true;dialog();"> Говорить </div>';
@ -771,8 +773,9 @@ function Opendialog(n,e){
 function closeMenu(){

         if (window.event && window.event.toElement)
-          {var cls = window.event.toElement.className;
-                  if (cls=='menuItem' || cls=='menu') return;
+          {
+              const cls = window.event.toElement.className;
+              if (cls=='menuItem' || cls=='menu') return;
          }
         document.all("oMenu").style.visibility = "hidden";
         document.all("oMenu").style.top="0px";
--- a/canalization_mod.php
+++ b/canalization_mod.php
@ -192,4 +192,3 @@ function next_step($location, $vector) {

 //////////////
 }
-?>
--- a/cave.php
+++ b/cave.php
@ -822,47 +822,48 @@ function test() {
 </SCRIPT>
 <link rel=stylesheet type="text/css" href="/i/main.css">
 <style>
-body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; margin: 0px 0px 0px 0px; }
-.menu {z-index: 100; background-color: #E4F2DF; border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute; left: 0px; top: 0px; visibility: hidden; cursor: pointer; }
-a.menuItem { border: 0px solid #000000; background-color: #484848; color: #000000; display: block; font-family: Verdana, Arial; font-size: 8pt; font-weight: bold; padding: 2px 12px 2px 8px; text-decoration: none; }
+body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; margin: 0 0 0 0; }
+.menu {z-index: 100; background-color: #E4F2DF; border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute; left: 0; top: 0; visibility: hidden; cursor: pointer; }
+a.menuItem { border: 0 solid #000000; background-color: #484848; color: #000000; display: block; font-family: Verdana, Arial; font-size: 8pt; font-weight: bold; padding: 2px 12px 2px 8px; text-decoration: none; }
 a.menuItem:hover { background-color: #d4cbaa; color: #000000; }
 div.MoveLine { width: 108px; height: 7px; size: 2px; font-size: 2px; position: relative; overflow: hidden; }
-img.MoveLine { width: 108px; height: 7px; border: 0px solid; position: absolute; left: 0px; top: 0px }
-
-.cw1 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/cw1.gif?1)}
-.cw2 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/cw2.gif?1)}
-.cw3 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/cw3.gif?1)}
-.cw4 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/cw4.gif?1)}
-.cw5 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/cw5.gif?1)}
-
-.lw0 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw0.gif)}
-.lw1 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw1.gif)}
-.lw2 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw2.gif)}
-.lw3 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw3.gif)}
-.lw4 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw4.gif)}
-
-.rw0 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw0.gif)}
-.rw1 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw1.gif)}
-.rw2 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw2.gif)}
-.rw3 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw3.gif)}
-.rw4 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw4.gif)}
-
-.lsw0 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw0.gif)}
-.lsw1 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw1.gif)}
-.lsw2 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw2.gif)}
-.lsw3 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw3.gif)}
-.lsw4 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw4.gif)}
-.lsw42 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lsw42.gif)}
-
-.rsw0 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw0.gif)}
-.rsw1 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw1.gif)}
-.rsw2 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw2.gif)}
-.rsw3 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw3.gif)}
-.rsw4 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw4.gif)}
-.rsw42 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rsw42.gif)}
-
-.lw42 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/lw42.gif)}
-.rw42 {position:absolute;left:0px;top:0px;width:352px;height:240px;background-image:url(<?=$base?>/rw42.gif)}
+img.MoveLine { width: 108px; height: 7px; border: 0 solid; position: absolute; left: 0; top: 0
+}
+
+.cw1 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/cw1.gif?1)}
+.cw2 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/cw2.gif?1)}
+.cw3 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/cw3.gif?1)}
+.cw4 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/cw4.gif?1)}
+.cw5 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/cw5.gif?1)}
+
+.lw0 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw0.gif)}
+.lw1 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw1.gif)}
+.lw2 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw2.gif)}
+.lw3 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw3.gif)}
+.lw4 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw4.gif)}
+
+.rw0 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw0.gif)}
+.rw1 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw1.gif)}
+.rw2 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw2.gif)}
+.rw3 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw3.gif)}
+.rw4 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw4.gif)}
+
+.lsw0 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw0.gif)}
+.lsw1 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw1.gif)}
+.lsw2 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw2.gif)}
+.lsw3 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw3.gif)}
+.lsw4 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw4.gif)}
+.lsw42 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lsw42.gif)}
+
+.rsw0 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw0.gif)}
+.rsw1 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw1.gif)}
+.rsw2 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw2.gif)}
+.rsw3 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw3.gif)}
+.rsw4 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw4.gif)}
+.rsw42 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rsw42.gif)}
+
+.lw42 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/lw42.gif)}
+.rw42 {position:absolute;left:0;top:0;width:352px;height:240px;background-image:url(<?=$base?>/rw42.gif)}
 .maptd { width: 15px; height: 15px; }
 </style>
 <script>
@ -974,8 +975,8 @@ setHP(<?=$user['hp'];?>, <?=$user['maxhp'];?>, 100);
 </head>
 <body leftmargin=5 topmargin=5 marginwidth=5 marginheight=5  bgcolor="#d7d7d7" style=" background-image: url(/i/bagr.gif); width=100%; background-repeat:repeat;background-position:top" onLoad="<?=topsethp()?>">
 <div id=hint3 class=ahint></div>
-<div style="z-index: 100;  background-color: #E4F2DF;  border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute;  left: 0px;  top: 0px;  visibility: hidden;  cursor:pointer;" id="oMenu"></div>
-<div style="z-index: 100;  background-color: #E4F2DF;  border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute;  left: 0px;  top: 0px;  visibility: hidden;  cursor:pointer;" id="oMenu2"></div>
+<div style="z-index: 100;  background-color: #E4F2DF;  border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute;  left: 0;  top: 0;  visibility: hidden;  cursor:pointer;" id="oMenu"></div>
+<div style="z-index: 100;  background-color: #E4F2DF;  border-style: solid; border-width: 2px; border-color: #77c3fc; position: absolute;  left: 0;  top: 0;  visibility: hidden;  cursor:pointer;" id="oMenu2"></div>
 <?

 if($user['hp'] <= 0) {
@ -1483,7 +1484,7 @@ function drawmap($map1, $players, $x, $y, $direction) {
    <td nowrap=\"nowrap\" id=\"moveto\">
    </td></tr></TABLE>";
    $ret.="</div>";
-    $ret.="<script language=\"javascript\" type=\"text/javascript\">
+    $ret.= ">
 var progressEnd = 108;		// set to number of progress <span>'s.
 var progressColor = '#00CC00';	// set to progress bar color
 var mtime = parseInt('";
--- a/cave/cave_bots.php
+++ b/cave/cave_bots.php
@ -18,4 +18,3 @@ $botnames = array(
    6 => "Обезумевший крыс",
    7 => "Призрак короля крыс ",
    8 => "Обезумевший палач");
-?>
--- a/cave/caveitems.php
+++ b/cave/caveitems.php
@ -9,4 +9,3 @@ if($user['room'] == 621) {
  $caveitems[7] = array(array('id' => 1129, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 10, 'podzem' => 1));
  $caveitems[8] = array(array('id' => 1131, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1));
 }
-?>
--- a/cave/lose.php
+++ b/cave/lose.php
@ -19,4 +19,3 @@ foreach($lomka1 as $k => $v) {
    }
  }
 }
-?>
--- a/cave/win.php
+++ b/cave/win.php
@ -84,4 +84,3 @@ if(in_array($user['room'], $caverooms)) {
  mysql_query("DELETE FROM `cavebots` WHERE `battle` = '".$this->battle_data["id"]."'");
  mysql_query('UNLOCK TABLES');
 }
-?>
--- a/cavedata.php
+++ b/cavedata.php
@ -2,4 +2,3 @@

 $cavedata = array(621 => array('x1' => 6, 'y1' => 11, 'dir1' => 1, 'x2' => 10, 'y2' => 8, 'dir2' => 1, 'x3' => 20, 'y3' => 4, 'dir3' => 1,'x4' => 10, 'y4' => 10, 'dir4' => 1, 'delay' => 360, 'name1' => 'Проклятый Рудник', 'name2' => 'Проклятого Рудника'));

-?>
--- a/ch.php
+++ b/ch.php
@ -188,7 +188,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {

        <title><?= $rooms[$user['room']], ' (', mysql_num_rows($data) ?>)</title>
    </head>
-<body style="margin: 0px; padding: 0px; background: #EEEEEE;" onscroll="top.myscroll()"
+<body style="margin: 0; padding: 0; background: #EEEEEE;" onscroll="top.myscroll()"
      onload="document.body.scrollTop=top.OnlineOldPosition">

    <? if ($user['first'] != 99) { ?>
@ -201,7 +201,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
    <center>
        <? if (!$_GET['rms']) { ?>
            <div id="fixednew"
-                 style="position: fixed; margin: 0px; padding: 0px; z-index: 9; width: 100%; text-align: center; overflow: auto;">
+                 style="position: fixed; margin: 0; padding: 0; z-index: 9; width: 100%; text-align: center; overflow: auto;">
                <table border="0" cellpadding="0" cellspacing="0">
                    <tbody>
                    <tr>
@ -219,7 +219,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
            </div><br/><br/><br/>
        <? } ?>
        <div id="mmoves"
-             style="background-color: #FFFFCC; visibility:hidden; overflow: visible; position: absolute; border-color: #666666; border-style: solid; border-width: 0px; padding: 0px; white-space: nowrap; display: block; vertical-align: middle; word-wrap: break-word;"></div>
+             style="background-color: #FFFFCC; visibility:hidden; overflow: visible; position: absolute; border-color: #666666; border-style: solid; border-width: 0; padding: 0; white-space: nowrap; display: block; vertical-align: middle; word-wrap: break-word;"></div>
        <?
        if (!$_GET['room']) {
            if (!isset($_GET['chview']) || $_GET['chview'] == 1) {
--- a/church.php
+++ b/church.php
@ -108,18 +108,19 @@ if(isset($_GET['info'])){
 <script type="text/javascript" src="/js/jquery.min.js"></script>
 <script type="text/javascript" src="/js/tooltip.js"></script>
 <script type="text/javascript">
-var timeStamp = <?php echo $timeStamp; ?>;
-function selecttarget(scrollid){
-		var targertinput = document.getElementById('target');
-		targertinput.value = scrollid;
+    let timeStamp =;

-		var targetform = document.getElementById('formtarget');
-		targetform.submit();
+    function selecttarget(scrollid){
+    const targertinput = document.getElementById('target');
+    targertinput.value = scrollid;
+
+    const targetform = document.getElementById('formtarget');
+    targetform.submit();
 }

 function show_table(title, script){
-	var choicehtml = "<form style='display:none' id='formtarget' action='" + script + "' method=POST><input type='hidden' id='target' name='target'>";
-	choicehtml += "</form><table width='100%' cellspacing='1' cellpadding='0' bgcolor='CCC3AA'>";
+    let choicehtml = "<form style='display:none' id='formtarget' action='" + script + "' method=POST><input type='hidden' id='target' name='target'>";
+    choicehtml += "</form><table width='100%' cellspacing='1' cellpadding='0' bgcolor='CCC3AA'>";
 	choicehtml += "<tr><td align='center'><B>" + title + "</td>";
 	choicehtml += "<td width='20' align='right' valign='top' style='cursor: pointer' onclick='closehint3(true);'>";
 	choicehtml += "<big><b>x</td></tr><tr><td colspan='2' id='tditemcontainer'><div id='itemcontainer' style='width:100%'>";
@ -129,9 +130,9 @@ function show_table(title, script){

 function showitemschoice(title, script,al){
 	$.get('itemschoice.php?get=1&svecha=qq&al='+al+'',function(data) {
-		var choicehtml=show_table(title, script);
-		var el = document.getElementById("hint3");
-		el.innerHTML = choicehtml+data;
+        const choicehtml = show_table(title, script);
+        const el = document.getElementById("hint3");
+        el.innerHTML = choicehtml+data;
 		el.style.width = 400 + 'px';
 		el.style.visibility = "visible";
 		el.style.left = 100 + 'px';
@ -142,8 +143,8 @@ function showitemschoice(title, script,al){

 function closehint3(clearstored){
 	if(clearstored){
-		var targetform = document.getElementById('formtarget');
-		targetform.action += "&clearstored=1";
+        const targetform = document.getElementById('formtarget');
+        targetform.action += "&clearstored=1";
 		targetform.submit();
 	}
 	document.getElementById("hint3").style.visibility="hidden";
--- a/clan_castle.php
+++ b/clan_castle.php
@ -120,7 +120,7 @@ elseif(($ccd+900)<time() && ($ccd+90+900)>=time())
            $own=mysql_fetch_array(mysql_query("SELECT `value` FROM `variables` WHERE `var` = 'castle_owner' LIMIT 1;"));
            shuffle($zays);
            $lucky=$zays[array_rand($zays)];
-            if($lucky>0 && $lucky!=$own['vlaue']);
+//            if($lucky>0 && $lucky!=$own['vlaue']);
            mysql_query("UPDATE `variables` SET `value`='{$lucky}' WHERE `var`='castle_att';");
            $tmp_k=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$lucky}' LIMIT 1;"));
            
--- a/clan_log.php
+++ b/clan_log.php
@ -77,7 +77,7 @@ if($clan_acces[6][0] == 1) {
 $(function() {
  $("#find").on("click", function() {
    var login = $("#logins").val();
-    var hash = '<?=md5($user['id'].'|'.$user['login']);?>';
+    let hash = '<?=md5($user['
    if(!login) {
      alert('Р’РІРµРґРёС‚Рµ Р»РѕРіРёРЅ');
    } else {
@ -101,7 +101,7 @@ $(function() {
 </script>
 <? } ?>
 </head>
-<body style="background-color: #dedede; margin: 0px; padding: 0px;">
+<body style="background-color: #dedede; margin: 0; padding: 0;">
 <style>
 td.dash {
  border-bottom-style: dotted;
--- a/classes/battle_new.class.php
+++ b/classes/battle_new.class.php
@ -38,7 +38,7 @@ class fbattle
 создание класса и сбор основной инфы
 --------------------------------------------------------------------*/

-    function fbattle($battle_id)
+    function __construct($battle_id)
    {
        global $mysql, $user, $_POST, $cavedata, $caverooms, $cavebots, $party;
        // соединяем мускуль и юзера
@ -1147,12 +1147,13 @@ class fbattle
                        unset($this->battle[$kak][$k]);
                    }
                }
-                if ($us['battle'] == 0) {
-                    //unset($this->battle[$k]);
-                    foreach ($this->battle as $kak => $vav) {
-                        //unset($this->battle[$kak][$k]);
-                    }
-                }
+
+//                if ($us['battle'] == 0) {
+//                    //unset($this->battle[$k]);
+//                    foreach ($this->battle as $kak => $vav) {
+//                        //unset($this->battle[$kak][$k]);
+//                    }
+//                }
                unset($us);
            }
            // обновить битку
@ -1297,9 +1298,9 @@ class fbattle
        //////////////
        if ($this->battle_data) {
            $ss = @array_keys($this->battle);
-            if ($this->user['id'] == 10022) {
-                //var_dump($ss, $this->t1);
-            }
+//            if ($this->user['id'] == 10022) {
+//                //var_dump($ss, $this->t1);
+//            }
            $t1life = 0;
            $t2life = 0;
            // проверяем живность команд
--- a/classes/cave/cave_bots.php
+++ b/classes/cave/cave_bots.php
@ -2,4 +2,3 @@
 $bots = array(1 => 10025, 2 => 10026, 3 => 10027, 4 => 10028, 5 => 10031, 6 => 10032, 7 => 10033, 8 => 10034);
 $botnames = array(1 => "Паук", 2 => "Тарантул", 3 => "Гигантская крыса", 4 => "Покровитель нечести", 5 => "Нечто", 6 => "Обезумевший крыс", 7 => "Призрак короля крыс ", 8 => "Обезумевший палач");  

-?>
--- a/classes/cave/caveitems.php
+++ b/classes/cave/caveitems.php
@ -9,4 +9,3 @@ if($user['room'] == 621) {
  $caveitems[7] = array(array('id' => 1129, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 10, 'podzem' => 1));
  $caveitems[8] = array(array('id' => 1131, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1));
 }
-?>
--- a/classes/cave/lose.php
+++ b/classes/cave/lose.php
@ -20,4 +20,3 @@ foreach($lomka1 as $k => $v) {
    }
  }
 }
-?>
--- a/classes/cave/win.php
+++ b/classes/cave/win.php
@ -79,4 +79,3 @@ if(in_array($user['room'], $caverooms)) {
  mysql_query("DELETE FROM `cavebots` WHERE `battle` = '".$this->battle_data["id"]."'");
  mysql_query('UNLOCK TABLES');
 }
-?>
--- a/classes/class.upload.php
+++ b/classes/class.upload.php
@ -4995,4 +4995,3 @@ class upload {
    }
 }

-?>
--- a/classes/quests_class.php
+++ b/classes/quests_class.php
@ -282,7 +282,7 @@ TASK;
                }

                $bot2 = mysql_fetch_array(mysql_query('SELECT * FROM `users` WHERE `id` = "' . $ex2[0] . '" LIMIT 1'));
-                $bot2['id'] = $bot2['id'];
+                //$bot2['id'] = $bot2['id']; ?!?!?!?!?!?!?!
                if (isset($bot2['id'])) {
                    $x .= '&nbsp; &nbsp; &bull; <b>' . $bot2['login'] . '</b> [' . $x2 . '/' . $d['all_kill'] . ']<br />';
                } else {
--- a/classturnir.php
+++ b/classturnir.php
@ -520,4 +520,3 @@ class TTournament {
 			echo "</form>";
 	}
 }
-?>
--- a/contacts.php
+++ b/contacts.php
@ -100,7 +100,7 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
 </TABLE>
 <script>
    function editcontact(login, comment) {
-        var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Редактировать контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
+        let s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Редактировать контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
        s += '<table width=100% align=center bgcolor=FFF6DD><form action="contacts.php" method=POST>';
        s += '<tr><td><input type="hidden" name="friendedit" value="' + login + '">';
        s += '<input name="comment" value="' + comment + '" placeholder="Комментарий" style="width: 105px"> ';
@ -115,7 +115,7 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
    }

    function addcontact() {
-        var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><B>Добавить контакт</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
+        let s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><B>Добавить контакт</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
        s += '<table width=100% bgcolor=FFF6DD align=center><form action="contacts.php" method=POST>';
        s += '<tr><td><input name="friendadd" placeholder="Логин" style="width:105px"> ';
        s += '<input name="comment" placeholder="Комментарий" style="width:105px"></td></tr>';
@ -130,7 +130,7 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
    }

    function removecontact() {
-        var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Удалить контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
+        let s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Удалить контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
        s += '<table width=100% align=center bgcolor=FFF6DD><form action="contacts.php" method=POST>';
        s += '<tr><td><input name="friendremove" placeholder="Логин" style="width: 105px"> ';
        s += '<input type="submit" value="Удалить"></td></tr></form></table>';
--- a/cronjobs/cron_bots_battle.php
+++ b/cronjobs/cron_bots_battle.php
@ -55,7 +55,7 @@ class fbattle
    public $max = 70;
    public $err = '';

-    function fbattle($battle_id)
+    function __construct($battle_id)
    {
        global $user, $_POST, $cavedata, $caverooms;
        $this->user = $user;
@ -1692,9 +1692,6 @@ class fbattle
            case "mech":
                $uron_vlad_me += $uid_1['mec'];
                break;
-            default :
-                0;
-                break;
        }
        $mfs['me']['udar'] += $uron_vlad_me;

--- a/css/2/buttons.css
+++ b/css/2/buttons.css
--- a/css/2/chat.css
+++ b/css/2/chat.css
@ -1 +1 @@
-html {	width:100%;	height:100%;	padding:0;	margin:0;}body {	width:100%;	height:100%;	padding:0;	margin:0;	overflow:hidden;	/*background-image: url('../i/buttons/chat_bg.gif');*/}select,textarea,input  {	border: solid 1pt #B0B0B0;	font-family: MS Sans Serif;	font-size: 8px;	color: #191970;	MARGIN-BOTTOM: 2px;	MARGIN-TOP: 1px;}img{	border:0px;}.text_msg {	border: 1px solid #CCCCCC;	font-size: 11px;	color: #000000;	font-family: Verdana, Arial, Helvetica, Tahoma, sans-serif;}.chatBtn1_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn1.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn1_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn1.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn2_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn2.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn2_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn2.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn4_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn4.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn4_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn4.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn5_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn5_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn5_3 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0px -59px repeat-x;;	cursor:pointer;}.chatBtn6_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn6.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn6_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn6.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn7_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0px 0px repeat-x;;	cursor:pointer;}.chatBtn7_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0px -30px repeat-x;;	cursor:pointer;}.chatBtn7_3 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0px -60px repeat-x;;	cursor:pointer;}
+html {	width:100%;	height:100%;	padding:0;	margin:0;}body {	width:100%;	height:100%;	padding:0;	margin:0;	overflow:hidden;	/*background-image: url('../i/buttons/chat_bg.gif');*/}select,textarea,input  {	border: solid 1pt #B0B0B0;	font-family: MS Sans Serif;	font-size: 8px;	color: #191970;	MARGIN-BOTTOM: 2px;	MARGIN-TOP: 1px;}img{	border:0;}  .text_msg {	border: 1px solid #CCCCCC;	font-size: 11px;	color: #000000;	font-family: Verdana, Arial, Helvetica, Tahoma, sans-serif;}  .chatBtn1_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn1.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn1_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn1.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn2_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn2.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn2_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn2.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn4_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn4.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn4_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn4.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn5_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn5_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn5_3 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn5.gif')  0 -59px repeat-x;;	cursor:pointer;}  .chatBtn6_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn6.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn6_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn6.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn7_1 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0 0 repeat-x;;	cursor:pointer;}  .chatBtn7_2 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0 -30px repeat-x;;	cursor:pointer;}  .chatBtn7_3 {	width:30px;	height:30px; 	background: url('../i/buttons/chatBtn7.gif')  0 -60px repeat-x;;	cursor:pointer;}
--- a/css/2/design2.css
+++ b/css/2/design2.css
--- a/css/2/design6.css
+++ b/css/2/design6.css
@ -1,6 +1,6 @@
 body {

-	margin: 0px;
+	margin: 0;

 	height: 100%;

--- a/css/2/dungeon_cs.css
+++ b/css/2/dungeon_cs.css
@ -7,10 +7,10 @@ DIV.Dungeon{
 	background:	black;
 }
 .Dungeon BUTTON {
-	border:		0px solid;
+	border:		0 solid;
 	background:	transparent;
-	padding:	0px;
-	margin:		0px;
+	padding:	0;
+	margin:		0;
 	position:	absolute;
 	filter:		Alpha(opacity=100),Chroma( Color=#c1cacf );
 }
--- a/css/2/dungeon_css.css
+++ b/css/2/dungeon_css.css
@ -7,10 +7,10 @@ DIV.Dungeon{
 	background:	black;
 }
 .Dungeon BUTTON {
-	border:		0px solid;
+	border:		0 solid;
 	background:	transparent;
-	padding:	0px;
-	margin:		0px;
+	padding:	0;
+	margin:		0;
 	position:	absolute;
 	filter:		Alpha(opacity=100),Chroma( Color=#c1cacf );
 }