jens-maus / carddav2fb

lib/vCard-parser/write-test.php

Spacing +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
 
 	//$vCard = new vCard('Example3.0.vcf');
 
-	echo '<pre>'.$vCard.'</pre>';
+	echo '<pre>' . $vCard . '</pre>';
 ?>
\ No newline at end of file

lib/CardDAV-PHP/carddav.php

Spacing +40 added lines, -40 removed lines

@@ -208,7 +208,7 @@ 
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_ADD              = 1004;
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE           = 1005;
     const EXCEPTION_MALFORMED_XML_RESPONSE                  = 1006;
-    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID             = 1007;
+    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID = 1007;
 
 
     /**
@@ -219,7 +219,7 @@ 
      */
     public function __construct($url = null)
     {
-        if ($url !== null) {
+        if($url !== null) {
             $this->setUrl($url);
         }
     }
@@ -245,14 +245,14 @@ 
     {
         $this->url = $url;
 
-        if (substr($this->url, -1, 1) !== '/') {
+        if(substr($this->url, -1, 1) !== '/') {
             $this->url = $this->url . '/';
         }
 
         $this->url_parts = parse_url($this->url);
 
         // workaround for providers that don't use the default .vcf extension
-        if (strpos($this->url, "google.com"))
+        if(strpos($this->url, "google.com"))
         {
           $this->setVcardExtension("");
         }
@@ -335,11 +335,11 @@ 
         // DEBUG: print the response of the carddav-server
         //print_r($result);
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 200:
             case 207:
-                if ($raw === true) {
+                if($raw === true) {
                     return $result['response'];
                 } else {
                     return $this->simplify($result['response'], $include_vcards);
@@ -367,17 +367,17 @@ 
         // DEBUG: print the response of the carddav-server
         // print_r($result);
 
-	switch ($result['http_code'])
+	switch($result['http_code'])
         {
 		case 404:
-			$altResult  = $this->query($this->url . $vcard_id , 'GET');
+			$altResult = $this->query($this->url . $vcard_id, 'GET');
 		        // DEBUG: print the response of the carddav-server
 		        // print_r($altResult);
-	                switch ($altResult['http_code'])
+	                switch($altResult['http_code'])
         	        {
                 	        case 200:
 	                        case 207:
-					print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
+					print "Ignoring given Vcard Extension (" . $this->url_vcard_extension . ")" . PHP_EOL . ".";
 					$this->setVcardExtension("");
         	                        return $altResult['response'];
 	                }
@@ -425,7 +425,7 @@ 
 
         $result = $this->query($this->url, 'REPORT', $xml->outputMemory(), 'text/xml');
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 200:
             case 207:
@@ -458,7 +458,7 @@ 
     {
         $result = $this->query($this->url, 'OPTIONS');
 
-        if ($result['http_code'] === 200) {
+        if($result['http_code'] === 200) {
             return true;
         } else {
             return false;
@@ -488,7 +488,7 @@ 
     {
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'DELETE');
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 204:
                 return true;
@@ -509,8 +509,8 @@ 
      */
     public function add($vcard, $vcard_id = null)
     {
-        if ($vcard_id === null) {
-            $vcard_id   = $this->generateVcardId();
+        if($vcard_id === null) {
+            $vcard_id = $this->generateVcardId();
         }
         $vcard  = $this->cleanVcard($vcard);
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'PUT', $vcard, 'text/vcard');
@@ -538,7 +538,7 @@ 
     {
         try {
             return $this->add($vcard, $vcard_id);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception($e->getMessage(), self::EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE);
         }
     }
@@ -556,7 +556,7 @@ 
 
         try {
             $xml = new \SimpleXMLElement($response);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception(
                 "The XML response seems to be malformed and can't be simplified!",
                 self::EXCEPTION_MALFORMED_XML_RESPONSE,
@@ -571,33 +571,33 @@ 
         $simplified_xml->startDocument('1.0', 'utf-8');
             $simplified_xml->startElement('response');
 
-        if (!empty($xml->response)) {
-            foreach ($xml->response as $response) {
-              if ((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
+        if(!empty($xml->response)) {
+            foreach($xml->response as $response) {
+              if((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
                   !$response->propstat->prop->resourcetype->collection) {
                     $id = basename($response->href);
                     $id = str_replace($this->url_vcard_extension, null, $id);
 
                     try {
                         $vcardData = $this->getVcard($id);
-                        if (!empty($id)) {
+                        if(!empty($id)) {
                             $simplified_xml->startElement('element');
                                 $simplified_xml->writeElement('id', $id);
                                 $simplified_xml->writeElement('etag', str_replace('"', null, $response->propstat->prop->getetag));
                                 $simplified_xml->writeElement('last_modified', $response->propstat->prop->getlastmodified);
 
-                            if ($include_vcards === true) {
+                            if($include_vcards === true) {
                                 $simplified_xml->writeElement('vcard', $vcardData);
                             }
                             $simplified_xml->endElement();
                         }
-                    } catch (\Exception $e) {
+                    } catch(\Exception $e) {
                         print("Error fetching vCard: {$id}: {$e->getMessage()}\n");
                     }
-                } elseif (preg_match('/unix-directory/', $response->propstat->prop->getcontenttype)) {
-                    if (isset($response->propstat->prop->href)) {
+                } elseif(preg_match('/unix-directory/', $response->propstat->prop->getcontenttype)) {
+                    if(isset($response->propstat->prop->href)) {
                         $href = $response->propstat->prop->href;
-                    } elseif (isset($response->href)) {
+                    } elseif(isset($response->href)) {
                         $href = $response->href;
                     } else {
                         $href = null;
@@ -643,22 +643,22 @@ 
      */
     public function curlInit()
     {
-        if (empty($this->curl)) {
+        if(empty($this->curl)) {
             $this->curl = curl_init();
             curl_setopt($this->curl, CURLOPT_HEADER, true);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT.self::VERSION);
+            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT . self::VERSION);
 
-            if ($this->auth !== null) {
+            if($this->auth !== null) {
                 curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
                 curl_setopt($this->curl, CURLOPT_USERPWD, $this->auth);
             }
 
             /* allow to follow redirects if activated */
             curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, $this->follow_redirects);
-            if ($this->follow_redirects)
+            if($this->follow_redirects)
             {
               curl_setopt($this->curl, CURLOPT_MAXREDIRS, $this->follow_redirects_count);
             }
@@ -681,7 +681,7 @@ 
         curl_setopt($this->curl, CURLOPT_URL, $url);
         curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
 
-        if ($content !== null) {
+        if($content !== null) {
             curl_setopt($this->curl, CURLOPT_POST, true);
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, $content);
         } else {
@@ -689,8 +689,8 @@ 
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
         }
 
-        if ($content_type !== null) {
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type, 'Depth: 1'));
+        if($content_type !== null) {
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: ' . $content_type, 'Depth: 1'));
         } else {
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Depth: 1'));
         }
@@ -698,7 +698,7 @@ 
         $complete_response  = curl_exec($this->curl);
         $header_size        = curl_getinfo($this->curl, CURLINFO_HEADER_SIZE);
         $http_code          = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
-        $header                 = trim(substr($complete_response, 0, $header_size));
+        $header = trim(substr($complete_response, 0, $header_size));
         $response           = substr($complete_response, $header_size);
 
         $return = array(
@@ -706,7 +706,7 @@ 
             'http_code'         => $http_code
         );
 
-        if ($this->debug === true) {
+        if($this->debug === true) {
             $debug = $return;
             $debug['url']           = $url;
             $debug['method']        = $method;
@@ -728,8 +728,8 @@ 
     {
         $vcard_id = null;
 
-        for ($number = 0; $number <= 25; $number ++) {
-            if ($number == 8 || $number == 17) {
+        for($number = 0; $number <= 25; $number++) {
+            if($number == 8 || $number == 17) {
                 $vcard_id .= '-';
             } else {
                 $vcard_id .= $this->vcard_id_chars[mt_rand(0, (count($this->vcard_id_chars) - 1))];
@@ -742,12 +742,12 @@ 
 
             $result = $carddav->query($this->url . $vcard_id . $this->url_vcard_extension, 'GET');
 
-            if ($result['http_code'] !== 404) {
+            if($result['http_code'] !== 404) {
                 $vcard_id = $this->generateVcardId();
             }
 
             return $vcard_id;
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception($e->getMessage(), self::EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID);
         }
     }
@@ -760,7 +760,7 @@ 
      */
     public function __destruct()
     {
-        if (!empty($this->curl)) {
+        if(!empty($this->curl)) {
             curl_close($this->curl);
         }
     }

lib/fritzbox_api_php/fritzbox_tam_on_off.php

Spacing +6 added lines, -6 removed lines

@@ -25,13 +25,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if(isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (int)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables an answering machine (TAM) of a Fritz!Box
@@ -78,11 +78,11 @@ 
   $output = $fritz->doPostForm($formfields);
   
   preg_match('@name="tam:settings/TAM' . $tam . '/Active" value="([10])"@i', $output, $matches);
-  if (isset($matches[1]) && $matches[1] == $mode)
+  if(isset($matches[1]) && $matches[1] == $mode)
   {
     $message .= $mode == 1 ? 'TAM' . $tam . ' enabled' : 'TAM' . $tam . ' disabled';
   }
-  else if (isset($matches[1]))
+  else if(isset($matches[1]))
   {
     $message .= 'ERROR: TAM' . $tam . ' status change failed, should be ' . $mode . ', but is ' . $matches[1];
   }
@@ -91,13 +91,13 @@ 
     $message .= 'NOTICE: TAM' . $tam . ' status change could have failed, should be ' . $mode . ' now, but I don\'t now if it actually is. Check your check section in the script.';
   }
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

lib/fritzbox_api_php/fritzbox_guestwlan_on_off.php

Spacing +13 added lines, -13 removed lines

@@ -22,13 +22,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if(isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (bool)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables the WLAN guest access of a Fritz!Box
@@ -63,7 +63,7 @@ 
   
   // read down_time_activ setting
   preg_match('@name="down_time_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['down_time_activ'] = 'on';
   }
@@ -72,7 +72,7 @@ 
   $formfields['down_time_value'] = isset($matches[1]) ? $matches[1] : '15';
   // read disconnect_guest_access setting
   preg_match('@name="disconnect_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['disconnect_guest_access'] = 'on';
   }
@@ -90,10 +90,10 @@ 
   $formfields['wpa_modus'] = isset($matches[1]) ? $matches[1] : 'x';
   
   // set new given setting
-  if ( $mode == true )
+  if($mode == true)
   {
     $formfields['activate_guest_access'] = 'on';
-    if ( $wpa_key !== false )
+    if($wpa_key !== false)
     {
       $formfields['wpa_key'] = $wpa_key;
     }
@@ -104,34 +104,34 @@ 
   $output = $fritz->doPostForm($formfields);
 
   preg_match('@name="activate_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) && $mode == true )
+  if(isset($matches[1]) && $mode == true)
   {
 		preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
-		if ( isset($matches[1]) )
+		if(isset($matches[1]))
 		{
 			$message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
 		}
   }
-  else if ( !isset($matches[1]) && $mode == false )
+  else if(!isset($matches[1]) && $mode == false)
   {
     $message .= 'WLAN guest access is now inactive.';
   }
-  else if ( isset($matches[1]) && $mode == false )
+  else if(isset($matches[1]) && $mode == false)
   {
     $message .= 'ERROR: WLAN guest access status change failed, should be inactive, but is still active.';
   }
-  else if ( !isset($matches[1]) && $mode == true )
+  else if(!isset($matches[1]) && $mode == true)
   {
     $message .= 'ERROR: WLAN guest access status change failed, should be active, but is still inactive.';
   }
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

lib/fritzbox_api_php/fritzbox_guestlan_on_off.php

Spacing +12 added lines, -12 removed lines

@@ -23,13 +23,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if(isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (bool)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables the LAN4 guest access of a Fritz!Box
@@ -61,7 +61,7 @@ 
   
   // read time_server_activ setting
   preg_match('@name="time_server_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['time_server_activ'] = 'on';
   }
@@ -70,19 +70,19 @@ 
   $formfields['time_server'] = isset($matches[1]) ? $matches[1] : '0.europe.pool.ntp.org';
   // read other_prefix_allowed setting
   preg_match('@name="other_prefix_allowed"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['other_prefix_allowed'] = 'on';
   }
   // read dnsv6_server_activ setting
   preg_match('@name="dnsv6_server_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['dnsv6_server_activ'] = 'on';
   }
   
   // set new given setting
-  if ( $mode == true )
+  if($mode == true)
   {
     $formfields['guest_enabled'] = 'on';
   }
@@ -92,30 +92,30 @@ 
   $output = $fritz->doPostForm($formfields);
 
   preg_match('@name="guest_enabled"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) && $mode == true )
+  if(isset($matches[1]) && $mode == true)
   {
 		$message .= 'LAN4 guest access is now active.';
   }
-  else if ( !isset($matches[1]) && $mode == false )
+  else if(!isset($matches[1]) && $mode == false)
   {
     $message .= 'LAN4 guest access is now inactive.';
   }
-  else if ( isset($matches[1]) && $mode == false )
+  else if(isset($matches[1]) && $mode == false)
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be inactive, but is still active.';
   }
-  else if ( !isset($matches[1]) && $mode == true )
+  else if(!isset($matches[1]) && $mode == true)
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be active, but is still inactive.';
   }
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

lib/fritzbox_api_php/fritzbox_user.conf.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( !isset($this->config) )
+if(!isset($this->config))
 {
   die(__FILE__ . ' must not be called directly');
 }

lib/fritzbox_api_php/fritzbox_tam_swap.php

Spacing +2 added lines, -2 removed lines

@@ -38,13 +38,13 @@
   // this is based on 1 => 1, 2 => 10, 3 => 11, 4 => 100, 5 => 101, 6 => 110, 7 => 111
   $fritz->doPostForm($formfields);
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

lib/fritzbox_api_php/fritzbox_api.class.php

Spacing +47 added lines, -47 removed lines

@@ -63,39 +63,39 @@ 
     * 
     * @access public
     */
-  public function __construct($password = false,$user_name = false,$fritzbox_ip = 'fritz.box',$force_local_login = false)
+  public function __construct($password = false, $user_name = false, $fritzbox_ip = 'fritz.box', $force_local_login = false)
   {
 	// init the config object
 	$this->config = new fritzbox_api_config();
     
 	// try autoloading the config
-	if (file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php') ) {
+	if(file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php')) {
 		require_once(__DIR__ . '/fritzbox_user.conf.php');
 	}
 
 	// set FRITZ!Box-IP and URL
-	$this->config->setItem('fritzbox_ip',$fritzbox_ip);
+	$this->config->setItem('fritzbox_ip', $fritzbox_ip);
 
 	// check if login on local network (fritz.box) or via a dynamic DNS-host
-	if ($fritzbox_ip != 'fritz.box' && !$force_local_login) {
-		$this->config->setItem('enable_remote_config',true);
-		$this->config->setItem('remote_config_user',$user_name);
-		$this->config->setItem('remote_config_password',$password);
-		$this->config->setItem('fritzbox_url', 'https://'.$this->config->getItem('fritzbox_ip'));
+	if($fritzbox_ip != 'fritz.box' && !$force_local_login) {
+		$this->config->setItem('enable_remote_config', true);
+		$this->config->setItem('remote_config_user', $user_name);
+		$this->config->setItem('remote_config_password', $password);
+		$this->config->setItem('fritzbox_url', 'https://' . $this->config->getItem('fritzbox_ip'));
 	} else {
-		$this->config->setItem('enable_remote_config',false);
-		if($user_name != false){
-			$this->config->setItem('username',$user_name);
+		$this->config->setItem('enable_remote_config', false);
+		if($user_name != false) {
+			$this->config->setItem('username', $user_name);
 		}
-		if($password != false){
-			$this->config->setItem('password',$password);
+		if($password != false) {
+			$this->config->setItem('password', $password);
 		}
 		$this->config->setItem('fritzbox_url', 'http://' . $this->config->getItem('fritzbox_ip'));
 	}
 
 	// make some config consistency checks
-	if ( $this->config->getItem('enable_remote_config') === true ){
-		if ( !$this->config->getItem('remote_config_user') || !$this->config->getItem('remote_config_password') ){
+	if($this->config->getItem('enable_remote_config') === true) {
+		if(!$this->config->getItem('remote_config_user') || !$this->config->getItem('remote_config_password')) {
 		  $this->error('ERROR: Remote config mode enabled, but no username or no password provided');
 		}
 	}
@@ -129,7 +129,7 @@ 
   {
     $ch = curl_init();
 
-    if ( isset($formfields['getpage']) && strpos($formfields['getpage'], '.lua') > 0 )
+    if(isset($formfields['getpage']) && strpos($formfields['getpage'], '.lua') > 0)
     {
       curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . $formfields['getpage'] . '?sid=' . $this->sid);
       unset($formfields['getpage']);
@@ -137,7 +137,7 @@ 
     else
     {
       // add the sid, if it is already set
-      if ($this->sid != '0000000000000000')
+      if($this->sid != '0000000000000000')
       {
         $formfields['sid'] = $this->sid;
       }   
@@ -145,10 +145,10 @@ 
     }
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_POST, 1);
-    if ( $this->config->getItem('enable_remote_config') == true )
+    if($this->config->getItem('enable_remote_config') == true)
     {
 		// set name of SSL-certificate (must be same as remote-hostname (dynDNS) of FRITZ!Box) and remove port in address if alternate port is given
-		if (strpos($this->config->getItem('fritzbox_ip'),":")){
+		if(strpos($this->config->getItem('fritzbox_ip'), ":")) {
 			$ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
 			$ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
 		} else {
@@ -158,11 +158,11 @@ 
 		// set SSL-options and path to certificate
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 2);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-		curl_setopt($ch, CURLOPT_CAINFO, '/etc/ssl/certs/'.$ssl_cert_fritzbox.'.pem');
+		curl_setopt($ch, CURLOPT_CAINFO, '/etc/ssl/certs/' . $ssl_cert_fritzbox . '.pem');
 		curl_setopt($ch, CURLOPT_CAPATH, '/etc/ssl/certs');
 
 		// support for pre FRITZ!OS 5.50 remote config
-		if (!$this->config->getItem('use_lua_login_method')){
+		if(!$this->config->getItem('use_lua_login_method')) {
 		curl_setopt($ch, CURLOPT_USERPWD, $this->config->getItem('remote_config_user') . ':' . $this->config->getItem('remote_config_password'));
 		}
     }
@@ -177,7 +177,7 @@ 
     $ch = curl_init();
    
     // add the sid, if it is already set
-    if ($this->sid != '0000000000000000')
+    if($this->sid != '0000000000000000')
     {
 		// 'sid' MUST be the first POST variable!!! (otherwise it will not work!!)
 		// therfore we use array_merge to ensuere the foreach outputs 'sid' fist
@@ -192,13 +192,13 @@ 
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     
     // if filefileds not specified ('@/path/to/file.xml;type=text/xml' works fine)
-    if(empty( $filefileds )) {
+    if(empty($filefileds)) {
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $formfields); // http_build_query
 	} 
 	// post calculated raw data
 	else {
 		$header = $this->_create_custom_file_post_header($formfields, $filefileds);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
 			'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
 			);
 			
@@ -209,12 +209,12 @@ 
 
 	// curl error
 	if(curl_errno($ch)) {
-		$this->error(curl_error($ch)." (".curl_errno($ch).")");
+		$this->error(curl_error($ch) . " (" . curl_errno($ch) . ")");
 	}
 
     // finger out an error message, if given
     preg_match('@<p class="ErrorMsg">(.*?)</p>@is', $output, $matches);
-    if (isset($matches[1]))
+    if(isset($matches[1]))
     {
 		$this->error(str_replace('&nbsp;', ' ', $matches[1]));
     }
@@ -245,7 +245,7 @@ 
 		$data = '';
 
 		// populate normal fields first (simpler)
-		foreach ($postFields as $name => $content) {
+		foreach($postFields as $name => $content) {
 		   $data .= "--" . $delimiter . "\r\n";
 			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
 			$data .= "\r\n\r\n";
@@ -253,7 +253,7 @@ 
 			$data .= "\r\n";
 		}
 		// populate file fields
-		foreach ($fileFields as $name => $file) {
+		foreach($fileFields as $name => $file) {
 			$data .= "--" . $delimiter . "\r\n";
 			// "filename" attribute is not essential; server-side scripts may use it
 			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '";' .
@@ -283,13 +283,13 @@ 
   public function doGetRequest($params = array())
   {
     // add the sid, if it is already set
-    if ($this->sid != '0000000000000000')
+    if($this->sid != '0000000000000000')
     {
       $params['sid'] = $this->sid;
     }    
   
     $ch = curl_init();
-    if ( strpos($params['getpage'], '.lua') > 0 )
+    if(strpos($params['getpage'], '.lua') > 0)
     {
       $getpage = $params['getpage'] . '?';
       unset($params['getpage']);
@@ -301,13 +301,13 @@ 
     curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . $getpage . http_build_query($params));
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_HTTPGET, 1);
-    if ( $this->config->getItem('enable_remote_config') )
+    if($this->config->getItem('enable_remote_config'))
     {
       curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
       curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
       // support for pre FRITZ!OS 5.50 remote config
-      if ( !$this->config->getItem('use_lua_login_method') )
+      if(!$this->config->getItem('use_lua_login_method'))
       {
         curl_setopt($ch, CURLOPT_USERPWD, $this->config->getItem('remote_config_user') . ':' . $this->config->getItem('remote_config_password'));
       }
@@ -328,7 +328,7 @@ 
   protected function initSID()
   {
     // determine, wich login type we have to use
-    if ( $this->config->getItem('use_lua_login_method') == true )
+    if($this->config->getItem('use_lua_login_method') == true)
     {
       $loginpage = '/login_sid.lua';
     }
@@ -340,13 +340,13 @@ 
     // read the current status
     $session_status_simplexml = simplexml_load_string($this->doGetRequest(array('getpage' => $loginpage)));
     
-    if ( !is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement' )
+    if(!is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement')
     {
       $this->error('Response of initialization call ' . $loginpage . ' in ' . __FUNCTION__ . ' was not xml-formatted.');
     }
     
     // perhaps we already have a SID (i.e. when no password is set)
-    if ( $session_status_simplexml->SID != '0000000000000000' )
+    if($session_status_simplexml->SID != '0000000000000000')
     {
       return $session_status_simplexml->SID;
     }
@@ -360,16 +360,16 @@ 
       $formfields = array(
         'getpage' => $loginpage,
       );
-      if ( $this->config->getItem('use_lua_login_method') )
+      if($this->config->getItem('use_lua_login_method'))
       {
-        if ( $this->config->getItem('enable_remote_config') )
+        if($this->config->getItem('enable_remote_config'))
         {
           $formfields['username'] = $this->config->getItem('remote_config_user');
           $response = $challenge . '-' . md5(mb_convert_encoding($challenge . '-' . $this->config->getItem('remote_config_password'), "UCS-2LE", "UTF-8"));
         }
         else
         {
-          if ( $this->config->getItem('username') )
+          if($this->config->getItem('username'))
           {
             $formfields['username'] = $this->config->getItem('username');
           }
@@ -386,12 +386,12 @@ 
       
       // finger out the SID from the response
       $session_status_simplexml = simplexml_load_string($output);
-      if ( !is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement' )
+      if(!is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement')
       {
         $this->error('Response of login call to ' . $loginpage . ' in ' . __FUNCTION__ . ' was not xml-formatted.');
       }
       
-      if ( $session_status_simplexml->SID != '0000000000000000' )
+      if($session_status_simplexml->SID != '0000000000000000')
       {
         return (string)$session_status_simplexml->SID;
       }
@@ -409,7 +409,7 @@ 
     */
   protected function logout()
   {
-    if ( $this->config->getItem('use_lua_login_method') == true )
+    if($this->config->getItem('use_lua_login_method') == true)
     {
       $this->doGetRequest(array('getpage' => '/home/home.lua', 'logout' => '1'));
     }
@@ -452,22 +452,22 @@ 
     */
   public function logMessage($message)
   {
-    if ( $this->config->getItem('newline') == false )
+    if($this->config->getItem('newline') == false)
     {
       $this->config->setItem('newline', (PHP_OS == 'WINNT') ? "\r\n" : "\n");
     }
   
-    if ( $this->config->getItem('logging') == 'console' )
+    if($this->config->getItem('logging') == 'console')
     {
       echo $message;
     }
-    else if ( $this->config->getItem('logging') == 'silent' || $this->config->getItem('logging') == false )
+    else if($this->config->getItem('logging') == 'silent' || $this->config->getItem('logging') == false)
     {
       // do nothing
     }
     else
     {
-      if ( is_writable($this->config->getItem('logging')) || is_writable(dirname($this->config->getItem('logging'))) )
+      if(is_writable($this->config->getItem('logging')) || is_writable(dirname($this->config->getItem('logging'))))
       {
         file_put_contents($this->config->getItem('logging'), $message . $this->config->getItem('newline'), FILE_APPEND);
       }
@@ -517,11 +517,11 @@ 
    */
   public function getItem($item = 'all')
   {
-    if ( $item == 'all' )
+    if($item == 'all')
     {
       return $this->config;
     }
-    elseif ( isset($this->config[$item]) )
+    elseif(isset($this->config[$item]))
     {
       return $this->config[$item];
     }

lib/fritzbox_api_php/fritzbox_get_foncallslist_xml.php

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@ 
   // init the output message
   $message = date('Y-m-d H:i') . ' ';
   
-  if ( !$fritz->config->getItem('foncallslist_path') )
+  if(!$fritz->config->getItem('foncallslist_path'))
   {
     throw new Exception('Mandatory config Item foncallslist_path not set.');
   }
-  if ( ( file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path')) ) || ( !file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path'))) ) )
+  if((file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path'))) || (!file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path')))))
   {
     throw new Exception('Config item foncallslist_path (' . $fritz->config->getItem('foncallslist_path') . ') is not writeable.');
   }
@@ -54,13 +54,13 @@ 
   // set a log message
   $message .= 'Call list sucessfully downloaded';
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }