jens-maus / carddav2fb

lib/CardDAV-PHP/carddav.php

Doc Comments +2 added lines, -2 removed lines

@@ -532,7 +532,7 @@ 
      *
      * @param   string  $vcard      vCard
      * @param   string  $vcard_id   vCard id on the CardDAV server
-     * @return  boolean
+     * @return  string
      */
     public function update($vcard, $vcard_id)
     {
@@ -672,7 +672,7 @@ 
      * @param   string  $method             HTTP method like (OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE)
      * @param   string  $content            Content for CardDAV queries
      * @param   string  $content_type       Set content type
-     * @return  array                       Raw CardDAV Response and http status code
+     * @return  boolean                       Raw CardDAV Response and http status code
      */
     private function query($url, $method, $content = null, $content_type = null)
     {

Indentation +44 added lines, -44 removed lines

@@ -143,17 +143,17 @@ 
     private $auth = null;
 
     /**
-    * Authentication: username
-    *
-    * @var  string
-    */
+     * Authentication: username
+     *
+     * @var  string
+     */
     private $username = null;
 
     /**
-    * Authentication: password
-    *
-    * @var  string
-    */
+     * Authentication: password
+     *
+     * @var  string
+     */
     private $password = null;
 
     /**
@@ -236,11 +236,11 @@ 
     }
 
     /**
-    * Sets the CardDAV server url
-    *
-    * @param    string  $url    CardDAV server url
-    * @return   void
-    */
+     * Sets the CardDAV server url
+     *
+     * @param    string  $url    CardDAV server url
+     * @return   void
+     */
     public function setUrl($url)
     {
         $this->url = $url;
@@ -354,11 +354,11 @@ 
     }
 
     /**
-    * Gets a clean vCard from the CardDAV server
-    *
-    * @param    string  $vcard_id   vCard id on the CardDAV server
-    * @return   string              vCard (text/vcard)
-    */
+     * Gets a clean vCard from the CardDAV server
+     *
+     * @param    string  $vcard_id   vCard id on the CardDAV server
+     * @return   string              vCard (text/vcard)
+     */
     public function getVcard($vcard_id)
     {
         $vcard_id   = str_replace($this->url_vcard_extension, null, $vcard_id);
@@ -367,29 +367,29 @@ 
         // 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');
-		        // DEBUG: print the response of the carddav-server
-		        // print_r($altResult);
-	                switch ($altResult['http_code'])
-        	        {
-                	        case 200:
-	                        case 207:
-					print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
-					$this->setVcardExtension("");
-        	                        return $altResult['response'];
-	                }
-		        throw new \Exception(
-		            "Woops, something's gone wrong! The CardDAV server returned the http status code {$result['http_code']}:{$result['response']}:{$vcard_id}.",
-		            self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD
-		        );
-
-		case 200:
-		case 207:
-			print ".";
-			return $result['response'];
+    case 404:
+      $altResult  = $this->query($this->url . $vcard_id , 'GET');
+            // DEBUG: print the response of the carddav-server
+            // print_r($altResult);
+                  switch ($altResult['http_code'])
+                  {
+                          case 200:
+                          case 207:
+          print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
+          $this->setVcardExtension("");
+                                  return $altResult['response'];
+                  }
+            throw new \Exception(
+                "Woops, something's gone wrong! The CardDAV server returned the http status code {$result['http_code']}:{$result['response']}:{$vcard_id}.",
+                self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD
+            );
+
+    case 200:
+    case 207:
+      print ".";
+      return $result['response'];
         }
 
         throw new \Exception(
@@ -450,10 +450,10 @@ 
     }
 
     /**
-    * Checks if the CardDAV server is reachable
-    *
-    * @return   boolean
-    */
+     * Checks if the CardDAV server is reachable
+     *
+     * @return   boolean
+     */
     public function checkConnection()
     {
         $result = $this->query($this->url, 'OPTIONS');

Spacing +9 added lines, -9 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;
 
 
     /**
@@ -370,14 +370,14 @@ 
 	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'])
         	        {
                 	        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'];
 	                }
@@ -510,12 +510,12 @@ 
     public function add($vcard, $vcard_id = null)
     {
         if ($vcard_id === null) {
-            $vcard_id   = $this->generateVcardId();
+            $vcard_id = $this->generateVcardId();
         }
         $vcard  = $this->cleanVcard($vcard);
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'PUT', $vcard, 'text/vcard');
 
-        switch($result['http_code'])
+        switch ($result['http_code'])
         {
             case 201:
                 return $vcard_id;
@@ -649,7 +649,7 @@ 
             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) {
                 curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
@@ -690,7 +690,7 @@ 
         }
 
         if ($content_type !== null) {
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type, 'Depth: 1'));
+            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(
@@ -728,7 +728,7 @@ 
     {
         $vcard_id = null;
 
-        for ($number = 0; $number <= 25; $number ++) {
+        for ($number = 0; $number <= 25; $number++) {
             if ($number == 8 || $number == 17) {
                 $vcard_id .= '-';
             } else {

lib/fritzbox_api_php/fritzbox_api.class.php

Doc Comments +4 added lines

@@ -533,6 +533,10 @@
    * @param  $item   string  the item to set
    * @param  $value  mixed   the value to store into the item
    */
+
+  /**
+   * @param string $item
+   */
   public function setItem($item, $value)
   {
     $this->config[$item] = $value;

Indentation +145 added lines, -145 removed lines

@@ -48,70 +48,70 @@ 
  */
 class fritzbox_api {
   /**
-    * @var  object  config object
-    */
+   * @var  object  config object
+   */
   public $config = array();
   
   /**
-    * @var  string  the session ID, set by method initSID() after login
-    */
+   * @var  string  the session ID, set by method initSID() after login
+   */
   protected $sid = '0000000000000000';
   
   
   /**
-    * the constructor, initializes the object and calls the login method
-    * 
-    * @access public
-    */
+   * the constructor, initializes the object and calls the login method
+   * 
+   * @access public
+   */
   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();
+  // 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') ) {
-		require_once(__DIR__ . '/fritzbox_user.conf.php');
-	}
+  // try autoloading the config
+  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);
+  // set FRITZ!Box-IP and URL
+  $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'));
-	} else {
-		$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);
-		}
-		$this->config->setItem('fritzbox_url', 'http://' . $this->config->getItem('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'));
+  } else {
+    $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);
+    }
+    $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') ){
-		  $this->error('ERROR: Remote config mode enabled, but no username or no password provided');
-		}
-	}
-	else {
-		$this->config->setItem('old_remote_config_user', null);
-		$this->config->setItem('old_remote_config_password', null);
-	}
-	$this->sid = $this->initSID();
+  // 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') ){
+      $this->error('ERROR: Remote config mode enabled, but no username or no password provided');
+    }
+  }
+  else {
+    $this->config->setItem('old_remote_config_user', null);
+    $this->config->setItem('old_remote_config_password', null);
+  }
+  $this->sid = $this->initSID();
   }
   
   
   /**
-    * the destructor just calls the logout method
-    * 
-    * @access public
-    */
+   * the destructor just calls the logout method
+   * 
+   * @access public
+   */
   public function __destruct()
   {
     $this->logout();
@@ -119,12 +119,12 @@ 
   
   
   /**
-    * do a POST request on the box
-    * the main cURL wrapper handles the command
-    * 
-    * @param  array  $formfields    an associative array with the POST fields to pass
-    * @return string                the raw HTML code returned by the Fritz!Box
-    */
+   * do a POST request on the box
+   * the main cURL wrapper handles the command
+   * 
+   * @param  array  $formfields    an associative array with the POST fields to pass
+   * @return string                the raw HTML code returned by the Fritz!Box
+   */
   public function doPostForm($formfields = array())
   {
     $ch = curl_init();
@@ -147,24 +147,24 @@ 
     curl_setopt($ch, CURLOPT_POST, 1);
     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'),":")){
-			$ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
-			$ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
-		} else {
-			$ssl_cert_fritzbox = $this->config->getItem('fritzbox_ip');
-		}
+    // 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'),":")){
+      $ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
+      $ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
+    } else {
+      $ssl_cert_fritzbox = $this->config->getItem('fritzbox_ip');
+    }
 
-		// 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_CAPATH, '/etc/ssl/certs');
+    // 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_CAPATH, '/etc/ssl/certs');
 
