Stefanius67 / GContacts

ContactDetails.php

Spacing +14 added lines, -14 removed lines

@@ -228,9 +228,9 @@ 
     			<label class="ptype" for="gender">gender:</label>

     			<select id="gender" name="genders_0_value">

     				<option value=""></option>

-    				<option value="male"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'male' ? ' selected' : '';?>>male</option>

-    				<option value="female"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'female' ? ' selected' : '';?>>female</option>

-    				<option value="unspecified"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'unspecified' ? ' selected' : '';?>>unspecified</option>

+    				<option value="male"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'male' ? ' selected' : ''; ?>>male</option>

+    				<option value="female"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'female' ? ' selected' : ''; ?>>female</option>

+    				<option value="unspecified"<?php echo ($oContact['genders'][0]['value'] ?? '') == 'unspecified' ? ' selected' : ''; ?>>unspecified</option>

     			</select>

     			<br/>

 			</fieldset>

@@ -248,7 +248,7 @@ 
     echo '                <input type="tel" id="' . $strField . '" name="' . $strFieldName . '" value="' . ($aPhone['value'] ?? '') . '">' . PHP_EOL;

     echo '                <label class="ptype" for="' . $strType . '">type:</label>' . PHP_EOL;

     echo '                <input class="ptype" type="text" id="' . $strType . '" name="' . $strTypeName . '" value="' . ($aPhone['type'] ?? 'other') . '">' . PHP_EOL;

-    echo '                <input type="radio" name="phoneNumbers" value="' . ($i-1) . '"' . $strPrimary . '>&nbsp;primary phone' . PHP_EOL;

+    echo '                <input type="radio" name="phoneNumbers" value="' . ($i - 1) . '"' . $strPrimary . '>&nbsp;primary phone' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

 }

 ?>

@@ -267,7 +267,7 @@ 
     echo '                <input class="mail" type="text" id="' . $strField . '" name="' . $strFieldName . '" value="' . ($aMail['value'] ?? '') . '">' . PHP_EOL;

     echo '                <label class="ptype" for="' . $strType . '">type:</label>' . PHP_EOL;

     echo '                <input class="ptype" type="text" id="' . $strType . '" name="' . $strTypeName . '" value="' . ($aMail['type'] ?? 'other') . '">' . PHP_EOL;

-    echo '                <input type="radio" name="emailAddresses" value="' . ($i-1) . '"' . $strPrimary . '>&nbsp;primary email' . PHP_EOL;

+    echo '                <input type="radio" name="emailAddresses" value="' . ($i - 1) . '"' . $strPrimary . '>&nbsp;primary email' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

 }

 ?>

@@ -295,23 +295,23 @@ 
     }

     $strPrimary = $oContact->isPrimaryItem($aAdr) ? ' checked' : '';

     echo '                <label for="adrType' . $i . '">type:</label>' . PHP_EOL;

-    echo '                <input class="ptype" type="text" id="adrType' . $i . '" name="addresses_' . ($i-1) . '_type" value="' . ($aAdr['type'] ?? 'home') . '">' . PHP_EOL;

-    echo '                <input type="radio" name="addresses" value="' . ($i-1) . '"' . $strPrimary . '>&nbsp;primary address' . PHP_EOL;

+    echo '                <input class="ptype" type="text" id="adrType' . $i . '" name="addresses_' . ($i - 1) . '_type" value="' . ($aAdr['type'] ?? 'home') . '">' . PHP_EOL;

+    echo '                <input type="radio" name="addresses" value="' . ($i - 1) . '"' . $strPrimary . '>&nbsp;primary address' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

     echo '                <label for="adrStreet' . $i . '">adrStreet:</label>' . PHP_EOL;

-    echo '                <input class="city" type="text" id="adrStreet' . $i . '" name="addresses_' . ($i-1) . '_streetAddress" value="' . ($aAdr['streetAddress'] ?? '') . '">' . PHP_EOL;

