Skip to content

Commit ea5e4fc

Browse files
se7enxwebse7enxweb
committed
Moved: Moved all default modules into kernel directory structure on disk and in included php code. Tested as working stable at beta state. Now we match ezpublish legacy kernel in structure even more than ever before
1 parent 9f4b937 commit ea5e4fc

File tree

7,019 files changed

+14036
-1723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,019 files changed

+14036
-1723
lines changed

‎.gitignore

+33-30
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,37 @@ bin/logs
44
bin/sql/captions
55
error_log
66
var/cache
7-
classes/cache
8-
ezimagecatalogue/catalogue
9-
ezmediacatalogue/catalogue
10-
ezcalendar/admin/cache
11-
ezcontact/admin/cache
12-
ezfilemanager/files
13-
ezarticle/cache
14-
ezarticle/admin/cache
15-
ezcalendar/user/cache
16-
ezfilemanager/admin/cache
17-
ezforum/admin/cache
18-
ezlink/admin/cache
19-
ezmessage/admin/cache
20-
ezpoll/admin/cache
21-
eztrade/admin/cache
22-
ezad/admin/cache
23-
ezaddress/admin/cache
24-
ezbug/admin/cache
25-
ezbulkmail/admin/cache
26-
ezform/admin/cache
27-
ezimagecatalogue/admin/cache
28-
ezmediacatalogue/admin/cache
29-
eznewsfeed/admin/cache
30-
ezquiz/admin/cache
31-
ezsitemanager/admin/cache
32-
ezstats/admin/cache
33-
ezsysinfo/admin/cache
34-
eztodo/admin/cache
35-
ezurltranslator/admin/cache
36-
ezuser/admin/cache
7+
var/site/storage
8+
autoload
9+
kernel/classes/cache
10+
kernel/ezimagecatalogue/catalogue/variations
11+
kernel/ezimagecatalogue/catalogue
12+
kernel/ezmediacatalogue/catalogue
13+
kernel/ezcalendar/admin/cache
14+
kernel/ezcontact/admin/cache
15+
kernel/ezfilemanager/files
16+
kernel/ezarticle/cache
17+
kernel/ezarticle/admin/cache
18+
kernel/ezcalendar/user/cache
19+
kernel/ezfilemanager/admin/cache
20+
kernel/ezforum/admin/cache
21+
kernel/ezlink/admin/cache
22+
kernel/ezmessage/admin/cache
23+
kernel/ezpoll/admin/cache
24+
kernel/eztrade/admin/cache
25+
kernel/ezad/admin/cache
26+
kernel/ezaddress/admin/cache
27+
kernel/ezbug/admin/cache
28+
kernel/ezbulkmail/admin/cache
29+
kernel/ezform/admin/cache
30+
kernel/ezimagecatalogue/admin/cache
31+
kernel/ezmediacatalogue/admin/cache
32+
kernel/eznewsfeed/admin/cache
33+
kernel/ezquiz/admin/cache
34+
kernel/ezsitemanager/admin/cache
35+
kernel/ezstats/admin/cache
36+
kernel/ezsysinfo/admin/cache
37+
kernel/eztodo/admin/cache
38+
kernel/ezurltranslator/admin/cache
39+
kernel/ezuser/admin/cache
3740
#vendor

‎bin/shell/clearcache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ezfilemanager
2020
ezimagecatalogue
2121
ezsitemanager
2222
ezquiz
23-
classes
23+
kernel/classes
2424
ezurltranslator
2525
ezbulkmail
2626
ezform

‎classes/admin/linklist.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
// $Funcs = Array of functions to call, currently only "delete" is used.
5151
// eg. array( "delete" => "deleteCacheHelper" );
5252
// Variables which you may set to use a different template and/or intl file.
53-
// $ClientRoot = The root of the module, default is "classes/", eg. "eztrade/admin/"
54-
// $ClientIntlDir = The intl dir of the module, default is "classes/admin/intl/", eg. "eztrade/admin/intl/"
53+
// $ClientRoot = The root of the module, default is "classes/", eg. "kernel/eztrade/admin/"
54+
// $ClientIntlDir = The intl dir of the module, default is "classes/admin/intl/", eg. "kernel/eztrade/admin/intl/"
5555

5656
include_once( "classes/INIFile.php" );
5757
include_once( "classes/eztemplate.php" );

‎design/intranet/frame.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -149,28 +149,28 @@ function MM_swapImage()
149149

150150
<?php
151151
$CategoryID=0;
152-
include( "ezarticle/user/menubox.php" );
152+
include( "kernel/ezarticle/user/menubox.php" );
153153
?>
154154

