Difference with andig fork

.editorconfig

@@ -0,0 +1,15 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# PHP PSR-2 Coding Standards
+# http://www.php-fig.org/psr/psr-2/
+
+root = true
+
+[*.php]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4

.gitignore

@@ -1 +1,5 @@
+/composer.lock
 /config.php
+/cards.xml
+/vendor/
+php-cs-fixer.config

.php_cs.php

@@ -0,0 +1,14 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('src')
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+    ->setUsingCache(false)
+;

.travis.yml

@@ -0,0 +1,37 @@
+sudo: false
+
+language: php
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+install:
+  - composer install
+
+matrix:
+  fast_finish: true
+
+jobs:
+  include:
+    - stage: Test
+      php: 7.1
+      script:
+        phpunit
+    - stage: Static Analysis
+      php: 7.1
+      install:
+        - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+        - composer require --dev "phpstan/phpstan"
+      script:
+        # Static analyzer check
+        - ./vendor/bin/phpstan analyze --level=5 --no-progress src
+    - stage: Code Style
+      php: 7.1
+      install:
+        - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+        - composer require --dev "friendsofphp/php-cs-fixer:^2.8"
+      script:
+        # Check the code style
+        - IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS
+        - ./vendor/bin/php-cs-fixer fix --config=.php_cs.php -v --dry-run --diff --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"

README.md

@@ -1,100 +1,55 @@
 # CardDAV contacts import for AVM FRITZ!Box
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BB3W3WH7GVSNW)
 
