jens-maus / carddav2fb

lib/fritzbox_api_php/fritzbox_guestlan_on_off.php

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_api.class.php

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

lib/fritzbox_api_php/fritzbox_user.conf.php

Spacing +1 added lines, -1 removed lines

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

lib/fritzbox_api_php/fritzbox_tam_swap.php

Spacing +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

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

lib/fritzbox_api_php/fritzbox_get_foncallslist.php

Spacing +3 added lines, -3 removed lines

@@ -23,11 +23,11 @@ 
   // init the output message
   $message = date('Y-m-d H:i') . ' ';
   
-  if ( !$fritz->config->getItem('foncallslist_path') )
+  if (!$fritz->config->getItem('foncallslist_path'))
   {
     throw new Exception('Mandatory config Item foncallslist_path not set.');
   }
-  if ( ( file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path')) ) || ( !file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path'))) ) )
+  if ((file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path'))) || (!file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path')))))
   {
     throw new Exception('Config item foncallslist_path (' . $fritz->config->getItem('foncallslist_path') . ') is not writeable.');
   }
@@ -61,7 +61,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/vCard-parser/vCard.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * @var string Current object mode - error, single or multiple (for a single vCard within a file and multiple combined vCards)
 		 */
-		private $Mode;  //single, multiple, error
+		private $Mode; //single, multiple, error
 
 		private $Path = '';
 		private $RawData = '';
@@ -79,7 +79,7 @@ 
 			{
 				if (!is_readable($Path))
 				{
-					throw new Exception('vCard: Path not accessible ('.$Path.')');
+					throw new Exception('vCard: Path not accessible (' . $Path . ')');
 				}
 
 				$this -> Path = $Path;
@@ -134,7 +134,7 @@ 
 				{
 					// Prepending "BEGIN:VCARD" to the raw string because we exploded on that one.
 					// If there won't be the BEGIN marker in the new object, it will fail.
-					$SinglevCardRawData = 'BEGIN:VCARD'."\n".$SinglevCardRawData;
+					$SinglevCardRawData = 'BEGIN:VCARD' . "\n" . $SinglevCardRawData;
 
 					$ClassName = get_class($this);
 					$this -> Data[] = new $ClassName(false, $SinglevCardRawData);
@@ -377,7 +377,7 @@ 
 			}
 			else
 			{
-				throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
+				throw new Exception('vCard: Cannot save file (' . $Key . '), target path not writable (' . $TargetPath . ')');
 			}
 			return false;
 		}
@@ -458,8 +458,8 @@ 
 		 */
 		public function __toString()
 		{
-			$Text = 'BEGIN:VCARD'.self::endl;
-			$Text .= 'VERSION:3.0'.self::endl;
+			$Text = 'BEGIN:VCARD' . self::endl;
+			$Text .= 'VERSION:3.0' . self::endl;
 
 			foreach ($this -> Data as $Key => $Values)
 			{
@@ -476,7 +476,7 @@ 
 					$Text .= $KeyUC;
 					if (is_array($Value) && isset($Value['type']))
 					{
-						$Text .= ';TYPE='.self::PrepareTypeStrForOutput($Value['type']);
+						$Text .= ';TYPE=' . self::PrepareTypeStrForOutput($Value['type']);
 					}
 					$Text .= ':';
 
@@ -502,7 +502,7 @@ 
 				}
 			}
 
-			$Text .= 'END:VCARD'.self::endl;
+			$Text .= 'END:VCARD' . self::endl;
 			return $Text;
 		}
 
@@ -603,7 +603,7 @@ 
 				}
 				elseif (count($Parameter) > 2)
 				{
-					if(count(explode(',', $RawParams[$Index], -1)) > 0)
+					if (count(explode(',', $RawParams[$Index], -1)) > 0)
 					{
 						$TempTypeParams = self::ParseParameters($Key, explode(',', $RawParams[$Index]));
 						if ($TempTypeParams['type'])

Braces +18 added lines, -32 removed lines

@@ -84,12 +84,10 @@ 
 
 				$this -> Path = $Path;
 				$this -> RawData = file_get_contents($this -> Path);
-			}
-			elseif ($RawData)
+			} elseif ($RawData)
 			{
 				$this -> RawData = $RawData;
-			}
-			else
+			} else
 			{
 				//throw new Exception('vCard: No content provided');
 				// Not necessary anymore as possibility to create vCards is added
@@ -139,8 +137,7 @@ 
 					$ClassName = get_class($this);
 					$this -> Data[] = new $ClassName(false, $SinglevCardRawData);
 				}
