darki73 / FreedomCoreVKAPI

source/API/VKAPI.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * @throws VKException
      */
     protected function isAllowed($requiredPermission = null) {
-        if ($requiredPermission != null){
+        if ($requiredPermission != null) {
             try {
                 $isValidPermission = $this->VKObject->getPermissionsMask() & $requiredPermission;
                 if (!$isValidPermission) {

source/API/VKUsers.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         }
 
         $requestParameters = [
-            'user_ids'      =>  implode(',',$usersIDs),
+            'user_ids'      =>  implode(',', $usersIDs),
             'fields'        =>  $this->returnAllowedFields($requestFields),
             'name_case'     =>  $this->returnAllowedNC($nameCase)
         ];
@@ -175,7 +175,7 @@ 
         $allowedFields = [ 'photo_id', 'verified', 'sex', 'bdate', 'city', 'country', 'home_town', 'has_photo', 'photo_50', 'photo_100', 'photo_200_orig', 'photo_200', 'photo_400_orig', 'photo_max', 'photo_max_orig', 'online', 'lists', 'domain', 'has_mobile', 'contacts', 'site', 'education', 'universities', 'schools', 'status', 'last_seen', 'followers_count', 'common_count', 'occupation', 'nickname', 'relatives', 'relation', 'personal', 'connections', 'exports', 'wall_comments', 'activities', 'interests', 'music', 'movies', 'tv', 'books', 'games', 'about', 'quotes', 'can_post', 'can_see_all_posts', 'can_see_audio', 'can_write_private_message', 'can_send_friend_request', 'is_favorite', 'is_hidden_from_feed', 'timezone', 'screen_name', 'maiden_name', 'crop_photo', 'is_friend', 'friend_status', 'career', 'military', 'blacklisted', 'blacklisted_by_me' ];
         foreach ($fieldsArray as $fKey => $fValue) { 
             if (!in_array($fValue, $allowedFields)) { 
-                unset($fieldsArray[$fKey]); 
+                unset($fieldsArray[ $fKey ]); 
             }
         }
 
@@ -188,7 +188,7 @@ 
      * @return string
      */
     private function returnAllowedNC($ncValue) {
-        $allowedNameCases = ['nom', 'gen', 'dat', 'acc', 'ins', 'abl'];
+        $allowedNameCases = [ 'nom', 'gen', 'dat', 'acc', 'ins', 'abl' ];
         if (!in_array($ncValue, $allowedNameCases)) {
             $ncValue = 'nom';
         }

source/API/VKGroups.php

Spacing +19 added lines, -19 removed lines

@@ -61,9 +61,9 @@ 
         ];
 
         if (is_array($groupID)) {
-            $requestParameters['group_ids'] = implode(',', $groupID);
+            $requestParameters[ 'group_ids' ] = implode(',', $groupID);
         } else {
-            $requestParameters['group_id'] = $groupID;
+            $requestParameters[ 'group_id' ] = $groupID;
         }
 
         return parent::executeQuery(__FUNCTION__, $requestParameters);
@@ -78,14 +78,14 @@ 
      * @return mixed
      */
     public function get($userID, $isExtended = 0, $setFilter = null, $requestFields = self::defaultFields) {
-        $allowedFilterTypes = ['admin', 'editor', 'moder', 'groups', 'publics', 'events'];
+        $allowedFilterTypes = [ 'admin', 'editor', 'moder', 'groups', 'publics', 'events' ];
         $requestParameters = [
             'user_id'   =>  $userID,
             'extended'  =>  ($isExtended > 1 || $isExtended < 0) ? 0 : $isExtended,
             'fields'    =>  $this->getAllowedFields($requestFields)
         ];
         if ($setFilter != null && in_array($setFilter, $allowedFilterTypes)) { 
-            $requestParameters['filter'] = $setFilter; 
+            $requestParameters[ 'filter' ] = $setFilter; 
         }
 
         return parent::executeQuery(__FUNCTION__, $requestParameters);
@@ -113,10 +113,10 @@ 
      * @return mixed
      */
     public function join($groupID, $ifMeeting = null) {
-        $requestParameters['group_id'] = $groupID;
-        if ($ifMeeting != null){ 
+        $requestParameters[ 'group_id' ] = $groupID;
+        if ($ifMeeting != null) { 
             if ($ifMeeting == 1 || $ifMeeting == 0) { 
-                $requestParameters['not_sure']  =   $ifMeeting; 
+                $requestParameters[ 'not_sure' ] = $ifMeeting; 
             } 
         }
 
@@ -129,7 +129,7 @@ 
      * @return mixed
      */
     public function leave($groupID) {
-        $requestParameters['group_id'] = $groupID;
+        $requestParameters[ 'group_id' ] = $groupID;
 
         return parent::executeQuery(__FUNCTION__, $requestParameters);
     }
@@ -141,9 +141,9 @@ 
      * @return mixed
      */
     public function search($searchQuery, $groupType = null) {
-        $requestParameters['q'] = $searchQuery;
-        if ($groupType != null && in_array($groupType, ['group', 'page', 'event'])) { 
-            $requestParameters['type'] = $groupType; 
+        $requestParameters[ 'q' ] = $searchQuery;
+        if ($groupType != null && in_array($groupType, [ 'group', 'page', 'event' ])) { 
+            $requestParameters[ 'type' ] = $groupType; 
         }
 
         return parent::executeQuery(__FUNCTION__, $requestParameters);
@@ -155,7 +155,7 @@ 
      * @return mixed
      */
     public function getInvites($isExtended = 0) {
-        $requestParameters['extended'] = ($isExtended > 1 || $isExtended < 0) ? 0 : $isExtended;
+        $requestParameters[ 'extended' ] = ($isExtended > 1 || $isExtended < 0) ? 0 : $isExtended;
         return parent::executeQuery(__FUNCTION__, $requestParameters);
     }
 
@@ -215,7 +215,7 @@ 
      * @return mixed
      */
     public function getBanned($groupID) {
-        return parent::executeQuery(__FUNCTION__, ['group_id' => $groupID]);
+        return parent::executeQuery(__FUNCTION__, [ 'group_id' => $groupID ]);
     }
 
     /**
@@ -227,16 +227,16 @@ 
      * @return mixed
      */
     public function create($groupTitle, $groupDescription, $groupType = 'group', $subType = null) {
-        $allowedGroupTypes = ['group', 'event', 'public'];
+        $allowedGroupTypes = [ 'group', 'event', 'public' ];
         $requestParameters = [
             'title'     =>  $groupTitle,
             'type'      =>  (in_array($groupType, $allowedGroupTypes)) ? $groupType : 'group'
         ];
         if ($groupType != 'public') { 
-            $requestParameters['description'] = $groupDescription; 
+            $requestParameters[ 'description' ] = $groupDescription; 
         }
         if ($subType != null) { 
-            $requestParameters['subtype'] = ($subType > 4 || $subType < 1) ? 2 : $subType;
+            $requestParameters[ 'subtype' ] = ($subType > 4 || $subType < 1) ? 2 : $subType;
         }
 
         return parent::executeQuery(__FUNCTION__, $requestParameters);
@@ -272,7 +272,7 @@ 
      * @return mixed
      */
     public function getSettings($groupID) {
-        return parent::executeQuery(__FUNCTION__, ['group_id' => $groupID]);
+        return parent::executeQuery(__FUNCTION__, [ 'group_id' => $groupID ]);
     }
 
     /**
@@ -372,9 +372,9 @@ 
             'contacts'
         ];
 
-        foreach($fieldsArray as $fKey => $fValue) {
+        foreach ($fieldsArray as $fKey => $fValue) {
             if (!in_array($fValue, $groupsFields)) {
-                unset($fieldsArray[$fKey]);
+                unset($fieldsArray[ $fKey ]);
             }
         }
         return implode(',', $fieldsArray);

source/VKBase.php

Spacing +43 added lines, -43 removed lines

@@ -95,7 +95,7 @@ 
             if (!$this->isPermissionsMaskSet) {
                 $VKUser = new VKUsers($this);
                 $VKAccount = new VKAccount($this);
-                $CurrentUser = $VKUser->get([ '' ])[ 'response' ][0][ 'uid' ];
+                $CurrentUser = $VKUser->get([ '' ])[ 'response' ][ 0 ][ 'uid' ];
                 $this->setPermissionsMask($VKAccount->getAppPermissions($CurrentUser)[ 'response' ]);
                 $this->isPermissionsMaskSet = true;
                 unset($VKUser);
@@ -126,7 +126,7 @@ 
      * @return string
      */
     public function getAPIUrl($apiMethod, $responseFormat = 'json') {
-        return self::METHOD_URL . $apiMethod . '.' . $responseFormat;
+        return self::METHOD_URL.$apiMethod.'.'.$responseFormat;
     }
 
     /**
@@ -176,7 +176,7 @@ 
 
         try {
             if (isset($apiResponse[ 'error' ])) {
-                throw new VKException($apiResponse[ 'error' ] . (!isset($apiResponse[ 'error_description' ]) ?: ': ' . $apiResponse[ 'error_description' ]), '0');
+                throw new VKException($apiResponse[ 'error' ].(!isset($apiResponse[ 'error_description' ]) ?: ': '.$apiResponse[ 'error_description' ]), '0');
             } else {
                 $this->authorizationStatus = true;
                 $this->accessToken = $apiResponse[ 'access_token' ];
@@ -184,7 +184,7 @@ 
             }
         } catch (VKException $ex) {
             echo $ex->getMessage();
-            return [];
+            return [ ];
         }
     }
 
@@ -205,7 +205,7 @@ 
      * @param string $requestMethod
      * @return mixed
      */
-    public function apiQuery($apiMethod, $requestParameters = [], $resultType = 'array', $requestMethod = 'get') {
+    public function apiQuery($apiMethod, $requestParameters = [ ], $resultType = 'array', $requestMethod = 'get') {
         $requestParameters[ 'timestamp' ] = time();
         $requestParameters[ 'api_id' ]    = $this->applicationID;
         $requestParameters[ 'random' ]    = rand(0, 10000);
@@ -225,7 +225,7 @@ 
             if (is_array($pValue)) {
                 $pValue = implode(', ', $pValue);
             }
-            $parametersSignature .= $pKey . '=' . $pValue;
+            $parametersSignature .= $pKey.'='.$pValue;
         }
         $parametersSignature .= $this->APISecret;
 
@@ -244,9 +244,9 @@ 
             }
 
             return $resultType == 'array' ? $decodedJSON : $apiResponse;
-        } catch(VKException $ex) {
+        } catch (VKException $ex) {
             echo $ex->getMessage();
-            return [];
+            return [ ];
         }
     }
 
@@ -273,7 +273,7 @@ 
      * @return string
      */
     private function createURL($urlString, $parametersArray) {
-        $urlString .= '?' . http_build_query($parametersArray);
+        $urlString .= '?'.http_build_query($parametersArray);
         return $urlString;
     }
 
@@ -284,9 +284,9 @@ 
      * @param array $postFields
      * @return string
      */
-    private function performRequest($requestURL, $requestMethod = 'GET', $postFields = []) {
+    private function performRequest($requestURL, $requestMethod = 'GET', $postFields = [ ]) {
         curl_setopt_array($this->curlObject, [
-            CURLOPT_USERAGENT       =>  'FreedomCore/' . self::PACKAGE_VERSION . ' VK OAuth Client',
+            CURLOPT_USERAGENT       =>  'FreedomCore/'.self::PACKAGE_VERSION.' VK OAuth Client',
             CURLOPT_RETURNTRANSFER  => true,
             CURLOPT_SSL_VERIFYPEER  => false,
             CURLOPT_POST            => ($requestMethod == 'POST'),
@@ -341,42 +341,42 @@ 
      */
     private function codeToErrorText($Code) {
         $errorsData = [
-            1       =>  [ 'title' => 'Unknown error occurred',  'description' => 'Try again later.' ],
-            2       =>  [ 'title' => 'Application is disabled. Enable your application or use test mode ',  'description' => 'You need to switch on the app in Settings (https://vk.com/editapp?id={Your API_ID} or use the test mode (test_mode=1).' ],
-            3       =>  [ 'title' => 'Unknown method passed ',  'description' => 'Check the method name: <a href="http://vk.com/dev/methods" target="_blank">http://vk.com/dev/methods</a> ' ],
-            4       =>  [ 'title' => 'Incorrect signature ',  'description' => 'Check if the signature has been formed correctly: <a href="https://vk.com/dev/api_nohttps" target="_blank"></a>' ],
-            5       =>  [ 'title' => 'User authorization failed ',  'description' => 'Make sure that you use a correct authorization type. To work with the methods without a secureprefix you need to authorize a user with one of these ways:  http://vk.com/dev/auth_sites, http://vk.com/dev/auth_mobile.' ],
-            6       =>  [ 'title' => 'Too many requests per second ',  'description' => 'Decrease the request frequency or use the execute method. More details on frequency limits here: <a href="http://vk.com/dev/api_requests" target="_blank">http://vk.com/dev/api_requests</a>' ],
-            7       =>  [ 'title' => 'Permission to perform this action is denied ',  'description' => 'Make sure that your have received required permissions during the authorization. You can do it with the account.getAppPermissions method.' ],
-            8       =>  [ 'title' => 'Invalid request ',  'description' => 'Check the request syntax and used parameters list (it can be found on a method description page) ' ],
-            9       =>  [ 'title' => 'Flood control ',  'description' => 'You need to decrease the count of identical requests. For more efficient work you may use execute or JSONP.' ],
-            10      =>  [ 'title' => 'Internal server error',  'description' => 'Try again later.' ],
-            11      =>  [ 'title' => 'In test mode application should be disabled or user should be authorized',  'description' => 'Switch the app off in Settings: https://vk.com/editapp?id={Your API_ID}.' ],
-            14      =>  [ 'title' => 'Captcha needed ',  'description' => 'Work with this error is explained in detail on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>' ],
-            15      =>  [ 'title' => 'Access denied ',  'description' => 'Make sure that you use correct identifiers and the content is available for the user in the full version of the site.' ],
-            16      =>  [ 'title' => 'HTTP authorization failed',  'description' => 'To avoid this error check if a user has the \'Use secure connection\' option enabled with the account.getInfo method.' ],
-            17      =>  [ 'title' => 'Validation required ',  'description' => 'Make sure that you don\'t use a token received with http://vk.com/dev/auth_mobile for a request from the server. It\'s restricted. The validation process is described on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>.' ],
-            20      =>  [ 'title' => 'Permission to perform this action is denied for non-standalone applications ',  'description' => 'If you see this error despite your app has the Standalone type, make sure that you use redirect_uri=https://oauth.vk.com/blank.html. Details here: http://vk.com/dev/auth_mobile.' ],
-            21      =>  [ 'title' => 'Permission to perform this action is allowed only for Standalone and OpenAPI applications',  'description' => '' ],
-            23      =>  [ 'title' => 'This method was disabled ',  'description' => 'All the methods available now are listed here: <a href="http://vk.com/dev/methods" target="_blank">http://vk.com/dev/methods</a>' ],
-            24      =>  [ 'title' => 'Confirmation required ',  'description' => 'Confirmation process is described on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>' ],
-            100     =>  [ 'title' => 'One of the parameters specified was missing or invalid ',  'description' => 'Check the required parameters list and their format on a method description page.' ],
-            101     =>  [ 'title' => 'Invalid application API ID ',  'description' => 'Find the app in the administrated list in settings: <a href="http://vk.com/apps?act=settings" target="_blank">http://vk.com/apps?act=settings</a> And set the correct API_ID in the request.' ],
+            1       =>  [ 'title' => 'Unknown error occurred', 'description' => 'Try again later.' ],
+            2       =>  [ 'title' => 'Application is disabled. Enable your application or use test mode ', 'description' => 'You need to switch on the app in Settings (https://vk.com/editapp?id={Your API_ID} or use the test mode (test_mode=1).' ],
+            3       =>  [ 'title' => 'Unknown method passed ', 'description' => 'Check the method name: <a href="http://vk.com/dev/methods" target="_blank">http://vk.com/dev/methods</a> ' ],
+            4       =>  [ 'title' => 'Incorrect signature ', 'description' => 'Check if the signature has been formed correctly: <a href="https://vk.com/dev/api_nohttps" target="_blank"></a>' ],
+            5       =>  [ 'title' => 'User authorization failed ', 'description' => 'Make sure that you use a correct authorization type. To work with the methods without a secureprefix you need to authorize a user with one of these ways:  http://vk.com/dev/auth_sites, http://vk.com/dev/auth_mobile.' ],
+            6       =>  [ 'title' => 'Too many requests per second ', 'description' => 'Decrease the request frequency or use the execute method. More details on frequency limits here: <a href="http://vk.com/dev/api_requests" target="_blank">http://vk.com/dev/api_requests</a>' ],
+            7       =>  [ 'title' => 'Permission to perform this action is denied ', 'description' => 'Make sure that your have received required permissions during the authorization. You can do it with the account.getAppPermissions method.' ],
+            8       =>  [ 'title' => 'Invalid request ', 'description' => 'Check the request syntax and used parameters list (it can be found on a method description page) ' ],
+            9       =>  [ 'title' => 'Flood control ', 'description' => 'You need to decrease the count of identical requests. For more efficient work you may use execute or JSONP.' ],
+            10      =>  [ 'title' => 'Internal server error', 'description' => 'Try again later.' ],
+            11      =>  [ 'title' => 'In test mode application should be disabled or user should be authorized', 'description' => 'Switch the app off in Settings: https://vk.com/editapp?id={Your API_ID}.' ],
+            14      =>  [ 'title' => 'Captcha needed ', 'description' => 'Work with this error is explained in detail on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>' ],
+            15      =>  [ 'title' => 'Access denied ', 'description' => 'Make sure that you use correct identifiers and the content is available for the user in the full version of the site.' ],
+            16      =>  [ 'title' => 'HTTP authorization failed', 'description' => 'To avoid this error check if a user has the \'Use secure connection\' option enabled with the account.getInfo method.' ],
+            17      =>  [ 'title' => 'Validation required ', 'description' => 'Make sure that you don\'t use a token received with http://vk.com/dev/auth_mobile for a request from the server. It\'s restricted. The validation process is described on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>.' ],
+            20      =>  [ 'title' => 'Permission to perform this action is denied for non-standalone applications ', 'description' => 'If you see this error despite your app has the Standalone type, make sure that you use redirect_uri=https://oauth.vk.com/blank.html. Details here: http://vk.com/dev/auth_mobile.' ],
+            21      =>  [ 'title' => 'Permission to perform this action is allowed only for Standalone and OpenAPI applications', 'description' => '' ],
+            23      =>  [ 'title' => 'This method was disabled ', 'description' => 'All the methods available now are listed here: <a href="http://vk.com/dev/methods" target="_blank">http://vk.com/dev/methods</a>' ],
+            24      =>  [ 'title' => 'Confirmation required ', 'description' => 'Confirmation process is described on the <a href="https://vk.com/dev/need_confirmation" target="_blank">separate page</a>' ],
+            100     =>  [ 'title' => 'One of the parameters specified was missing or invalid ', 'description' => 'Check the required parameters list and their format on a method description page.' ],
+            101     =>  [ 'title' => 'Invalid application API ID ', 'description' => 'Find the app in the administrated list in settings: <a href="http://vk.com/apps?act=settings" target="_blank">http://vk.com/apps?act=settings</a> And set the correct API_ID in the request.' ],
             103     =>  [ 'title' => 'Out of limits', 'description' => 'Out of limits' ],
             104     =>  [ 'title' => 'Not found', 'description' => 'Not found' ],
-            113     =>  [ 'title' => 'Invalid user id ',  'description' => 'Make sure that you use a correct id. You can get an id using a screen name with the utils.resolveScreenName method' ],
-            150     =>  [ 'title' => 'Invalid timestamp ',  'description' => 'You may get a correct value with the utils.getServerTime method.' ],
-            200     =>  [ 'title' => 'Access to album denied ',  'description' => 'Make sure you use correct ids (owner_id is always positive for users, negative for communities) and the current user has access to the requested content in the full version of the site.' ],
-            201     =>  [ 'title' => 'Access to audio denied ',  'description' => 'Make sure you use correct ids (owner_id is always positive for users, negative for communities) and the current user has access to the requested content in the full version of the site.' ],
-            203     =>  [ 'title' => 'Access to group denied ',  'description' => 'Make sure that the current user is a member or admin of the community (for closed and private groups and events).' ],
-            300     =>  [ 'title' => 'This album is full ',  'description' => 'You need to delete the odd objects from the album or use another album.' ],
-            500     =>  [ 'title' => 'Permission denied. You must enable votes processing in application settings',  'description' => 'Check the app settings: http://vk.com/editapp?id={Your API_ID}&section=payments' ],
-            600     =>  [ 'title' => 'Permission denied. You have no access to operations specified with given object(s)',  'description' => '' ],
-            603     =>  [ 'title' => 'Some ads error occurred',  'description' => '' ],
-            1260    =>  [ 'title' => 'Invalid screen name',  'description' => 'This screen name is already in use or invalid' ],
+            113     =>  [ 'title' => 'Invalid user id ', 'description' => 'Make sure that you use a correct id. You can get an id using a screen name with the utils.resolveScreenName method' ],
+            150     =>  [ 'title' => 'Invalid timestamp ', 'description' => 'You may get a correct value with the utils.getServerTime method.' ],
+            200     =>  [ 'title' => 'Access to album denied ', 'description' => 'Make sure you use correct ids (owner_id is always positive for users, negative for communities) and the current user has access to the requested content in the full version of the site.' ],
+            201     =>  [ 'title' => 'Access to audio denied ', 'description' => 'Make sure you use correct ids (owner_id is always positive for users, negative for communities) and the current user has access to the requested content in the full version of the site.' ],
+            203     =>  [ 'title' => 'Access to group denied ', 'description' => 'Make sure that the current user is a member or admin of the community (for closed and private groups and events).' ],
+            300     =>  [ 'title' => 'This album is full ', 'description' => 'You need to delete the odd objects from the album or use another album.' ],
+            500     =>  [ 'title' => 'Permission denied. You must enable votes processing in application settings', 'description' => 'Check the app settings: http://vk.com/editapp?id={Your API_ID}&section=payments' ],
+            600     =>  [ 'title' => 'Permission denied. You have no access to operations specified with given object(s)', 'description' => '' ],
+            603     =>  [ 'title' => 'Some ads error occurred', 'description' => '' ],
+            1260    =>  [ 'title' => 'Invalid screen name', 'description' => 'This screen name is already in use or invalid' ],
         ];
 
-        return (!array_key_exists($Code, $errorsData)) ? $errorsData[1] : $errorsData[$Code];
+        return (!array_key_exists($Code, $errorsData)) ? $errorsData[ 1 ] : $errorsData[ $Code ];
     }
 
 }
\ No newline at end of file

source/API/VKAccount.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
         ];
         
         foreach ($filtersArray as $fKey => $fValue) { 
-            if(!in_array($fValue, $existingFilters)) {
+            if (!in_array($fValue, $existingFilters)) {
                 unset($filtersArray[ $fKey ]); 
             }
         }