-    echo '                <input class="ptype" type="text" id="extendedAddress' . $i . '" name="addresses_' . ($i-1) . '_extendedAddress" value="' . ($aAdr['extendedAddress'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="city" type="text" id="adrStreet' . $i . '" name="addresses_' . ($i - 1) . '_streetAddress" value="' . ($aAdr['streetAddress'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="ptype" type="text" id="extendedAddress' . $i . '" name="addresses_' . ($i - 1) . '_extendedAddress" value="' . ($aAdr['extendedAddress'] ?? '') . '">' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

     echo '                <label for="adrPostcode' . $i . '">adrPostcode/adrCity:</label>' . PHP_EOL;

-    echo '                <input class="ptype" type="text" id="adrPostcode' . $i . '" name="addresses_' . ($i-1) . '_postalCode" value="' . ($aAdr['postalCode'] ?? '') . '">' . PHP_EOL;

-    echo '                <input class="city" type="text" id="adrCity' . $i . '" name="addresses_' . ($i-1) . '_city" value="' . ($aAdr['city'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="ptype" type="text" id="adrPostcode' . $i . '" name="addresses_' . ($i - 1) . '_postalCode" value="' . ($aAdr['postalCode'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="city" type="text" id="adrCity' . $i . '" name="addresses_' . ($i - 1) . '_city" value="' . ($aAdr['city'] ?? '') . '">' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

     echo '                <label for="adrCountry' . $i . '">adrCountry/Code:</label>' . PHP_EOL;

-    echo '                <input class="city" type="text" id="adrCountry' . $i . '" name="addresses_' . ($i-1) . '_country" value="' . ($aAdr['country'] ?? '') . '">' . PHP_EOL;

-    echo '                <input class="ptype" type="text" id="adrCountryCode' . $i . '" name="addresses_' . ($i-1) . '_countryCode" value="' . ($aAdr['countryCode'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="city" type="text" id="adrCountry' . $i . '" name="addresses_' . ($i - 1) . '_country" value="' . ($aAdr['country'] ?? '') . '">' . PHP_EOL;

+    echo '                <input class="ptype" type="text" id="adrCountryCode' . $i . '" name="addresses_' . ($i - 1) . '_countryCode" value="' . ($aAdr['countryCode'] ?? '') . '">' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

     echo '                <label for="adrPOBox' . $i . '">adrPOBox:</label>' . PHP_EOL;

-    echo '                <input type="text" id="adrPOBox' . $i . '" name="addresses_' . ($i-1) . '_poBox" value="' . ($aAdr['poBox'] ?? '') . '">' . PHP_EOL;

+    echo '                <input type="text" id="adrPOBox' . $i . '" name="addresses_' . ($i - 1) . '_poBox" value="' . ($aAdr['poBox'] ?? '') . '">' . PHP_EOL;

     echo '                <br/>' . PHP_EOL;

 }

 ?>

displayApiError.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 function displayApiError(string $strAction, string $strResourceName, int $iResponseCode, string $strMessage, string $strStatus) : void
 {
-    $strHTML =<<<HTML
+    $strHTML = <<<HTML
         <html>
         <head>
         <style>

SKien/Google/GContacts.php

Spacing +5 added lines, -5 removed lines

@@ -34,10 +34,10 @@ 
     /** readonly access to the users contacts */

     public const CONTACTS_READONLY = "https://www.googleapis.com/auth/contacts.readonly";

     /** readonly access to the users other contacts */

-    public const CONTACTS_OTHER_READONLY ="https://www.googleapis.com/auth/contacts.other.readonly";

+    public const CONTACTS_OTHER_READONLY = "https://www.googleapis.com/auth/contacts.other.readonly";

 

     /**	Sort people by when they were changed; older entries first. */

-    public const SO_LAST_MODIFIED_ASCENDING ='LAST_MODIFIED_ASCENDING';

+    public const SO_LAST_MODIFIED_ASCENDING = 'LAST_MODIFIED_ASCENDING';

     /**	Sort people by when they were changed; newer entries first. */

     public const SO_LAST_MODIFIED_DESCENDING = 'LAST_MODIFIED_DESCENDING';

     /**	Sort people by first name. */

@@ -205,7 +205,7 @@ 
             'readMask' => implode(',', $this->aPersonFields),

             'pageSize' => ($this->iPageSize > self::SEARCH_MAX_PAGESIZE ? self::SEARCH_MAX_PAGESIZE : $this->iPageSize),

         ];

-        $strURI = 'https://people.googleapis.com/v1/people:searchContacts?' . http_build_query($aParams);;

+        $strURI = 'https://people.googleapis.com/v1/people:searchContacts?' . http_build_query($aParams); ;

 

         // 'warmup' request

         // Note from google documentation:

@@ -213,7 +213,7 @@ 
         // https://developers.google.com/people/v1/contacts#search_the_users_contacts

         $this->oClient->fetchJsonResponse($strURI, GClient::GET, $aHeader);

         $aParams['query'] = $strQuery;

-        $strURI = 'https://people.googleapis.com/v1/people:searchContacts?' . http_build_query($aParams);;

+        $strURI = 'https://people.googleapis.com/v1/people:searchContacts?' . http_build_query($aParams); ;

 

         $aContactList = false;

         if (($strResponse = $this->oClient->fetchJsonResponse($strURI, GClient::GET, $aHeader)) !== false) {

@@ -246,7 +246,7 @@ 
             'personFields' => implode(',', $this->aPersonFields),

         ];

 

-        $strURI = 'https://people.googleapis.com/v1/' . $strResourceName . '?' . http_build_query($aParams);;

+        $strURI = 'https://people.googleapis.com/v1/' . $strResourceName . '?' . http_build_query($aParams); ;

         $strResponse = $this->oClient->fetchJsonResponse($strURI, GClient::GET, $aHeader);

 

         $result = false;

SKien/Google/GClient.php

Spacing +3 added lines, -3 removed lines

@@ -521,7 +521,7 @@ 
             $this->strLastStatus = '';

         } else {

             $strError = substr($strResponse, $iHeaderSize);

-            if (strlen($strError) > 0)  {

+            if (strlen($strError) > 0) {

                 $aError = json_decode($strError, true);

                 if (isset($aError['error'])) {

                     $this->strLastError = $aError['error']['message'] ?? '';

@@ -558,11 +558,11 @@ 
     {

         $aHeader = [];

         $strHeader = trim($strHeader);

-        $aLine = explode("\n",$strHeader);

+        $aLine = explode("\n", $strHeader);

         $aHeader['status'] = $aLine[0];

         array_shift($aLine);

 

-        foreach($aLine as $strLine){

+        foreach ($aLine as $strLine) {

             // only consider the first colon, since other colons can also appear in

             // the header value - the rest of such a value would be lost

             // (eg "Location: https: // www ...." - "// www ...." would be gone !)

SKien/Google/GContact.php

Spacing +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
         }

         if ($iType == self::DT_UNIX_TIMESTAMP) {

             $result = $uxtsBirth;

-        } else if ($iType ==  self::DT_OBJECT) {

+        } else if ($iType == self::DT_OBJECT) {

             $dtBirth = null;

             if ($uxtsBirth > 0) {

                 $dtBirth = new \DateTime();