155155
<?php
156-
include( "ezbug/user/menubox.php" );
156+
include( "kernel/ezbug/user/menubox.php" );
157157
?>
158158

159159
<?php
160-
include( "ezcontact/user/menubox.php" );
160+
include( "kernel/ezcontact/user/menubox.php" );
161161
?>
162162

163163
<?php
164-
include( "ezforum/user/menubox.php" );
165-
include( "ezforum/user/latestmessages.php" );
164+
include( "kernel/ezforum/user/menubox.php" );
165+
include( "kernel/ezforum/user/latestmessages.php" );
166166
?>
167167

168168
<?php
169-
include( "ezfilemanager/user/menubox.php" );
169+
include( "kernel/ezfilemanager/user/menubox.php" );
170170
?>
171171

172172
<?php
173-
include( "ezimagecatalogue/user/menubox.php" );
173+
include( "kernel/ezimagecatalogue/user/menubox.php" );
174174
?>
175175

176176
<!-- Left menu end -->
@@ -188,7 +188,7 @@ function MM_swapImage()
188188

189189
// $CategoryID = $ini->read_var( "eZAdMain", "DefaultCategory" );
190190
// $Limit = 1;
191-
// include( "ezad/user/adlist.php" );
191+
// include( "kernel/ezad/user/adlist.php" );
192192

193193
?>
194194
</div><br />
@@ -210,30 +210,30 @@ function MM_swapImage()
210210
<!-- Right menu start -->
211211

212212
<?php
213-
include( "ezuser/user/userbox.php" );
213+
include( "kernel/ezuser/user/userbox.php" );
214214
?>
215215

216216
<?php
217-
include( "ezmail/user/menubox.php" );
217+
include( "kernel/ezmail/user/menubox.php" );
218218
?>
219219

220220
<?php
221-
include( "eztodo/user/menubox.php" );
221+
include( "kernel/eztodo/user/menubox.php" );
222222
?>
223223

224224
<?php
225-
include( "eztodo/user/todomenulist.php" );
225+
include( "kernel/eztodo/user/todomenulist.php" );
226226
?>
227227

228228
<?php
229-
include( "ezcalendar/user/menubox.php" );
229+
include( "kernel/ezcalendar/user/menubox.php" );
230230
?>
231231

232232
<?php
233-
include( "ezcontact/user/consultationlist.php" );
233+
include( "kernel/ezcontact/user/consultationlist.php" );
234234
?>
235235
<?php
236-
include( "ezsearch/user/menubox.php" );
236+
include( "kernel/ezsearch/user/menubox.php" );
237237
?>
238238

239239
<!-- Right menu end -->
@@ -274,4 +274,4 @@ function MM_swapImage()
274274
?>
275275

276276
</body>
277-
</html>
277+
</html>

‎design/news/frame.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ function MM_swapImage()
144144

145145
<?php
146146
$CategoryID=0;
147-
include( "ezarticle/user/menubox.php" );
147+
include( "kernel/ezarticle/user/menubox.php" );
148148
?>
149149

150150
<?php
151-
include( "eznewsfeed/user/menubox.php" );
151+
include( "kernel/eznewsfeed/user/menubox.php" );
152152
?>
153153

154154
<?php
155-
include( "ezbulkmail/user/menubox.php" );
155+
include( "kernel/ezbulkmail/user/menubox.php" );
156156
?>
157157

158158
<!-- Left menu end -->
@@ -169,7 +169,7 @@ function MM_swapImage()
169169
<?php
170170
// $CategoryID = 4;
171171
// $Limit = 1;
172-
// include( "ezad/user/adlist.php" );
172+
// include( "kernel/ezad/user/adlist.php" );
173173
?>
174174
</div><br />
175175
-->
@@ -192,15 +192,15 @@ function MM_swapImage()
192192
<!-- Right menu start -->
193193

194194
<?php
195-
include( "ezuser/user/userbox.php" );
195+
include( "kernel/ezuser/user/userbox.php" );
196196
?>
197197

198198
<?php
199199
$CategoryID = 1;
200-
include( "eznewsfeed/user/headlines.php" );
200+
include( "kernel/eznewsfeed/user/headlines.php" );
201201
?>
202202
<?php
203-
include( "ezsearch/user/menubox.php" );
203+
include( "kernel/ezsearch/user/menubox.php" );
204204
?>
205205

206206
<!-- Right menu end -->
@@ -242,4 +242,4 @@ function MM_swapImage()
242242
?>
243243