-		// support for pre FRITZ!OS 5.50 remote config
-		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'));
-		}
+    // support for pre FRITZ!OS 5.50 remote config
+    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'));
+    }
     }
     curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($formfields));
     $output = curl_exec($ch);
@@ -179,10 +179,10 @@ 
     // add the sid, if it is already set
     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
-		$formfields = array_merge(array('sid' => $this->sid), $formfields);
-		//$formfields['sid'] = $this->sid;
+    // 'sid' MUST be the first POST variable!!! (otherwise it will not work!!)
+    // therfore we use array_merge to ensuere the foreach outputs 'sid' fist
+    $formfields = array_merge(array('sid' => $this->sid), $formfields);
+    //$formfields['sid'] = $this->sid;
     }   
     curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . '/cgi-bin/firmwarecfg'); 
     curl_setopt($ch, CURLOPT_POST, 1);
@@ -193,30 +193,30 @@ 
     
     // if filefileds not specified ('@/path/to/file.xml;type=text/xml' works fine)
     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(
-			'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
-			);
+    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(
+      'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
+      );
 			
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $header['data']);		
-	}
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $header['data']);		
+  }
 	
     $output = curl_exec($ch);
 
-	// curl error
-	if(curl_errno($ch)) {
-		$this->error(curl_error($ch)." (".curl_errno($ch).")");
-	}
+  // curl error
+  if(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]))
     {
-		$this->error(str_replace('&nbsp;', ' ', $matches[1]));
+    $this->error(str_replace('&nbsp;', ' ', $matches[1]));
     }
 
     curl_close($ch);
@@ -224,10 +224,10 @@ 
   }
 
   private function _create_custom_file_post_header($postFields, $fileFields) {
-		// form field separator
-		$delimiter = '-------------' . uniqid();
+    // form field separator
+    $delimiter = '-------------' . uniqid();
 		
-		/*
+    /*
 		// file upload fields: name => array(type=>'mime/type',content=>'raw data')
 		$fileFields = array(
 			'file1' => array(
@@ -242,44 +242,44 @@ 
 		);
 		*/
 		
-		$data = '';
+    $data = '';
 
-		// populate normal fields first (simpler)
-		foreach ($postFields as $name => $content) {
-		   $data .= "--" . $delimiter . "\r\n";
-			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
-			$data .= "\r\n\r\n";
-			$data .= $content;
-			$data .= "\r\n";
-		}
-		// populate file fields
-		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) . '";' .
-					 ' filename="' . $file['filename'] . '"' . "\r\n";
+    // populate normal fields first (simpler)
+    foreach ($postFields as $name => $content) {
+        $data .= "--" . $delimiter . "\r\n";
+      $data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
+      $data .= "\r\n\r\n";
+      $data .= $content;
+      $data .= "\r\n";
+    }
+    // populate file fields
+    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) . '";' .
+            ' filename="' . $file['filename'] . '"' . "\r\n";
 					 
-			//$data .= 'Content-Transfer-Encoding: binary'."\r\n";
-			// this is, again, informative only; good practice to include though
-			$data .= 'Content-Type: ' . $file['type'] . "\r\n";
-			// this endline must be here to indicate end of headers
-			$data .= "\r\n";
-			// the file itself (note: there's no encoding of any kind)
-			$data .= $file['content'] . "\r\n";
-		}
-		// last delimiter
-		$data .= "--" . $delimiter . "--\r\n";
+      //$data .= 'Content-Transfer-Encoding: binary'."\r\n";
+      // this is, again, informative only; good practice to include though
+      $data .= 'Content-Type: ' . $file['type'] . "\r\n";
+      // this endline must be here to indicate end of headers
+      $data .= "\r\n";
+      // the file itself (note: there's no encoding of any kind)
+      $data .= $file['content'] . "\r\n";
+    }
+    // last delimiter
+    $data .= "--" . $delimiter . "--\r\n";
 	
-		return array('delimiter' => $delimiter, 'data' => $data);
-	}
+    return array('delimiter' => $delimiter, 'data' => $data);
+  }
   
   /**
-    * do a GET request on the box
-    * the main cURL wrapper handles the command
-    * 
-    * @param  array  $params    an associative array with the GET params to pass
-    * @return string            the raw HTML code returned by the Fritz!Box
-    */
+   * do a GET request on the box
+   * the main cURL wrapper handles the command
+   * 
+   * @param  array  $params    an associative array with the GET params to pass
+   * @return string            the raw HTML code returned by the Fritz!Box
+   */
   public function doGetRequest($params = array())
   {
     // add the sid, if it is already set
@@ -319,12 +319,12 @@ 
   
   
   /**
-    * the login method, handles the secured login-process
-    * newer firmwares (xx.04.74 and newer) need a challenge-response mechanism to prevent Cross-Site Request Forgery attacks
-    * see http://www.avm.de/de/Extern/Technical_Note_Session_ID.pdf for details
-    * 
-    * @return string                a valid SID, if the login was successful, otherwise throws an Exception with an error message
-    */
+   * the login method, handles the secured login-process
+   * newer firmwares (xx.04.74 and newer) need a challenge-response mechanism to prevent Cross-Site Request Forgery attacks
+   * see http://www.avm.de/de/Extern/Technical_Note_Session_ID.pdf for details
+   * 
+   * @return string                a valid SID, if the login was successful, otherwise throws an Exception with an error message
+   */
   protected function initSID()
   {
     // determine, wich login type we have to use
@@ -404,9 +404,9 @@ 
   
   
   /**
-    * the logout method just sends a logout command to the Fritz!Box
-    * 
-    */
+   * the logout method just sends a logout command to the Fritz!Box
+   * 
+   */
   protected function logout()
   {
     if ( $this->config->getItem('use_lua_login_method') == true )
@@ -425,10 +425,10 @@ 
   
   
   /**
-    * the error method just throws an Exception
-    * 
-    * @param  string   $message     an error message for the Exception
-    */
+   * the error method just throws an Exception
+   * 
+   * @param  string   $message     an error message for the Exception
+   */
   public function error($message = null)
   {
     throw new Exception($message);
@@ -436,20 +436,20 @@ 
   
   
   /**
-    * a getter for the session ID
-    * 
-    * @return string                $this->sid
-    */
+   * a getter for the session ID
+   * 
+   * @return string                $this->sid
+   */
   public function getSID()
   {
     return $this->sid;
   }
   
   /**
-    * log a message
-    * 
-    * @param  $message  string  the message to log
-    */
+   * log a message
+   * 
+   * @param  $message  string  the message to log
+   */
   public function logMessage($message)
   {
     if ( $this->config->getItem('newline') == false )

Spacing +41 added lines, -41 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'));
+		$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']);
@@ -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'));
 		}
     }
@@ -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']) )
 			);
 			
@@ -208,8 +208,8 @@ 
     $output = curl_exec($ch);
 
 	// curl error
-	if(curl_errno($ch)) {
-		$this->error(curl_error($ch)." (".curl_errno($ch).")");
+	if (curl_errno($ch)) {
+		$this->error(curl_error($ch) . " (" . curl_errno($ch) . ")");
 	}
 
     // finger out an error message, if given
@@ -289,7 +289,7 @@ 
     }    
   
     $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];
     }

Braces +12 added lines, -24 removed lines

@@ -98,8 +98,7 @@ 
 		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');
 		}
-	}
-	else {
+	} else {
 		$this->config->setItem('old_remote_config_user', null);
 		$this->config->setItem('old_remote_config_password', null);
 	}
@@ -133,8 +132,7 @@ 
     {
       curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . $formfields['getpage'] . '?sid=' . $this->sid);
       unset($formfields['getpage']);
-    }
-    else
+    } else
     {
       // add the sid, if it is already set
       if ($this->sid != '0000000000000000')
@@ -293,8 +291,7 @@ 
     {
       $getpage = $params['getpage'] . '?';
       unset($params['getpage']);
-    }
-    else
+    } else
     {
       $getpage = '/cgi-bin/webcm?';
     }
@@ -331,8 +328,7 @@ 
     if ( $this->config->getItem('use_lua_login_method') == true )
     {
       $loginpage = '/login_sid.lua';
-    }
-    else
+    } else
     {
       $loginpage = '../html/login_sid.xml';
     }
