Skip to content

Commit de4406c

Browse files
pafnutypafnuty
authored
Merge pull request #136 from dle-modules/6.0
5.1.1
2 parents 2c68c83 + e7191c4 commit de4406c

8 files changed

Lines changed: 4253 additions & 121 deletions

File tree

‎.gitignore‎

Lines changed: 238 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,240 @@
1-
# Исключаем всё
2-
/*
3-
# Кроме самого .gitignore (и как следствие всего, что в нём написано)
4-
!.gitignore
5-
# Кроме папок и файлов модуля
1+
# Redactors
2+
/.idea/
3+
4+
5+
# Installed DLE
6+
/engine/cache/*.tmp
7+
/engine/cache/system/*.php
8+
/engine/data/*.txt
9+
/engine/data/*.php
10+
11+
# DLE 11.1 sources
12+
/.htaccess
13+
/admin.php
14+
/backup/.htaccess
15+
/backup/index.html
16+
/cron.php
17+
/engine/ajax/addcomments.php
18+
/engine/ajax/adminfunction.php
19+
/engine/ajax/allvotes.php
20+
/engine/ajax/antivirus.php
21+
/engine/ajax/bbcode.php
22+
/engine/ajax/calendar.php
23+
/engine/ajax/clean.php
24+
/engine/ajax/comments.php
25+
/engine/ajax/complaint.php
26+
/engine/ajax/deletecomments.php
27+
/engine/ajax/editcomments.php
28+
/engine/ajax/editnews.php
29+
/engine/ajax/favorites.php
30+
/engine/ajax/feedback.php
31+
/engine/ajax/find_relates.php
32+
/engine/ajax/find_tags.php
33+
/engine/ajax/keywords.php
34+
/engine/ajax/message.php
35+
/engine/ajax/newsletter.php
36+
/engine/ajax/pm.php
37+
/engine/ajax/poll.php
38+
/engine/ajax/profile.php
39+
/engine/ajax/quote.php
40+
/engine/ajax/rating.php
41+
/engine/ajax/ratingcomments.php
42+
/engine/ajax/rebuild.php
43+
/engine/ajax/registration.php
44+
/engine/ajax/replycomments.php
45+
/engine/ajax/rss.php
46+
/engine/ajax/search.php
47+
/engine/ajax/sitemap.php
48+
/engine/ajax/templates.php
49+
/engine/ajax/typograf.php
50+
/engine/ajax/updates.php
51+
/engine/ajax/upload.php
52+
/engine/ajax/vote.php
53+
/engine/api/
54+
/engine/cache/*
55+
/engine/cache/system/*
56+
/engine/classes/.htaccess
57+
/engine/classes/antivirus.class.php
58+
/engine/classes/calendar/calendar.css
59+
/engine/classes/calendar/calendar.js
60+
/engine/classes/comments.class.php
61+
/engine/classes/download.class.php
62+
/engine/classes/flashplayer/*
63+
/engine/classes/google.class.php
64+
/engine/classes/highlight/
65+
/engine/classes/highslide/
66+
/engine/classes/html5player/*
67+
/engine/classes/js/*
68+
/engine/classes/mail.class.php
69+
/engine/classes/mail/class.phpmailer.php
70+
/engine/classes/masha/*
71+
/engine/classes/min/*
72+
/engine/classes/mobiledetect.class.php
73+
/engine/classes/mysql.php
74+
/engine/classes/parse.class.php
75+
/engine/classes/recaptcha.php
76+
/engine/classes/rss.class.php
77+
/engine/classes/social.class.php
78+
/engine/classes/stopspam.class.php
79+
/engine/classes/templates.class.php
80+
/engine/classes/thumb.class.php
81+
/engine/classes/typograf.class.php
82+
/engine/classes/uploads/*
83+
/engine/data/.htaccess
84+
/engine/data/emoticons/*
85+
/engine/download.php
86+
/engine/editor/*
87+
/engine/engine.php
88+
/engine/go.php
89+
/engine/inc/.htaccess
90+
/engine/inc/addnews.php
91+
/engine/inc/banners.php
92+
/engine/inc/blockip.php
93+
/engine/inc/categories.php
94+
/engine/inc/check.php
95+
/engine/inc/clean.php
96+
/engine/inc/cmoderation.php
97+
/engine/inc/comments.php
98+
/engine/inc/complaint.php
99+
/engine/inc/dboption.php
100+
/engine/inc/dumper.php
101+
/engine/inc/editnews.php
102+
/engine/inc/editusers.php
103+
/engine/inc/editvote.php
104+
/engine/inc/email.php
105+
/engine/inc/files.php
106+
/engine/inc/googlemap.php
107+
/engine/inc/help.php
108+
/engine/inc/include/.htaccess
109+
/engine/inc/include/functions.inc.php
110+
/engine/inc/include/init.php
111+
/engine/inc/include/inserttag.php
112+
/engine/inc/iptools.php
113+
/engine/inc/links.php
114+
/engine/inc/logs.php
115+
/engine/inc/main.php
116+
/engine/inc/mass_static_actions.php
117+
/engine/inc/mass_user_actions.php
118+
/engine/inc/massactions.php
119+
/engine/inc/newsletter.php
120+
/engine/inc/options.php
121+
/engine/inc/preview.php
122+
/engine/inc/question.php
123+
/engine/inc/rebuild.php
124+
/engine/inc/rss.php
125+
/engine/inc/rssinform.php
126+
/engine/inc/search.php
127+
/engine/inc/social.php
128+
/engine/inc/static.php
129+
/engine/inc/tagscloud.php
130+
/engine/inc/templates.php
131+
/engine/inc/userfields.php
132+
/engine/inc/usergroup.php
133+
/engine/inc/videoconfig.php
134+
/engine/inc/wordfilter.php
135+
/engine/inc/xfields.php
136+
/engine/init.php
137+
/engine/modules/.htaccess
138+
/engine/modules/addcomments.php
139+
/engine/modules/addnews.php
140+
/engine/modules/antibot/*
141+
/engine/modules/banned.php
142+
/engine/modules/banners.php
143+
/engine/modules/bbcode.php
144+
/engine/modules/calendar.php
145+
/engine/modules/changemail.php
146+
/engine/modules/comments.php
147+
/engine/modules/cron.php
148+
/engine/modules/deletenews.php
149+
/engine/modules/favorites.php
150+
/engine/modules/feedback.php
151+
/engine/modules/functions.php
152+
/engine/modules/lastcomments.php
153+
/engine/modules/links.php
154+
/engine/modules/lostpassword.php
155+
/engine/modules/main.php
156+
/engine/modules/offline.php
157+
/engine/modules/pm.php
158+
/engine/modules/pm_alert.php
159+
/engine/modules/poll.php
160+
/engine/modules/profile.php
161+
/engine/modules/register.php
162+
/engine/modules/rssinform.php
163+
/engine/modules/search.php
164+
/engine/modules/show.custom.php
165+
/engine/modules/show.full.php
166+
/engine/modules/show.short.php
167+
/engine/modules/sitelogin.php
168+
/engine/modules/social.php
169+
/engine/modules/static.php
170+
/engine/modules/stats.php
171+
/engine/modules/tagscloud.php
172+
/engine/modules/topnews.php
173+
/engine/modules/vote.php
174+
/engine/opensearch.php
175+
/engine/preview.php
176+
/engine/print.php
177+
/engine/rss.php
178+
/engine/skins/.htaccess
179+
/engine/skins/codemirror/css/default.css
180+
/engine/skins/codemirror/js/LICENSE
181+
/engine/skins/codemirror/js/code.js
182+
/engine/skins/default.skin.php
183+
/engine/skins/fonts/*
184+
/engine/skins/images/*
185+
/engine/skins/javascripts/application.js
186+
/engine/skins/stylesheets/application.css
187+
/engine/skins/stylesheets/frame.css
188+
/index.php
189+
/install.php
190+
/language/.htaccess
191+
/language/Russian/admincheck.lng
192+
/language/Russian/adminlogs.lng
193+
/language/Russian/adminpanel.lng
194+
/language/Russian/help.lng
195+
/language/Russian/website.lng
196+
/robots.txt
197+
/templates/.htaccess
198+
/templates/Default/*
199+
/templates/Gemini/*
200+
/templates/Green/*
201+
/templates/Pisces/*
202+
/templates/Red/*
203+
/templates/banned.tpl
204+
/templates/opensearch.tpl
205+
/templates/rss.tpl
206+
/templates/smartphone/*
207+
/upgrade/*
208+
/uploads/*
209+
210+
# DLE 11.3 sources
211+
/engine/ajax/commentssubscribe.php
212+
/engine/ajax/twofactor.php
213+
/engine/classes/htmlpurifier/*
214+
/engine/classes/memcache.class.php
215+
/engine/inc/lostpassword.php
216+
/engine/inc/redirects.php
217+
/engine/inc/twofactor.php
218+
219+
# DLE 12 sources
220+
/engine/inc/metatags.php
221+
/language/English/admincheck.lng
222+
/language/English/adminlogs.lng
223+
/language/English/adminpanel.lng
224+
/language/English/help.lng
225+
/language/English/website.lng
226+
227+
# DLE 13 sources
228+
229+
/engine/ajax/controller.php
230+
/engine/ajax/plugins.php
231+
/engine/classes/plugins.class.php
232+
/engine/classes/zipextract.class.php
233+
/engine/inc/plugins.php
234+
/engine/inc/upgrade.php
235+
/engine/inc/upgrade
236+
237+
# BlockPro
6238
!/engine/modules/base/
7239
!/engine/data/blockpro.php
8240
!/engine/ajax/base/
@@ -13,4 +245,4 @@
13245
!/blockpro.php
14246
!/blockpro_install.php
15247
!/bp_check.php
16-
!/CHANGELOG.md
248+
!/CHANGELOG.md

‎blockpro.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
define('ROOT_DIR', dirname(__FILE__));
2323
define('ENGINE_DIR', ROOT_DIR . '/engine');
2424

25-
include ENGINE_DIR . '/data/config.php';
25+
include_once ENGINE_DIR . '/plugins/loader/loader.php';
26+
include(DLEPlugins::Check(ENGINE_DIR . '/data/config.php'));
2627

2728
/** @var array $config */
2829
if ($config['version_id'] > 10.2) {
@@ -38,9 +39,9 @@
3839
$config['http_home_url'] = 'http://' . $_SERVER['HTTP_HOST'] . $config['http_home_url'];
3940
}
4041