-[![Build Status](https://scrutinizer-ci.com/g/jens-maus/carddav2fb/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jens-maus/carddav2fb/build-status/master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jens-maus/carddav2fb/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jens-maus/carddav2fb/?branch=master)
+This is an entirely simplified version of https://github.com/jens-maus/carddav2fb. The Vcard parser has been replaced by an extended version of https://github.com/jeroendesloovere/vcard.
 
-Features:
+## Features
 
-* Allows to import CardDAV-based VCard contacts (e.g. from 'owncloud') to a phonebook in a AVM FRITZ!Box
-* CardDAV import includes photo images specified in VCards
-* No modification of FRITZ!Box firmware (aka FRITZ!OS) required
-* Definition of multiple CardDAV accounts and "folders" possible
-* Format of full name in FRITZ!Box phonebook can be designed
-
-**CAUTION: This script will overwrite your current contacts in the FritzBox without any warning!**
-
-## Information
-
-This version of carddav2fb is a forked version from carlos22 (https://github.com/carlos22/carddav2fb) and adding support for convenient image upload, different FRITZ!Box base paths (for example for FRITZ!Box 7490 (UI) OS: 6.50) and full name design support. 
+  * download from any number of CardDAV servers
+  * selection (include/exclude) by categories or groups (e.g. iCloud)
+  * upload of contact pictures to display them on the FRITZ!Fon (handling see below)
+  * transfer of quick dial and vanity numbers (see wiki for handling details)
+  * if more than nine phone numbers are included, the contact will be divided into a corresponding number of phonebook entries (any existing email addresses are assigned to the first set [there is no quantity limit!])
+  * phone numbers are sorted by type. The order of the conversion values ('phoneTypes') determines the order in the phone book entry
+  * the contact's UID of the CardDAV server is added to the phonebook entry (not visible in the FRITZ! Box GUI)
 
 ## Requirements
 
-* PHP-version 5.3.6 or higher
-* PHP-curl module
-* PHP-ftp module
-* PHP-mbstring module
+  * PHP >7.0 (`apt-get install php php-curl php-mbstring php-xml`)
+  * Composer (follow the installation guide at https://getcomposer.org/download/)
 
 ## Installation
 
- Checkout the carddav2fb sources including its related subprojects using the following command:
+Install requirements
 
-		git clone https://github.com/jens-maus/carddav2fb.git
+    git clone https://github.com/andig/carddav2fb.git
+    cd carddav2fb
+    composer install --no-dev
 
-Now you should have everything setup and checked out to a 'carddav2fb' directory.
-
-### Configuration
-1. Make sure you have `System -> FRITZ!Box-Users -> Login via Username+Password` in your FRITZ!Box activated.
-2. Make sure you have a separate user created under `System -> FRITZ!Box-Users` for which the following access rights have been granted: 
-  * `FRITZ!Box settings` (required to upload telephone book data)
-  * `Access to NAS content` (required to upload photos via ftp).
-3. Make sure the telephone book you are going to update via carddav2fb exists on the FRITZ!Box, otherwise the upload will fail.
-4. Copy `config.example.php` to `config.php` and adapt it to your needs including setting the FRITZ!Box user settings.
+edit `config.example.php` and save as `config.php`
 
 ## Usage
 
-### Ubuntu
-
-1. Install PHP, PHP-curl, PHP-ftp, PHP-mbstring and php-xml module:
-
-		sudo apt-get install php-cli php-curl php-ftp php-mbstring php-xml
-
-2. Open a Terminal and execute:
-
-		php carddav2fb.php
-
-### Windows
+List all commands:
 
-1. Download PHP from [php.net](http://windows.php.net/download/). Extract it to `C:\PHP`.
-2. Start -> cmd. Run `C:\PHP\php.exe C:\path\to\carddav2fb\carddav2fb.php`
+    php carddav2fb.php list
 
-## config.php Example (owncloud)
+Complete processing:
 
-	$config['fritzbox_ip'] = 'fritz.box';
-	$config['fritzbox_user'] = '<USERNAME>';
-	$config['fritzbox_pw'] = '<PASSWORD>';
-	$config['phonebook_number'] = '0';
-	$config['phonebook_name'] = 'Telefonbuch';
-	$config['fritzbox_path'] = 'file:///var/media/ftp/';
+    php carddav2fb.php run
 
-	// full name format options default 0
-	// parts in '' will only added if existing and switched to true in config
-	// 0 =  'Prefix' Lastname, Firstname, 'Additional Names', 'Suffix', 'orgname'
-	// 1 =  'Prefix' Firstname Lastname 'AdditionalNames' 'Suffix' '(orgname)'
-	// 2 =  'Prefix' Firstname 'AdditionalNames' Lastname 'Suffix' '(orgname)'
-	$config['fullname_format'] = 0;
+Get help for a command:
 
-	// fullname parts
-	$config['prefix'] = false; // include prefix in fullname if existing
-	$config['suffix'] = false; // include suffix in fullname if existing
-	$config['addnames'] = false; // include additionalnames in fullname if existing
-	$config['orgname'] = false; // include organisation (company) in fullname if existing
-
-	$config['quickdial_keyword'] = 'Quickdial:'; // once activated you may add 'Quickdial:+49030123456:**709' to the contact note field and the number will be set as quickdialnumber in your FRITZ!Box. It is possible to add more quickdials for one contact each in a new line
+    php carddav2fb.php run -h
 
-	// first
-	$config['carddav'][0] = array(
-	  'url' => 'https://<HOSTNAME>/remote.php/carddav/addressbooks/<USERNAME>/contacts',
-	  'user' => '<USERNAME>',
-	  'pw' => '<PASSWORD>'
-	);
+## Precondition for using image upload (command -i)
 
-## Note
-This script is using third-party libraries for downloading VCards from CardDAV servers based on the following packages
-* CardDAV-PHP (https://github.com/jens-maus/CardDAV-PHP.git)
-* FRITZ!Box-API-PHP (https://github.com/jens-maus/fritzbox_api_php.git)
-* VCard-Parser (https://github.com/jens-maus/vCard-parser.git)
+  * your memory (USB stick) is indexed [Heimnetz -> Speicher (NAS) -> Speicher an der FRITZ!Box]
+  * ftp access is activ [Heimnetz -> Speicher (NAS) -> Heimnetzfreigabe]
+  * you use an standalone user (NOT! dslf-config) which has explicit permissions for FRITZ!Box settings, access to NAS content and read/write permission to all available memory [System -> FRITZ!Box-Benutzer -> [user] -> Berechtigungen]
 
 ## License
-This script is released under Public Domain.
+This script is released under Public Domain, some parts under GNU AGPL or MIT license. Make sure you understand which parts are which.
 
 ## Authors
-Copyright (c) 2012-2016 Karl Glatz, Martin Rost, Jens Maus, Johannes Freiburger
+Copyright (c) 2012-2019 Andreas Götz, Volker Püschel, Karl Glatz, Christian Putzke, Martin Rost, Jens Maus, Johannes Freiburger