Skip to content

Commit 0847cee

Browse files
beaver-devbeaver-dev
committed
Fixes & move more files into /app folder
1 parent edeb9f7 commit 0847cee

Some content is hidden

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

67 files changed

+207
-63
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cache/
2-
include/config.php
1+
app/cache/
2+
app/config.php
33
.idea/
44
nbproject/
55
lang/French

‎app/Controller/Admin/Parser.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ public function display()
3535
require FEATHER_ROOT . 'app/lang/' . $this->user->language . '/admin/parser.php';
3636

3737
// This is where the parser data lives and breathes.
38-
$cache_file = FEATHER_ROOT.'cache/cache_parser_data.php';
38+
$cache_file = FEATHER_ROOT.'app/cache/cache_parser_data.php';
3939

4040
// If RESET button pushed, or no cache file, re-compile master bbcode source file.
4141
if ($this->request->post('reset') || !file_exists($cache_file)) {
42-
require_once(FEATHER_ROOT.'include/bbcd_source.php');
43-
require_once(FEATHER_ROOT.'include/bbcd_compile.php');
42+
require_once(FEATHER_ROOT.'app/Helpers/bbcd_source.php');
43+
require_once(FEATHER_ROOT.'app/Helpers/bbcd_compile.php');
4444
redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['reset_success']);
4545
}
4646

47-
// Load the current BBCode $pd array from include/parser_data.inc.php.
47+
// Load the current BBCode $pd array from app/Helpers/parser_data.inc.php.
4848
require_once($cache_file); // Fetch $pd compiled global regex data.
4949
$bbcd = $pd['bbcd']; // Local scratch copy of $bbcd.
5050
$smilies = $pd['smilies']; // Local scratch copy of $smilies.
@@ -198,7 +198,7 @@ public function display()
198198
}
199199
}
200200

201-
require_once('include/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
201+
require_once('app/Helpers/bbcd_compile.php'); // Compile $bbcd and save into $pd['bbcd']
202202
redirect($this->feather->url->get('admin/parser/'), $lang_admin_parser['save_success']);
203203
}
204204

app/controller/delete.php renamed to app/Controller/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function deletepost($id)
5757
$this->model->handle_deletion($is_topic_post, $id, $cur_post['tid'], $cur_post['fid']);
5858
}
5959

60-
require $this->feather->forum_env['FEATHER_ROOT'].'include/parser.php';
60+
require $this->feather->forum_env['FEATHER_ROOT'].'app/Helpers/parser.php';
6161
$cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
6262

6363
$this->feather->view2->setPageInfo(array(

app/controller/edit.php renamed to app/Controller/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function editpost($id)
8181
}
8282

8383
if ($this->request->post('preview')) {
84-
require_once FEATHER_ROOT.'include/parser.php';
84+
require_once FEATHER_ROOT.'app/Helpers/parser.php';
8585
$preview_message = parse_message($post['message'], $post['hide_smilies']);
8686
} else {
8787
$preview_message = '';

app/controller/help.php renamed to app/Controller/Help.php

File renamed without changes.

app/controller/index.php renamed to app/Controller/Index.php

File renamed without changes.

app/controller/install.php renamed to app/Controller/Install.php

File renamed without changes.

app/controller/login.php renamed to app/Controller/Login.php

File renamed without changes.

app/controller/misc.php renamed to app/Controller/Misc.php

File renamed without changes.

app/controller/moderate.php renamed to app/Controller/Moderate.php

File renamed without changes.

0 commit comments

Comments
 (0)