jens-maus / carddav2fb

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

Braces +182 added lines, -156 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;
@@ -207,8 +214,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();
@@ -216,8 +224,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();
@@ -239,11 +248,13 @@ 
       {
         $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 = '';
@@ -252,17 +263,21 @@ 
         $lastname = '';
 
         // 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']);
@@ -281,72 +296,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));
@@ -364,22 +386,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();
+        }
 
         $quick_dial_for_nr = null;
         $quick_dial_nr = null;
@@ -417,9 +439,9 @@ 
               break;
             }
           }
-        } 
-        else
-          $add_entry = 1;
+        } else {
+                  $add_entry = 1;
+        }
 
         if($add_entry == 1)
         {
@@ -432,8 +454,7 @@ 
             {
               $type = "mobile";
               $phone_number = $t;
-            }
-            else
+            } else
             {
               $phone_number = $t['value'];
               
@@ -443,10 +464,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;
                 }
@@ -455,24 +477,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));
           }
@@ -486,19 +510,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
@@ -524,8 +548,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>');
@@ -563,8 +588,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");
@@ -602,8 +628,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);
@@ -613,19 +638,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");
@@ -644,21 +668,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()
@@ -743,13 +769,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)
@@ -760,30 +787,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."
+      } else {
+              print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings."
 
       // close ftp connection
       ftp_close($conn_id);
-    }
-    else
-      print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'."
+      }
+    } else {
+          print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'."
 
     // 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;
@@ -815,8 +842,7 @@ 
       $fritz = null;  // 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 )
   {

Braces +7 added lines, -14 removed lines

@@ -26,8 +26,7 @@ 
   if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
   {
     $mode = (bool)$argv[1];
-  }
-  else
+  } else
   {
     if ( $fritz->config->getItem('logging') == 'console' )
     {
@@ -43,8 +42,7 @@ 
   0 disables the guest access
   1 enables the guest access
   ';
-    }
-    else
+    } else
     {
       $fritz->logMessage($message . 'ERROR: Script was called without or with an invalid argument');
     }
@@ -95,21 +93,17 @@ 
   if ( isset($matches[1]) && $mode == true )
   {
 		$message .= 'LAN4 guest access is now active.';
-  }
-  else if ( !isset($matches[1]) && $mode == false )
+  } else if ( !isset($matches[1]) && $mode == false )
   {
     $message .= 'LAN4 guest access is now inactive.';
-  }
-  else if ( isset($matches[1]) && $mode == false )
+  } else if ( isset($matches[1]) && $mode == false )
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be inactive, but is still active.';
-  }
-  else if ( !isset($matches[1]) && $mode == true )
+  } else if ( !isset($matches[1]) && $mode == true )
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be active, but is still inactive.';
   }
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -118,8 +112,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

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 )

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

Braces +2 added lines, -4 removed lines

@@ -31,8 +31,7 @@ 
   $fritz->doPostForm($formfields);
   // set a log message
   $message .= 'Call list sucessfully deleted';
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -41,8 +40,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

@@ -14,8 +14,7 @@ 
   );
   $fritz->doPostForm($formfields);
   $message .= 'Phone ' . $dial . ' ringed.';
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -24,8 +23,7 @@ 
 if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
 {
   $fritz->logMessage($message);
-}
-else
+} else
 {
   echo($message);
 }

lib/fritzbox_api_php/fritzbox_diversity0on.php

Braces +2 added lines, -4 removed lines

@@ -18,8 +18,7 @@ 
     'telcfg:settings/Diversity' . $diversity . '/Active' => $mode,
   );
   $fritz->doPostForm($formfields);
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -28,8 +27,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

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
   // 3 for the first and the second, 5 for the first and the third and so on
   // this is based on 1 => 1, 2 => 10, 3 => 11, 4 => 100, 5 => 101, 6 => 110, 7 => 111
   $fritz->doPostForm($formfields);
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
   $message .= $e->getMessage();
 }
@@ -47,8 +46,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 )
   {

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

Braces +2 added lines, -4 removed lines

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