View GitHub Repository cadmium-cms

Schedule Inspection
Subscribe
Completed
Push — master ( e7c824...3ed60a )
by Anton
10s
created
Status
Category
Toggle Patches
www/engine/System/Includes/Tables.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@
 
 block discarded – undo
2 2
3 3 
 # Database tables
4 4
5 
-define('TABLE_PAGES',                               'pages');
6 
-define('TABLE_MENU',                                'menu');
7 
-define('TABLE_VARIABLES',                           'variables');
8 
-define('TABLE_WIDGETS',                             'widgets');
5 
+define('TABLE_PAGES', 'pages');
6 
+define('TABLE_MENU', 'menu');
7 
+define('TABLE_VARIABLES', 'variables');
8 
+define('TABLE_WIDGETS', 'widgets');
9 9
10 
-define('TABLE_USERS',                               'users');
11 
-define('TABLE_USERS_SECRETS',                       'users_secrets');
12 
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
10 
+define('TABLE_USERS', 'users');
11 
+define('TABLE_USERS_SECRETS', 'users_secrets');
12 
+define('TABLE_USERS_SESSIONS', 'users_sessions');
Please login to merge, or discard this patch.
www/engine/System/Exception.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -4,21 +4,21 @@
 
 block discarded – undo
4 4
5 5 
 	# Captcha generate exception
