darki73 / FreedomCoreVKAPI

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 ]); 
             }
         }