Browse Source

fixed php int max

tags/0.1.2
Robin Thoni 8 years ago
parent
commit
d9b0689fba

+ 22
- 0
src/Auth/Business/LuticateBusiness.php View File

50
         $user_id = "{user_id:$int}";
50
         $user_id = "{user_id:$int}";
51
         $permission_name = "{permission_name:$name}";
51
         $permission_name = "{permission_name:$name}";
52
         $permission_value = "{permission_value:$bool}";
52
         $permission_value = "{permission_value:$bool}";
53
+        $setting_name = "{setting_name:$name}";
53
 
54
 
54
         $route = LuRoute::getInstance();
55
         $route = LuRoute::getInstance();
55
 
56
 
135
         $route->post("$prefix/permissions/user/$user_id/$permission_name/edit/$permission_value",
136
         $route->post("$prefix/permissions/user/$user_id/$permission_name/edit/$permission_value",
136
             "${ns}LuticatePermissionsUsersController", "edit", array(LuticatePermissions::PERM_USER_EDIT,
137
             "${ns}LuticatePermissionsUsersController", "edit", array(LuticatePermissions::PERM_USER_EDIT,
137
                 LuticatePermissions::PERM_USER_GET));
138
                 LuticatePermissions::PERM_USER_GET));
139
+
140
+
141
+        $route->get("$prefix/settings/effective/$user_id/$setting_name", "${ns}LuticateSettingsController",
142
+            "getEffectiveSetting", LuticatePermissions::SETTING_EFFECTIVE_GET);
143
+        $route->get("$prefix/settings/effective/$user_id", "${ns}LuticateSettingsController",
144
+            "getAllEffectiveSetting", array(LuticatePermissions::SETTING_GET, LuticatePermissions::SETTING_EFFECTIVE_GET));
145
+        $route->get("$prefix/settings/effective/me/$setting_name", "${ns}LuticateSettingsController",
146
+            "getEffectiveSettingMe");
147
+        $route->get("$prefix/settings/effective/me", "${ns}LuticateSettingsController",
148
+            "getAllEffectiveSettingMe");
149
+
150
+        $route->get("$prefix/settings/$setting_name", "${ns}LuticateSettingsController", "get",
151
+            LuticatePermissions::SETTING_GET);
152
+        $route->get("$prefix/settings", "${ns}LuticateSettingsController", "getAll",
153
+            LuticatePermissions::SETTING_GET);
154
+        $route->post("$prefix/settings/add", "${ns}LuticateSettingsController",
155
+            "add", array(LuticatePermissions::SETTING_ADD, LuticatePermissions::SETTING_GET));
156
+        $route->post("$prefix/settings/$setting_name/del", "${ns}LuticateSettingsController", "del",
157
+            array(LuticatePermissions::SETTING_DEL, LuticatePermissions::SETTING_GET));
158
+        $route->post("$prefix/settings/$setting_name/edit", "${ns}LuticateSettingsController",
159
+            "edit", array(LuticatePermissions::SETTING_EDIT, LuticatePermissions::SETTING_GET));
138
     }
160
     }
139
 }
161
 }

+ 1
- 1
src/Auth/Business/LuticateGroupsBusiness.php View File

25
         return $group;
25
         return $group;
26
     }
26
     }
27
 
27
 
28
-    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
28
+    public static function getUsers($group_id, $page = 0, $perPage = 2000000000, $query = "")
29
     {
29
     {
30
         return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage, $query);
30
         return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage, $query);
31
     }
31
     }

+ 1
- 1
src/Auth/Business/LuticatePermissionsGroupsBusiness.php View File

21
         return LuticatePermissionsGroupsDataAccess::getByName($group_id, $permission_name);
21
         return LuticatePermissionsGroupsDataAccess::getByName($group_id, $permission_name);
22
     }
22
     }
23
 
23
 