@@ -366,8 +362,7 @@ 
         {
           $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
+        } else
         {
           if ( $this->config->getItem('username') )
           {
@@ -376,8 +371,7 @@ 
           $response = $challenge . '-' . md5(mb_convert_encoding($challenge . '-' . $this->config->getItem('password'), "UCS-2LE", "UTF-8"));
         }
         $formfields['response'] = $response;
-      }
-      else
+      } else
       {
         $response = $challenge . '-' . md5(mb_convert_encoding($challenge . '-' . $this->config->getItem('password'), "UCS-2LE", "UTF-8"));
         $formfields['login:command/response'] = $response;
@@ -394,8 +388,7 @@ 
       if ( $session_status_simplexml->SID != '0000000000000000' )
       {
         return (string)$session_status_simplexml->SID;
-      }
-      else
+      } else
       {
         $this->error('ERROR: Login failed with an unknown response.');
       }
@@ -412,8 +405,7 @@ 
     if ( $this->config->getItem('use_lua_login_method') == true )
     {
       $this->doGetRequest(array('getpage' => '/home/home.lua', 'logout' => '1'));
-    }
-    else
+    } else
     {
       $formfields = array(
         'getpage'                 => '../html/de/menus/menu2.html',
@@ -460,18 +452,15 @@ 
     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
+    } else
     {
       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);
-      }
-      else
+      } else
       {
         echo('Error: Cannot log to non-writeable file or dir: ' . $this->config->getItem('logging'));
       }
@@ -520,8 +509,7 @@ 
     if ( $item == 'all' )
     {
       return $this->config;
-    }
-    elseif ( isset($this->config[$item]) )
+    } elseif ( isset($this->config[$item]) )
     {
       return $this->config[$item];
     }

carddav2fb.php

Indentation +5 added lines, -5 removed lines

@@ -615,7 +615,7 @@ 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
           }
           else
-           print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
+            print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
         }
         elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
         {
@@ -804,10 +804,10 @@ 
       );
 
       $filefileds = array('PhonebookImportFile' => array(
-       'type' => 'text/xml',
-       'filename' => 'updatepb.xml',
-       'content' => $this->fbxml,
-       )
+        'type' => 'text/xml',
+        'filename' => 'updatepb.xml',
+        'content' => $this->fbxml,
+        )
       );
 
       $raw_result =  $fritz->doPostFile($formfields, $filefileds);   // send the command

Doc Comments +7 added lines

@@ -133,6 +133,9 @@ 
     return $path;
   }
 
+  /**
+   * @param string $dir
+   */
   public function rmtemp($dir)
   {
     if(is_dir($dir))
@@ -177,6 +180,10 @@ 
     }
   }
 
+  /**
+   * @param string $inputfile
+   * @param string $outputfile
+   */
   public function base64_to_jpeg($inputfile, $outputfile)
   {
     // read data (binary)

Spacing +129 added lines, -129 removed lines

@@ -27,9 +27,9 @@ 
 
 // check for the minimum php version
 $php_min_version = '5.3.6';
-if(version_compare(PHP_VERSION, $php_min_version) < 0)
+if (version_compare(PHP_VERSION, $php_min_version) < 0)
 {
-  print 'ERROR: PHP version '.$php_min_version.' is required. Found version: ' . PHP_VERSION . PHP_EOL;
+  print 'ERROR: PHP version ' . $php_min_version . ' is required. Found version: ' . PHP_VERSION . PHP_EOL;
   exit(1);
 }
 
@@ -37,7 +37,7 @@ 
 require_once('lib/vCard-parser/vCard.php');
 require_once('lib/fritzbox_api_php/fritzbox_api.class.php');
 
-if($argc == 2)
+if ($argc == 2)
   $config_file_name = $argv[1];
 else
   $config_file_name = __DIR__ . '/config.php';
@@ -59,11 +59,11 @@ 
 $config['build_photos'] = true;
 $config['quickdial_keyword'] = 'Quickdial:';
 
-if(is_file($config_file_name))
+if (is_file($config_file_name))
   require($config_file_name);
 else
 {
-  print 'ERROR: No '.$config_file_name.' found, please take a look at config.example.php and create a '.$config_file_name.' file!'.PHP_EOL;
+  print 'ERROR: No ' . $config_file_name . ' found, please take a look at config.example.php and create a ' . $config_file_name . ' file!' . PHP_EOL;
   exit(1);
 }
 
@@ -119,14 +119,14 @@ 
   }
 
   // Source: https://php.net/manual/de/function.tempnam.php#61436
