From 69a356cec12c0e71378b93e2ae19a86e5a4e8528 Mon Sep 17 00:00:00 2001 From: Oleg Kasyanov Date: Sat, 26 Oct 2019 19:20:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D1=8B=20=D0=B2?= =?UTF-8?q?=20/assets/emoticons/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smileys => assets/emoticons}/admin/adm.gif | Bin .../smileys => assets/emoticons}/admin/ban.gif | Bin .../smileys => assets/emoticons}/admin/ban2.gif | Bin .../smileys => assets/emoticons}/admin/ban3.gif | Bin .../smileys => assets/emoticons}/admin/closed.gif | Bin .../smileys => assets/emoticons}/admin/devil.gif | Bin .../smileys => assets/emoticons}/admin/dont.gif | Bin .../smileys => assets/emoticons}/admin/flood.gif | Bin .../emoticons}/admin/huligan.gif | Bin .../smileys => assets/emoticons}/admin/index.php | 0 .../smileys => assets/emoticons}/admin/moder.gif | Bin .../smileys => assets/emoticons}/admin/moder2.gif | Bin .../smileys => assets/emoticons}/admin/offtop.gif | Bin .../emoticons}/admin/pravila.gif | Bin {images/smileys => assets/emoticons}/index.php | 0 {images/smileys => assets/emoticons}/simply/(.gif | Bin {images/smileys => assets/emoticons}/simply/).gif | Bin {images/smileys => assets/emoticons}/simply/D.gif | Bin {images/smileys => assets/emoticons}/simply/P.gif | Bin .../smileys => assets/emoticons}/simply/index.php | 0 .../emoticons}/user/animals/akula.gif | Bin .../emoticons}/user/animals/kisa.gif | Bin .../emoticons}/user/animals/puh.gif | Bin .../emoticons}/user/animals/sobaka.gif | Bin .../emoticons}/user/brawl_weapons/2pistoleta.gif | Bin .../emoticons}/user/brawl_weapons/atata.gif | Bin .../emoticons}/user/brawl_weapons/draka.gif | Bin .../emoticons}/user/brawl_weapons/pirat.gif | Bin .../emoticons}/user/brawl_weapons/punish.gif | Bin .../emoticons}/user/emotions/aaa.gif | Bin .../emoticons}/user/emotions/ah.gif | Bin .../emoticons}/user/emotions/blabla.gif | Bin .../emoticons}/user/emotions/bratok.gif | Bin .../emoticons}/user/emotions/cry.gif | Bin .../emoticons}/user/emotions/dovolen.gif | Bin .../emoticons}/user/emotions/fuu.gif | Bin .../emoticons}/user/emotions/gg.gif | Bin .../emoticons}/user/emotions/gy.gif | Bin .../emoticons}/user/emotions/gyy.gif | Bin .../emoticons}/user/emotions/ha.gif | Bin .../emoticons}/user/emotions/haha.gif | Bin .../emoticons}/user/emotions/helpme.gif | Bin .../emoticons}/user/emotions/hm.gif | Bin .../emoticons}/user/emotions/hrap.gif | Bin .../emoticons}/user/emotions/isterika.gif | Bin .../emoticons}/user/emotions/krasn.gif | Bin .../emoticons}/user/emotions/lol.gif | Bin .../emoticons}/user/emotions/plak.gif | Bin .../emoticons}/user/emotions/preved.gif | Bin .../emoticons}/user/emotions/rofl.gif | Bin .../emoticons}/user/emotions/shok.gif | Bin .../emoticons}/user/emotions/sorry.gif | Bin .../emoticons}/user/emotions/stena.gif | Bin .../emoticons}/user/emotions/vosadok.gif | Bin .../emoticons}/user/emotions/yahoo.gif | Bin .../emoticons}/user/emotions/zloj.gif | Bin .../emoticons}/user/flowers/cvetok.gif | Bin .../emoticons}/user/flowers/romawki.gif | Bin .../emoticons}/user/flowers/roza.gif | Bin .../emoticons}/user/flowers/roza2.gif | Bin .../emoticons}/user/flowers/tjulpan.gif | Bin .../emoticons}/user/food_alcohol/alkawi.gif | Bin .../emoticons}/user/food_alcohol/arbuz.gif | Bin .../emoticons}/user/food_alcohol/drinks.gif | Bin .../emoticons}/user/food_alcohol/jajca.gif | Bin .../emoticons}/user/food_alcohol/obed.gif | Bin .../emoticons}/user/gestures/apl.gif | Bin .../emoticons}/user/gestures/clapping.gif | Bin .../emoticons}/user/gestures/kul2.gif | Bin .../emoticons}/user/gestures/neznayu.gif | Bin .../emoticons}/user/gestures/nono.gif | Bin .../emoticons}/user/holidays/ded_moroz.gif | Bin .../emoticons}/user/holidays/ded_snegur2.gif | Bin .../emoticons}/user/holidays/snegur.gif | Bin .../smileys => assets/emoticons}/user/index.php | 0 .../emoticons}/user/love/chmok.gif | Bin .../emoticons}/user/love/gadaet.gif | Bin .../emoticons}/user/love/kiss.gif | Bin .../emoticons}/user/love/kiss1.gif | Bin .../emoticons}/user/love/loveman.gif | Bin .../emoticons}/user/misc/banan.gif | Bin .../emoticons}/user/misc/kopilka.gif | Bin .../emoticons}/user/misc/mail.gif | Bin .../emoticons}/user/misc/pylesos.gif | Bin .../emoticons}/user/misc/teleskop.gif | Bin .../emoticons}/user/misc/yad.gif | Bin .../emoticons}/user/music/afr.gif | Bin .../emoticons}/user/music/bajan2.gif | Bin .../emoticons}/user/music/disko.gif | Bin .../emoticons}/user/music/music.gif | Bin .../emoticons}/user/music/pank.gif | Bin .../emoticons}/user/music/rus.gif | Bin .../emoticons}/user/sports/best.gif | Bin .../emoticons}/user/sports/boks.gif | Bin .../emoticons}/user/sports/mjach.gif | Bin .../emoticons}/user/technology/samolet.gif | Bin .../emoticons}/user/technology/skuter.gif | Bin .../emoticons}/user/technology/velo.gif | Bin modules/admin/includes/smilies.php | 14 +++++++------- modules/help/includes/admsmilies.php | 6 +++--- modules/help/includes/set_my_sm.php | 6 +++--- modules/help/includes/smilies.php | 6 +++--- modules/help/includes/usersmilies.php | 6 +++--- system/bootstrap.php | 14 ++++++++------ 104 files changed, 27 insertions(+), 25 deletions(-) rename {images/smileys => assets/emoticons}/admin/adm.gif (100%) rename {images/smileys => assets/emoticons}/admin/ban.gif (100%) rename {images/smileys => assets/emoticons}/admin/ban2.gif (100%) rename {images/smileys => assets/emoticons}/admin/ban3.gif (100%) rename {images/smileys => assets/emoticons}/admin/closed.gif (100%) rename {images/smileys => assets/emoticons}/admin/devil.gif (100%) rename {images/smileys => assets/emoticons}/admin/dont.gif (100%) rename {images/smileys => assets/emoticons}/admin/flood.gif (100%) rename {images/smileys => assets/emoticons}/admin/huligan.gif (100%) rename {images/smileys => assets/emoticons}/admin/index.php (100%) rename {images/smileys => assets/emoticons}/admin/moder.gif (100%) rename {images/smileys => assets/emoticons}/admin/moder2.gif (100%) rename {images/smileys => assets/emoticons}/admin/offtop.gif (100%) rename {images/smileys => assets/emoticons}/admin/pravila.gif (100%) rename {images/smileys => assets/emoticons}/index.php (100%) rename {images/smileys => assets/emoticons}/simply/(.gif (100%) rename {images/smileys => assets/emoticons}/simply/).gif (100%) rename {images/smileys => assets/emoticons}/simply/D.gif (100%) rename {images/smileys => assets/emoticons}/simply/P.gif (100%) rename {images/smileys => assets/emoticons}/simply/index.php (100%) rename {images/smileys => assets/emoticons}/user/animals/akula.gif (100%) rename {images/smileys => assets/emoticons}/user/animals/kisa.gif (100%) rename {images/smileys => assets/emoticons}/user/animals/puh.gif (100%) rename {images/smileys => assets/emoticons}/user/animals/sobaka.gif (100%) rename {images/smileys => assets/emoticons}/user/brawl_weapons/2pistoleta.gif (100%) rename {images/smileys => assets/emoticons}/user/brawl_weapons/atata.gif (100%) rename {images/smileys => assets/emoticons}/user/brawl_weapons/draka.gif (100%) rename {images/smileys => assets/emoticons}/user/brawl_weapons/pirat.gif (100%) rename {images/smileys => assets/emoticons}/user/brawl_weapons/punish.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/aaa.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/ah.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/blabla.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/bratok.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/cry.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/dovolen.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/fuu.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/gg.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/gy.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/gyy.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/ha.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/haha.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/helpme.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/hm.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/hrap.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/isterika.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/krasn.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/lol.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/plak.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/preved.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/rofl.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/shok.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/sorry.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/stena.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/vosadok.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/yahoo.gif (100%) rename {images/smileys => assets/emoticons}/user/emotions/zloj.gif (100%) rename {images/smileys => assets/emoticons}/user/flowers/cvetok.gif (100%) rename {images/smileys => assets/emoticons}/user/flowers/romawki.gif (100%) rename {images/smileys => assets/emoticons}/user/flowers/roza.gif (100%) rename {images/smileys => assets/emoticons}/user/flowers/roza2.gif (100%) rename {images/smileys => assets/emoticons}/user/flowers/tjulpan.gif (100%) rename {images/smileys => assets/emoticons}/user/food_alcohol/alkawi.gif (100%) rename {images/smileys => assets/emoticons}/user/food_alcohol/arbuz.gif (100%) rename {images/smileys => assets/emoticons}/user/food_alcohol/drinks.gif (100%) rename {images/smileys => assets/emoticons}/user/food_alcohol/jajca.gif (100%) rename {images/smileys => assets/emoticons}/user/food_alcohol/obed.gif (100%) rename {images/smileys => assets/emoticons}/user/gestures/apl.gif (100%) rename {images/smileys => assets/emoticons}/user/gestures/clapping.gif (100%) rename {images/smileys => assets/emoticons}/user/gestures/kul2.gif (100%) rename {images/smileys => assets/emoticons}/user/gestures/neznayu.gif (100%) rename {images/smileys => assets/emoticons}/user/gestures/nono.gif (100%) rename {images/smileys => assets/emoticons}/user/holidays/ded_moroz.gif (100%) rename {images/smileys => assets/emoticons}/user/holidays/ded_snegur2.gif (100%) rename {images/smileys => assets/emoticons}/user/holidays/snegur.gif (100%) rename {images/smileys => assets/emoticons}/user/index.php (100%) rename {images/smileys => assets/emoticons}/user/love/chmok.gif (100%) rename {images/smileys => assets/emoticons}/user/love/gadaet.gif (100%) rename {images/smileys => assets/emoticons}/user/love/kiss.gif (100%) rename {images/smileys => assets/emoticons}/user/love/kiss1.gif (100%) rename {images/smileys => assets/emoticons}/user/love/loveman.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/banan.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/kopilka.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/mail.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/pylesos.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/teleskop.gif (100%) rename {images/smileys => assets/emoticons}/user/misc/yad.gif (100%) rename {images/smileys => assets/emoticons}/user/music/afr.gif (100%) rename {images/smileys => assets/emoticons}/user/music/bajan2.gif (100%) rename {images/smileys => assets/emoticons}/user/music/disko.gif (100%) rename {images/smileys => assets/emoticons}/user/music/music.gif (100%) rename {images/smileys => assets/emoticons}/user/music/pank.gif (100%) rename {images/smileys => assets/emoticons}/user/music/rus.gif (100%) rename {images/smileys => assets/emoticons}/user/sports/best.gif (100%) rename {images/smileys => assets/emoticons}/user/sports/boks.gif (100%) rename {images/smileys => assets/emoticons}/user/sports/mjach.gif (100%) rename {images/smileys => assets/emoticons}/user/technology/samolet.gif (100%) rename {images/smileys => assets/emoticons}/user/technology/skuter.gif (100%) rename {images/smileys => assets/emoticons}/user/technology/velo.gif (100%) diff --git a/images/smileys/admin/adm.gif b/assets/emoticons/admin/adm.gif similarity index 100% rename from images/smileys/admin/adm.gif rename to assets/emoticons/admin/adm.gif diff --git a/images/smileys/admin/ban.gif b/assets/emoticons/admin/ban.gif similarity index 100% rename from images/smileys/admin/ban.gif rename to assets/emoticons/admin/ban.gif diff --git a/images/smileys/admin/ban2.gif b/assets/emoticons/admin/ban2.gif similarity index 100% rename from images/smileys/admin/ban2.gif rename to assets/emoticons/admin/ban2.gif diff --git a/images/smileys/admin/ban3.gif b/assets/emoticons/admin/ban3.gif similarity index 100% rename from images/smileys/admin/ban3.gif rename to assets/emoticons/admin/ban3.gif diff --git a/images/smileys/admin/closed.gif b/assets/emoticons/admin/closed.gif similarity index 100% rename from images/smileys/admin/closed.gif rename to assets/emoticons/admin/closed.gif diff --git a/images/smileys/admin/devil.gif b/assets/emoticons/admin/devil.gif similarity index 100% rename from images/smileys/admin/devil.gif rename to assets/emoticons/admin/devil.gif diff --git a/images/smileys/admin/dont.gif b/assets/emoticons/admin/dont.gif similarity index 100% rename from images/smileys/admin/dont.gif rename to assets/emoticons/admin/dont.gif diff --git a/images/smileys/admin/flood.gif b/assets/emoticons/admin/flood.gif similarity index 100% rename from images/smileys/admin/flood.gif rename to assets/emoticons/admin/flood.gif diff --git a/images/smileys/admin/huligan.gif b/assets/emoticons/admin/huligan.gif similarity index 100% rename from images/smileys/admin/huligan.gif rename to assets/emoticons/admin/huligan.gif diff --git a/images/smileys/admin/index.php b/assets/emoticons/admin/index.php similarity index 100% rename from images/smileys/admin/index.php rename to assets/emoticons/admin/index.php diff --git a/images/smileys/admin/moder.gif b/assets/emoticons/admin/moder.gif similarity index 100% rename from images/smileys/admin/moder.gif rename to assets/emoticons/admin/moder.gif diff --git a/images/smileys/admin/moder2.gif b/assets/emoticons/admin/moder2.gif similarity index 100% rename from images/smileys/admin/moder2.gif rename to assets/emoticons/admin/moder2.gif diff --git a/images/smileys/admin/offtop.gif b/assets/emoticons/admin/offtop.gif similarity index 100% rename from images/smileys/admin/offtop.gif rename to assets/emoticons/admin/offtop.gif diff --git a/images/smileys/admin/pravila.gif b/assets/emoticons/admin/pravila.gif similarity index 100% rename from images/smileys/admin/pravila.gif rename to assets/emoticons/admin/pravila.gif diff --git a/images/smileys/index.php b/assets/emoticons/index.php similarity index 100% rename from images/smileys/index.php rename to assets/emoticons/index.php diff --git a/images/smileys/simply/(.gif b/assets/emoticons/simply/(.gif similarity index 100% rename from images/smileys/simply/(.gif rename to assets/emoticons/simply/(.gif diff --git a/images/smileys/simply/).gif b/assets/emoticons/simply/).gif similarity index 100% rename from images/smileys/simply/).gif rename to assets/emoticons/simply/).gif diff --git a/images/smileys/simply/D.gif b/assets/emoticons/simply/D.gif similarity index 100% rename from images/smileys/simply/D.gif rename to assets/emoticons/simply/D.gif diff --git a/images/smileys/simply/P.gif b/assets/emoticons/simply/P.gif similarity index 100% rename from images/smileys/simply/P.gif rename to assets/emoticons/simply/P.gif diff --git a/images/smileys/simply/index.php b/assets/emoticons/simply/index.php similarity index 100% rename from images/smileys/simply/index.php rename to assets/emoticons/simply/index.php diff --git a/images/smileys/user/animals/akula.gif b/assets/emoticons/user/animals/akula.gif similarity index 100% rename from images/smileys/user/animals/akula.gif rename to assets/emoticons/user/animals/akula.gif diff --git a/images/smileys/user/animals/kisa.gif b/assets/emoticons/user/animals/kisa.gif similarity index 100% rename from images/smileys/user/animals/kisa.gif rename to assets/emoticons/user/animals/kisa.gif diff --git a/images/smileys/user/animals/puh.gif b/assets/emoticons/user/animals/puh.gif similarity index 100% rename from images/smileys/user/animals/puh.gif rename to assets/emoticons/user/animals/puh.gif diff --git a/images/smileys/user/animals/sobaka.gif b/assets/emoticons/user/animals/sobaka.gif similarity index 100% rename from images/smileys/user/animals/sobaka.gif rename to assets/emoticons/user/animals/sobaka.gif diff --git a/images/smileys/user/brawl_weapons/2pistoleta.gif b/assets/emoticons/user/brawl_weapons/2pistoleta.gif similarity index 100% rename from images/smileys/user/brawl_weapons/2pistoleta.gif rename to assets/emoticons/user/brawl_weapons/2pistoleta.gif diff --git a/images/smileys/user/brawl_weapons/atata.gif b/assets/emoticons/user/brawl_weapons/atata.gif similarity index 100% rename from images/smileys/user/brawl_weapons/atata.gif rename to assets/emoticons/user/brawl_weapons/atata.gif diff --git a/images/smileys/user/brawl_weapons/draka.gif b/assets/emoticons/user/brawl_weapons/draka.gif similarity index 100% rename from images/smileys/user/brawl_weapons/draka.gif rename to assets/emoticons/user/brawl_weapons/draka.gif diff --git a/images/smileys/user/brawl_weapons/pirat.gif b/assets/emoticons/user/brawl_weapons/pirat.gif similarity index 100% rename from images/smileys/user/brawl_weapons/pirat.gif rename to assets/emoticons/user/brawl_weapons/pirat.gif diff --git a/images/smileys/user/brawl_weapons/punish.gif b/assets/emoticons/user/brawl_weapons/punish.gif similarity index 100% rename from images/smileys/user/brawl_weapons/punish.gif rename to assets/emoticons/user/brawl_weapons/punish.gif diff --git a/images/smileys/user/emotions/aaa.gif b/assets/emoticons/user/emotions/aaa.gif similarity index 100% rename from images/smileys/user/emotions/aaa.gif rename to assets/emoticons/user/emotions/aaa.gif diff --git a/images/smileys/user/emotions/ah.gif b/assets/emoticons/user/emotions/ah.gif similarity index 100% rename from images/smileys/user/emotions/ah.gif rename to assets/emoticons/user/emotions/ah.gif diff --git a/images/smileys/user/emotions/blabla.gif b/assets/emoticons/user/emotions/blabla.gif similarity index 100% rename from images/smileys/user/emotions/blabla.gif rename to assets/emoticons/user/emotions/blabla.gif diff --git a/images/smileys/user/emotions/bratok.gif b/assets/emoticons/user/emotions/bratok.gif similarity index 100% rename from images/smileys/user/emotions/bratok.gif rename to assets/emoticons/user/emotions/bratok.gif diff --git a/images/smileys/user/emotions/cry.gif b/assets/emoticons/user/emotions/cry.gif similarity index 100% rename from images/smileys/user/emotions/cry.gif rename to assets/emoticons/user/emotions/cry.gif diff --git a/images/smileys/user/emotions/dovolen.gif b/assets/emoticons/user/emotions/dovolen.gif similarity index 100% rename from images/smileys/user/emotions/dovolen.gif rename to assets/emoticons/user/emotions/dovolen.gif diff --git a/images/smileys/user/emotions/fuu.gif b/assets/emoticons/user/emotions/fuu.gif similarity index 100% rename from images/smileys/user/emotions/fuu.gif rename to assets/emoticons/user/emotions/fuu.gif diff --git a/images/smileys/user/emotions/gg.gif b/assets/emoticons/user/emotions/gg.gif similarity index 100% rename from images/smileys/user/emotions/gg.gif rename to assets/emoticons/user/emotions/gg.gif diff --git a/images/smileys/user/emotions/gy.gif b/assets/emoticons/user/emotions/gy.gif similarity index 100% rename from images/smileys/user/emotions/gy.gif rename to assets/emoticons/user/emotions/gy.gif diff --git a/images/smileys/user/emotions/gyy.gif b/assets/emoticons/user/emotions/gyy.gif similarity index 100% rename from images/smileys/user/emotions/gyy.gif rename to assets/emoticons/user/emotions/gyy.gif diff --git a/images/smileys/user/emotions/ha.gif b/assets/emoticons/user/emotions/ha.gif similarity index 100% rename from images/smileys/user/emotions/ha.gif rename to assets/emoticons/user/emotions/ha.gif diff --git a/images/smileys/user/emotions/haha.gif b/assets/emoticons/user/emotions/haha.gif similarity index 100% rename from images/smileys/user/emotions/haha.gif rename to assets/emoticons/user/emotions/haha.gif diff --git a/images/smileys/user/emotions/helpme.gif b/assets/emoticons/user/emotions/helpme.gif similarity index 100% rename from images/smileys/user/emotions/helpme.gif rename to assets/emoticons/user/emotions/helpme.gif diff --git a/images/smileys/user/emotions/hm.gif b/assets/emoticons/user/emotions/hm.gif similarity index 100% rename from images/smileys/user/emotions/hm.gif rename to assets/emoticons/user/emotions/hm.gif diff --git a/images/smileys/user/emotions/hrap.gif b/assets/emoticons/user/emotions/hrap.gif similarity index 100% rename from images/smileys/user/emotions/hrap.gif rename to assets/emoticons/user/emotions/hrap.gif diff --git a/images/smileys/user/emotions/isterika.gif b/assets/emoticons/user/emotions/isterika.gif similarity index 100% rename from images/smileys/user/emotions/isterika.gif rename to assets/emoticons/user/emotions/isterika.gif diff --git a/images/smileys/user/emotions/krasn.gif b/assets/emoticons/user/emotions/krasn.gif similarity index 100% rename from images/smileys/user/emotions/krasn.gif rename to assets/emoticons/user/emotions/krasn.gif diff --git a/images/smileys/user/emotions/lol.gif b/assets/emoticons/user/emotions/lol.gif similarity index 100% rename from images/smileys/user/emotions/lol.gif rename to assets/emoticons/user/emotions/lol.gif diff --git a/images/smileys/user/emotions/plak.gif b/assets/emoticons/user/emotions/plak.gif similarity index 100% rename from images/smileys/user/emotions/plak.gif rename to assets/emoticons/user/emotions/plak.gif diff --git a/images/smileys/user/emotions/preved.gif b/assets/emoticons/user/emotions/preved.gif similarity index 100% rename from images/smileys/user/emotions/preved.gif rename to assets/emoticons/user/emotions/preved.gif diff --git a/images/smileys/user/emotions/rofl.gif b/assets/emoticons/user/emotions/rofl.gif similarity index 100% rename from images/smileys/user/emotions/rofl.gif rename to assets/emoticons/user/emotions/rofl.gif diff --git a/images/smileys/user/emotions/shok.gif b/assets/emoticons/user/emotions/shok.gif similarity index 100% rename from images/smileys/user/emotions/shok.gif rename to assets/emoticons/user/emotions/shok.gif diff --git a/images/smileys/user/emotions/sorry.gif b/assets/emoticons/user/emotions/sorry.gif similarity index 100% rename from images/smileys/user/emotions/sorry.gif rename to assets/emoticons/user/emotions/sorry.gif diff --git a/images/smileys/user/emotions/stena.gif b/assets/emoticons/user/emotions/stena.gif similarity index 100% rename from images/smileys/user/emotions/stena.gif rename to assets/emoticons/user/emotions/stena.gif diff --git a/images/smileys/user/emotions/vosadok.gif b/assets/emoticons/user/emotions/vosadok.gif similarity index 100% rename from images/smileys/user/emotions/vosadok.gif rename to assets/emoticons/user/emotions/vosadok.gif diff --git a/images/smileys/user/emotions/yahoo.gif b/assets/emoticons/user/emotions/yahoo.gif similarity index 100% rename from images/smileys/user/emotions/yahoo.gif rename to assets/emoticons/user/emotions/yahoo.gif diff --git a/images/smileys/user/emotions/zloj.gif b/assets/emoticons/user/emotions/zloj.gif similarity index 100% rename from images/smileys/user/emotions/zloj.gif rename to assets/emoticons/user/emotions/zloj.gif diff --git a/images/smileys/user/flowers/cvetok.gif b/assets/emoticons/user/flowers/cvetok.gif similarity index 100% rename from images/smileys/user/flowers/cvetok.gif rename to assets/emoticons/user/flowers/cvetok.gif diff --git a/images/smileys/user/flowers/romawki.gif b/assets/emoticons/user/flowers/romawki.gif similarity index 100% rename from images/smileys/user/flowers/romawki.gif rename to assets/emoticons/user/flowers/romawki.gif diff --git a/images/smileys/user/flowers/roza.gif b/assets/emoticons/user/flowers/roza.gif similarity index 100% rename from images/smileys/user/flowers/roza.gif rename to assets/emoticons/user/flowers/roza.gif diff --git a/images/smileys/user/flowers/roza2.gif b/assets/emoticons/user/flowers/roza2.gif similarity index 100% rename from images/smileys/user/flowers/roza2.gif rename to assets/emoticons/user/flowers/roza2.gif diff --git a/images/smileys/user/flowers/tjulpan.gif b/assets/emoticons/user/flowers/tjulpan.gif similarity index 100% rename from images/smileys/user/flowers/tjulpan.gif rename to assets/emoticons/user/flowers/tjulpan.gif diff --git a/images/smileys/user/food_alcohol/alkawi.gif b/assets/emoticons/user/food_alcohol/alkawi.gif similarity index 100% rename from images/smileys/user/food_alcohol/alkawi.gif rename to assets/emoticons/user/food_alcohol/alkawi.gif diff --git a/images/smileys/user/food_alcohol/arbuz.gif b/assets/emoticons/user/food_alcohol/arbuz.gif similarity index 100% rename from images/smileys/user/food_alcohol/arbuz.gif rename to assets/emoticons/user/food_alcohol/arbuz.gif diff --git a/images/smileys/user/food_alcohol/drinks.gif b/assets/emoticons/user/food_alcohol/drinks.gif similarity index 100% rename from images/smileys/user/food_alcohol/drinks.gif rename to assets/emoticons/user/food_alcohol/drinks.gif diff --git a/images/smileys/user/food_alcohol/jajca.gif b/assets/emoticons/user/food_alcohol/jajca.gif similarity index 100% rename from images/smileys/user/food_alcohol/jajca.gif rename to assets/emoticons/user/food_alcohol/jajca.gif diff --git a/images/smileys/user/food_alcohol/obed.gif b/assets/emoticons/user/food_alcohol/obed.gif similarity index 100% rename from images/smileys/user/food_alcohol/obed.gif rename to assets/emoticons/user/food_alcohol/obed.gif diff --git a/images/smileys/user/gestures/apl.gif b/assets/emoticons/user/gestures/apl.gif similarity index 100% rename from images/smileys/user/gestures/apl.gif rename to assets/emoticons/user/gestures/apl.gif diff --git a/images/smileys/user/gestures/clapping.gif b/assets/emoticons/user/gestures/clapping.gif similarity index 100% rename from images/smileys/user/gestures/clapping.gif rename to assets/emoticons/user/gestures/clapping.gif diff --git a/images/smileys/user/gestures/kul2.gif b/assets/emoticons/user/gestures/kul2.gif similarity index 100% rename from images/smileys/user/gestures/kul2.gif rename to assets/emoticons/user/gestures/kul2.gif diff --git a/images/smileys/user/gestures/neznayu.gif b/assets/emoticons/user/gestures/neznayu.gif similarity index 100% rename from images/smileys/user/gestures/neznayu.gif rename to assets/emoticons/user/gestures/neznayu.gif diff --git a/images/smileys/user/gestures/nono.gif b/assets/emoticons/user/gestures/nono.gif similarity index 100% rename from images/smileys/user/gestures/nono.gif rename to assets/emoticons/user/gestures/nono.gif diff --git a/images/smileys/user/holidays/ded_moroz.gif b/assets/emoticons/user/holidays/ded_moroz.gif similarity index 100% rename from images/smileys/user/holidays/ded_moroz.gif rename to assets/emoticons/user/holidays/ded_moroz.gif diff --git a/images/smileys/user/holidays/ded_snegur2.gif b/assets/emoticons/user/holidays/ded_snegur2.gif similarity index 100% rename from images/smileys/user/holidays/ded_snegur2.gif rename to assets/emoticons/user/holidays/ded_snegur2.gif diff --git a/images/smileys/user/holidays/snegur.gif b/assets/emoticons/user/holidays/snegur.gif similarity index 100% rename from images/smileys/user/holidays/snegur.gif rename to assets/emoticons/user/holidays/snegur.gif diff --git a/images/smileys/user/index.php b/assets/emoticons/user/index.php similarity index 100% rename from images/smileys/user/index.php rename to assets/emoticons/user/index.php diff --git a/images/smileys/user/love/chmok.gif b/assets/emoticons/user/love/chmok.gif similarity index 100% rename from images/smileys/user/love/chmok.gif rename to assets/emoticons/user/love/chmok.gif diff --git a/images/smileys/user/love/gadaet.gif b/assets/emoticons/user/love/gadaet.gif similarity index 100% rename from images/smileys/user/love/gadaet.gif rename to assets/emoticons/user/love/gadaet.gif diff --git a/images/smileys/user/love/kiss.gif b/assets/emoticons/user/love/kiss.gif similarity index 100% rename from images/smileys/user/love/kiss.gif rename to assets/emoticons/user/love/kiss.gif diff --git a/images/smileys/user/love/kiss1.gif b/assets/emoticons/user/love/kiss1.gif similarity index 100% rename from images/smileys/user/love/kiss1.gif rename to assets/emoticons/user/love/kiss1.gif diff --git a/images/smileys/user/love/loveman.gif b/assets/emoticons/user/love/loveman.gif similarity index 100% rename from images/smileys/user/love/loveman.gif rename to assets/emoticons/user/love/loveman.gif diff --git a/images/smileys/user/misc/banan.gif b/assets/emoticons/user/misc/banan.gif similarity index 100% rename from images/smileys/user/misc/banan.gif rename to assets/emoticons/user/misc/banan.gif diff --git a/images/smileys/user/misc/kopilka.gif b/assets/emoticons/user/misc/kopilka.gif similarity index 100% rename from images/smileys/user/misc/kopilka.gif rename to assets/emoticons/user/misc/kopilka.gif diff --git a/images/smileys/user/misc/mail.gif b/assets/emoticons/user/misc/mail.gif similarity index 100% rename from images/smileys/user/misc/mail.gif rename to assets/emoticons/user/misc/mail.gif diff --git a/images/smileys/user/misc/pylesos.gif b/assets/emoticons/user/misc/pylesos.gif similarity index 100% rename from images/smileys/user/misc/pylesos.gif rename to assets/emoticons/user/misc/pylesos.gif diff --git a/images/smileys/user/misc/teleskop.gif b/assets/emoticons/user/misc/teleskop.gif similarity index 100% rename from images/smileys/user/misc/teleskop.gif rename to assets/emoticons/user/misc/teleskop.gif diff --git a/images/smileys/user/misc/yad.gif b/assets/emoticons/user/misc/yad.gif similarity index 100% rename from images/smileys/user/misc/yad.gif rename to assets/emoticons/user/misc/yad.gif diff --git a/images/smileys/user/music/afr.gif b/assets/emoticons/user/music/afr.gif similarity index 100% rename from images/smileys/user/music/afr.gif rename to assets/emoticons/user/music/afr.gif diff --git a/images/smileys/user/music/bajan2.gif b/assets/emoticons/user/music/bajan2.gif similarity index 100% rename from images/smileys/user/music/bajan2.gif rename to assets/emoticons/user/music/bajan2.gif diff --git a/images/smileys/user/music/disko.gif b/assets/emoticons/user/music/disko.gif similarity index 100% rename from images/smileys/user/music/disko.gif rename to assets/emoticons/user/music/disko.gif diff --git a/images/smileys/user/music/music.gif b/assets/emoticons/user/music/music.gif similarity index 100% rename from images/smileys/user/music/music.gif rename to assets/emoticons/user/music/music.gif diff --git a/images/smileys/user/music/pank.gif b/assets/emoticons/user/music/pank.gif similarity index 100% rename from images/smileys/user/music/pank.gif rename to assets/emoticons/user/music/pank.gif diff --git a/images/smileys/user/music/rus.gif b/assets/emoticons/user/music/rus.gif similarity index 100% rename from images/smileys/user/music/rus.gif rename to assets/emoticons/user/music/rus.gif diff --git a/images/smileys/user/sports/best.gif b/assets/emoticons/user/sports/best.gif similarity index 100% rename from images/smileys/user/sports/best.gif rename to assets/emoticons/user/sports/best.gif diff --git a/images/smileys/user/sports/boks.gif b/assets/emoticons/user/sports/boks.gif similarity index 100% rename from images/smileys/user/sports/boks.gif rename to assets/emoticons/user/sports/boks.gif diff --git a/images/smileys/user/sports/mjach.gif b/assets/emoticons/user/sports/mjach.gif similarity index 100% rename from images/smileys/user/sports/mjach.gif rename to assets/emoticons/user/sports/mjach.gif diff --git a/images/smileys/user/technology/samolet.gif b/assets/emoticons/user/technology/samolet.gif similarity index 100% rename from images/smileys/user/technology/samolet.gif rename to assets/emoticons/user/technology/samolet.gif diff --git a/images/smileys/user/technology/skuter.gif b/assets/emoticons/user/technology/skuter.gif similarity index 100% rename from images/smileys/user/technology/skuter.gif rename to assets/emoticons/user/technology/skuter.gif diff --git a/images/smileys/user/technology/velo.gif b/assets/emoticons/user/technology/velo.gif similarity index 100% rename from images/smileys/user/technology/velo.gif rename to assets/emoticons/user/technology/velo.gif diff --git a/modules/admin/includes/smilies.php b/modules/admin/includes/smilies.php index 3802c35f7..a92c309f7 100644 --- a/modules/admin/includes/smilies.php +++ b/modules/admin/includes/smilies.php @@ -27,30 +27,30 @@ $smileys = []; // Обрабатываем простые смайлы -foreach (glob(ROOT_PATH . 'images' . DIRECTORY_SEPARATOR . 'smileys' . DIRECTORY_SEPARATOR . 'simply' . DIRECTORY_SEPARATOR . '*') as $var) { +foreach (glob(ASSETS_PATH . 'emoticons' . DS . 'simply' . DS . '*') as $var) { $file = basename($var); $name = explode('.', $file); if (in_array($name[1], $ext)) { - $smileys['usr'][':' . $name[0]] = ''; + $smileys['usr'][':' . $name[0]] = ''; } } // Обрабатываем Админские смайлы -foreach (glob(ROOT_PATH . 'images' . DIRECTORY_SEPARATOR . 'smileys' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . '*') as $var) { +foreach (glob(ASSETS_PATH . 'emoticons' . DS . 'admin' . DS . '*') as $var) { $file = basename($var); $name = explode('.', $file); if (in_array($name[1], $ext)) { - $smileys['adm'][':' . $tools->trans($name[0]) . ':'] = ''; - $smileys['adm'][':' . $name[0] . ':'] = ''; + $smileys['adm'][':' . $tools->trans($name[0]) . ':'] = ''; + $smileys['adm'][':' . $name[0] . ':'] = ''; } } // Обрабатываем смайлы каталога -foreach (glob(ROOT_PATH . 'images' . DIRECTORY_SEPARATOR . 'smileys' . DIRECTORY_SEPARATOR . 'user' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . '*') as $var) { +foreach (glob(ASSETS_PATH . 'emoticons' . DS . 'user' . DS . '*' . DS . '*') as $var) { $file = basename($var); $name = explode('.', $file); if (in_array($name[1], $ext)) { - $path = $config['homeurl'] . '/images/smileys/user/' . basename(dirname($var)); + $path = $config['homeurl'] . '/assets/emoticons/user/' . basename(dirname($var)); $smileys['usr'][':' . $tools->trans($name[0]) . ':'] = ''; $smileys['usr'][':' . $name[0] . ':'] = ''; } diff --git a/modules/help/includes/admsmilies.php b/modules/help/includes/admsmilies.php index 486d02396..4b02066f4 100644 --- a/modules/help/includes/admsmilies.php +++ b/modules/help/includes/admsmilies.php @@ -38,7 +38,7 @@ echo '
' . _t('My smilies') . ' (' . count($user_sm) . ' / ' . $user_smileys . ')
' . '
'; $array = []; -$dir = opendir('../images/smileys/admin'); +$dir = opendir(ASSETS_PATH . 'emoticons/admin'); while (($file = readdir($dir)) !== false) { if (($file != '.') && ($file != '..') && ($file != 'name.dat') && ($file != '.svn') && ($file != 'index.php')) { @@ -58,10 +58,10 @@ for ($i = $start; $i < $end; $i++) { $smile = preg_replace('#^(.*?).(gif|jpg|png)$#isU', '$1', $array[$i], 1); - echo $i % 2 ? '
' : '
'; + echo ($i % 2) ? '
' : '
'; $smileys = (in_array($smile, $user_sm) ? '' : ' '); - echo $smileys . ' - :' . $smile . ': ' . _t('or') . ' :' . $tools->trans($smile) . ':
'; + echo $smileys . ' - :' . $smile . ': ' . _t('or') . ' :' . $tools->trans($smile) . ':
'; } } else { echo '