-			}
-			else
+			} else
 			{
 				// Protect the BASE64 final = sign (detected by the line beginning with whitespace), otherwise the next replace will get rid of it
 				$this -> RawData = preg_replace('{(\n\s.+)=(\n)}', '$1-base64=-$2', $this -> RawData);
@@ -190,8 +187,7 @@ 
 						}
 						$this -> Data[$Key][] = $Value;
 						continue;
-					}
-					else
+					} else
 					{
 						$Value = str_replace('-wrap-', '', $Value);
 					}
@@ -224,11 +220,12 @@ 
 									if (in_array($ParamValue, array('b', 'base64')))
 									{
 										//$Value = base64_decode($Value);
-									}
-									elseif ($ParamValue == 'quoted-printable') // v2.1
+									} elseif ($ParamValue == 'quoted-printable') {
+									  // v2.1
 									{
 										$Value = quoted_printable_decode($Value);
 									}
+									}
 									break;
 								case 'charset': // v2.1
 									if ($ParamValue != 'utf-8' && $ParamValue != 'utf8')
@@ -263,8 +260,7 @@ 
 						{
 							$Value['type'] = $Type;
 						}
-					}
-					else
+					} else
 					{
 						if (in_array($Key, self::$Spec_MultipleValueElements))
 						{
@@ -311,8 +307,7 @@ 
 				if ($Key == 'agent')
 				{
 					return $this -> Data[$Key];
-				}
-				elseif (in_array($Key, self::$Spec_FileElements))
+				} elseif (in_array($Key, self::$Spec_FileElements))
 				{
 					$Value = $this -> Data[$Key];
 					foreach ($Value as $K => $V)
@@ -331,8 +326,7 @@ 
 					return $this -> Data[$Key][0];
 				}
 				return $this -> Data[$Key];
-			}
-			elseif ($Key == 'Mode')
+			} elseif ($Key == 'Mode')
 			{
 				return $this -> Mode;
 			}
@@ -374,8 +368,7 @@ 
 				}
 				$Status = file_put_contents($TargetPath, $RawContent);
 				return (bool)$Status;
-			}
-			else
+			} else
 			{
 				throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
 			}
@@ -421,8 +414,7 @@ 
 						if (empty($this -> Data[$Key][$LastElementIndex][$Types[0]]))
 						{
 							$this -> Data[$Key][$LastElementIndex][$Types[0]] = $Value;
-						}
-						else
+						} else
 						{
 							$LastElementIndex++;
 						}
@@ -434,16 +426,14 @@ 
 							$Types[0] => $Value
 						);
 					}
-				}
-				elseif (isset(self::$Spec_ElementTypes[$Key]))
+				} elseif (isset(self::$Spec_ElementTypes[$Key]))
 				{
 					$this -> Data[$Key][] = array(
 						'value' => $Value,
 						'type' => $Types
 					);
 				}
-			}
-			elseif ($Value)
+			} elseif ($Value)
 			{
 				$this -> Data[$Key][] = $Value;
 			}
@@ -488,12 +478,10 @@ 
 							$PartArray[] = isset($Value[$Part]) ? $Value[$Part] : '';
 						}
 						$Text .= implode(';', $PartArray);
-					}
-					elseif (is_array($Value) && isset(self::$Spec_ElementTypes[$Key]))
+					} elseif (is_array($Value) && isset(self::$Spec_ElementTypes[$Key]))
 					{
 						$Text .= $Value['value'];
-					}
-					else
+					} else
 					{
 						$Text .= $Value;
 					}
@@ -600,8 +588,7 @@ 
 					{
 						$Type[] = $Parameter[0];
 					}
-				}
-				elseif (count($Parameter) > 2)
+				} elseif (count($Parameter) > 2)
 				{
 					if(count(explode(',', $RawParams[$Index], -1)) > 0)
 					{
@@ -611,8 +598,7 @@ 
 							$Type = array_merge($Type, $TempTypeParams['type']);
 						}
 					}
-				}
-				else
+				} else
 				{
 					switch ($Parameter[0])
 					{

lib/vCard-parser/write-test.php

Spacing +1 added lines, -1 removed lines

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