@@ -6,7 +6,7 @@ |
||
6 | 6 | date_default_timezone_set("America/Bogota"); |
7 | 7 | |
8 | 8 | // Memory limit |
9 | -ini_set("memory_limit","256M"); |
|
9 | +ini_set("memory_limit", "256M"); |
|
10 | 10 | |
11 | 11 | // Run application |
12 | 12 | require_once("vendor/autoload.php"); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $http = new Http(); |
87 | 87 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
88 | 88 | |
89 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
89 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | $this->checkSession(); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $http = new Http(); |
117 | 117 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
118 | 118 | |
119 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
119 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | # STANDARD VALIDATIONS [check needed arguments] |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $http = new Http(); |
129 | 129 | $http->writeStatus($http::HTTP_BAD_REQUEST); |
130 | 130 | |
131 | - die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
131 | + die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!'); |
|
132 | 132 | } |
133 | 133 | }); |
134 | 134 | |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | foreach ($errors as $errno => $error) |
269 | 269 | { |
270 | 270 | $errorInformation .= |
271 | - "<strong style='color: #a94442'>". |
|
271 | + "<strong style='color: #a94442'>" . |
|
272 | 272 | $method |
273 | 273 | . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />"; |
274 | 274 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $http = new Http(); |
21 | 21 | $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED); |
22 | 22 | |
23 | - die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
23 | + die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!'); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | $config = include 'module/Auth/config/user.config.php'; |
@@ -3,11 +3,11 @@ |
||
3 | 3 | return [ |
4 | 4 | 'router' => [ |
5 | 5 | 'routes' => [ |
6 | - 'Auth' => [ |
|
7 | - 'module' => 'Auth', |
|
8 | - 'controller' => 'LogIn', |
|
9 | - 'view' => 'index' |
|
10 | - ] |
|
6 | + 'Auth' => [ |
|
7 | + 'module' => 'Auth', |
|
8 | + 'controller' => 'LogIn', |
|
9 | + 'view' => 'index' |
|
10 | + ] |
|
11 | 11 | ], |
12 | 12 | ], |
13 | 13 | 'view_manager' => [ |
@@ -81,7 +81,7 @@ |
||
81 | 81 | { |
82 | 82 | $new = array(); |
83 | 83 | |
84 | - foreach($obj as $key => $val) |
|
84 | + foreach ($obj as $key => $val) |
|
85 | 85 | { |
86 | 86 | $new[$key] = $this->object_to_array($val); |
87 | 87 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | ], |
25 | 25 | 'environment' => [ |
26 | 26 | 'base_path' => (dirname(dirname($_SERVER['PHP_SELF'])) == "/") ? "" : dirname(dirname($_SERVER['PHP_SELF'])), |
27 | - 'dev_mode' => true, // set this to FALSE for production environments |
|
27 | + 'dev_mode' => true, // set this to FALSE for production environments |
|
28 | 28 | 'locale' => 'en' |
29 | 29 | ], |
30 | 30 | ]; |
31 | 31 | \ No newline at end of file |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - 'default' => [ |
|
5 | - 'dbname' => '', |
|
6 | - 'dbuser' => '', |
|
7 | - 'dbpass' => '', |
|
8 | - 'dbhost' => '', |
|
9 | - 'driver' => 'Oci8', |
|
10 | - 'dbchar' => 'utf8' |
|
11 | - ], |
|
4 | + 'default' => [ |
|
5 | + 'dbname' => '', |
|
6 | + 'dbuser' => '', |
|
7 | + 'dbpass' => '', |
|
8 | + 'dbhost' => '', |
|
9 | + 'driver' => 'Oci8', |
|
10 | + 'dbchar' => 'utf8' |
|
11 | + ], |
|
12 | 12 | ]; |
13 | 13 | \ No newline at end of file |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | { |
5 | 5 | function ifdef($value, Array $array) |
6 | 6 | { |
7 | - $global = __DIR__ . '/../../../config/global.config.php'; |
|
7 | + $global = __DIR__ . '/../../../config/global.config.php'; |
|
8 | 8 | |
9 | 9 | if (file_exists($global)) |
10 | 10 | { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if (!$key) |
29 | 29 | return $in; |
30 | 30 | |
31 | - } while($key); |
|
31 | + } while ($key); |
|
32 | 32 | } |
33 | 33 | else |
34 | 34 | return $value; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | return [ |
39 | 39 | 'project' => [ |
40 | - 'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project |
|
40 | + 'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project |
|
41 | 41 | ], |
42 | 42 | 'mail' => [ |
43 | 43 | /** CHECKING: |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | "host" => ifdef('localhost', ["mail", "host"]) |
52 | 52 | ], |
53 | 53 | "authentication" => [ |
54 | - "method" => ifdef('_COOKIE', ["authentication", "method"]), # the method to store credentials (_COOKIE, _SESSION) |
|
55 | - "key" => ifdef('session_id', ["authentication", "key"]), # the key in the array to store credentials |
|
54 | + "method" => ifdef('_COOKIE', ["authentication", "method"]), # the method to store credentials (_COOKIE, _SESSION) |
|
55 | + "key" => ifdef('session_id', ["authentication", "key"]), # the key in the array to store credentials |
|
56 | 56 | /** AUTH TYPE: |
57 | 57 | * db_table: get credentials from a table in a database |
58 | 58 | * db_user: get credentials from database users (database authentication) |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * a database and checks the specified credentials. Theses will checked only if the AUTH TYPE is db_table. |
64 | 64 | */ |
65 | 65 | "gateway" => [ |
66 | - "entity" => "USER", # Table name (without prefix if exists) |
|
66 | + "entity" => "USER", # Table name (without prefix if exists) |
|
67 | 67 | /** CREDENTIALS: |
68 | 68 | * The field names of credentials in the table. |
69 | 69 | */ |
@@ -81,14 +81,14 @@ discard block |
||
81 | 81 | */ |
82 | 82 | "table_info" => [ |
83 | 83 | "columns" => [ |
84 | - "id_field" => "USER_ID", # often the primary key |
|
85 | - "state_field" => "USER_STATE_ID", # required if mail_checking is enabled |
|
84 | + "id_field" => "USER_ID", # often the primary key |
|
85 | + "state_field" => "USER_STATE_ID", # required if mail_checking is enabled |
|
86 | 86 | "email_field" => "EMAIL" # required registration process |
87 | 87 | ], |
88 | 88 | "column_values" => [ |
89 | 89 | "state_field" => [ |
90 | - "pending_email" => 1, # required if mail_checking is enabled |
|
91 | - "user_active" => 2, # required if mail_checking is enabled |
|
90 | + "pending_email" => 1, # required if mail_checking is enabled |
|
91 | + "user_active" => 2, # required if mail_checking is enabled |
|
92 | 92 | ] |
93 | 93 | ] |
94 | 94 | ] |
@@ -2,100 +2,100 @@ discard block |
||
2 | 2 | |
3 | 3 | if (!function_exists('ifdef')) |
4 | 4 | { |
5 | - function ifdef($value, Array $array) |
|
6 | - { |
|
7 | - $global = __DIR__ . '/../../../config/global.config.php'; |
|
5 | + function ifdef($value, Array $array) |
|
6 | + { |
|
7 | + $global = __DIR__ . '/../../../config/global.config.php'; |
|
8 | 8 | |
9 | - if (file_exists($global)) |
|
10 | - { |
|
11 | - $key = array_shift($array); |
|
12 | - $in = include $global; |
|
9 | + if (file_exists($global)) |
|
10 | + { |
|
11 | + $key = array_shift($array); |
|
12 | + $in = include $global; |
|
13 | 13 | |
14 | - do |
|
15 | - { |
|
16 | - if (is_array($in)) |
|
17 | - { |
|
18 | - if (array_key_exists($key, $in)) |
|
19 | - $in = $in[$key]; |
|
20 | - else |
|
21 | - return $value; |
|
22 | - } |
|
23 | - else |
|
24 | - return $value; |
|
14 | + do |
|
15 | + { |
|
16 | + if (is_array($in)) |
|
17 | + { |
|
18 | + if (array_key_exists($key, $in)) |
|
19 | + $in = $in[$key]; |
|
20 | + else |
|
21 | + return $value; |
|
22 | + } |
|
23 | + else |
|
24 | + return $value; |
|
25 | 25 | |
26 | - $key = ($array) ? array_shift($array) : NULL; |
|
26 | + $key = ($array) ? array_shift($array) : NULL; |
|
27 | 27 | |
28 | - if (!$key) |
|
29 | - return $in; |
|
28 | + if (!$key) |
|
29 | + return $in; |
|
30 | 30 | |
31 | - } while($key); |
|
32 | - } |
|
33 | - else |
|
34 | - return $value; |
|
35 | - } |
|
31 | + } while($key); |
|
32 | + } |
|
33 | + else |
|
34 | + return $value; |
|
35 | + } |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | return [ |
39 | - 'project' => [ |
|
40 | - 'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project |
|
41 | - ], |
|
42 | - 'mail' => [ |
|
39 | + 'project' => [ |
|
40 | + 'name' => ifdef('PROJECT NAME', ["project", "name"]), # The name of your project |
|
41 | + ], |
|
42 | + 'mail' => [ |
|
43 | 43 | /** CHECKING: |
44 | 44 | * If checking is enabled, the registering process will require e-mail verification. |
45 | 45 | * If checking is enabled, the user will log in after registering. |
46 | 46 | */ |
47 | - 'checking' => [ |
|
48 | - 'enabled' => "N", |
|
49 | - 'from' => ifdef('[email protected]', ["mail", "noreply"]) |
|
50 | - ], |
|
51 | - "host" => ifdef('localhost', ["mail", "host"]) |
|
52 | - ], |
|
53 | - "authentication" => [ |
|
54 | - "method" => ifdef('_COOKIE', ["authentication", "method"]), # the method to store credentials (_COOKIE, _SESSION) |
|
55 | - "key" => ifdef('session_id', ["authentication", "key"]), # the key in the array to store credentials |
|
47 | + 'checking' => [ |
|
48 | + 'enabled' => "N", |
|
49 | + 'from' => ifdef('[email protected]', ["mail", "noreply"]) |
|
50 | + ], |
|
51 | + "host" => ifdef('localhost', ["mail", "host"]) |
|
52 | + ], |
|
53 | + "authentication" => [ |
|
54 | + "method" => ifdef('_COOKIE', ["authentication", "method"]), # the method to store credentials (_COOKIE, _SESSION) |
|
55 | + "key" => ifdef('session_id', ["authentication", "key"]), # the key in the array to store credentials |
|
56 | 56 | /** AUTH TYPE: |
57 | 57 | * db_table: get credentials from a table in a database |
58 | 58 | * db_user: get credentials from database users (database authentication) |
59 | 59 | */ |
60 | - "type" => "db_table", |
|
60 | + "type" => "db_table", |
|
61 | 61 | /** DB GATEWAY: |
62 | 62 | * Gateway is used to connect to database. It consists in an entity that connects to |
63 | 63 | * a database and checks the specified credentials. Theses will checked only if the AUTH TYPE is db_table. |
64 | 64 | */ |
65 | - "gateway" => [ |
|
66 | - "entity" => "USER", # Table name (without prefix if exists) |
|
67 | - /** CREDENTIALS: |
|
68 | - * The field names of credentials in the table. |
|
69 | - */ |
|
70 | - "credentials" => [ |
|
71 | - "username" => "USERNAME", |
|
72 | - "password" => "USER_PASSWORD" |
|
73 | - ], |
|
65 | + "gateway" => [ |
|
66 | + "entity" => "USER", # Table name (without prefix if exists) |
|
67 | + /** CREDENTIALS: |
|
68 | + * The field names of credentials in the table. |
|
69 | + */ |
|
70 | + "credentials" => [ |
|
71 | + "username" => "USERNAME", |
|
72 | + "password" => "USER_PASSWORD" |
|
73 | + ], |
|
74 | 74 | |
75 | - // [TO DO] - Add validations for the following ... |
|
75 | + // [TO DO] - Add validations for the following ... |
|
76 | 76 | |
77 | 77 | |
78 | - /** TABLE INFO: |
|
79 | - * Other information may be required for abstraction. If mail_checking is not enabled, your must define |
|
80 | - * at least the id_field for the table. |
|
81 | - */ |
|
82 | - "table_info" => [ |
|
83 | - "columns" => [ |
|
84 | - "id_field" => "USER_ID", # often the primary key |
|
85 | - "state_field" => "USER_STATE_ID", # required if mail_checking is enabled |
|
86 | - "email_field" => "EMAIL" # required registration process |
|
87 | - ], |
|
88 | - "column_values" => [ |
|
89 | - "state_field" => [ |
|
90 | - "pending_email" => 1, # required if mail_checking is enabled |
|
91 | - "user_active" => 2, # required if mail_checking is enabled |
|
92 | - ] |
|
93 | - ] |
|
94 | - ] |
|
78 | + /** TABLE INFO: |
|
79 | + * Other information may be required for abstraction. If mail_checking is not enabled, your must define |
|
80 | + * at least the id_field for the table. |
|
81 | + */ |
|
82 | + "table_info" => [ |
|
83 | + "columns" => [ |
|
84 | + "id_field" => "USER_ID", # often the primary key |
|
85 | + "state_field" => "USER_STATE_ID", # required if mail_checking is enabled |
|
86 | + "email_field" => "EMAIL" # required registration process |
|
87 | + ], |
|
88 | + "column_values" => [ |
|
89 | + "state_field" => [ |
|
90 | + "pending_email" => 1, # required if mail_checking is enabled |
|
91 | + "user_active" => 2, # required if mail_checking is enabled |
|
92 | + ] |
|
93 | + ] |
|
94 | + ] |
|
95 | 95 | |
96 | 96 | |
97 | - ], |
|
98 | - ], |
|
97 | + ], |
|
98 | + ], |
|
99 | 99 | /** AUTHORIZATION: |
100 | 100 | * |
101 | 101 | * If authorization is enabled, after user registering someone must authorize the first login of a user. |
@@ -104,14 +104,14 @@ discard block |
||
104 | 104 | * |
105 | 105 | * If authorization is not enabled, users will log in after registration process without a previous authorization. |
106 | 106 | */ |
107 | - "authorization" => [ |
|
108 | - "enabled" => "N" |
|
109 | - ], |
|
110 | - "database" => [ |
|
111 | - /** TABLE PREFIX: |
|
112 | - * Database prefix of tables, specifically here, the prefix of entity gateway above. |
|
113 | - */ |
|
114 | - "prefix" => ifdef('APP', ["database", "prefix"]) |
|
115 | - ], |
|
116 | - "redirect" => "App" # the module that will be redirect to, after authentication |
|
107 | + "authorization" => [ |
|
108 | + "enabled" => "N" |
|
109 | + ], |
|
110 | + "database" => [ |
|
111 | + /** TABLE PREFIX: |
|
112 | + * Database prefix of tables, specifically here, the prefix of entity gateway above. |
|
113 | + */ |
|
114 | + "prefix" => ifdef('APP', ["database", "prefix"]) |
|
115 | + ], |
|
116 | + "redirect" => "App" # the module that will be redirect to, after authentication |
|
117 | 117 | ]; |
118 | 118 | \ No newline at end of file |
@@ -6,32 +6,32 @@ |
||
6 | 6 | |
7 | 7 | class Resource extends Entity |
8 | 8 | { |
9 | - /** |
|
10 | - * @var integer |
|
11 | - */ |
|
9 | + /** |
|
10 | + * @var integer |
|
11 | + */ |
|
12 | 12 | public $RESOURCE_ID; |
13 | 13 | |
14 | - /** |
|
15 | - * @var string |
|
16 | - */ |
|
14 | + /** |
|
15 | + * @var string |
|
16 | + */ |
|
17 | 17 | public $RESOURCE_NAME; |
18 | 18 | |
19 | - /** |
|
20 | - * @var string |
|
21 | - */ |
|
19 | + /** |
|
20 | + * @var string |
|
21 | + */ |
|
22 | 22 | public $STATE; |
23 | 23 | |
24 | - /** |
|
25 | - * @var date |
|
26 | - */ |
|
24 | + /** |
|
25 | + * @var date |
|
26 | + */ |
|
27 | 27 | public $RECORD_DATE; |
28 | 28 | |
29 | 29 | public function __construct($data = []) |
30 | 30 | { |
31 | - parent::__construct($data); |
|
31 | + parent::__construct($data); |
|
32 | 32 | |
33 | - $config = include 'module/Auth/config/user.config.php'; |
|
34 | - $prefix = $config["database"]["prefix"]; |
|
33 | + $config = include 'module/Auth/config/user.config.php'; |
|
34 | + $prefix = $config["database"]["prefix"]; |
|
35 | 35 | |
36 | 36 | $this->setTableName($prefix . "_" . "RESOURCE"); |
37 | 37 | } |