24
-    public static function getAllByGroup($group_id, $page = 0, $perPage = PHP_INT_MAX)
24
+    public static function getAllByGroup($group_id, $page = 0, $perPage = 2000000000)
25
     {
25
     {
26
         $users = LuticatePermissionsGroupsDataAccess::getAllByGroup($group_id, $page, $perPage);
26
         $users = LuticatePermissionsGroupsDataAccess::getAllByGroup($group_id, $page, $perPage);
27
         return $users->map(function($user)
27
         return $users->map(function($user)

+ 1
- 1
src/Auth/Business/LuticatePermissionsUsersBusiness.php View File

21
         return LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
21
         return LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
22
     }
22
     }
23
 
23
 
24
-    public static function getAllByUser($user_id, $page = 0, $perPage = PHP_INT_MAX)
24
+    public static function getAllByUser($user_id, $page = 0, $perPage = 2000000000)
25
     {
25
     {
26
         $values = LuticatePermissionsUsersDataAccess::getAllByUser($user_id, $page, $perPage);
26
         $values = LuticatePermissionsUsersDataAccess::getAllByUser($user_id, $page, $perPage);
27
         $dbos = [];
27
         $dbos = [];

+ 1
- 1
src/Auth/Business/LuticateUsersBusiness.php View File

101
         return true;
101
         return true;
102
     }
102
     }
103
 
103
 
104
-    public static function getAllLight($page = 0, $perPage = PHP_INT_MAX, $query = "")
104
+    public static function getAllLight($page = 0, $perPage = 2000000000, $query = "")
105
     {
105
     {
106
         $users = self::getAll($page, $perPage, $query);
106
         $users = self::getAll($page, $perPage, $query);
107
         return $users->map(function($user)
107
         return $users->map(function($user)

+ 2
- 2
src/Auth/Controller/LuticateGroupsController.php View File

29
      * @param string $query The filter query
29
      * @param string $query The filter query
30
      * @return \Luticate\Utils\LuMultipleDbo
30
      * @return \Luticate\Utils\LuMultipleDbo
31
      */
31
      */
32
-    public function getAll($page = 0, $perPage = PHP_INT_MAX, $query = "")
32
+    public function getAll($page = 0, $perPage = 2000000000, $query = "")
33
     {
33
     {
34
         return LuticateGroupsBusiness::getAll($page, $perPage, $query);
34
         return LuticateGroupsBusiness::getAll($page, $perPage, $query);
35
     }
35
     }
42
      * @param string $query The filter query
42
      * @param string $query The filter query
43
      * @return \Luticate\Utils\LuMultipleDbo
43
      * @return \Luticate\Utils\LuMultipleDbo
44
      */
44
      */
45
-    public function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
45
+    public function getUsers($group_id, $page = 0, $perPage = 2000000000, $query = "")
46
     {
46
     {
47
         return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage, $query);
47
         return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage, $query);
48
     }
48
     }

+ 1
- 1
src/Auth/Controller/LuticatePermissionsController.php View File

72
      * @param string $query The filter query
72
      * @param string $query The filter query
73
      * @return \Luticate\Utils\LuMultipleDbo
73
      * @return \Luticate\Utils\LuMultipleDbo
74
      */
74
      */
75
-    public function getAll($page = 0, $perPage = PHP_INT_MAX, $query = "")
75
+    public function getAll($page = 0, $perPage = 2000000000, $query = "")
76
     {
76
     {
77
         return LuticatePermissionsBusiness::getAll($page, $perPage, $query);
77
         return LuticatePermissionsBusiness::getAll($page, $perPage, $query);
78
     }
78
     }

+ 1
- 1
src/Auth/Controller/LuticatePermissionsGroupsController.php View File

19
      * @param int $perPage The number of items per page
19
      * @param int $perPage The number of items per page
20
      * @return \Luticate\Utils\LuMultipleDbo
20
      * @return \Luticate\Utils\LuMultipleDbo
21
      */
21
      */
22
-    public function getAllByGroup($group_id, $page = 0, $perPage = PHP_INT_MAX)
22
+    public function getAllByGroup($group_id, $page = 0, $perPage = 2000000000)
23
     {
23
     {
24
         return LuticatePermissionsGroupsBusiness::getAllByGroup($group_id, $page, $perPage);
24
         return LuticatePermissionsGroupsBusiness::getAllByGroup($group_id, $page, $perPage);
25
     }
25
     }

+ 1
- 1
src/Auth/Controller/LuticatePermissionsUsersController.php View File

19
      * @param int $perPage The number of items per page
19
      * @param int $perPage The number of items per page
20
      * @return \Luticate\Utils\LuMultipleDbo
20
      * @return \Luticate\Utils\LuMultipleDbo
21
      */
21
      */
22
-    public function getAllByUser($user_id, $page = 0, $perPage = PHP_INT_MAX)
22
+    public function getAllByUser($user_id, $page = 0, $perPage = 2000000000)
23
     {
23
     {
24
         return LuticatePermissionsUsersBusiness::getAllByUser($user_id, $page, $perPage);
24
         return LuticatePermissionsUsersBusiness::getAllByUser($user_id, $page, $perPage);
25
     }
25
     }

+ 1
- 1
src/Auth/Controller/LuticateUsersController.php View File

60
      * @param string $query The filter query
60
      * @param string $query The filter query
61
      * @return array
61
      * @return array
62
      */
62
      */
63
-    public function getAllLight($page = 0, $perPage = PHP_INT_MAX, $query = "")
63
+    public function getAllLight($page = 0, $perPage = 2000000000, $query = "")
64
     {
64
     {
65
         return LuticateUsersBusiness::getAllLight($page, $perPage, $query);
65
         return LuticateUsersBusiness::getAllLight($page, $perPage, $query);
66
     }
66
     }

+ 6
- 0
src/Auth/DBO/LuticatePermissions.php View File

39
     const PERM_USER_ADD = "LU_PERM_USER_ADD";
39
     const PERM_USER_ADD = "LU_PERM_USER_ADD";
40
     const PERM_USER_EDIT = "LU_PERM_USER_EDIT";
40
     const PERM_USER_EDIT = "LU_PERM_USER_EDIT";
41
     const PERM_USER_DEL = "LU_PERM_USER_DEL";
41
     const PERM_USER_DEL = "LU_PERM_USER_DEL";
42
+
43
+    const SETTING_EFFECTIVE_GET = "LU_SETTING_EFFECTIVE_GET";
44
+    const SETTING_GET = "LU_SETTING_GET";
45
+    const SETTING_ADD = "LU_SETTING_ADD";
46
+    const SETTING_EDIT = "LU_SETTING_EDIT";
47
+    const SETTING_DEL = "LU_SETTING_DEL";
42
 }
48
 }

+ 1
- 1
src/Auth/DataAccess/LuticateGroupsDataAccess.php View File

37
         return $group->toDbo();
37
         return $group->toDbo();
38
     }
38
     }