6 6
7 
-	class Captcha extends Exception  {
7 
+	class Captcha extends Exception {
8 8
9 9 
 		protected $message = 'Error generating captcha';
10 10 
 	}
11 11
12 12 
 	# Sitemap generate exception
13 13
14 
-	class Sitemap extends Exception  {
14 
+	class Sitemap extends Exception {
15 15
16 16 
 		protected $message = 'Error generating sitemap';
17 17 
 	}
18 18
19 19 
 	# View not initialized exception
20 20
21 
-	class View extends Exception  {
21 
+	class View extends Exception {
22 22
23 23 
 		protected $message = 'View is not initialized';
24 24 
 	}
Please login to merge, or discard this patch.
www/engine/System/Languages/uk-UA/Phrases/Install.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -58,43 +58,43 @@
 
 block discarded – undo
58 58 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Головна',
59 59
60 60 
 	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Ласкаво просимо!</h2>' .
61 
-	                                               '<p>Це демонстраційний сайт, що працює на <strong>Cadmium CMS</strong>.</p>' .
62 
-	                                               '<p>Ви можете увійти в панель керування, перейшовши за <a href="$install_path$/admin">цим посиланням</a>.</p>' .
63 
-	                                               '<h2>Дивіться також</h2>' .
64 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Офіційний сайт</a></li>' .
65 
-	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Сторінка проекту на GitHub</a></li></ul>',
61 
+												   '<p>Це демонстраційний сайт, що працює на <strong>Cadmium CMS</strong>.</p>' .
62 
+												   '<p>Ви можете увійти в панель керування, перейшовши за <a href="$install_path$/admin">цим посиланням</a>.</p>' .
63 
+												   '<h2>Дивіться також</h2>' .
64 
+												   '<ul><li><a href="http://cadmium-cms.com" target="_blank">Офіційний сайт</a></li>' .
65 
+												   '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Сторінка проекту на GitHub</a></li></ul>',
66 66
67 67 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Сторінка',
68 68
69 69 
 	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
70 70
71 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
71 
+												   '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
+												   'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
+												   'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
+												   'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
+												   'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
+												   'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
77 77
78 
-	                                               '<h3>Vix no suas populo</h3>' .
78 
+												   '<h3>Vix no suas populo</h3>' .
79 79
80 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
80 
+												   '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
+												   'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
+												   'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 83
84 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
84 
+												   '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
+												   'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
+												   'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 87
88 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
88 
+												   '<h3>Ea mea tantas delenit</h3>' .
89 89
90 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
90 
+												   '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
+												   'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
+												   'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
+												   'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
+												   'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
95 95
96 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
-	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
96 
+												   '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
+												   'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
+												   'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+												   'In sed denique iudicabit. Id eos equidem scribentur.</p>'
100 100 
 ];
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -60,44 +60,44 @@
 
 block discarded – undo
60 60
61 61 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Головна',
62 62
63 
-	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Ласкаво просимо!</h2>' .
64 
-	                                               '<p>Це демонстраційний сайт, що працює на <strong>Cadmium CMS</strong>.</p>' .
65 
-	                                               '<p>Ви можете увійти в панель керування, перейшовши за <a href="$install_path$/admin">цим посиланням</a>.</p>' .
66 
-	                                               '<h2>Дивіться також</h2>' .
67 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Офіційний сайт</a></li>' .
63 
+	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Ласкаво просимо!</h2>'.
64 
+	                                               '<p>Це демонстраційний сайт, що працює на <strong>Cadmium CMS</strong>.</p>'.
65 
+	                                               '<p>Ви можете увійти в панель керування, перейшовши за <a href="$install_path$/admin">цим посиланням</a>.</p>'.
66 
+	                                               '<h2>Дивіться також</h2>'.
67 
+	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Офіційний сайт</a></li>'.
68 68 
 	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Сторінка проекту на GitHub</a></li></ul>',
69 69
70 70 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Сторінка',
71 71
72 
-	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
72 
+	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>'.
73 73
74 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
75 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
76 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
77 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
78 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
79 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
74 
+	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. '.
75 
+	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. '.
76 
+	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. '.
77 
+	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. '.
78 
+	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. '.
79 
+	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>'.
80 80
81 
-	                                               '<h3>Vix no suas populo</h3>' .
81 
+	                                               '<h3>Vix no suas populo</h3>'.
82 82
83 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
84 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
85 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 
+	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. '.
84 
+	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. '.
85 
+	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>'.
86 86
87 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
88 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
89 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 
+	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. '.
88 
+	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. '.
89 
+	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>'.
90 90
91 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
91 
+	                                               '<h3>Ea mea tantas delenit</h3>'.
92 92
93 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
94 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
95 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
96 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
97 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
93 
+	                                               '<p>Ea mea tantas delenit, ut usu alii commune. '.
94 
+	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, '.
95 
+	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. '.
96 
+	                                               'Saperet luptatum recusabo quo cu, '.'vix facer dolores persecuti no. '.
97 
+	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>'.
98 98
99 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
100 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
101 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, '.
100 
+	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, '.
101 
+	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. '.
102 102 
 	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
103 103 
 ];
Please login to merge, or discard this patch.
www/engine/System/Languages/uk-UA/Phrases/Admin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -64,9 +64,9 @@
 
 block discarded – undo
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'База даних',
65 65
66 66 
 	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Інсталяційний файл <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
67 
-	                                               'досі знаходиться в кореневій директорії сайта. Необхідно видалити його.',
67 
+												   'досі знаходиться в кореневій директорії сайта. Необхідно видалити його.',
68 68 
 	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'Схоже, Ви поки не редагували конфігурацію сайта. '.
69 
-	                                               'Перейдіть на <a href="$install_path$/admin/system/settings">сторінку налаштувань</a> для введення актуальних значень.',
69 
+												   'Перейдіть на <a href="$install_path$/admin/system/settings">сторінку налаштувань</a> для введення актуальних значень.',
70 70
71 71 
 	# Pages
72 72
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -63,7 +63,7 @@
 
 block discarded – undo
63 63 
 	'DASHBOARD_GROUP_GENERAL'                   => 'Основне',
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'База даних',
65 65
66 
-	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Інсталяційний файл <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
66 
+	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Інсталяційний файл <a href="$install_path$/install.php" target="_blank">install.php</a> '.
67 67 
 	                                               'досі знаходиться в кореневій директорії сайта. Необхідно видалити його.',
68 68 
 	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'Схоже, Ви поки не редагували конфігурацію сайта. '.
69 69 
 	                                               'Перейдіть на <a href="$install_path$/admin/system/settings">сторінку налаштувань</a> для введення актуальних значень.',
Please login to merge, or discard this patch.
www/engine/System/Languages/en-US/Phrases/Install.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -58,43 +58,43 @@
 
 block discarded – undo
58 58 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Home',
59 59
60 60 
 	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Welcome!</h2>' .
61 
-	                                               '<p>This is demo site, powered by <strong>Cadmium CMS</strong>.</p>' .
62 
-	                                               '<p>You can log into admin panel by following <a href="$install_path$/admin">this link</a>.</p>' .
63 
-	                                               '<h2>See also</h2>' .
64 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Official website</a></li>' .
65 
-	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">GitHub project page</a></ul>',
61 
+												   '<p>This is demo site, powered by <strong>Cadmium CMS</strong>.</p>' .
62 
+												   '<p>You can log into admin panel by following <a href="$install_path$/admin">this link</a>.</p>' .
63 
+												   '<h2>See also</h2>' .
64 
+												   '<ul><li><a href="http://cadmium-cms.com" target="_blank">Official website</a></li>' .
65 
+												   '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">GitHub project page</a></ul>',
66 66
67 67 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Page',
68 68
69 69 
 	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
70 70
71 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
71 
+												   '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
+												   'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
+												   'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
+												   'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
+												   'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
+												   'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
77 77
78 
-	                                               '<h3>Vix no suas populo</h3>' .
78 
+												   '<h3>Vix no suas populo</h3>' .
79 79
80 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
80 
+												   '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
+												   'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
+												   'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 83
84 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
84 
+												   '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
+												   'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
+												   'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 87
88 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
88 
+												   '<h3>Ea mea tantas delenit</h3>' .
89 89
90 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
90 
+												   '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
+												   'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
+												   'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
+												   'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
+												   'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
95 95
96 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
-	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
96 
+												   '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
+												   'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
+												   'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+												   'In sed denique iudicabit. Id eos equidem scribentur.</p>'
100 100 
 ];
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -60,44 +60,44 @@
 
 block discarded – undo