-  public function mktemp($dir, $prefix='', $mode=0700)
+  public function mktemp($dir, $prefix = '', $mode = 0700)
   {
-    if(substr($dir, -1) != '/')
+    if (substr($dir, -1) != '/')
       $dir .= '/';
 
     do
     {
-      $path = $dir.$prefix.mt_rand(0, 9999999);
+      $path = $dir . $prefix . mt_rand(0, 9999999);
     }
     while (!mkdir($path, $mode));
 
@@ -135,15 +135,15 @@ 
 
   public function rmtemp($dir)
   {
-    if(is_dir($dir))
+    if (is_dir($dir))
     {
       $objects = scandir($dir);
-      foreach($objects as $object)
+      foreach ($objects as $object)
       {
-        if($object != "." && $object != "..")
+        if ($object != "." && $object != "..")
         {
-          if(filetype($dir."/".$object) == "dir")
-            rrmdir($dir."/".$object); else unlink($dir."/".$object);
+          if (filetype($dir . "/" . $object) == "dir")
+            rrmdir($dir . "/" . $object); else unlink($dir . "/" . $object);
         }
       }
       reset($objects);
@@ -156,21 +156,21 @@ 
     try
     {
       // Check if there are valid base64 characters
-      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
+      if (!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
         return false;
 
       // Decode the string in strict mode and check the results
       $decoded = base64_decode($str, true);
-      if($decoded === false)
+      if ($decoded === false)
         return false;
 
       // Encode the string again
-      if(base64_encode($decoded) === $str)
+      if (base64_encode($decoded) === $str)
         return true;
       else
         return false;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
       // If exception is caught, then it is not a base64 encoded string
       return false;
@@ -199,9 +199,9 @@ 
     $imgseqfname = 1;
     $snum = 0;
 
-    if(is_array($this->config['carddav']))
+    if (is_array($this->config['carddav']))
     {
-      foreach($this->config['carddav'] as $conf)
+      foreach ($this->config['carddav'] as $conf)
       {
         print " [" . $snum . "]: " . $conf['url'] . " ";
         $carddav = new CardDavPHP\CardDavBackend($conf['url']);
@@ -209,23 +209,23 @@ 
 
         // set the vcard extension in case the user
         // defined it in the config
-        if(isset($conf['extension']))
+        if (isset($conf['extension']))
           $carddav->setVcardExtension($conf['extension']);
 
         // retrieve data from the CardDAV server now
-        $xmldata =  $carddav->get();
+        $xmldata = $carddav->get();
 
         // identify if we received UTF-8 encoded data from the
         // CardDAV server and if not reencode it since the FRITZ!Box
         // requires UTF-8 encoded data
-        if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata)
+        if (iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata)
           $xmldata = utf8_encode($xmldata);
 
         // read raw_vcard data from xml response
         $raw_vcards = array();
         $xmlvcard = new SimpleXMLElement($xmldata);
 
-        foreach($xmlvcard->element as $vcard_element)
+        foreach ($xmlvcard->element as $vcard_element)
         {
           $id = $vcard_element->id->__toString();
           $value = (string)$vcard_element->vcard->__toString();
@@ -236,14 +236,14 @@ 
 
         // parse raw_vcards
         $quick_dial_arr = array();
-        foreach($raw_vcards as $v)
+        foreach ($raw_vcards as $v)
         {
           $vcard_obj = new vCard(false, $v);
           $name_arr = null;
-          if(isset($vcard_obj->n[0]))
+          if (isset($vcard_obj->n[0]))
             $name_arr = $vcard_obj->n[0];
           $org_arr = null;
-          if(isset($vcard_obj->org[0]))
+          if (isset($vcard_obj->org[0]))
             $org_arr = $vcard_obj->org[0];
           $addnames = '';
           $prefix = '';
@@ -251,16 +251,16 @@ 
           $orgname = '';
 
           // Build name Parts if existing ans switch to true in config
-          if(isset($name_arr['prefixes']) AND $this->config['prefix'])
+          if (isset($name_arr['prefixes']) AND $this->config['prefix'])
             $prefix = trim($name_arr['prefixes']);
 
-          if(isset($name_arr['suffixes']) AND $this->config['suffix'])
+          if (isset($name_arr['suffixes']) AND $this->config['suffix'])
             $suffix = trim($name_arr['suffixes']);
 
-          if(isset($name_arr['additionalnames']) AND $this->config['addnames'])
+          if (isset($name_arr['additionalnames']) AND $this->config['addnames'])
             $addnames = trim($name_arr['additionalnames']);
 
-          if(isset($org_arr['name']) AND $this->config['orgname'])
+          if (isset($org_arr['name']) AND $this->config['orgname'])
             $orgname = trim($org_arr['name']);
 
           $firstname = trim($name_arr['firstname']);
@@ -280,13 +280,13 @@ 
           $format = $this->config['fullname_format'];
 
           // Prefix
-          if(!empty($prefix))
+          if (!empty($prefix))
             $name .= $prefix;
 
-          if($format == 0)
+          if ($format == 0)
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
+            if (!empty($name) AND !empty($lastname))
               $name .= ' ' . $lastname;
             else
               $name .= $lastname;
@@ -294,25 +294,25 @@ 
           else
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
+            if (!empty($name) AND !empty($firstname))
               $name .= ' ' . $firstname;
             else
               $name .= $firstname;
           }
 
-          if($format == 2)
+          if ($format == 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
+            if (!empty($name) AND !empty($addnames))
               $name .= ' ' . $addnames;
             else
               $name .= $addnames;
           }
 
-          if($format == 0)
+          if ($format == 0)
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
+            if (!empty($name) AND !empty($firstname))
               $name .= ', ' . $firstname;
             else
               $name .= $firstname;
@@ -320,29 +320,29 @@ 
           else
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
+            if (!empty($name) AND !empty($lastname))
               $name .= ' ' . $lastname;
             else
               $name .= $lastname;
           }
 
-          if($format != 2)
+          if ($format != 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
+            if (!empty($name) AND !empty($addnames))
               $name .= ' ' . $addnames;
             else
               $name .= $addnames;
           }
 
           // Suffix
-          if(!empty($name) AND !empty($suffix))
+          if (!empty($name) AND !empty($suffix))
             $name .= ' ' . $suffix;
           else
             $name .= $suffix;
 
           // OrgName
-          if(!empty($name) AND !empty($orgname))
+          if (!empty($name) AND !empty($orgname))
             $name .= ' (' . $orgname . ')';
           else
             $name .= $orgname;
@@ -350,24 +350,24 @@ 
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
 
-          if(empty($name))
+          if (empty($name))
           {
             print '  WARNING: No fullname, lastname or orgname found!';
             $name = 'UNKNOWN';
           }
 
           // format filename of contact photo; remove special letters, added config option for sequential filnames default is false
-          if($vcard_obj->photo)
+          if ($vcard_obj->photo)
           {
-            if(isset($this->config['seq_photo_name']) AND $this->config['seq_photo_name'] == true)
+            if (isset($this->config['seq_photo_name']) AND $this->config['seq_photo_name'] == true)
             {
               $photo = $imgseqfname;
               $imgseqfname++;
             }
             else
             {
-              $photo = str_replace(array(',','&',' ','/','ä','ö','ü','Ä','Ö','Ü','ß','á','à','ó','ò','ú','ù','í','ø'),
-              array('','_','_','_','ae','oe','ue','Ae','Oe','Ue','ss','a','a','o','o','u','u','i','oe'),$name);
+              $photo = str_replace(array(',', '&', ' ', '/', 'ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß', 'á', 'à', 'ó', 'ò', 'ú', 'ù', 'í', 'ø'),
+              array('', '_', '_', '_', 'ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss', 'a', 'a', 'o', 'o', 'u', 'u', 'i', 'oe'), $name);
             }
           }
           else
@@ -375,25 +375,25 @@ 
 
           // phone
           $phone_no = array();
-          if($vcard_obj->categories)
+          if ($vcard_obj->categories)
             $categories = $vcard_obj->categories[0];
           else
             $categories = array();
 
           // check for quickdial entry
-          if(isset($vcard_obj->note[0]))
+          if (isset($vcard_obj->note[0]))
           {
             $note = $vcard_obj->note[0];
             $notes = explode($this->config['quickdial_keyword'], $note);
-            foreach($notes as $linenr => $linecontent)
+            foreach ($notes as $linenr => $linecontent)
             {
-              $found = strrpos($linecontent , ":**7");
-              if($found > 0)
+              $found = strrpos($linecontent, ":**7");
+              if ($found > 0)
               {
-                $pos_qd_start = strrpos($linecontent , ":**7" );
-                $quick_dial_for_nr = preg_replace("/[^0-9+]/", "",substr($linecontent , 0, $pos_qd_start));
-                $quick_dial_nr = intval(substr($linecontent , $pos_qd_start+4, 3));
-                $quick_dial_arr[$quick_dial_for_nr]=$quick_dial_nr;
+                $pos_qd_start = strrpos($linecontent, ":**7");
+                $quick_dial_for_nr = preg_replace("/[^0-9+]/", "", substr($linecontent, 0, $pos_qd_start));
+                $quick_dial_nr = intval(substr($linecontent, $pos_qd_start + 4, 3));
+                $quick_dial_arr[$quick_dial_for_nr] = $quick_dial_nr;
               }
             }
           }
@@ -402,12 +402,12 @@ 
           $email_add = array();
           $vip = isset($this->config['group_vip']) && in_array((string)$this->config['group_vip'], $categories);
 
-          if(array_key_exists('group_filter',$this->config) && is_array($this->config['group_filter']))
+          if (array_key_exists('group_filter', $this->config) && is_array($this->config['group_filter']))
           {
             $add_entry = 0;
-            foreach($this->config['group_filter'] as $group_filter)
+            foreach ($this->config['group_filter'] as $group_filter)
             {
-              if(in_array($group_filter,$categories))
+              if (in_array($group_filter, $categories))
               {
                 $add_entry = 1;
                 break;
@@ -417,14 +417,14 @@ 
           else
             $add_entry = 1;
 
-          if($add_entry == 1)
+          if ($add_entry == 1)
           {
-            foreach($vcard_obj->tel as $t)
+            foreach ($vcard_obj->tel as $t)
             {
               $prio = 0;
-              $quickdial =null;
+              $quickdial = null;
               
-              if(!is_array($t) || empty($t['type']))
+              if (!is_array($t) || empty($t['type']))
               {
                 $type = "mobile";
                 $phone_number = $t;
@@ -433,15 +433,15 @@ 
               {
                 $phone_number = $t['value'];
                 
-                $phone_number_clean = preg_replace("/[^0-9+]/", "",$phone_number);
-                foreach($quick_dial_arr as $qd_phone_nr => $value)
+                $phone_number_clean = preg_replace("/[^0-9+]/", "", $phone_number);
+                foreach ($quick_dial_arr as $qd_phone_nr => $value)
                 {
-                  if($qd_phone_nr == $phone_number_clean)
+                  if ($qd_phone_nr == $phone_number_clean)
                   {
                     //Set quickdial
-                    if($value == 1)
+                    if ($value == 1)
                       print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
-                    elseif($value >= 100)
+                    elseif ($value >= 100)
                       print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
 
                     $quickdial = $value;
@@ -451,34 +451,34 @@ 
                 $typearr_lower = unserialize(strtolower(serialize($t['type'])));
 
                 // find out priority
-                if(in_array("pref", $typearr_lower))
+                if (in_array("pref", $typearr_lower))
                   $prio = 1;
 
                 // set the proper type
-                if(in_array("cell", $typearr_lower))
+                if (in_array("cell", $typearr_lower))
                   $type = "mobile";
-                elseif(in_array("home", $typearr_lower))
+                elseif (in_array("home", $typearr_lower))
                   $type = "home";
-                elseif(in_array("fax", $typearr_lower))
+                elseif (in_array("fax", $typearr_lower))
                   $type = "fax_work";
-                elseif(in_array("work", $typearr_lower))
+                elseif (in_array("work", $typearr_lower))
                   $type = "work";
-                elseif(in_array("other", $typearr_lower))
+                elseif (in_array("other", $typearr_lower))
                   $type = "other";
-                elseif(in_array("dom", $typearr_lower))
+                elseif (in_array("dom", $typearr_lower))
                   $type = "other";
                 else
                   continue;
               }
-              $phone_no[] =  array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
+              $phone_no[] = array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
             }
 
             // request email address and type
-            if($vcard_obj->email)
+            if ($vcard_obj->email)
             {
-              foreach($vcard_obj->email as $e)
+              foreach ($vcard_obj->email as $e)
               {
-                if(empty($e['type']))
+                if (empty($e['type']))
                 {
                   $type_email = "work";
                   $email = $e;
@@ -487,11 +487,11 @@ 
                 {
                   $email = $e['value'];
                   $typearr_lower = unserialize(strtolower(serialize($e['type'])));
-                  if(in_array("work", $typearr_lower))
+                  if (in_array("work", $typearr_lower))
                     $type_email = "work";
-                  elseif(in_array("home", $typearr_lower))
+                  elseif (in_array("home", $typearr_lower))
                     $type_email = "home";
-                  elseif(in_array("other", $typearr_lower))
+                  elseif (in_array("other", $typearr_lower))
                     $type_email = "other";
                   else
                     continue;
@@ -521,15 +521,15 @@ 
 
   public function build_fb_xml()
   {
-    if(empty($this->entries))
+    if (empty($this->entries))
       throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!');
 
     // create FB XML in utf-8 format
     $root = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><phonebooks><phonebook></phonebook></phonebooks>');
     $pb = $root->phonebook;
-    $pb->addAttribute("name",$this->config['phonebook_name']);
+    $pb->addAttribute("name", $this->config['phonebook_name']);
 
-    foreach($this->entries as $entry)
+    foreach ($this->entries as $entry)
     {
       $contact = $pb->addChild("contact");
       $contact->addChild("category", $entry['vip']);
@@ -541,17 +541,17 @@ 
       // telephone: put the phonenumbers into the fritzbox xml file
       $telephony = $contact->addChild("telephony");
       $id = 0;
-      foreach($entry['telephony'] as $tel)
+      foreach ($entry['telephony'] as $tel)
       {
         $num = $telephony->addChild("number", $tel['value']);
         $num->addAttribute("type", $tel['type']);
-        $num->addAttribute("vanity","");
+        $num->addAttribute("vanity", "");
         $num->addAttribute("prio", $tel['prio']);
         $num->addAttribute("id", $id);
 
-        if(isset($tel['quickdial']))
+        if (isset($tel['quickdial']))
         {
-          $num->addAttribute("quickdial",$tel['quickdial']);
+          $num->addAttribute("quickdial", $tel['quickdial']);
           print "  Added quickdial: " . $tel['quickdial'] . " for: " . $tel['value'] . " (" . $tel['type'] . ")" . PHP_EOL;
         }
 
@@ -560,13 +560,13 @@ 
       }
 
       // output a warning if no telephone number was found
-      if($id == 0)
+      if ($id == 0)
         print "  WARNING: no phone entry found. VCard will be ignored." . PHP_EOL;
 
       // email: put the email addresses into the fritzbox xml file
       $email = $contact->addChild("services");
       $id = 0;
-      foreach($entry['email'] as $mail)
+      foreach ($entry['email'] as $mail)
       {
         $mail_adr = $email->addChild("email", $mail['value']);
         $mail_adr->addAttribute("classifier", $mail['type']);
@@ -577,14 +577,14 @@ 
       }
 
       // check for a photo being part of the VCard
-      if(($entry['photo']) and ($entry['photo_data']) and (is_array($entry['photo_data'])) and ($entry['photo_data'][0]))
+      if (($entry['photo']) and ($entry['photo_data']) and (is_array($entry['photo_data'])) and ($entry['photo_data'][0]))
       {
         // check if 'photo_data'[0] is an array as well because then
         // we have to extract ['value'] and friends.
-        if(is_array($entry['photo_data'][0]) and (array_key_exists('value', $entry['photo_data'][0])))
+        if (is_array($entry['photo_data'][0]) and (array_key_exists('value', $entry['photo_data'][0])))
         {
           // check if photo_data really contains JPEG data
-          if((array_key_exists('type', $entry['photo_data'][0])) and (is_array($entry['photo_data'][0]['type'])) and
+          if ((array_key_exists('type', $entry['photo_data'][0])) and (is_array($entry['photo_data'][0]['type'])) and
              ($entry['photo_data'][0]['type'][0] == 'jpeg' or $entry['photo_data'][0]['type'][0] == 'jpg'))
           {
             // get photo, rename, base64 convert and save as jpg
@@ -594,7 +594,7 @@ 
 
             // check for base64 encoding of the photo data and convert it
             // accordingly.
-            if(((array_key_exists('encoding', $entry['photo_data'][0])) and ($entry['photo_data'][0]['encoding'] == 'b')) or $this->is_base64($photo_data))
+            if (((array_key_exists('encoding', $entry['photo_data'][0])) and ($entry['photo_data'][0]['encoding'] == 'b')) or $this->is_base64($photo_data))
             {
               file_put_contents($photo_file . ".b64", $photo_data);
               $this->base64_to_jpeg($photo_file . ".b64", $photo_file);
@@ -607,14 +607,14 @@ 
             }
 
             // add contact photo to xml
-            $person->addChild("imageURL", $this->config['fritzbox_path'].$this->config['usb_disk']."FRITZ/fonpix/".basename($photo_file));
+            $person->addChild("imageURL", $this->config['fritzbox_path'] . $this->config['usb_disk'] . "FRITZ/fonpix/" . basename($photo_file));
 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
           }
           else
            print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
         }
-        elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
+        elseif (substr($entry['photo_data'][0], 0, 4) == 'http')
         {
           // add contact photo to xml
           $person->addChild("imageURL", $entry['photo_data'][0]);
@@ -639,20 +639,20 @@ 
     return $text;
   }
 
-  public function _concat ($text1,$text2)
+  public function _concat($text1, $text2)
   {
-    if($text1 == '')
+    if ($text1 == '')
       return $text2;
-    elseif($text2 == '')
+    elseif ($text2 == '')
       return $text1;
     else
-      return $text1.", ".$text2;
+      return $text1 . ", " . $text2;
   }
 
   public function _parse_fb_result($text)
   {
     preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches);
-    if($matches)
+    if ($matches)
       return $matches[1];
     else
       return "Error while uploading xml to fritzbox";
@@ -661,10 +661,10 @@ 
   public function upload_to_fb()
   {
     // if the user wants to save the xml to a separate file, we do so now
-    if(array_key_exists('output_file',$this->config))
+    if (array_key_exists('output_file', $this->config))
     {
       $output = fopen($this->config['output_file'], 'w');
-      if($output)
+      if ($output)
       {
         fwrite($output, $this->fbxml);
         fclose($output);
@@ -679,24 +679,24 @@ 
     // perform an ftps-connection to copy over the photos to a specified directory
     $ftp_server = $this->config['fritzbox_ip_ftp'];
     $conn_id = ftp_ssl_connect($ftp_server);
-    if($conn_id == false)
+    if ($conn_id == false)
     {
       print " WARNING: Secure connection to FTP-server '" . $ftp_server . "' failed, retrying without SSL." . PHP_EOL;
       $conn_id = ftp_connect($ftp_server);
     }
 
-    if($conn_id != false)
+    if ($conn_id != false)
     {
       ftp_set_option($conn_id, FTP_TIMEOUT_SEC, 60);
       $login_result = ftp_login($conn_id, $this->config['fritzbox_user'], $this->config['fritzbox_pw']);
-      if($login_result === true)
+      if ($login_result === true)
       {
         ftp_pasv($conn_id, true);
 
         // create remote photo path on FRITZ!Box if it doesn't exist
-        $remote_path = $this->config['usb_disk']."/FRITZ/fonpix";
+        $remote_path = $this->config['usb_disk'] . "/FRITZ/fonpix";
         $all_existing_files = ftp_nlist($conn_id, $remote_path);
-        if($all_existing_files == false)
+        if ($all_existing_files == false)
         {
           ftp_mkdir($conn_id, $remote_path);
           $all_existing_files = array();
@@ -704,43 +704,43 @@ 
 
         // now iterate through all jpg files in tempdir and upload them if necessary
         $dir = new DirectoryIterator($this->tmpdir);
-        foreach($dir as $fileinfo)
+        foreach ($dir as $fileinfo)
         {
-          if(!$fileinfo->isDot())
+          if (!$fileinfo->isDot())
           {
-            if($fileinfo->getExtension() == "jpg")
+            if ($fileinfo->getExtension() == "jpg")
             {
               $file = $fileinfo->getFilename();
 
               print " FTP-Upload '" . $file . "'...";
-              if(!in_array($remote_path . "/" . $file, $all_existing_files))
+              if (!in_array($remote_path . "/" . $file, $all_existing_files))
               {
-                if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
+                if (!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
                 {
                   // retry when a fault occurs.
                   print " retrying... ";
                   $conn_id = ftp_ssl_connect($ftp_server);
-                  if($conn_id == false)
+                  if ($conn_id == false)
                   {
                     print " WARNING: Secure re-connection to FTP-server '" . $ftp_server . "' failed, retrying without SSL." . PHP_EOL;
                     $conn_id = ftp_connect($ftp_server);
                   }
 
-                  if($conn_id == false)
+                  if ($conn_id == false)
                   {
                     print " ERROR: couldn't re-connect to FTP server '" . $ftp_server . "', abortіng." . PHP_EOL;
                     break;
                   }
 
                   $login_result = ftp_login($conn_id, $this->config['fritzbox_user'], $this->config['fritzbox_pw']);
-                  if($login_result === false)
+                  if ($login_result === false)
                   {
                     print " ERROR: couldn't re-login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
                     break;
                   }
 
                   ftp_pasv($conn_id, true);
-                  if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
+                  if (!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
                     print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL;
                   else
                     print " ok." . PHP_EOL;
@@ -749,9 +749,9 @@ 
                   print " ok." . PHP_EOL;
 
                 // cleanup old files
-                foreach($all_existing_files as $existing_file)
+                foreach ($all_existing_files as $existing_file)
                 {
-                  if(strpos($existing_file, $remote_path."/".substr($file, 0, -10)) !== false)
+                  if (strpos($existing_file, $remote_path . "/" . substr($file, 0, -10)) !== false)
                   {
                     print " FTP-Delete: " . $existing_file . PHP_EOL;
                     ftp_delete($conn_id, $remote_path . "/" . basename($existing_file));
@@ -775,14 +775,14 @@ 
 
     // in case numeric IP is given, try to resolve to hostname. Otherwise Fritzbox may decline login, because it is determine to be (prohibited) remote access
     $hostname = $this->config['fritzbox_ip'];
-    if(filter_var($hostname, FILTER_VALIDATE_IP))
+    if (filter_var($hostname, FILTER_VALIDATE_IP))
     {
       $hostname = gethostbyaddr($hostname);
-      if($hostname ==  $this->config['fritzbox_ip'])
-        print " WARNING: Unable to get hostname for IP address (". $this->config['fritzbox_ip'] .") <" . $hostname . "<" . PHP_EOL;
+      if ($hostname == $this->config['fritzbox_ip'])
+        print " WARNING: Unable to get hostname for IP address (" . $this->config['fritzbox_ip'] . ") <" . $hostname . "<" . PHP_EOL;
       else
       {
-        print " INFO: Given IP address (". $this->config['fritzbox_ip'] .") has hostname ". $hostname . "." . PHP_EOL;
+        print " INFO: Given IP address (" . $this->config['fritzbox_ip'] . ") has hostname " . $hostname . "." . PHP_EOL;
         $this->config['fritzbox_ip'] = $hostname;
       }
     }
@@ -807,15 +807,15 @@ 
        )
       );
 
-      $raw_result =  $fritz->doPostFile($formfields, $filefileds);   // send the command
+      $raw_result = $fritz->doPostFile($formfields, $filefileds); // send the command
       $msg = $this->_parse_fb_result($raw_result);
-      unset($fritz);  // destroy the object to log out
+      unset($fritz); // destroy the object to log out
 
       print "  FRITZ!Box returned message: '" . $msg . "'" . PHP_EOL;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
-      print "  ERROR: " . $e->getMessage() . PHP_EOL;     // show the error message in anything failed
+      print "  ERROR: " . $e->getMessage() . PHP_EOL; // show the error message in anything failed
     }
   }
 }

Braces +180 added lines, -154 removed lines

@@ -37,10 +37,11 @@ 
 require_once('lib/vCard-parser/vCard.php');
 require_once('lib/fritzbox_api_php/fritzbox_api.class.php');
 
-if($argc == 2)
+if($argc == 2) {
   $config_file_name = $argv[1];
-else
+} else {
   $config_file_name = __DIR__ . '/config.php';
+}
 
 // default/fallback config options
 $config['tmp_dir'] = sys_get_temp_dir();
@@ -59,9 +60,9 @@ 
 $config['build_photos'] = true;
 $config['quickdial_keyword'] = 'Quickdial:';
 
-if(is_file($config_file_name))
+if(is_file($config_file_name)) {
   require($config_file_name);
-else
+} else
 {
   print 'ERROR: No '.$config_file_name.' found, please take a look at config.example.php and create a '.$config_file_name.' file!'.PHP_EOL;
   exit(1);
@@ -121,8 +122,9 @@ 
   // Source: https://php.net/manual/de/function.tempnam.php#61436
   public function mktemp($dir, $prefix='', $mode=0700)
   {
-    if(substr($dir, -1) != '/')
-      $dir .= '/';
+    if(substr($dir, -1) != '/') {
+          $dir .= '/';
+    }
 
     do
     {
@@ -142,8 +144,11 @@ 
       {
         if($object != "." && $object != "..")
         {
-          if(filetype($dir."/".$object) == "dir")
-            rrmdir($dir."/".$object); else unlink($dir."/".$object);
+          if(filetype($dir."/".$object) == "dir") {
+                      rrmdir($dir."/".$object);
+          } else {
+              unlink($dir."/".$object);
+            }
         }
       }
       reset($objects);
@@ -156,21 +161,23 @@ 
     try
     {
       // Check if there are valid base64 characters
-      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
-        return false;
+      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str)) {
+              return false;
+      }
 
       // Decode the string in strict mode and check the results
       $decoded = base64_decode($str, true);
-      if($decoded === false)
-        return false;
+      if($decoded === false) {
+              return false;
+      }
 
       // Encode the string again
-      if(base64_encode($decoded) === $str)
-        return true;
-      else
-        return false;
-    }
-    catch(Exception $e)
+      if(base64_encode($decoded) === $str) {
+              return true;
+      } else {
+              return false;
+      }
+    } catch(Exception $e)
     {
       // If exception is caught, then it is not a base64 encoded string
       return false;
@@ -209,8 +216,9 @@ 
 
         // set the vcard extension in case the user
         // defined it in the config
-        if(isset($conf['extension']))
-          $carddav->setVcardExtension($conf['extension']);
+        if(isset($conf['extension'])) {
+                  $carddav->setVcardExtension($conf['extension']);
+        }
 
         // retrieve data from the CardDAV server now
         $xmldata =  $carddav->get();
@@ -218,8 +226,9 @@ 
         // identify if we received UTF-8 encoded data from the
         // CardDAV server and if not reencode it since the FRITZ!Box
         // requires UTF-8 encoded data
-        if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata)
-          $xmldata = utf8_encode($xmldata);
+        if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata) {
+                  $xmldata = utf8_encode($xmldata);
+        }
 
         // read raw_vcard data from xml response
         $raw_vcards = array();
@@ -240,28 +249,34 @@ 
         {
           $vcard_obj = new vCard(false, $v);
           $name_arr = null;
-          if(isset($vcard_obj->n[0]))
-            $name_arr = $vcard_obj->n[0];
+          if(isset($vcard_obj->n[0])) {
+                      $name_arr = $vcard_obj->n[0];
+          }
           $org_arr = null;
-          if(isset($vcard_obj->org[0]))
-            $org_arr = $vcard_obj->org[0];
+          if(isset($vcard_obj->org[0])) {
+                      $org_arr = $vcard_obj->org[0];
+          }
           $addnames = '';
           $prefix = '';
           $suffix = '';
           $orgname = '';
 
           // Build name Parts if existing ans switch to true in config
-          if(isset($name_arr['prefixes']) AND $this->config['prefix'])
-            $prefix = trim($name_arr['prefixes']);
+          if(isset($name_arr['prefixes']) AND $this->config['prefix']) {
+                      $prefix = trim($name_arr['prefixes']);
+          }
 
-          if(isset($name_arr['suffixes']) AND $this->config['suffix'])
-            $suffix = trim($name_arr['suffixes']);
+          if(isset($name_arr['suffixes']) AND $this->config['suffix']) {
+                      $suffix = trim($name_arr['suffixes']);
+          }
 
-          if(isset($name_arr['additionalnames']) AND $this->config['addnames'])
-            $addnames = trim($name_arr['additionalnames']);
+          if(isset($name_arr['additionalnames']) AND $this->config['addnames']) {
+                      $addnames = trim($name_arr['additionalnames']);
+          }
 
-          if(isset($org_arr['name']) AND $this->config['orgname'])
-            $orgname = trim($org_arr['name']);
+          if(isset($org_arr['name']) AND $this->config['orgname']) {
+                      $orgname = trim($org_arr['name']);
+          }
 
           $firstname = trim($name_arr['firstname']);
           $lastname = trim($name_arr['lastname']);
@@ -280,72 +295,79 @@ 
           $format = $this->config['fullname_format'];
 
           // Prefix
-          if(!empty($prefix))
-            $name .= $prefix;
+          if(!empty($prefix)) {
+                      $name .= $prefix;
+          }
 
           if($format == 0)
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
-          }
-          else
+            if(!empty($name) AND !empty($lastname)) {
+                          $name .= ' ' . $lastname;
+            } else {
+                          $name .= $lastname;
+            }
+          } else
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
-              $name .= ' ' . $firstname;
-            else
-              $name .= $firstname;
+            if(!empty($name) AND !empty($firstname)) {
+                          $name .= ' ' . $firstname;
+            } else {
+                          $name .= $firstname;
+            }
           }
 
           if($format == 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            if(!empty($name) AND !empty($addnames)) {
+                          $name .= ' ' . $addnames;
+            } else {
+                          $name .= $addnames;
+            }
           }
 
           if($format == 0)
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
-              $name .= ', ' . $firstname;
-            else
-              $name .= $firstname;
-          }
-          else
+            if(!empty($name) AND !empty($firstname)) {
+                          $name .= ', ' . $firstname;
+            } else {
+                          $name .= $firstname;
+            }
+          } else
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
+            if(!empty($name) AND !empty($lastname)) {
+                          $name .= ' ' . $lastname;
+            } else {
+                          $name .= $lastname;
+            }
           }
 
           if($format != 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            if(!empty($name) AND !empty($addnames)) {
+                          $name .= ' ' . $addnames;
+            } else {
+                          $name .= $addnames;
+            }
           }
 
           // Suffix
-          if(!empty($name) AND !empty($suffix))
-            $name .= ' ' . $suffix;
-          else
-            $name .= $suffix;
+          if(!empty($name) AND !empty($suffix)) {
+                      $name .= ' ' . $suffix;
+          } else {
+                      $name .= $suffix;
+          }
 
           // OrgName
-          if(!empty($name) AND !empty($orgname))
-            $name .= ' (' . $orgname . ')';
-          else
-            $name .= $orgname;
+          if(!empty($name) AND !empty($orgname)) {
+                      $name .= ' (' . $orgname . ')';
+          } else {
+                      $name .= $orgname;
+          }
 
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
@@ -363,22 +385,22 @@ 
             {
               $photo = $imgseqfname;
               $imgseqfname++;
-            }
-            else
+            } else
             {
               $photo = str_replace(array(',','&',' ','/','ä','ö','ü','Ä','Ö','Ü','ß','á','à','ó','ò','ú','ù','í','ø'),
               array('','_','_','_','ae','oe','ue','Ae','Oe','Ue','ss','a','a','o','o','u','u','i','oe'),$name);
             }
+          } else {
+                      $photo = '';
           }
-          else
-            $photo = '';
 
           // phone
           $phone_no = array();
-          if($vcard_obj->categories)
-            $categories = $vcard_obj->categories[0];
-          else
-            $categories = array();
+          if($vcard_obj->categories) {
+                      $categories = $vcard_obj->categories[0];
+          } else {
+                      $categories = array();
+          }
 
           // check for quickdial entry
           if(isset($vcard_obj->note[0]))
@@ -413,9 +435,9 @@ 
                 break;
               }
             }
-          } 
-          else
-            $add_entry = 1;
+          } else {
+                      $add_entry = 1;
+          }
 
           if($add_entry == 1)
           {
@@ -428,8 +450,7 @@ 
               {
                 $type = "mobile";
                 $phone_number = $t;
-              }
-              else
+              } else
               {
                 $phone_number = $t['value'];
                 
@@ -439,10 +460,11 @@ 
                   if($qd_phone_nr == $phone_number_clean)
                   {
                     //Set quickdial
-                    if($value == 1)
-                      print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
-                    elseif($value >= 100)
-                      print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
+                    if($value == 1) {
+                                          print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
+                    } elseif($value >= 100) {
+                                          print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
+                    }
 
                     $quickdial = $value;
                   }
@@ -451,24 +473,26 @@ 
                 $typearr_lower = unserialize(strtolower(serialize($t['type'])));
 
                 // find out priority
-                if(in_array("pref", $typearr_lower))
-                  $prio = 1;
+                if(in_array("pref", $typearr_lower)) {
+                                  $prio = 1;
+                }
 
                 // set the proper type
-                if(in_array("cell", $typearr_lower))
-                  $type = "mobile";
-                elseif(in_array("home", $typearr_lower))
-                  $type = "home";
-                elseif(in_array("fax", $typearr_lower))
-                  $type = "fax_work";
-                elseif(in_array("work", $typearr_lower))
-                  $type = "work";
-                elseif(in_array("other", $typearr_lower))
-                  $type = "other";
-                elseif(in_array("dom", $typearr_lower))
-                  $type = "other";
-                else
-                  continue;
+                if(in_array("cell", $typearr_lower)) {
+                                  $type = "mobile";
+                } elseif(in_array("home", $typearr_lower)) {
+                                  $type = "home";
+                } elseif(in_array("fax", $typearr_lower)) {
+                                  $type = "fax_work";
+                } elseif(in_array("work", $typearr_lower)) {
+                                  $type = "work";
+                } elseif(in_array("other", $typearr_lower)) {
+                                  $type = "other";
+                } elseif(in_array("dom", $typearr_lower)) {
+                                  $type = "other";
+                } else {
+                                  continue;
+                }
               }
               $phone_no[] =  array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
             }
@@ -482,19 +506,19 @@ 
                 {
                   $type_email = "work";
                   $email = $e;
-                }
-                else
+                } else
                 {
                   $email = $e['value'];
                   $typearr_lower = unserialize(strtolower(serialize($e['type'])));
-                  if(in_array("work", $typearr_lower))
-                    $type_email = "work";
-                  elseif(in_array("home", $typearr_lower))
-                    $type_email = "home";
-                  elseif(in_array("other", $typearr_lower))
-                    $type_email = "other";
-                  else
-                    continue;
+                  if(in_array("work", $typearr_lower)) {
+                                      $type_email = "work";
+                  } elseif(in_array("home", $typearr_lower)) {
+                                      $type_email = "home";
+                  } elseif(in_array("other", $typearr_lower)) {
+                                      $type_email = "other";
+                  } else {
+                                      continue;
+                  }
                 }
 
                 // DEBUG: print out the email address on the console
@@ -521,8 +545,9 @@ 
 
   public function build_fb_xml()
   {
-    if(empty($this->entries))
-      throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!');
+    if(empty($this->entries)) {
+          throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!');
+    }
 
     // create FB XML in utf-8 format
     $root = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><phonebooks><phonebook></phonebook></phonebooks>');
@@ -560,8 +585,9 @@ 
       }
 
       // output a warning if no telephone number was found
-      if($id == 0)
-        print "  WARNING: no phone entry found. VCard will be ignored." . PHP_EOL;
+      if($id == 0) {
+              print "  WARNING: no phone entry found. VCard will be ignored." . PHP_EOL;
+      }
 
       // email: put the email addresses into the fritzbox xml file
       $email = $contact->addChild("services");
@@ -599,8 +625,7 @@ 
               file_put_contents($photo_file . ".b64", $photo_data);
               $this->base64_to_jpeg($photo_file . ".b64", $photo_file);
               unlink($photo_file . ".b64");
-            }
-            else
+            } else
             {
               print "  WARNING: non-base64 encoded photo data found and used." . PHP_EOL;
               file_put_contents($photo_file, $photo_data);
@@ -610,19 +635,18 @@ 
             $person->addChild("imageURL", $this->config['fritzbox_path'].$this->config['usb_disk']."FRITZ/fonpix/".basename($photo_file));
 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
+          } else {
+                     print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
           }
-          else
-           print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
-        }
-        elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
+        } elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
         {
           // add contact photo to xml
           $person->addChild("imageURL", $entry['photo_data'][0]);
 
           print "  Added photo: " . $entry['photo_data'][0] . PHP_EOL;
+        } else {
+                  print "  WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL;
         }
-        else
-          print "  WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL;
       }
 
       $contact->addChild("services");
@@ -641,21 +665,23 @@ 
 
   public function _concat ($text1,$text2)
   {
-    if($text1 == '')
-      return $text2;
-    elseif($text2 == '')
-      return $text1;
-    else
-      return $text1.", ".$text2;
+    if($text1 == '') {
+          return $text2;
+    } elseif($text2 == '') {
+          return $text1;
+    } else {
+          return $text1.", ".$text2;
+    }
   }
 
   public function _parse_fb_result($text)
   {
     preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches);
-    if($matches)
-      return $matches[1];
-    else
-      return "Error while uploading xml to fritzbox";
+    if($matches) {
+          return $matches[1];
+    } else {
+          return "Error while uploading xml to fritzbox";
+    }
   }
 
   public function upload_to_fb()
@@ -740,13 +766,14 @@ 
                   }
 
                   ftp_pasv($conn_id, true);
-                  if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
-                    print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL;
-                  else
-                    print " ok." . PHP_EOL;
+                  if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY)) {
+                                      print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL;
+                  } else {
+                                      print " ok." . PHP_EOL;
+                  }
+                } else {
+                                  print " ok." . PHP_EOL;
                 }
-                else
-                  print " ok." . PHP_EOL;
 
                 // cleanup old files
                 foreach($all_existing_files as $existing_file)
@@ -757,30 +784,30 @@ 
                     ftp_delete($conn_id, $remote_path . "/" . basename($existing_file));
                   }
                 }
+              } else {
+                              print " already exists." . PHP_EOL;
               }
-              else
-                print " already exists." . PHP_EOL;
             }
           }
         }
+      } else {
+              print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
       }