39
 
39
 
40
-    public static function getUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
40
+    public static function getUsers($group_id, $page = 0, $perPage = 2000000000, $query = "")
41
     {
41
     {
42
         $model = LuticateUsers::/*where("luticate_users.username", "ilike", "%" . $query . "%")
42
         $model = LuticateUsers::/*where("luticate_users.username", "ilike", "%" . $query . "%")
43
             ->where("luticate_users.email", "ilike", "%" . $query . "%", "or")
43
             ->where("luticate_users.email", "ilike", "%" . $query . "%", "or")

+ 1
- 1
src/Auth/DataAccess/LuticatePermissionsGroupsDataAccess.php View File

18
         return LuticatePermissionsGroups::where("name", "=", $permission_name)->where("group_id", "=", $group_id)->first();
18
         return LuticatePermissionsGroups::where("name", "=", $permission_name)->where("group_id", "=", $group_id)->first();
19
     }
19
     }
20
 
20
 
21
-    public static function getAllByGroup($group_id, $page = 0, $perPage = PHP_INT_MAX)
21
+    public static function getAllByGroup($group_id, $page = 0, $perPage = 2000000000)
22
     {
22
     {
23
         return self::getMultiple(array(array('group_id', '=', $group_id)), array(array("name", "ASC")), $page, $perPage);
23
         return self::getMultiple(array(array('group_id', '=', $group_id)), array(array("name", "ASC")), $page, $perPage);
24
     }
24
     }

+ 1
- 1
src/Auth/DataAccess/LuticatePermissionsUsersDataAccess.php View File

18
         return LuticatePermissionsUsers::where("name", "=", $permission_name)->where("user_id", "=", $user_id)->first();
18
         return LuticatePermissionsUsers::where("name", "=", $permission_name)->where("user_id", "=", $user_id)->first();
19
     }
19
     }
20
 
20
 
21
-    public static function getAllByUser($user_id, $page = 0, $perPage = PHP_INT_MAX)
21
+    public static function getAllByUser($user_id, $page = 0, $perPage = 2000000000)
22
     {
22
     {
23
         return self::getMultiple(array(array('user_id', '=', $user_id)), array(array("name", "ASC")), $page, $perPage);
23
         return self::getMultiple(array(array('user_id', '=', $user_id)), array(array("name", "ASC")), $page, $perPage);
24
     }
24
     }

Loading…
Cancel
Save