60 60
61 61 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Home',
62 62
63 
-	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Welcome!</h2>' .
64 
-	                                               '<p>This is demo site, powered by <strong>Cadmium CMS</strong>.</p>' .
65 
-	                                               '<p>You can log into admin panel by following <a href="$install_path$/admin">this link</a>.</p>' .
66 
-	                                               '<h2>See also</h2>' .
67 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Official website</a></li>' .
63 
+	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Welcome!</h2>'.
64 
+	                                               '<p>This is demo site, powered by <strong>Cadmium CMS</strong>.</p>'.
65 
+	                                               '<p>You can log into admin panel by following <a href="$install_path$/admin">this link</a>.</p>'.
66 
+	                                               '<h2>See also</h2>'.
67 
+	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Official website</a></li>'.
68 68 
 	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">GitHub project page</a></ul>',
69 69
70 70 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Page',
71 71
72 
-	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
72 
+	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>'.
73 73
74 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
75 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
76 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
77 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
78 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
79 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
74 
+	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. '.
75 
+	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. '.
76 
+	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. '.
77 
+	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. '.
78 
+	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. '.
79 
+	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>'.
80 80
81 
-	                                               '<h3>Vix no suas populo</h3>' .
81 
+	                                               '<h3>Vix no suas populo</h3>'.
82 82
83 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
84 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
85 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 
+	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. '.
84 
+	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. '.
85 
+	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>'.
86 86
87 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
88 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
89 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 
+	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. '.
88 
+	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. '.
89 
+	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>'.
90 90
91 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
91 
+	                                               '<h3>Ea mea tantas delenit</h3>'.
92 92
93 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
94 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
95 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
96 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
97 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
93 
+	                                               '<p>Ea mea tantas delenit, ut usu alii commune. '.
94 
+	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, '.
95 
+	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. '.
96 
+	                                               'Saperet luptatum recusabo quo cu, '.'vix facer dolores persecuti no. '.
97 
+	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>'.
98 98
99 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
100 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
101 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, '.
100 
+	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, '.
101 
+	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. '.
102 102 
 	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
103 103 
 ];
Please login to merge, or discard this patch.
www/engine/System/Languages/en-US/Phrases/Admin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -64,9 +64,9 @@
 
 block discarded – undo
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'Database',
65 65
66 66 
 	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