-      else
-        print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
 
       // close ftp connection
       ftp_close($conn_id);
+    } else {
+          print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL;
     }
-    else
-      print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL;
 
     // in case numeric IP is given, try to resolve to hostname. Otherwise Fritzbox may decline login, because it is determine to be (prohibited) remote access
     $hostname = $this->config['fritzbox_ip'];
     if(filter_var($hostname, FILTER_VALIDATE_IP))
     {
       $hostname = gethostbyaddr($hostname);
-      if($hostname ==  $this->config['fritzbox_ip'])
-        print " WARNING: Unable to get hostname for IP address (". $this->config['fritzbox_ip'] .") <" . $hostname . "<" . PHP_EOL;
-      else
+      if($hostname ==  $this->config['fritzbox_ip']) {
+              print " WARNING: Unable to get hostname for IP address (". $this->config['fritzbox_ip'] .") <" . $hostname . "<" . PHP_EOL;
+      } else
       {
         print " INFO: Given IP address (". $this->config['fritzbox_ip'] .") has hostname ". $hostname . "." . PHP_EOL;
         $this->config['fritzbox_ip'] = $hostname;
@@ -812,8 +839,7 @@ 
       unset($fritz);  // destroy the object to log out
 
       print "  FRITZ!Box returned message: '" . $msg . "'" . PHP_EOL;
-    }
-    catch(Exception $e)
+    } catch(Exception $e)
     {
       print "  ERROR: " . $e->getMessage() . PHP_EOL;     // show the error message in anything failed
     }

