jens-maus / carddav2fb

lib/fritzbox_api_php/fritzbox_api.class.php

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_guestwlan_on_off.php

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

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

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

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/test.php

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 				if ($Photo['encoding'] == 'b')
 				{
 					echo '<img src="data:image/'.$Photo['type'][0].';base64,'.$Photo['value'].'" /><br />';
-				}
-				else
+				} else
 				{
 					echo '<img src="'.$Photo['value'].'" /><br />';
 				}
@@ -89,8 +88,7 @@ 
 				if (is_scalar($Tel))
 				{
 					echo $Tel.'<br />';
-				}
-				else
+				} else
 				{
 					echo $Tel['value'].' ('.implode(', ', $Tel['type']).')<br />';
 				}
@@ -106,8 +104,7 @@ 
 				if (is_scalar($Email))
 				{
 					echo $Email;
-				}
-				else
+				} else
 				{
 					echo $Email['value'].' ('.implode(', ', $Email['type']).')<br />';
 				}
@@ -123,8 +120,7 @@ 
 				if (is_scalar($URL))
 				{
 					echo $URL.'<br />';
-				}
-				else
+				} else
 				{
 					echo $URL['value'].'<br />';
 				}
@@ -140,8 +136,7 @@ 
 				if (is_scalar($IMPP))
 				{
 					echo $IMPP.'<br />';
-				}
-				else
+				} else
 				{
 					echo $IMPP['value'].'<br/ >';
 				}
@@ -173,8 +168,7 @@ 
 				if (is_scalar($Agent))
 				{
 					echo '<div class="Agent">'.$Agent.'</div>';
-				}
-				elseif (is_a($Agent, 'vCard'))
+				} elseif (is_a($Agent, 'vCard'))
 				{
 					echo '<div class="Agent">';
 					OutputvCard($Agent);

lib/fritzbox_api_php/fritzbox_guestlan_on_off.php

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_delete_foncallslist.php

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_ring_phone.php

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