244244
</body>
245-
</html>
245+
</html>

‎design/standard/frame.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,24 @@ function MM_swapImage()
155155
<tr valign="top">
156156
<td class="menu-left" width="1%" bgcolor="#f0f0f0">
157157
<!-- Left menu start -->
158-
159158
<?php
160159
$CategoryID = 0;
161-
include( "ezarticle/user/menubox.php" );
160+
include( "kernel/ezarticle/user/menubox.php" );
162161
?>
163162

164163
<?php
165164
$CategoryID = 1;
166-
include( "ezarticle/user/headlines.php" );
165+
include( "kernel/ezarticle/user/headlines.php" );
167166
?>
168167

169168
<?php
170-
include( "ezlink/user/menubox.php" );
169+
include( "kernel/ezlink/user/menubox.php" );
171170
?>
172171

173172
<?php
174173
// include the static pages for category 2
175174
$CategoryID = 1;
176-
include( "ezarticle/user/articlelinks.php" );
175+
include( "kernel/ezarticle/user/articlelinks.php" );
177176
?>
178177

179178
<!-- Left menu end -->
@@ -187,7 +186,7 @@ function MM_swapImage()
187186
<?php
188187
// $CategoryID = 1;
189188
// $Limit = 1;
190-
// include( "ezad/user/adlist.php" );
189+
// include( "kernelkernelezad/user/adlist.php" );
191190
?>
192191
-->
193192

@@ -214,7 +213,7 @@ function MM_swapImage()
214213

215214
<?php
216215
$NoAddress = true;
217-
include( "ezuser/user/userbox.php" );
216+
include( "kernel/ezuser/user/userbox.php" );
218217
?>
219218

220219
<?php
@@ -223,14 +222,14 @@ function MM_swapImage()
223222
$CategoryID=1;
224223
$Offset=1;
225224
$Limit=1;
226-
include( "ezarticle/user/smallarticlelist.php" );
225+
include( "kernel/ezarticle/user/smallarticlelist.php" );
227226
?>
228227

229228
<?php
230-
include( "ezpoll/user/votebox.php" );
229+
include( "kernel/ezpoll/user/votebox.php" );
231230
?>
232231
<?php
233-
include( "ezsearch/user/menubox.php" );
232+
include( "kernel/ezsearch/user/menubox.php" );
234233
?>
235234

236235
<!-- Right menu end -->
@@ -272,4 +271,4 @@ function MM_swapImage()
272271
?>
273272

274273
</body>
275-
</html>
274+
</html>

‎design/trade/frame.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,16 @@ function MM_swapImage()
159159

160160
<?php
161161
$CategoryID=0;
162-
include( "ezarticle/user/menubox.php" );
162+
include( "kernel/ezarticle/user/menubox.php" );
163163
?>
164164

165165
<?php
166166
$CategoryID = 0;
167-
include( "eztrade/user/categorylist.php" );
167+
include( "kernel/eztrade/user/categorylist.php" );
168168
?>
169169

170170
<?php
171-
include( "eztrade/user/hotdealslist.php" );
171+
include( "kernel/eztrade/user/hotdealslist.php" );
172172
?>
173173

174174
<!-- Left menu end -->
@@ -186,7 +186,7 @@ function MM_swapImage()
186186

187187
// $CategoryID = $ini->read_var( "eZAdMain", "DefaultCategory" );
188188
// $Limit = 1;
189-
// include( "ezad/user/adlist.php" );
189+
// include( "kernel/ezad/user/adlist.php" );
190190

191191
?>
192192
</div><br />
@@ -211,19 +211,19 @@ function MM_swapImage()
211211

212212
<!-- Right menu start -->
213213
<?php
214-
include( "ezuser/user/userbox.php" );
214+
include( "kernel/ezuser/user/userbox.php" );
215215
?>
216216

217217
<?php
218-
include( "eztrade/user/menubox.php" );
218+
include( "kernel/eztrade/user/menubox.php" );
219219
?>
220220

221221
<?php
222-
include( "eztrade/user/smallcart.php" );
222+
include( "kernel/eztrade/user/smallcart.php" );
223223
?>
224224

225225
<?php
226-
include( "ezsearch/user/menubox.php" );
226+
include( "kernel/ezsearch/user/menubox.php" );
227227
?>
228228

229229
<!-- Right menu end -->
@@ -265,4 +265,4 @@ function MM_swapImage()
265265
?>
266266

267267
</body>
268-
</html>
268+
</html>

0 commit comments

Comments
 (0)