From 094b8a60271ef8bc43b9b7912d180f87e75ebb57 Mon Sep 17 00:00:00 2001 From: "Igor Barkov [iwork]" Date: Wed, 16 Jan 2019 19:45:30 +0200 Subject: [PATCH] Autofix small errors --- _unused-files/h.js | 72 +- admin/admin.php | 32 +- admin/reset_clan_rates.php | 1 - admin/test_stats.php | 2 +- ahero_shop.php | 4 +- buttons.php | 66 +- c_forest.php | 8 +- c_haos.php | 2 +- c_haos_in.php | 9 +- canalizaciya.php | 65 +- canalization_mod.php | 1 - cave.php | 73 +- cave/cave_bots.php | 1 - cave/caveitems.php | 1 - cave/lose.php | 1 - cave/win.php | 1 - cavedata.php | 1 - ch.php | 6 +- church.php | 27 +- clan_castle.php | 2 +- clan_log.php | 4 +- classes/battle_new.class.php | 21 +- classes/cave/cave_bots.php | 1 - classes/cave/caveitems.php | 1 - classes/cave/lose.php | 1 - classes/cave/win.php | 1 - classes/class.upload.php | 1 - classes/quests_class.php | 2 +- classturnir.php | 1 - contacts.php | 6 +- cronjobs/cron_bots_battle.php | 5 +- css/2/buttons.css | 2 +- css/2/chat.css | 2 +- css/2/design2.css | 8 +- css/2/design6.css | 2 +- css/2/dungeon_cs.css | 6 +- css/2/dungeon_css.css | 6 +- css/2/dungeon_gy0.css | 6 +- css/2/dungeon_kn4.css | 6 +- css/2/dungeon_sn.css | 6 +- css/2/dungeon_sun.css | 6 +- css/2/dungeon_uq.css | 6 +- css/2/main.css | 4 +- css/2/reg.css | 7 +- css/design4.css | 4 +- css/style.css | 12 +- css/wysibb/theme/default/wbbtheme.css | 20 +- design/css/css/fight.css | 26 +- design/css/fight.css | 24 +- edit_koefs.php | 1 - fbattle.php | 22 +- forum.php | 4 +- group_arena.php | 20 +- help.php | 90 +- hostel.php | 2 +- hostel_room.php | 4 +- i/boloto/backgrounds/index.php | 1 - i/boloto/bone/index.php | 1 - i/boloto/chat/index.php | 1 - i/boloto/forum/avatar/index.php | 1 - i/boloto/forum/index.php | 1 - i/boloto/ico/index.php | 1 - i/boloto/navigate/index.php | 1 - i/boloto/vault/index.php | 1 - i/boloto/vault/navigation/index.php | 1 - i/magic/sleep1.php | 1 - js/ZeroClipboard.js | 232 ++--- js/ajaxLoad.js | 4 +- js/ch.js | 3 + js/chat.js | 17 +- js/core.js | 12 +- js/forum.js | 20 +- js/jquery.cookie.js | 18 +- js/jquery.js | 2 +- js/jquery.plugins.js | 2 +- js/tooltip.js | 98 +- lab_enter.php | 2 +- labirint.php | 46 +- library.php | 16 +- locations/style.css | 2 +- lotery.php | 91 +- luka_shop.php | 4 +- magic/8cure30.php | 5 +- magic/al_neut_power.php | 2 +- magic/attack.php | 1 - magic/attack_t.php | 1 - magic/attackbot.php | 1 - magic/attackk.php | 1 - magic/attackk_close.php | 1 - magic/attackk_open.php | 1 - magic/battack.php | 1 - magic/bexit.php | 1 - magic/brat.php | 1 - magic/c30_100.php | 1 - magic/check.php | 1 - magic/cityattack.php | 1 - magic/clone.php | 1 - magic/clones.php | 1 - magic/cpattack.php | 1 - magic/ct1.php | 1 - magic/ct2.php | 1 - magic/ct3.php | 1 - magic/ct3_100.php | 1 - magic/ct_all.php | 1 - magic/ct_nele4.php | 1 - magic/cure120.php | 1 - magic/cure15.php | 1 - magic/cure150.php | 1 - magic/cure30.php | 1 - magic/cure300.php | 1 - magic/cure30_100.php | 1 - magic/cure30_8.php | 1 - magic/cure45.php | 1 - magic/cure60.php | 1 - magic/ddark.php | 1 - magic/death.php | 1 - magic/death_off.php | 1 - magic/defence.php | 2 +- magic/devastate.php | 2 +- magic/dlight.php | 1 - magic/dneit.php | 1 - magic/dob10.php | 2 +- magic/dob100.php | 2 +- magic/dob20.php | 2 +- magic/dob450.php | 2 +- magic/dob5.php | 2 +- magic/dob50.php | 2 +- magic/down.php | 1 - magic/dpal.php | 1 - magic/eattack.php | 1 - magic/ebattack.php | 1 - magic/elem_ally_air.php | 1 - magic/elem_ally_earth.php | 1 - magic/elem_ally_fire.php | 1 - magic/elem_ally_water.php | 1 - magic/elem_foe_air.php | 1 - magic/elem_foe_earth.php | 1 - magic/elem_foe_fire.php | 1 - magic/elem_foe_water.php | 1 - magic/elikbroni.php | 2 +- magic/elikurona.php | 1 - magic/fist_def.php | 2 +- magic/haos.php | 1 - magic/haos_off.php | 1 - magic/hidden.php | 1 - magic/hiden.php | 1 - magic/ident.php | 1 - magic/larec1.php | 1 - magic/larec2.php | 1 - magic/larec3.php | 1 - magic/larec4.php | 1 - magic/ldadd.php | 2 +- magic/luck.php | 1 - magic/mfunctions.php | 1 - magic/note.php | 1 - magic/nybut.php | 1 - magic/obezl.php | 1 - magic/obezl_off.php | 1 - magic/rom.php | 1 - magic/scaner.php | 1 - magic/sharp_d1.php | 1 - magic/sharp_d11.php | 1 - magic/sharp_d2.php | 1 - magic/sharp_d3.php | 1 - magic/sharp_d4.php | 1 - magic/sharp_d5.php | 1 - magic/sharp_m1.php | 1 - magic/sharp_m11.php | 1 - magic/sharp_m2.php | 1 - magic/sharp_m3.php | 1 - magic/sharp_m4.php | 1 - magic/sharp_m5.php | 1 - magic/sharp_n1.php | 1 - magic/sharp_n11.php | 1 - magic/sharp_n2.php | 1 - magic/sharp_n3.php | 1 - magic/sharp_n4.php | 1 - magic/sharp_n5.php | 1 - magic/sharp_t1.php | 1 - magic/sharp_t11.php | 1 - magic/sharp_t2.php | 1 - magic/sharp_t3.php | 1 - magic/sharp_t4.php | 1 - magic/sharp_t5.php | 1 - magic/sleep.php | 1 - magic/sleep15.php | 1 - magic/sleep30.php | 1 - magic/sleep_off.php | 1 - magic/sleepf.php | 1 - magic/sleepf_off.php | 1 - magic/stop.php | 2 +- magic/stop_200.php | 2 +- magic/sunduk.php | 1 - magic/sunduk1.php | 1 - magic/sunduk2.php | 1 - magic/sunduk3.php | 1 - magic/sunduk4.php | 1 - magic/sunduk5.php | 1 - magic/sunduk6.php | 1 - magic/sunduk7.php | 1 - magic/sunduk8.php | 1 - magic/sunduk9.php | 1 - magic/unclone.php | 1 - magic/usability_klan/attack.php | 1 - magic/usability_klan/attack_blood.php | 1 - magic/usability_klan/clone.php | 1 - magic/usability_klan/note.php | 1 - magic/usability_klan/sleep15.php | 1 - magic/usability_klan/sleep30.php | 1 - magic/usability_klan/travmoff.php | 1 - magic/usability_klan/unclone.php | 1 - magic/usability_user/attack.php | 1 - magic/usability_user/attack_blood.php | 1 - magic/usability_user/clone.php | 1 - magic/usability_user/note.php | 1 - magic/usability_user/sleep15.php | 1 - magic/usability_user/sleep30.php | 1 - magic/usability_user/travmoff.php | 1 - magic/usability_user/unclone.php | 1 - magic/usability_vip/attack.php | 1 - magic/usability_vip/attack_blood.php | 1 - magic/usability_vip/defence.php | 2 +- magic/usability_vip/devastate.php | 2 +- magic/usability_vip/invisible.php | 1 - magic/usability_vip/no_attack.php | 1 - magic/usability_vip/pers_blood.php | 1 - magic/usability_vip/sleep.php | 1 - magic/usability_vip/travmoff.php | 1 - magic/usability_vip/un_sleep.php | 2 +- magic/vampir.php | 1 - magic/wis_air_def1.php | 1 - magic/wis_air_def2.php | 1 - magic/wis_air_def3.php | 1 - magic/wis_air_h1.php | 1 - magic/wis_air_h2.php | 1 - magic/wis_air_h3.php | 1 - magic/wis_air_m1.php | 1 - magic/wis_air_m2.php | 1 - magic/wis_air_m3.php | 1 - magic/wis_air_o1.php | 1 - magic/wis_air_o2.php | 1 - magic/wis_air_o3.php | 1 - magic/wis_air_t1.php | 1 - magic/wis_air_t2.php | 1 - magic/wis_air_t3.php | 1 - magic/wis_earth_d1.php | 1 - magic/wis_earth_d2.php | 1 - magic/wis_earth_d3.php | 1 - magic/wis_earth_def1.php | 1 - magic/wis_earth_def2.php | 1 - magic/wis_earth_def3.php | 1 - magic/wis_earth_g1.php | 1 - magic/wis_earth_g2.php | 1 - magic/wis_earth_g3.php | 1 - magic/wis_earth_k1.php | 1 - magic/wis_earth_k2.php | 1 - magic/wis_earth_k3.php | 1 - magic/wis_earth_m1.php | 1 - magic/wis_earth_m2.php | 1 - magic/wis_earth_m3.php | 1 - magic/wis_fire_def1.php | 1 - magic/wis_fire_def2.php | 1 - magic/wis_fire_def3.php | 1 - magic/wis_fire_i1.php | 1 - magic/wis_fire_i2.php | 1 - magic/wis_fire_i3.php | 1 - magic/wis_fire_p1.php | 1 - magic/wis_fire_p2.php | 1 - magic/wis_fire_p3.php | 1 - magic/wis_fire_t1.php | 1 - magic/wis_fire_t2.php | 1 - magic/wis_fire_t3.php | 1 - magic/wis_fire_v1.php | 1 - magic/wis_fire_v2.php | 1 - magic/wis_fire_v3.php | 1 - magic/wis_water_ch1.php | 1 - magic/wis_water_ch2.php | 1 - magic/wis_water_ch3.php | 1 - magic/wis_water_def1.php | 1 - magic/wis_water_def2.php | 1 - magic/wis_water_def3.php | 1 - magic/wis_water_o1.php | 1 - magic/wis_water_o2.php | 1 - magic/wis_water_o3.php | 1 - magic/wis_water_r1.php | 1 - magic/wis_water_r2.php | 1 - magic/wis_water_r3.php | 1 - magic/wis_water_tr1.php | 1 - magic/wis_water_tr2.php | 1 - magic/wis_water_tr3.php | 1 - magic/zz.php | 2 +- map/includes/mapmove_class.php | 1 - map/index.php | 1 - module_quest.php | 4 +- perenoskomplekta.php | 1 - podzem/atk.php | 1 - podzem/connect.php | 1 - podzem/raschet_bot.php | 2 +- podzem_brat.php | 1 - podzem_dialog.php | 8 +- podzem_mod.php | 2 +- podzem_res.php | 2 +- rep_shop.php | 52 +- startpodzemel.php | 1 - tmp/pma.php | 1254 ------------------------- tower.php | 2 +- towerin.php | 67 +- towerstamp.php | 12 +- underground/objects/621.php | 2 +- user_abilities.php | 8 +- vxod.php | 2 +- wall_build.php | 5 +- zamok.php | 62 +- 313 files changed, 736 insertions(+), 2280 deletions(-) delete mode 100644 tmp/pma.php diff --git a/_unused-files/h.js b/_unused-files/h.js index 46bf1f3..8030e01 100644 --- 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 = $('
').css('width',options.width); - var t = $('
').text(options.title); - var c = $('X') - .click(function(){return options.onClose.call($(this).closest('div.sd-container'))}); - var f = $('
') - .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 = $('
').css('width', options.width); + const t = $('
').text(options.title); + const c = $('X') + .click(function () { + return options.onClose.call($(this).closest('div.sd-container')) + }); + const f = $('
') + .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){ $('').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 = $('') - .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 = $('') + .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('')); 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: '<> ' + 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) diff --git a/admin/admin.php b/admin/admin.php index 96bfd5a..6eff026 100644 --- a/admin/admin.php +++ b/admin/admin.php @@ -1043,17 +1043,17 @@ if ($_POST['login'] && $_POST['krest']) { ?> "; exit(); - + - +
@@ -557,28 +558,28 @@ hr { height: 1px; }
  @@ -267,22 +269,22 @@ if(isset($_POST['leaveZv'])) {
@@ -705,7 +705,7 @@ if(in_array($me_room, $ar_150)){ $me_150 = 1; } - if(!in_array($serch_room, $ar_all)){ } +// if(!in_array($serch_room, $ar_all)){ } echo '
  • "'.$locations_normal[$serch_room].'"
    • '; @@ -732,20 +732,20 @@ if(in_array($me_room, $ar_150)){ $me_150 = 1; } ?>