Passed
Push — master ( db71b9...272130 )
by Darío
04:27
created
module/Workarea/config/user.config.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -2,52 +2,52 @@
 block discarded – undo
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
-	"authentication" => [
43
-		"method"  => ifdef('_COOKIE', ["authentication", "method"]),		# the method to store credentials (_COOKIE, _SESSION)
44
-		"key"     => ifdef('session_id', ["authentication", "key"]),		# the key in the array to store credentials
45
-	],
46
-	"database" => [
47
-	    /** TABLE PREFIX:
48
-	     * Database prefix of tables, specifically here, the prefix of entity gateway above.
49
-	     */
50
-		"prefix" => ifdef('APP', ["database", "prefix"])
51
-	],
52
-	"redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
39
+    'project' => [
40
+        'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
41
+    ],
42
+    "authentication" => [
43
+        "method"  => ifdef('_COOKIE', ["authentication", "method"]),		# the method to store credentials (_COOKIE, _SESSION)
44
+        "key"     => ifdef('session_id', ["authentication", "key"]),		# the key in the array to store credentials
45
+    ],
46
+    "database" => [
47
+        /** TABLE PREFIX:
48
+         * Database prefix of tables, specifically here, the prefix of entity gateway above.
49
+         */
50
+        "prefix" => ifdef('APP', ["database", "prefix"])
51
+    ],
52
+    "redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
53 53
 ];
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
module/Connections/config/user.config.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -2,52 +2,52 @@
 block discarded – undo
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
-	"authentication" => [
43
-		"method"  => ifdef('_COOKIE', ["authentication", "method"]),		# the method to store credentials (_COOKIE, _SESSION)
44
-		"key"     => ifdef('session_id', ["authentication", "key"]),		# the key in the array to store credentials
45
-	],
46
-	"database" => [
47
-	    /** TABLE PREFIX:
48
-	     * Database prefix of tables, specifically here, the prefix of entity gateway above.
49
-	     */
50
-		"prefix" => ifdef('APP', ["database", "prefix"])
51
-	],
52
-	"redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
39
+    'project' => [
40
+        'name' => ifdef('PROJECT NAME', ["project", "name"]),			# The name of your project
41
+    ],
42
+    "authentication" => [
43
+        "method"  => ifdef('_COOKIE', ["authentication", "method"]),		# the method to store credentials (_COOKIE, _SESSION)
44
+        "key"     => ifdef('session_id', ["authentication", "key"]),		# the key in the array to store credentials
45
+    ],
46
+    "database" => [
47
+        /** TABLE PREFIX:
48
+         * Database prefix of tables, specifically here, the prefix of entity gateway above.
49
+         */
50
+        "prefix" => ifdef('APP', ["database", "prefix"])
51
+    ],
52
+    "redirect" => "Auth"			# where users will be redirect to if the they aren't logged in
53 53
 ];
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
module/Auth/config/user.config.php 1 patch
Indentation   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -2,100 +2,100 @@  discard block
 block discarded – undo
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
 block discarded – undo
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" => "Workarea"			# 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" => "Workarea"			# the module that will be redirect to, after authentication
117 117
 ];
118 118
\ No newline at end of file
Please login to merge, or discard this patch.
module/Auth/source/Model/Resource.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -6,32 +6,32 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
module/Auth/source/Model/UserRole.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@
 block discarded – undo
6 6
 
7 7
 class UserRole extends Entity
8 8
 {
9
-	/**
10
-	 * @var string
11
-	 */
9
+    /**
10
+     * @var string
11
+     */
12 12
     public $USER_ID;
13 13
 
14
-	/**
15
-	 * @var integer
16
-	 */
14
+    /**
15
+     * @var integer
16
+     */
17 17
     public $ROLE_ID;
18 18
 
19 19
     public function __construct($data = [])
Please login to merge, or discard this patch.
module/Auth/source/Model/User.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@  discard block
 block discarded – undo
6 6
 
7 7
 class User extends Entity
8 8
 {
9
-	/**
10
-	 * @var string
11
-	 */
9
+    /**
10
+     * @var string
11
+     */
12 12
     public $TOKEN;
13 13
 
14
-	/**
15
-	 * @var date
16
-	 */
14
+    /**
15
+     * @var date
16
+     */
17 17
     public $RECORD_DATE;
18 18
 
19 19
     public function __construct($data = [])
20 20
     {
21
-		$config = include 'module/Auth/config/user.config.php';
21
+        $config = include 'module/Auth/config/user.config.php';
22 22
 
23 23
         $username_str = $config["authentication"]["gateway"]["credentials"]["username"];
24 24
         $password_str = $config["authentication"]["gateway"]["credentials"]["password"];
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
             $this->{$field} = null;
32 32
         }
33 33
 
34
-    	parent::__construct($data);
34
+        parent::__construct($data);
35 35
 
36
-		$table  = $config["authentication"]["gateway"]["entity"];
37
-		$prefix = $config["database"]["prefix"];
36
+        $table  = $config["authentication"]["gateway"]["entity"];
37
+        $prefix = $config["database"]["prefix"];
38 38
 
39 39
         $this->setTableName($prefix . "_" . $table);
40 40
     }
Please login to merge, or discard this patch.
module/Auth/source/Model/Role.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -6,32 +6,32 @@
 block discarded – undo
6 6
 
7 7
 class Role extends Entity
8 8
 {
9
-	/**
10
-	 * @var integer
11
-	 */
9
+    /**
10
+     * @var integer
11
+     */
12 12
     public $ROLE_ID;
13 13
 
14
-	/**
15
-	 * @var string
16
-	 */
14
+    /**
15
+     * @var string
16
+     */
17 17
     public $ROLE_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 . "_" . "ROLE");
37 37
     }
Please login to merge, or discard this patch.
module/Auth/source/Model/DbUserRole.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
 
7 7
 class DbUserRole extends Entity
8 8
 {
9
-	/**
10
-	 * @var string
11
-	 */
9
+    /**
10
+     * @var string
11
+     */
12 12
     public $USERNAME;
13 13
 
14 14
     /**
Please login to merge, or discard this patch.
module/Auth/Module.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -202,8 +202,8 @@
 block discarded – undo
202 202
         $c->translator = new \Zend\Mvc\I18n\Translator($i18nTranslator);
203 203
     }
204 204
 
205
-	public function getUserConfig()
206
-	{
207
-		return include __DIR__ . "/config/user.config.php";
208
-	}
205
+    public function getUserConfig()
206
+    {
207
+        return include __DIR__ . "/config/user.config.php";
208
+    }
209 209
 }
210 210
\ No newline at end of file
Please login to merge, or discard this patch.