' . _t('The list is empty') . '

'; diff --git a/modules/help/includes/set_my_sm.php b/modules/help/includes/set_my_sm.php index 7ad213059..b5b96a262 100644 --- a/modules/help/includes/set_my_sm.php +++ b/modules/help/includes/set_my_sm.php @@ -28,7 +28,7 @@ $tools = $container->get(Johncms\Api\ToolsInterface::class); if (($adm && ! $systemUser->rights) || ($add && ! $adm && ! $cat) || ($delete && ! $_POST['delete_sm']) || ($add && ! $_POST['add_sm'])) { - echo $tools->displayError(_t('Wrong data'), '' . _t('Smilies') . ''); + echo $tools->displayError(_t('Wrong data'), '' . _t('Smilies') . ''); require 'system/end.php'; exit; } @@ -56,7 +56,7 @@ $db->query('UPDATE `users` SET `smileys` = ' . $db->quote(serialize($smileys)) . ' WHERE `id` = ' . $systemUser->id); if ($delete || isset($_GET['clean'])) { - header('location: index.php?act=my_smilies&start=' . $start . ''); + header('location: ?act=my_smilies&start=' . $start . ''); } else { - header('location: index.php?act=' . ($adm ? 'admsmilies' : 'usersmilies&cat=' . urlencode($cat) . '') . '&start=' . $start . ''); + header('location: ?act=' . ($adm ? 'admsmilies' : 'usersmilies&cat=' . urlencode($cat) . '') . '&start=' . $start . ''); } diff --git a/modules/help/includes/smilies.php b/modules/help/includes/smilies.php index 99be71618..2a92469e5 100644 --- a/modules/help/includes/smilies.php +++ b/modules/help/includes/smilies.php @@ -24,10 +24,10 @@ } if ($systemUser->rights >= 1) { - echo '
' . _t('For administration') . ' (' . (int)count(glob(ROOT_PATH . 'images/smileys/admin/*.gif')) . ')
'; + echo '
' . _t('For administration') . ' (' . (int)count(glob(ASSETS_PATH . 'emoticons/admin/*.gif')) . ')
'; } -$dir = glob(ROOT_PATH . 'images/smileys/user/*', GLOB_ONLYDIR); +$dir = glob(ASSETS_PATH . 'emoticons/user/*', GLOB_ONLYDIR); foreach ($dir as $val) { $cat = strtolower(basename($val)); @@ -45,7 +45,7 @@ foreach ($smileys_cat as $key => $val) { echo $i % 2 ? '
' : '
'; echo '' . htmlspecialchars($val) . '' . - ' (' . count(glob(ROOT_PATH . 'images/smileys/user/' . $key . '/*.{gif,jpg,png}', GLOB_BRACE)) . ')'; + ' (' . count(glob(ASSETS_PATH . 'emoticons/user/' . $key . '/*.{gif,jpg,png}', GLOB_BRACE)) . ')'; echo '
'; ++$i; } diff --git a/modules/help/includes/usersmilies.php b/modules/help/includes/usersmilies.php index f1b77c3e4..a7a173fd3 100644 --- a/modules/help/includes/usersmilies.php +++ b/modules/help/includes/usersmilies.php @@ -22,7 +22,7 @@ $tools = $container->get(Johncms\Api\ToolsInterface::class); // Каталог пользовательских Смайлов -$dir = glob(ROOT_PATH . 'images/smileys/user/*', GLOB_ONLYDIR); +$dir = glob(ASSETS_PATH . 'emoticons/user/*', GLOB_ONLYDIR); foreach ($dir as $val) { $val = explode('/', $val); @@ -30,7 +30,7 @@ } $cat = isset($_GET['cat']) && in_array(trim($_GET['cat']), $cat_list) ? trim($_GET['cat']) : $cat_list[0]; -$smileys = glob(ROOT_PATH . 'images/smileys/user/' . $cat . '/*.{gif,jpg,png}', GLOB_BRACE); +$smileys = glob(ASSETS_PATH . 'emoticons/user/' . $cat . '/*.{gif,jpg,png}', GLOB_BRACE); $total = count($smileys); $end = $start + $kmess; @@ -67,7 +67,7 @@ echo in_array($smile, $user_sm) ? '' : ' '; } - echo ' :' . $smile . ': ' . _t('or') . ' :' . $tools->trans($smile) . ':'; + echo ' :' . $smile . ': ' . _t('or') . ' :' . $tools->trans($smile) . ':'; echo '
'; } diff --git a/system/bootstrap.php b/system/bootstrap.php index 00f28d544..aed606edc 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -33,12 +33,14 @@ define('START_MEMORY', memory_get_usage()); define('START_TIME', microtime(true)); - -define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR); -const CONFIG_PATH = ROOT_PATH . 'config' . DIRECTORY_SEPARATOR; -const DATA_PATH = ROOT_PATH . 'data' . DIRECTORY_SEPARATOR; -const UPLOAD_PATH = ROOT_PATH . 'upload' . DIRECTORY_SEPARATOR; -const CACHE_PATH = DATA_PATH. 'cache' . DIRECTORY_SEPARATOR; +const DS = DIRECTORY_SEPARATOR; + +define('ROOT_PATH', dirname(__DIR__) . DS); +const ASSETS_PATH = ROOT_PATH . 'assets' . DS; +const CONFIG_PATH = ROOT_PATH . 'config' . DS; +const DATA_PATH = ROOT_PATH . 'data' . DS; +const UPLOAD_PATH = ROOT_PATH . 'upload' . DS; +const CACHE_PATH = DATA_PATH. 'cache' . DS; require __DIR__ . '/vendor/autoload.php';