67 
-	                                               'still exists in the root of your site. It\'s necessary to remove it.',
67 
+												   'still exists in the root of your site. It\'s necessary to remove it.',
68 68 
 	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'It seems you have not yet edited site configuration. ' .
69 
-	                                               'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual values.',
69 
+												   'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual values.',
70 70
71 71 
 	# Pages
72 72
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -63,9 +63,9 @@
 
 block discarded – undo
63 63 
 	'DASHBOARD_GROUP_GENERAL'                   => 'General',
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'Database',
65 65
66 
-	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
66 
+	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> '.
67 67 
 	                                               'still exists in the root of your site. It\'s necessary to remove it.',
68 
-	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'It seems you have not yet edited site configuration. ' .
68 
+	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'It seems you have not yet edited site configuration. '.
69 69 
 	                                               'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual values.',
70 70
71 71 
 	# Pages
Please login to merge, or discard this patch.
www/engine/System/Languages/ru-RU/Phrases/Install.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -58,43 +58,43 @@
 
 block discarded – undo
58 58 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Главная',
59 59
60 60 
 	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Добро пожаловать!</h2>' .
61 
-	                                               '<p>Это демонстрационный сайт, работающий на <strong>Cadmium CMS</strong>.</p>' .
62 
-	                                               '<p>Вы можете войти в панель управления, перейдя по <a href="$install_path$/admin">этой ссылке</a>.</p>' .
63 
-	                                               '<h2>Смотрите также</h2>' .
64 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Официальный сайт</a></li>' .
65 
-	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Страница проекта на GitHub</a></li></ul>',
61 
+												   '<p>Это демонстрационный сайт, работающий на <strong>Cadmium CMS</strong>.</p>' .
62 
+												   '<p>Вы можете войти в панель управления, перейдя по <a href="$install_path$/admin">этой ссылке</a>.</p>' .
63 
+												   '<h2>Смотрите также</h2>' .
64 
+												   '<ul><li><a href="http://cadmium-cms.com" target="_blank">Официальный сайт</a></li>' .
65 
+												   '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Страница проекта на GitHub</a></li></ul>',
66 66
67 67 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Страница',
68 68
69 69 
 	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
70 70
71 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
71 
+												   '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
72 
+												   'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
73 
+												   'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
74 
+												   'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
75 
+												   'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
76 
+												   'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
77 77
78 
-	                                               '<h3>Vix no suas populo</h3>' .
78 
+												   '<h3>Vix no suas populo</h3>' .
79 79
80 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
80 
+												   '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
81 
+												   'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
82 
+												   'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 83
84 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
84 
+												   '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
85 
+												   'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
86 
+												   'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 87
88 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
88 
+												   '<h3>Ea mea tantas delenit</h3>' .
89 89
90 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
90 
+												   '<p>Ea mea tantas delenit, ut usu alii commune. ' .
91 
+												   'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
92 
+												   'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
93 
+												   'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
94 
+												   'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
95 95
96 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
-	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
96 
+												   '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
97 
+												   'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
98 
+												   'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+												   'In sed denique iudicabit. Id eos equidem scribentur.</p>'
100 100 
 ];
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -60,44 +60,44 @@
 
 block discarded – undo
60 60
61 61 
 	'INSTALL_PAGE_INDEX_TITLE'                  => 'Главная',
62 62
63 
-	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Добро пожаловать!</h2>' .
64 
-	                                               '<p>Это демонстрационный сайт, работающий на <strong>Cadmium CMS</strong>.</p>' .
65 
-	                                               '<p>Вы можете войти в панель управления, перейдя по <a href="$install_path$/admin">этой ссылке</a>.</p>' .
66 
-	                                               '<h2>Смотрите также</h2>' .
67 
-	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Официальный сайт</a></li>' .
63 
+	'INSTALL_PAGE_INDEX_CONTENTS'               => '<h2>Добро пожаловать!</h2>'.
64 
+	                                               '<p>Это демонстрационный сайт, работающий на <strong>Cadmium CMS</strong>.</p>'.
65 
+	                                               '<p>Вы можете войти в панель управления, перейдя по <a href="$install_path$/admin">этой ссылке</a>.</p>'.
66 
+	                                               '<h2>Смотрите также</h2>'.
67 
+	                                               '<ul><li><a href="http://cadmium-cms.com" target="_blank">Официальный сайт</a></li>'.
68 68 
 	                                               '<li><a href="https://github.com/cadmium-org/cadmium-cms" target="_blank">Страница проекта на GitHub</a></li></ul>',
