Completed
Pull Request — master (#7)
by Anton
04:49
created
www/engine/System/Includes/Regex.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@
 block discarded – undo
2 2
 
3 3
 # Regular expressions
4 4
 
5
-define('REGEX_MAP_ITEM_PATH',                       '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
6
-define('REGEX_MAP_ITEM_HANDLER',                    '/^[A-Z][a-zA-Z0-9]*$/');
5
+define('REGEX_MAP_ITEM_PATH', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
6
+define('REGEX_MAP_ITEM_HANDLER', '/^[A-Z][a-zA-Z0-9]*$/');
7 7
 
8
-define('REGEX_LANGUAGE_NAME',                       '/^[a-z][a-z]-[A-Z][A-Z]$/');
9
-define('REGEX_TEMPLATE_NAME',                       '/^[A-Z0-9][a-zA-Z0-9]*$/');
8
+define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/');
9
+define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/');
10 10
 
11
-define('REGEX_USER_AUTH_CODE',                      '/^[a-zA-Z0-9]{40}$/');
11
+define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/');
12 12
 
13
-define('REGEX_USER_NAME',                           '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
14
-define('REGEX_USER_PASSWORD',                       '/^.+$/');
13
+define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
14
+define('REGEX_USER_PASSWORD', '/^.+$/');
15 15
 
16
-define('REGEX_FILE_NAME',                           '/^[^\/?%*:|"<>\\\]+$/');
16
+define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/');
Please login to merge, or discard this patch.
www/engine/System/Includes/Constants.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -2,78 +2,78 @@
 block discarded – undo
2 2
 
3 3
 # Cadmium
4 4
 
5
-define('CADMIUM_NAME',                              'Cadmium CMS');
6
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
5
+define('CADMIUM_NAME', 'Cadmium CMS');
6
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
7 7
 
8
-define('CADMIUM_VERSION',                           '0.2.2');
9
-define('CADMIUM_COPY',                              '2016');
8
+define('CADMIUM_VERSION', '0.2.2');
9
+define('CADMIUM_COPY', '2016');
10 10
 
11 11
 # External
12 12
 
13
-define('JQUERY_VERSION',                            '2.2.0');
14
-define('SEMANTIC_UI_VERSION',                       '2.1.8');
15
-define('CKEDITOR_VERSION',                          '4.5.6');
13
+define('JQUERY_VERSION', '2.2.0');
14
+define('SEMANTIC_UI_VERSION', '2.1.8');
15
+define('CKEDITOR_VERSION', '4.5.6');
16 16
 
17 17
 # Sections
18 18
 
19
-define('SECTION_ADMIN',                             'Admin');
20
-define('SECTION_SITE',                              'Site');
19
+define('SECTION_ADMIN', 'Admin');
20
+define('SECTION_SITE', 'Site');
21 21
 
22 22
 # Entity types
23 23
 
24
-define('ENTITY_TYPE_PAGE',                          'page');
25
-define('ENTITY_TYPE_MENUITEM',                      'menuitem');
26
-define('ENTITY_TYPE_VARIABLE',                      'variable');
27
-define('ENTITY_TYPE_WIDGET',                        'widget');
28
-define('ENTITY_TYPE_USER',                          'user');
29
-define('ENTITY_TYPE_USER_SECRET',                   'user_secret');
30
-define('ENTITY_TYPE_USER_SESSION',                  'user_session');
24
+define('ENTITY_TYPE_PAGE', 'page');
25
+define('ENTITY_TYPE_MENUITEM', 'menuitem');
26
+define('ENTITY_TYPE_VARIABLE', 'variable');
27
+define('ENTITY_TYPE_WIDGET', 'widget');
28
+define('ENTITY_TYPE_USER', 'user');
29
+define('ENTITY_TYPE_USER_SECRET', 'user_secret');
30
+define('ENTITY_TYPE_USER_SESSION', 'user_session');
31 31
 
32 32
 # Filemanager types
33 33
 
34
-define('FILEMANAGER_TYPE_DIR',                      'dir');
35
-define('FILEMANAGER_TYPE_FILE',                     'file');
34
+define('FILEMANAGER_TYPE_DIR', 'dir');
35
+define('FILEMANAGER_TYPE_FILE', 'file');
36 36
 
37 37
 # Access
38 38
 
39
-define('ACCESS_PUBLIC',                             0);
40
-define('ACCESS_REGISTERED',                         1);
41
-define('ACCESS_ADMINISTRATOR',                      2);
39
+define('ACCESS_PUBLIC', 0);
40
+define('ACCESS_REGISTERED', 1);
41
+define('ACCESS_ADMINISTRATOR', 2);
42 42
 
43 43
 # Frequency
44 44
 
45
-define('FREQUENCY_ALWAYS',                          'always');
46
-define('FREQUENCY_HOURLY',                          'hourly');
47
-define('FREQUENCY_DAILY',                           'daily');
48
-define('FREQUENCY_WEEKLY',                          'weekly');
49
-define('FREQUENCY_MONTHLY',                         'monthly');
50
-define('FREQUENCY_YEARLY',                          'yearly');
51
-define('FREQUENCY_NEVER',                           'never');
45
+define('FREQUENCY_ALWAYS', 'always');
46
+define('FREQUENCY_HOURLY', 'hourly');
47
+define('FREQUENCY_DAILY', 'daily');
48
+define('FREQUENCY_WEEKLY', 'weekly');
49
+define('FREQUENCY_MONTHLY', 'monthly');
50
+define('FREQUENCY_YEARLY', 'yearly');
51
+define('FREQUENCY_NEVER', 'never');
52 52
 
53 53
 # Rank
54 54
 
55
-define('RANK_GUEST',                                0);
56
-define('RANK_USER',                                 1);
57
-define('RANK_ADMINISTRATOR',                        2);
55
+define('RANK_GUEST', 0);
56
+define('RANK_USER', 1);
57
+define('RANK_ADMINISTRATOR', 2);
58 58
 
59 59
 # Sex
60 60
 
61
-define('SEX_NOT_SELECTED',                          0);
62
-define('SEX_MALE',                                  1);
63
-define('SEX_FEMALE',                                2);
61
+define('SEX_NOT_SELECTED', 0);
62
+define('SEX_MALE', 1);
63
+define('SEX_FEMALE', 2);
64 64
 
65 65
 # Status
66 66
 
67
-define('STATUS_ONLINE',                             0);
68
-define('STATUS_MAINTENANCE',                        1);
69
-define('STATUS_UPDATE',                             2);
67
+define('STATUS_ONLINE', 0);
68
+define('STATUS_MAINTENANCE', 1);
69
+define('STATUS_UPDATE', 2);
70 70
 
71 71
 # Target
72 72
 
73
-define('TARGET_SELF',                               0);
74
-define('TARGET_BLANK',                              1);
73
+define('TARGET_SELF', 0);
74
+define('TARGET_BLANK', 1);
75 75
 
76 76
 # Visibility
77 77
 
78
-define('VISIBILITY_DRAFT',                          0);
79
-define('VISIBILITY_PUBLISHED',                      1);
78
+define('VISIBILITY_DRAFT', 0);
79
+define('VISIBILITY_PUBLISHED', 1);
Please login to merge, or discard this patch.