lib/fritzbox_api_php/fritzbox_guestlan_on_off.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
   preg_match('@name="guest_enabled"[^>]+(checked)[^>]*@', $output, $matches);
   if ( isset($matches[1]) && $mode == true )
   {
-		$message .= 'LAN4 guest access is now active.';
+    $message .= 'LAN4 guest access is now active.';
   }
   else if ( !isset($matches[1]) && $mode == false )
   {

Spacing +11 added lines, -11 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,19 +92,19 @@ 
   $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.';
   }
@@ -115,7 +115,7 @@ 
 }
 
 // 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);
 }

Braces +7 added lines, -14 removed lines

@@ -25,8 +25,7 @@ 
   if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
   {
     $mode = (bool)$argv[1];
-  }
-  else
+  } else
   {
     if ( $fritz->config->getItem('logging') == 'console' )
     {
@@ -45,8 +44,7 @@ 
   The optional argument PASSWORD sets a new guest access password (min 8 chars)
   Defaults to false, so the current password is kept.
   ';
-    }
-    else
+    } else
     {
       $fritz->logMessage($message . 'ERROR: Script was called without or with an invalid argument');
     }
@@ -111,21 +109,17 @@ 
 		{
 			$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();
 }
@@ -134,8 +128,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($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_delete_foncallslist.php

Indentation +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
   
   // delete calllist form fields
   $formfields = array(
-	'getpage'	=> '/fon_num/foncalls_list.lua',
-	'usejournal' 	=> '1',
-	'callstab' 	=> 'all',
-	'submit'	=> 'clear',
-	'clear'	=> '1',
+  'getpage'	=> '/fon_num/foncalls_list.lua',
+  'usejournal' 	=> '1',
+  'callstab' 	=> 'all',
+  'submit'	=> 'clear',
+  'clear'	=> '1',
   );
   
   $fritz->doPostForm($formfields);

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 }
 
 // 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);
 }