69 69
70 70 
 	'INSTALL_PAGE_DEMO_TITLE'                   => 'Страница',
71 71
72 
-	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>' .
72 
+	'INSTALL_PAGE_DEMO_CONTENTS'                => '<h2>Lorem ipsum</h2>'.
73 73
74 
-	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. ' .
75 
-	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. ' .
76 
-	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. ' .
77 
-	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. ' .
78 
-	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. ' .
79 
-	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>' .
74 
+	                                               '<p>Lorem ipsum dolor sit amet, ex etiam facilis vim. '.
75 
+	                                               'Qui etiam soluta nostro no, te praesent consulatu eos. '.
76 
+	                                               'His at modus diceret referrentur, exerci viderer aperiri et sed. '.
77 
+	                                               'Ne errem appareat apeirian has, ut has eligendi comprehensam. '.
78 
+	                                               'His ea adipisci eloquentiam, nec id temporibus appellantur. '.
79 
+	                                               'Pri ut inermis persequeris contentiones, vel vidit ponderum cu.</p>'.
80 80
81 
-	                                               '<h3>Vix no suas populo</h3>' .
81 
+	                                               '<h3>Vix no suas populo</h3>'.
82 82
83 
-	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. ' .
84 
-	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. ' .
85 
-	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>' .
83 
+	                                               '<p>Vix no suas populo. Mea inani utinam ex. Duo vocibus noluisse partiendo ei. '.
84 
+	                                               'Impedit voluptatibus pro ut, ea probatus reformidans pri. '.
85 
+	                                               'An vix repudiandae complectitur, ex soluta numquam splendide nam.</p>'.
86 86
87 
-	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. ' .
88 
-	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. ' .
89 
-	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>' .
87 
+	                                               '<p>Mea ex novum contentiones, eleifend ocurreret voluptaria et usu. '.
88 
+	                                               'No mel illum nonumy maiorum, pro saperet disputando in. Cum ei tritani accusam incorrupte. '.
89 
+	                                               'Per animal saperet suavitate id, vim ex quod delicatissimi.</p>'.
90 90
91 
-	                                               '<h3>Ea mea tantas delenit</h3>' .
91 
+	                                               '<h3>Ea mea tantas delenit</h3>'.
92 92
93 
-	                                               '<p>Ea mea tantas delenit, ut usu alii commune. ' .
94 
-	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, ' .
95 
-	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. ' .
96 
-	                                               'Saperet luptatum recusabo quo cu, ' .'vix facer dolores persecuti no. ' .
97 
-	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>' .
93 
+	                                               '<p>Ea mea tantas delenit, ut usu alii commune. '.
94 
+	                                               'Te vix decore dolore scribentur. Ad pri malis invidunt ullamcorper, '.
95 
+	                                               'qui eu laboramus vulputate scriptorem, id veri audiam integre pro. '.
96 
+	                                               'Saperet luptatum recusabo quo cu, '.'vix facer dolores persecuti no. '.
97 
+	                                               'Eos id omnes affert possim. Vix id commune urbanitas.</p>'.
98 98
99 
-	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, ' .
100 
-	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, ' .
101 
-	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. ' .
99 
+	                                               '<p>Cu eum quod prodesset, vix sale democritum delicatissimi et, '.
100 
+	                                               'putant viderer inimicus pro ut. Sea ut tamquam hendrerit definitionem, '.
101 
+	                                               'an quo illud persecuti, debet affert vis te. Mei ea omnes saepe nostrum. '.
102 102 
 	                                               'In sed denique iudicabit. Id eos equidem scribentur.</p>'
103 103 
 ];
Please login to merge, or discard this patch.
www/engine/System/Languages/ru-RU/Phrases/Admin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -64,9 +64,9 @@
 
 block discarded – undo
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'База данных',
65 65
66 66 
 	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Установочный файл <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