41-
require_once ENGINE_DIR . '/classes/mysql.php';
42-
require_once ENGINE_DIR . '/data/dbconfig.php';
43-
require_once ENGINE_DIR . '/modules/functions.php';
42+
require_once(DLEPlugins::Check(ENGINE_DIR . '/classes/mysql.php'));
43+
require_once(DLEPlugins::Check(ENGINE_DIR . '/data/dbconfig.php'));
44+
require_once(DLEPlugins::Check(ENGINE_DIR . '/modules/functions.php'));
4445

4546
check_xss();
4647

@@ -76,8 +77,8 @@
7677
$isRSS = true;
7778
}
7879
if (isset($_REQUEST['frame'])) {
79-
$blockId = $_REQUEST['frame'];
80-
$isIframe = true;
80+
$blockId = $_REQUEST['frame'];
81+
$isIframe = true;
8182
}
8283
$blockId = $db->safesql($blockId);
8384

‎engine/ajax/blockpro.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
define('ENGINE_DIR', ROOT_DIR . '/engine');
2323

2424
include_once ENGINE_DIR . '/plugins/loader/loader.php';
25-
include (DLEPlugins::Check(ENGINE_DIR . '/data/config.php'));
25+
include(DLEPlugins::Check(ENGINE_DIR . '/data/config.php'));
2626

2727
/** @var array $config */
2828
if ($config['version_id'] > 10.2) {
@@ -38,10 +38,9 @@
3838
$config['http_home_url'] = "http://" . $_SERVER['HTTP_HOST'] . $config['http_home_url'];
3939
}
4040

41-
require_once (DLEPlugins::Check(ENGINE_DIR . '/classes/mysql.php'));
42-
require_once (DLEPlugins::Check(ENGINE_DIR . '/data/dbconfig.php'));
43-
require_once (DLEPlugins::Check(ENGINE_DIR . '/modules/functions.php'));
44-
require_once (DLEPlugins::Check(ENGINE_DIR . '/classes/templates.class.php'));
41+
require_once(DLEPlugins::Check(ENGINE_DIR . '/classes/mysql.php'));
42+
require_once(DLEPlugins::Check(ENGINE_DIR . '/data/dbconfig.php'));
43+
require_once(DLEPlugins::Check(ENGINE_DIR . '/modules/functions.php'));
4544

4645
if (function_exists('dle_session')) {
4746
dle_session();
@@ -53,7 +52,7 @@
5352
$member_id = [];
5453

5554
if ($config['allow_registration']) {
56-
require_once (DLEPlugins::Check(ENGINE_DIR . '/modules/sitelogin.php'));
55+
require_once(DLEPlugins::Check(ENGINE_DIR . '/modules/sitelogin.php'));
5756
}
5857
if (!$is_logged) {
5958
$member_id['user_group'] = 5;
@@ -128,7 +127,7 @@
128127
}
129128
}
130129

131-
include (DLEPlugins::Check(ENGINE_DIR . '/modules/base/blockpro.php'));
130+
include(DLEPlugins::Check(ENGINE_DIR . '/modules/base/blockpro.php'));
132131

133132
} else {
134133
die('cache not found');

‎engine/modules/base/blockpro.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
*/
1313

1414
if (!defined('DATALIFEENGINE')) {
15-
die('Go fuck yourself!');
15+
header( "HTTP/1.1 403 Forbidden" );
16+
header ( 'Location: ../../' );
17+
die( "Hacking attempt!" );
1618
}
1719

1820
/**

‎engine/modules/base/core/base.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
*/
1313

1414
if (!defined('DATALIFEENGINE')) {
15-
die("Go fuck yourself!");
15+
header( "HTTP/1.1 403 Forbidden" );
16+
header ( 'Location: ../../' );
17+
die( "Hacking attempt!" );
1618
}
1719

1820
define('BASE_DIR', ENGINE_DIR . '/modules/base');
1921

2022
require_once(BASE_DIR . '/core/Fenom.php');
2123
\Fenom::registerAutoload(BASE_DIR . '/core/');
2224

23-
require_once(ENGINE_DIR . '/modules/functions.php');
25+
include_once ENGINE_DIR . '/plugins/loader/loader.php';
26+
27+
require_once(DLEPlugins::Check(ENGINE_DIR . '/modules/functions.php'));
2428

2529
/**
2630
* BaseClass

0 commit comments

Comments
 (0)