Braces +2 added lines, -4 removed lines

@@ -54,8 +54,7 @@ 
   
   // set a log message
   $message .= 'Call list sucessfully downloaded';
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -64,8 +63,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($message);
 }

lib/fritzbox_api_php/fritzbox_tam_swap.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 }
 
 // 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);
 }

Braces +2 added lines, -4 removed lines

@@ -54,8 +54,7 @@ 
   
   // set a log message
   $message .= 'Call list sucessfully downloaded';
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -64,8 +63,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($message);
 }

lib/fritzbox_api_php/fritzbox_guestwlan_on_off.php

Indentation +5 added lines, -5 removed lines

@@ -106,11 +106,11 @@
   preg_match('@name="activate_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
   if ( isset($matches[1]) && $mode == true )
   {
-		preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
-		if ( isset($matches[1]) )
-		{
-			$message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
-		}
+    preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
+    if ( isset($matches[1]) )
+    {
+      $message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
+    }
   }
   else if ( !isset($matches[1]) && $mode == false )
   {

Spacing +12 added lines, -12 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,23 +104,23 @@ 
   $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.';
   }
@@ -131,7 +131,7 @@ 
 }
 
 // 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);
 }

Braces +7 added lines, -14 removed lines

@@ -25,8 +25,7 @@ 
   if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
   {
     $mode = (bool)$argv[1];
-  }
-  else
+  } else
   {
     if ( $fritz->config->getItem('logging') == 'console' )
     {
@@ -45,8 +44,7 @@ 
   The optional argument PASSWORD sets a new guest access password (min 8 chars)
   Defaults to false, so the current password is kept.
   ';
-    }
-    else
+    } else
     {
       $fritz->logMessage($message . 'ERROR: Script was called without or with an invalid argument');
     }
@@ -111,21 +109,17 @@ 
 		{
 			$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();
 }
@@ -134,8 +128,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($message);
 }

lib/fritzbox_api_php/fritzbox_tam_on_off.php

Spacing +3 added lines, -3 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
@@ -97,7 +97,7 @@ 
 }
 
 // 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);
 }

Braces +6 added lines, -12 removed lines

@@ -28,8 +28,7 @@ 
   if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
   {
     $mode = (int)$argv[1];
-  }
-  else
+  } else
   {
     if ( $fritz->config->getItem('logging') == 'console' )
     {
@@ -51,8 +50,7 @@ 
   Warning: A non existent TAM will not lead to an error message but adds a
   new TAM to the Fritz!Box, which will answer all incoming calls by default!
       ';
-    }
-    else
+    } else
     {
       $fritz->logMessage($message . 'ERROR: Script was called without or with an invalid argument');
     }
@@ -81,17 +79,14 @@ 
   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];
-  }
-  else
+  } else
   {
     $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();
 }
@@ -100,8 +95,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($message);
 }