67 
-	                                               'по-прежнему находится в корневой директории сайта. Необходимо удалить его.',
67 
+												   'по-прежнему находится в корневой директории сайта. Необходимо удалить его.',
68 68 
 	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'Похоже, Вы пока не редактировали конфигурацию сайта. '.
69 
-	                                               'Перейдите на <a href="$install_path$/admin/system/settings">страницу настроек</a> для ввода актуальных значений.',
69 
+												   'Перейдите на <a href="$install_path$/admin/system/settings">страницу настроек</a> для ввода актуальных значений.',
70 70
71 71 
 	# Pages
72 72
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -63,7 +63,7 @@
 
 block discarded – undo
63 63 
 	'DASHBOARD_GROUP_GENERAL'                   => 'Основное',
64 64 
 	'DASHBOARD_GROUP_DATABASE'                  => 'База данных',
65 65
66 
-	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Установочный файл <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
66 
+	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Установочный файл <a href="$install_path$/install.php" target="_blank">install.php</a> '.
67 67 
 	                                               'по-прежнему находится в корневой директории сайта. Необходимо удалить его.',
68 68 
 	'DASHBOARD_MESSAGE_CONFIG_FILE'             => 'Похоже, Вы пока не редактировали конфигурацию сайта. '.
69 69 
 	                                               'Перейдите на <a href="$install_path$/admin/system/settings">страницу настроек</a> для ввода актуальных значений.',
Please login to merge, or discard this patch.
www/engine/Framework/Main.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,9 @@
 
 block discarded – undo
23 23
24 24 
 # Set defaults
25 25
26 
-if (function_exists('mb_internal_encoding')) mb_internal_encoding('UTF-8');
26 
+if (function_exists('mb_internal_encoding')) {
27 
+	mb_internal_encoding('UTF-8');
28 
+}
27 29
28 30 
 date_default_timezone_set('UTC');
29 31
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -2,24 +2,24 @@
 
 block discarded – undo
2 2
3 3 
 # Define constants
4 4
5 
-define('DIR_FRAMEWORK',     (dirname(__FILE__) . '/'));
5 
+define('DIR_FRAMEWORK', (dirname(__FILE__).'/'));
6 6
7 
-define('DIR_CLASSES',       (DIR_FRAMEWORK . 'Classes/'));
8 
-define('DIR_DATA',          (DIR_FRAMEWORK . 'Data/'));
9 
-define('DIR_INCLUDES',      (DIR_FRAMEWORK . 'Includes/'));
10 
-define('DIR_TEMPLATES',     (DIR_FRAMEWORK . 'Templates/'));
7 
+define('DIR_CLASSES', (DIR_FRAMEWORK.'Classes/'));
8 
+define('DIR_DATA', (DIR_FRAMEWORK.'Data/'));
9 
+define('DIR_INCLUDES', (DIR_FRAMEWORK.'Includes/'));
10 
+define('DIR_TEMPLATES', (DIR_FRAMEWORK.'Templates/'));
11 11
12 12 
 # Require classes
13 13
14 
-require_once (DIR_FRAMEWORK . 'Engine.php');
15 
-require_once (DIR_FRAMEWORK . 'Exception.php');
14 
+require_once (DIR_FRAMEWORK.'Engine.php');
15 
+require_once (DIR_FRAMEWORK.'Exception.php');
16 16
17 17 
 # Require configuration
18 18
19 
-require_once (DIR_INCLUDES . 'Constants.php');
20 
-require_once (DIR_INCLUDES . 'Regex.php');
21 
-require_once (DIR_INCLUDES . 'Headers/Mime.php');
22 
-require_once (DIR_INCLUDES . 'Headers/Status.php');
19 
+require_once (DIR_INCLUDES.'Constants.php');
20 
+require_once (DIR_INCLUDES.'Regex.php');
21 
+require_once (DIR_INCLUDES.'Headers/Mime.php');
22 
+require_once (DIR_INCLUDES.'Headers/Status.php');
23 23
24 24 
 # Set defaults
25 25
Please login to merge, or discard this patch.