@@ -38,9 +38,12 @@ discard block |
||
| 38 | 38 | require_once('lib/fritzbox_api_php/fritzbox_api.class.php'); |
| 39 | 39 | |
| 40 | 40 | if($argc == 2) |
| 41 | +{ |
|
| 41 | 42 | $config_file_name = $argv[1]; |
| 42 | -else |
|
| 43 | +} |
|
| 44 | +else { |
|
| 43 | 45 | $config_file_name = __DIR__ . '/config.php'; |
| 46 | +} |
|
| 44 | 47 | |
| 45 | 48 | // default/fallback config options |
| 46 | 49 | $config['tmp_dir'] = sys_get_temp_dir(); |
@@ -60,7 +63,9 @@ discard block |
||
| 60 | 63 | $config['quickdial_keyword'] = 'Quickdial:'; |
| 61 | 64 | |
| 62 | 65 | if(is_file($config_file_name)) |
| 66 | +{ |
|
| 63 | 67 | require($config_file_name); |
| 68 | +} |
|
| 64 | 69 | else |
| 65 | 70 | { |
| 66 | 71 | print 'ERROR: No ' . $config_file_name . ' found, please take a look at config.example.php and create a ' . $config_file_name . ' file!' . PHP_EOL; |
@@ -91,9 +96,12 @@ discard block |
||
| 91 | 96 | // upload the XML-file to the FRITZ!Box (CAUTION: this will overwrite all current entries in the phone book!!) |
| 92 | 97 | print 'Upload data to FRITZ!Box @ ' . $config['fritzbox_ip'] . PHP_EOL; |
| 93 | 98 | if($client->upload_to_fb()) |
| 99 | +{ |
|
| 94 | 100 | print 'Done.' . PHP_EOL; |
| 95 | -else |
|
| 101 | +} |
|
| 102 | +else { |
|
| 96 | 103 | exit(1); |
| 104 | +} |
|
| 97 | 105 | |
| 98 | 106 | flush(); // in case this script runs by php-cgi |
| 99 | 107 | |
@@ -124,7 +132,9 @@ discard block |
||
| 124 | 132 | public function mktemp($dir, $prefix = '', $mode = 0700) |
| 125 | 133 | { |
| 126 | 134 | if(substr($dir, -1) != '/') |
| 127 | - $dir .= '/'; |
|
| 135 | + { |
|
| 136 | + $dir .= '/'; |
|
| 137 | + } |
|
| 128 | 138 | |
| 129 | 139 | do |
| 130 | 140 | { |
@@ -145,7 +155,12 @@ discard block |
||
| 145 | 155 | if($object != "." && $object != "..") |
| 146 | 156 | { |
| 147 | 157 | if(filetype($dir . "/" . $object) == "dir") |
| 148 | - rrmdir($dir . "/" . $object); else unlink($dir . "/" . $object); |
|
| 158 | + { |
|
| 159 | + rrmdir($dir . "/" . $object); |
|
| 160 | + } |
|
| 161 | + else { |
|
| 162 | + unlink($dir . "/" . $object); |
|
| 163 | + } |
|
| 149 | 164 | } |
| 150 | 165 | } |
| 151 | 166 | reset($objects); |
@@ -159,18 +174,25 @@ discard block |
||
| 159 | 174 | { |
| 160 | 175 | // Check if there are valid base64 characters |
| 161 | 176 | if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str)) |
| 162 | - return false; |
|
| 177 | + { |
|
| 178 | + return false; |
|
| 179 | + } |
|
| 163 | 180 | |
| 164 | 181 | // Decode the string in strict mode and check the results |
| 165 | 182 | $decoded = base64_decode($str, true); |
| 166 | 183 | if($decoded === false) |
| 167 | - return false; |
|
| 184 | + { |
|
| 185 | + return false; |
|
| 186 | + } |
|
| 168 | 187 | |
| 169 | 188 | // Encode the string again |
| 170 | 189 | if(base64_encode($decoded) === $str) |
| 171 | - return true; |
|
| 172 | - else |
|
| 173 | - return false; |
|
| 190 | + { |
|
| 191 | + return true; |
|
| 192 | + } |
|
| 193 | + else { |
|
| 194 | + return false; |
|
| 195 | + } |
|
| 174 | 196 | } |
| 175 | 197 | catch(Exception $e) |
| 176 | 198 | { |
@@ -211,7 +233,9 @@ discard block |
||
| 211 | 233 | // set the vcard extension in case the user |
| 212 | 234 | // defined it in the config |
| 213 | 235 | if(isset($conf['extension'])) |
| 214 | - $carddav->setVcardExtension($conf['extension']); |
|
| 236 | + { |
|
| 237 | + $carddav->setVcardExtension($conf['extension']); |
|
| 238 | + } |
|
| 215 | 239 | |
| 216 | 240 | // retrieve data from the CardDAV server now |
| 217 | 241 | $xmldata = $carddav->get(); |
@@ -220,7 +244,9 @@ discard block |
||
| 220 | 244 | // CardDAV server and if not reencode it since the FRITZ!Box |
| 221 | 245 | // requires UTF-8 encoded data |
| 222 | 246 | if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata) |
| 223 | - $xmldata = utf8_encode($xmldata); |
|
| 247 | + { |
|
| 248 | + $xmldata = utf8_encode($xmldata); |
|
| 249 | + } |
|
| 224 | 250 | |
| 225 | 251 | // read raw_vcard data from xml response |
| 226 | 252 | $raw_vcards = array(); |
@@ -242,10 +268,14 @@ discard block |
||
| 242 | 268 | $vcard_obj = new vCard(false, $v); |
| 243 | 269 | $name_arr = null; |
| 244 | 270 | if(isset($vcard_obj->n[0])) |
| 245 | - $name_arr = $vcard_obj->n[0]; |
|
| 271 | + { |
|
| 272 | + $name_arr = $vcard_obj->n[0]; |
|
| 273 | + } |
|
| 246 | 274 | $org_arr = null; |
| 247 | 275 | if(isset($vcard_obj->org[0])) |
| 248 | - $org_arr = $vcard_obj->org[0]; |
|
| 276 | + { |
|
| 277 | + $org_arr = $vcard_obj->org[0]; |
|
| 278 | + } |
|
| 249 | 279 | $addnames = ''; |
| 250 | 280 | $prefix = ''; |
| 251 | 281 | $suffix = ''; |
@@ -254,19 +284,29 @@ discard block |
||
| 254 | 284 | |
| 255 | 285 | // Build name Parts if existing ans switch to true in config |
| 256 | 286 | if(isset($name_arr['prefixes']) and $this->config['prefix']) |
| 257 | - $prefix = trim($name_arr['prefixes']); |
|
| 287 | + { |
|
| 288 | + $prefix = trim($name_arr['prefixes']); |
|
| 289 | + } |
|
| 258 | 290 | |
| 259 | 291 | if(isset($name_arr['suffixes']) and $this->config['suffix']) |
| 260 | - $suffix = trim($name_arr['suffixes']); |
|
| 292 | + { |
|
| 293 | + $suffix = trim($name_arr['suffixes']); |
|
| 294 | + } |
|
| 261 | 295 | |
| 262 | 296 | if(isset($name_arr['additionalnames']) and $this->config['addnames']) |
| 263 | - $addnames = trim($name_arr['additionalnames']); |
|
| 297 | + { |
|
| 298 | + $addnames = trim($name_arr['additionalnames']); |
|
| 299 | + } |
|
| 264 | 300 | |
| 265 | 301 | if(isset($org_arr['name']) and $this->config['orgname']) |
| 266 | - $orgname = trim($org_arr['name']); |
|
| 302 | + { |
|
| 303 | + $orgname = trim($org_arr['name']); |
|
| 304 | + } |
|
| 267 | 305 | |
| 268 | 306 | if (isset($vcard_obj->fn[0])) |
| 269 | - $formattedname = $vcard_obj->fn[0]; |
|
| 307 | + { |
|
| 308 | + $formattedname = $vcard_obj->fn[0]; |
|
| 309 | + } |
|
| 270 | 310 | |
| 271 | 311 | $firstname = trim($name_arr['firstname']); |
| 272 | 312 | $lastname = trim($name_arr['lastname']); |
@@ -286,78 +326,106 @@ discard block |
||
| 286 | 326 | |
| 287 | 327 | // Prefix |
| 288 | 328 | if(!empty($prefix)) |
| 289 | - $name .= $prefix; |
|
| 329 | + { |
|
| 330 | + $name .= $prefix; |
|
| 331 | + } |
|
| 290 | 332 | |
| 291 | 333 | if($format == 0) |
| 292 | 334 | { |
| 293 | 335 | // Lastname |
| 294 | 336 | if(!empty($name) and !empty($lastname)) |
| 295 | - $name .= ' ' . $lastname; |
|
| 296 | - else |
|
| 297 | - $name .= $lastname; |
|
| 337 | + { |
|
| 338 | + $name .= ' ' . $lastname; |
|
| 339 | + } |
|
| 340 | + else { |
|
| 341 | + $name .= $lastname; |
|
| 342 | + } |
|
| 298 | 343 | } |
| 299 | 344 | else |
| 300 | 345 | { |
| 301 | 346 | // Firstname |
| 302 | 347 | if(!empty($name) and !empty($firstname)) |
| 303 | - $name .= ' ' . $firstname; |
|
| 304 | - else |
|
| 305 | - $name .= $firstname; |
|
| 348 | + { |
|
| 349 | + $name .= ' ' . $firstname; |
|
| 350 | + } |
|
| 351 | + else { |
|
| 352 | + $name .= $firstname; |
|
| 353 | + } |
|
| 306 | 354 | } |
| 307 | 355 | |
| 308 | 356 | if($format == 2) |
| 309 | 357 | { |
| 310 | 358 | // AdditionalNames |
| 311 | 359 | if(!empty($name) and !empty($addnames)) |
| 312 | - $name .= ' ' . $addnames; |
|
| 313 | - else |
|
| 314 | - $name .= $addnames; |
|
| 360 | + { |
|
| 361 | + $name .= ' ' . $addnames; |
|
| 362 | + } |
|
| 363 | + else { |
|
| 364 | + $name .= $addnames; |
|
| 365 | + } |
|
| 315 | 366 | } |
| 316 | 367 | |
| 317 | 368 | if($format == 0) |
| 318 | 369 | { |
| 319 | 370 | // Firstname |
| 320 | 371 | if(!empty($name) and !empty($firstname)) |
| 321 | - $name .= ', ' . $firstname; |
|
| 322 | - else |
|
| 323 | - $name .= $firstname; |
|
| 372 | + { |
|
| 373 | + $name .= ', ' . $firstname; |
|
| 374 | + } |
|
| 375 | + else { |
|
| 376 | + $name .= $firstname; |
|
| 377 | + } |
|
| 324 | 378 | } |
| 325 | 379 | else |
| 326 | 380 | { |
| 327 | 381 | // Lastname |
| 328 | 382 | if(!empty($name) and !empty($lastname)) |
| 329 | - $name .= ' ' . $lastname; |
|
| 330 | - else |
|
| 331 | - $name .= $lastname; |
|
| 383 | + { |
|
| 384 | + $name .= ' ' . $lastname; |
|
| 385 | + } |
|
| 386 | + else { |
|
| 387 | + $name .= $lastname; |
|
| 388 | + } |
|
| 332 | 389 | } |
| 333 | 390 | |
| 334 | 391 | if($format != 2) |
| 335 | 392 | { |
| 336 | 393 | // AdditionalNames |
| 337 | 394 | if(!empty($name) and !empty($addnames)) |
| 338 | - $name .= ' ' . $addnames; |
|
| 339 | - else |
|
| 340 | - $name .= $addnames; |
|
| 395 | + { |
|
| 396 | + $name .= ' ' . $addnames; |
|
| 397 | + } |
|
| 398 | + else { |
|
| 399 | + $name .= $addnames; |
|
| 400 | + } |
|
| 341 | 401 | } |
| 342 | 402 | |
| 343 | 403 | // Suffix |
| 344 | 404 | if(!empty($name) and !empty($suffix)) |
| 345 | - $name .= ' ' . $suffix; |
|
| 346 | - else |
|
| 347 | - $name .= $suffix; |
|
| 405 | + { |
|
| 406 | + $name .= ' ' . $suffix; |
|
| 407 | + } |
|
| 408 | + else { |
|
| 409 | + $name .= $suffix; |
|
| 410 | + } |
|
| 348 | 411 | |
| 349 | 412 | // OrgName |
| 350 | 413 | if(!empty($name) and !empty($orgname)) |
| 351 | - $name .= ' (' . $orgname . ')'; |
|
| 352 | - else |
|
| 353 | - $name .= $orgname; |
|
| 414 | + { |
|
| 415 | + $name .= ' (' . $orgname . ')'; |
|
| 416 | + } |
|
| 417 | + else { |
|
| 418 | + $name .= $orgname; |
|
| 419 | + } |
|
| 354 | 420 | |
| 355 | 421 | // make sure to trim whitespaces and double spaces |
| 356 | 422 | $name = trim(str_replace(' ', ' ', $name)); |
| 357 | 423 | |
| 358 | 424 | // perform a fallback to formatted name, if we don't have any name and formatted name is available |
| 359 | 425 | if(empty($name) and !empty($formattedname)) |
| 360 | - $name = $formattedname; |
|
| 426 | + { |
|
| 427 | + $name = $formattedname; |
|
| 428 | + } |
|
| 361 | 429 | |
| 362 | 430 | if(empty($name)) |
| 363 | 431 | { |
@@ -371,15 +439,19 @@ discard block |
||
| 371 | 439 | $photo = str_replace(array(',', '&', ' ', '/', 'ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß', 'á', 'à', 'ó', 'ò', 'ú', 'ù', 'í', 'ø'), |
| 372 | 440 | array('', '_', '_', '_', 'ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss', 'a', 'a', 'o', 'o', 'u', 'u', 'i', 'oe'), $name); |
| 373 | 441 | } |
| 374 | - else |
|
| 375 | - $photo = ''; |
|
| 442 | + else { |
|
| 443 | + $photo = ''; |
|
| 444 | + } |
|
| 376 | 445 | |
| 377 | 446 | // phone |
| 378 | 447 | $phone_no = array(); |
| 379 | 448 | if($vcard_obj->categories) |
| 380 | - $categories = $vcard_obj->categories[0]; |
|
| 381 | - else |
|
| 382 | - $categories = array(); |
|
| 449 | + { |
|
| 450 | + $categories = $vcard_obj->categories[0]; |
|
| 451 | + } |
|
| 452 | + else { |
|
| 453 | + $categories = array(); |
|
| 454 | + } |
|
| 383 | 455 | |
| 384 | 456 | // check for quickdial entry |
| 385 | 457 | if(isset($vcard_obj->note[0])) |
@@ -414,9 +486,10 @@ discard block |
||
| 414 | 486 | break; |
| 415 | 487 | } |
| 416 | 488 | } |
| 417 | - } |
|
| 418 | - else |
|
| 419 | - $add_entry = 1; |
|
| 489 | + } |
|
| 490 | + else { |
|
| 491 | + $add_entry = 1; |
|
| 492 | + } |
|
| 420 | 493 | |
| 421 | 494 | if($add_entry == 1) |
| 422 | 495 | { |
@@ -441,9 +514,13 @@ discard block |
||
| 441 | 514 | { |
| 442 | 515 | //Set quickdial |
| 443 | 516 | if($value == 1) |
| 444 | - print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n"; |
|
| 517 | + { |
|
| 518 | + print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n"; |
|
| 519 | + } |
|
| 445 | 520 | elseif($value >= 100) |
| 446 | - print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n"; |
|
| 521 | + { |
|
| 522 | + print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n"; |
|
| 523 | + } |
|
| 447 | 524 | |
| 448 | 525 | $quickdial = $value; |
| 449 | 526 | } |
@@ -453,23 +530,38 @@ discard block |
||
| 453 | 530 | |
| 454 | 531 | // find out priority |
| 455 | 532 | if(in_array("pref", $typearr_lower)) |
| 456 | - $prio = 1; |
|
| 533 | + { |
|
| 534 | + $prio = 1; |
|
| 535 | + } |
|
| 457 | 536 | |
| 458 | 537 | // set the proper type |
| 459 | 538 | if(in_array("cell", $typearr_lower)) |
| 460 | - $type = "mobile"; |
|
| 539 | + { |
|
| 540 | + $type = "mobile"; |
|
| 541 | + } |
|
| 461 | 542 | elseif(in_array("home", $typearr_lower)) |
| 462 | - $type = "home"; |
|
| 543 | + { |
|
| 544 | + $type = "home"; |
|
| 545 | + } |
|
| 463 | 546 | elseif(in_array("fax", $typearr_lower)) |
| 464 | - $type = "fax_work"; |
|
| 547 | + { |
|
| 548 | + $type = "fax_work"; |
|
| 549 | + } |
|
| 465 | 550 | elseif(in_array("work", $typearr_lower)) |
| 466 | - $type = "work"; |
|
| 551 | + { |
|
| 552 | + $type = "work"; |
|
| 553 | + } |
|
| 467 | 554 | elseif(in_array("other", $typearr_lower)) |
| 468 | - $type = "other"; |
|
| 555 | + { |
|
| 556 | + $type = "other"; |
|
| 557 | + } |
|
| 469 | 558 | elseif(in_array("dom", $typearr_lower)) |
| 470 | - $type = "other"; |
|
| 471 | - else |
|
| 472 | - continue; |
|
| 559 | + { |
|
| 560 | + $type = "other"; |
|
| 561 | + } |
|
| 562 | + else { |
|
| 563 | + continue; |
|
| 564 | + } |
|
| 473 | 565 | } |
| 474 | 566 | $phone_no[] = array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number)); |
| 475 | 567 | } |
@@ -489,13 +581,20 @@ discard block |
||
| 489 | 581 | $email = $e['value']; |
| 490 | 582 | $typearr_lower = unserialize(strtolower(serialize($e['type']))); |
| 491 | 583 | if(in_array("work", $typearr_lower)) |
| 492 | - $type_email = "work"; |
|
| 584 | + { |
|
| 585 | + $type_email = "work"; |
|
| 586 | + } |
|
| 493 | 587 | elseif(in_array("home", $typearr_lower)) |
| 494 | - $type_email = "home"; |
|
| 588 | + { |
|
| 589 | + $type_email = "home"; |
|
| 590 | + } |
|
| 495 | 591 | elseif(in_array("other", $typearr_lower)) |
| 496 | - $type_email = "other"; |
|
| 497 | - else |
|
| 498 | - continue; |
|
| 592 | + { |
|
| 593 | + $type_email = "other"; |
|
| 594 | + } |
|
| 595 | + else { |
|
| 596 | + continue; |
|
| 597 | + } |
|
| 499 | 598 | } |
| 500 | 599 | |
| 501 | 600 | // DEBUG: print out the email address on the console |
@@ -523,7 +622,9 @@ discard block |
||
| 523 | 622 | public function build_fb_xml() |
| 524 | 623 | { |
| 525 | 624 | if(empty($this->entries)) |
| 526 | - throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!'); |
|
| 625 | + { |
|
| 626 | + throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!'); |
|
| 627 | + } |
|
| 527 | 628 | |
| 528 | 629 | // create FB XML in utf-8 format |
| 529 | 630 | $root = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><phonebooks><phonebook></phonebook></phonebooks>'); |
@@ -562,7 +663,9 @@ discard block |
||
| 562 | 663 | |
| 563 | 664 | // output a warning if no telephone number was found |
| 564 | 665 | if($id == 0) |
| 565 | - print " WARNING: no phone entry found. VCard will be ignored." . PHP_EOL; |
|
| 666 | + { |
|
| 667 | + print " WARNING: no phone entry found. VCard will be ignored." . PHP_EOL; |
|
| 668 | + } |
|
| 566 | 669 | |
| 567 | 670 | // email: put the email addresses into the fritzbox xml file |
| 568 | 671 | $email = $contact->addChild("services"); |
@@ -612,8 +715,9 @@ discard block |
||
| 612 | 715 | |
| 613 | 716 | print " Added photo: " . basename($photo_file) . PHP_EOL; |
| 614 | 717 | } |
| 615 | - else |
|
| 616 | - print " WARNING: Only jpg contact photos are currently supported." . PHP_EOL; |
|
| 718 | + else { |
|
| 719 | + print " WARNING: Only jpg contact photos are currently supported." . PHP_EOL; |
|
| 720 | + } |
|
| 617 | 721 | } |
| 618 | 722 | elseif(substr($entry['photo_data'][0], 0, 4) == 'http') |
| 619 | 723 | { |
@@ -622,8 +726,9 @@ discard block |
||
| 622 | 726 | |
| 623 | 727 | print " Added photo: " . $entry['photo_data'][0] . PHP_EOL; |
| 624 | 728 | } |
| 625 | - else |
|
| 626 | - print " WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL; |
|
| 729 | + else { |
|
| 730 | + print " WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL; |
|
| 731 | + } |
|
| 627 | 732 | } |
| 628 | 733 | |
| 629 | 734 | $contact->addChild("services"); |
@@ -632,7 +737,9 @@ discard block |
||
| 632 | 737 | } |
| 633 | 738 | |
| 634 | 739 | if($root->asXML() !== false) |
| 635 | - $this->fbxml = $root->asXML(); |
|
| 740 | + { |
|
| 741 | + $this->fbxml = $root->asXML(); |
|
| 742 | + } |
|
| 636 | 743 | else |
| 637 | 744 | { |
| 638 | 745 | print " ERROR: created XML data isn't well-formed." . PHP_EOL; |
@@ -649,19 +756,27 @@ discard block |
||
| 649 | 756 | public function _concat($text1, $text2) |
| 650 | 757 | { |
| 651 | 758 | if($text1 == '') |
| 652 | - return $text2; |
|
| 759 | + { |
|
| 760 | + return $text2; |
|
| 761 | + } |
|
| 653 | 762 | elseif($text2 == '') |
| 654 | - return $text1; |
|
| 655 | - else |
|
| 656 | - return $text1 . ", " . $text2; |
|
| 763 | + { |
|
| 764 | + return $text1; |
|
| 765 | + } |
|
| 766 | + else { |
|
| 767 | + return $text1 . ", " . $text2; |
|
| 768 | + } |
|
| 657 | 769 | } |
| 658 | 770 | |
| 659 | 771 | public function _parse_fb_result($text) |
| 660 | 772 | { |
| 661 | 773 | if(preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches) == 1 && !empty($matches)) |
| 662 | - return $matches[1]; |
|
| 663 | - else |
|
| 664 | - return "Error while uploading xml to fritzbox"; |
|
| 774 | + { |
|
| 775 | + return $matches[1]; |
|
| 776 | + } |
|
| 777 | + else { |
|
| 778 | + return "Error while uploading xml to fritzbox"; |
|
| 779 | + } |
|
| 665 | 780 | } |
| 666 | 781 | |
| 667 | 782 | public function upload_to_fb() |
@@ -683,15 +798,17 @@ discard block |
||
| 683 | 798 | $newphonebhash = md5(preg_replace("/<mod_time>(\\d{10})/","",file_get_contents($this->config['output_file'],'r'),-1,$debugnewtsreplace)); |
| 684 | 799 | print " INFO: Compare old and new phonebook file versions." . PHP_EOL . " INFO: old version: " . $oldphonebhash . PHP_EOL . " INFO: new version: " . $newphonebhash . PHP_EOL; |
| 685 | 800 | if($oldphonebhash === $newphonebhash) |
| 686 | - { |
|
| 801 | + { |
|
| 687 | 802 | print " INFO: Same versions ==> No changes in phonebook or images" . PHP_EOL . " EXIT: No need to upload phonebook to the FRITZ!Box.". PHP_EOL; |
| 688 | 803 | return 0; |
| 689 | 804 | } |
| 690 | - else |
|
| 691 | - print " INFO: Different versions ==> Changes in phonebook." . PHP_EOL . " INFO: Changes dedected! Continue with upload." . PHP_EOL; |
|
| 805 | + else { |
|
| 806 | + print " INFO: Different versions ==> Changes in phonebook." . PHP_EOL . " INFO: Changes dedected! Continue with upload." . PHP_EOL; |
|
| 807 | + } |
|
| 692 | 808 | } |
| 693 | - else |
|
| 694 | - return 0; |
|
| 809 | + else { |
|
| 810 | + return 0; |
|
| 811 | + } |
|
| 695 | 812 | } |
| 696 | 813 | // now we upload the photo jpgs first being stored in the |
| 697 | 814 | // temp directory. |
@@ -761,12 +878,16 @@ discard block |
||
| 761 | 878 | |
| 762 | 879 | ftp_pasv($conn_id, true); |
| 763 | 880 | if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY)) |
| 764 | - print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL; |
|
| 765 | - else |
|
| 766 | - print " ok." . PHP_EOL; |
|
| 881 | + { |
|
| 882 | + print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL; |
|
| 883 | + } |
|
| 884 | + else { |
|
| 885 | + print " ok." . PHP_EOL; |
|
| 886 | + } |
|
| 887 | + } |
|
| 888 | + else { |
|
| 889 | + print " ok." . PHP_EOL; |
|
| 767 | 890 | } |
| 768 | - else |
|
| 769 | - print " ok." . PHP_EOL; |
|
| 770 | 891 | |
| 771 | 892 | // cleanup old files |
| 772 | 893 | foreach($all_existing_files as $existing_file) |
@@ -778,20 +899,23 @@ discard block |
||
| 778 | 899 | } |
| 779 | 900 | } |
| 780 | 901 | } |
| 781 | - else |
|
| 782 | - print " already exists." . PHP_EOL; |
|
| 902 | + else { |
|
| 903 | + print " already exists." . PHP_EOL; |
|
| 904 | + } |
|
| 783 | 905 | } |
| 784 | 906 | } |
| 785 | 907 | } |
| 786 | 908 | } |
| 787 | - else |
|
| 788 | - print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL; |
|
| 909 | + else { |
|
| 910 | + print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL; |
|
| 911 | + } |
|
| 789 | 912 | |
| 790 | 913 | // close ftp connection |
| 791 | 914 | ftp_close($conn_id); |
| 792 | 915 | } |
| 793 | - else |
|
| 794 | - print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL; |
|
| 916 | + else { |
|
| 917 | + print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL; |
|
| 918 | + } |
|
| 795 | 919 | |
| 796 | 920 | // lets post the phonebook xml to the FRITZ!Box |
| 797 | 921 | print " Uploading Phonebook XML to " . $this->config['fritzbox_ip'] . PHP_EOL; |