From 59b316d9a23fd31598100536680c04a5dcb8026f Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 08:42:57 +0100
Subject: [PATCH 01/87] Create upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 misc/scripts/upgrade-pb-3.2-3.3.sql

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
new file mode 100644
index 000000000..bd18c3879
--- /dev/null
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -0,0 +1,42 @@
+CREATE TABLE IF NOT EXISTS `pb_prv` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `firstname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `lastname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `number` varchar(25) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `ptype` varchar(16) COLLATE utf8_unicode_ci NOT NULL COMMENT 'cell,work,home',
+  `vcard_id` int(11) NOT NULL,
+  `cat_id` int(11) NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `uid_lastname_firstname` (`user_id`,`lastname`(15),`firstname`(10)),
+  KEY `uid_firstname_lastname` (`user_id`,`firstname`(10),`lastname`(10)),
+  KEY `uid_number` (`user_id`,`number`(10)),
+  KEY `uid_vcard` (`user_id`,`vcard_id`),
+  KEY `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`),
+  KEY `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `pb_cloud` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) NOT NULL,
+  `url` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
+  `login` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `pass` varbinary(64) NOT NULL,
+  `frequency` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1d',
+  `next_poll` datetime NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `next_poll` (`next_poll`),
+  KEY `url` (`user_id`,`url`(255)),
+  KEY `login` (`user_id`,`login`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+ALTER TABLE `pb_prv`  ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
+ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL;
+ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL;
+ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`);
+ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`);
+ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`);

From 03faefe78ae7af053ad411cfd0e07b96e728fe9e Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:01:12 +0100
Subject: [PATCH 02/87] added categories

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index bd18c3879..bd2d7c8a1 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,3 +1,4 @@
+// gs 3.3 private phonebook
 CREATE TABLE IF NOT EXISTS `pb_prv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -17,6 +18,17 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   KEY `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+// alter existing 3.2 private phonebook
+ALTER TABLE `pb_prv`  ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
+ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL;
+ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL;
+ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`);
+ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`);
+ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`);
+
+
+// import voip phone book from cloud for preparing the xml to phone functionality
 CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL,
@@ -33,10 +45,11 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   KEY `login` (`user_id`,`login`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-ALTER TABLE `pb_prv`  ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
-ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL;
-ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL;
-ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`);
-ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`);
-ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`);
+// add categories like family etc. to phone book
+CREATE TABLE IF NOT EXISTS `pb_category` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) NOT NULL,
+  `category` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

From 0cf62efa79f51b1b7206b5cb4a6b5fec34ec5a03 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:27:27 +0100
Subject: [PATCH 03/87] Update pb_private.php

---
 .../htdocs/gui/mod/pb_private.php             | 58 ++++++++++++++++---
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index de3984d11..da4c7d730 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -10,6 +10,10 @@
 * Philipp Kempgen <philipp.kempgen@amooma.de>
 * Peter Kozak <peter.kozak@amooma.de>
 * Soeren Sprenger <soeren.sprenger@amooma.de>
+* Markus Neubauer <markus.neubauer@email-online.org> - 2015
+*  - extending db and preparing for vcards
+* you need to alter the db for this version to work:
+* 
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -52,9 +56,11 @@ function confirm_delete() {
 
 $name         =      trim(@$_REQUEST['name'   ]);
 $number       =      trim(@$_REQUEST['number' ]);
+$ptype        =      trim(@$_REQUEST['ptype' ]);
 $save_lname   =      trim(@$_REQUEST['slname' ]);
 $save_fname   =      trim(@$_REQUEST['sfname' ]);
 $save_number  =      trim(@$_REQUEST['snumber']);
+$save_ptype   =      trim(@$_REQUEST['sptype']);
 $page         = (int)    (@$_REQUEST['page'   ]);
 $delete_entry = (int)trim(@$_REQUEST['delete' ]);
 $edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
@@ -78,18 +84,19 @@ function confirm_delete() {
 	if ($save_entry < 1) {
 		
 		$rs = $DB->execute(
-'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`) VALUES
-(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\')'
+'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`, `ptype`) VALUES
+(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\', \''. $DB->escape($save_ptype) .'\')'
 		);
 		
 	} else {
 		
 		$rs = $DB->execute(
-'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\'
+'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
 WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
 	$save_number = '';
 	$save_name = '';
+	$save_ptype = '';
 		
 	}
 }
@@ -112,7 +119,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number` '.
+			'`id`, `lastname`, `firstname`, `number` , `ptype` '.
 		'FROM '.
 			'`pb_prv` '.
 		'WHERE '.
@@ -140,7 +147,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number` '.
+			'`id`, `lastname`, `firstname`, `number`, `ptype` '.
 		'FROM '.
 			'`pb_prv` '.
 		'WHERE '.
@@ -164,7 +171,7 @@ function confirm_delete() {
 <tr>
 	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
 	<th style="width:200px;"><?php echo __('Nummer suchen'); ?></th>
-	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+	<th style="width:220px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
 </tr>
 </thead>
 <tbody>
@@ -214,7 +221,7 @@ function confirm_delete() {
 	</td>
 </tr>
 <tr>
-	<td colspan="2" class="quickchars">
+	<td colspan="3" class="quickchars">
 <?php
 
 $chars = array();
@@ -237,6 +244,7 @@ function confirm_delete() {
 echo gs_form_hidden($SECTION, $MODULE), "\n";
 echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
 echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
+echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
 ?>
 
 <table cellspacing="1" class="phonebook">
@@ -248,6 +256,9 @@ function confirm_delete() {
 	<th style="width:200px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
 		<?php echo __('Nummer'); ?>
 	</th>
+	<th style="width:100px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Location'); ?><sup>[1]</sup>
+	</th>
 	<th style="width:100px;">&nbsp;</th>
 </tr>
 </thead>
@@ -270,6 +281,10 @@ function confirm_delete() {
 			echo '<input type="text" name="snumber" value="', htmlEnt($r['number']), '" size="15" maxlength="25" style="width:150px;" />';
 			echo '</td>', "\n";
 			
+			echo '<td>';
+			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:100px;" />';
+			echo '</td>', "\n";
+			
 			echo '<td>';
 			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
 			echo '<input type="hidden" name="page" value="', $page, '" />';
@@ -291,6 +306,8 @@ function confirm_delete() {
 			echo '</td>', "\n";
 			
 			echo '<td>', htmlEnt($r['number']), '</td>', "\n";
+
+			echo '<td>', htmlEnt($r['ptype']), '</td>', "\n";
 			
 			echo '<td>';
 			$sudo_url =
@@ -320,6 +337,9 @@ function confirm_delete() {
 	<td>
 		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
 	</td>
+	<td>
+		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:100px;" />
+	</td>
 	<td>
 		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
 			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
@@ -335,3 +355,27 @@ function confirm_delete() {
 </table>
 
 </form>
+<br>
+<p class="text"><sup>[1]</sup> Type of phone number: cell/work/home etc.</p>
+<?php
+/*
+function check_pb_table() {
+
+	if ( empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "ptype"')->fetchRow() ) ) {
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `ptype` varchar(16) NOT NULL COMMENT "cell,work,home"');
+	}
+	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "vcard_id"')->fetchRow() )) {
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL');
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`)');
+	}
+	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "cat_id"')->fetchRow() )) {
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL');
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`)');
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`)');
+	}
+	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "modified"')->fetchRow() )) {
+		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP');
+	}
+}
+*/
+?>

From eefe71bbfaf255ee6c30ab32b8523576e9b02407 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:28:24 +0100
Subject: [PATCH 04/87] Create pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 384 +++++++++++++++++++
 1 file changed, 384 insertions(+)
 create mode 100644 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
new file mode 100644
index 000000000..da66d2581
--- /dev/null
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -0,0 +1,384 @@
+<?php
+/*******************************************************************\
+*            Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
+* http://www.std-soft.com/
+* Markus Neubauer <markus.neubauer@email-online.org>
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+defined('GS_VALID') or die('No direct access.');
+include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
+
+echo '<h2>';
+if (@$MODULES[$SECTION]['icon'])
+	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
+if (count( $MODULES[$SECTION]['sub'] ) > 1 )
+	echo $MODULES[$SECTION]['title'], ' - ';
+echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
+echo '</h2>', "\n";
+
+
+echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
+echo '<script type="text/javascript">
+//<![CDATA[
+function confirm_delete() {
+	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
+}
+//]]>
+</script>' ,"\n";
+
+$per_page = (int)GS_GUI_NUM_RESULTS;
+
+$name         =      trim(@$_REQUEST['name'   ]);
+$url          =      trim(@$_REQUEST['url' ]);
+$login        =      trim(@$_REQUEST['login' ]);
+$pass         =      trim(@$_REQUEST['pass' ]);
+$frequency    =      trim(@$_REQUEST['frequency' ]);
+$save_url     =      trim(@$_REQUEST['surl']);
+$save_login   =      trim(@$_REQUEST['slogin' ]);
+$save_pass    =      trim(@$_REQUEST['spass' ]);
+$save_frequency =    trim(@$_REQUEST['sfrequency' ]);
+$page         = (int)    (@$_REQUEST['page'   ]);
+$delete_entry = (int)trim(@$_REQUEST['delete' ]);
+$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
+$save_entry   = (int)trim(@$_REQUEST['save'   ]);
+
+$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
+
+if ($delete_entry > 0) {
+	# delete entry
+	
+	$rs = $DB->execute(
+'DELETE FROM `pb_cloud`
+WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
+	);
+	
+}
+
+if (($save_url != '' || $save_login != '') && ($save_pass != '')) {
+	# save entry
+
+	// check or correct frequency
+	if ( empty($save_frequency) ) {
+		$save_frequency='1d';
+	} else {
+		$p = substr($save_frequency, -1);
+		if ( ! ('h' == $p || 'd' == $p || 'm' == $p) ) {
+			$save_frequency='1d';
+		}
+	}
+	
+	if ($save_entry < 1) {
+		
+		$rs = $DB->execute(
+'INSERT INTO `pb_cloud` (`id`, `user_id`, `url`, `login`, `pass`, `frequency`, `next_poll`) VALUES
+(NULL, '. $user_id .', \''. $DB->escape($save_url) .'\', \''. $DB->escape($save_login) .'\', des_encrypt(\''. $save_pass .'\',\'' . $save_login. '\'), \''. $DB->escape($save_frequency) .'\', NOW())'
+		);
+		
+	} else {
+		
+		$rs = $DB->execute(
+'UPDATE `pb_cloud` SET `url`=\''. $DB->escape($save_url) .'\', `login`=\''. $DB->escape($save_login) .'\', `pass`=des_encrypt(\''. $save_pass .'\',\'' . $save_login .'\'), `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW() 
+ WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
+		);
+	$save_url = '';
+	$save_login = '';
+	$save_pass = '';
+	$save_frequency = '';
+		
+	}
+}
+
+
+
+
+
+if ($url != '') {
+	
+	# search by url
+	
+	$search_url = 'url='. urlEncode($url);
+	
+	$url_sql = '%' . str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$url
+	) .'%';
+	
+	$rs = $DB->execute(
+		'SELECT SQL_CALC_FOUND_ROWS '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency` '.
+		'FROM '.
+			'`pb_cloud` '.
+		'WHERE '.
+			'`url` LIKE \''. $DB->escape($url_sql) .'\' '.
+			'AND '.
+			'`user_id`='. $user_id .' '.
+		'ORDER BY `url`, `login` '.
+		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
+		);
+	$num_total = @$DB->numFoundRows();
+	$num_pages = ceil($num_total / $per_page);
+	
+} else {
+	
+	# search by login
+	
+	$search_url = 'login='. urlEncode($login);
+	
+	$login_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$login
+	) .'%';
+	
+	$rs = $DB->execute(
+		'SELECT SQL_CALC_FOUND_ROWS '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency` '.
+		'FROM '.
+			'`pb_cloud` '.
+		'WHERE '.
+			'`login` LIKE \''. $DB->escape($login_sql) .'\' '.
+			'AND '.
+			'`user_id`='. $DB->escape($user_id).' '.
+		'ORDER BY `login`, `url` '.
+		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
+		);
+	$num_total = @$DB->numFoundRows();
+	$num_pages = ceil($num_total / $per_page);
+	
+}
+
+
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"><?php echo __('URL suchen'); ?></th>
+	<th style="width:200px;"><?php echo __('Login suchen'); ?></th>
+	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="text" name="url" id="ipt-url" value="<?php echo htmlEnt($url); ?>" size="256" style="width:200px;" />
+		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-url').focus(); }catch(e){} /*]]>*/</script>
+		<button type="submit" title="<?php echo __('URL suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="text" name="login" value="<?php echo htmlEnt($login); ?>" size="32" style="width:130px;" />
+		<button type="submit" title="<?php echo __('Login suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td rowspan="2">
+<?php
+
+if ($page > 0) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
+}
+if ($page < $num_pages-1) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
+}
+
+?>
+	</td>
+</tr>
+<tr>
+	<td colspan="2" class="quickchars">
+<?php
+
+$chars = array();
+$chars['#'] = '';
+for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
+foreach ($chars as $cd => $cs) {
+	echo '<a href="', gs_url($SECTION, $MODULE, null, 'login='. htmlEnt($cs)), '">', htmlEnt($cd), '</a>', "\n";
+}
+
+?>
+	</td>
+</tr>
+</tbody>
+</table>
+
+
+
+<?php
+echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
+echo gs_form_hidden($SECTION, $MODULE), "\n";
+echo '<input type="hidden" name="url" value="', htmlEnt($url), '" />', "\n";
+echo '<input type="hidden" name="login" value="', htmlEnt($login), '" />', "\n";
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"<?php if ($url=='') echo ' class="sort-col"'; ?>>
+		<?php echo __('vCard URL'); ?> <sup>[1]</sup>
+	</th>
+	<th style="width:200px;"<?php if ($login!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Login'); ?>
+	</th>
+	<th style="width:200px;">
+		<?php echo __('Password'); ?>
+	</th>
+	<th style="width:50px;">
+		<?php echo __('Schedule'); ?><sup>[2]</sup>
+	</th>
+	<th style="width:100px;">&nbsp;</th>
+</tr>
+</thead>
+<tbody>
+
+<?php
+
+if (@$rs) {
+	$i = 0;
+	while ($r = $rs->fetchRow()) {
+		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
+		
+		if ($r['id']==$edit_entry) {
+ 			
+			echo '<td>';
+			echo '<input type="url" name="surl" value="', htmlEnt($r['url']), '" size="15" maxlength="256" style="width:250px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="slogin" value="', htmlEnt($r['login']), '" size="15" maxlength="32" style="width:150px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="password" name="spass" value="', htmlEnt($r['pass']), '" size="15" maxlength="16" style="width:150px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="sfrequency" value="', htmlEnt($r['frequency']), '" size="3" maxlength="3" style="width:150px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
+			echo '<input type="hidden" name="page" value="', $page, '" />';
+			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
+			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
+			echo '</button>';
+			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
+			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
+			echo '</button>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page), '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
+	
+			echo '</td>';
+			
+		} else {
+			
+			echo '<td>', htmlEnt($r['url']);
+			echo '</td>', "\n";
+			
+			echo '<td>', htmlEnt($r['login']), '</td>', "\n";
+			
+			echo '<td>', str_repeat('&bull;', strLen($r['pass'])), '</td>', "\n";
+			
+			echo '<td>', htmlEnt($r['frequency']), '</td>', "\n";
+			
+			echo '<td>';
+			$sudo_url =
+				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
+				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			echo '</td>';
+			
+		}
+		
+		echo '</tr>', "\n";
+	}
+}
+
+?>
+
+
+<tr>
+<?php
+if ($edit_entry < 1) {
+?>
+	<td>
+		<input type="url" name="surl" value="" size="30" maxlength="256" style="width:250px;" />
+	</td>
+	<td>
+		<input type="text" name="slogin" value="" size="15" maxlength="32" style="width:150px;" />
+	</td>
+	<td>
+		<input type="password" name="spass" value="" size="15" maxlength="16" style="width:150px;" />
+	</td>
+	<td>
+		<input type="text" name="sfrequency" value="" size="3" maxlength="3" style="width:50px;" />
+	</td>
+	<td>
+		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
+			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
+		</button>
+		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
+	</td>
+<?php
+}
+?>
+</tr>
+
+</tbody>
+</table>
+
+</form>
+<br>
+<p class="text">Hint: vCards automatically will be fetched on new entry or record changes, besides schedule.</p>
+<p class="text"><sup>[1]</sup> URL: Enter the full vCard URL including scheme from your provider. Naiv examples:</p>
+<div class="text">
+<dl class="text">
+<dt class="text">ownCloud</dt><dd class="text">https://example.com/remote.php/carddav/addressbooks/{resource|principal|username}/{collection}/</dd>
+<dt class="text">memotoo</dt><dd class="text">https://sync.memotoo.com/cardDAV/</dd>
+<dt class="text">SabreDAV</dt><dd class="text">https://example.com/addressbooks/{resource|principal|username}/{collection}/</dd>
+<dt class="text">radicale</dt><dd class="text">https://example.com/radicale/{resource|principal|username}/{collection}/</dd>
+<dt class="text">SOGo</dt><dd class="text">https://example.com/SOGo/dav/{resource|principal|username}/Contacts/{collection}/</dd>
+<dt class="text">DAViCal</dt><dd class="text">https://example.com/{resource|principal|username}/{collection}/</dd>
+<dt class="text">Apple Addressbook Server</dt><dd class="text">https://example.com/addressbooks/users/{resource|principal|username}/{collection}/</dd>
+</dl>
+</div>
+<p class="text"><sup>[2]</sup> Schedule: Refresh in h=hour, d=day, m=month etc., two digits followed by one char allowed<br> &nbsp; &nbsp; &nbsp; Example: Where '4h' is every 4 hours (~ also during night). Defaults to '1d'</p>

From 1b395ecfe2b5fd55e3e63dc6ab95bd133f7174e1 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:29:07 +0100
Subject: [PATCH 05/87] Create pb_category.php

---
 .../htdocs/gui/mod/pb_category.php            | 268 ++++++++++++++++++
 1 file changed, 268 insertions(+)
 create mode 100644 opt/gemeinschaft/htdocs/gui/mod/pb_category.php

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
new file mode 100644
index 000000000..43d0033aa
--- /dev/null
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
@@ -0,0 +1,268 @@
+<?php
+/*******************************************************************\
+*            Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
+* http://www.std-soft.com/
+* Markus Neubauer <markus.neubauer@email-online.org>
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+defined('GS_VALID') or die('No direct access.');
+include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
+
+echo '<h2>';
+if (@$MODULES[$SECTION]['icon'])
+	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
+if (count( $MODULES[$SECTION]['sub'] ) > 1 )
+	echo $MODULES[$SECTION]['title'], ' - ';
+echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
+echo '</h2>', "\n";
+
+
+echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
+echo '<script type="text/javascript">
+//<![CDATA[
+function confirm_delete() {
+	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
+}
+//]]>
+</script>' ,"\n";
+
+$per_page = (int)GS_GUI_NUM_RESULTS;
+
+$name         =      trim(@$_REQUEST['name'   ]);
+$category          =      trim(@$_REQUEST['category' ]);
+$save_category     =      trim(@$_REQUEST['scategory']);
+$page         = (int)    (@$_REQUEST['page'   ]);
+$delete_entry = (int)trim(@$_REQUEST['delete' ]);
+$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
+$save_entry   = (int)trim(@$_REQUEST['save'   ]);
+
+$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
+
+if ($delete_entry > 0) {
+	# delete entry
+	
+	$rs = $DB->execute(
+'DELETE FROM `pb_category`
+WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
+	);
+	
+}
+
+if ( $save_category != '' ) {
+	# save entry
+
+	if ($save_entry < 1) {
+		
+		$rs = $DB->execute(
+'INSERT INTO `pb_category` (`id`, `user_id`, `category`) VALUES
+(NULL, '. $user_id .', \''. $DB->escape($save_category) .'\')'
+		);
+		
+	} else {
+		
+		$rs = $DB->execute(
+'UPDATE `pb_category` SET `category`=\''. $DB->escape($save_category) .'\' 
+ WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
+		);
+	$save_category = '';
+		
+	}
+}
+
+
+# search by category
+	
+$search_url = 'category='. urlEncode($category);
+	
+$category_sql = '%' . str_replace(
+	array( '*', '?' ),
+	array( '%', '_' ),
+	$category
+) .'%';
+	
+$rs = $DB->execute(
+	'SELECT SQL_CALC_FOUND_ROWS '.
+		'`id`, `category` '.
+	'FROM '.
+		'`pb_category` '.
+	'WHERE '.
+		'`category` LIKE \''. $DB->escape($category_sql) .'\' '.
+		'AND '.
+		'`user_id`='. $user_id .' '.
+	'ORDER BY `category` ' .
+	'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
+	);
+$num_total = @$DB->numFoundRows();
+$num_pages = ceil($num_total / $per_page);
+
+
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:350px;"><?php echo __('Kategorie suchen'); ?></th>
+	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="text" name="category" id="ipt-category" value="<?php echo htmlEnt($category); ?>" size="256" style="width:250px;" />
+		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-category').focus(); }catch(e){} /*]]>*/</script>
+		<button type="submit" title="<?php echo __('Kategorie suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td rowspan="2">
+<?php
+
+if ($page > 0) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
+}
+if ($page < $num_pages-1) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
+}
+
+?>
+	</td>
+</tr>
+<tr>
+	<td colspan="2" class="quickchars">
+<?php
+
+$chars = array();
+$chars['#'] = '';
+for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
+foreach ($chars as $cd => $cs) {
+	echo '<a href="', gs_url($SECTION, $MODULE, null, 'category='. htmlEnt($cs)), '">', htmlEnt($cd), '</a>', "\n";
+}
+
+?>
+	</td>
+</tr>
+</tbody>
+</table>
+
+
+
+<?php
+echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
+echo gs_form_hidden($SECTION, $MODULE), "\n";
+echo '<input type="hidden" name="category" value="', htmlEnt($category), '" />', "\n";
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"<?php if ($category=='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Kategorie'); ?>
+	</th>
+</tr>
+</thead>
+<tbody>
+
+<?php
+
+if (@$rs) {
+	$i = 0;
+	while ($r = $rs->fetchRow()) {
+		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
+		
+		if ($r['id']==$edit_entry) {
+ 			
+			echo '<td>';
+			echo '<input type="text" name="scategory" value="', htmlEnt($r['category']), '" size="15" maxlength="256" style="width:250px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
+			echo '<input type="hidden" name="page" value="', $page, '" />';
+			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
+			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
+			echo '</button>';
+			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
+			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
+			echo '</button>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page), '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
+	
+			echo '</td>';
+			
+		} else {
+			
+			echo '<td>', htmlEnt($r['category']);
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			$sudo_url =
+				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
+				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			echo '</td>';
+			
+		}
+		
+		echo '</tr>', "\n";
+	}
+}
+
+?>
+
+
+<tr>
+<?php
+if ($edit_entry < 1) {
+?>
+	<td>
+		<input type="category" name="scategory" value="" size="30" maxlength="256" style="width:250px;" />
+	</td>
+	<td>
+		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
+			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
+		</button>
+		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
+	</td>
+<?php
+}
+?>
+</tr>
+
+</tbody>
+</table>
+
+</form>

From fc489e21d176dc0d9a759beeeed65c4602542fe4 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:29:47 +0100
Subject: [PATCH 06/87] Update modules.php

---
 opt/gemeinschaft/htdocs/gui/inc/modules.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/inc/modules.php b/opt/gemeinschaft/htdocs/gui/inc/modules.php
index 3c1003123..f2ba6e429 100644
--- a/opt/gemeinschaft/htdocs/gui/inc/modules.php
+++ b/opt/gemeinschaft/htdocs/gui/inc/modules.php
@@ -71,7 +71,13 @@
 		's' => array('title' => __('Intern' ), 'id' => 3001)  ),
 	25=>array(
 		'k' => 'private',
-		's' => array('title' => __('Pers&ouml;nlich' ), 'id' => 3002)  )
+		's' => array('title' => __('Pers&ouml;nlich' ), 'id' => 3002)  ),
+	35=>array(
+		'k' => 'category' ,
+		's' => array('title' => __('Kategorien' ), 'id' => 3006)  ),
+	45=>array(
+		'k' => 'cloud' ,
+		's' => array('title' => __('Cloud' ), 'id' => 3005)  )
 );
 if (gs_get_conf('GS_PB_IMPORTED_ENABLED')) {
 	$pos = (int)gs_get_conf('GS_PB_IMPORTED_ORDER', 9) * 10;

From f5974711034bb637053cdfa630745d5cf2fdbb91 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 8 Dec 2015 15:31:28 +0100
Subject: [PATCH 07/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index bd2d7c8a1..2cd588c89 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -53,3 +53,7 @@ CREATE TABLE IF NOT EXISTS `pb_category` (
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+// set new modules active
+INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;
+INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3006) ON DUPLICATE KEY UPDATE `member` = 3006;

From 3bd8c0a295c317ca02e6c0936671de07f99ee41a Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:45:15 +0100
Subject: [PATCH 08/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 66 ++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 2cd588c89..d6046e8f8 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -6,52 +6,78 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   `lastname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `number` varchar(25) CHARACTER SET ascii NOT NULL DEFAULT '',
   `ptype` varchar(16) COLLATE utf8_unicode_ci NOT NULL COMMENT 'cell,work,home',
-  `vcard_id` int(11) NOT NULL,
-  `cat_id` int(11) NOT NULL,
+  `card_id` int(10) unsigned NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `uid_lastname_firstname` (`user_id`,`lastname`(15),`firstname`(10)),
   KEY `uid_firstname_lastname` (`user_id`,`firstname`(10),`lastname`(10)),
   KEY `uid_number` (`user_id`,`number`(10)),
-  KEY `uid_vcard` (`user_id`,`vcard_id`),
-  KEY `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`),
-  KEY `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`)
+  KEY `uid_cardid` (`user_id`,`card_id`),
+  KEY `cloud_card_id` (`card_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 // alter existing 3.2 private phonebook
 ALTER TABLE `pb_prv`  ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
-ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL;
-ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL;
+ALTER TABLE `pb_prv` ADD `vcard_id` int(10) NOT NULL;
 ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`);
-ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`);
-ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`);
+ALTER TABLE `pb_prv` ADD INDEX `uid_cardid` (`user_id`,`card_id`);
+ALTER TABLE `pb_prv` ADD INDEX `cloud_card_id` (`card_id`);
 
 
 // import voip phone book from cloud for preparing the xml to phone functionality
 CREATE TABLE IF NOT EXISTS `pb_cloud` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
   `url` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
-  `login` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `login` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `pass` varbinary(64) NOT NULL,
   `frequency` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1d',
+  `ctag` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `last_remote_modified` datetime NOT NULL,
   `next_poll` datetime NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  KEY `user_id` (`user_id`),
+  UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
   KEY `next_poll` (`next_poll`),
-  KEY `url` (`user_id`,`url`(255)),
-  KEY `login` (`user_id`,`login`)
+  KEY `uid_login` (`user_id`,`login`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+// holds the vcards
+CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cloud_id` int(10) unsigned NOT NULL,
+  `vcard_id` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
+  `etag` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `vcard` text COLLATE utf8_unicode_ci NOT NULL,
+  `last_modified` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `cloud_id_vcard_id` (`cloud_id`,`vcard_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-// add categories like family etc. to phone book
+// add categories (i.e like family, company etc.)
 CREATE TABLE IF NOT EXISTS `pb_category` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
   `category` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uid_catid` (`user_id`,`category`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+// connect a phone book entry to a category
+CREATE TABLE IF NOT EXISTS `pb_prv_category` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `cat_id` int(10) unsigned NOT NULL,
+  `card_id` int(10) unsigned NOT NULL,
+  `prv_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid_catid_cardid` (`user_id`,`cat_id`,`card_id`),
+  KEY `uid_prvid` (`user_id`,`prv_id`),
+  KEY `uid_cardid` (`user_id`,`card_id`),
+  KEY `card_id` (`card_id`),
+  KEY `prv_id` (`prv_id`),
+  KEY `cat_id` (`cat_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 // set new modules active

From 0600261e4e1427ee714a621e42dfb432f64dffd5 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:50:01 +0100
Subject: [PATCH 09/87] Update modules.php

---
 opt/gemeinschaft/htdocs/gui/inc/modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/inc/modules.php b/opt/gemeinschaft/htdocs/gui/inc/modules.php
index f2ba6e429..06fbaa2e1 100644
--- a/opt/gemeinschaft/htdocs/gui/inc/modules.php
+++ b/opt/gemeinschaft/htdocs/gui/inc/modules.php
@@ -77,7 +77,7 @@
 		's' => array('title' => __('Kategorien' ), 'id' => 3006)  ),
 	45=>array(
 		'k' => 'cloud' ,
-		's' => array('title' => __('Cloud' ), 'id' => 3005)  )
+		's' => array('title' => __('Cloud Import' ), 'id' => 3005)  )
 );
 if (gs_get_conf('GS_PB_IMPORTED_ENABLED')) {
 	$pos = (int)gs_get_conf('GS_PB_IMPORTED_ORDER', 9) * 10;

From ea7cbe2fbe26a9aecf94cae67f8a9659b04ac8f6 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:51:22 +0100
Subject: [PATCH 10/87] Update pb_private.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index da4c7d730..ae8d4dd59 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -94,11 +94,11 @@ function confirm_delete() {
 'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
 WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
+		
+	}
 	$save_number = '';
 	$save_name = '';
 	$save_ptype = '';
-		
-	}
 }
 
 

From 598eed265f84c2b49d4efe943c73897a83bd4df6 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:51:59 +0100
Subject: [PATCH 11/87] Update pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index da66d2581..b5e735da5 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -73,17 +73,19 @@ function confirm_delete() {
 	
 }
 
-if (($save_url != '' || $save_login != '') && ($save_pass != '')) {
+if ($save_url != '' && $save_login != '' && $save_pass != '') {
 	# save entry
 
 	// check or correct frequency
-	if ( empty($save_frequency) ) {
-		$save_frequency='1d';
+	if ( strlen($save_frequency) < 2 ) {
+		$save_frequency = '1d';
 	} else {
+		$save_frequency = str_replace(' ', '', $save_frequency);
 		$p = substr($save_frequency, -1);
-		if ( ! ('h' == $p || 'd' == $p || 'm' == $p) ) {
-			$save_frequency='1d';
-		}
+		if ( ! ('h' == $p || 'd' == $p || 'm' == $p) )
+			$save_frequency = substr($save_frequency, 0, -1) . 'd';
+                if ( ! is_numeric(substr($save_frequency, 0, -1)) || substr($save_frequency, 0, -1) == '0' ) 
+			$save_frequency = '1' . substr($save_frequency, -1);
 	}
 	
 	if ($save_entry < 1) {
@@ -99,12 +101,12 @@ function confirm_delete() {
 'UPDATE `pb_cloud` SET `url`=\''. $DB->escape($save_url) .'\', `login`=\''. $DB->escape($save_login) .'\', `pass`=des_encrypt(\''. $save_pass .'\',\'' . $save_login .'\'), `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW() 
  WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
+		
+	}
 	$save_url = '';
 	$save_login = '';
 	$save_pass = '';
 	$save_frequency = '';
-		
-	}
 }
 
 
@@ -381,4 +383,5 @@ function confirm_delete() {
 <dt class="text">Apple Addressbook Server</dt><dd class="text">https://example.com/addressbooks/users/{resource|principal|username}/{collection}/</dd>
 </dl>
 </div>
-<p class="text"><sup>[2]</sup> Schedule: Refresh in h=hour, d=day, m=month etc., two digits followed by one char allowed<br> &nbsp; &nbsp; &nbsp; Example: Where '4h' is every 4 hours (~ also during night). Defaults to '1d'</p>
+<p class="text"><sup>[2]</sup> Schedule: h=hour, d=day, m=month (Max. 2 digits + 1 char, no minutes allowed).<br>
+ &nbsp; &nbsp; &nbsp; Example: '4h' = refresh every 4 hours (~ also during night). Defaults to '1d'.</p>

From 92082c15dca860ef3beaca74efdda46c52149067 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:52:36 +0100
Subject: [PATCH 12/87] Update pb_category.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
index 43d0033aa..b8e1cc8ba 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
@@ -83,9 +83,9 @@ function confirm_delete() {
 'UPDATE `pb_category` SET `category`=\''. $DB->escape($save_category) .'\' 
  WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
-	$save_category = '';
 		
 	}
+	$save_category = '';
 }
 
 

From 015c8236b7ed8e01c4d40d1f188b480efd150360 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:54:12 +0100
Subject: [PATCH 13/87] Create CardDAV.php

---
 opt/gemeinschaft/lib/carddav/CardDAV.php | 679 +++++++++++++++++++++++
 1 file changed, 679 insertions(+)
 create mode 100644 opt/gemeinschaft/lib/carddav/CardDAV.php

diff --git a/opt/gemeinschaft/lib/carddav/CardDAV.php b/opt/gemeinschaft/lib/carddav/CardDAV.php
new file mode 100644
index 000000000..aae5fd23b
--- /dev/null
+++ b/opt/gemeinschaft/lib/carddav/CardDAV.php
@@ -0,0 +1,679 @@
+<?php
+
+/**
+ * CardDAV PHP
+ *
+ * Simple CardDAV query
+ * --------------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * echo $carddav->get();
+ *
+ *
+ * Simple vCard query
+ * ------------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * echo $carddav->get_vcard('0126FFB4-2EB74D0A-302EA17F');
+ *
+ *
+ * XML vCard query
+ * ------------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * echo $carddav->get_xml_vcard('0126FFB4-2EB74D0A-302EA17F');
+ *
+ *
+ * Check CardDAV server connection
+ * -------------------------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * var_dump($carddav->check_connection());
+ *
+ *
+ * CardDAV delete query
+ * --------------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * $carddav->delete('0126FFB4-2EB74D0A-302EA17F');
+ *
+ *
+ * CardDAV add query
+ * --------------------
+ * $vcard = 'BEGIN:VCARD
+ * VERSION:3.0
+ * UID:1f5ea45f-b28a-4b96-25as-ed4f10edf57b
+ * FN:Christian Putzke
+ * N:Christian;Putzke;;;
+ * EMAIL;TYPE=OTHER:christian.putzke@graviox.de
+ * END:VCARD';
+ *
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * $vcard_id = $carddav->add($vcard);
+ *
+ *
+ * CardDAV update query
+ * --------------------
+ * $vcard = 'BEGIN:VCARD
+ * VERSION:3.0
+ * UID:1f5ea45f-b28a-4b96-25as-ed4f10edf57b
+ * FN:Christian Putzke
+ * N:Christian;Putzke;;;
+ * EMAIL;TYPE=OTHER:christian.putzke@graviox.de
+ * END:VCARD';
+ *
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->set_auth('username', 'password');
+ * $carddav->update($vcard, '0126FFB4-2EB74D0A-302EA17F');
+ *
+ *
+ * CardDAV debug
+ * -------------
+ * $carddav = new carddav_backend('https://davical.example.com/user/contacts/');
+ * $carddav->enable_debug();
+ * $carddav->set_auth('username', 'password');
+ * $carddav->get();
+ * var_dump($carddav->get_debug());
+ *
+ *
+ * CardDAV server list
+ * -------------------
+ * DAViCal:						https://example.com/{resource|principal|username}/{collection}/
+ * Apple Addressbook Server:	https://example.com/addressbooks/users/{resource|principal|username}/{collection}/
+ * memotoo:						https://sync.memotoo.com/cardDAV/
+ * SabreDAV:					https://example.com/addressbooks/{resource|principal|username}/{collection}/
+ * ownCloud:					https://example.com/apps/contacts/carddav.php/addressbooks/{resource|principal|username}/{collection}/
+ * SOGo:						https://example.com/SOGo/dav/{resource|principal|username}/Contacts/{collection}/
+ *
+ *
+ * @author Christian Putzke <christian.putzke@graviox.de>
+ * @copyright Christian Putzke
+ * @link http://www.graviox.de/
+ * @link https://twitter.com/cputzke/
+ * @since 20.07.2011
+ * @version 0.6
+ * @license http://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ *
+ */
+
+class carddav_backend
+{
+	/**
+	 * CardDAV PHP Version
+	 *
+	 * @constant	string
+	 */
+	const VERSION = '0.6';
+
+	/**
+	 * User agent displayed in http requests
+	 *
+	 * @constant	string
+	 */
+	const USERAGENT = 'CardDAV PHP/';
+
+	/**
+	 * CardDAV server url
+	 *
+	 * @var	string
+	 */
+	private $url = null;
+
+	/**
+	 * CardDAV server url_parts
+	 *
+	 * @var	array
+	 */
+	private $url_parts = null;
+
+	/**
+	 * Authentication string
+	 *
+	 * @var	string
+	 */
+	private $auth = null;
+
+	/**
+	* Authentication: username
+	*
+	* @var	string
+	*/
+	private $username = null;
+
+	/**
+	* Authentication: password
+	*
+	* @var	string
+	*/
+	private $password = null;
+
+	/**
+	 * Characters used for vCard id generation
+	 *
+	 * @var	array
+	 */
+	private $vcard_id_chars = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F');
+
+	/**
+	 * CardDAV server connection (curl handle)
+	 *
+	 * @var	resource
+	 */
+	private $curl;
+
+	/**
+	 * Debug on or off
+	 *
+	 * @var	boolean
+	 */
+	private $debug = false;
+
+	/**
+	 * All available debug information
+	 *
+	 * @var	array
+	 */
+	private $debug_information = array();
+
+	/**
+	 * Exception codes
+	 */
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_GET				= 1000;
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD		= 1001;
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_XML_VCARD	= 1002;
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_DELETE			= 1003;
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_ADD				= 1004;
+	const EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE			= 1005;
+	const EXCEPTION_MALFORMED_XML_RESPONSE					= 1006;
+	const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID			= 1007;
+
+
+	/**
+	 * Constructor
+	 * Sets the CardDAV server url
+	 *
+	 * @param	string	$url	CardDAV server url
+	 */
+	public function __construct($url = null)
+	{
+		if ($url !== null)
+		{
+			$this->set_url($url);
+		}
+	}
+
+	/**
+	 * Sets debug information
+	 *
+	 * @param	array	$debug_information		Debug information
+	 * @return	void
+	 */
+	public function set_debug(array $debug_information)
+	{
+		$this->debug_information[] = $debug_information;
+	}
+
+	/**
+	* Sets the CardDAV server url
+	*
+	* @param	string	$url	CardDAV server url
+	* @return	void
+	*/
+	public function set_url($url)
+	{
+		$this->url = $url;
+
+		if (substr($this->url, -1, 1) !== '/')
+		{
+			$this->url = $this->url . '/';
+		}
+
+		$this->url_parts = parse_url($this->url);
+	}
+
+	/**
+	 * Sets authentication information
+	 *
+	 * @param	string	$username	CardDAV server username
+	 * @param	string	$password	CardDAV server password
+	 * @return	void
+	 */
+	public function set_auth($username, $password)
+	{
+		$this->username	= $username;
+		$this->password	= $password;
+		$this->auth		= $username . ':' . $password;
+	}
+
+	/**
+	 * Gets all available debug information
+	 *
+	 * @return	array	$this->debug_information	All available debug information
+	 */
+	public function get_debug()
+	{
+		return $this->debug_information;
+	}
+
+	/**
+	 * Gets all vCards including additional information from the CardDAV server
+	 *
+	 * @param	boolean	$include_vcards		Include vCards within the response (simplified only)
+	 * @param	boolean	$raw				Get response raw or simplified
+	 * @return	string						Raw or simplified XML response
+	 */
+	public function get($include_vcards = true, $raw = false)
+	{
+		$result = $this->query($this->url, 'PROPFIND');
+
+		switch ($result['http_code'])
+		{
+			case 200:
+			case 207:
+				if ($raw === true)
+				{
+					return $result['response'];
+				}
+				else
+				{
+					return $this->simplify($result['response'], $include_vcards);
+				}
+			break;
+
+			default:
+				throw new Exception('Woops, something\'s gone wrong! The CardDAV server returned the http status code ' . $result['http_code'] . '.', self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET);
+			break;
+		}
+	}
+
+	/**
+	* Gets a clean vCard from the CardDAV server
+	*
+	* @param	string	$vcard_id	vCard id on the CardDAV server
+	* @return	string				vCard (text/vcard)
+	*/
+	public function get_vcard($vcard_id)
+	{
+		$vcard_id	= str_replace('.vcf', null, $vcard_id);
+		$result		= $this->query($this->url . $vcard_id . '.vcf', 'GET');
+
+		switch ($result['http_code'])
+		{
+			case 200:
+			case 207:
+				return $result['response'];
+			break;
+
+			default:
+				throw new Exception('Woops, something\'s gone wrong! The CardDAV server returned the http status code ' . $result['http_code'] . '.', self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD);
+			break;
+		}
+	}
+
+	/**
+	 * Gets a vCard + XML from the CardDAV Server
+	 *
+	 * @param	string		$vcard_id	vCard id on the CardDAV Server
+	 * @return	string					Raw or simplified vCard (text/xml)
+	 */
+	public function get_xml_vcard($vcard_id)
+	{
+		$vcard_id = str_replace('.vcf', null, $vcard_id);
+
+		$xml = new XMLWriter();
+		$xml->openMemory();
+		$xml->setIndent(4);
+		$xml->startDocument('1.0', 'utf-8');
+			$xml->startElement('C:addressbook-multiget');
+				$xml->writeAttribute('xmlns:D', 'DAV:');
+				$xml->writeAttribute('xmlns:C', 'urn:ietf:params:xml:ns:carddav');
+				$xml->startElement('D:prop');
+					$xml->writeElement('D:getetag');
+					$xml->writeElement('D:getlastmodified');
+				$xml->endElement();
+				$xml->writeElement('D:href', $this->url_parts['path'] . $vcard_id . '.vcf');
+			$xml->endElement();
+		$xml->endDocument();
+
+		$result = $this->query($this->url, 'REPORT', $xml->outputMemory(), 'text/xml');
+
+		switch ($result['http_code'])
+		{
+			case 200:
+			case 207:
+				return $this->simplify($result['response'], true);
+			break;
+
+			default:
+				throw new Exception('Woops, something\'s gone wrong! The CardDAV server returned the http status code ' . $result['http_code'] . '.', self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_XML_VCARD);
+			break;
+		}
+	}
+
+	/**
+	 * Enables the debug mode
+	 *
+	 * @return	void
+	 */
+	public function enable_debug()
+	{
+		$this->debug = true;
+	}
+
+	/**
+	* Checks if the CardDAV server is reachable
+	*
+	* @return	boolean
+	*/
+	public function check_connection()
+	{
+		$result = $this->query($this->url, 'OPTIONS');
+
+		if ($result['http_code'] === 200)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Cleans the vCard
+	 *
+	 * @param	string	$vcard	vCard
+	 * @return	string	$vcard	vCard
+	 */
+	private function clean_vcard($vcard)
+	{
+		$vcard = str_replace("\t", null, $vcard);
+
+		return $vcard;
+	}
+
+	/**
+	 * Deletes an entry from the CardDAV server
+	 *
+	 * @param	string	$vcard_id	vCard id on the CardDAV server
+	 * @return	boolean
+	 */
+	public function delete($vcard_id)
+	{
+		$result = $this->query($this->url . $vcard_id . '.vcf', 'DELETE');
+
+		switch ($result['http_code'])
+		{
+			case 204:
+				return true;
+			break;
+
+			default:
+				throw new Exception('Woops, something\'s gone wrong! The CardDAV server returned the http status code ' . $result['http_code'] . '.', self::EXCEPTION_WRONG_HTTP_STATUS_CODE_DELETE);
+			break;
+		}
+	}
+
+	/**
+	 * Adds an entry to the CardDAV server
+	 *
+	 * @param	string	$vcard		vCard
+	 * @param	string	$vcard_id	vCard id on the CardDAV server
+	 * @return	string			The new vCard id
+	 */
+	public function add($vcard, $vcard_id = null)
+	{
+		if ($vcard_id === null)
+		{
+			$vcard_id	= $this->generate_vcard_id();
+		}
+		$vcard		= $this->clean_vcard($vcard);
+		$result		= $this->query($this->url . $vcard_id . '.vcf', 'PUT', $vcard, 'text/vcard');
+
+		switch($result['http_code'])
+		{
+			case 201:
+				return $vcard_id;
+			break;
+
+			default:
+				throw new Exception('Woops, something\'s gone wrong! The CardDAV server returned the http status code ' . $result['http_code'] . '.', self::EXCEPTION_WRONG_HTTP_STATUS_CODE_ADD);
+			break;
+		}
+	}
+
+	/**
+	 * Updates an entry to the CardDAV server
+	 *
+	 * @param	string	$vcard		vCard
+	 * @param	string	$vcard_id	vCard id on the CardDAV server
+	 * @return	boolean
+	 */
+	public function update($vcard, $vcard_id)
+	{
+		try
+		{
+			return $this->add($vcard, $vcard_id);
+		}
+		catch (Exception $e)
+		{
+			throw new Exception($e->getMessage(), self::EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE);
+		}
+	}
+
+	/**
+	 * Simplify CardDAV XML response
+	 *
+	 * @param	string	$response			CardDAV XML response
+	 * @param	boolean	$include_vcards		Include vCards or not
+	 * @return	string						Simplified CardDAV XML response
+	 */
+	private function simplify($response, $include_vcards = true)
+	{
+		$response = $this->clean_response($response);
+
+		try
+		{
+			$xml = new SimpleXMLElement($response);
+		}
+		catch(Exception $e)
+		{
+			throw new Exception('The XML response seems to be malformed and can\'t be simplified!', self::EXCEPTION_MALFORMED_XML_RESPONSE, $e);
+		}
+
+		$simplified_xml = new XMLWriter();
+		$simplified_xml->openMemory();
+		$simplified_xml->setIndent(4);
+
+		$simplified_xml->startDocument('1.0', 'utf-8');
+			$simplified_xml->startElement('response');
+
+				if (!empty($xml->response))
+				{
+					foreach ($xml->response as $response)
+					{
+						if (preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href))
+						{
+							$id = basename($response->href);
+							$id = str_replace('.vcf', null, $id);
+
+							if (!empty($id))
+							{
+								$simplified_xml->startElement('element');
+									$simplified_xml->writeElement('id', $id);
+									$simplified_xml->writeElement('etag', str_replace('"', null, $response->propstat->prop->getetag));
+									$simplified_xml->writeElement('last_modified', $response->propstat->prop->getlastmodified);
+
+									if ($include_vcards === true)
+									{
+										$simplified_xml->writeElement('vcard', $this->get_vcard($id));
+									}
+								$simplified_xml->endElement();
+							}
+						}
+						else if (preg_match('/unix-directory/', $response->propstat->prop->getcontenttype))
+						{
+							if (isset($response->propstat->prop->href))
+							{
+								$href = $response->propstat->prop->href;
+							}
+							else if (isset($response->href))
+							{
+								$href = $response->href;
+							}
+							else
+							{
+								$href = null;
+							}
+
+							$url = str_replace($this->url_parts['path'], null, $this->url) . $href;
+							$simplified_xml->startElement('addressbook_element');
+								$simplified_xml->writeElement('display_name', $response->propstat->prop->displayname);
+								$simplified_xml->writeElement('url', $url);
+								$simplified_xml->writeElement('last_modified', $response->propstat->prop->getlastmodified);
+							$simplified_xml->endElement();
+						}
+					}
+				}
+
+			$simplified_xml->endElement();
+		$simplified_xml->endDocument();
+
+		return $simplified_xml->outputMemory();
+	}
+
+	/**
+	 * Cleans CardDAV XML response
+	 *
+	 * @param	string	$response	CardDAV XML response
+	 * @return	string	$response	Cleaned CardDAV XML response
+	 */
+	private function clean_response($response)
+	{
+		$response = utf8_encode($response);
+		$response = str_replace('D:', null, $response);
+		$response = str_replace('d:', null, $response);
+		$response = str_replace('C:', null, $response);
+		$response = str_replace('c:', null, $response);
+
+		return $response;
+	}
+
+	/**
+	 * Curl initialization
+	 *
+	 * @return void
+	 */
+	public function curl_init()
+	{
+		if (empty($this->curl))
+		{
+			$this->curl = curl_init();
+			curl_setopt($this->curl, CURLOPT_HEADER, true);
+			curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
+			curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT.self::VERSION);
+
+			if ($this->auth !== null)
+			{
+				curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+				curl_setopt($this->curl, CURLOPT_USERPWD, $this->auth);
+			}
+		}
+	}
+
+	/**
+	 * Query the CardDAV server via curl and returns the response
+	 *
+	 * @param	string	$url				CardDAV server URL
+	 * @param	string	$method				HTTP method like (OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE)
+	 * @param	string	$content			Content for CardDAV queries
+	 * @param	string	$content_type		Set content type
+	 * @return	array						Raw CardDAV Response and http status code
+	 */
+	private function query($url, $method, $content = null, $content_type = null)
+	{
+		$this->curl_init();
+
+		curl_setopt($this->curl, CURLOPT_URL, $url);
+		curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
+
+		if ($content !== null)
+		{
+			curl_setopt($this->curl, CURLOPT_POST, true);
+			curl_setopt($this->curl, CURLOPT_POSTFIELDS, $content);
+		}
+		else
+		{
+			curl_setopt($this->curl, CURLOPT_POST, false);
+			curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
+		}
+
+		if ($content_type !== null)
+		{
+			curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type));
+		}
+		else
+		{
+			curl_setopt($this->curl, CURLOPT_HTTPHEADER, array());
+		}
+
+		$complete_response	= curl_exec($this->curl);
+		$header_size		= curl_getinfo($this->curl, CURLINFO_HEADER_SIZE);
+		$http_code 			= curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
+		$header				= trim(substr($complete_response, 0, $header_size));
+		$response			= substr($complete_response, $header_size);
+
+		$return = array(
+			'response'		=> $response,
+			'http_code'		=> $http_code
+		);
+
+		if ($this->debug === true)
+		{
+			$debug = $return;
+			$debug['url']			= $url;
+			$debug['method']		= $method;
+			$debug['content']		= $content;
+			$debug['content_type']	= $content_type;
+			$debug['header']		= $header;
+			$this->set_debug($debug);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Returns a valid and unused vCard id
+	 *
+	 * @return$carddav->query($this->url . $vcard_id . '.vcf', 'GET');
+
+			if ($result['http_code'] !== 404)
+			{
+				$vcard_id = $this->generate_vcard_id();
+			}
+
+			return $vcard_id;
+		}
+		catch (Exception $e)
+		{
+			throw new Exception($e->getMessage(), self::EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID);
+		}
+	}
+
+	/**
+	 * Destructor
+	 * Close curl connection if it's open
+	 *
+	 * @return	void
+	 */
+	public function __destruct()
+	{
+		if (!empty($this->curl))
+		{
+			curl_close($this->curl);
+		}
+	}
+}

From 42943235dedda7f3ba0714ff557bacc8ad0cf8df Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:55:04 +0100
Subject: [PATCH 14/87] Create xml2array.php

---
 opt/gemeinschaft/lib/xml/xml2array.php | 142 +++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 opt/gemeinschaft/lib/xml/xml2array.php

diff --git a/opt/gemeinschaft/lib/xml/xml2array.php b/opt/gemeinschaft/lib/xml/xml2array.php
new file mode 100644
index 000000000..165405134
--- /dev/null
+++ b/opt/gemeinschaft/lib/xml/xml2array.php
@@ -0,0 +1,142 @@
+<?php
+
+// put a xml string into array
+class XMLThing
+{
+	var $rawXML;
+	var $valueArray = array();
+	var $keyArray = array();
+	var $parsed = array();
+	var $index = 0;
+	var $attribKey = 'attributes';
+	var $valueKey = 'value';
+	var $cdataKey = 'cdata';
+	var $isError = false;
+	var $error = '';
+
+	function XMLThing($xml = NULL)
+	{
+		$this->rawXML = $xml;
+	}
+
+	function parse($xml = NULL)
+	{
+		if (!is_null($xml))
+		{
+			$this->rawXML = $xml;
+		}
+
+		$this->isError = false;
+			
+		if (!$this->parse_init())
+		{
+			return false;
+		}
+
+		$this->index = 0;
+		$this->parsed = $this->parse_recurse();
+		$this->status = 'parsing complete';
+
+		return $this->parsed;
+	}
+
+	function parse_recurse()
+	{		
+		$found = array();
+		$tagCount = array();
+
+		while (isset($this->valueArray[$this->index]))
+		{
+			$tag = $this->valueArray[$this->index];
+			$this->index++;
+
+			if ($tag['type'] == 'close')
+			{
+				return $found;
+			}
+
+			if ($tag['type'] == 'cdata')
+			{
+				$tag['tag'] = $this->cdataKey;
+				$tag['type'] = 'complete';
+			}
+
+			$tagName = $tag['tag'];
+
+			if (isset($tagCount[$tagName]))
+			{		
+				if ($tagCount[$tagName] == 1)
+				{
+					$found[$tagName] = array($found[$tagName]);
+				}
+					
+				$tagRef =& $found[$tagName][$tagCount[$tagName]];
+				$tagCount[$tagName]++;
+			}
+			else	
+			{
+				$tagCount[$tagName] = 1;
+				$tagRef =& $found[$tagName];
+			}
+
+			switch ($tag['type'])
+			{
+				case 'open':
+					$tagRef = $this->parse_recurse();
+
+					if (isset($tag['attributes']))
+					{
+						$tagRef[$this->attribKey] = $tag['attributes'];
+					}
+						
+					if (isset($tag['value']))
+					{
+						if (isset($tagRef[$this->cdataKey]))	
+						{
+							$tagRef[$this->cdataKey] = (array)$tagRef[$this->cdataKey];	
+							array_unshift($tagRef[$this->cdataKey], $tag['value']);
+						}
+						else
+						{
+							$tagRef[$this->cdataKey] = $tag['value'];
+						}
+					}
+					break;
+
+				case 'complete':
+					if (isset($tag['attributes']))
+					{
+						$tagRef[$this->attribKey] = $tag['attributes'];
+						$tagRef =& $tagRef[$this->valueKey];
+					}
+
+					if (isset($tag['value']))
+					{
+						$tagRef = $tag['value'];
+					}
+					break;
+			}			
+		}
+
+		return $found;
+	}
+
+	function parse_init()
+	{
+		$this->parser = xml_parser_create();
+
+		$parser = $this->parser;
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);	 
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);		
+		if (!$res = (bool)xml_parse_into_struct($parser, $this->rawXML, $this->valueArray, $this->keyArray))
+		{
+			$this->isError = true;
+			$this->error = 'error: '.xml_error_string(xml_get_error_code($parser)).' at line '.xml_get_current_line_number($parser);
+		}
+		xml_parser_free($parser);
+
+		return $res;
+	}
+}
+
+?>

From 02fff4c71edb2df6290a7f8b597b9581f7f5d6a1 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 17:56:12 +0100
Subject: [PATCH 15/87] Create gs-carddav-reader.php

---
 .../scripts/gs-carddav-reader.php             | 315 ++++++++++++++++++
 1 file changed, 315 insertions(+)
 create mode 100644 opt/gemeinschaft/scripts/gs-carddav-reader.php

diff --git a/opt/gemeinschaft/scripts/gs-carddav-reader.php b/opt/gemeinschaft/scripts/gs-carddav-reader.php
new file mode 100644
index 000000000..9d999452b
--- /dev/null
+++ b/opt/gemeinschaft/scripts/gs-carddav-reader.php
@@ -0,0 +1,315 @@
+#!/usr/bin/php -q
+<?php
+/*******************************************************************\
+*	Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
+* http://www.std-soft.com/
+* Markus Neubauer <markus.neubauer@email-online.org>
+* 
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+define('GS_VALID', true); // arriving nativ here
+
+require_once( dirName(__FILE__) .'/../inc/conf.php' );
+$CARDDAV_LOG = 'cloud_connector.log';
+$FIFO = '';
+$process_name = 'vcard-checker';
+include_once( GS_DIR .'inc/log.php' );
+
+if (defined('STDIN' )) @fClose(STDIN );
+if (defined('STDOUT')) @fClose(STDOUT);
+if (defined('STDERR')) @fClose(STDERR);
+
+include_once( GS_DIR .'lib/yadb/yadb.php' );
+include_once( GS_DIR .'inc/gs-lib.php' );
+require_once( GS_DIR .'lib/carddav/CardDAV.php' );
+require_once( GS_DIR .'lib/XML/xml2array.php' );
+require_once( GS_DIR .'inc/db_connect.php' );
+
+
+// vCard DAV connect
+function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
+  global $CARDDAV_LOG, $FIFO;
+
+	if (! class_exists('carddav_backend')) {
+		gs_log( GS_LOG_FATAL, getmypid() .': This PHP does not support carddav (lib CardDav.php missing)!', $CARDDAV_LOG, $FIFO );
+		exit(1);
+	}
+
+	$carddav_conn = new carddav_backend($url);
+	$carddav_conn->set_auth($login, $pass);
+	
+	if ( $carddav_conn->check_connection() ) {
+		gs_log(GS_LOG_DEBUG, getmypid() .': connected to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		return $carddav_conn;
+	} else {
+		gs_log(GS_LOG_FATAL, getmypid() .': Could not connect to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		return false;
+	}
+}
+
+// update gs records
+function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
+  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX;
+
+	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
+
+	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
+	if ( ! empty($lvc) ) {
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
+	}
+	else {
+		$DB->execute('INSERT INTO `pb_cloud_card` ' .
+				' (`cloud_id`,`vcard_id`,`etag`,`vcard`,`last_modified`) ' .
+				' VALUES(' . $vcr['id'] . ',\'' . $head['vcard_id'] . '\',\'' . $etag . '\',\'' . mysql_real_escape_string($vcard) . '\',\'' . $last_modified . '\')');
+		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
+				' FROM `pb_cloud_card` ' .
+				' WHERE `cloud_id`=' . $vcr['id'] . 
+					' and `vcard_id`=\'' . $head['vcard_id'] . '\''
+				)->fetchRow();
+	}
+
+	$tmp_vcard = explode("\n", $vcard);
+	
+	$n = array();
+	$acat = array();
+	$fn   = '';
+	$ln   = '';
+	foreach ( $tmp_vcard as $value ) {
+		if ( empty( $value ) ) continue;
+
+		$elem = substr($value, strpos($value, ':') + 1 );
+		$key  = substr($value, 0, strpos($value, ':') );
+		if     ( 'N' == $key ) {
+			$elem = trim($elem);
+			$aname = explode(';', $elem);
+			$ln = array_shift ( $aname );
+			for ($i = count($aname); $i >= 0; $i--) {
+				if ( empty($aname[$i]) ) continue;
+				$fn .= ' ' . $aname[$i];
+			}
+			$fn = ltrim( $fn );
+		}
+		if ( empty( $ln) ) {
+			$ln = $fn;
+			$fn='';
+		}
+
+		elseif ( 'TEL' == substr($key, 0, 3) ) {
+			$elem = trim($elem);
+			$ptype =  strtolower( substr($key, strpos($key, '=') + 1) );
+			
+			if ( '+' == substr($elem, 0, 1) ) 
+				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
+				
+			$number = preg_replace('/\D/', '', $elem);
+
+			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
+				$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
+
+			// insert number
+			$n[$number] = $ptype;
+		}
+
+		elseif ( 'CATEGORIES' == $key ) {
+			$elem = trim($elem);
+			$acat = explode( ',', $elem );
+		}
+	}
+	
+	// loop over phone numbers
+	foreach ( $n as $number => $ptype ) {
+
+		// check_duplicates from within a vcard
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);	
+
+		// add a phone record
+		$DB->execute('INSERT INTO `pb_prv` ' .
+			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`card_id`) ' .
+			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $ptype .'\',' . $lvc['id'] . ')');
+
+		// loop over categories
+		if ( ! empty( $acat) ) {
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $ptype . '\' and `card_id`=' . $lvc['id'])->fetchRow();
+			foreach ( $acat as $cat ) {
+				if ( empty($cat) ) continue;
+				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
+					// insert rec
+					$DB->execute('INSERT INTO `pb_category` ' .
+						' (`user_id`,`category`) ' .
+						' VALUES(' . $vcr['user_id'] .',\'' . $cat .'\')');
+					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow();
+				}
+				// correct xref
+				$DB->execute('INSERT INTO `pb_prv_category` ' .
+					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
+					' VALUES(' . $vcr['user_id'] .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
+				}
+		}
+	}
+
+}
+
+
+// fetch vcards for a cloud entry
+function gs_vcards_update( $vcr ) {
+  global $CARDDAV_LOG, $FIFO, $DB;
+
+	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
+	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
+		return false;
+	}
+
+	$a = new XMLThing();
+	$vchead = $a->parse($carddav_conn->get(false,true));
+	$vchead = $vchead['d:multistatus']['d:response'];
+	$head   = array_shift ( $vchead );
+	
+	// skip rest if not modified between, depending on header etag or lastmodified
+	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
+		// ref etag: https://tools.ietf.org/html/rfc6352
+		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
+		if ( $last_ctag == $vcr['last_ctag'] ) {
+			gs_log(GS_LOG_DEBUG, getmypid() .': no update, ctag='. $last_ctag, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else  $last_ctag = '';
+
+	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
+		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+		if ( $last_modified <= $vcr['last_remote_modified'] ) {
+			gs_log(GS_LOG_DEBUG, getmypid() .': no update, last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else $last_modified = $vcr['modified'];
+
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+	// update ctag and last_modified immed
+	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
+	
+	// get unseen records
+	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
+	$unseen=array();
+	$unrc = $DB->execute('SELECT `id`, `vcard_id`,`etag`, `last_modified` FROM `pb_cloud_card` WHERE `cloud_id`=' . $vcr['id']);
+	while ( $urc = $unrc->fetchRow() ) {
+		$unseen[$urc['vcard_id']] = array(
+			'id'		=> $urc['id'],
+			'etag'		=> $urc['etag'],
+			'last_modified' => $urc['last_modified']
+			);
+	}
+	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
+
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
+	
+	// iterate through all of them
+	for ($i = 0; $i < count($vchead); $i++) {
+
+		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
+		
+		$vchead[$i]['vcard_id'] =  $vcard_id;
+		
+		// check for existing vcard
+		if ( isset($unseen[$vcard_id]) ) {
+			$lvc = $unseen[$vcard_id];
+			// avoid deleting
+			unset($unseen["$vcard_id"]);
+
+			// skip if not modified
+			$last_modified = date("Y-m-d H:i:s", strtotime( $vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] ));
+			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
+			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
+
+			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
+
+			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
+
+			// modified remote get the new vcard
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
+			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
+
+		} else {
+
+			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
+			// missing local add new vcard
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');			
+			gs_vcard_update( $vcr, $vchead[$i], $vcard );
+		}
+	}
+
+	// delete no more existing recs
+	foreach ($unseen as $vcard_id => $value) {
+		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
+	}
+
+	return true;
+}
+
+$DB = gs_db_master_connect();
+
+
+// remain in loop, doing a record time by time (avoid race cond in dup exec)
+while ( true ) {
+	$vcrc = @ $DB->execute(
+		'SELECT
+		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, `last_remote_modified`, `modified`
+		FROM `pb_cloud` 
+		WHERE `next_poll` < NOW() ORDER BY `next_poll`
+		LIMIT 1'
+		);
+	if ( $vcr = $vcrc->fetchRow() ) {
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards: '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+	} else {
+		break; //the loop
+	}
+	
+	// update next check immediately to avoid concurrent execs in timeout situations
+	$hdm2text = array(
+		'h' => 'hour',
+		'd' => 'day', 
+		'm' => 'month' 
+	);
+	$period = substr($vcr['frequency'], -1);
+	$freq = substr($vcr['frequency'], 0, -1);
+	if ( $freq > 1 ) $more = 's'; 
+	else $more = '';
+
+	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
+
+	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\' WHERE `id`=' . $vcr['id']);
+
+	if ( gs_vcards_update( $vcr )  === true ) {
+		// all went ok
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal.', $CARDDAV_LOG, $FIFO );
+
+	} else {
+		// any failure
+		gs_log(GS_LOG_WARNING, getmypid() .': Check vCards failed for '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+	}
+}
+
+?>

From fcb2533fab47f055d83ccb288b7c3281117d4673 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 18:03:37 +0100
Subject: [PATCH 16/87] Create gs-carddav-reader-to-db

---
 etc/cron.d/gs-carddav-reader-to-db | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 etc/cron.d/gs-carddav-reader-to-db

diff --git a/etc/cron.d/gs-carddav-reader-to-db b/etc/cron.d/gs-carddav-reader-to-db
new file mode 100644
index 000000000..5e12a1755
--- /dev/null
+++ b/etc/cron.d/gs-carddav-reader-to-db
@@ -0,0 +1,6 @@
+# Gemeinschaft
+# $Revision$
+
+# refresh cloud card phone books into the database
+
+*/11 *  * * *   root   sleep 23; /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null

From 35dd61208a13fdbb0500c3507c4d1d4d5662d058 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 18:05:25 +0100
Subject: [PATCH 17/87] Update gs-carddav-reader-to-db

---
 etc/cron.d/gs-carddav-reader-to-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/cron.d/gs-carddav-reader-to-db b/etc/cron.d/gs-carddav-reader-to-db
index 5e12a1755..dd63e7d4e 100644
--- a/etc/cron.d/gs-carddav-reader-to-db
+++ b/etc/cron.d/gs-carddav-reader-to-db
@@ -3,4 +3,4 @@
 
 # refresh cloud card phone books into the database
 
-*/11 *  * * *   root   sleep 23; /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null
+*/17 *  * * *   root   sleep 23; /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null

From 08f4d627b89cbc899716bf171f316b9da63fd78e Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 18:05:46 +0100
Subject: [PATCH 18/87] Update gs-carddav-reader-to-db

---
 etc/cron.d/gs-carddav-reader-to-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/cron.d/gs-carddav-reader-to-db b/etc/cron.d/gs-carddav-reader-to-db
index dd63e7d4e..4ade8a3a6 100644
--- a/etc/cron.d/gs-carddav-reader-to-db
+++ b/etc/cron.d/gs-carddav-reader-to-db
@@ -3,4 +3,4 @@
 
 # refresh cloud card phone books into the database
 
-*/17 *  * * *   root   sleep 23; /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null
+*/17 *  * * *   root   sleep 23; nice -n 15 /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null

From 49bdca951f439650064ee856a1230d98d04bf94f Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 10 Dec 2015 18:30:37 +0100
Subject: [PATCH 19/87] Update asterisk.sql

---
 usr/share/doc/gemeinschaft/asterisk.sql | 76 +++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/gemeinschaft/asterisk.sql b/usr/share/doc/gemeinschaft/asterisk.sql
index f647c5ab0..9102dbeb2 100644
--- a/usr/share/doc/gemeinschaft/asterisk.sql
+++ b/usr/share/doc/gemeinschaft/asterisk.sql
@@ -6180,6 +6180,8 @@ INSERT INTO `group_members` VALUES (6,3001);
 INSERT INTO `group_members` VALUES (6,3002);
 INSERT INTO `group_members` VALUES (6,3003);
 INSERT INTO `group_members` VALUES (6,3004);
+INSERT INTO `group_members` VALUES (6,3005);
+INSERT INTO `group_members` VALUES (6,3006);
 INSERT INTO `group_members` VALUES (6,4000);
 INSERT INTO `group_members` VALUES (6,4001);
 INSERT INTO `group_members` VALUES (6,4002);
@@ -6672,6 +6674,68 @@ INSERT INTO `pb_ldap` VALUES ('012345','TEST','HANS','123','2007-05-24 07:28:28'
 /*!40000 ALTER TABLE `pb_ldap` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Tabellenstruktur für Tabelle `pb_category`
+--
+
+CREATE TABLE IF NOT EXISTS `pb_category` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `category` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uid_catid` (`user_id`,`category`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- Tabellenstruktur für Tabelle `pb_cloud`
+--
+
+CREATE TABLE IF NOT EXISTS `pb_cloud` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `url` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
+  `login` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `pass` varbinary(64) NOT NULL,
+  `frequency` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1d',
+  `ctag` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `last_remote_modified` datetime NOT NULL,
+  `next_poll` datetime NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
+  KEY `next_poll` (`next_poll`),
+  KEY `uid_login` (`user_id`,`login`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- Tabellenstruktur für Tabelle `pb_cloud_card`
+--
+
+CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cloud_id` int(10) unsigned NOT NULL,
+  `vcard_id` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
+  `etag` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `vcard` text COLLATE utf8_unicode_ci NOT NULL,
+  `last_modified` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `cloud_id_vcard_id` (`cloud_id`,`vcard_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- Tabellenstruktur für Tabelle `pb_category`
+--
+
+CREATE TABLE IF NOT EXISTS `pb_category` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `category` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uid_catid` (`user_id`,`category`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
 --
 -- Table structure for table `pb_prv`
 --
@@ -6679,18 +6743,23 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `pb_prv`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pb_prv` (
+DROP TABLE IF EXISTS `pb_prv`;
+CREATE TABLE IF NOT EXISTS `pb_prv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL DEFAULT '0',
   `firstname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `lastname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `number` varchar(25) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `ptype` varchar(16) COLLATE utf8_unicode_ci NOT NULL COMMENT 'cell,work,home',
+  `card_id` int(10) unsigned NOT NULL,
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `uid_lastname_firstname` (`user_id`,`lastname`(15),`firstname`(10)),
   KEY `uid_firstname_lastname` (`user_id`,`firstname`(10),`lastname`(10)),
   KEY `uid_number` (`user_id`,`number`(10)),
-  CONSTRAINT `pb_prv_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  KEY `uid_vcard` (`user_id`,`card_id`),
+  KEY `cloud_card_id` (`card_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7655,4 +7724,3 @@ USE `asterisk`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 -- Dump completed on 2010-10-19 19:30:00
-

From ce99a391c92f76d1528e40227ff06a695f3d796d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 08:18:32 +0100
Subject: [PATCH 20/87] small fix (from c&p)

---
 opt/gemeinschaft/htdocs/gui/mod/pb_category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
index b8e1cc8ba..703f85f7b 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
@@ -231,7 +231,7 @@ function confirm_delete() {
 			$sudo_url =
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;category='. rawUrlEncode($category) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
 			echo '</td>';
 			

From 52e0c47ee5860bd470d6cf602a673a42a76090be Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 08:19:07 +0100
Subject: [PATCH 21/87] small fix (from c&p)

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index b5e735da5..eed61634f 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -325,7 +325,7 @@ function confirm_delete() {
 			$sudo_url =
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;login='. rawUrlEncode($login) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
 			echo '</td>';
 			

From eaa018bcbd30fbd0e613cac1db1c0004eb631ab4 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 08:40:26 +0100
Subject: [PATCH 22/87] moved from scripts to sbin as it is a cron job

---
 opt/gemeinschaft/sbin/gs-carddav-reader | 315 ++++++++++++++++++++++++
 1 file changed, 315 insertions(+)
 create mode 100644 opt/gemeinschaft/sbin/gs-carddav-reader

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader b/opt/gemeinschaft/sbin/gs-carddav-reader
new file mode 100644
index 000000000..9d999452b
--- /dev/null
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader
@@ -0,0 +1,315 @@
+#!/usr/bin/php -q
+<?php
+/*******************************************************************\
+*	Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
+* http://www.std-soft.com/
+* Markus Neubauer <markus.neubauer@email-online.org>
+* 
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+define('GS_VALID', true); // arriving nativ here
+
+require_once( dirName(__FILE__) .'/../inc/conf.php' );
+$CARDDAV_LOG = 'cloud_connector.log';
+$FIFO = '';
+$process_name = 'vcard-checker';
+include_once( GS_DIR .'inc/log.php' );
+
+if (defined('STDIN' )) @fClose(STDIN );
+if (defined('STDOUT')) @fClose(STDOUT);
+if (defined('STDERR')) @fClose(STDERR);
+
+include_once( GS_DIR .'lib/yadb/yadb.php' );
+include_once( GS_DIR .'inc/gs-lib.php' );
+require_once( GS_DIR .'lib/carddav/CardDAV.php' );
+require_once( GS_DIR .'lib/XML/xml2array.php' );
+require_once( GS_DIR .'inc/db_connect.php' );
+
+
+// vCard DAV connect
+function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
+  global $CARDDAV_LOG, $FIFO;
+
+	if (! class_exists('carddav_backend')) {
+		gs_log( GS_LOG_FATAL, getmypid() .': This PHP does not support carddav (lib CardDav.php missing)!', $CARDDAV_LOG, $FIFO );
+		exit(1);
+	}
+
+	$carddav_conn = new carddav_backend($url);
+	$carddav_conn->set_auth($login, $pass);
+	
+	if ( $carddav_conn->check_connection() ) {
+		gs_log(GS_LOG_DEBUG, getmypid() .': connected to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		return $carddav_conn;
+	} else {
+		gs_log(GS_LOG_FATAL, getmypid() .': Could not connect to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		return false;
+	}
+}
+
+// update gs records
+function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
+  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX;
+
+	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
+
+	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
+	if ( ! empty($lvc) ) {
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
+	}
+	else {
+		$DB->execute('INSERT INTO `pb_cloud_card` ' .
+				' (`cloud_id`,`vcard_id`,`etag`,`vcard`,`last_modified`) ' .
+				' VALUES(' . $vcr['id'] . ',\'' . $head['vcard_id'] . '\',\'' . $etag . '\',\'' . mysql_real_escape_string($vcard) . '\',\'' . $last_modified . '\')');
+		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
+				' FROM `pb_cloud_card` ' .
+				' WHERE `cloud_id`=' . $vcr['id'] . 
+					' and `vcard_id`=\'' . $head['vcard_id'] . '\''
+				)->fetchRow();
+	}
+
+	$tmp_vcard = explode("\n", $vcard);
+	
+	$n = array();
+	$acat = array();
+	$fn   = '';
+	$ln   = '';
+	foreach ( $tmp_vcard as $value ) {
+		if ( empty( $value ) ) continue;
+
+		$elem = substr($value, strpos($value, ':') + 1 );
+		$key  = substr($value, 0, strpos($value, ':') );
+		if     ( 'N' == $key ) {
+			$elem = trim($elem);
+			$aname = explode(';', $elem);
+			$ln = array_shift ( $aname );
+			for ($i = count($aname); $i >= 0; $i--) {
+				if ( empty($aname[$i]) ) continue;
+				$fn .= ' ' . $aname[$i];
+			}
+			$fn = ltrim( $fn );
+		}
+		if ( empty( $ln) ) {
+			$ln = $fn;
+			$fn='';
+		}
+
+		elseif ( 'TEL' == substr($key, 0, 3) ) {
+			$elem = trim($elem);
+			$ptype =  strtolower( substr($key, strpos($key, '=') + 1) );
+			
+			if ( '+' == substr($elem, 0, 1) ) 
+				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
+				
+			$number = preg_replace('/\D/', '', $elem);
+
+			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
+				$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
+
+			// insert number
+			$n[$number] = $ptype;
+		}
+
+		elseif ( 'CATEGORIES' == $key ) {
+			$elem = trim($elem);
+			$acat = explode( ',', $elem );
+		}
+	}
+	
+	// loop over phone numbers
+	foreach ( $n as $number => $ptype ) {
+
+		// check_duplicates from within a vcard
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);	
+
+		// add a phone record
+		$DB->execute('INSERT INTO `pb_prv` ' .
+			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`card_id`) ' .
+			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $ptype .'\',' . $lvc['id'] . ')');
+
+		// loop over categories
+		if ( ! empty( $acat) ) {
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $ptype . '\' and `card_id`=' . $lvc['id'])->fetchRow();
+			foreach ( $acat as $cat ) {
+				if ( empty($cat) ) continue;
+				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
+					// insert rec
+					$DB->execute('INSERT INTO `pb_category` ' .
+						' (`user_id`,`category`) ' .
+						' VALUES(' . $vcr['user_id'] .',\'' . $cat .'\')');
+					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow();
+				}
+				// correct xref
+				$DB->execute('INSERT INTO `pb_prv_category` ' .
+					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
+					' VALUES(' . $vcr['user_id'] .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
+				}
+		}
+	}
+
+}
+
+
+// fetch vcards for a cloud entry
+function gs_vcards_update( $vcr ) {
+  global $CARDDAV_LOG, $FIFO, $DB;
+
+	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
+	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
+		return false;
+	}
+
+	$a = new XMLThing();
+	$vchead = $a->parse($carddav_conn->get(false,true));
+	$vchead = $vchead['d:multistatus']['d:response'];
+	$head   = array_shift ( $vchead );
+	
+	// skip rest if not modified between, depending on header etag or lastmodified
+	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
+		// ref etag: https://tools.ietf.org/html/rfc6352
+		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
+		if ( $last_ctag == $vcr['last_ctag'] ) {
+			gs_log(GS_LOG_DEBUG, getmypid() .': no update, ctag='. $last_ctag, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else  $last_ctag = '';
+
+	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
+		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+		if ( $last_modified <= $vcr['last_remote_modified'] ) {
+			gs_log(GS_LOG_DEBUG, getmypid() .': no update, last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else $last_modified = $vcr['modified'];
+
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+	// update ctag and last_modified immed
+	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
+	
+	// get unseen records
+	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
+	$unseen=array();
+	$unrc = $DB->execute('SELECT `id`, `vcard_id`,`etag`, `last_modified` FROM `pb_cloud_card` WHERE `cloud_id`=' . $vcr['id']);
+	while ( $urc = $unrc->fetchRow() ) {
+		$unseen[$urc['vcard_id']] = array(
+			'id'		=> $urc['id'],
+			'etag'		=> $urc['etag'],
+			'last_modified' => $urc['last_modified']
+			);
+	}
+	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
+
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
+	
+	// iterate through all of them
+	for ($i = 0; $i < count($vchead); $i++) {
+
+		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
+		
+		$vchead[$i]['vcard_id'] =  $vcard_id;
+		
+		// check for existing vcard
+		if ( isset($unseen[$vcard_id]) ) {
+			$lvc = $unseen[$vcard_id];
+			// avoid deleting
+			unset($unseen["$vcard_id"]);
+
+			// skip if not modified
+			$last_modified = date("Y-m-d H:i:s", strtotime( $vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] ));
+			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
+			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
+
+			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
+
+			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
+
+			// modified remote get the new vcard
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
+			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
+
+		} else {
+
+			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
+			// missing local add new vcard
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');			
+			gs_vcard_update( $vcr, $vchead[$i], $vcard );
+		}
+	}
+
+	// delete no more existing recs
+	foreach ($unseen as $vcard_id => $value) {
+		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
+	}
+
+	return true;
+}
+
+$DB = gs_db_master_connect();
+
+
+// remain in loop, doing a record time by time (avoid race cond in dup exec)
+while ( true ) {
+	$vcrc = @ $DB->execute(
+		'SELECT
+		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, `last_remote_modified`, `modified`
+		FROM `pb_cloud` 
+		WHERE `next_poll` < NOW() ORDER BY `next_poll`
+		LIMIT 1'
+		);
+	if ( $vcr = $vcrc->fetchRow() ) {
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards: '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+	} else {
+		break; //the loop
+	}
+	
+	// update next check immediately to avoid concurrent execs in timeout situations
+	$hdm2text = array(
+		'h' => 'hour',
+		'd' => 'day', 
+		'm' => 'month' 
+	);
+	$period = substr($vcr['frequency'], -1);
+	$freq = substr($vcr['frequency'], 0, -1);
+	if ( $freq > 1 ) $more = 's'; 
+	else $more = '';
+
+	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
+
+	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\' WHERE `id`=' . $vcr['id']);
+
+	if ( gs_vcards_update( $vcr )  === true ) {
+		// all went ok
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal.', $CARDDAV_LOG, $FIFO );
+
+	} else {
+		// any failure
+		gs_log(GS_LOG_WARNING, getmypid() .': Check vCards failed for '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+	}
+}
+
+?>

From 17f65eabab59146e6d0f16c420daffd948afeab0 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 08:41:14 +0100
Subject: [PATCH 23/87] moved to sbin

---
 .../scripts/gs-carddav-reader.php             | 315 ------------------
 1 file changed, 315 deletions(-)
 delete mode 100644 opt/gemeinschaft/scripts/gs-carddav-reader.php

diff --git a/opt/gemeinschaft/scripts/gs-carddav-reader.php b/opt/gemeinschaft/scripts/gs-carddav-reader.php
deleted file mode 100644
index 9d999452b..000000000
--- a/opt/gemeinschaft/scripts/gs-carddav-reader.php
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/php -q
-<?php
-/*******************************************************************\
-*	Gemeinschaft - asterisk cluster gemeinschaft
-* 
-* $Revision$
-* 
-* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
-* http://www.std-soft.com/
-* Markus Neubauer <markus.neubauer@email-online.org>
-* 
-* 
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-* MA 02110-1301, USA.
-\*******************************************************************/
-
-define('GS_VALID', true); // arriving nativ here
-
-require_once( dirName(__FILE__) .'/../inc/conf.php' );
-$CARDDAV_LOG = 'cloud_connector.log';
-$FIFO = '';
-$process_name = 'vcard-checker';
-include_once( GS_DIR .'inc/log.php' );
-
-if (defined('STDIN' )) @fClose(STDIN );
-if (defined('STDOUT')) @fClose(STDOUT);
-if (defined('STDERR')) @fClose(STDERR);
-
-include_once( GS_DIR .'lib/yadb/yadb.php' );
-include_once( GS_DIR .'inc/gs-lib.php' );
-require_once( GS_DIR .'lib/carddav/CardDAV.php' );
-require_once( GS_DIR .'lib/XML/xml2array.php' );
-require_once( GS_DIR .'inc/db_connect.php' );
-
-
-// vCard DAV connect
-function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
-  global $CARDDAV_LOG, $FIFO;
-
-	if (! class_exists('carddav_backend')) {
-		gs_log( GS_LOG_FATAL, getmypid() .': This PHP does not support carddav (lib CardDav.php missing)!', $CARDDAV_LOG, $FIFO );
-		exit(1);
-	}
-
-	$carddav_conn = new carddav_backend($url);
-	$carddav_conn->set_auth($login, $pass);
-	
-	if ( $carddav_conn->check_connection() ) {
-		gs_log(GS_LOG_DEBUG, getmypid() .': connected to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
-		return $carddav_conn;
-	} else {
-		gs_log(GS_LOG_FATAL, getmypid() .': Could not connect to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
-		return false;
-	}
-}
-
-// update gs records
-function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
-  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX;
-
-	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
-	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
-
-	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
-	if ( ! empty($lvc) ) {
-		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
-	}
-	else {
-		$DB->execute('INSERT INTO `pb_cloud_card` ' .
-				' (`cloud_id`,`vcard_id`,`etag`,`vcard`,`last_modified`) ' .
-				' VALUES(' . $vcr['id'] . ',\'' . $head['vcard_id'] . '\',\'' . $etag . '\',\'' . mysql_real_escape_string($vcard) . '\',\'' . $last_modified . '\')');
-		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
-				' FROM `pb_cloud_card` ' .
-				' WHERE `cloud_id`=' . $vcr['id'] . 
-					' and `vcard_id`=\'' . $head['vcard_id'] . '\''
-				)->fetchRow();
-	}
-
-	$tmp_vcard = explode("\n", $vcard);
-	
-	$n = array();
-	$acat = array();
-	$fn   = '';
-	$ln   = '';
-	foreach ( $tmp_vcard as $value ) {
-		if ( empty( $value ) ) continue;
-
-		$elem = substr($value, strpos($value, ':') + 1 );
-		$key  = substr($value, 0, strpos($value, ':') );
-		if     ( 'N' == $key ) {
-			$elem = trim($elem);
-			$aname = explode(';', $elem);
-			$ln = array_shift ( $aname );
-			for ($i = count($aname); $i >= 0; $i--) {
-				if ( empty($aname[$i]) ) continue;
-				$fn .= ' ' . $aname[$i];
-			}
-			$fn = ltrim( $fn );
-		}
-		if ( empty( $ln) ) {
-			$ln = $fn;
-			$fn='';
-		}
-
-		elseif ( 'TEL' == substr($key, 0, 3) ) {
-			$elem = trim($elem);
-			$ptype =  strtolower( substr($key, strpos($key, '=') + 1) );
-			
-			if ( '+' == substr($elem, 0, 1) ) 
-				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
-				
-			$number = preg_replace('/\D/', '', $elem);
-
-			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
-				$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
-
-			// insert number
-			$n[$number] = $ptype;
-		}
-
-		elseif ( 'CATEGORIES' == $key ) {
-			$elem = trim($elem);
-			$acat = explode( ',', $elem );
-		}
-	}
-	
-	// loop over phone numbers
-	foreach ( $n as $number => $ptype ) {
-
-		// check_duplicates from within a vcard
-		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
-			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);	
-
-		// add a phone record
-		$DB->execute('INSERT INTO `pb_prv` ' .
-			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`card_id`) ' .
-			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $ptype .'\',' . $lvc['id'] . ')');
-
-		// loop over categories
-		if ( ! empty( $acat) ) {
-			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $ptype . '\' and `card_id`=' . $lvc['id'])->fetchRow();
-			foreach ( $acat as $cat ) {
-				if ( empty($cat) ) continue;
-				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
-					// insert rec
-					$DB->execute('INSERT INTO `pb_category` ' .
-						' (`user_id`,`category`) ' .
-						' VALUES(' . $vcr['user_id'] .',\'' . $cat .'\')');
-					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow();
-				}
-				// correct xref
-				$DB->execute('INSERT INTO `pb_prv_category` ' .
-					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
-					' VALUES(' . $vcr['user_id'] .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
-				}
-		}
-	}
-
-}
-
-
-// fetch vcards for a cloud entry
-function gs_vcards_update( $vcr ) {
-  global $CARDDAV_LOG, $FIFO, $DB;
-
-	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
-	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
-		return false;
-	}
-
-	$a = new XMLThing();
-	$vchead = $a->parse($carddav_conn->get(false,true));
-	$vchead = $vchead['d:multistatus']['d:response'];
-	$head   = array_shift ( $vchead );
-	
-	// skip rest if not modified between, depending on header etag or lastmodified
-	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
-		// ref etag: https://tools.ietf.org/html/rfc6352
-		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
-		if ( $last_ctag == $vcr['last_ctag'] ) {
-			gs_log(GS_LOG_DEBUG, getmypid() .': no update, ctag='. $last_ctag, $CARDDAV_LOG, $FIFO );
-			return true;
-		}
-	} else  $last_ctag = '';
-
-	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
-		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
-		if ( $last_modified <= $vcr['last_remote_modified'] ) {
-			gs_log(GS_LOG_DEBUG, getmypid() .': no update, last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
-			return true;
-		}
-	} else $last_modified = $vcr['modified'];
-
-	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
-	// update ctag and last_modified immed
-	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
-	
-	// get unseen records
-	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
-	$unseen=array();
-	$unrc = $DB->execute('SELECT `id`, `vcard_id`,`etag`, `last_modified` FROM `pb_cloud_card` WHERE `cloud_id`=' . $vcr['id']);
-	while ( $urc = $unrc->fetchRow() ) {
-		$unseen[$urc['vcard_id']] = array(
-			'id'		=> $urc['id'],
-			'etag'		=> $urc['etag'],
-			'last_modified' => $urc['last_modified']
-			);
-	}
-	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
-
-	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
-	
-	// iterate through all of them
-	for ($i = 0; $i < count($vchead); $i++) {
-
-		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
-		
-		$vchead[$i]['vcard_id'] =  $vcard_id;
-		
-		// check for existing vcard
-		if ( isset($unseen[$vcard_id]) ) {
-			$lvc = $unseen[$vcard_id];
-			// avoid deleting
-			unset($unseen["$vcard_id"]);
-
-			// skip if not modified
-			$last_modified = date("Y-m-d H:i:s", strtotime( $vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] ));
-			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
-			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
-
-			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
-
-			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
-
-			// modified remote get the new vcard
-			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
-			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
-
-		} else {
-
-			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
-			// missing local add new vcard
-			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');			
-			gs_vcard_update( $vcr, $vchead[$i], $vcard );
-		}
-	}
-
-	// delete no more existing recs
-	foreach ($unseen as $vcard_id => $value) {
-		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
-		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
-		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
-	}
-
-	return true;
-}
-
-$DB = gs_db_master_connect();
-
-
-// remain in loop, doing a record time by time (avoid race cond in dup exec)
-while ( true ) {
-	$vcrc = @ $DB->execute(
-		'SELECT
-		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, `last_remote_modified`, `modified`
-		FROM `pb_cloud` 
-		WHERE `next_poll` < NOW() ORDER BY `next_poll`
-		LIMIT 1'
-		);
-	if ( $vcr = $vcrc->fetchRow() ) {
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards: '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
-	} else {
-		break; //the loop
-	}
-	
-	// update next check immediately to avoid concurrent execs in timeout situations
-	$hdm2text = array(
-		'h' => 'hour',
-		'd' => 'day', 
-		'm' => 'month' 
-	);
-	$period = substr($vcr['frequency'], -1);
-	$freq = substr($vcr['frequency'], 0, -1);
-	if ( $freq > 1 ) $more = 's'; 
-	else $more = '';
-
-	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
-
-	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\' WHERE `id`=' . $vcr['id']);
-
-	if ( gs_vcards_update( $vcr )  === true ) {
-		// all went ok
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal.', $CARDDAV_LOG, $FIFO );
-
-	} else {
-		// any failure
-		gs_log(GS_LOG_WARNING, getmypid() .': Check vCards failed for '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
-	}
-}
-
-?>

From 7281cc2929df5c5de2bd450c5eba10388df6b238 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 08:48:49 +0100
Subject: [PATCH 24/87] Rename gs-carddav-reader to gs-carddav-reader-to-db

---
 .../sbin/{gs-carddav-reader => gs-carddav-reader-to-db}           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename opt/gemeinschaft/sbin/{gs-carddav-reader => gs-carddav-reader-to-db} (100%)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
similarity index 100%
rename from opt/gemeinschaft/sbin/gs-carddav-reader
rename to opt/gemeinschaft/sbin/gs-carddav-reader-to-db

From f9fd55ec9a212ee4919824ee97c85eeb75b0a488 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 11 Dec 2015 09:33:29 +0100
Subject: [PATCH 25/87] prohibit changes on cloud records

Prohibit changes on cloud records, as the cloud server always needs to win. This is mandatory as phone addressbooks of smartphones and web should not diverge.
---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index ae8d4dd59..571c361a6 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -119,7 +119,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number` , `ptype` '.
+			'`id`, `lastname`, `firstname`, `number` , `ptype`, `card_id` '.
 		'FROM '.
 			'`pb_prv` '.
 		'WHERE '.
@@ -147,7 +147,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number`, `ptype` '.
+			'`id`, `lastname`, `firstname`, `number`, `ptype`, `card_id` '.
 		'FROM '.
 			'`pb_prv` '.
 		'WHERE '.
@@ -314,8 +314,10 @@ function confirm_delete() {
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			if ( ! $r['card_id'] ) {
+				echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+				echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			}
 			echo '</td>';
 			
 		}

From beffedc52f57997e77e92c8e376420231237c29d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:12:57 +0100
Subject: [PATCH 26/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index d6046e8f8..89978e15b 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -6,20 +6,28 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   `lastname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `number` varchar(25) CHARACTER SET ascii NOT NULL DEFAULT '',
   `ptype` varchar(16) COLLATE utf8_unicode_ci NOT NULL COMMENT 'cell,work,home',
+  `pref` int(2) unsigned NOT NULL DEFAULT '9',
   `card_id` int(10) unsigned NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  KEY `uid_lastname_firstname` (`user_id`,`lastname`(15),`firstname`(10)),
-  KEY `uid_firstname_lastname` (`user_id`,`firstname`(10),`lastname`(10)),
-  KEY `uid_number` (`user_id`,`number`(10)),
-  KEY `uid_cardid` (`user_id`,`card_id`),
-  KEY `cloud_card_id` (`card_id`)
+  KEY `uid_vcard` (`user_id`,`card_id`),
+  KEY `cloud_card_id` (`card_id`),
+  KEY `uid_lastname_firstname_pref` (`user_id`,`lastname`(15),`firstname`(10),`pref`,`ptype`),
+  KEY `uid_number_pref` (`user_id`,`number`(10),`pref`,`ptype`),
+  KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 // alter existing 3.2 private phonebook
-ALTER TABLE `pb_prv`  ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
+ALTER TABLE `pb_prv` ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
+ALTER TABLE `pb_prv` ADD `pref` int(2) unsigned NOT NULL DEFAULT '9';
 ALTER TABLE `pb_prv` ADD `vcard_id` int(10) NOT NULL;
 ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_firstname_lastname_pref` ,
+ ADD INDEX `uid_firstname_lastname_pref` ( `user_id` , `firstname` ( 10 ) , `lastname` ( 10 ) , `pref` , `ptype` );
+ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_lastname_firstname_pref` , 
+ ADD INDEX `uid_lastname_firstname_pref` ( `user_id` , `lastname` ( 15 ) , `firstname` ( 10 ) , `pref` , `ptype` );
+ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_number_pref` ,
+ ADD INDEX `uid_number_pref` ( `user_id` , `number` ( 10 ) , `pref` , `ptype` );
 ALTER TABLE `pb_prv` ADD INDEX `uid_cardid` (`user_id`,`card_id`);
 ALTER TABLE `pb_prv` ADD INDEX `cloud_card_id` (`card_id`);
 

From 77e3a8ad44f8cad627ed7d39e732c88075dd97ca Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:14:45 +0100
Subject: [PATCH 27/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 9d999452b..4f8b2d72d 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -93,32 +93,29 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	
 	$n = array();
 	$acat = array();
+	$aparam = array();
 	$fn   = '';
 	$ln   = '';
 	foreach ( $tmp_vcard as $value ) {
 		if ( empty( $value ) ) continue;
 
-		$elem = substr($value, strpos($value, ':') + 1 );
-		$key  = substr($value, 0, strpos($value, ':') );
+		$pos = strpos($value, ':');
+		$elem = trim(substr($value, $pos + 1 ));
+		$aparam = explode(';', substr($value, 0, $pos));
+		$key  = strtoupper( array_shift( $aparam ) );
+
 		if     ( 'N' == $key ) {
-			$elem = trim($elem);
 			$aname = explode(';', $elem);
-			$ln = array_shift ( $aname );
+			$ln = array_shift( $aname );
 			for ($i = count($aname); $i >= 0; $i--) {
 				if ( empty($aname[$i]) ) continue;
 				$fn .= ' ' . $aname[$i];
 			}
 			$fn = ltrim( $fn );
 		}
-		if ( empty( $ln) ) {
-			$ln = $fn;
-			$fn='';
-		}
+		if ( empty( $ln) ) { $ln = $fn; $fn=''; }
 
-		elseif ( 'TEL' == substr($key, 0, 3) ) {
-			$elem = trim($elem);
-			$ptype =  strtolower( substr($key, strpos($key, '=') + 1) );
-			
+		elseif ( 'TEL' == $key ) {
 			if ( '+' == substr($elem, 0, 1) ) 
 				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
 				
@@ -127,18 +124,27 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
 				$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
 
-			// insert number
-			$n[$number] = $ptype;
-		}
+			// add number to array, making it singular
+			$n[$number] = array( 'type' => '', 'pref' => 99 );
 
-		elseif ( 'CATEGORIES' == $key ) {
-			$elem = trim($elem);
-			$acat = explode( ',', $elem );
+			// add attributes to the number
+			foreach ( $aparam as $param ) {
+				if ( empty($param) ) continue;
+				$k2 = explode('=', strtoupper( $param ));
+				if ( 'TYPE' == $k2[0] ) {
+					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 0;
+					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
+				}
+				elseif ( 'PREF' == $key2 ) $n[$number]['pref'] = $value2;
+			}
+			$n[$number]['type'] = rtrim($n[$number]['type'], ',');
 		}
+
+		elseif ( 'CATEGORIES' == $key ) $acat = explode( ',', $elem );
 	}
 	
 	// loop over phone numbers
-	foreach ( $n as $number => $ptype ) {
+	foreach ( $n as $number => $param ) {
 
 		// check_duplicates from within a vcard
 		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
@@ -146,12 +152,12 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 
 		// add a phone record
 		$DB->execute('INSERT INTO `pb_prv` ' .
-			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`card_id`) ' .
-			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $ptype .'\',' . $lvc['id'] . ')');
+			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`pref`,`card_id`) ' .
+			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $param['type'] .'\',' . $param['pref'] . ',' . $lvc['id'] . ')');
 
 		// loop over categories
 		if ( ! empty( $acat) ) {
-			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $ptype . '\' and `card_id`=' . $lvc['id'])->fetchRow();
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'])->fetchRow();
 			foreach ( $acat as $cat ) {
 				if ( empty($cat) ) continue;
 				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {

From 98d2a65eb0be713dbe16254dc9e4f0fd8c36439d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:17:29 +0100
Subject: [PATCH 28/87] Update pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index eed61634f..3a399bf5b 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -383,5 +383,7 @@ function confirm_delete() {
 <dt class="text">Apple Addressbook Server</dt><dd class="text">https://example.com/addressbooks/users/{resource|principal|username}/{collection}/</dd>
 </dl>
 </div>
-<p class="text"><sup>[2]</sup> Schedule: h=hour, d=day, m=month (Max. 2 digits + 1 char, no minutes allowed).<br>
- &nbsp; &nbsp; &nbsp; Example: '4h' = refresh every 4 hours (~ also during night). Defaults to '1d'.</p>
+<p class="text"><sup>[2]</sup> Schedule: Defaults to '1d', the first/next update will happen within half an hour.<br>
+ &nbsp; &nbsp; &nbsp; Where h=hour, d=day, m=month (Max. 2 digits plus 1 char, no blank/minutes allowed).<br>
+ &nbsp; &nbsp; &nbsp; Example: <i>12h</i> =~ refresh every 12 hours (~ also during night), starting with now (save time).<br>
+ &nbsp; &nbsp; &nbsp; You can <i>trigger</i> a refresh using <i>edit</i> and <i>save</i> with no other changes.<p>

From 41c668a7483ffa4f993903c012c0f8d8fbc8f4f7 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:18:16 +0100
Subject: [PATCH 29/87] Update pb_private.php

---
 .../htdocs/gui/mod/pb_private.php             | 368 ++++++++++++++++++
 1 file changed, 368 insertions(+)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index 571c361a6..5c1f33dcc 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -7,6 +7,15 @@
 * Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
 * http://www.amooma.de/
 * Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
+* Philipp Kempgen <philipp.k<?php
+/*******************************************************************\
+*            Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
+* http://www.amooma.de/
+* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
 * Philipp Kempgen <philipp.kempgen@amooma.de>
 * Peter Kozak <peter.kozak@amooma.de>
 * Soeren Sprenger <soeren.sprenger@amooma.de>
@@ -105,6 +114,365 @@ function confirm_delete() {
 
 
 
+if ($number != '') {
+	
+	# search by number
+	
+	$search_url = 'number='. urlEncode($number);
+	
+	$number_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$number
+	) .'%';
+	
+	$rs = $DB->execute(
+		'SELECT SQL_CALC_FOUND_ROWS '.
+			'`id`, `lastname`, `firstname`, `number` , `ptype`, `card_id` '.
+		'FROM '.
+			'`pb_prv` '.
+		'WHERE '.
+			'`number` LIKE \''. $DB->escape($number_sql) .'\' '.
+			'AND '.
+			'`user_id`='. $user_id .' '.
+		'ORDER BY `lastname`, `firstname`, `pref`, `ptype` '.
+		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
+		);
+	$num_total = @$DB->numFoundRows();
+	$num_pages = ceil($num_total / $per_page);
+	
+} else {
+	
+	# search by name
+	
+	$number = '';
+	$search_url = 'name='. urlEncode($name);
+	
+	$name_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$name
+	) .'%';
+	
+	$rs = $DB->execute(
+		'SELECT SQL_CALC_FOUND_ROWS '.
+			'`id`, `lastname`, `firstname`, `number`, `ptype`, `card_id` '.
+		'FROM '.
+			'`pb_prv` '.
+		'WHERE '.
+			'( `lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
+			'  `firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) '.
+			'AND '.
+			'`user_id`='. $DB->escape($user_id).' '.
+		'ORDER BY `lastname`, `firstname`, `pref`, `ptype` '.
+		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
+		);
+	$num_total = @$DB->numFoundRows();
+	$num_pages = ceil($num_total / $per_page);
+	
+}
+
+
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
+	<th style="width:200px;"><?php echo __('Nummer suchen'); ?></th>
+	<th style="width:220px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="text" name="name" id="ipt-name" value="<?php echo htmlEnt($name); ?>" size="25" style="width:200px;" />
+		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-name').focus(); }catch(e){} /*]]>*/</script>
+		<button type="submit" title="<?php echo __('Name suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="text" name="number" value="<?php echo htmlEnt($number); ?>" size="15" style="width:130px;" />
+		<button type="submit" title="<?php echo __('Nummer suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td rowspan="2">
+<?php
+
+if ($page > 0) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
+}
+if ($page < $num_pages-1) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
+}
+
+?>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" class="quickchars">
+<?php
+
+$chars = array();
+$chars['#'] = '';
+for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
+foreach ($chars as $cd => $cs) {
+	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)), '">', htmlEnt($cd), '</a>', "\n";
+}
+
+?>
+	</td>
+</tr>
+</tbody>
+</table>
+
+
+
+<?php
+echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
+echo gs_form_hidden($SECTION, $MODULE), "\n";
+echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
+echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
+echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
+?>
+
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"<?php if ($number=='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Nachname') .', '. __('Vorname'); ?>
+	</th>
+	<th style="width:200px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Nummer'); ?>
+	</th>
+	<th style="width:100px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Location'); ?><sup>[1]</sup>
+	</th>
+	<th style="width:100px;">
+		<?php echo __('call') . '/' . __('edit') . '/' . __('delete')?>
+	</th>
+</tr>
+</thead>
+<tbody>
+
+<?php
+
+if (@$rs) {
+	$i = 0;
+	$last_seen = '';
+	while ($r = $rs->fetchRow()) {
+		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
+		
+		if ($r['id']==$edit_entry) {
+ 			
+			echo '<td>';
+			echo '<input type="text" name="slname" value="', htmlEnt($r['lastname']), '" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="', htmlEnt($r['firstname']), '" size="15" maxlength="40" style="width:115px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="snumber" value="', htmlEnt($r['number']), '" size="15" maxlength="25" style="width:150px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:100px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
+			echo '<input type="hidden" name="page" value="', $page, '" />';
+			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
+			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
+			echo '</button>';
+			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
+			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
+			echo '</button>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page), '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
+	
+			echo '</td>';
+			
+		} else {
+			
+			$show_name = trim( $r['lastname'] . ', ' . $r['firstname'], " ," );
+			if ( $last_seen != $show_name ) {
+				echo '<td>';
+				$last_seen = htmlEnt($show_name);
+			}
+			else echo '<td style="opacity: 0.0;">';
+			echo $last_seen;
+			echo '</td>', "\n";
+			
+			echo '<td>', htmlEnt($r['number']), '</td>', "\n";
+
+			echo '<td>', htmlEnt($r['ptype']), '</td>', "\n";
+			
+			echo '<td>';
+			$sudo_url =
+				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
+				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
+			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			if ( $r['card_id'] ) echo ' <sup>[2]</sup>';
+			echo '</td>';
+			
+		}
+		
+		echo '</tr>', "\n";
+	}
+}
+
+?>
+
+
+<tr>
+<?php
+if ($edit_entry < 1) {
+?>
+	<td>
+		<input type="text" name="slname" value="" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="" size="15" maxlength="40" style="width:115px;" />
+	</td>
+	<td>
+		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
+	</td>
+	<td>
+		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:100px;" />
+	</td>
+	<td>
+		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
+			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
+		</button>
+		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
+	</td>
+<?php
+}
+?>
+</tr>
+
+</tbody>
+</table>
+
+</form>
+<br>
+<p class="text"><sup>[1]</sup> Type of phone number: cell/work/home etc.</p>
+<p class="text"><sup>[2]</sup> You can loose local changes on a refresh, rather modify/delete this entry within your cloud!</p>
+empgen@amooma.de>
+* Peter Kozak <peter.kozak@amooma.de>
+* Soeren Sprenger <soeren.sprenger@amooma.de>
+* Markus Neubauer <markus.neubauer@email-online.org> - 2015
+*  - extending db and preparing for vcards
+* you need to alter the db for this version to work:
+* 
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+defined('GS_VALID') or die('No direct access.');
+include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
+
+echo '<h2>';
+if (@$MODULES[$SECTION]['icon'])
+	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
+if (count( $MODULES[$SECTION]['sub'] ) > 1 )
+	echo $MODULES[$SECTION]['title'], ' - ';
+echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
+echo '</h2>', "\n";
+
+
+echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
+echo '<script type="text/javascript">
+//<![CDATA[
+function confirm_delete() {
+	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
+}
+//]]>
+</script>' ,"\n";
+
+$per_page = (int)GS_GUI_NUM_RESULTS;
+
+$name         =      trim(@$_REQUEST['name'   ]);
+$number       =      trim(@$_REQUEST['number' ]);
+$ptype        =      trim(@$_REQUEST['ptype' ]);
+$save_lname   =      trim(@$_REQUEST['slname' ]);
+$save_fname   =      trim(@$_REQUEST['sfname' ]);
+$save_number  =      trim(@$_REQUEST['snumber']);
+$save_ptype   =      trim(@$_REQUEST['sptype']);
+$page         = (int)    (@$_REQUEST['page'   ]);
+$delete_entry = (int)trim(@$_REQUEST['delete' ]);
+$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
+$save_entry   = (int)trim(@$_REQUEST['save'   ]);
+
+$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
+
+if ($delete_entry > 0) {
+	# delete entry
+	
+	$rs = $DB->execute(
+'DELETE FROM `pb_prv`
+WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
+	);
+	
+}
+
+if (($save_lname != '' || $save_fname != '') && ($save_number != '')) {
+	# save entry
+	
+	if ($save_entry < 1) {
+		
+		$rs = $DB->execute(
+'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`, `ptype`) VALUES
+(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\', \''. $DB->escape($save_ptype) .'\')'
+		);
+		
+	} else {
+		
+		$rs = $DB->execute(
+'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
+WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
+		);
+		
+	}
+	$save_number = '';
+	$save_name = '';
+	$save_ptype = '';
+}
+
+
+
+
+
 if ($number != '') {
 	
 	# search by number

From 073f14310df4454fa89675b315b3ad4ee0e374ac Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:20:14 +0100
Subject: [PATCH 30/87] Update pb_private.php

---
 .../htdocs/gui/mod/pb_private.php             | 383 ------------------
 1 file changed, 383 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index 5c1f33dcc..1ebf54435 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -7,15 +7,6 @@
 * Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
 * http://www.amooma.de/
 * Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
-* Philipp Kempgen <philipp.k<?php
-/*******************************************************************\
-*            Gemeinschaft - asterisk cluster gemeinschaft
-* 
-* $Revision$
-* 
-* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
-* http://www.amooma.de/
-* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
 * Philipp Kempgen <philipp.kempgen@amooma.de>
 * Peter Kozak <peter.kozak@amooma.de>
 * Soeren Sprenger <soeren.sprenger@amooma.de>
@@ -375,377 +366,3 @@ function confirm_delete() {
 <br>
 <p class="text"><sup>[1]</sup> Type of phone number: cell/work/home etc.</p>
 <p class="text"><sup>[2]</sup> You can loose local changes on a refresh, rather modify/delete this entry within your cloud!</p>
-empgen@amooma.de>
-* Peter Kozak <peter.kozak@amooma.de>
-* Soeren Sprenger <soeren.sprenger@amooma.de>
-* Markus Neubauer <markus.neubauer@email-online.org> - 2015
-*  - extending db and preparing for vcards
-* you need to alter the db for this version to work:
-* 
-* 
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-* MA 02110-1301, USA.
-\*******************************************************************/
-
-defined('GS_VALID') or die('No direct access.');
-include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
-
-echo '<h2>';
-if (@$MODULES[$SECTION]['icon'])
-	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
-if (count( $MODULES[$SECTION]['sub'] ) > 1 )
-	echo $MODULES[$SECTION]['title'], ' - ';
-echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
-echo '</h2>', "\n";
-
-
-echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
-echo '<script type="text/javascript">
-//<![CDATA[
-function confirm_delete() {
-	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
-}
-//]]>
-</script>' ,"\n";
-
-$per_page = (int)GS_GUI_NUM_RESULTS;
-
-$name         =      trim(@$_REQUEST['name'   ]);
-$number       =      trim(@$_REQUEST['number' ]);
-$ptype        =      trim(@$_REQUEST['ptype' ]);
-$save_lname   =      trim(@$_REQUEST['slname' ]);
-$save_fname   =      trim(@$_REQUEST['sfname' ]);
-$save_number  =      trim(@$_REQUEST['snumber']);
-$save_ptype   =      trim(@$_REQUEST['sptype']);
-$page         = (int)    (@$_REQUEST['page'   ]);
-$delete_entry = (int)trim(@$_REQUEST['delete' ]);
-$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
-$save_entry   = (int)trim(@$_REQUEST['save'   ]);
-
-$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
-
-if ($delete_entry > 0) {
-	# delete entry
-	
-	$rs = $DB->execute(
-'DELETE FROM `pb_prv`
-WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
-	);
-	
-}
-
-if (($save_lname != '' || $save_fname != '') && ($save_number != '')) {
-	# save entry
-	
-	if ($save_entry < 1) {
-		
-		$rs = $DB->execute(
-'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`, `ptype`) VALUES
-(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\', \''. $DB->escape($save_ptype) .'\')'
-		);
-		
-	} else {
-		
-		$rs = $DB->execute(
-'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
-WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
-		);
-		
-	}
-	$save_number = '';
-	$save_name = '';
-	$save_ptype = '';
-}
-
-
-
-
-
-if ($number != '') {
-	
-	# search by number
-	
-	$search_url = 'number='. urlEncode($number);
-	
-	$number_sql = str_replace(
-		array( '*', '?' ),
-		array( '%', '_' ),
-		$number
-	) .'%';
-	
-	$rs = $DB->execute(
-		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number` , `ptype`, `card_id` '.
-		'FROM '.
-			'`pb_prv` '.
-		'WHERE '.
-			'`number` LIKE \''. $DB->escape($number_sql) .'\' '.
-			'AND '.
-			'`user_id`='. $user_id .' '.
-		'ORDER BY `lastname`, `firstname` '.
-		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
-		);
-	$num_total = @$DB->numFoundRows();
-	$num_pages = ceil($num_total / $per_page);
-	
-} else {
-	
-	# search by name
-	
-	$number = '';
-	$search_url = 'name='. urlEncode($name);
-	
-	$name_sql = str_replace(
-		array( '*', '?' ),
-		array( '%', '_' ),
-		$name
-	) .'%';
-	
-	$rs = $DB->execute(
-		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number`, `ptype`, `card_id` '.
-		'FROM '.
-			'`pb_prv` '.
-		'WHERE '.
-			'( `lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
-			'  `firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) '.
-			'AND '.
-			'`user_id`='. $DB->escape($user_id).' '.
-		'ORDER BY `lastname`, `firstname` '.
-		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
-		);
-	$num_total = @$DB->numFoundRows();
-	$num_pages = ceil($num_total / $per_page);
-	
-}
-
-
-?>
-
-<table cellspacing="1" class="phonebook">
-<thead>
-<tr>
-	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
-	<th style="width:200px;"><?php echo __('Nummer suchen'); ?></th>
-	<th style="width:220px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-	<td>
-		<form method="get" action="<?php echo GS_URL_PATH; ?>">
-		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
-		<input type="text" name="name" id="ipt-name" value="<?php echo htmlEnt($name); ?>" size="25" style="width:200px;" />
-		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-name').focus(); }catch(e){} /*]]>*/</script>
-		<button type="submit" title="<?php echo __('Name suchen'); ?>" class="plain">
-			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
-		</button>
-		</form>
-	</td>
-	<td>
-		<form method="get" action="<?php echo GS_URL_PATH; ?>">
-		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
-		<input type="text" name="number" value="<?php echo htmlEnt($number); ?>" size="15" style="width:130px;" />
-		<button type="submit" title="<?php echo __('Nummer suchen'); ?>" class="plain">
-			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
-		</button>
-		</form>
-	</td>
-	<td rowspan="2">
-<?php
-
-if ($page > 0) {
-	echo
-	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
-	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
-	'</a>', "\n";
-} else {
-	echo
-	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
-}
-if ($page < $num_pages-1) {
-	echo
-	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
-	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
-	'</a>', "\n";
-} else {
-	echo
-	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
-}
-
-?>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" class="quickchars">
-<?php
-
-$chars = array();
-$chars['#'] = '';
-for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
-foreach ($chars as $cd => $cs) {
-	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)), '">', htmlEnt($cd), '</a>', "\n";
-}
-
-?>
-	</td>
-</tr>
-</tbody>
-</table>
-
-
-
-<?php
-echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
-echo gs_form_hidden($SECTION, $MODULE), "\n";
-echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
-echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
-echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
-?>
-
-<table cellspacing="1" class="phonebook">
-<thead>
-<tr>
-	<th style="width:270px;"<?php if ($number=='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Nachname') .', '. __('Vorname'); ?>
-	</th>
-	<th style="width:200px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Nummer'); ?>
-	</th>
-	<th style="width:100px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Location'); ?><sup>[1]</sup>
-	</th>
-	<th style="width:100px;">&nbsp;</th>
-</tr>
-</thead>
-<tbody>
-
-<?php
-
-if (@$rs) {
-	$i = 0;
-	while ($r = $rs->fetchRow()) {
-		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
-		
-		if ($r['id']==$edit_entry) {
- 			
-			echo '<td>';
-			echo '<input type="text" name="slname" value="', htmlEnt($r['lastname']), '" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="', htmlEnt($r['firstname']), '" size="15" maxlength="40" style="width:115px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="text" name="snumber" value="', htmlEnt($r['number']), '" size="15" maxlength="25" style="width:150px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:100px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
-			echo '<input type="hidden" name="page" value="', $page, '" />';
-			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
-			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
-			echo '</button>';
-			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
-			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
-			echo '</button>';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page), '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
-	
-			echo '</td>';
-			
-		} else {
-			
-			echo '<td>', htmlEnt($r['lastname']);
-			if ($r['firstname'] != '')
-				echo ', ', htmlEnt($r['firstname']);
-			echo '</td>', "\n";
-			
-			echo '<td>', htmlEnt($r['number']), '</td>', "\n";
-
-			echo '<td>', htmlEnt($r['ptype']), '</td>', "\n";
-			
-			echo '<td>';
-			$sudo_url =
-				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
-				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
-			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			if ( ! $r['card_id'] ) {
-				echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
-				echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
-			}
-			echo '</td>';
-			
-		}
-		
-		echo '</tr>', "\n";
-	}
-}
-
-?>
-
-
-<tr>
-<?php
-if ($edit_entry < 1) {
-?>
-	<td>
-		<input type="text" name="slname" value="" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="" size="15" maxlength="40" style="width:115px;" />
-	</td>
-	<td>
-		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
-	</td>
-	<td>
-		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:100px;" />
-	</td>
-	<td>
-		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
-			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
-		</button>
-		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
-	</td>
-<?php
-}
-?>
-</tr>
-
-</tbody>
-</table>
-
-</form>
-<br>
-<p class="text"><sup>[1]</sup> Type of phone number: cell/work/home etc.</p>
-<?php
-/*
-function check_pb_table() {
-
-	if ( empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "ptype"')->fetchRow() ) ) {
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `ptype` varchar(16) NOT NULL COMMENT "cell,work,home"');
-	}
-	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "vcard_id"')->fetchRow() )) {
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `vcard_id` int(11) NOT NULL');
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_vcard` (`user_id`,`vcard_id`)');
-	}
-	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "cat_id"')->fetchRow() )) {
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `cat_id` int(11) NOT NULL');
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_cat_lastname_firstname` (`user_id`,`cat_id`,`lastname`,`firstname`)');
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD INDEX `uid_cat_firstname_lastname` (`user_id`,`cat_id`,`firstname`,`lastname`)');
-	}
-	if (empty( $DB->execute('SHOW COLUMNS FROM pb_prv LIKE "modified"')->fetchRow() )) {
-		$rs = $DB->execute('ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP');
-	}
-}
-*/
-?>

From 4e7cd12d35d80f00a263da080fd16c1586a86397 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 12 Dec 2015 00:40:45 +0100
Subject: [PATCH 31/87] Update asterisk.sql

---
 usr/share/doc/gemeinschaft/asterisk.sql | 39 +++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/gemeinschaft/asterisk.sql b/usr/share/doc/gemeinschaft/asterisk.sql
index 9102dbeb2..4a4b1b56d 100644
--- a/usr/share/doc/gemeinschaft/asterisk.sql
+++ b/usr/share/doc/gemeinschaft/asterisk.sql
@@ -6723,19 +6723,6 @@ CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
   KEY `cloud_id_vcard_id` (`cloud_id`,`vcard_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
---
--- Tabellenstruktur für Tabelle `pb_category`
---
-
-CREATE TABLE IF NOT EXISTS `pb_category` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) unsigned NOT NULL,
-  `category` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
-  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uid_catid` (`user_id`,`category`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
 --
 -- Table structure for table `pb_prv`
 --
@@ -6743,7 +6730,6 @@ CREATE TABLE IF NOT EXISTS `pb_category` (
 DROP TABLE IF EXISTS `pb_prv`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-DROP TABLE IF EXISTS `pb_prv`;
 CREATE TABLE IF NOT EXISTS `pb_prv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -6751,14 +6737,15 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   `lastname` varchar(40) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `number` varchar(25) CHARACTER SET ascii NOT NULL DEFAULT '',
   `ptype` varchar(16) COLLATE utf8_unicode_ci NOT NULL COMMENT 'cell,work,home',
+  `pref` int(2) unsigned NOT NULL DEFAULT '9',
   `card_id` int(10) unsigned NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  KEY `uid_lastname_firstname` (`user_id`,`lastname`(15),`firstname`(10)),
-  KEY `uid_firstname_lastname` (`user_id`,`firstname`(10),`lastname`(10)),
-  KEY `uid_number` (`user_id`,`number`(10)),
   KEY `uid_vcard` (`user_id`,`card_id`),
-  KEY `cloud_card_id` (`card_id`)
+  KEY `cloud_card_id` (`card_id`),
+  KEY `uid_lastname_firstname_pref` (`user_id`,`lastname`(15),`firstname`(10),`pref`,`ptype`),
+  KEY `uid_number_pref` (`user_id`,`number`(10),`pref`,`ptype`),
+  KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -6771,6 +6758,22 @@ LOCK TABLES `pb_prv` WRITE;
 /*!40000 ALTER TABLE `pb_prv` ENABLE KEYS */;
 UNLOCK TABLES;
 
+-- connect a phone book entry to a category
+CREATE TABLE IF NOT EXISTS `pb_prv_category` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `cat_id` int(10) unsigned NOT NULL,
+  `card_id` int(10) unsigned NOT NULL,
+  `prv_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid_catid_cardid` (`user_id`,`cat_id`,`card_id`),
+  KEY `uid_prvid` (`user_id`,`prv_id`),
+  KEY `uid_cardid` (`user_id`,`card_id`),
+  KEY `card_id` (`card_id`),
+  KEY `prv_id` (`prv_id`),
+  KEY `cat_id` (`cat_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
 --
 -- Table structure for table `penalties`
 --

From 5555ad59dce1da9904ba3352b47a20000f9bfa75 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 15:52:34 +0100
Subject: [PATCH 32/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 96 ++++++++++++++-----
 1 file changed, 70 insertions(+), 26 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 4f8b2d72d..49a12fd67 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -44,24 +44,28 @@ require_once( GS_DIR .'lib/carddav/CardDAV.php' );
 require_once( GS_DIR .'lib/XML/xml2array.php' );
 require_once( GS_DIR .'inc/db_connect.php' );
 
+$CLOUD_MSG = '';
 
 // vCard DAV connect
 function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
-  global $CARDDAV_LOG, $FIFO;
+  global $CARDDAV_LOG, $FIFO, $CLOUD_MSG;
 
 	if (! class_exists('carddav_backend')) {
-		gs_log( GS_LOG_FATAL, getmypid() .': This PHP does not support carddav (lib CardDav.php missing)!', $CARDDAV_LOG, $FIFO );
-		exit(1);
+		$CLOUD_MSG = 'This system does not support carddav (lib CardDav.php missing)!';
+		gs_log( GS_LOG_FATAL, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		return false;
 	}
 
 	$carddav_conn = new carddav_backend($url);
 	$carddav_conn->set_auth($login, $pass);
-	
+
 	if ( $carddav_conn->check_connection() ) {
-		gs_log(GS_LOG_DEBUG, getmypid() .': connected to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		$CLOUD_MSG = 'connected CardDAV '. $url .' for user ' . $login;
+		gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return $carddav_conn;
 	} else {
-		gs_log(GS_LOG_FATAL, getmypid() .': Could not connect to CardDAV '. $url .' for user ' . $login, $CARDDAV_LOG, $FIFO );
+		$CLOUD_MSG = 'can not connect to cloud, check url, and login/password.';
+		gs_log(GS_LOG_FATAL, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return false;
 	}
 }
@@ -90,7 +94,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	}
 
 	$tmp_vcard = explode("\n", $vcard);
-	
+
 	$n = array();
 	$acat = array();
 	$aparam = array();
@@ -118,7 +122,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 		elseif ( 'TEL' == $key ) {
 			if ( '+' == substr($elem, 0, 1) ) 
 				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
-				
+
 			$number = preg_replace('/\D/', '', $elem);
 
 			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
@@ -142,13 +146,13 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 
 		elseif ( 'CATEGORIES' == $key ) $acat = explode( ',', $elem );
 	}
-	
+
 	// loop over phone numbers
 	foreach ( $n as $number => $param ) {
 
 		// check_duplicates from within a vcard
 		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
-			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);	
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
 
 		// add a phone record
 		$DB->execute('INSERT INTO `pb_prv` ' .
@@ -180,7 +184,11 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 
 // fetch vcards for a cloud entry
 function gs_vcards_update( $vcr ) {
-  global $CARDDAV_LOG, $FIFO, $DB;
+  global $CARDDAV_LOG, $FIFO, $DB, $CLOUD_MSG;
+	$vc_add = 0;
+	$vc_mod = 0;
+	$vc_del = 0;
+	$vc_seen = 0;
 
 	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
 	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
@@ -191,13 +199,15 @@ function gs_vcards_update( $vcr ) {
 	$vchead = $a->parse($carddav_conn->get(false,true));
 	$vchead = $vchead['d:multistatus']['d:response'];
 	$head   = array_shift ( $vchead );
-	
+	$CLOUD_MSG = '';
+
 	// skip rest if not modified between, depending on header etag or lastmodified
 	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
 		// ref etag: https://tools.ietf.org/html/rfc6352
 		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
 		if ( $last_ctag == $vcr['last_ctag'] ) {
-			gs_log(GS_LOG_DEBUG, getmypid() .': no update, ctag='. $last_ctag, $CARDDAV_LOG, $FIFO );
+			$CLOUD_MSG =  'no update, cloud last ctag: '. $last_ctag;
+			gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 			return true;
 		}
 	} else  $last_ctag = '';
@@ -205,7 +215,8 @@ function gs_vcards_update( $vcr ) {
 	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
 		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
 		if ( $last_modified <= $vcr['last_remote_modified'] ) {
-			gs_log(GS_LOG_DEBUG, getmypid() .': no update, last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+			$CLOUD_MSG = 'no update, cloud last modified: '. $last_modified;
+			gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 			return true;
 		}
 	} else $last_modified = $vcr['modified'];
@@ -213,7 +224,7 @@ function gs_vcards_update( $vcr ) {
 	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
 	// update ctag and last_modified immed
 	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
-	
+
 	// get unseen records
 	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
 	$unseen=array();
@@ -228,14 +239,15 @@ function gs_vcards_update( $vcr ) {
 	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
 
 	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
-	
+
 	// iterate through all of them
 	for ($i = 0; $i < count($vchead); $i++) {
 
 		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
-		
+
 		$vchead[$i]['vcard_id'] =  $vcard_id;
-		
+
+		$vc_seen += 1;
 		// check for existing vcard
 		if ( isset($unseen[$vcard_id]) ) {
 			$lvc = $unseen[$vcard_id];
@@ -247,6 +259,7 @@ function gs_vcards_update( $vcr ) {
 			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
 			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
 
+			$vc_mod += 1;
 			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
 
 			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
@@ -256,22 +269,34 @@ function gs_vcards_update( $vcr ) {
 			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
 
 		} else {
-
-			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
 			// missing local add new vcard
-			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');			
+			$vc_add += 1;
+			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
 			gs_vcard_update( $vcr, $vchead[$i], $vcard );
 		}
 	}
 
 	// delete no more existing recs
 	foreach ($unseen as $vcard_id => $value) {
+		$vc_del += 1;
 		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
 		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
 		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
 		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
 	}
 
+	// clean up categories
+	$rs2 = $DB->execute(  'DELETE c FROM `pb_category` AS c ' . 
+				 ' LEFT JOIN `pb_prv_category` AS p ' .
+					' ON  c.id = p.cat_id ' . 
+				     ' WHERE  c.user_id = ' . $vcr['user_id'] .
+				       ' AND  p.id IS NULL'
+				);
+
+	$CLOUD_MSG = $vc_seen . ' seen, ' . $vc_mod . ' modified, ' . $vc_add . ' added, ' . $vc_del . ' deleted';
+	gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+
 	return true;
 }
 
@@ -280,11 +305,13 @@ $DB = gs_db_master_connect();
 
 // remain in loop, doing a record time by time (avoid race cond in dup exec)
 while ( true ) {
+	$CLOUD_MSG = '';
 	$vcrc = @ $DB->execute(
 		'SELECT
-		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, `last_remote_modified`, `modified`
+		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, 
+		`last_remote_modified`, `modified`, `error_count`
 		FROM `pb_cloud` 
-		WHERE `next_poll` < NOW() ORDER BY `next_poll`
+		WHERE `next_poll` < NOW() AND `active`=1 ORDER BY `next_poll`
 		LIMIT 1'
 		);
 	if ( $vcr = $vcrc->fetchRow() ) {
@@ -292,7 +319,7 @@ while ( true ) {
 	} else {
 		break; //the loop
 	}
-	
+
 	// update next check immediately to avoid concurrent execs in timeout situations
 	$hdm2text = array(
 		'h' => 'hour',
@@ -306,16 +333,33 @@ while ( true ) {
 
 	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
 
-	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\' WHERE `id`=' . $vcr['id']);
+	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\', `message`=\'Update in progress...\' WHERE `id`=' . $vcr['id']);
 
+	$unset_active='';
 	if ( gs_vcards_update( $vcr )  === true ) {
 		// all went ok
 		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal.', $CARDDAV_LOG, $FIFO );
+		$CLOUD_MSG     = 'OK - ' . $CLOUD_MSG;
+		$error_counter = ', `error_count`=0 ';
 
 	} else {
 		// any failure
-		gs_log(GS_LOG_WARNING, getmypid() .': Check vCards failed for '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+		$error_counter=', `error_count`=`error_count`+1 ';
+		$CLOUD_MSG = getmypid() . ': ';
+		if ( $vcr['error_count'] = 4 ) {
+			// deactivate record
+			$unset_active = ', `active`=0 ';
+			$CLOUD_MSG .= 'Set inactive. ';
+		};
+		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'] . ', ' . $CLOUD_MSG;
+		gs_log(GS_LOG_WARNING, $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		// increment error counter
 	}
+	// inform on user display
+	$DB->execute('UPDATE `pb_cloud` SET `message` = CONCAT_WS(\' \', ' .
+				'\'' . $CLOUD_MSG . '\',\', last check: \', `modified` ) ' .
+				$error_counter . $unset_active .
+                     ' WHERE `id` = ' . $vcr['id']);
 }
 
 ?>

From bef04fffb8db8ac993c843d82f17efcdf10e61de Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 15:53:31 +0100
Subject: [PATCH 33/87] Update pb_category.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_category.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
index 703f85f7b..9bd28e9de 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_category.php
@@ -189,7 +189,7 @@ function confirm_delete() {
 <table cellspacing="1" class="phonebook">
 <thead>
 <tr>
-	<th style="width:270px;"<?php if ($category=='') echo ' class="sort-col"'; ?>>
+	<th style="width:350px;"<?php if ($category=='') echo ' class="sort-col"'; ?>>
 		<?php echo __('Kategorie'); ?>
 	</th>
 </tr>
@@ -206,7 +206,7 @@ function confirm_delete() {
 		if ($r['id']==$edit_entry) {
  			
 			echo '<td>';
-			echo '<input type="text" name="scategory" value="', htmlEnt($r['category']), '" size="15" maxlength="256" style="width:250px;" />';
+			echo '<input type="text" name="scategory" value="', htmlEnt($r['category']), '" size="50" maxlength="256" style="width:300px;" />';
 			echo '</td>', "\n";
 			
 			echo '<td>';
@@ -249,7 +249,7 @@ function confirm_delete() {
 if ($edit_entry < 1) {
 ?>
 	<td>
-		<input type="category" name="scategory" value="" size="30" maxlength="256" style="width:250px;" />
+		<input type="category" name="scategory" value="" size="50" maxlength="256" style="width:300px;" />
 	</td>
 	<td>
 		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
@@ -266,3 +266,5 @@ function confirm_delete() {
 </table>
 
 </form>
+<p class="text">Hint: Categories are coming from the cloud and<br>
+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; must be changed within the cloud to really become active here.</p>

From 0e347e04bcb1e36e55fc610e7976a26b725f84a1 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 15:54:10 +0100
Subject: [PATCH 34/87] Update home_home.php

---
 opt/gemeinschaft/htdocs/gui/mod/home_home.php | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/home_home.php b/opt/gemeinschaft/htdocs/gui/mod/home_home.php
index db74df080..75e0088f5 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/home_home.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/home_home.php
@@ -9,6 +9,8 @@
 * Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
 * Philipp Kempgen <philipp.kempgen@amooma.de>
 * Peter Kozak <peter.kozak@amooma.de>
+* STD Markus Neubauer <markus.neubauer@email-online.org> 
+*  - added view for cloud books
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -297,6 +299,7 @@
 			
 			?>
 		</div>
+
 	</div>
 	
 	<div class="fl" style="width:49%; min-width:20em; max-width:30em; margin:1px;">
@@ -317,6 +320,59 @@
 			</button>
 			</form>
 		</div>
+	</div>
+</div>
+
+<div class="ie_clearing"></div>
+
+<div class="fl" style="clear:right; width:99%; margin:0.2em 0;">
+
+	<div class="fl" style="width:49%; min-width:20em; max-width:35em; margin:1px;">
+
+	<?php
+                $rs = $DB->execute(
+'SELECT `url`, `login`, `message`, `active`, `error_count` 
+FROM
+        `pb_cloud`
+WHERE
+        `user_id`='. (int)@$_SESSION['sudo_user']['info']['id'] . ' 
+ORDER BY `active`, `error_count` DESC
+LIMIT 5'
+                );
+	?>
+	
+	        <div class="th" style="padding:0.35em 0.5em; margin-bottom:2px;">
+                        <img alt=" " src="<?php echo GS_URL_PATH, 'crystal-svg/16/act/contents.png'; ?>" />&nbsp;
+                        <a href="<?php echo gs_url('pb','cloud'); ?>"><?php
+                                echo __('Cloud Telefonb&uuml;cher');
+                        ?></a>
+                </div>
+                <div class="td" style="padding:0.0em;">
+                        <?php
+                        
+                        echo '<table cellspacing="1" style="width:100%;">' ,"\n";
+                        echo '<tbody>' ,"\n";
+                        $i=0;
+                        while ($r = $rs->fetchRow()) {
+                                echo '<tr class="', ($i%2?'even':'odd') ,'">' ,"\n";
+                                echo '<td style="width:30%;">', htmlEnt($r['url']) ,', Status: ';
+                                echo htmlEnt($r['message']) ,'</td>' ,"\n";
+                                echo '</tr>' ,"\n";
+                                ++$i;
+                        }
+                        if ($i===0) {
+                                echo '<tr>' ,"\n";
+                                echo '<td colspan="2"><i>', __('keine') ,'</i></td>' ,"\n";
+                                echo '</tr>' ,"\n";
+                        }
+                        echo '</tbody>' ,"\n";
+                        echo '</table>' ,"\n";
+                          
+                        ?>
+                </div>	
+	
+	</div>
+	<div class="fl" style="width:49%; min-width:20em; max-width:30em; margin:1px;">
 
 		<div class="th" style="padding:0.35em 0.5em; margin-bottom:2px;">
 			<img alt=" " src="<?php echo GS_URL_PATH, 'crystal-svg/16/app/display.png'; ?>" />&nbsp;

From 8f955fc7affff0438cb2449fd8c83008465b0dd4 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 15:54:47 +0100
Subject: [PATCH 35/87] Update pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 98 +++++++++++++++-----
 1 file changed, 74 insertions(+), 24 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index 3a399bf5b..ee5df8e1a 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -67,10 +67,38 @@ function confirm_delete() {
 	# delete entry
 	
 	$rs = $DB->execute(
-'DELETE FROM `pb_cloud`
-WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
+'DELETE FROM `pb_cloud` ' .
+     ' WHERE `id`='. $delete_entry .
+       ' AND `user_id`='. $user_id
 	);
-	
+	$rs2 = $DB->execute(
+'DELETE FROM `pb_cloud_card` ' .
+     ' WHERE `cloud_id`='. $delete_entry
+	);
+	$rs2 = $DB->execute(
+'DELETE p FROM `pb_prv` AS p ' . 
+   ' LEFT JOIN `pb_cloud_card` AS c ' .
+          ' ON  c.id = p.card_id ' . 
+       ' WHERE  p.user_id = ' . $user_id .
+         ' AND  p.card_id != 0 ' . 
+         ' AND  c.id IS NULL'
+	);
+	$rs2 = $DB->execute(
+'DELETE p FROM `pb_prv_category` AS p ' . 
+   ' LEFT JOIN `pb_cloud_card` AS c ' . 
+          ' ON  c.id = p.card_id' .
+       ' WHERE  p.user_id = ' . $user_id .
+         ' AND  p.card_id != 0 ' . 
+         ' AND  c.id IS NULL'
+	);
+	$rs2 = $DB->execute(
+'DELETE c FROM `pb_category` AS c ' . 
+	' LEFT JOIN `pb_prv_category` AS p ' .
+          ' ON  c.id = p.cat_id ' . 
+       ' WHERE  c.user_id = ' . $user_id .
+         ' AND  p.id IS NULL'
+	);
+
 }
 
 if ($save_url != '' && $save_login != '' && $save_pass != '') {
@@ -89,17 +117,21 @@ function confirm_delete() {
 	}
 	
 	if ($save_entry < 1) {
-		
+
 		$rs = $DB->execute(
-'INSERT INTO `pb_cloud` (`id`, `user_id`, `url`, `login`, `pass`, `frequency`, `next_poll`) VALUES
-(NULL, '. $user_id .', \''. $DB->escape($save_url) .'\', \''. $DB->escape($save_login) .'\', des_encrypt(\''. $save_pass .'\',\'' . $save_login. '\'), \''. $DB->escape($save_frequency) .'\', NOW())'
+'INSERT INTO `pb_cloud` ' . 
+          ' (`id`, `user_id`, `url`, `login`, `pass`, `frequency`, `next_poll`, `message`) ' .
+    ' VALUES' .
+        '(NULL, '. $user_id .', \''. $DB->escape($save_url) .'\', \''. $DB->escape($save_login) .'\', des_encrypt(\''. $save_pass .'\',\'' . $save_login. '\'), \''. $DB->escape($save_frequency) .'\', NOW(), \'Scheduled\')'
 		);
 		
 	} else {
 		
 		$rs = $DB->execute(
-'UPDATE `pb_cloud` SET `url`=\''. $DB->escape($save_url) .'\', `login`=\''. $DB->escape($save_login) .'\', `pass`=des_encrypt(\''. $save_pass .'\',\'' . $save_login .'\'), `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW() 
- WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
+'UPDATE `pb_cloud` ' .
+  ' SET `url`=\''. $DB->escape($save_url) .'\', `login`=\''. $DB->escape($save_login) .'\', `pass`=des_encrypt(\''. $save_pass .'\',\'' . $save_login .'\'), ' .
+       ' `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW(), message=\'Scheduled\', last_remote_modified=\'2000-01-01 00:00:00\', active=1 ' .
+' WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
 		
 	}
@@ -127,7 +159,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency` '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message` '.
 		'FROM '.
 			'`pb_cloud` '.
 		'WHERE '.
@@ -154,7 +186,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency` '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message` '.
 		'FROM '.
 			'`pb_cloud` '.
 		'WHERE '.
@@ -259,13 +291,13 @@ function confirm_delete() {
 		<?php echo __('vCard URL'); ?> <sup>[1]</sup>
 	</th>
 	<th style="width:200px;"<?php if ($login!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Login'); ?>
+		<?php echo __('Login ID'); ?>
 	</th>
-	<th style="width:200px;">
-		<?php echo __('Password'); ?>
+	<th style="width:150px;">
+		<?php echo __('Passwort'); ?>
 	</th>
 	<th style="width:50px;">
-		<?php echo __('Schedule'); ?><sup>[2]</sup>
+		<?php echo __('Zeitplan'); ?><sup>[2]</sup>
 	</th>
 	<th style="width:100px;">&nbsp;</th>
 </tr>
@@ -294,7 +326,7 @@ function confirm_delete() {
 			echo '</td>', "\n";
 			
 			echo '<td>';
-			echo '<input type="text" name="sfrequency" value="', htmlEnt($r['frequency']), '" size="3" maxlength="3" style="width:150px;" />';
+			echo '<input type="text" name="sfrequency" value="', htmlEnt($r['frequency']), '" size="3" maxlength="3" style="width:50px;" />';
 			echo '</td>', "\n";
 			
 			echo '<td>';
@@ -328,6 +360,17 @@ function confirm_delete() {
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;login='. rawUrlEncode($login) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
 			echo '</td>';
+			if ( !empty($r['message']) ) {
+			        echo '</tr><tr class="', (($i % 2 == 0) ? 'even':'odd'), '">';
+			        echo '<td colspan=5>';
+			        echo ' &nbsp; &nbsp; &nbsp; ' . __('Status') . ': ';
+			        if ( 'OK' != substr($r['message'], 0, 2) ) {
+			                if   ( 'Scheduled' == $r['message'] ) $bg = '#FFFF00 ';
+			                else $bg = '#FF0000';
+			                echo '<span style="background-color:' . $bg . '">'  . $r['message'] . '</span>';
+			        } else  echo $r['message'];
+ 				echo '</td>';
+			}
 			
 		}
 		
@@ -369,21 +412,28 @@ function confirm_delete() {
 </table>
 
 </form>
-<br>
-<p class="text">Hint: vCards automatically will be fetched on new entry or record changes, besides schedule.</p>
-<p class="text"><sup>[1]</sup> URL: Enter the full vCard URL including scheme from your provider. Naiv examples:</p>
 <div class="text">
+<dl>
+<dt>Hints:</dt>
+<dd>vCards are imported into your private phone book.</dd>
+<dd>Updating vCards is based on changes within the cloud - the cloud always wins.</dd>
+<dd>Matching local entries with an equal vCard entry will be removed to avoid dulicates.</dd>
+<dd>The next update should be done within &#190; hour.</dd>
+<dd>To refresh all vCards of a cloud entry locally, you will need to delete and recreate an entry.</dd>
+</dl>
+<p class="text"><sup>[1]</sup> vCard URL: Any valid URL from your cloud provider, starting with scheme <i>(http/https)://</i>.<br>
+Naiv Examples:
 <dl class="text">
 <dt class="text">ownCloud</dt><dd class="text">https://example.com/remote.php/carddav/addressbooks/{resource|principal|username}/{collection}/</dd>
-<dt class="text">memotoo</dt><dd class="text">https://sync.memotoo.com/cardDAV/</dd>
 <dt class="text">SabreDAV</dt><dd class="text">https://example.com/addressbooks/{resource|principal|username}/{collection}/</dd>
 <dt class="text">radicale</dt><dd class="text">https://example.com/radicale/{resource|principal|username}/{collection}/</dd>
 <dt class="text">SOGo</dt><dd class="text">https://example.com/SOGo/dav/{resource|principal|username}/Contacts/{collection}/</dd>
 <dt class="text">DAViCal</dt><dd class="text">https://example.com/{resource|principal|username}/{collection}/</dd>
-<dt class="text">Apple Addressbook Server</dt><dd class="text">https://example.com/addressbooks/users/{resource|principal|username}/{collection}/</dd>
+<dt class="text">Apple Adrbook Server</dt><dd class="text">https://example.com/addressbooks/users/{resource|principal|username}/{collection}/</dd>
 </dl>
-</div>
-<p class="text"><sup>[2]</sup> Schedule: Defaults to '1d', the first/next update will happen within half an hour.<br>
+</p>
+<p class="text"><sup>[2]</sup> Schedule: Defaults to '1d', also see hints before.<br>
  &nbsp; &nbsp; &nbsp; Where h=hour, d=day, m=month (Max. 2 digits plus 1 char, no blank/minutes allowed).<br>
- &nbsp; &nbsp; &nbsp; Example: <i>12h</i> =~ refresh every 12 hours (~ also during night), starting with now (save time).<br>
- &nbsp; &nbsp; &nbsp; You can <i>trigger</i> a refresh using <i>edit</i> and <i>save</i> with no other changes.<p>
+ &nbsp; &nbsp; &nbsp; Example: <i>12h</i> =~ refresh every 12 hours (~ also during night), starting with the <i>save</i>d time.<br>
+ &nbsp; &nbsp; &nbsp; You can simply <i>trigger</i> a refresh using <i>edit</i> and <i>save</i> with <i>no other changes</i>.<p>
+</div>

From 923515dd50fd02213b29b2de08fa2cbf872fa2cc Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 15:55:26 +0100
Subject: [PATCH 36/87] Update pb_private.php

---
 .../htdocs/gui/mod/pb_private.php             | 127 ++++++++++--------
 1 file changed, 73 insertions(+), 54 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index 1ebf54435..5100b7284 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -57,6 +57,7 @@ function confirm_delete() {
 $name         =      trim(@$_REQUEST['name'   ]);
 $number       =      trim(@$_REQUEST['number' ]);
 $ptype        =      trim(@$_REQUEST['ptype' ]);
+$catid        =      trim(@$_REQUEST['catid' ]);
 $save_lname   =      trim(@$_REQUEST['slname' ]);
 $save_fname   =      trim(@$_REQUEST['sfname' ]);
 $save_number  =      trim(@$_REQUEST['snumber']);
@@ -101,68 +102,72 @@ function confirm_delete() {
 	$save_ptype = '';
 }
 
+if ( empty($catid) && isset($SESSION['catid']) ) $catid=(int)@$SESSION['catid'];
+elseif ( empty($catid) ) $catid=0;
+
+$sel = ( $catid == 0 ) ? ' selected="selected"' : '';
+$ac = array('<option value="0"'.$sel.'>' . __('Alle Kategorien') . '</option>');
+
+$cs = $DB->execute(
+        'SELECT `c`.`id`, `c`.`category` '.
+	'FROM   `pb_category` `c` '.
+        'LEFT JOIN `pb_prv_category` `p` ON `c`.`id` = `p`.`cat_id` ' .
+	'WHERE '.
+	        '`p`.`id` IS NOT NULL AND ' .
+		'`c`.`user_id`='. $DB->escape($user_id).' '.
+        'GROUP BY `c`.`category` '.
+	'ORDER BY `c`.`category`'
+	);
+while ( $r = $cs->fetchRow() ) {
+       	$sel = ($catid == @$r['id']) ? ' selected="selected"' : '';
+        $ac[] = '<option value="' . $r['id'] . '"' . $sel . '>' . $r['category'] . '</option>';
+}
 
-
-
+$query = 'SELECT SQL_CALC_FOUND_ROWS '.
+			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`'.
+		' FROM `pb_prv` `p`';
+$where = ' WHERE `p`.`user_id`='. $user_id;
 
 if ($number != '') {
-	
+
 	# search by number
-	
+	$name = '';
 	$search_url = 'number='. urlEncode($number);
-	
 	$number_sql = str_replace(
 		array( '*', '?' ),
 		array( '%', '_' ),
 		$number
 	) .'%';
-	
-	$rs = $DB->execute(
-		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number` , `ptype`, `card_id` '.
-		'FROM '.
-			'`pb_prv` '.
-		'WHERE '.
-			'`number` LIKE \''. $DB->escape($number_sql) .'\' '.
-			'AND '.
-			'`user_id`='. $user_id .' '.
-		'ORDER BY `lastname`, `firstname`, `pref`, `ptype` '.
-		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
-		);
-	$num_total = @$DB->numFoundRows();
-	$num_pages = ceil($num_total / $per_page);
-	
+        $where .= ' AND `p`.`number` LIKE \''. $DB->escape($number_sql) .'\' ';
+
 } else {
-	
+
 	# search by name
-	
 	$number = '';
 	$search_url = 'name='. urlEncode($name);
-	
 	$name_sql = str_replace(
 		array( '*', '?' ),
 		array( '%', '_' ),
 		$name
 	) .'%';
-	
-	$rs = $DB->execute(
-		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `lastname`, `firstname`, `number`, `ptype`, `card_id` '.
-		'FROM '.
-			'`pb_prv` '.
-		'WHERE '.
-			'( `lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
-			'  `firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) '.
-			'AND '.
-			'`user_id`='. $DB->escape($user_id).' '.
-		'ORDER BY `lastname`, `firstname`, `pref`, `ptype` '.
-		'LIMIT '. ($page*(int)$per_page) .','. (int)$per_page
-		);
-	$num_total = @$DB->numFoundRows();
-	$num_pages = ceil($num_total / $per_page);
-	
+        $where .= ' AND ( `p`.`lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
+                    ' `p`.`firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) ';
 }
 
+if ( $catid != 0 ) {
+        $search_url .= '&amp;catid='. $catid;
+        $query .= ' LEFT JOIN `pb_prv_category` `pc` ON `p`.`id` = `pc`.`prv_id` ';
+        $where .= ' AND `pc`.`cat_id` = ' . $catid;
+}
+$SESSION['catid']=$catid;
+
+$order = ' ORDER BY `p`.`lastname`, `p`.`firstname`, `p`.`pref`, `p`.`ptype` ';
+$limit = ' LIMIT '. ($page*(int)$per_page) .','. (int)$per_page;
+
+$rs = $DB->execute( $query . $where . $order . $limit);
+
+$num_total = @$DB->numFoundRows();
+$num_pages = ceil($num_total / $per_page);
 
 ?>
 
@@ -170,8 +175,9 @@ function confirm_delete() {
 <thead>
 <tr>
 	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
-	<th style="width:200px;"><?php echo __('Nummer suchen'); ?></th>
-	<th style="width:220px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+	<th style="width:170px;"><?php echo __('Nummer suchen'); ?></th>
+	<th style="width:138px;"><?php echo __('Kategorie'); ?> <sup>[1]</sup></th>
+	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
 </tr>
 </thead>
 <tbody>
@@ -195,6 +201,19 @@ function confirm_delete() {
 		</button>
 		</form>
 	</td>
+	<td>
+		<?php
+	        if ( !empty($ac[1]) ) {
+                        echo '<form method="get" action="' . GS_URL_PATH .'">';
+                        echo gs_form_hidden($SECTION, $MODULE);
+        		echo '<select name="catid" onchange="this.form.submit();">';
+                        foreach ($ac as $option) {
+                                echo $option;
+                        }
+        		echo '</select></form>';
+                } else echo '&nbsp;';
+                ?>
+	</td>
 	<td rowspan="2">
 <?php
 
@@ -245,6 +264,7 @@ function confirm_delete() {
 echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
 echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
 echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
+echo '<input type="hidden" name="catid" value="', $catid, '" />', "\n";
 ?>
 
 <table cellspacing="1" class="phonebook">
@@ -253,15 +273,13 @@ function confirm_delete() {
 	<th style="width:270px;"<?php if ($number=='') echo ' class="sort-col"'; ?>>
 		<?php echo __('Nachname') .', '. __('Vorname'); ?>
 	</th>
-	<th style="width:200px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
+	<th style="width:170px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
 		<?php echo __('Nummer'); ?>
 	</th>
-	<th style="width:100px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Location'); ?><sup>[1]</sup>
-	</th>
-	<th style="width:100px;">
-		<?php echo __('call') . '/' . __('edit') . '/' . __('delete')?>
+	<th style="width:130px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Lokation'); ?><sup>[2]</sup>
 	</th>
+	<th style="width:100px;">&nbsp;</th>
 </tr>
 </thead>
 <tbody>
@@ -285,7 +303,7 @@ function confirm_delete() {
 			echo '</td>', "\n";
 			
 			echo '<td>';
-			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:100px;" />';
+			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:130px;" />';
 			echo '</td>', "\n";
 			
 			echo '<td>';
@@ -323,7 +341,7 @@ function confirm_delete() {
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
-			if ( $r['card_id'] ) echo ' <sup>[2]</sup>';
+			if ( $r['card_id'] ) echo ' <sup>[1]</sup>';
 			echo '</td>';
 			
 		}
@@ -346,7 +364,7 @@ function confirm_delete() {
 		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
 	</td>
 	<td>
-		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:100px;" />
+		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:130px;" />
 	</td>
 	<td>
 		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
@@ -364,5 +382,6 @@ function confirm_delete() {
 
 </form>
 <br>
-<p class="text"><sup>[1]</sup> Type of phone number: cell/work/home etc.</p>
-<p class="text"><sup>[2]</sup> You can loose local changes on a refresh, rather modify/delete this entry within your cloud!</p>
+<p class="text"><sup>[1]</sup> is only shown for cloud records. You can loose local changes on a cloud record with a refresh,<br>
+ &nbsp; &nbsp; &nbsp;  rather modify/delete this entry within your cloud!</p>
+<p class="text"><sup>[2]</sup> Type of phone number: cell/work/home etc.</p>

From 864321f2ee95faafe26c63914cc8c0f94dceb718 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 16:06:34 +0100
Subject: [PATCH 37/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 89978e15b..dbc6acf74 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -11,8 +11,8 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `uid_vcard` (`user_id`,`card_id`),
-  KEY `cloud_card_id` (`card_id`),
   KEY `uid_lastname_firstname_pref` (`user_id`,`lastname`(15),`firstname`(10),`pref`,`ptype`),
+  KEY `cloud_card_id` (`card_id`),
   KEY `uid_number_pref` (`user_id`,`number`(10),`pref`,`ptype`),
   KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -23,7 +23,7 @@ ALTER TABLE `pb_prv` ADD `pref` int(2) unsigned NOT NULL DEFAULT '9';
 ALTER TABLE `pb_prv` ADD `vcard_id` int(10) NOT NULL;
 ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
 ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_firstname_lastname_pref` ,
- ADD INDEX `uid_firstname_lastname_pref` ( `user_id` , `firstname` ( 10 ) , `lastname` ( 10 ) , `pref` , `ptype` );
+ ADD INDEX `uid_firstname_lastname_pref` ( `user_id` , `firstname` ( 10 ) , `lastname` ( 15 ) , `pref` , `ptype` );
 ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_lastname_firstname_pref` , 
  ADD INDEX `uid_lastname_firstname_pref` ( `user_id` , `lastname` ( 15 ) , `firstname` ( 10 ) , `pref` , `ptype` );
 ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_number_pref` ,
@@ -44,10 +44,13 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `last_remote_modified` datetime NOT NULL,
   `next_poll` datetime NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `message` tinytext COLLATE utf8_unicode_ci NOT NULL,
+  `error_count` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
   KEY `next_poll` (`next_poll`),
-  KEY `uid_login` (`user_id`,`login`)
+  KEY `uid_login_url` (`user_id`,`login`,`url`(255))
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 // holds the vcards
@@ -85,9 +88,8 @@ CREATE TABLE IF NOT EXISTS `pb_prv_category` (
   KEY `uid_cardid` (`user_id`,`card_id`),
   KEY `card_id` (`card_id`),
   KEY `prv_id` (`prv_id`),
-  KEY `cat_id` (`cat_id`)
+  KEY `catid_uid` (`cat_id`,`user_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 // set new modules active
 INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;
-INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3006) ON DUPLICATE KEY UPDATE `member` = 3006;

From 1d47283d53ad90dae74462718167a51cd26cfc2b Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 16:07:23 +0100
Subject: [PATCH 38/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index dbc6acf74..84f093f7b 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
 
 // alter existing 3.2 private phonebook
 ALTER TABLE `pb_prv` ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
-ALTER TABLE `pb_prv` ADD `pref` int(2) unsigned NOT NULL DEFAULT '9';
+ALTER TABLE `pb_prv` ADD `pref` int(2) unsigned NOT NULL DEFAULT '2';
 ALTER TABLE `pb_prv` ADD `vcard_id` int(10) NOT NULL;
 ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
 ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_firstname_lastname_pref` ,

From 411a347fd1ff5efee7b8172bef936bcd8d75f2b4 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 14 Dec 2015 16:11:13 +0100
Subject: [PATCH 39/87] Update asterisk.sql

---
 usr/share/doc/gemeinschaft/asterisk.sql | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/gemeinschaft/asterisk.sql b/usr/share/doc/gemeinschaft/asterisk.sql
index 4a4b1b56d..20347fcf8 100644
--- a/usr/share/doc/gemeinschaft/asterisk.sql
+++ b/usr/share/doc/gemeinschaft/asterisk.sql
@@ -6677,7 +6677,7 @@ UNLOCK TABLES;
 --
 -- Tabellenstruktur für Tabelle `pb_category`
 --
-
+DROP TABLE IF EXISTS `pb_category`;
 CREATE TABLE IF NOT EXISTS `pb_category` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
@@ -6690,7 +6690,7 @@ CREATE TABLE IF NOT EXISTS `pb_category` (
 --
 -- Tabellenstruktur für Tabelle `pb_cloud`
 --
-
+DROP TABLE IF EXISTS `pb_cloud`;
 CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
@@ -6702,16 +6702,19 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `last_remote_modified` datetime NOT NULL,
   `next_poll` datetime NOT NULL,
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `message` tinytext COLLATE utf8_unicode_ci NOT NULL,
+  `error_count` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
   KEY `next_poll` (`next_poll`),
-  KEY `uid_login` (`user_id`,`login`)
+  KEY `uid_login_url` (`user_id`,`login`,`url`(255))
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
 -- Tabellenstruktur für Tabelle `pb_cloud_card`
 --
-
+DROP TABLE IF EXISTS `pb_cloud_card`;
 CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cloud_id` int(10) unsigned NOT NULL,
@@ -6742,8 +6745,8 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `uid_vcard` (`user_id`,`card_id`),
-  KEY `cloud_card_id` (`card_id`),
   KEY `uid_lastname_firstname_pref` (`user_id`,`lastname`(15),`firstname`(10),`pref`,`ptype`),
+  KEY `cloud_card_id` (`card_id`),
   KEY `uid_number_pref` (`user_id`,`number`(10),`pref`,`ptype`),
   KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

From cf4d98a800df99ee0b8308f4d413bea0e96d26cf Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 10:07:35 +0100
Subject: [PATCH 40/87] Update pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index ee5df8e1a..9e2955c10 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -417,9 +417,9 @@ function confirm_delete() {
 <dt>Hints:</dt>
 <dd>vCards are imported into your private phone book.</dd>
 <dd>Updating vCards is based on changes within the cloud - the cloud always wins.</dd>
-<dd>Matching local entries with an equal vCard entry will be removed to avoid dulicates.</dd>
-<dd>The next update should be done within &#190; hour.</dd>
-<dd>To refresh all vCards of a cloud entry locally, you will need to delete and recreate an entry.</dd>
+<dd>Matching local entries with an equal vCard entry will be removed to avoid duplicates.</dd>
+<dd>An update should occur within &#190; of a hour.</dd>
+<dd>To refresh locally all phone numbers of a cloud entry, you will have to delete and recreate an entry.</dd>
 </dl>
 <p class="text"><sup>[1]</sup> vCard URL: Any valid URL from your cloud provider, starting with scheme <i>(http/https)://</i>.<br>
 Naiv Examples:

From 2dcc3e989ebe7121279dd9a9a8ce83647844e428 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 10:26:43 +0100
Subject: [PATCH 41/87] reimport former data set

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 84f093f7b..2345a2a2e 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,4 +1,6 @@
 // gs 3.3 private phonebook
+RENAME TABLE `pb_prv` TO `pb_prv_previous`;
+
 CREATE TABLE IF NOT EXISTS `pb_prv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -17,20 +19,7 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-// alter existing 3.2 private phonebook
-ALTER TABLE `pb_prv` ADD `ptype` VARCHAR(16) NOT NULL COMMENT 'cell,work,home';
-ALTER TABLE `pb_prv` ADD `pref` int(2) unsigned NOT NULL DEFAULT '2';
-ALTER TABLE `pb_prv` ADD `vcard_id` int(10) NOT NULL;
-ALTER TABLE `pb_prv` ADD `modified` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_firstname_lastname_pref` ,
- ADD INDEX `uid_firstname_lastname_pref` ( `user_id` , `firstname` ( 10 ) , `lastname` ( 15 ) , `pref` , `ptype` );
-ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_lastname_firstname_pref` , 
- ADD INDEX `uid_lastname_firstname_pref` ( `user_id` , `lastname` ( 15 ) , `firstname` ( 10 ) , `pref` , `ptype` );
-ALTER TABLE `asterisk`.`pb_prv` DROP INDEX `uid_number_pref` ,
- ADD INDEX `uid_number_pref` ( `user_id` , `number` ( 10 ) , `pref` , `ptype` );
-ALTER TABLE `pb_prv` ADD INDEX `uid_cardid` (`user_id`,`card_id`);
-ALTER TABLE `pb_prv` ADD INDEX `cloud_card_id` (`card_id`);
-
+INSERT INTO pb_prv (id, user_id, firstname, lastname, number) SELECT id, user_id, firstname, lastname, number FROM `pb_prv_previous`;
 
 // import voip phone book from cloud for preparing the xml to phone functionality
 CREATE TABLE IF NOT EXISTS `pb_cloud` (

From fbe0a73244758ee05bf9f83198ca7d279924f444 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 10:27:08 +0100
Subject: [PATCH 42/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 2345a2a2e..4711f2ea5 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -19,7 +19,8 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-INSERT INTO pb_prv (id, user_id, firstname, lastname, number) SELECT id, user_id, firstname, lastname, number FROM `pb_prv_previous`;
+INSERT INTO pb_prv (id, user_id, firstname, lastname, number) 
+  SELECT id, user_id, firstname, lastname, number FROM `pb_prv_previous`;
 
 // import voip phone book from cloud for preparing the xml to phone functionality
 CREATE TABLE IF NOT EXISTS `pb_cloud` (

From 3c2ee4b62ca00883de55a59f8015a97737db344f Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 10:53:54 +0100
Subject: [PATCH 43/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 4711f2ea5..8f10f01f1 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,4 +1,5 @@
 // gs 3.3 private phonebook
+ALTER TABLE `pb_prv` DROP FOREIGN KEY `pb_prv_ibfk_1` ;
 RENAME TABLE `pb_prv` TO `pb_prv_previous`;
 
 CREATE TABLE IF NOT EXISTS `pb_prv` (
@@ -19,8 +20,11 @@ CREATE TABLE IF NOT EXISTS `pb_prv` (
   KEY `uid_firstname_lastname_pref` (`user_id`,`firstname`(10),`lastname`(10),`pref`,`ptype`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-INSERT INTO pb_prv (id, user_id, firstname, lastname, number) 
-  SELECT id, user_id, firstname, lastname, number FROM `pb_prv_previous`;
+INSERT INTO `pb_prv` (`id`, `user_id`, `firstname`, `lastname`, `number`) 
+  SELECT `id`, `user_id`, `firstname`, `lastname`, `number` FROM `pb_prv_previous`;
+  
+ALTER TABLE `pb_prv` ADD CONSTRAINT `pb_prv_ibfk_1` FOREIGN KEY (`user_id`) 
+  REFERENCES `users` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
 
 // import voip phone book from cloud for preparing the xml to phone functionality
 CREATE TABLE IF NOT EXISTS `pb_cloud` (
@@ -43,6 +47,9 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   KEY `uid_login_url` (`user_id`,`login`,`url`(255))
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_cloud` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
+
 // holds the vcards
 CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -55,6 +62,9 @@ CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
   KEY `cloud_id_vcard_id` (`cloud_id`,`vcard_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_cloud_card` ADD FOREIGN KEY ( `cloud_id` ) 
+  REFERENCES `pb_cloud` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
 // add categories (i.e like family, company etc.)
 CREATE TABLE IF NOT EXISTS `pb_category` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -65,6 +75,9 @@ CREATE TABLE IF NOT EXISTS `pb_category` (
   UNIQUE KEY `uid_catid` (`user_id`,`category`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_category` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
 // connect a phone book entry to a category
 CREATE TABLE IF NOT EXISTS `pb_prv_category` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -81,5 +94,17 @@ CREATE TABLE IF NOT EXISTS `pb_prv_category` (
   KEY `catid_uid` (`cat_id`,`user_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `cat_id` ) 
+  REFERENCES `pb_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `card_id` ) 
+  REFERENCES `pb_cloud_card` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `prv_id` ) 
+  REFERENCES `pb_prv` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+  
 // set new modules active
 INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;

From 0d9a62db4e0d479f438bf0dc4a083fa39986a5b4 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 11:20:55 +0100
Subject: [PATCH 44/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 8f10f01f1..e4a2f08a1 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,4 +1,4 @@
-// gs 3.3 private phonebook
+// gs 3.3 private phonebook modifications
 ALTER TABLE `pb_prv` DROP FOREIGN KEY `pb_prv_ibfk_1` ;
 RENAME TABLE `pb_prv` TO `pb_prv_previous`;
 
@@ -64,6 +64,8 @@ CREATE TABLE IF NOT EXISTS `pb_cloud_card` (
 
 ALTER TABLE `pb_cloud_card` ADD FOREIGN KEY ( `cloud_id` ) 
   REFERENCES `pb_cloud` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv` ADD FOREIGN KEY ( `card_id` ) 
+  REFERENCES `pb_cloud_card` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
 
 // add categories (i.e like family, company etc.)
 CREATE TABLE IF NOT EXISTS `pb_category` (
@@ -96,15 +98,12 @@ CREATE TABLE IF NOT EXISTS `pb_prv_category` (
 
 ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `user_id` ) 
   REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
-
 ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `cat_id` ) 
   REFERENCES `pb_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
-
 ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `card_id` ) 
   REFERENCES `pb_cloud_card` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
-
 ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `prv_id` ) 
   REFERENCES `pb_prv` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
-  
+
 // set new modules active
 INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;

From 4068e41e8373b6ef6f22b2c5e3bd02f77b85ba8c Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 14:47:02 +0100
Subject: [PATCH 45/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index e4a2f08a1..c4f61efb3 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,5 +1,4 @@
 // gs 3.3 private phonebook modifications
-ALTER TABLE `pb_prv` DROP FOREIGN KEY `pb_prv_ibfk_1` ;
 RENAME TABLE `pb_prv` TO `pb_prv_previous`;
 
 CREATE TABLE IF NOT EXISTS `pb_prv` (

From 4ae46fb7f18e36d86e794e9df7fc9f27c0f42872 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 15 Dec 2015 14:53:12 +0100
Subject: [PATCH 46/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index c4f61efb3..f432ed23a 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -1,4 +1,5 @@
 // gs 3.3 private phonebook modifications
+DROP TABLE IF EXISTS `pb_prv_previous`;
 RENAME TABLE `pb_prv` TO `pb_prv_previous`;
 
 CREATE TABLE IF NOT EXISTS `pb_prv` (

From dcc877a832565444dbdb4a39a8f36a76cd999c2b Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 18 Dec 2015 08:42:11 +0100
Subject: [PATCH 47/87] Update original.css

---
 opt/gemeinschaft/htdocs/gui/styles/original.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/styles/original.css b/opt/gemeinschaft/htdocs/gui/styles/original.css
index bfdb92782..01a69f2cc 100644
--- a/opt/gemeinschaft/htdocs/gui/styles/original.css
+++ b/opt/gemeinschaft/htdocs/gui/styles/original.css
@@ -142,9 +142,9 @@ q:after  { content: close-quote; }
 .r {text-align: right;}
 .c {text-align: center;}
 
-.t {text-align: top;}
-.m {text-align: middle;}
-.b {text-align: bottom;}
+.t {vertical-align: top;}
+.m {vertical-align: middle;}
+.b {vertical-align: bottom;}
 
 .m,
 tr.m td,

From a7a4f092396801b1821e4c08efaf436355bd207f Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 18 Dec 2015 13:28:56 +0100
Subject: [PATCH 48/87] Create private-phonebook-xml.inc

---
 .../htdocs/prov/private-phonebook-xml.inc     | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc

diff --git a/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
new file mode 100644
index 000000000..8df33c897
--- /dev/null
+++ b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
@@ -0,0 +1,153 @@
+<?php
+/*******************************************************************\
+*            Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
+* http://www.amooma.de/
+* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
+* Philipp Kempgen <philipp.kempgen@amooma.de>
+* Peter Kozak <peter.kozak@amooma.de>
+* Soeren Sprenger <soeren.sprenger@amooma.de>
+* Markus Neubauer <markus.neubauer@email-online.org> - 2015
+*  - extending db and preparing for vcards
+* you need to alter the db for this version to work:
+* 
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+defined('GS_VALID') or die('No direct access.');
+
+require_once( dirName(__FILE__) .'/../../inc/conf.php' );
+include_once( GS_DIR .'lib/yadb/yadb.php' );
+include_once( GS_DIR .'inc/gs-lib.php' );
+require_once( GS_DIR .'inc/db_connect.php' );
+include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
+require_once( GS_DIR .'inc/db_connect.php' );
+
+header('Content-type: application/xml');
+
+if ( empty($_REQUEST) && !empty($argv) ) parse_str(implode('&', array_slice($argv, 1)), $_REQUEST);
+if ( empty($_REQUEST) && !empty($_GET) ) $_REQUEST = $_GET;
+
+$name         =      trim(@$_REQUEST['name'   ]);
+$number       =      trim(@$_REQUEST['number' ]);
+$catid        =      trim(@$_REQUEST['catid' ]);
+$cat          =      trim(@$_REQUEST['cat' ]);
+
+$user_id = (int)@$_REQUEST['id'];
+$user = @$_REQUEST['user'];
+
+if ( empty($catid) && isset($SESSION['catid']) ) $catid=(int)@$SESSION['catid'];
+elseif ( empty($catid) ) $catid=0;
+
+$query = 'SELECT `id`, `user` FROM `users` WHERE ';
+if ( !empty($user) ) {
+	$query .= '`user`=' . $user;
+}
+elseif ( !empty( $user_id ) ) {
+	$query .= '`id`=' . $user_id;
+}
+elseif ( empty( $user ) && empty( $user_id ) ) die();
+
+$DB = gs_db_master_connect();
+
+$rs = $DB->execute( $query . ' LIMIT 1' );
+if ( $r = $rs->fetchRow() ) {
+	$user = $r['user'];
+	$user_id = $r['id'];
+} else die();
+
+if ( empty($catid) && ! empty($cat) ) {
+	$query = 'SELECT `id` FROM `pb_category` WHERE `category`=\'' . $cat . '\' LIMIT 1';
+	 $catid = (int)$DB->executeGetOne( $query ); 
+}
+
+
+$query = 'SELECT SQL_CALC_FOUND_ROWS '.
+			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`'.
+		' FROM `pb_prv` `p`';
+$where = ' WHERE `p`.`user_id`='. $user_id;
+
+if ($number != '') {
+
+	# search by number
+	$name = '';
+	$search_url = 'number='. urlEncode($number);
+	$number_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$number
+	) .'%';
+        $where .= ' AND `p`.`number` LIKE \''. $DB->escape($number_sql) .'\' ';
+
+} else {
+
+	# search by name
+	$number = '';
+	$search_url = 'name='. urlEncode($name);
+	$name_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$name
+	) .'%';
+        $where .= ' AND ( `p`.`lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
+                    ' `p`.`firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) ';
+}
+
+if ( $catid != 0 ) {
+        $search_url .= '&amp;catid='. $catid;
+        $query .= ' LEFT JOIN `pb_prv_category` `pc` ON `p`.`id` = `pc`.`prv_id` ';
+        $where .= ' AND `pc`.`cat_id` = ' . $catid;
+}
+
+$order = ' ORDER BY `p`.`lastname`, `p`.`firstname`, `p`.`pref`, `p`.`ptype` ';
+
+$rs = $DB->execute( $query . $where . $order);
+
+$cs = $DB->execute(
+        'SELECT `c`.`category` '.
+	'  FROM `pb_category` `c` '.
+	' WHERE `c`.`id` =' . $catid
+	);
+if ( $r = $cs->fetchRow() ) $sel = $r['category'];
+else $sel = __('Alle Kategorien');
+
+?>
+<Title><?php echo $sel ?></Title>
+<Prompt>Prompt</Prompt>
+<?php
+
+if (@$rs) {
+	$i = 0;
+	$last_seen = '';
+	while ($r = $rs->fetchRow()) {
+	        echo '<DirectoryEntry>' . PHP_EOL;
+	        echo '<Name>' . trim( $r['lastname'] . ', ' . $r['firstname'], " ," ) . ' (' . $r['ptype'] . ')</Name>' . PHP_EOL;
+	        echo '<Telephone>' . $r['number'] . '</Telephone>' . PHP_EOL;
+	        echo '</DirectoryEntry>' . PHP_EOL;
+	}
+}
+
+if ( $sel != __('Alle Kategorien') ) {
+        echo '<SoftKeyItem>' . PHP_EOL;
+        echo '<Name>*</Name>' . PHP_EOL;
+        echo '<URL>http://' . $_SERVER['SERVER_NAME'] . '/gemeinschaft/prov/snom/private-phonebook-xml.php?user=' . $user . '</URL>' . PHP_EOL;
+        echo '</SoftKeyItem>' . PHP_EOL;
+}
+?>

From 0ede77e6af4ed16b7ff890598f4776baaef2be37 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 18 Dec 2015 13:29:54 +0100
Subject: [PATCH 49/87] Create private-phonebook-xml.php

---
 .../prov/snom/private-phonebook-xml.php       | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 opt/gemeinschaft/htdocs/prov/snom/private-phonebook-xml.php

diff --git a/opt/gemeinschaft/htdocs/prov/snom/private-phonebook-xml.php b/opt/gemeinschaft/htdocs/prov/snom/private-phonebook-xml.php
new file mode 100644
index 000000000..0d6f2f4a1
--- /dev/null
+++ b/opt/gemeinschaft/htdocs/prov/snom/private-phonebook-xml.php
@@ -0,0 +1,43 @@
+<?php
+/*******************************************************************\
+*            Gemeinschaft - asterisk cluster gemeinschaft
+* 
+* $Revision$
+* 
+* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
+* http://www.amooma.de/
+* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
+* Philipp Kempgen <philipp.kempgen@amooma.de>
+* Peter Kozak <peter.kozak@amooma.de>
+* Soeren Sprenger <soeren.sprenger@amooma.de>
+* Markus Neubauer <markus.neubauer@email-online.org> - 2015
+*  - extending db and preparing for vcards
+* you need to alter the db for this version to work:
+* 
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301, USA.
+\*******************************************************************/
+
+define('GS_VALID', true); // arriving nativ here
+
+header('Content-type: application/xml');
+
+?>
+<SnomIPPhoneDirectory>
+<?php
+include_once( '../private-phonebook-xml.inc' );
+?>
+</SnomIPPhoneDirectory>

From 50db6af316b03b6c434a9bde72b4d9a63378c817 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 18 Dec 2015 14:34:19 +0100
Subject: [PATCH 50/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 49a12fd67..44f9ea1ce 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -52,7 +52,7 @@ function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
 
 	if (! class_exists('carddav_backend')) {
 		$CLOUD_MSG = 'This system does not support carddav (lib CardDav.php missing)!';
-		gs_log( GS_LOG_FATAL, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		gs_log( GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return false;
 	}
 
@@ -61,11 +61,11 @@ function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
 
 	if ( $carddav_conn->check_connection() ) {
 		$CLOUD_MSG = 'connected CardDAV '. $url .' for user ' . $login;
-		gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return $carddav_conn;
 	} else {
 		$CLOUD_MSG = 'can not connect to cloud, check url, and login/password.';
-		gs_log(GS_LOG_FATAL, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		gs_log(GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return false;
 	}
 }
@@ -136,7 +136,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				if ( empty($param) ) continue;
 				$k2 = explode('=', strtoupper( $param ));
 				if ( 'TYPE' == $k2[0] ) {
-					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 0;
+					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
 					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
 				}
 				elseif ( 'PREF' == $key2 ) $n[$number]['pref'] = $value2;
@@ -207,7 +207,7 @@ function gs_vcards_update( $vcr ) {
 		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
 		if ( $last_ctag == $vcr['last_ctag'] ) {
 			$CLOUD_MSG =  'no update, cloud last ctag: '. $last_ctag;
-			gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 			return true;
 		}
 	} else  $last_ctag = '';
@@ -216,7 +216,7 @@ function gs_vcards_update( $vcr ) {
 		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
 		if ( $last_modified <= $vcr['last_remote_modified'] ) {
 			$CLOUD_MSG = 'no update, cloud last modified: '. $last_modified;
-			gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 			return true;
 		}
 	} else $last_modified = $vcr['modified'];
@@ -295,7 +295,7 @@ function gs_vcards_update( $vcr ) {
 				);
 
 	$CLOUD_MSG = $vc_seen . ' seen, ' . $vc_mod . ' modified, ' . $vc_add . ' added, ' . $vc_del . ' deleted';
-	gs_log(GS_LOG_DEBUG, getmypid() . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+	gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 
 	return true;
 }
@@ -315,7 +315,10 @@ while ( true ) {
 		LIMIT 1'
 		);
 	if ( $vcr = $vcrc->fetchRow() ) {
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards: '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+		$usrc = $DB->execute('SELECT `user` FROM `users` WHERE `id`=' . $vcr['user_id'] . ' LIMIT 1');
+		$urc =  $usrc->fetchRow();
+		$sudo_user = $urc['user'];
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
 	} else {
 		break; //the loop
 	}
@@ -338,7 +341,7 @@ while ( true ) {
 	$unset_active='';
 	if ( gs_vcards_update( $vcr )  === true ) {
 		// all went ok
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal.', $CARDDAV_LOG, $FIFO );
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal for ' . $sudo_user . '.', $CARDDAV_LOG, $FIFO );
 		$CLOUD_MSG     = 'OK - ' . $CLOUD_MSG;
 		$error_counter = ', `error_count`=0 ';
 
@@ -352,7 +355,7 @@ while ( true ) {
 			$CLOUD_MSG .= 'Set inactive. ';
 		};
 		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'] . ', ' . $CLOUD_MSG;
-		gs_log(GS_LOG_WARNING, $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		gs_log(GS_LOG_WARNING, $sudo_user . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		// increment error counter
 	}
 	// inform on user display

From 255ed74cbdea9be623ee43e061ba712eb8b854bf Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 18 Dec 2015 14:41:36 +0100
Subject: [PATCH 51/87] added phone type

---
 .../dialplan-scripts/in-get-callername.agi      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi b/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
index 07b2a685a..d9b053615 100755
--- a/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
+++ b/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
@@ -37,7 +37,7 @@ ob_implicit_flush(1);
 
 function search_number ( $user_id, $source, $cid , $db ) {
 	if ($source == 'private')
-		$query = 'SELECT `firstname`, `lastname`, `number` FROM `pb_prv` WHERE `user_id`=' . $user_id . ' AND `number`= \'' . $db->escape($cid) . '\'';
+		$query = 'SELECT `firstname`, `lastname`, `number`, `ptype` FROM `pb_prv` WHERE `user_id`=' . $user_id . ' AND `number`= \'' . $db->escape($cid) . '\'';
 	else if ($source == 'public')
 		$query = 'SELECT `firstname`, `lastname`, `number` FROM `pb_ldap` WHERE `number`=\''. $db->escape($cid) . '\'';
 
@@ -49,7 +49,9 @@ function search_number ( $user_id, $source, $cid , $db ) {
 			$firstname	= $caller['firstname'];
 			$lastname	= $caller['lastname'];
 			$number		= $caller['number'];
-			$set = array( 'firstname' => $caller['firstname'], 'lastname' => $caller['lastname'], 'number' => $caller['number']);
+			if (isset($caller['ptype']) && !empty($caller['ptype']) ) $ptype = $caller['ptype'];
+			else $ptype = '';
+			$set = array( 'firstname' => $caller['firstname'], 'lastname' => $caller['lastname'], 'number' => $caller['number'], 'ptype' => $ptype);
 			$result[$number] = $set;
 		}
 	}
@@ -57,14 +59,17 @@ function search_number ( $user_id, $source, $cid , $db ) {
 	//direct match
 	if ( isset($result[$cid]) ) {
 		$hit = $result[$cid];
-		print_name($hit['firstname'], $hit['lastname']);
+		print_name($hit['firstname'], $hit['lastname'], $hit['ptype']);
 	}
 }
 
-function print_name ( $firstname, $lastname ) {
+function print_name ( $firstname, $lastname, $ptype='' ) {
 	$fullname = '';
-	if(strlen($firstname) > 0)
-		$fullname = strtoupper( substr($firstname, 0, 1) ) . '. ' . $lastname;
+	if(strlen($ptype) > 0)
+		$fullname = strtoupper( substr($firstname, 0, 1) ) . '. ' . $lastname . ' (' . $ptype .')';
+//	else
+//	if(strlen($firstname) > 0)
+//		$fullname = strtoupper( substr($firstname, 0, 1) ) . '. ' . $lastname;
 	else
 		$fullname = $lastname;
 	gs_agi_set_variable('CALLERID(name)' , $fullname);

From 3678e4c8e35f14acf3b49506563275fa5c66199a Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 10:55:15 +0100
Subject: [PATCH 52/87] remain within category on href actions

---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index 5100b7284..a1028633e 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -156,9 +156,10 @@ function confirm_delete() {
 
 if ( $catid != 0 ) {
         $search_url .= '&amp;catid='. $catid;
+        $search_cat = '&amp;catid='. $catid;
         $query .= ' LEFT JOIN `pb_prv_category` `pc` ON `p`.`id` = `pc`.`prv_id` ';
         $where .= ' AND `pc`.`cat_id` = ' . $catid;
-}
+} else $search_cat = '';
 $SESSION['catid']=$catid;
 
 $order = ' ORDER BY `p`.`lastname`, `p`.`firstname`, `p`.`pref`, `p`.`ptype` ';
@@ -185,6 +186,7 @@ function confirm_delete() {
 	<td>
 		<form method="get" action="<?php echo GS_URL_PATH; ?>">
 		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
 		<input type="text" name="name" id="ipt-name" value="<?php echo htmlEnt($name); ?>" size="25" style="width:200px;" />
 		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-name').focus(); }catch(e){} /*]]>*/</script>
 		<button type="submit" title="<?php echo __('Name suchen'); ?>" class="plain">
@@ -195,6 +197,7 @@ function confirm_delete() {
 	<td>
 		<form method="get" action="<?php echo GS_URL_PATH; ?>">
 		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
 		<input type="text" name="number" value="<?php echo htmlEnt($number); ?>" size="15" style="width:130px;" />
 		<button type="submit" title="<?php echo __('Nummer suchen'); ?>" class="plain">
 			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
@@ -247,7 +250,7 @@ function confirm_delete() {
 $chars['#'] = '';
 for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
 foreach ($chars as $cd => $cs) {
-	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)), '">', htmlEnt($cd), '</a>', "\n";
+	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)) . $search_cat, '">', htmlEnt($cd), '</a>', "\n";
 }
 
 ?>
@@ -315,7 +318,7 @@ function confirm_delete() {
 			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
 			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
 			echo '</button>';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page), '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page) . $search_cat, '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
 	
 			echo '</td>';
 			
@@ -339,8 +342,8 @@ function confirm_delete() {
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page), '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page), '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
 			if ( $r['card_id'] ) echo ' <sup>[1]</sup>';
 			echo '</td>';
 			

From 9aab0e4d38f79270203c5972e9e3d96c5db23288 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 12:52:01 +0100
Subject: [PATCH 53/87] enable sip numbers

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 44f9ea1ce..2103fd7c7 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -120,13 +120,19 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 		if ( empty( $ln) ) { $ln = $fn; $fn=''; }
 
 		elseif ( 'TEL' == $key ) {
-			if ( '+' == substr($elem, 0, 1) ) 
-				$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
 
-			$number = preg_replace('/\D/', '', $elem);
+			// do not canonize on sip strings
+			if ( strpos($elem, '@') === false ) {
 
-			if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
-				$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
+				if ( '+' == substr($elem, 0, 1) ) 
+					$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
+
+				$number = preg_replace('/\D/', '', $elem);
+
+				if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
+					$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
+			}
+			else $number = $elem;
 
 			// add number to array, making it singular
 			$n[$number] = array( 'type' => '', 'pref' => 99 );
@@ -136,6 +142,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				if ( empty($param) ) continue;
 				$k2 = explode('=', strtoupper( $param ));
 				if ( 'TYPE' == $k2[0] ) {
+					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
 					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
 					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
 				}

From 5aa5b953d004c7fda82ac3b95ba47025699a333c Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 14:30:04 +0100
Subject: [PATCH 54/87] clean up code

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 2103fd7c7..96defe999 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -89,7 +89,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
 				' FROM `pb_cloud_card` ' .
 				' WHERE `cloud_id`=' . $vcr['id'] . 
-					' and `vcard_id`=\'' . $head['vcard_id'] . '\''
+					' and `vcard_id`=\'' . $head['vcard_id'] . '\' LIMIT 1'
 				)->fetchRow();
 	}
 
@@ -103,12 +103,16 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	foreach ( $tmp_vcard as $value ) {
 		if ( empty( $value ) ) continue;
 
+		// we need only name, category and tel type records for the phone book
+		if ( 'N' != $key && 'TEL' != $key && 'CATEGORIES' != $key ) continue;
+
 		$pos = strpos($value, ':');
 		$elem = trim(substr($value, $pos + 1 ));
 		$aparam = explode(';', substr($value, 0, $pos));
 		$key  = strtoupper( array_shift( $aparam ) );
 
 		if     ( 'N' == $key ) {
+			// reverse the array N for the phones display
 			$aname = explode(';', $elem);
 			$ln = array_shift( $aname );
 			for ($i = count($aname); $i >= 0; $i--) {
@@ -116,8 +120,8 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				$fn .= ' ' . $aname[$i];
 			}
 			$fn = ltrim( $fn );
+			if ( empty( $ln) ) { $ln = $fn; $fn=''; }
 		}
-		if ( empty( $ln) ) { $ln = $fn; $fn=''; }
 
 		elseif ( 'TEL' == $key ) {
 
@@ -135,7 +139,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 			else $number = $elem;
 
 			// add number to array, making it singular
-			$n[$number] = array( 'type' => '', 'pref' => 99 );
+			if ( ! isset($n[$number]) ) $n[$number] = array( 'type' => '', 'pref' => 99 );
 
 			// add attributes to the number
 			foreach ( $aparam as $param ) {
@@ -150,7 +154,6 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 			}
 			$n[$number]['type'] = rtrim($n[$number]['type'], ',');
 		}
-
 		elseif ( 'CATEGORIES' == $key ) $acat = explode( ',', $elem );
 	}
 
@@ -158,7 +161,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	foreach ( $n as $number => $param ) {
 
 		// check_duplicates from within a vcard
-		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0')->fetchRow() )
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0 LIMIT 1')->fetchRow() )
 			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
 
 		// add a phone record
@@ -168,7 +171,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 
 		// loop over categories
 		if ( ! empty( $acat) ) {
-			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'])->fetchRow();
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'] . ' LIMIT 1')->fetchRow();
 			foreach ( $acat as $cat ) {
 				if ( empty($cat) ) continue;
 				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
@@ -176,13 +179,13 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 					$DB->execute('INSERT INTO `pb_category` ' .
 						' (`user_id`,`category`) ' .
 						' VALUES(' . $vcr['user_id'] .',\'' . $cat .'\')');
-					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow();
+					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\' LIMIT 1')->fetchRow();
 				}
 				// correct xref
 				$DB->execute('INSERT INTO `pb_prv_category` ' .
 					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
 					' VALUES(' . $vcr['user_id'] .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
-				}
+			}
 		}
 	}
 
@@ -326,9 +329,8 @@ while ( true ) {
 		$urc =  $usrc->fetchRow();
 		$sudo_user = $urc['user'];
 		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
-	} else {
-		break; //the loop
-	}
+
+	} else break; //the loop
 
 	// update next check immediately to avoid concurrent execs in timeout situations
 	$hdm2text = array(

From 17fb1eaa4571cca00d1b9f4047cdb84428d41b81 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 19:02:23 +0100
Subject: [PATCH 55/87] add public cloud book functionality

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index f432ed23a..25c2d300c 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -41,6 +41,7 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `message` tinytext COLLATE utf8_unicode_ci NOT NULL,
   `error_count` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `public` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
   KEY `next_poll` (`next_poll`),
@@ -107,3 +108,5 @@ ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `prv_id` )
 
 // set new modules active
 INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;
+// needed dependency for public cloud entries
+INSERT OR REPLACE INTO `users` VALUES ('1', 'public-abook', '', '', '', '', '', '1', '1', NULL, '', NULL, NULL, NULL, '0');

From df60c5c828d1a41d99ef66bc03406617a1dc0406 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 19:16:20 +0100
Subject: [PATCH 56/87] Update upgrade-pb-3.2-3.3.sql

---
 misc/scripts/upgrade-pb-3.2-3.3.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/scripts/upgrade-pb-3.2-3.3.sql b/misc/scripts/upgrade-pb-3.2-3.3.sql
index 25c2d300c..2a0fe8cf8 100644
--- a/misc/scripts/upgrade-pb-3.2-3.3.sql
+++ b/misc/scripts/upgrade-pb-3.2-3.3.sql
@@ -107,6 +107,6 @@ ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `prv_id` )
   REFERENCES `pb_prv` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
 
 // set new modules active
-INSERT INTO `group_members` (`group`, `member`) VALUES (6, 3005) ON DUPLICATE KEY UPDATE `member` = 3005;
+INSERT INTO `group_members` VALUES (6, 3005);
 // needed dependency for public cloud entries
-INSERT OR REPLACE INTO `users` VALUES ('1', 'public-abook', '', '', '', '', '', '1', '1', NULL, '', NULL, NULL, NULL, '0');
+INSERT INTO `users` VALUES ('1', 'public-abook', '', '', '', '', '', '1', '1', NULL, '', NULL, NULL, NULL, '');

From 01b02a72fb04c18b4305fba9a3abea8cb54152f8 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 19:16:29 +0100
Subject: [PATCH 57/87] Update asterisk.sql

---
 usr/share/doc/gemeinschaft/asterisk.sql | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/gemeinschaft/asterisk.sql b/usr/share/doc/gemeinschaft/asterisk.sql
index 20347fcf8..beb337b92 100644
--- a/usr/share/doc/gemeinschaft/asterisk.sql
+++ b/usr/share/doc/gemeinschaft/asterisk.sql
@@ -6181,7 +6181,6 @@ INSERT INTO `group_members` VALUES (6,3002);
 INSERT INTO `group_members` VALUES (6,3003);
 INSERT INTO `group_members` VALUES (6,3004);
 INSERT INTO `group_members` VALUES (6,3005);
-INSERT INTO `group_members` VALUES (6,3006);
 INSERT INTO `group_members` VALUES (6,4000);
 INSERT INTO `group_members` VALUES (6,4001);
 INSERT INTO `group_members` VALUES (6,4002);
@@ -6705,12 +6704,16 @@ CREATE TABLE IF NOT EXISTS `pb_cloud` (
   `message` tinytext COLLATE utf8_unicode_ci NOT NULL,
   `error_count` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `public` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uid_url_login` (`user_id`,`url`(255),`login`),
   KEY `next_poll` (`next_poll`),
   KEY `uid_login_url` (`user_id`,`login`,`url`(255))
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_cloud` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
+
 --
 -- Tabellenstruktur für Tabelle `pb_cloud_card`
 --
@@ -6777,6 +6780,21 @@ CREATE TABLE IF NOT EXISTS `pb_prv_category` (
   KEY `cat_id` (`cat_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+ALTER TABLE `pb_cloud_card` ADD FOREIGN KEY ( `cloud_id` ) 
+  REFERENCES `pb_cloud` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv` ADD FOREIGN KEY ( `card_id` ) 
+  REFERENCES `pb_cloud_card` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_category` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `user_id` ) 
+  REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `cat_id` ) 
+  REFERENCES `pb_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `card_id` ) 
+  REFERENCES `pb_cloud_card` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+ALTER TABLE `pb_prv_category` ADD FOREIGN KEY ( `prv_id` ) 
+  REFERENCES `pb_prv` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ;
+
 --
 -- Table structure for table `penalties`
 --
@@ -7526,6 +7544,7 @@ CREATE TABLE `users` (
 
 LOCK TABLES `users` WRITE;
 /*!40000 ALTER TABLE `users` DISABLE KEYS */;
+INSERT INTO `users` VALUES ('1', 'public-abook', '', '', '', '', '', '1', '1', NULL, '', NULL, NULL, NULL, '')
 INSERT INTO `users` VALUES (5,'nobody-00001','','','','','',1,1,NULL,'',NULL,NULL,NULL,'');
 INSERT INTO `users` VALUES (6,'nobody-00002','','','','','',2,1,NULL,'',NULL,NULL,NULL,'');
 INSERT INTO `users` VALUES (7,'nobody-00003','','','','','',3,1,NULL,'',NULL,NULL,NULL,'');

From ca678e27984960523d5801aed4599fc42b9d7507 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:02:47 +0100
Subject: [PATCH 58/87] Update in-get-callername.agi

---
 opt/gemeinschaft/dialplan-scripts/in-get-callername.agi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi b/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
index d9b053615..2d9c272a8 100755
--- a/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
+++ b/opt/gemeinschaft/dialplan-scripts/in-get-callername.agi
@@ -37,7 +37,7 @@ ob_implicit_flush(1);
 
 function search_number ( $user_id, $source, $cid , $db ) {
 	if ($source == 'private')
-		$query = 'SELECT `firstname`, `lastname`, `number`, `ptype` FROM `pb_prv` WHERE `user_id`=' . $user_id . ' AND `number`= \'' . $db->escape($cid) . '\'';
+		$query = 'SELECT `firstname`, `lastname`, `number`, `ptype` FROM `pb_prv` WHERE ( `user_id`=' . $user_id . ' OR `user_id`=1 ) AND `number`= \'' . $db->escape($cid) . '\'';
 	else if ($source == 'public')
 		$query = 'SELECT `firstname`, `lastname`, `number` FROM `pb_ldap` WHERE `number`=\''. $db->escape($cid) . '\'';
 

From 97c414f1862d67fad835195c8ae332bd7b82522d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:03:45 +0100
Subject: [PATCH 59/87] Update datenbank-tabellen.xml

---
 .../doc/de/docbook/datenbank-tabellen.xml     | 304 ++++++++++--------
 1 file changed, 168 insertions(+), 136 deletions(-)

diff --git a/opt/gemeinschaft/doc/de/docbook/datenbank-tabellen.xml b/opt/gemeinschaft/doc/de/docbook/datenbank-tabellen.xml
index ca98ff48c..338baa823 100644
--- a/opt/gemeinschaft/doc/de/docbook/datenbank-tabellen.xml
+++ b/opt/gemeinschaft/doc/de/docbook/datenbank-tabellen.xml
@@ -17,19 +17,19 @@
   Tabellenstruktur eingespielt wird, ist in <xref
   linkend="mysql-replikation" /> beschrieben.</para>
 
-  <para>Die Datei <filename>asterisk.sql</filename> enth�lt hier alle zum
-  Erzeugen der Tabellen n�tigen SQL-Befehle. Einige Eintr�ge (z.B. IP-Adressen
-  etc.) m�ssen noch an die Installation angepa�t werden.</para>
+  <para>Die Datei <filename>asterisk.sql</filename> enthält hier alle zum
+  Erzeugen der Tabellen nötigen SQL-Befehle. Einige Einträge (z.B. IP-Adressen
+  etc.) müssen noch an die Installation angepaßt werden.</para>
 
   <section id="datenbank-infos">
     <title>Datenbank-Struktur</title>
 
     <para>In der Datenbank <literal>asterisk</literal> werden zentral
-    Laufzeitkonfiguration und Logeintr�ge vorgehalten. Auf alle Tabellen, die
+    Laufzeitkonfiguration und Logeinträge vorgehalten. Auf alle Tabellen, die
     mit <literal>ast_</literal> beginnen, wird direkt aus Asterisk
     zugegriffen, wodurch auch die Struktur und Spaltennamen vorgegeben sind.
-    Zus�tzliche Spalten, die f�r Asterisk keine Bedeutung haben, sind in
-    diesen Tabellen mit einem f�hrenden Unterstrich (<literal>_</literal>)
+    Zusätzliche Spalten, die für Asterisk keine Bedeutung haben, sind in
+    diesen Tabellen mit einem führenden Unterstrich (<literal>_</literal>)
     benannt.</para>
   </section>
 
@@ -37,7 +37,7 @@
     <title>Tabellenstruktur der Datenbank <quote>asterisk</quote></title>
 
     <para>Die Tabellen der Datenbank werden hier alphabetisch
-    aufgef�hrt.</para>
+    aufgeführt.</para>
 
     <section>
       <title><literal>ast_cdr</literal></title>
@@ -48,9 +48,9 @@
       Konfigurationen dazu werden auf den Asterisk-Servern in der
       <filename>/opt/gemeinschaft/etc/asterisk/cdr_mysql.conf</filename>
       vorgenommen. Im Gegensatz zur Tabelle <literal>dial_log</literal> wird
-      diese Tabelle zur Auswertung von Gesp�chsdaten verwendet (z.B.
+      diese Tabelle zur Auswertung von Gespächsdaten verwendet (z.B.
       Statistik). Die Tabelle <literal>dial_log</literal> dient hingegen nur
-      der Anzeige f�r den Benutzer und wird von AGI-Skripten erstellt.</para>
+      der Anzeige für den Benutzer und wird von AGI-Skripten erstellt.</para>
 
       <variablelist>
         <varlistentry>
@@ -83,8 +83,8 @@
           <term><literal>dst</literal></term>
 
           <listitem>
-            <para>Zuletzt f�r den Anruf im Dialplan ausgef�hrte
-            Ziel-Extension; Achtung: kann auch <literal>h</literal> (f�r
+            <para>Zuletzt für den Anruf im Dialplan ausgeführte
+            Ziel-Extension; Achtung: kann auch <literal>h</literal> (für
             Hangup-Extension) sein!</para>
           </listitem>
         </varlistentry>
@@ -120,7 +120,7 @@
           <term><literal>lastapp</literal></term>
 
           <listitem>
-            <para>Letzte ausgef�hrte Applikation im Dialplan, z.B.:
+            <para>Letzte ausgeführte Applikation im Dialplan, z.B.:
             <literal>NoOp</literal></para>
           </listitem>
         </varlistentry>
@@ -129,7 +129,7 @@
           <term><literal>lastdata</literal></term>
 
           <listitem>
-            <para>Die dieser Applikation (s.o.) �bergebenen Argumente, z.B.:
+            <para>Die dieser Applikation (s.o.) übergebenen Argumente, z.B.:
             <literal>Finish if-to-internal-users-self-79</literal></para>
           </listitem>
         </varlistentry>
@@ -147,7 +147,7 @@
           <term><literal>billsec</literal></term>
 
           <listitem>
-            <para>Dauer des Gespr�chs in Sekunden, also ohne Klingeln o.�.
+            <para>Dauer des Gesprächs in Sekunden, also ohne Klingeln o.ä.
             (die ggf. in Rechnung zu stellende Zeit), z.B.:
             <literal>29</literal></para>
           </listitem>
@@ -190,7 +190,7 @@
 
                   <listitem>
                     <simpara>Fehlgeschlagen. - Unbekannte Rufnummer, Stau,
-                    o.�.</simpara>
+                    o.ä.</simpara>
                   </listitem>
                 </varlistentry>
 
@@ -198,8 +198,8 @@
                   <term><literal>UNKNOWN</literal></term>
 
                   <listitem>
-                    <simpara>Unbekannt. - Keine Information �ber den Erfolg
-                    verf�gbar.</simpara>
+                    <simpara>Unbekannt. - Keine Information über den Erfolg
+                    verfügbar.</simpara>
                   </listitem>
                 </varlistentry>
               </variablelist></para>
@@ -304,7 +304,7 @@
           <term><literal>penalty</literal></term>
 
           <listitem>
-            <para>Legt die Priorit�t fest, nach der die Mitglieder einer
+            <para>Legt die Priorität fest, nach der die Mitglieder einer
             Warteschlange (Agenten) angerufen werden.</para>
           </listitem>
         </varlistentry>
@@ -346,7 +346,7 @@
           <term><literal>musicclass</literal></term>
 
           <listitem>
-            <para>Die Art der Wartemusik kann hiermit f�r die einzelne
+            <para>Die Art der Wartemusik kann hiermit für die einzelne
             Warteschlange (z.B. nach Musikrichtung) definiert werden.</para>
           </listitem>
         </varlistentry>
@@ -366,7 +366,7 @@
 
           <listitem>
             <para>Legt einen optionalen Kontext fest. Ein Anrufer wird durch
-            Dr�cken einer einzigen Ziffer zu der entsprechenden Extension in
+            Drücken einer einzigen Ziffer zu der entsprechenden Extension in
             diesem Kontext weitergeleitet.</para>
           </listitem>
         </varlistentry>
@@ -385,7 +385,7 @@
 
           <listitem>
             <para>Legt fest, ob ein Agent automatisch auf "Pause" gesetzt
-            wird, wenn er einen Anruf nicht beantwortet. M�gliche Werte:
+            wird, wenn er einen Anruf nicht beantwortet. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -396,7 +396,7 @@
           <listitem>
             <para>Legt fest, ob das Interface des Mitglieds der Warteschlange,
             welches mit dem Anrufer verbunden wird, in der Variable
-            "MEMBERINTERFACE" gespeichert wird. M�gliche Werte:
+            "MEMBERINTERFACE" gespeichert wird. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -405,9 +405,9 @@
           <term><literal>monitor_join</literal></term>
 
           <listitem>
-            <para>Legt fest, ob bei einem Gespr�chsmitschnitt die Audiodateien
+            <para>Legt fest, ob bei einem Gesprächsmitschnitt die Audiodateien
             der eIngehenden und der ausgehenden Richtung zu einer einzigen
-            Datei zusammengemischt werden. M�gliche Werte:
+            Datei zusammengemischt werden. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -416,7 +416,7 @@
           <term><literal>monitor_format</literal></term>
 
           <listitem>
-            <para>Legt fest ob und in welchem Audioformat Gespr�chsmitschnitte
+            <para>Legt fest ob und in welchem Audioformat Gesprächsmitschnitte
             gespeichert werden sollen.</para>
 
             <variablelist>
@@ -424,7 +424,7 @@
                 <term><literal>NULL</literal></term>
 
                 <listitem>
-                  <para>Keine Aufzeichnung der Sprachkan�le wird durchgef�hrt,
+                  <para>Keine Aufzeichnung der Sprachkanäle wird durchgeführt,
                   wenn kein Format definiert wurde.</para>
                 </listitem>
               </varlistentry>
@@ -483,8 +483,8 @@
 
           <listitem>
             <para>Sekunden, auf welche die Ansage der Wartezeit abgerundet
-            oder aufgerundet werden soll, um nicht unn�tige Pr�zision
-            vorzut�uschen. Sinnvolle Werte: <literal>0</literal> (keine Ansage
+            oder aufgerundet werden soll, um nicht unnötige Präzision
+            vorzutäuschen. Sinnvolle Werte: <literal>0</literal> (keine Ansage
             der Sekunden), <literal>1</literal>, <literal>5</literal>,
             <literal>10</literal>, <literal>15</literal>,
             <literal>30</literal>.</para>
@@ -542,7 +542,7 @@
 
           <listitem>
             <para>Zeit in Sekunden, die ein Mitglied der Warteschlange nicht
-            angerufen wird, nachdem er ein vorhergehendes Gespr�ch beendet
+            angerufen wird, nachdem er ein vorhergehendes Gespräch beendet
             hat.</para>
           </listitem>
         </varlistentry>
@@ -552,7 +552,7 @@
 
           <listitem>
             <para>Maximale Anzahl der Anrufer, die in der Warteschlange
-            gehalten werden d�rfen. Der Wert <literal>0</literal> steht f�r
+            gehalten werden dürfen. Der Wert <literal>0</literal> steht für
             eine unbegrenzte Anzahl.</para>
           </listitem>
         </varlistentry>
@@ -600,8 +600,8 @@
 
                 <listitem>
                   <para>Das Mitglied der Warteschlange wird angeklingelt,
-                  dessen letztes Telefonat zeitlich am l�ngsten
-                  zur�ckliegt.</para>
+                  dessen letztes Telefonat zeitlich am längsten
+                  zurückliegt.</para>
                 </listitem>
               </varlistentry>
 
@@ -618,7 +618,7 @@
                 <term><literal>random</literal></term>
 
                 <listitem>
-                  <para>Ein zuf�llig ausgew�hltes Mitglied der Warteschlange
+                  <para>Ein zufällig ausgewähltes Mitglied der Warteschlange
                   wird angeklingelt.</para>
                 </listitem>
               </varlistentry>
@@ -629,7 +629,7 @@
                 <listitem>
                   <para>Alle Mitglieder der Warteschlange werden nacheinander
                   angeklingelt, jedoch wird die Anfangsposition aus einem
-                  vorhergehenden Durchlauf ber�cksichtigt.</para>
+                  vorhergehenden Durchlauf berücksichtigt.</para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -641,14 +641,14 @@
 
           <listitem>
             <para>Legt fest ob Anrufer in eine Warteschlange aufgenommen
-            werden, die keine Mitglieder enth�lt.</para>
+            werden, die keine Mitglieder enthält.</para>
 
             <variablelist>
               <varlistentry>
                 <term><literal>yes</literal></term>
 
                 <listitem>
-                  <para>Anrufer k�nnen in die Warteschlange aufgenommen
+                  <para>Anrufer können in die Warteschlange aufgenommen
                   werden, auch wenn diese keine Mitglieder definiert
                   hat.</para>
                 </listitem>
@@ -658,8 +658,8 @@
                 <term><literal>no</literal></term>
 
                 <listitem>
-                  <para>Anrufer k�nnen nur in die Warteschlange aufgenommen
-                  werden, mindestens ein Mitglied verf�gbar ist.</para>
+                  <para>Anrufer können nur in die Warteschlange aufgenommen
+                  werden, mindestens ein Mitglied verfügbar ist.</para>
                 </listitem>
               </varlistentry>
 
@@ -667,8 +667,8 @@
                 <term><literal>strict</literal></term>
 
                 <listitem>
-                  <para>Anrufer k�nnen nur in die Warteschlange aufgenommen
-                  werden, wenn mindestens ein Mitglied definiert ist, mu� aber
+                  <para>Anrufer können nur in die Warteschlange aufgenommen
+                  werden, wenn mindestens ein Mitglied definiert ist, muß aber
                   zu diesem Zeitpunkt nicht unbedingt eingeloggt sein.</para>
                 </listitem>
               </varlistentry>
@@ -720,7 +720,7 @@
 
           <listitem>
             <para>Legt fest, ob QueueMemberStatus-Events im Manager-Interface
-            erzeugt werden. M�gliche Werte:
+            erzeugt werden. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -729,10 +729,10 @@
           <term><literal>eventwhencalled</literal></term>
 
           <listitem>
-            <para>Legt fest, ob u.a. die folgenden Events f�r das
+            <para>Legt fest, ob u.a. die folgenden Events für das
             Manager-Interface erzeugt werden: <literal>AgentCalled</literal>,
             <literal>AgentDump</literal>, <literal>AgentConnect</literal>,
-            <literal>AgentComplete</literal>. M�gliche Werte:
+            <literal>AgentComplete</literal>. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -742,8 +742,8 @@
 
           <listitem>
             <para>Legt fest ob dem Mitglied der Warteschlange, der das
-            Gespr�ch annimmt, die Wartezeit des Anrufers angesagt werden soll,
-            bevor dieser zu ihm durchgestellt wird. M�gliche Werte:
+            Gespräch annimmt, die Wartezeit des Anrufers angesagt werden soll,
+            bevor dieser zu ihm durchgestellt wird. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -753,8 +753,8 @@
 
           <listitem>
             <para>Legt fest, ob Mitglieder der Warteschlange auch dann
-            angeklingelt werden ,wenn sie sich in einem Gespr�ch befinden.
-            M�gliche Werte:
+            angeklingelt werden ,wenn sie sich in einem Gespräch befinden.
+            Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -774,7 +774,7 @@
           <listitem>
             <para>Die relative Gewichtung der Warteschlangen. Ist ein Benutzer
             Mitglied in mehreren Warteschlangen, kann hiermit die Reihenfolge
-            der Wichtigkeit festgelegt werden. Schlangen mit h�herem Wert
+            der Wichtigkeit festgelegt werden. Schlangen mit höherem Wert
             werden bevorzugt.</para>
           </listitem>
         </varlistentry>
@@ -784,8 +784,8 @@
 
           <listitem>
             <para>Bestimmt, ob der Antwort-Timeout eines Mitglieds der
-            Warteschlange bei einem Besetzt- oder Leitung-�berlastet-Signal
-            zur�ckgesetzt wird.</para>
+            Warteschlange bei einem Besetzt- oder Leitung-überlastet-Signal
+            zurückgesetzt wird.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -794,9 +794,9 @@
     <section>
       <title><literal>ast_sipfriends</literal></title>
 
-      <para>Die SIP Endger�te - Datenbankversion der
-      <filename>sip.conf</filename>. F�r diese Tabelle existiert der View ast_sipfriends_gs,
-      dieser wird von Asterisk ausgewertet, der view beschr�nkt die Tabelle um peers die f�r 
+      <para>Die SIP Endgeräte - Datenbankversion der
+      <filename>sip.conf</filename>. Für diese Tabelle existiert der View ast_sipfriends_gs,
+      dieser wird von Asterisk ausgewertet, der view beschränkt die Tabelle um peers die für 
       Asterisk nicht relevant sind, so zb. User auf externen Hosts (Angenturen)</para>
 
       <variablelist>
@@ -813,7 +813,7 @@
           <term><literal>name</literal></term>
 
           <listitem>
-            <para>Der Name des Endger�tes zur Identifikation z.B. im
+            <para>Der Name des Endgerätes zur Identifikation z.B. im
             Dialplan.</para>
           </listitem>
         </varlistentry>
@@ -822,8 +822,8 @@
           <term><literal>secret</literal></term>
 
           <listitem>
-            <para>Legt das Passwort fest, welches das SIP-Endger�t zur
-            Anmeldung benutzten mu�.</para>
+            <para>Legt das Passwort fest, welches das SIP-Endgerät zur
+            Anmeldung benutzten muß.</para>
           </listitem>
         </varlistentry>
 
@@ -831,7 +831,7 @@
           <term><literal>type</literal></term>
 
           <listitem>
-            <para>Die Art, wie der SIP-Anschluss und damit das SIP-Endger�t
+            <para>Die Art, wie der SIP-Anschluss und damit das SIP-Endgerät
             behandelt werden soll</para>
 
             <variablelist>
@@ -869,7 +869,7 @@
           <term><literal>host</literal></term>
 
           <listitem>
-            <para>Legt fest, ob sich das SIP-Endger�t eine dynamische oder
+            <para>Legt fest, ob sich das SIP-Endgerät eine dynamische oder
             eine statische IP-Adresse verwendet.</para>
 
             <variablelist>
@@ -877,7 +877,7 @@
                 <term><literal>dynamic</literal></term>
 
                 <listitem>
-                  <para>Die IP-Adresse des Endger�tes ist dynamisch, seine IP
+                  <para>Die IP-Adresse des Endgerätes ist dynamisch, seine IP
                   ist dem System nicht bekannt.</para>
                 </listitem>
               </varlistentry>
@@ -886,8 +886,8 @@
                 <term><literal><replaceable>&lt;IP&gt;</replaceable>|<replaceable>&lt;hostname&gt;</replaceable></literal></term>
 
                 <listitem>
-                  <para>Die IP-Adresse oder der Hostname des Endger�tes. Das
-                  System kann hier�ber das Endger�t erreichen, ohne dass sich
+                  <para>Die IP-Adresse oder der Hostname des Endgerätes. Das
+                  System kann hierüber das Endgerät erreichen, ohne dass sich
                   dieses erst registrieren muss.</para>
                 </listitem>
               </varlistentry>
@@ -900,7 +900,7 @@
 
           <listitem>
             <para>Legt die IP-Adresse fest, unter der das System versucht ein
-            Endger�t zu erreichen, wenn es sich noch nicht registriert
+            Endgerät zu erreichen, wenn es sich noch nicht registriert
             hat.</para>
           </listitem>
         </varlistentry>
@@ -909,7 +909,7 @@
           <term><literal>context</literal></term>
 
           <listitem>
-            <para>Der Kontext, zu welchem das SIP-Endger�t geh�ren
+            <para>Der Kontext, zu welchem das SIP-Endgerät gehören
             soll.</para>
           </listitem>
         </varlistentry>
@@ -918,7 +918,7 @@
           <term><literal>callerid</literal></term>
 
           <listitem>
-            <para>Die ID des Anrufers, die an die Gegenstelle �betragen
+            <para>Die ID des Anrufers, die an die Gegenstelle übetragen
             wird.</para>
           </listitem>
         </varlistentry>
@@ -927,7 +927,7 @@
           <term><literal>mailbox</literal></term>
 
           <listitem>
-            <para>Die Nummer der Mailbox, die dem Endger�t zugeordnet
+            <para>Die Nummer der Mailbox, die dem Endgerät zugeordnet
             ist.</para>
           </listitem>
         </varlistentry>
@@ -936,8 +936,8 @@
           <term><literal>callgroup</literal></term>
 
           <listitem>
-            <para>Liste numerischer IDs der Call-Groups, zu denen das Endger�t
-            geh�ren soll.</para>
+            <para>Liste numerischer IDs der Call-Groups, zu denen das Endgerät
+            gehören soll.</para>
           </listitem>
         </varlistentry>
 
@@ -945,8 +945,8 @@
           <term><literal>pickupgroup</literal></term>
 
           <listitem>
-            <para>Liste numerischer IDs der Call-Groups, f�r die das
-            Heranholen von Gespr�chen an dieses Endger�t erlaubt ist.</para>
+            <para>Liste numerischer IDs der Call-Groups, für die das
+            Heranholen von Gesprächen an dieses Endgerät erlaubt ist.</para>
           </listitem>
         </varlistentry>
 
@@ -955,7 +955,7 @@
 
           <listitem>
             <para>Legt fest, ob und welche Channelvariable bei Anrufen von
-            diesem Endger�t gesetzt werden soll.</para>
+            diesem Endgerät gesetzt werden soll.</para>
           </listitem>
         </varlistentry>
 
@@ -963,8 +963,8 @@
           <term><literal>call-limit</literal></term>
 
           <listitem>
-            <para>Legt die Maximale Anzahl von Gespr�chen fest, die �ber
-            dieses Endger�t gef�hrt werden k�nnen.</para>
+            <para>Legt die Maximale Anzahl von Gesprächen fest, die über
+            dieses Endgerät geführt werden können.</para>
           </listitem>
         </varlistentry>
 
@@ -973,8 +973,8 @@
 
           <listitem>
             <para>Legt den Kontext fest, welcher zur Signalisierung z.B. von
-            LEDs an einem SIP-Endger�t verwendet wird. In diesem Kontext
-            befinden sich z.B. die "hint" Eintr�ge im Dialplan.</para>
+            LEDs an einem SIP-Endgerät verwendet wird. In diesem Kontext
+            befinden sich z.B. die "hint" Einträge im Dialplan.</para>
           </listitem>
         </varlistentry>
 
@@ -983,7 +983,7 @@
 
           <listitem>
             <para>Legt fest, welcher Kontest beim ersten Registrieren eines
-            SIP-Endger�tes automatisch aufgerufen wird. Als Extension wird der
+            SIP-Endgerätes automatisch aufgerufen wird. Als Extension wird der
             Inhalt des Feldes <literal>name</literal> verwendet.</para>
           </listitem>
         </varlistentry>
@@ -992,7 +992,7 @@
           <term><literal>ipaddr</literal></term>
 
           <listitem>
-            <para>Die aktuelle IP-Adresse des SIP-Endger�tes wird vom
+            <para>Die aktuelle IP-Adresse des SIP-Endgerätes wird vom
             Asterisk-Server in diesem Feld abgelegt.</para>
           </listitem>
         </varlistentry>
@@ -1001,7 +1001,7 @@
           <term><literal>port</literal></term>
 
           <listitem>
-            <para>Die aktuelle Portnummer des SIP-Endger�tes wird vom
+            <para>Die aktuelle Portnummer des SIP-Endgerätes wird vom
             Asterisk-Server in diesem Feld abgelegt.</para>
           </listitem>
         </varlistentry>
@@ -1010,7 +1010,7 @@
           <term><literal>regseconds</literal></term>
 
           <listitem>
-            <para>Zeitstempel der Registrierung des SIP-Endger�tes wird vom
+            <para>Zeitstempel der Registrierung des SIP-Endgerätes wird vom
             Asterisk-Server in diesem Feld abgelegt.</para>
           </listitem>
         </varlistentry>
@@ -1019,7 +1019,7 @@
           <term><literal>username</literal></term>
 
           <listitem>
-            <para>Benutzername, wie er in der Konfiguration des SIP-Endger�tes
+            <para>Benutzername, wie er in der Konfiguration des SIP-Endgerätes
             festgelegt wurde.</para>
           </listitem>
         </varlistentry>
@@ -1028,7 +1028,7 @@
           <term><literal>regserver</literal></term>
 
           <listitem>
-            <para>Name des Servers, an dem das Endger�t registriert ist, wird
+            <para>Name des Servers, an dem das Endgerät registriert ist, wird
             vom Asterisk-Server in diesem Feld abgelegt.</para>
           </listitem>
         </varlistentry>
@@ -1037,7 +1037,7 @@
           <term><literal>fullcontact</literal></term>
 
           <listitem>
-            <para>Die Kontaktdaten des SIP-Endger�tes werden vom
+            <para>Die Kontaktdaten des SIP-Endgerätes werden vom
             Asterisk-Server in diesem Feld abgelegt.</para>
           </listitem>
         </varlistentry>
@@ -1079,7 +1079,7 @@
           <term><literal>context</literal></term>
 
           <listitem>
-            <para>Legt fest, zu welchem Kontext die Mailbox geh�rt.</para>
+            <para>Legt fest, zu welchem Kontext die Mailbox gehört.</para>
           </listitem>
         </varlistentry>
 
@@ -1104,7 +1104,7 @@
           <term><literal>fullname</literal></term>
 
           <listitem>
-            <para>Vollst�ndiger Name des Benutzers der Mailbox.</para>
+            <para>Vollständiger Name des Benutzers der Mailbox.</para>
           </listitem>
         </varlistentry>
 
@@ -1121,8 +1121,8 @@
           <term><literal>attach</literal></term>
 
           <listitem>
-            <para>Legt fest, ob an die Benachrichtigung �ber eMail, eine
-            Audiodatei mit der Aufnahme angeh�ngt werden soll. M�gliche Werte:
+            <para>Legt fest, ob an die Benachrichtigung über eMail, eine
+            Audiodatei mit der Aufnahme angehängt werden soll. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -1132,7 +1132,7 @@
 
           <listitem>
             <para>Legt fest, ob nach der Benachrichtigung per eMail die
-            Audiodatei gel�scht werden soll.</para>
+            Audiodatei gelöscht werden soll.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -1165,7 +1165,7 @@
           <term><literal>regexp</literal></term>
 
           <listitem>
-            <para>Regul�rer Ausdruck zur Definition der
+            <para>Regulärer Ausdruck zur Definition der
             Rufnummernsperre</para>
           </listitem>
         </varlistentry>
@@ -1199,7 +1199,7 @@
           <term><literal>case</literal></term>
 
           <listitem>
-            <simpara>Legt fest, f�r welchen Fall die Anrufweiterleitung
+            <simpara>Legt fest, für welchen Fall die Anrufweiterleitung
             aktiviert werden soll.</simpara>
 
             <variablelist>
@@ -1231,7 +1231,7 @@
                 <term><literal>offline</literal></term>
 
                 <listitem>
-                  <para>Wenn das Endger�t des Benutzers nicht angemeldet
+                  <para>Wenn das Endgerät des Benutzers nicht angemeldet
                   ist.</para>
                 </listitem>
               </varlistentry>
@@ -1319,8 +1319,8 @@
           <term><literal>active</literal></term>
 
           <listitem>
-            <para>Legt fest, ob das Signal f�r einen weiteren, ankommenden
-            Anruf, w�hrend eines bestehenden Gespr�chs gesendet wird.</para>
+            <para>Legt fest, ob das Signal für einen weiteren, ankommenden
+            Anruf, während eines bestehenden Gesprächs gesendet wird.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -1330,7 +1330,7 @@
       <title><literal>clir</literal></title>
 
       <para>Konfiguration des Dienstmerkmals "CLIR"
-      (Rufnummernunterdr�ckung)</para>
+      (Rufnummernunterdrückung)</para>
 
       <variablelist>
         <varlistentry>
@@ -1346,8 +1346,8 @@
           <term><literal>internal_restrict</literal></term>
 
           <listitem>
-            <para>Legt fest, ob bei ausgehenden, internen Gespr�chen die
-            eigene Rufnummer unterdr�ckt wird. M�gliche Werte:
+            <para>Legt fest, ob bei ausgehenden, internen Gesprächen die
+            eigene Rufnummer unterdrückt wird. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -1356,8 +1356,8 @@
           <term><literal>external_restrict</literal></term>
 
           <listitem>
-            <para>Legt fest, ob bei ausgehenden, externen Gespr�chen die
-            eigene Rufnummer unterdr�ckt wird. M�gliche Werte:
+            <para>Legt fest, ob bei ausgehenden, externen Gesprächen die
+            eigene Rufnummer unterdrückt wird. Mögliche Werte:
             <literal>yes</literal>|<literal>no</literal></para>
           </listitem>
         </varlistentry>
@@ -1367,7 +1367,7 @@
     <section>
       <title><literal>conferences</literal></title>
 
-      <para>Konferenzr�ume</para>
+      <para>Konferenzräume</para>
 
       <variablelist>
         <varlistentry>
@@ -1392,9 +1392,9 @@
     <section>
       <title><literal>dial_log</literal></title>
 
-      <para>Liste get�tigter, erhaltener oder verpasster Anrufe. Diese Tabelle
-      wird durch AGI-Skripte im Dialplan gef�llt, und die einzelnen Eintr�ge
-      k�nnen auch vom Benutzer gel�scht werden.</para>
+      <para>Liste getätigter, erhaltener oder verpasster Anrufe. Diese Tabelle
+      wird durch AGI-Skripte im Dialplan gefüllt, und die einzelnen Einträge
+      können auch vom Benutzer gelöscht werden.</para>
 
       <variablelist>
         <varlistentry>
@@ -1425,7 +1425,7 @@
                 <term><literal>out</literal></term>
 
                 <listitem>
-                  <para>Get�tigter Anruf</para>
+                  <para>Getätigter Anruf</para>
                 </listitem>
               </varlistentry>
 
@@ -1480,7 +1480,7 @@
     <section>
       <title><literal>hosts</literal></title>
 
-      <para>Zum System geh�rende Hosts</para>
+      <para>Zum System gehörende Hosts</para>
 
       <variablelist>
         <varlistentry>
@@ -1597,14 +1597,14 @@
     <section>
       <title><literal>pb_prv</literal></title>
 
-      <para>Die pers�nlichen Telefonb�cher der Benutzer.</para>
+      <para>Die persönlichen Telefonbücher der Benutzer.</para>
 
       <variablelist>
         <varlistentry>
           <term><literal>id</literal></term>
 
           <listitem>
-            <para>Fortlaufende Nummer der Eintr�ge.</para>
+            <para>Fortlaufende Nummer der Einträge.</para>
           </listitem>
         </varlistentry>
 
@@ -1613,7 +1613,7 @@
 
           <listitem>
             <para>ID des Benutzers (aus der Tabelle <literal>users</literal>)
-            dem das Telefonbuch geh�rt.</para>
+            dem das Telefonbuch gehört.</para>
           </listitem>
         </varlistentry>
 
@@ -1638,14 +1638,14 @@
     <section>
       <title><literal>phones</literal></title>
 
-      <para>Die Endger�te.</para>
+      <para>Die Endgeräte.</para>
 
       <variablelist>
         <varlistentry>
           <term><literal>id</literal></term>
 
           <listitem>
-            <para>Eindeutige, numerische ID des Endger�tes.</para>
+            <para>Eindeutige, numerische ID des Endgerätes.</para>
           </listitem>
         </varlistentry>
 
@@ -1653,7 +1653,7 @@
           <term><literal>type</literal></term>
 
           <listitem>
-            <para>Typ des Endger�tes, z.B. <literal>snom360</literal></para>
+            <para>Typ des Endgerätes, z.B. <literal>snom360</literal></para>
           </listitem>
         </varlistentry>
 
@@ -1661,7 +1661,7 @@
           <term><literal>mac_addr</literal></term>
 
           <listitem>
-            <para>Die MAC-Adresse des Endger�tes.</para>
+            <para>Die MAC-Adresse des Endgerätes.</para>
           </listitem>
         </varlistentry>
 
@@ -1680,11 +1680,11 @@
           <listitem>
             <para>Eindeutige, numerische ID eines Pseudo-Benutzers aus dem
             Feld <literal>nobody_index</literal> der Tabelle
-            <literal>users</literal>. Jedem Endger�t wird bei der Installation
+            <literal>users</literal>. Jedem Endgerät wird bei der Installation
             ein solcher Benutzer zugewiesen, um auch dann das Telefon
-            verwenden zu k�nnen, wenn sich noch kein Benutzer an diesem Ger�t
-            angemeldet hat. Dies erm�glicht Notrufe, kostenlose
-            Interngespr�che etc. direkt nach der Installation.</para>
+            verwenden zu können, wenn sich noch kein Benutzer an diesem Gerät
+            angemeldet hat. Dies ermöglicht Notrufe, kostenlose
+            Interngespräche etc. direkt nach der Installation.</para>
           </listitem>
         </varlistentry>
 
@@ -1733,7 +1733,7 @@
 
           <listitem>
             <para>Numerische ID der Pickup-Gruppe, zu welcher der Benutzer
-            geh�rt, aus der Tabelle <literal>pickupgroups</literal>.</para>
+            gehört, aus der Tabelle <literal>pickupgroups</literal>.</para>
           </listitem>
         </varlistentry>
 
@@ -1776,7 +1776,7 @@
           <term><literal>event</literal></term>
 
           <listitem>
-            <para>Ereignis, welches zum Eintrag ins Log gef�hrt hat.</para>
+            <para>Ereignis, welches zum Eintrag ins Log geführt hat.</para>
           </listitem>
         </varlistentry>
 
@@ -1810,8 +1810,8 @@
           <term><literal>caller</literal></term>
 
           <listitem>
-            <para>Die Anrufer-ID, wie sie zum System �bertragen wurde oder
-            NULL, fals keine Rufnummern�bertragung aktiviert war.</para>
+            <para>Die Anrufer-ID, wie sie zum System übertragen wurde oder
+            NULL, fals keine Rufnummernübertragung aktiviert war.</para>
           </listitem>
         </varlistentry>
 
@@ -1861,7 +1861,7 @@
           <term><literal>info</literal></term>
 
           <listitem>
-            <para>Zus�tzliche Informationen (z.B.
+            <para>Zusätzliche Informationen (z.B.
             <literal><replaceable>&lt;extension&gt;</replaceable>@<replaceable>&lt;context&gt;</replaceable></literal>)
             bei einer Weiterleitung.</para>
           </listitem>
@@ -1872,7 +1872,7 @@
     <section>
       <title><literal>ringtones</literal></title>
 
-      <para>Die pro Benutzer eingestellten Klingelt�ne.</para>
+      <para>Die pro Benutzer eingestellten Klingeltöne.</para>
 
       <variablelist>
         <varlistentry>
@@ -1888,7 +1888,7 @@
           <term><literal>src</literal></term>
 
           <listitem>
-            <para>F�r Anrufe von welcher Quelle der Klingelton gelten soll.
+            <para>Für Anrufe von welcher Quelle der Klingelton gelten soll.
             <literal>internal</literal> | <literal>external</literal>.</para>
           </listitem>
         </varlistentry>
@@ -1897,10 +1897,10 @@
           <term><literal>bellcore</literal></term>
 
           <listitem>
-            <para>Die Nummer eines Standard-Klingeltons. �blicherweise
-            <literal>1</literal> - <literal>10</literal> f�r
+            <para>Die Nummer eines Standard-Klingeltons. Üblicherweise
+            <literal>1</literal> - <literal>10</literal> für
             <literal>Bellcore-dr<replaceable>X</replaceable></literal> oder
-            <literal>0</literal> f�r <literal>Silent</literal>
+            <literal>0</literal> für <literal>Silent</literal>
             (lautlos).</para>
           </listitem>
         </varlistentry>
@@ -1942,10 +1942,10 @@
           <term><literal>key</literal></term>
 
           <listitem>
-            <para>Telefon-Typ-spezifisches K�rzel der Taste. Wird aber vom
+            <para>Telefon-Typ-spezifisches Kürzel der Taste. Wird aber vom
             Provisioning-System (z.B.
-            <filename>htdocs/prov/snom/settings.php</filename>) nochmal f�r
-            das Telefon �bersetzt.</para>
+            <filename>htdocs/prov/snom/settings.php</filename>) nochmal für
+            das Telefon übersetzt.</para>
           </listitem>
         </varlistentry>
 
@@ -1956,6 +1956,38 @@
             <para>Eingestellte Rufnummer.</para>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term><literal>ptype</literal></term>
+
+          <listitem>
+            <para>Lokation der Nummer (cell/work/home/fax etc.).</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><literal>pref</literal></term>
+
+          <listitem>
+            <para>Praeferenz der Nummer (1=highest, 99=lowest, default=9).</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><literal>card_id</literal></term>
+
+          <listitem>
+            <para>vCard ID Referenz.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><literal>modified</literal></term>
+
+          <listitem>
+            <para>Zeitstemples letzter Aenderung.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </section>
 
@@ -1979,7 +2011,7 @@
 
           <listitem>
             <para>Eindeutige alphanumerische Bezeichnung des Benutzers, z.B.
-            Personalnummer o.�.</para>
+            Personalnummer o.ä.</para>
           </listitem>
         </varlistentry>
 
@@ -2020,8 +2052,8 @@
 
           <listitem>
             <para>Eindeutige, numerische ID eines Pseudo-Benutzers. Diese
-            speziellen Benutzer werden verwendet, wenn an einem Endger�t noch
-            kein anderer Benutzer angemeldet ist. Dies erm�glicht z.B.
+            speziellen Benutzer werden verwendet, wenn an einem Endgerät noch
+            kein anderer Benutzer angemeldet ist. Dies ermöglicht z.B.
             Notrufe.</para>
           </listitem>
         </varlistentry>
@@ -2030,7 +2062,7 @@
           <term><literal>host_id</literal></term>
 
           <listitem>
-            <para>Numerische ID des Asterisk-Servers, an dem sich das Endger�t
+            <para>Numerische ID des Asterisk-Servers, an dem sich das Endgerät
             des Benutzer anmeldet.</para>
           </listitem>
         </varlistentry>
@@ -2039,7 +2071,7 @@
           <term><literal>current_ip</literal></term>
 
           <listitem>
-            <para>Aktuelle IP des Endger�tes, welches der Benutzer aktuell
+            <para>Aktuelle IP des Endgerätes, welches der Benutzer aktuell
             verwendet.</para>
           </listitem>
         </varlistentry>
@@ -2058,7 +2090,7 @@
     <section>
       <title><literal>users_external_numbers</literal></title>
 
-      <para>M�gliche Ausgangsrufnummern pro Benutzer zur Initiierung von
+      <para>Mögliche Ausgangsrufnummern pro Benutzer zur Initiierung von
       Anrufen.</para>
 
       <variablelist>
@@ -2100,8 +2132,8 @@
           <term><literal>internal_active</literal></term>
 
           <listitem>
-            <para>Legt fest, ob die Anrufbeantworterfunktion f�r interne
-            Gespr�che aktiviert werden soll.</para>
+            <para>Legt fest, ob die Anrufbeantworterfunktion für interne
+            Gespräche aktiviert werden soll.</para>
           </listitem>
         </varlistentry>
 
@@ -2109,8 +2141,8 @@
           <term><literal>external_active</literal></term>
 
           <listitem>
-            <para>Legt fest, ob die Anrufbeantworterfunktion f�r externe
-            Gespr�che aktiviert werden soll.</para>
+            <para>Legt fest, ob die Anrufbeantworterfunktion für externe
+            Gespräche aktiviert werden soll.</para>
           </listitem>
         </varlistentry>
       </variablelist>

From 666543614c19175e0fd61aacd0ffddf3c77da2f8 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:04:23 +0100
Subject: [PATCH 60/87] Update dial-log-store

---
 opt/gemeinschaft/dialplan-scripts/dial-log-store | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/dial-log-store b/opt/gemeinschaft/dialplan-scripts/dial-log-store
index d7a972ad6..25a61f07b 100755
--- a/opt/gemeinschaft/dialplan-scripts/dial-log-store
+++ b/opt/gemeinschaft/dialplan-scripts/dial-log-store
@@ -76,7 +76,7 @@ $remote_user = $rs->fetchRow();
 $is_from_phonebook = false;
 if (! $remote_user) {
 	# if there is nothing in the ast_sipfriends, check the private phonebook
-	$rs = $db->execute('SELECT `firstname`, `lastname` FROM `pb_prv` WHERE `user_id`='.$uid.' AND `number`=\''. $db->escape($number) .'\'');
+	$rs = $db->execute('SELECT `firstname`, `lastname` FROM `pb_prv` WHERE (`user_id`='.$uid.' OR `user_id`=1) AND `number`=\''. $db->escape($number) .'\'');
 	//FIXME - probably doesn't make much sense with uncanonized phone numbers
 	$remote_user = $rs->fetchRow();
 	$is_from_phonebook = true;
@@ -103,4 +103,4 @@ $db->execute( 'INSERT INTO `dial_log` (`user_id`, `type`, `timestamp`, `number`,
 
 
 
-?>
\ No newline at end of file
+?>

From ff29797b5f4eeaaf4077ea88b6f110e30fa95b72 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:05:18 +0100
Subject: [PATCH 61/87] Update pb.php

---
 opt/gemeinschaft/htdocs/prov/snom/pb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/prov/snom/pb.php b/opt/gemeinschaft/htdocs/prov/snom/pb.php
index fc83adb56..958acb4dc 100644
--- a/opt/gemeinschaft/htdocs/prov/snom/pb.php
+++ b/opt/gemeinschaft/htdocs/prov/snom/pb.php
@@ -161,7 +161,7 @@ function getUserID( $ext )
 		switch ($t) {
 		case 'gs'      : $cq .= '`users` WHERE `id` IN ('.implode(',',$group_members).') AND `id`!='.$user_id; break;
 		case 'imported': $cq .= '`pb_ldap`'                           ; break;
-		case 'prv'     : $cq .= '`pb_prv` WHERE `user_id`='. $user_id ; break;
+		case 'prv'     : $cq .= '`pb_prv` WHERE (`user_id`='. $user_id . 'OR `user_id`=1 )' ; break;
 		default        : $cq  = false;
 		}
 		$c = $cq ? (' ('. (int)@$db->executeGetOne( $cq ) .')') : '';

From 7a809af742505686b7c3925b964f2580446fe5a2 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:05:53 +0100
Subject: [PATCH 62/87] Update pb.php

---
 opt/gemeinschaft/htdocs/prov/siemens/pb/pb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/prov/siemens/pb/pb.php b/opt/gemeinschaft/htdocs/prov/siemens/pb/pb.php
index a9ee3a70b..6bd5b7ef0 100644
--- a/opt/gemeinschaft/htdocs/prov/siemens/pb/pb.php
+++ b/opt/gemeinschaft/htdocs/prov/siemens/pb/pb.php
@@ -283,7 +283,7 @@ function write_alert( $message, $alert_type='ERROR' )
 				$image = $img_url.'contents.png';
 				break;
 			case 'prv':
-				$c = (int)$db->executeGetOne( 'SELECT COUNT(*) FROM `pb_prv` WHERE `user_id`='. $user_id );
+				$c = (int)$db->executeGetOne( 'SELECT COUNT(*) FROM `pb_prv` WHERE (`user_id`='. $user_id . 'OR `user_id`=1 )' );
 				$image = $img_url.'yast_sysadmin.png';
 				break;
 			case 'imported':

From 0e71054748beefd69fee2e3042af64107c756a5e Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:06:48 +0100
Subject: [PATCH 63/87] Update pb.php

---
 opt/gemeinschaft/htdocs/prov/aastra/pb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/prov/aastra/pb.php b/opt/gemeinschaft/htdocs/prov/aastra/pb.php
index c543a70cd..dbf7fb009 100644
--- a/opt/gemeinschaft/htdocs/prov/aastra/pb.php
+++ b/opt/gemeinschaft/htdocs/prov/aastra/pb.php
@@ -269,7 +269,7 @@ function _get_userid()
 FROM
 	`pb_prv`
 WHERE
-	`user_id`='. $user_id .' AND (
+	(`user_id`='. $user_id . 'OR `user_id`=1 ) AND (
 	`lastname` LIKE _utf8\''. $db->escape($name_sql) .'\' COLLATE utf8_unicode_ci
 	)
 ORDER BY `lastname`, `firstname`
@@ -446,4 +446,4 @@ function _get_userid()
 
 aastra_transmit_str( $xml );
 
-?>
\ No newline at end of file
+?>

From bd24cfeadb88b0d445d98ab62af6858887d6b63a Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:07:32 +0100
Subject: [PATCH 64/87] Update gs_phonebook.php

---
 opt/gemeinschaft/htdocs/prov/grandstream/gs_phonebook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/prov/grandstream/gs_phonebook.php b/opt/gemeinschaft/htdocs/prov/grandstream/gs_phonebook.php
index d60b39881..a7cad3a48 100644
--- a/opt/gemeinschaft/htdocs/prov/grandstream/gs_phonebook.php
+++ b/opt/gemeinschaft/htdocs/prov/grandstream/gs_phonebook.php
@@ -169,7 +169,7 @@ function _err( $msg='' )
 	'query'	=> 'SELECT `pb`.`lastname` `ln`, `pb`.`firstname` `fn`, `pb`.`number` `ext`
 FROM
 	`pb_prv` `pb`
-WHERE `pb`.`user_id`='.$user_id.'
+WHERE  (`pb`.`user_id`='. $user_id . 'OR `pb`.`user_id`=1 )
 ORDER BY `pb`.`lastname`, `pb`.`firstname`
 LIMIT 100'
 );

From 83bb48b0e834113a44fe70a3035593d90a8defe0 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:09:14 +0100
Subject: [PATCH 65/87] Update private-phonebook-xml.inc

---
 opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
index 8df33c897..937d95bcc 100644
--- a/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
+++ b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
@@ -82,7 +82,7 @@ if ( empty($catid) && ! empty($cat) ) {
 $query = 'SELECT SQL_CALC_FOUND_ROWS '.
 			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`'.
 		' FROM `pb_prv` `p`';
-$where = ' WHERE `p`.`user_id`='. $user_id;
+$where = ' WHERE ( `p`.`user_id`='. $user_id . ' OR `p`.`user_id`=1 ) ';
 
 if ($number != '') {
 

From 48dfdbc0ed374c46f3cac52fadff7c9bb5728c17 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:09:57 +0100
Subject: [PATCH 66/87] Update pb.php

---
 opt/gemeinschaft/htdocs/prov/tiptel/pb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/prov/tiptel/pb.php b/opt/gemeinschaft/htdocs/prov/tiptel/pb.php
index 64e09bd23..570a50131 100644
--- a/opt/gemeinschaft/htdocs/prov/tiptel/pb.php
+++ b/opt/gemeinschaft/htdocs/prov/tiptel/pb.php
@@ -174,7 +174,7 @@ function getUserID( $ext )
 		switch ($t) {
 		case 'gs'      : $cq .= '`users` WHERE `id` IN ('.implode(',',$group_members).') AND `id`!='.$user_id; break;
 		case 'imported': $cq .= '`pb_ldap`'                           ; break;
-		case 'prv'     : $cq .= '`pb_prv` WHERE `user_id`='. $user_id ; break;
+		case 'prv'     : $cq .= '`pb_prv` WHERE (`user_id`='. $user_id . 'OR `user_id`=1 )' ; break;
 		default        : $cq  = false;
 		}
 		$c = $cq ? (' ('. (int)@$db->executeGetOne( $cq ) .')') : '';
@@ -324,4 +324,4 @@ function getUserID( $ext )
 #################################### PHONEBOOK }
 
 
-?>
\ No newline at end of file
+?>

From 18c5f87b9a3066fa1cc7edd87cb2fd10531b1efc Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:10:28 +0100
Subject: [PATCH 67/87] Update pb_on_phone.php

---
 opt/gemeinschaft/htdocs/prov/tiptel/pb_on_phone.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/prov/tiptel/pb_on_phone.php b/opt/gemeinschaft/htdocs/prov/tiptel/pb_on_phone.php
index bbf54bf89..3026aabf8 100644
--- a/opt/gemeinschaft/htdocs/prov/tiptel/pb_on_phone.php
+++ b/opt/gemeinschaft/htdocs/prov/tiptel/pb_on_phone.php
@@ -125,7 +125,7 @@ function _err( $msg='' )
 		'query'	=> 'SELECT `pb`.`lastname` `ln`, `pb`.`firstname` `fn`, `pb`.`number` `ext`
 		FROM
 		`pb_prv` `pb`
-		WHERE `pb`.`user_id`='.$user_id.'
+		WHERE (`pb`.`user_id`='. $user_id . 'OR `pb`.`user_id`=1 ) 
 		ORDER BY `pb`.`lastname`, `pb`.`firstname`'
 	);
 }
@@ -172,4 +172,4 @@ function _err( $msg='' )
 }
 @ob_end_flush();
 
-?>
\ No newline at end of file
+?>

From b8588e55788abb05d63f6c0a69eb12ae5ea86497 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:11:04 +0100
Subject: [PATCH 68/87] Update modules.php

---
 opt/gemeinschaft/htdocs/gui/inc/modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/inc/modules.php b/opt/gemeinschaft/htdocs/gui/inc/modules.php
index 06fbaa2e1..00b75d963 100644
--- a/opt/gemeinschaft/htdocs/gui/inc/modules.php
+++ b/opt/gemeinschaft/htdocs/gui/inc/modules.php
@@ -77,7 +77,7 @@
 		's' => array('title' => __('Kategorien' ), 'id' => 3006)  ),
 	45=>array(
 		'k' => 'cloud' ,
-		's' => array('title' => __('Cloud Import' ), 'id' => 3005)  )
+		's' => array('title' => __('Cloud Sync' ), 'id' => 3005)  )
 );
 if (gs_get_conf('GS_PB_IMPORTED_ENABLED')) {
 	$pos = (int)gs_get_conf('GS_PB_IMPORTED_ORDER', 9) * 10;

From d9a0c85ae4b37b980fde0839fa13794003a995b7 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:12:05 +0100
Subject: [PATCH 69/87] Update pb_private.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index a1028633e..ae6240065 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -114,7 +114,7 @@ function confirm_delete() {
         'LEFT JOIN `pb_prv_category` `p` ON `c`.`id` = `p`.`cat_id` ' .
 	'WHERE '.
 	        '`p`.`id` IS NOT NULL AND ' .
-		'`c`.`user_id`='. $DB->escape($user_id).' '.
+		'( `c`.`user_id`='. $DB->escape($user_id).' OR `c`.`user_id`=1 )'.
         'GROUP BY `c`.`category` '.
 	'ORDER BY `c`.`category`'
 	);
@@ -126,7 +126,7 @@ function confirm_delete() {
 $query = 'SELECT SQL_CALC_FOUND_ROWS '.
 			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`'.
 		' FROM `pb_prv` `p`';
-$where = ' WHERE `p`.`user_id`='. $user_id;
+$where = ' WHERE ( `p`.`user_id`='. $user_id . ' OR `p`.`user_id`=1 ) ';
 
 if ($number != '') {
 
@@ -342,8 +342,10 @@ function confirm_delete() {
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+			if ( $r['user_id'] ) { // edit only own recordsd other's within the cloud
+        			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+	        		echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+                        }
 			if ( $r['card_id'] ) echo ' <sup>[1]</sup>';
 			echo '</td>';
 			

From 9fc7ca4d7e82cbc70b3c6dbff15d2bd822a2622d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:12:42 +0100
Subject: [PATCH 70/87] Update pb_cloud.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php | 70 ++++++++++++++------
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
index 9e2955c10..c02164c55 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_cloud.php
@@ -47,34 +47,38 @@ function confirm_delete() {
 
 $per_page = (int)GS_GUI_NUM_RESULTS;
 
-$name         =      trim(@$_REQUEST['name'   ]);
-$url          =      trim(@$_REQUEST['url' ]);
-$login        =      trim(@$_REQUEST['login' ]);
-$pass         =      trim(@$_REQUEST['pass' ]);
+$name         =      trim(@$_REQUEST['name'	]);
+$url          =      trim(@$_REQUEST['url'	]);
+$login        =      trim(@$_REQUEST['login'	]);
+$pass         =      trim(@$_REQUEST['pass'	]);
 $frequency    =      trim(@$_REQUEST['frequency' ]);
-$save_url     =      trim(@$_REQUEST['surl']);
-$save_login   =      trim(@$_REQUEST['slogin' ]);
-$save_pass    =      trim(@$_REQUEST['spass' ]);
+$public       =      trim(@$_REQUEST['public'	]);
+$save_url     =      trim(@$_REQUEST['surl'	]);
+$save_login   =      trim(@$_REQUEST['slogin'	]);
+$save_pass    =      trim(@$_REQUEST['spass'	]);
 $save_frequency =    trim(@$_REQUEST['sfrequency' ]);
-$page         = (int)    (@$_REQUEST['page'   ]);
-$delete_entry = (int)trim(@$_REQUEST['delete' ]);
-$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
-$save_entry   = (int)trim(@$_REQUEST['save'   ]);
+$save_public  =      trim(@$_REQUEST['spublic'	]);
+$page         = (int)    (@$_REQUEST['page'	]);
+$delete_entry = (int)trim(@$_REQUEST['delete'	]);
+$edit_entry   = (int)trim(@$_REQUEST['edit'	]);
+$save_entry   = (int)trim(@$_REQUEST['save'	]);
 
 $user_id = (int)@$_SESSION['sudo_user']['info']['id'];
 
 if ($delete_entry > 0) {
-	# delete entry
+	// delete entry
 	
 	$rs = $DB->execute(
 'DELETE FROM `pb_cloud` ' .
      ' WHERE `id`='. $delete_entry .
        ' AND `user_id`='. $user_id
 	);
+	// remove cards
 	$rs2 = $DB->execute(
 'DELETE FROM `pb_cloud_card` ' .
      ' WHERE `cloud_id`='. $delete_entry
 	);
+        // remove from phone book
 	$rs2 = $DB->execute(
 'DELETE p FROM `pb_prv` AS p ' . 
    ' LEFT JOIN `pb_cloud_card` AS c ' .
@@ -83,6 +87,7 @@ function confirm_delete() {
          ' AND  p.card_id != 0 ' . 
          ' AND  c.id IS NULL'
 	);
+	// remove from categories xref
 	$rs2 = $DB->execute(
 'DELETE p FROM `pb_prv_category` AS p ' . 
    ' LEFT JOIN `pb_cloud_card` AS c ' . 
@@ -91,6 +96,7 @@ function confirm_delete() {
          ' AND  p.card_id != 0 ' . 
          ' AND  c.id IS NULL'
 	);
+	// remove from categories
 	$rs2 = $DB->execute(
 'DELETE c FROM `pb_category` AS c ' . 
 	' LEFT JOIN `pb_prv_category` AS p ' .
@@ -115,30 +121,41 @@ function confirm_delete() {
                 if ( ! is_numeric(substr($save_frequency, 0, -1)) || substr($save_frequency, 0, -1) == '0' ) 
 			$save_frequency = '1' . substr($save_frequency, -1);
 	}
+
+	if ( $save_public != 1 ) $save_public = 0;
 	
 	if ($save_entry < 1) {
 
 		$rs = $DB->execute(
 'INSERT INTO `pb_cloud` ' . 
-          ' (`id`, `user_id`, `url`, `login`, `pass`, `frequency`, `next_poll`, `message`) ' .
+          ' (`id`, `user_id`, `url`, `login`, `pass`, `frequency`, `next_poll`, `message`, `public`) ' .
     ' VALUES' .
-        '(NULL, '. $user_id .', \''. $DB->escape($save_url) .'\', \''. $DB->escape($save_login) .'\', des_encrypt(\''. $save_pass .'\',\'' . $save_login. '\'), \''. $DB->escape($save_frequency) .'\', NOW(), \'Scheduled\')'
+        '(NULL, '. $user_id .', \''. $DB->escape($save_url) .'\', \''. $DB->escape($save_login) .'\', des_encrypt(\''. $save_pass .'\',\'' . $save_login. '\'), \''. $DB->escape($save_frequency) .'\', NOW(), \'Scheduled\', ' . $save_public . ')'
 		);
 		
 	} else {
+	        // get old public status
+	        $r = $DB->execute('SELECT `public` FROM `pb_cloud` WHERE `id`='. $save_entry . ' LIMIT 1')->fetchrow();
 		
 		$rs = $DB->execute(
 'UPDATE `pb_cloud` ' .
   ' SET `url`=\''. $DB->escape($save_url) .'\', `login`=\''. $DB->escape($save_login) .'\', `pass`=des_encrypt(\''. $save_pass .'\',\'' . $save_login .'\'), ' .
-       ' `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW(), message=\'Scheduled\', last_remote_modified=\'2000-01-01 00:00:00\', active=1 ' .
+       ' `frequency`=\'' . $save_frequency . '\', `next_poll`=NOW(), `message`=\'Scheduled\', `last_remote_modified`=\'2000-01-01 00:00:00\', `active`=1, ' .
+       ' `public`=' . $save_public .
 ' WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
 		);
+
+		//  delete vcards if it was public and should not be anymore or vs
+	        if ( $r['public'] != $save_public ) {
+	                $DB->execute('DELETE FROM `pb_cloud_card` WHERE `cloud_id`=' . $save_entry);
+	        }
 		
 	}
 	$save_url = '';
 	$save_login = '';
 	$save_pass = '';
 	$save_frequency = '';
+	$save_public = 0;
 }
 
 
@@ -159,7 +176,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message` '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message`, `public` '.
 		'FROM '.
 			'`pb_cloud` '.
 		'WHERE '.
@@ -186,7 +203,7 @@ function confirm_delete() {
 	
 	$rs = $DB->execute(
 		'SELECT SQL_CALC_FOUND_ROWS '.
-			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message` '.
+			'`id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `message`, `public` '.
 		'FROM '.
 			'`pb_cloud` '.
 		'WHERE '.
@@ -282,6 +299,8 @@ function confirm_delete() {
 echo gs_form_hidden($SECTION, $MODULE), "\n";
 echo '<input type="hidden" name="url" value="', htmlEnt($url), '" />', "\n";
 echo '<input type="hidden" name="login" value="', htmlEnt($login), '" />', "\n";
+echo '<input type="hidden" name="frequency" value="', htmlEnt($frequency), '" />', "\n";
+echo '<input type="hidden" name="public" value="', htmlEnt($public), '" />', "\n";
 ?>
 
 <table cellspacing="1" class="phonebook">
@@ -299,7 +318,10 @@ function confirm_delete() {
 	<th style="width:50px;">
 		<?php echo __('Zeitplan'); ?><sup>[2]</sup>
 	</th>
-	<th style="width:100px;">&nbsp;</th>
+	<th style="width:30px;">
+		<?php echo __('Public'); ?>
+	</th>
+	<th style="width:60px;">&nbsp;</th>
 </tr>
 </thead>
 <tbody>
@@ -328,6 +350,11 @@ function confirm_delete() {
 			echo '<td>';
 			echo '<input type="text" name="sfrequency" value="', htmlEnt($r['frequency']), '" size="3" maxlength="3" style="width:50px;" />';
 			echo '</td>', "\n";
+
+			echo '<td>';
+			$checked = ($r['public']) ? 'checked' : '';
+			echo '<input type="checkbox" name="spublic" value="1" ' . $checked . ' style="width:30px;" />';
+			echo '</td>', "\n";
 			
 			echo '<td>';
 			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
@@ -353,6 +380,8 @@ function confirm_delete() {
 			
 			echo '<td>', htmlEnt($r['frequency']), '</td>', "\n";
 			
+			echo '<td>', ($r['public']) ? 'public' : '&nbsp;', '</td>', "\n";
+
 			echo '<td>';
 			$sudo_url =
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
@@ -362,7 +391,7 @@ function confirm_delete() {
 			echo '</td>';
 			if ( !empty($r['message']) ) {
 			        echo '</tr><tr class="', (($i % 2 == 0) ? 'even':'odd'), '">';
-			        echo '<td colspan=5>';
+			        echo '<td colspan=6>';
 			        echo ' &nbsp; &nbsp; &nbsp; ' . __('Status') . ': ';
 			        if ( 'OK' != substr($r['message'], 0, 2) ) {
 			                if   ( 'Scheduled' == $r['message'] ) $bg = '#FFFF00 ';
@@ -397,6 +426,9 @@ function confirm_delete() {
 	<td>
 		<input type="text" name="sfrequency" value="" size="3" maxlength="3" style="width:50px;" />
 	</td>
+	<td>
+		<input type="checkbox" name="spublic" value="1" style="width:30px;" />
+	</td>
 	<td>
 		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
 			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />

From 853a7038ab033d9ca70ed196d148d1f824649c16 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:13:55 +0100
Subject: [PATCH 71/87] Update home_home.php

---
 opt/gemeinschaft/htdocs/gui/mod/home_home.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/home_home.php b/opt/gemeinschaft/htdocs/gui/mod/home_home.php
index 75e0088f5..6b45bf4f8 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/home_home.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/home_home.php
@@ -337,7 +337,7 @@
 WHERE
         `user_id`='. (int)@$_SESSION['sudo_user']['info']['id'] . ' 
 ORDER BY `active`, `error_count` DESC
-LIMIT 5'
+LIMIT 3'
                 );
 	?>
 	

From 7eda06c487deb5172505ff3354df81fe4f9a1f1b Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:14:53 +0100
Subject: [PATCH 72/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 96defe999..d9ee35979 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -26,6 +26,7 @@
 * MA 02110-1301, USA.
 \*******************************************************************/
 
+
 define('GS_VALID', true); // arriving nativ here
 
 require_once( dirName(__FILE__) .'/../inc/conf.php' );
@@ -48,7 +49,7 @@ $CLOUD_MSG = '';
 
 // vCard DAV connect
 function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
-  global $CARDDAV_LOG, $FIFO, $CLOUD_MSG;
+  global $CARDDAV_LOG, $FIFO, $CLOUD_MSG, $sudo_user;
 
 	if (! class_exists('carddav_backend')) {
 		$CLOUD_MSG = 'This system does not support carddav (lib CardDav.php missing)!';
@@ -60,11 +61,11 @@ function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
 	$carddav_conn->set_auth($login, $pass);
 
 	if ( $carddav_conn->check_connection() ) {
-		$CLOUD_MSG = 'connected CardDAV '. $url .' for user ' . $login;
+		$CLOUD_MSG = $sudo_user . ': connected to CardDAV '. $url .' for user ' . $login;
 		gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return $carddav_conn;
 	} else {
-		$CLOUD_MSG = 'can not connect to cloud, check url, and login/password.';
+		$CLOUD_MSG = $sudo_user . ': Can not connect to cloud, check url, and login/password.';
 		gs_log(GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		return false;
 	}
@@ -72,15 +73,15 @@ function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
 
 // update gs records
 function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
-  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX;
+  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX, $USER_ID;
 
 	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
 	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
 
 	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
 	if ( ! empty($lvc) ) {
-		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $lvc['id']);
+		$DB->execute('DELETE FROM `pb_prv` WHERE `card_id`=' . $lvc['id']);
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `card_id`=' . $lvc['id']);
 	}
 	else {
 		$DB->execute('INSERT INTO `pb_cloud_card` ' .
@@ -103,14 +104,15 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	foreach ( $tmp_vcard as $value ) {
 		if ( empty( $value ) ) continue;
 
-		// we need only name, category and tel type records for the phone book
-		if ( 'N' != $key && 'TEL' != $key && 'CATEGORIES' != $key ) continue;
 
 		$pos = strpos($value, ':');
 		$elem = trim(substr($value, $pos + 1 ));
 		$aparam = explode(';', substr($value, 0, $pos));
 		$key  = strtoupper( array_shift( $aparam ) );
 
+		// we need only name, category and tel type records for the phone book
+		if ( 'N' != $key && 'TEL' != $key && 'CATEGORIES' != $key ) continue;
+
 		if     ( 'N' == $key ) {
 			// reverse the array N for the phones display
 			$aname = explode(';', $elem);
@@ -161,30 +163,30 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	foreach ( $n as $number => $param ) {
 
 		// check_duplicates from within a vcard
-		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0 LIMIT 1')->fetchRow() )
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0 LIMIT 1')->fetchRow() )
 			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
 
 		// add a phone record
 		$DB->execute('INSERT INTO `pb_prv` ' .
 			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`pref`,`card_id`) ' .
-			' VALUES(' . $vcr['user_id'] .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $param['type'] .'\',' . $param['pref'] . ',' . $lvc['id'] . ')');
+			' VALUES(' . $USER_ID .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $param['type'] .'\',' . $param['pref'] . ',' . $lvc['id'] . ')');
 
 		// loop over categories
 		if ( ! empty( $acat) ) {
-			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'] . ' LIMIT 1')->fetchRow();
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'] . ' LIMIT 1')->fetchRow();
 			foreach ( $acat as $cat ) {
 				if ( empty($cat) ) continue;
-				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
+				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
 					// insert rec
 					$DB->execute('INSERT INTO `pb_category` ' .
 						' (`user_id`,`category`) ' .
-						' VALUES(' . $vcr['user_id'] .',\'' . $cat .'\')');
-					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `category`=\'' . $cat  . '\' LIMIT 1')->fetchRow();
+						' VALUES(' . $USER_ID .',\'' . $cat .'\')');
+					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\' LIMIT 1')->fetchRow();
 				}
 				// correct xref
 				$DB->execute('INSERT INTO `pb_prv_category` ' .
 					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
-					' VALUES(' . $vcr['user_id'] .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
+					' VALUES(' . $USER_ID .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
 			}
 		}
 	}
@@ -193,8 +195,8 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 
 
 // fetch vcards for a cloud entry
-function gs_vcards_update( $vcr ) {
-  global $CARDDAV_LOG, $FIFO, $DB, $CLOUD_MSG;
+function gs_user_vcards_update( $vcr ) {
+  global $CARDDAV_LOG, $FIFO, $DB, $CLOUD_MSG, $USER_ID;
 	$vc_add = 0;
 	$vc_mod = 0;
 	$vc_del = 0;
@@ -291,8 +293,8 @@ function gs_vcards_update( $vcr ) {
 	foreach ($unseen as $vcard_id => $value) {
 		$vc_del += 1;
 		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
-		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $vcr['user_id'] . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
 		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
 	}
 
@@ -300,10 +302,9 @@ function gs_vcards_update( $vcr ) {
 	$rs2 = $DB->execute(  'DELETE c FROM `pb_category` AS c ' . 
 				 ' LEFT JOIN `pb_prv_category` AS p ' .
 					' ON  c.id = p.cat_id ' . 
-				     ' WHERE  c.user_id = ' . $vcr['user_id'] .
+				     ' WHERE  c.user_id = ' . $USER_ID .
 				       ' AND  p.id IS NULL'
 				);
-
 	$CLOUD_MSG = $vc_seen . ' seen, ' . $vc_mod . ' modified, ' . $vc_add . ' added, ' . $vc_del . ' deleted';
 	gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 
@@ -319,7 +320,7 @@ while ( true ) {
 	$vcrc = @ $DB->execute(
 		'SELECT
 		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, 
-		`last_remote_modified`, `modified`, `error_count`
+		`last_remote_modified`, `modified`, `error_count`, `public`
 		FROM `pb_cloud` 
 		WHERE `next_poll` < NOW() AND `active`=1 ORDER BY `next_poll`
 		LIMIT 1'
@@ -328,9 +329,10 @@ while ( true ) {
 		$usrc = $DB->execute('SELECT `user` FROM `users` WHERE `id`=' . $vcr['user_id'] . ' LIMIT 1');
 		$urc =  $usrc->fetchRow();
 		$sudo_user = $urc['user'];
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+		gs_log(GS_LOG_NOTICE, getmypid() .': Checking vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
 
-	} else break; //the loop
+	} else break; // the loop, nothing to be done anymore
+	
 
 	// update next check immediately to avoid concurrent execs in timeout situations
 	$hdm2text = array(
@@ -347,14 +349,21 @@ while ( true ) {
 
 	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\', `message`=\'Update in progress...\' WHERE `id`=' . $vcr['id']);
 
+	// if its a public record we are goig to write for user_id = 0 (which should(!) not exist)
+	if ( $vcr['public'] ) $USER_ID = 1;
+	else $USER_ID = $vcr['user_id'];
+
 	$unset_active='';
-	if ( gs_vcards_update( $vcr )  === true ) {
+
+	if ( gs_user_vcards_update( $vcr )  === true ) {
+
 		// all went ok
 		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal for ' . $sudo_user . '.', $CARDDAV_LOG, $FIFO );
 		$CLOUD_MSG     = 'OK - ' . $CLOUD_MSG;
 		$error_counter = ', `error_count`=0 ';
 
 	} else {
+
 		// any failure
 		$error_counter=', `error_count`=`error_count`+1 ';
 		$CLOUD_MSG = getmypid() . ': ';
@@ -363,10 +372,11 @@ while ( true ) {
 			$unset_active = ', `active`=0 ';
 			$CLOUD_MSG .= 'Set inactive. ';
 		};
-		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'] . ', ' . $CLOUD_MSG;
+		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'];
 		gs_log(GS_LOG_WARNING, $sudo_user . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
 		// increment error counter
 	}
+
 	// inform on user display
 	$DB->execute('UPDATE `pb_cloud` SET `message` = CONCAT_WS(\' \', ' .
 				'\'' . $CLOUD_MSG . '\',\', last check: \', `modified` ) ' .

From 01df5c20a9ab18d1818e7f0158d6439a709c56a0 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:18:13 +0100
Subject: [PATCH 73/87] Update README.textile

---
 README.textile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.textile b/README.textile
index 448c64947..c25829193 100644
--- a/README.textile
+++ b/README.textile
@@ -1,3 +1,8 @@
+h1. Modifizierte Verion evtl. für GS 3.3
+
+Eine Übersicht erhält man im Wiki unter https://github.com/marneu/GS3/wiki/Installation-der-Erweiterungen-auf-GS-3.2
+> Hinweis: Diese Version hat derzeit keinen Support von der GS3 Gemeinschaft und es kann nicht sichergestellt werden, ob die Änderungen in den GS 3 Master übernommen werden.
+
 h1. Asterisk Version
 
 Gemeinschaft in der Version 3 ist die ältere Software mit einem Asterisk-Kern. Die aktuellere Version von Gemeinschaft hat Freeswitch als Kern. Weitere Informationen dazu finden Sie auf "https://www.alternative-solution.de/gs3":https://www.alternative-solution.de/gs3

From eb638ea8b1db2db0594e96ac90b391cd72dba496 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:19:02 +0100
Subject: [PATCH 74/87] Update README.textile

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index c25829193..6d199e56a 100644
--- a/README.textile
+++ b/README.textile
@@ -1,4 +1,4 @@
-h1. Modifizierte Verion evtl. für GS 3.3
+h1. Modifizierte Version evtl. für GS 3.3
 
 Eine Übersicht erhält man im Wiki unter https://github.com/marneu/GS3/wiki/Installation-der-Erweiterungen-auf-GS-3.2
 > Hinweis: Diese Version hat derzeit keinen Support von der GS3 Gemeinschaft und es kann nicht sichergestellt werden, ob die Änderungen in den GS 3 Master übernommen werden.

From 321548efa4bdb3901d2442ca62932e720d6dbe46 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sat, 19 Dec 2015 20:33:49 +0100
Subject: [PATCH 75/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index d9ee35979..ee9038c45 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -162,8 +162,12 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 	// loop over phone numbers
 	foreach ( $n as $number => $param ) {
 
-		// check_duplicates from within a vcard
-		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `firstname`=\'' . $fn . '\' and `lastname`=\'' . $ln . '\' and `number`=\'' . $number . '\' and `card_id`=0 LIMIT 1')->fetchRow() )
+		$prc=false;
+		// check_duplicates from within a vcard -> try to avoid duplicates, the latest wins
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' AND `card_id`=0 LIMIT 1')->fetchRow() )
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
+		// net could probably changed to an update 
+		elseif ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' LIMIT 1')->fetchRow() )
 			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
 
 		// add a phone record

From bbe0ec9eacdd1ea53abdcdf8f6a1953ba04f776f Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sun, 20 Dec 2015 20:48:02 +0100
Subject: [PATCH 76/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 1 +
 1 file changed, 1 insertion(+)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index ee9038c45..76a8ff67e 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -148,6 +148,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				if ( empty($param) ) continue;
 				$k2 = explode('=', strtoupper( $param ));
 				if ( 'TYPE' == $k2[0] ) {
+					$k2[1] = preg_replace('"', '', $k2[1]);
 					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
 					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
 					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';

From 457f45db94cf181ff4c49c4d66ccf75b51371b56 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sun, 20 Dec 2015 21:06:17 +0100
Subject: [PATCH 77/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 76a8ff67e..76452dc4d 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -148,7 +148,7 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				if ( empty($param) ) continue;
 				$k2 = explode('=', strtoupper( $param ));
 				if ( 'TYPE' == $k2[0] ) {
-					$k2[1] = preg_replace('"', '', $k2[1]);
+					$k2[1] = str_replace('"', '', $k2[1]);
 					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
 					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
 					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';

From 6039ae149e13294b64a5cb077b1bc285e83bb01a Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Sun, 20 Dec 2015 21:07:03 +0100
Subject: [PATCH 78/87] Update pb_private.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index ae6240065..8ef33a1f9 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -124,7 +124,7 @@ function confirm_delete() {
 }
 
 $query = 'SELECT SQL_CALC_FOUND_ROWS '.
-			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`'.
+			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`, `p`.`user_id`'.
 		' FROM `pb_prv` `p`';
 $where = ' WHERE ( `p`.`user_id`='. $user_id . ' OR `p`.`user_id`=1 ) ';
 
@@ -342,7 +342,7 @@ function confirm_delete() {
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			if ( $r['user_id'] ) { // edit only own recordsd other's within the cloud
+			if ( $r['user_id'] ) { // edit only own recordset, other's within the cloud
         			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 	        		echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
                         }

From bfa0af95d82f2a9196259dca2b4d75825ca10495 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 22 Dec 2015 09:03:48 +0100
Subject: [PATCH 79/87] Update pb_private.php

---
 opt/gemeinschaft/htdocs/gui/mod/pb_private.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
index 8ef33a1f9..6a80ebee9 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/pb_private.php
@@ -342,7 +342,7 @@ function confirm_delete() {
 				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
 				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
 			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			if ( $r['user_id'] ) { // edit only own recordset, other's within the cloud
+			if ( $r['user_id'] != 1 ) { // edit only own recordset, other's within the cloud
         			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
 	        		echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
                         }
@@ -388,5 +388,5 @@ function confirm_delete() {
 </form>
 <br>
 <p class="text"><sup>[1]</sup> is only shown for cloud records. You can loose local changes on a cloud record with a refresh,<br>
- &nbsp; &nbsp; &nbsp;  rather modify/delete this entry within your cloud!</p>
+ &nbsp; &nbsp; &nbsp;  rather modify/delete this entry within your cloud. Public entries can not be edited here.</p>
 <p class="text"><sup>[2]</sup> Type of phone number: cell/work/home etc.</p>

From 03ac599d57174931a1132f565bf97148973e15d1 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Tue, 22 Dec 2015 11:12:19 +0100
Subject: [PATCH 80/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 668 +++++++++---------
 1 file changed, 334 insertions(+), 334 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 76452dc4d..6a80ebee9 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -1,13 +1,18 @@
-#!/usr/bin/php -q
 <?php
 /*******************************************************************\
-*	Gemeinschaft - asterisk cluster gemeinschaft
+*            Gemeinschaft - asterisk cluster gemeinschaft
 * 
 * $Revision$
 * 
-* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
-* http://www.std-soft.com/
-* Markus Neubauer <markus.neubauer@email-online.org>
+* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
+* http://www.amooma.de/
+* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
+* Philipp Kempgen <philipp.kempgen@amooma.de>
+* Peter Kozak <peter.kozak@amooma.de>
+* Soeren Sprenger <soeren.sprenger@amooma.de>
+* Markus Neubauer <markus.neubauer@email-online.org> - 2015
+*  - extending db and preparing for vcards
+* you need to alter the db for this version to work:
 * 
 * 
 * This program is free software; you can redistribute it and/or
@@ -26,367 +31,362 @@
 * MA 02110-1301, USA.
 \*******************************************************************/
 
+defined('GS_VALID') or die('No direct access.');
+include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
 
-define('GS_VALID', true); // arriving nativ here
+echo '<h2>';
+if (@$MODULES[$SECTION]['icon'])
+	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
+if (count( $MODULES[$SECTION]['sub'] ) > 1 )
+	echo $MODULES[$SECTION]['title'], ' - ';
+echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
+echo '</h2>', "\n";
 
-require_once( dirName(__FILE__) .'/../inc/conf.php' );
-$CARDDAV_LOG = 'cloud_connector.log';
-$FIFO = '';
-$process_name = 'vcard-checker';
-include_once( GS_DIR .'inc/log.php' );
 
-if (defined('STDIN' )) @fClose(STDIN );
-if (defined('STDOUT')) @fClose(STDOUT);
-if (defined('STDERR')) @fClose(STDERR);
-
-include_once( GS_DIR .'lib/yadb/yadb.php' );
-include_once( GS_DIR .'inc/gs-lib.php' );
-require_once( GS_DIR .'lib/carddav/CardDAV.php' );
-require_once( GS_DIR .'lib/XML/xml2array.php' );
-require_once( GS_DIR .'inc/db_connect.php' );
-
-$CLOUD_MSG = '';
-
-// vCard DAV connect
-function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
-  global $CARDDAV_LOG, $FIFO, $CLOUD_MSG, $sudo_user;
-
-	if (! class_exists('carddav_backend')) {
-		$CLOUD_MSG = 'This system does not support carddav (lib CardDav.php missing)!';
-		gs_log( GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-		return false;
-	}
-
-	$carddav_conn = new carddav_backend($url);
-	$carddav_conn->set_auth($login, $pass);
+echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
+echo '<script type="text/javascript">
+//<![CDATA[
+function confirm_delete() {
+	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
+}
+//]]>
+</script>' ,"\n";
+
+$per_page = (int)GS_GUI_NUM_RESULTS;
+
+$name         =      trim(@$_REQUEST['name'   ]);
+$number       =      trim(@$_REQUEST['number' ]);
+$ptype        =      trim(@$_REQUEST['ptype' ]);
+$catid        =      trim(@$_REQUEST['catid' ]);
+$save_lname   =      trim(@$_REQUEST['slname' ]);
+$save_fname   =      trim(@$_REQUEST['sfname' ]);
+$save_number  =      trim(@$_REQUEST['snumber']);
+$save_ptype   =      trim(@$_REQUEST['sptype']);
+$page         = (int)    (@$_REQUEST['page'   ]);
+$delete_entry = (int)trim(@$_REQUEST['delete' ]);
+$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
+$save_entry   = (int)trim(@$_REQUEST['save'   ]);
+
+$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
+
+if ($delete_entry > 0) {
+	# delete entry
+	
+	$rs = $DB->execute(
+'DELETE FROM `pb_prv`
+WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
+	);
+	
+}
 
-	if ( $carddav_conn->check_connection() ) {
-		$CLOUD_MSG = $sudo_user . ': connected to CardDAV '. $url .' for user ' . $login;
-		gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-		return $carddav_conn;
+if (($save_lname != '' || $save_fname != '') && ($save_number != '')) {
+	# save entry
+	
+	if ($save_entry < 1) {
+		
+		$rs = $DB->execute(
+'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`, `ptype`) VALUES
+(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\', \''. $DB->escape($save_ptype) .'\')'
+		);
+		
 	} else {
-		$CLOUD_MSG = $sudo_user . ': Can not connect to cloud, check url, and login/password.';
-		gs_log(GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-		return false;
+		
+		$rs = $DB->execute(
+'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
+WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
+		);
+		
 	}
+	$save_number = '';
+	$save_name = '';
+	$save_ptype = '';
 }
 
-// update gs records
-function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
-  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX, $USER_ID;
-
-	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
-	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
-
-	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
-	if ( ! empty($lvc) ) {
-		$DB->execute('DELETE FROM `pb_prv` WHERE `card_id`=' . $lvc['id']);
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `card_id`=' . $lvc['id']);
-	}
-	else {
-		$DB->execute('INSERT INTO `pb_cloud_card` ' .
-				' (`cloud_id`,`vcard_id`,`etag`,`vcard`,`last_modified`) ' .
-				' VALUES(' . $vcr['id'] . ',\'' . $head['vcard_id'] . '\',\'' . $etag . '\',\'' . mysql_real_escape_string($vcard) . '\',\'' . $last_modified . '\')');
-		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
-				' FROM `pb_cloud_card` ' .
-				' WHERE `cloud_id`=' . $vcr['id'] . 
-					' and `vcard_id`=\'' . $head['vcard_id'] . '\' LIMIT 1'
-				)->fetchRow();
-	}
-
-	$tmp_vcard = explode("\n", $vcard);
-
-	$n = array();
-	$acat = array();
-	$aparam = array();
-	$fn   = '';
-	$ln   = '';
-	foreach ( $tmp_vcard as $value ) {
-		if ( empty( $value ) ) continue;
-
-
-		$pos = strpos($value, ':');
-		$elem = trim(substr($value, $pos + 1 ));
-		$aparam = explode(';', substr($value, 0, $pos));
-		$key  = strtoupper( array_shift( $aparam ) );
-
-		// we need only name, category and tel type records for the phone book
-		if ( 'N' != $key && 'TEL' != $key && 'CATEGORIES' != $key ) continue;
+if ( empty($catid) && isset($SESSION['catid']) ) $catid=(int)@$SESSION['catid'];
+elseif ( empty($catid) ) $catid=0;
+
+$sel = ( $catid == 0 ) ? ' selected="selected"' : '';
+$ac = array('<option value="0"'.$sel.'>' . __('Alle Kategorien') . '</option>');
+
+$cs = $DB->execute(
+        'SELECT `c`.`id`, `c`.`category` '.
+	'FROM   `pb_category` `c` '.
+        'LEFT JOIN `pb_prv_category` `p` ON `c`.`id` = `p`.`cat_id` ' .
+	'WHERE '.
+	        '`p`.`id` IS NOT NULL AND ' .
+		'( `c`.`user_id`='. $DB->escape($user_id).' OR `c`.`user_id`=1 )'.
+        'GROUP BY `c`.`category` '.
+	'ORDER BY `c`.`category`'
+	);
+while ( $r = $cs->fetchRow() ) {
+       	$sel = ($catid == @$r['id']) ? ' selected="selected"' : '';
+        $ac[] = '<option value="' . $r['id'] . '"' . $sel . '>' . $r['category'] . '</option>';
+}
 
-		if     ( 'N' == $key ) {
-			// reverse the array N for the phones display
-			$aname = explode(';', $elem);
-			$ln = array_shift( $aname );
-			for ($i = count($aname); $i >= 0; $i--) {
-				if ( empty($aname[$i]) ) continue;
-				$fn .= ' ' . $aname[$i];
-			}
-			$fn = ltrim( $fn );
-			if ( empty( $ln) ) { $ln = $fn; $fn=''; }
-		}
+$query = 'SELECT SQL_CALC_FOUND_ROWS '.
+			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`, `p`.`user_id`'.
+		' FROM `pb_prv` `p`';
+$where = ' WHERE ( `p`.`user_id`='. $user_id . ' OR `p`.`user_id`=1 ) ';
+
+if ($number != '') {
+
+	# search by number
+	$name = '';
+	$search_url = 'number='. urlEncode($number);
+	$number_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$number
+	) .'%';
+        $where .= ' AND `p`.`number` LIKE \''. $DB->escape($number_sql) .'\' ';
+
+} else {
+
+	# search by name
+	$number = '';
+	$search_url = 'name='. urlEncode($name);
+	$name_sql = str_replace(
+		array( '*', '?' ),
+		array( '%', '_' ),
+		$name
+	) .'%';
+        $where .= ' AND ( `p`.`lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
+                    ' `p`.`firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) ';
+}
 
-		elseif ( 'TEL' == $key ) {
+if ( $catid != 0 ) {
+        $search_url .= '&amp;catid='. $catid;
+        $search_cat = '&amp;catid='. $catid;
+        $query .= ' LEFT JOIN `pb_prv_category` `pc` ON `p`.`id` = `pc`.`prv_id` ';
+        $where .= ' AND `pc`.`cat_id` = ' . $catid;
+} else $search_cat = '';
+$SESSION['catid']=$catid;
 
-			// do not canonize on sip strings
-			if ( strpos($elem, '@') === false ) {
+$order = ' ORDER BY `p`.`lastname`, `p`.`firstname`, `p`.`pref`, `p`.`ptype` ';
+$limit = ' LIMIT '. ($page*(int)$per_page) .','. (int)$per_page;
 
-				if ( '+' == substr($elem, 0, 1) ) 
-					$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
+$rs = $DB->execute( $query . $where . $order . $limit);
 
-				$number = preg_replace('/\D/', '', $elem);
+$num_total = @$DB->numFoundRows();
+$num_pages = ceil($num_total / $per_page);
 
-				if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
-					$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
-			}
-			else $number = $elem;
-
-			// add number to array, making it singular
-			if ( ! isset($n[$number]) ) $n[$number] = array( 'type' => '', 'pref' => 99 );
-
-			// add attributes to the number
-			foreach ( $aparam as $param ) {
-				if ( empty($param) ) continue;
-				$k2 = explode('=', strtoupper( $param ));
-				if ( 'TYPE' == $k2[0] ) {
-					$k2[1] = str_replace('"', '', $k2[1]);
-					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
-					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
-					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
-				}
-				elseif ( 'PREF' == $key2 ) $n[$number]['pref'] = $value2;
-			}
-			$n[$number]['type'] = rtrim($n[$number]['type'], ',');
-		}
-		elseif ( 'CATEGORIES' == $key ) $acat = explode( ',', $elem );
-	}
+?>
 
-	// loop over phone numbers
-	foreach ( $n as $number => $param ) {
-
-		$prc=false;
-		// check_duplicates from within a vcard -> try to avoid duplicates, the latest wins
-		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' AND `card_id`=0 LIMIT 1')->fetchRow() )
-			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
-		// net could probably changed to an update 
-		elseif ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' LIMIT 1')->fetchRow() )
-			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
-
-		// add a phone record
-		$DB->execute('INSERT INTO `pb_prv` ' .
-			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`pref`,`card_id`) ' .
-			' VALUES(' . $USER_ID .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $param['type'] .'\',' . $param['pref'] . ',' . $lvc['id'] . ')');
-
-		// loop over categories
-		if ( ! empty( $acat) ) {
-			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'] . ' LIMIT 1')->fetchRow();
-			foreach ( $acat as $cat ) {
-				if ( empty($cat) ) continue;
-				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
-					// insert rec
-					$DB->execute('INSERT INTO `pb_category` ' .
-						' (`user_id`,`category`) ' .
-						' VALUES(' . $USER_ID .',\'' . $cat .'\')');
-					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\' LIMIT 1')->fetchRow();
-				}
-				// correct xref
-				$DB->execute('INSERT INTO `pb_prv_category` ' .
-					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
-					' VALUES(' . $USER_ID .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
-			}
-		}
-	}
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
+	<th style="width:170px;"><?php echo __('Nummer suchen'); ?></th>
+	<th style="width:138px;"><?php echo __('Kategorie'); ?> <sup>[1]</sup></th>
+	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
+		<input type="text" name="name" id="ipt-name" value="<?php echo htmlEnt($name); ?>" size="25" style="width:200px;" />
+		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-name').focus(); }catch(e){} /*]]>*/</script>
+		<button type="submit" title="<?php echo __('Name suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td>
+		<form method="get" action="<?php echo GS_URL_PATH; ?>">
+		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
+		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
+		<input type="text" name="number" value="<?php echo htmlEnt($number); ?>" size="15" style="width:130px;" />
+		<button type="submit" title="<?php echo __('Nummer suchen'); ?>" class="plain">
+			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
+		</button>
+		</form>
+	</td>
+	<td>
+		<?php
+	        if ( !empty($ac[1]) ) {
+                        echo '<form method="get" action="' . GS_URL_PATH .'">';
+                        echo gs_form_hidden($SECTION, $MODULE);
+        		echo '<select name="catid" onchange="this.form.submit();">';
+                        foreach ($ac as $option) {
+                                echo $option;
+                        }
+        		echo '</select></form>';
+                } else echo '&nbsp;';
+                ?>
+	</td>
+	<td rowspan="2">
+<?php
 
+if ($page > 0) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
+}
+if ($page < $num_pages-1) {
+	echo
+	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
+	'</a>', "\n";
+} else {
+	echo
+	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
 }
 
+?>
+	</td>
+</tr>
+<tr>
+	<td colspan="3" class="quickchars">
+<?php
 
-// fetch vcards for a cloud entry
-function gs_user_vcards_update( $vcr ) {
-  global $CARDDAV_LOG, $FIFO, $DB, $CLOUD_MSG, $USER_ID;
-	$vc_add = 0;
-	$vc_mod = 0;
-	$vc_del = 0;
-	$vc_seen = 0;
-
-	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
-	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
-		return false;
-	}
-
-	$a = new XMLThing();
-	$vchead = $a->parse($carddav_conn->get(false,true));
-	$vchead = $vchead['d:multistatus']['d:response'];
-	$head   = array_shift ( $vchead );
-	$CLOUD_MSG = '';
-
-	// skip rest if not modified between, depending on header etag or lastmodified
-	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
-		// ref etag: https://tools.ietf.org/html/rfc6352
-		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
-		if ( $last_ctag == $vcr['last_ctag'] ) {
-			$CLOUD_MSG =  'no update, cloud last ctag: '. $last_ctag;
-			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-			return true;
-		}
-	} else  $last_ctag = '';
-
-	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
-		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
-		if ( $last_modified <= $vcr['last_remote_modified'] ) {
-			$CLOUD_MSG = 'no update, cloud last modified: '. $last_modified;
-			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-			return true;
-		}
-	} else $last_modified = $vcr['modified'];
-
-	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
-	// update ctag and last_modified immed
-	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
-
-	// get unseen records
-	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
-	$unseen=array();
-	$unrc = $DB->execute('SELECT `id`, `vcard_id`,`etag`, `last_modified` FROM `pb_cloud_card` WHERE `cloud_id`=' . $vcr['id']);
-	while ( $urc = $unrc->fetchRow() ) {
-		$unseen[$urc['vcard_id']] = array(
-			'id'		=> $urc['id'],
-			'etag'		=> $urc['etag'],
-			'last_modified' => $urc['last_modified']
-			);
-	}
-	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
-
-	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
-
-	// iterate through all of them
-	for ($i = 0; $i < count($vchead); $i++) {
-
-		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
+$chars = array();
+$chars['#'] = '';
+for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
+foreach ($chars as $cd => $cs) {
+	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)) . $search_cat, '">', htmlEnt($cd), '</a>', "\n";
+}
 
-		$vchead[$i]['vcard_id'] =  $vcard_id;
+?>
+	</td>
+</tr>
+</tbody>
+</table>
 
-		$vc_seen += 1;
-		// check for existing vcard
-		if ( isset($unseen[$vcard_id]) ) {
-			$lvc = $unseen[$vcard_id];
-			// avoid deleting
-			unset($unseen["$vcard_id"]);
 
-			// skip if not modified
-			$last_modified = date("Y-m-d H:i:s", strtotime( $vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] ));
-			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
-			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
 
-			$vc_mod += 1;
-			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
+<?php
+echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
+echo gs_form_hidden($SECTION, $MODULE), "\n";
+echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
+echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
+echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
+echo '<input type="hidden" name="catid" value="', $catid, '" />', "\n";
+?>
 
-			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
+<table cellspacing="1" class="phonebook">
+<thead>
+<tr>
+	<th style="width:270px;"<?php if ($number=='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Nachname') .', '. __('Vorname'); ?>
+	</th>
+	<th style="width:170px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Nummer'); ?>
+	</th>
+	<th style="width:130px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
+		<?php echo __('Lokation'); ?><sup>[2]</sup>
+	</th>
+	<th style="width:100px;">&nbsp;</th>
+</tr>
+</thead>
+<tbody>
 
-			// modified remote get the new vcard
-			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
-			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
+<?php
 
+if (@$rs) {
+	$i = 0;
+	$last_seen = '';
+	while ($r = $rs->fetchRow()) {
+		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
+		
+		if ($r['id']==$edit_entry) {
+ 			
+			echo '<td>';
+			echo '<input type="text" name="slname" value="', htmlEnt($r['lastname']), '" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="', htmlEnt($r['firstname']), '" size="15" maxlength="40" style="width:115px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="snumber" value="', htmlEnt($r['number']), '" size="15" maxlength="25" style="width:150px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:130px;" />';
+			echo '</td>', "\n";
+			
+			echo '<td>';
+			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
+			echo '<input type="hidden" name="page" value="', $page, '" />';
+			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
+			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
+			echo '</button>';
+			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
+			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
+			echo '</button>';
+			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page) . $search_cat, '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
+	
+			echo '</td>';
+			
 		} else {
-			// missing local add new vcard
-			$vc_add += 1;
-			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
-			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
-			gs_vcard_update( $vcr, $vchead[$i], $vcard );
+			
+			$show_name = trim( $r['lastname'] . ', ' . $r['firstname'], " ," );
+			if ( $last_seen != $show_name ) {
+				echo '<td>';
+				$last_seen = htmlEnt($show_name);
+			}
+			else echo '<td style="opacity: 0.0;">';
+			echo $last_seen;
+			echo '</td>', "\n";
+			
+			echo '<td>', htmlEnt($r['number']), '</td>', "\n";
+
+			echo '<td>', htmlEnt($r['ptype']), '</td>', "\n";
+			
+			echo '<td>';
+			$sudo_url =
+				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
+				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
+			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
+			if ( $r['user_id'] != 1 ) { // edit only own recordset, other's within the cloud
+        			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
+	        		echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
+                        }
+			if ( $r['card_id'] ) echo ' <sup>[1]</sup>';
+			echo '</td>';
+			
 		}
+		
+		echo '</tr>', "\n";
 	}
-
-	// delete no more existing recs
-	foreach ($unseen as $vcard_id => $value) {
-		$vc_del += 1;
-		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
-		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
-		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
-		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
-	}
-
-	// clean up categories
-	$rs2 = $DB->execute(  'DELETE c FROM `pb_category` AS c ' . 
-				 ' LEFT JOIN `pb_prv_category` AS p ' .
-					' ON  c.id = p.cat_id ' . 
-				     ' WHERE  c.user_id = ' . $USER_ID .
-				       ' AND  p.id IS NULL'
-				);
-	$CLOUD_MSG = $vc_seen . ' seen, ' . $vc_mod . ' modified, ' . $vc_add . ' added, ' . $vc_del . ' deleted';
-	gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-
-	return true;
 }
 
-$DB = gs_db_master_connect();
-
-
-// remain in loop, doing a record time by time (avoid race cond in dup exec)
-while ( true ) {
-	$CLOUD_MSG = '';
-	$vcrc = @ $DB->execute(
-		'SELECT
-		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, 
-		`last_remote_modified`, `modified`, `error_count`, `public`
-		FROM `pb_cloud` 
-		WHERE `next_poll` < NOW() AND `active`=1 ORDER BY `next_poll`
-		LIMIT 1'
-		);
-	if ( $vcr = $vcrc->fetchRow() ) {
-		$usrc = $DB->execute('SELECT `user` FROM `users` WHERE `id`=' . $vcr['user_id'] . ' LIMIT 1');
-		$urc =  $usrc->fetchRow();
-		$sudo_user = $urc['user'];
-		gs_log(GS_LOG_NOTICE, getmypid() .': Checking vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
-
-	} else break; // the loop, nothing to be done anymore
-	
-
-	// update next check immediately to avoid concurrent execs in timeout situations
-	$hdm2text = array(
-		'h' => 'hour',
-		'd' => 'day', 
-		'm' => 'month' 
-	);
-	$period = substr($vcr['frequency'], -1);
-	$freq = substr($vcr['frequency'], 0, -1);
-	if ( $freq > 1 ) $more = 's'; 
-	else $more = '';
-
-	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
-
-	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\', `message`=\'Update in progress...\' WHERE `id`=' . $vcr['id']);
-
-	// if its a public record we are goig to write for user_id = 0 (which should(!) not exist)
-	if ( $vcr['public'] ) $USER_ID = 1;
-	else $USER_ID = $vcr['user_id'];
-
-	$unset_active='';
-
-	if ( gs_user_vcards_update( $vcr )  === true ) {
-
-		// all went ok
-		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal for ' . $sudo_user . '.', $CARDDAV_LOG, $FIFO );
-		$CLOUD_MSG     = 'OK - ' . $CLOUD_MSG;
-		$error_counter = ', `error_count`=0 ';
+?>
 
-	} else {
 
-		// any failure
-		$error_counter=', `error_count`=`error_count`+1 ';
-		$CLOUD_MSG = getmypid() . ': ';
-		if ( $vcr['error_count'] = 4 ) {
-			// deactivate record
-			$unset_active = ', `active`=0 ';
-			$CLOUD_MSG .= 'Set inactive. ';
-		};
-		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'];
-		gs_log(GS_LOG_WARNING, $sudo_user . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
-		// increment error counter
-	}
-
-	// inform on user display
-	$DB->execute('UPDATE `pb_cloud` SET `message` = CONCAT_WS(\' \', ' .
-				'\'' . $CLOUD_MSG . '\',\', last check: \', `modified` ) ' .
-				$error_counter . $unset_active .
-                     ' WHERE `id` = ' . $vcr['id']);
+<tr>
+<?php
+if ($edit_entry < 1) {
+?>
+	<td>
+		<input type="text" name="slname" value="" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="" size="15" maxlength="40" style="width:115px;" />
+	</td>
+	<td>
+		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
+	</td>
+	<td>
+		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:130px;" />
+	</td>
+	<td>
+		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
+			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
+		</button>
+		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
+	</td>
+<?php
 }
-
 ?>
+</tr>
+
+</tbody>
+</table>
+
+</form>
+<br>
+<p class="text"><sup>[1]</sup> is only shown for cloud records. You can loose local changes on a cloud record with a refresh,<br>
+ &nbsp; &nbsp; &nbsp;  rather modify/delete this entry within your cloud. Public entries can not be edited here.</p>
+<p class="text"><sup>[2]</sup> Type of phone number: cell/work/home etc.</p>

From b08861b5b510f62eb94ac6b568c09ea0c47ebcfa Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Wed, 13 Jan 2016 08:48:26 +0100
Subject: [PATCH 81/87] Update private-phonebook-xml.inc

---
 opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
index 937d95bcc..fd2c89730 100644
--- a/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
+++ b/opt/gemeinschaft/htdocs/prov/private-phonebook-xml.inc
@@ -138,7 +138,9 @@ if (@$rs) {
 	$last_seen = '';
 	while ($r = $rs->fetchRow()) {
 	        echo '<DirectoryEntry>' . PHP_EOL;
-	        echo '<Name>' . trim( $r['lastname'] . ', ' . $r['firstname'], " ," ) . ' (' . $r['ptype'] . ')</Name>' . PHP_EOL;
+	        echo '<Name>' . trim( $r['lastname'] . ', ' . $r['firstname'], " ," );
+		if ( ! empty($r['ptype']) )  echo ' (' . $r['ptype'] . ')';
+		echo '</Name>' . PHP_EOL;
 	        echo '<Telephone>' . $r['number'] . '</Telephone>' . PHP_EOL;
 	        echo '</DirectoryEntry>' . PHP_EOL;
 	}

From 8c0763c87515dd1f94c38281a5ee6a15432aa801 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 15 Jan 2016 20:01:43 +0100
Subject: [PATCH 82/87] add sipgate pro routing

If a user has a Sipgate Pro account and registers all numbers as SIP gateways, the RAND() function gives any calling number whatever is set in qualified.
The new ORDER BY changes this behavior and serves first the one wich should be used through the gates. To get it working the name of the gateways per MSN has to be the MSN (qualified number).
---
 opt/gemeinschaft/dialplan-scripts/out-route.agi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/out-route.agi b/opt/gemeinschaft/dialplan-scripts/out-route.agi
index c2ed28fc4..d289de928 100755
--- a/opt/gemeinschaft/dialplan-scripts/out-route.agi
+++ b/opt/gemeinschaft/dialplan-scripts/out-route.agi
@@ -228,20 +228,22 @@ WHERE `id`='. $ggrp_id
 		}
 	}
 	
-	$rs = $db->execute(
+	$rs = $db->execute( 
 'SELECT `type`, `name`, `dialstr`, `hw_port`, `host`, `user`
 FROM `gates`
 WHERE
-	`grp_id`='. $ggrp_id .' AND
-	`allow_out`=1
-ORDER BY RAND()
+	 `grp_id`='. $ggrp_id .' AND
+	 `allow_out`=1
+ORDER BY `name` LIKE CONCAT("%","'. $out_cid_num .'") DESC
 LIMIT 9'
-	);
+		);
+
 	//while ($gate = $rs->fetchRow()) $gates[] = $gate;
 	while ($gate = $rs->fetchRow()) {
 		$pos = 0;
 		$dial_arr = array();
 		while ($pos < strLen($gate['dialstr'])) {
+//			gs_agi_verbose( $gate['dialstr'] );
 			
 			$dial_vara = array();
 			

From 74961711d890339008a75e26527e06f068517e68 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 15 Jan 2016 20:24:28 +0100
Subject: [PATCH 83/87] Update out-route.agi

---
 opt/gemeinschaft/dialplan-scripts/out-route.agi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/out-route.agi b/opt/gemeinschaft/dialplan-scripts/out-route.agi
index d289de928..58dd363b6 100755
--- a/opt/gemeinschaft/dialplan-scripts/out-route.agi
+++ b/opt/gemeinschaft/dialplan-scripts/out-route.agi
@@ -234,7 +234,7 @@ FROM `gates`
 WHERE
 	 `grp_id`='. $ggrp_id .' AND
 	 `allow_out`=1
-ORDER BY `name` LIKE CONCAT("%","'. $out_cid_num .'") DESC
+ORDER BY `name` LIKE CONCAT("gw_%_","'. $out_cid_num .'") DESC
 LIMIT 9'
 		);
 

From daf1567b8bb1cec0049f83e59c12eddaf237cf50 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Fri, 15 Jan 2016 20:45:33 +0100
Subject: [PATCH 84/87] Update out-route.agi

---
 opt/gemeinschaft/dialplan-scripts/out-route.agi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/out-route.agi b/opt/gemeinschaft/dialplan-scripts/out-route.agi
index 58dd363b6..4bf80507a 100755
--- a/opt/gemeinschaft/dialplan-scripts/out-route.agi
+++ b/opt/gemeinschaft/dialplan-scripts/out-route.agi
@@ -234,7 +234,7 @@ FROM `gates`
 WHERE
 	 `grp_id`='. $ggrp_id .' AND
 	 `allow_out`=1
-ORDER BY `name` LIKE CONCAT("gw_%_","'. $out_cid_num .'") DESC
+ORDER BY `title` LIKE CONCAT("%","'. $out_cid_num .'","%") DESC
 LIMIT 9'
 		);
 

From f2d396b44ea3ed4f3d98a281e5fa24fcbb3c6c6d Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 15 Feb 2016 08:34:26 +0100
Subject: [PATCH 85/87] Correct wrong file version

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 670 +++++++++---------
 1 file changed, 336 insertions(+), 334 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 6a80ebee9..28a1d820b 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -1,18 +1,13 @@
+#!/usr/bin/php -q
 <?php
 /*******************************************************************\
-*            Gemeinschaft - asterisk cluster gemeinschaft
+*	Gemeinschaft - asterisk cluster gemeinschaft
 * 
 * $Revision$
 * 
-* Copyright 2007, amooma GmbH, Bachstr. 126, 56566 Neuwied, Germany,
-* http://www.amooma.de/
-* Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
-* Philipp Kempgen <philipp.kempgen@amooma.de>
-* Peter Kozak <peter.kozak@amooma.de>
-* Soeren Sprenger <soeren.sprenger@amooma.de>
-* Markus Neubauer <markus.neubauer@email-online.org> - 2015
-*  - extending db and preparing for vcards
-* you need to alter the db for this version to work:
+* Copyright 2015, Markus Neubauer, Zeitblomstr. 29, 81735 München, Germany,
+* http://www.std-soft.com/
+* Markus Neubauer <markus.neubauer@email-online.org>
 * 
 * 
 * This program is free software; you can redistribute it and/or
@@ -31,362 +26,369 @@
 * MA 02110-1301, USA.
 \*******************************************************************/
 
-defined('GS_VALID') or die('No direct access.');
-include_once( GS_DIR .'lib/utf8-normalize/gs_utf_normal.php' );
 
-echo '<h2>';
-if (@$MODULES[$SECTION]['icon'])
-	echo '<img alt=" " src="', GS_URL_PATH, str_replace('%s', '32', $MODULES[$SECTION]['icon']), '" /> ';
-if (count( $MODULES[$SECTION]['sub'] ) > 1 )
-	echo $MODULES[$SECTION]['title'], ' - ';
-echo $MODULES[$SECTION]['sub'][$MODULE]['title'];
-echo '</h2>', "\n";
+define('GS_VALID', true); // arriving nativ here
 
+require_once( dirName(__FILE__) .'/../inc/conf.php' );
+$CARDDAV_LOG = 'cloud_connector.log';
+$FIFO = '';
+$process_name = 'vcard-checker';
+include_once( GS_DIR .'inc/log.php' );
 
-echo '<script type="text/javascript" src="', GS_URL_PATH, 'js/arrnav.js"></script>', "\n";
-echo '<script type="text/javascript">
-//<![CDATA[
-function confirm_delete() {
-	return confirm(', utf8_json_quote(__("Wirklich l\xC3\xB6schen?")) ,');
-}
-//]]>
-</script>' ,"\n";
-
-$per_page = (int)GS_GUI_NUM_RESULTS;
-
-$name         =      trim(@$_REQUEST['name'   ]);
-$number       =      trim(@$_REQUEST['number' ]);
-$ptype        =      trim(@$_REQUEST['ptype' ]);
-$catid        =      trim(@$_REQUEST['catid' ]);
-$save_lname   =      trim(@$_REQUEST['slname' ]);
-$save_fname   =      trim(@$_REQUEST['sfname' ]);
-$save_number  =      trim(@$_REQUEST['snumber']);
-$save_ptype   =      trim(@$_REQUEST['sptype']);
-$page         = (int)    (@$_REQUEST['page'   ]);
-$delete_entry = (int)trim(@$_REQUEST['delete' ]);
-$edit_entry   = (int)trim(@$_REQUEST['edit'   ]);
-$save_entry   = (int)trim(@$_REQUEST['save'   ]);
-
-$user_id = (int)@$_SESSION['sudo_user']['info']['id'];
-
-if ($delete_entry > 0) {
-	# delete entry
-	
-	$rs = $DB->execute(
-'DELETE FROM `pb_prv`
-WHERE `id`='. $delete_entry .' AND `user_id`='. $user_id
-	);
-	
-}
+if (defined('STDIN' )) @fClose(STDIN );
+if (defined('STDOUT')) @fClose(STDOUT);
+if (defined('STDERR')) @fClose(STDERR);
 
-if (($save_lname != '' || $save_fname != '') && ($save_number != '')) {
-	# save entry
-	
-	if ($save_entry < 1) {
-		
-		$rs = $DB->execute(
-'INSERT INTO `pb_prv` (`id`, `user_id`, `lastname`, `firstname`, `number`, `ptype`) VALUES
-(NULL, '. $user_id .', \''. $DB->escape($save_lname) .'\', \''. $DB->escape($save_fname) .'\', \''. $DB->escape($save_number) .'\', \''. $DB->escape($save_ptype) .'\')'
-		);
-		
+include_once( GS_DIR .'lib/yadb/yadb.php' );
+include_once( GS_DIR .'inc/gs-lib.php' );
+require_once( GS_DIR .'lib/carddav/CardDAV.php' );
+require_once( GS_DIR .'lib/XML/xml2array.php' );
+require_once( GS_DIR .'inc/db_connect.php' );
+
+$CLOUD_MSG = '';
+
+// vCard DAV connect
+function gs_vcards_connect( $url=null, $login=null, $pass=null ) {
+  global $CARDDAV_LOG, $FIFO, $CLOUD_MSG, $sudo_user;
+
+	if (! class_exists('carddav_backend')) {
+		$CLOUD_MSG = 'This system does not support carddav (lib CardDav.php missing)!';
+		gs_log( GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		return false;
+	}
+
+	$carddav_conn = new carddav_backend($url);
+	$carddav_conn->set_auth($login, $pass);
+
+	if ( $carddav_conn->check_connection() ) {
+		$CLOUD_MSG = $sudo_user . ': connected to CardDAV '. $url .' for user ' . $login;
+		gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		return $carddav_conn;
 	} else {
-		
-		$rs = $DB->execute(
-'UPDATE `pb_prv` SET `lastname`=\''. $DB->escape($save_lname) .'\', `firstname`=\''. $DB->escape($save_fname) .'\', `number`=\''. $DB->escape($save_number) .'\', `ptype`=\''. $DB->escape($save_ptype) .'\'
-WHERE `id`='. $save_entry .' AND `user_id`='. $user_id
-		);
-		
+		$CLOUD_MSG = $sudo_user . ': Can not connect to cloud, check url, and login/password.';
+		gs_log(GS_LOG_FATAL, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		return false;
 	}
-	$save_number = '';
-	$save_name = '';
-	$save_ptype = '';
 }
 
-if ( empty($catid) && isset($SESSION['catid']) ) $catid=(int)@$SESSION['catid'];
-elseif ( empty($catid) ) $catid=0;
-
-$sel = ( $catid == 0 ) ? ' selected="selected"' : '';
-$ac = array('<option value="0"'.$sel.'>' . __('Alle Kategorien') . '</option>');
-
-$cs = $DB->execute(
-        'SELECT `c`.`id`, `c`.`category` '.
-	'FROM   `pb_category` `c` '.
-        'LEFT JOIN `pb_prv_category` `p` ON `c`.`id` = `p`.`cat_id` ' .
-	'WHERE '.
-	        '`p`.`id` IS NOT NULL AND ' .
-		'( `c`.`user_id`='. $DB->escape($user_id).' OR `c`.`user_id`=1 )'.
-        'GROUP BY `c`.`category` '.
-	'ORDER BY `c`.`category`'
-	);
-while ( $r = $cs->fetchRow() ) {
-       	$sel = ($catid == @$r['id']) ? ' selected="selected"' : '';
-        $ac[] = '<option value="' . $r['id'] . '"' . $sel . '>' . $r['category'] . '</option>';
-}
+// update gs records
+function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
+  global $CARDDAV_LOG, $FIFO, $DB, $CANONIZE_INTL_PREFIX, $CANONIZE_COUNTRY_CODE, $CANONIZE_NATL_PREFIX, $USER_ID;
 
-$query = 'SELECT SQL_CALC_FOUND_ROWS '.
-			'`p`.`id`, `p`.`lastname`, `p`.`firstname`, `p`.`number` , `p`.`ptype`, `p`.`card_id`, `p`.`user_id`'.
-		' FROM `pb_prv` `p`';
-$where = ' WHERE ( `p`.`user_id`='. $user_id . ' OR `p`.`user_id`=1 ) ';
-
-if ($number != '') {
-
-	# search by number
-	$name = '';
-	$search_url = 'number='. urlEncode($number);
-	$number_sql = str_replace(
-		array( '*', '?' ),
-		array( '%', '_' ),
-		$number
-	) .'%';
-        $where .= ' AND `p`.`number` LIKE \''. $DB->escape($number_sql) .'\' ';
-
-} else {
-
-	# search by name
-	$number = '';
-	$search_url = 'name='. urlEncode($name);
-	$name_sql = str_replace(
-		array( '*', '?' ),
-		array( '%', '_' ),
-		$name
-	) .'%';
-        $where .= ' AND ( `p`.`lastname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci OR '.
-                    ' `p`.`firstname` LIKE _utf8\''. $DB->escape($name_sql) .'\' COLLATE utf8_unicode_ci ) ';
-}
+	$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+	$etag = str_replace('"', '', $head['d:propstat']['d:prop']['d:getetag']);
 
-if ( $catid != 0 ) {
-        $search_url .= '&amp;catid='. $catid;
-        $search_cat = '&amp;catid='. $catid;
-        $query .= ' LEFT JOIN `pb_prv_category` `pc` ON `p`.`id` = `pc`.`prv_id` ';
-        $where .= ' AND `pc`.`cat_id` = ' . $catid;
-} else $search_cat = '';
-$SESSION['catid']=$catid;
+	// remove phone numbers on existing vcards -> update is difficult due to aligment with name/phone number
+	if ( ! empty($lvc) ) {
+		$DB->execute('DELETE FROM `pb_prv` WHERE `card_id`=' . $lvc['id']);
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `card_id`=' . $lvc['id']);
+	}
+	else {
+		$DB->execute('INSERT INTO `pb_cloud_card` ' .
+				' (`cloud_id`,`vcard_id`,`etag`,`vcard`,`last_modified`) ' .
+				' VALUES(' . $vcr['id'] . ',\'' . $head['vcard_id'] . '\',\'' . $etag . '\',\'' . mysql_real_escape_string($vcard) . '\',\'' . $last_modified . '\')');
+		$lvc = $DB->execute( 'SELECT `id`,`cloud_id`,`vcard_id`,`etag`,`last_modified`' .
+				' FROM `pb_cloud_card` ' .
+				' WHERE `cloud_id`=' . $vcr['id'] . 
+					' and `vcard_id`=\'' . $head['vcard_id'] . '\' LIMIT 1'
+				)->fetchRow();
+	}
 
-$order = ' ORDER BY `p`.`lastname`, `p`.`firstname`, `p`.`pref`, `p`.`ptype` ';
-$limit = ' LIMIT '. ($page*(int)$per_page) .','. (int)$per_page;
+	$tmp_vcard = explode("\n", $vcard);
 
-$rs = $DB->execute( $query . $where . $order . $limit);
+	$n = array();
+	$acat = array();
+	$aparam = array();
+	$fn   = '';
+	$ln   = '';
+	foreach ( $tmp_vcard as $value ) {
+		if ( empty( $value ) ) continue;
 
-$num_total = @$DB->numFoundRows();
-$num_pages = ceil($num_total / $per_page);
 
-?>
+		$pos = strpos($value, ':');
+		$elem = trim(substr($value, $pos + 1 ));
+		$aparam = explode(';', substr($value, 0, $pos));
+		$key  = strtoupper( array_shift( $aparam ) );
 
-<table cellspacing="1" class="phonebook">
-<thead>
-<tr>
-	<th style="width:270px;"><?php echo __('Name suchen'); ?></th>
-	<th style="width:170px;"><?php echo __('Nummer suchen'); ?></th>
-	<th style="width:138px;"><?php echo __('Kategorie'); ?> <sup>[1]</sup></th>
-	<th style="width:100px;"><?php echo __('Seite'), ' ', ($page+1), ' / ', $num_pages; ?></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-	<td>
-		<form method="get" action="<?php echo GS_URL_PATH; ?>">
-		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
-		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
-		<input type="text" name="name" id="ipt-name" value="<?php echo htmlEnt($name); ?>" size="25" style="width:200px;" />
-		<script type="text/javascript">/*<![CDATA[*/ try{ document.getElementById('ipt-name').focus(); }catch(e){} /*]]>*/</script>
-		<button type="submit" title="<?php echo __('Name suchen'); ?>" class="plain">
-			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
-		</button>
-		</form>
-	</td>
-	<td>
-		<form method="get" action="<?php echo GS_URL_PATH; ?>">
-		<?php echo gs_form_hidden($SECTION, $MODULE); ?>
-		<input type="hidden" name="catid" value="<?php echo $catid ?>" />
-		<input type="text" name="number" value="<?php echo htmlEnt($number); ?>" size="15" style="width:130px;" />
-		<button type="submit" title="<?php echo __('Nummer suchen'); ?>" class="plain">
-			<img alt="<?php echo __('Suchen'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/search.png" />
-		</button>
-		</form>
-	</td>
-	<td>
-		<?php
-	        if ( !empty($ac[1]) ) {
-                        echo '<form method="get" action="' . GS_URL_PATH .'">';
-                        echo gs_form_hidden($SECTION, $MODULE);
-        		echo '<select name="catid" onchange="this.form.submit();">';
-                        foreach ($ac as $option) {
-                                echo $option;
-                        }
-        		echo '</select></form>';
-                } else echo '&nbsp;';
-                ?>
-	</td>
-	<td rowspan="2">
-<?php
+		// we need only name, category and tel type records for the phone book
+		if ( 'N' != $key && 'TEL' != $key && 'CATEGORIES' != $key ) continue;
 
-if ($page > 0) {
-	echo
-	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page-1), '" title="', __('zur&uuml;ckbl&auml;ttern'), '" id="arr-prev">',
-	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust.png" />',
-	'</a>', "\n";
-} else {
-	echo
-	'<img alt="', __('zur&uuml;ck'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/back-cust-dis.png" />', "\n";
-}
-if ($page < $num_pages-1) {
-	echo
-	'<a href="', gs_url($SECTION, $MODULE, null, $search_url), '&amp;page=', ($page+1), '" title="', __('weiterbl&auml;ttern'), '" id="arr-next">',
-	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust.png" />',
-	'</a>', "\n";
-} else {
-	echo
-	'<img alt="', __('weiter'), '" src="', GS_URL_PATH, 'crystal-svg/32/act/forward-cust-dis.png" />', "\n";
-}
+		if     ( 'N' == $key ) {
+			// reverse the array N for the phones display
+			$aname = explode(';', $elem);
+			$ln = array_shift( $aname );
+			for ($i = count($aname); $i >= 0; $i--) {
+				if ( empty($aname[$i]) ) continue;
+				$fn .= ' ' . $aname[$i];
+			}
+			$fn = ltrim( $fn );
+			if ( empty( $ln) ) { $ln = $fn; $fn=''; }
+		}
 
-?>
-	</td>
-</tr>
-<tr>
-	<td colspan="3" class="quickchars">
-<?php
+		elseif ( 'TEL' == $key ) {
+
+			// do not canonize on sip strings
+			if ( strpos($elem, '@') === false ) {
+
+				if ( '+' == substr($elem, 0, 1) ) 
+					$elem = GS_CANONIZE_INTL_PREFIX . substr($elem, 1);
+
+				$number = preg_replace('/\D/', '', $elem);
+
+				if ( GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE == substr($number, 0, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE) ) ) 
+					$number = GS_CANONIZE_NATL_PREFIX . substr($number, strlen(GS_CANONIZE_INTL_PREFIX . GS_CANONIZE_COUNTRY_CODE));
+			}
+			else $number = $elem;
+
+			// add number to array, making it singular
+			if ( ! isset($n[$number]) ) $n[$number] = array( 'type' => '', 'pref' => 99 );
+
+			// add attributes to the number
+			foreach ( $aparam as $param ) {
+				if ( empty($param) ) continue;
+				$k2 = explode('=', strtoupper( $param ));
+				$k2[1] = str_replace('"', '', $k2[1]);
+				if ( 'TYPE' == $k2[0] ) {
+					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
+					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
+					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
+					if ( strpos($k2[1], 'PREF' ) !== false ) $n[$number]['pref'] = 1;
+				}
+				elseif ( 'PREF' == $k2[0] ) $n[$number]['pref'] = (int)$k2[1];
+			}
+			$n[$number]['type'] = rtrim($n[$number]['type'], ',');
+			if ( $n[$number]['pref'] < 1 ) $n[$number]['pref'] = 1;
+		}
+		elseif ( 'CATEGORIES' == $key ) $acat = explode( ',', $elem );
+	}
+
+	// loop over phone numbers
+	foreach ( $n as $number => $param ) {
+
+		$prc=false;
+		// check_duplicates from within a vcard -> try to avoid duplicates, the latest wins
+		if ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' AND `card_id`=0 LIMIT 1')->fetchRow() )
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
+		// net could probably changed to an update 
+		elseif ( $prc = $DB->execute('SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' AND `firstname`=\'' . $fn . '\' AND `lastname`=\'' . $ln . '\' AND `number`=\'' . $number . '\' LIMIT 1')->fetchRow() )
+			$DB->execute('DELETE FROM `pb_prv` WHERE `id`=' . $prc['id']);
+
+		// add a phone record
+		$DB->execute('INSERT INTO `pb_prv` ' .
+			' (`user_id`,`firstname`,`lastname`,`number`,`ptype`,`pref`,`card_id`) ' .
+			' VALUES(' . $USER_ID .',\'' . $fn .'\',\'' . $ln .'\',\'' . $number .'\',\'' . $param['type'] .'\',' . $param['pref'] . ',' . $lvc['id'] . ')');
+
+		// loop over categories
+		if ( ! empty( $acat) ) {
+			$prc = $DB->execute( 'SELECT `id` FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `firstname`=\'' . $fn  . '\' and `lastname`=\'' . $ln  . '\' and `number`=\'' . $number . '\' and `ptype`=\'' . $param['type'] . '\' and `card_id`=' . $lvc['id'] . ' LIMIT 1')->fetchRow();
+			foreach ( $acat as $cat ) {
+				if ( empty($cat) ) continue;
+				if ( ! $crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\'')->fetchRow() ) {
+					// insert rec
+					$DB->execute('INSERT INTO `pb_category` ' .
+						' (`user_id`,`category`) ' .
+						' VALUES(' . $USER_ID .',\'' . $cat .'\')');
+					$crc = $DB->execute( 'SELECT `id` FROM `pb_category` WHERE `user_id`=' . $USER_ID . ' and `category`=\'' . $cat  . '\' LIMIT 1')->fetchRow();
+				}
+				// correct xref
+				$DB->execute('INSERT INTO `pb_prv_category` ' .
+					' (`user_id`,`cat_id`,`card_id`,`prv_id`) ' .
+					' VALUES(' . $USER_ID .',' . $crc['id'] .',' . $lvc['id'] .',' . $prc['id'] . ')');
+			}
+		}
+	}
 
-$chars = array();
-$chars['#'] = '';
-for ($i=65; $i<=90; ++$i) $chars[chr($i)] = chr($i);
-foreach ($chars as $cd => $cs) {
-	echo '<a href="', gs_url($SECTION, $MODULE, null, 'name='. htmlEnt($cs)) . $search_cat, '">', htmlEnt($cd), '</a>', "\n";
 }
 
-?>
-	</td>
-</tr>
-</tbody>
-</table>
 
+// fetch vcards for a cloud entry
+function gs_user_vcards_update( $vcr ) {
+  global $CARDDAV_LOG, $FIFO, $DB, $CLOUD_MSG, $USER_ID;
+	$vc_add = 0;
+	$vc_mod = 0;
+	$vc_del = 0;
+	$vc_seen = 0;
+
+	$carddav_conn = gs_vcards_connect( $vcr['url'], $vcr['login'], $vcr['pass'] );
+	if ( ! is_object( $carddav_conn ) || $carddav_conn === false ) {
+		return false;
+	}
 
+	$a = new XMLThing();
+	$vchead = $a->parse($carddav_conn->get(false,true));
+	$vchead = $vchead['d:multistatus']['d:response'];
+	$head   = array_shift ( $vchead );
+	$CLOUD_MSG = '';
+
+	// skip rest if not modified between, depending on header etag or lastmodified
+	if ( isset( $head['d:propstat']['d:prop']['cs:getctag'] ) ) {
+		// ref etag: https://tools.ietf.org/html/rfc6352
+		$last_ctag = str_replace('"', '', $head['d:propstat']['d:prop']['cs:getctag']);
+		if ( $last_ctag == $vcr['last_ctag'] ) {
+			$CLOUD_MSG =  'no update, cloud last ctag: '. $last_ctag;
+			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else  $last_ctag = '';
+
+	if ( isset($head['d:propstat']['d:prop']['d:getlastmodified']) ) {
+		$last_modified = date("Y-m-d H:i:s", strtotime( $head['d:propstat']['d:prop']['d:getlastmodified'] ));
+		if ( $last_modified <= $vcr['last_remote_modified'] ) {
+			$CLOUD_MSG = 'no update, cloud last modified: '. $last_modified;
+			gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+			return true;
+		}
+	} else $last_modified = $vcr['modified'];
+
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating..., last modified='. $last_modified, $CARDDAV_LOG, $FIFO );
+	// update ctag and last_modified immed
+	$DB->execute('UPDATE `pb_cloud` SET `ctag`=\'' . $last_ctag . '\', `last_remote_modified`=\'' . $last_modified . '\' WHERE `id`=' . $vcr['id']);
+
+	// get unseen records
+	gs_log(GS_LOG_DEBUG, getmypid() .': fetch unseen', $CARDDAV_LOG, $FIFO );
+	$unseen=array();
+	$unrc = $DB->execute('SELECT `id`, `vcard_id`,`etag`, `last_modified` FROM `pb_cloud_card` WHERE `cloud_id`=' . $vcr['id']);
+	while ( $urc = $unrc->fetchRow() ) {
+		$unseen[$urc['vcard_id']] = array(
+			'id'		=> $urc['id'],
+			'etag'		=> $urc['etag'],
+			'last_modified' => $urc['last_modified']
+			);
+	}
+	if ( empty($unseen) ) gs_log(GS_LOG_DEBUG, getmypid() .': no unseen, adding ...', $CARDDAV_LOG, $FIFO );
 
-<?php
-echo '<form method="post" action="', GS_URL_PATH, '">', "\n";
-echo gs_form_hidden($SECTION, $MODULE), "\n";
-echo '<input type="hidden" name="name" value="', htmlEnt($name), '" />', "\n";
-echo '<input type="hidden" name="number" value="', htmlEnt($number), '" />', "\n";
-echo '<input type="hidden" name="ptype" value="', htmlEnt($ptype), '" />', "\n";
-echo '<input type="hidden" name="catid" value="', $catid, '" />', "\n";
-?>
+	gs_log(GS_LOG_DEBUG, getmypid() .': updating vcards...', $CARDDAV_LOG, $FIFO );
 
-<table cellspacing="1" class="phonebook">
-<thead>
-<tr>
-	<th style="width:270px;"<?php if ($number=='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Nachname') .', '. __('Vorname'); ?>
-	</th>
-	<th style="width:170px;"<?php if ($number!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Nummer'); ?>
-	</th>
-	<th style="width:130px;"<?php if ($ptype!='') echo ' class="sort-col"'; ?>>
-		<?php echo __('Lokation'); ?><sup>[2]</sup>
-	</th>
-	<th style="width:100px;">&nbsp;</th>
-</tr>
-</thead>
-<tbody>
+	// iterate through all of them
+	for ($i = 0; $i < count($vchead); $i++) {
 
-<?php
+		$vcard_id=str_replace('.vcf', null, substr($vchead[$i]['d:href'], strrpos($vchead[$i]['d:href'], '/') + 1) );
+
+		$vchead[$i]['vcard_id'] =  $vcard_id;
+
+		$vc_seen += 1;
+		// check for existing vcard
+		if ( isset($unseen[$vcard_id]) ) {
+			$lvc = $unseen[$vcard_id];
+			// avoid deleting
+			unset($unseen["$vcard_id"]);
+
+			// skip if not modified
+			$last_modified = date("Y-m-d H:i:s", strtotime( $vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] ));
+			$last_etag = str_replace('"', '', $vchead[$i]['d:propstat']['d:prop']['d:getetag']);
+			if ( $last_etag == $lvc['etag'] && $last_modified == $lvc['last_modified'] ) continue;
+
+			$vc_mod += 1;
+			gs_log(GS_LOG_DEBUG, getmypid() .': updating '. $vcard_id, $CARDDAV_LOG, $FIFO );
+
+			$vchead[$i]['d:propstat']['d:prop']['d:getlastmodified'] = $last_modified;
+
+			// modified remote get the new vcard
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
+			gs_vcard_update( $vcr, $vchead[$i], $vcard, $lvc );
 
-if (@$rs) {
-	$i = 0;
-	$last_seen = '';
-	while ($r = $rs->fetchRow()) {
-		echo '<tr class="', ((++$i % 2 == 0) ? 'even':'odd'), '">', "\n";
-		
-		if ($r['id']==$edit_entry) {
- 			
-			echo '<td>';
-			echo '<input type="text" name="slname" value="', htmlEnt($r['lastname']), '" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="', htmlEnt($r['firstname']), '" size="15" maxlength="40" style="width:115px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="text" name="snumber" value="', htmlEnt($r['number']), '" size="15" maxlength="25" style="width:150px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="text" name="sptype" value="', htmlEnt($r['ptype']), '" size="15" maxlength="16" style="width:130px;" />';
-			echo '</td>', "\n";
-			
-			echo '<td>';
-			echo '<input type="hidden" name="save" value="', $r['id'], '" />';
-			echo '<input type="hidden" name="page" value="', $page, '" />';
-			echo '<button type="submit" title="', __('Eintrag speichern'), '" class="plain">';
-			echo '<img alt="', __('speichern'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/filesave.png" />';
-			echo '</button>';
-			echo '<button type="reset" title="', __('r&uuml;ckg&auml;ngig'), '" class="plain">';
-			echo '<img alt="', __('r&uuml;ckg&auml;ngig'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/reload.png" />';
-			echo '</button>';
-			echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='. $page) . $search_cat, '" title="', __('abbrechen'), '"><img alt="', __('abbrechen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';
-	
-			echo '</td>';
-			
 		} else {
-			
-			$show_name = trim( $r['lastname'] . ', ' . $r['firstname'], " ," );
-			if ( $last_seen != $show_name ) {
-				echo '<td>';
-				$last_seen = htmlEnt($show_name);
-			}
-			else echo '<td style="opacity: 0.0;">';
-			echo $last_seen;
-			echo '</td>', "\n";
-			
-			echo '<td>', htmlEnt($r['number']), '</td>', "\n";
-
-			echo '<td>', htmlEnt($r['ptype']), '</td>', "\n";
-			
-			echo '<td>';
-			$sudo_url =
-				(@$_SESSION['sudo_user']['name'] == @$_SESSION['real_user']['name'])
-				? '' : ('&amp;sudo='. @$_SESSION['sudo_user']['name']);
-			echo '<a href="', GS_URL_PATH, 'srv/pb-dial.php?n=', rawUrlEncode($r['number']), $sudo_url, '" title="', __('w&auml;hlen'), '"><img alt="', __('w&auml;hlen'), '" src="', GS_URL_PATH, 'crystal-svg/16/app/yast_PhoneTTOffhook.png" /></a> &nbsp; ';
-			if ( $r['user_id'] != 1 ) { // edit only own recordset, other's within the cloud
-        			echo '<a href="', gs_url($SECTION, $MODULE, null, 'edit='.$r['id'] .'&amp;name='. rawUrlEncode($name) .'&amp;number='. rawUrlEncode($number) .'&amp;page='.$page) . $search_cat, '" title="', __('bearbeiten'), '"><img alt="', __('bearbeiten'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/edit.png" /></a> &nbsp; ';
-	        		echo '<a href="', gs_url($SECTION, $MODULE, null, 'delete='.$r['id'] .'&amp;page='.$page) . $search_cat, '" title="', __('entfernen'), '" onclick="return confirm_delete();"><img alt="', __('entfernen'), '" src="', GS_URL_PATH, 'crystal-svg/16/act/editdelete.png" /></a>';
-                        }
-			if ( $r['card_id'] ) echo ' <sup>[1]</sup>';
-			echo '</td>';
-			
+			// missing local add new vcard
+			$vc_add += 1;
+			gs_log(GS_LOG_DEBUG, getmypid() .': adding '. $vcard_id, $CARDDAV_LOG, $FIFO );
+			$vcard = $carddav_conn->get_vcard($vcard_id . '.vcf');
+			gs_vcard_update( $vcr, $vchead[$i], $vcard );
 		}
-		
-		echo '</tr>', "\n";
 	}
+
+	// delete no more existing recs
+	foreach ($unseen as $vcard_id => $value) {
+		$vc_del += 1;
+		gs_log(GS_LOG_DEBUG, getmypid() .': deleting '. $vcard_id, $CARDDAV_LOG, $FIFO );
+		$DB->execute('DELETE FROM `pb_prv_category` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_prv` WHERE `user_id`=' . $USER_ID . ' and `card_id`=' . $value['id']);
+		$DB->execute('DELETE FROM `pb_cloud_card` WHERE `id`=' . $value['id']);
+	}
+
+	// clean up categories
+	$rs2 = $DB->execute(  'DELETE c FROM `pb_category` AS c ' . 
+				 ' LEFT JOIN `pb_prv_category` AS p ' .
+					' ON  c.id = p.cat_id ' . 
+				     ' WHERE  c.user_id = ' . $USER_ID .
+				       ' AND  p.id IS NULL'
+				);
+	$CLOUD_MSG = $vc_seen . ' seen, ' . $vc_mod . ' modified, ' . $vc_add . ' added, ' . $vc_del . ' deleted';
+	gs_log(GS_LOG_DEBUG, getmypid() . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+
+	return true;
 }
 
-?>
+$DB = gs_db_master_connect();
 
 
-<tr>
-<?php
-if ($edit_entry < 1) {
-?>
-	<td>
-		<input type="text" name="slname" value="" size="15" maxlength="40" style="width:125px;" /><input type="text" name="sfname" value="" size="15" maxlength="40" style="width:115px;" />
-	</td>
-	<td>
-		<input type="text" name="snumber" value="" size="15" maxlength="25" style="width:150px;" />
-	</td>
-	<td>
-		<input type="text" name="sptype" value="" size="15" maxlength="16" style="width:130px;" />
-	</td>
-	<td>
-		<button type="submit" title="<?php echo __('Eintrag speichern'); ?>" class="plain">
-			<img alt="<?php echo __('Speichern'); ?>" src="<?php echo GS_URL_PATH; ?>crystal-svg/16/act/filesave.png" />
-		</button>
-		<?php /*echo '<a href="', gs_url($SECTION, $MODULE, null, 'page='.$page), '" title="abbrechen"><img alt="abbrechen" src="', GS_URL_PATH, 'crystal-svg/16/act/cancel.png" /></a>';*/ ?>
-	</td>
-<?php
-}
-?>
-</tr>
+// remain in loop, doing a record time by time (avoid race cond in dup exec)
+while ( true ) {
+	$CLOUD_MSG = '';
+	$vcrc = @ $DB->execute(
+		'SELECT
+		`id`, `user_id`, `url`, `login`, cast(des_decrypt(`pass`,`login`) as char(16)) as pass, `frequency`, `ctag`, 
+		`last_remote_modified`, `modified`, `error_count`, `public`
+		FROM `pb_cloud` 
+		WHERE `next_poll` < NOW() AND `active`=1 ORDER BY `next_poll`
+		LIMIT 1'
+		);
+	if ( $vcr = $vcrc->fetchRow() ) {
+		$usrc = $DB->execute('SELECT `user` FROM `users` WHERE `id`=' . $vcr['user_id'] . ' LIMIT 1');
+		$urc =  $usrc->fetchRow();
+		$sudo_user = $urc['user'];
+		gs_log(GS_LOG_NOTICE, getmypid() .': Checking vCards for ' . $sudo_user . ': '. $vcr['login'] . ': ' .  $vcr['url'], $CARDDAV_LOG, $FIFO );
+
+	} else break; // the loop, nothing to be done anymore
+	
+
+	// update next check immediately to avoid concurrent execs in timeout situations
+	$hdm2text = array(
+		'h' => 'hour',
+		'd' => 'day', 
+		'm' => 'month' 
+	);
+	$period = substr($vcr['frequency'], -1);
+	$freq = substr($vcr['frequency'], 0, -1);
+	if ( $freq > 1 ) $more = 's'; 
+	else $more = '';
+
+	$next_poll = date_format(date_add( date_create(), DateInterval::createFromDateString("$freq $hdm2text[$period]" . "$more") ), "Y-m-d H:i:s");
+
+	$DB->execute('UPDATE `pb_cloud` SET `next_poll`=\'' . $next_poll . '\', `message`=\'Update in progress...\' WHERE `id`=' . $vcr['id']);
 
-</tbody>
-</table>
+	// if its a public record we are goig to write for user_id = 0 (which should(!) not exist)
+	if ( $vcr['public'] ) $USER_ID = 1;
+	else $USER_ID = $vcr['user_id'];
 
-</form>
-<br>
-<p class="text"><sup>[1]</sup> is only shown for cloud records. You can loose local changes on a cloud record with a refresh,<br>
- &nbsp; &nbsp; &nbsp;  rather modify/delete this entry within your cloud. Public entries can not be edited here.</p>
-<p class="text"><sup>[2]</sup> Type of phone number: cell/work/home etc.</p>
+	$unset_active='';
+
+	if ( gs_user_vcards_update( $vcr )  === true ) {
+
+		// all went ok
+		gs_log(GS_LOG_NOTICE, getmypid() .': Check vCards completed normal for ' . $sudo_user . '.', $CARDDAV_LOG, $FIFO );
+		$CLOUD_MSG     = 'OK - ' . $CLOUD_MSG;
+		$error_counter = ', `error_count`=0 ';
+
+	} else {
+
+		// any failure
+		$error_counter=', `error_count`=`error_count`+1 ';
+		$CLOUD_MSG = getmypid() . ': ';
+		if ( $vcr['error_count'] = 4 ) {
+			// deactivate record
+			$unset_active = ', `active`=0 ';
+			$CLOUD_MSG .= 'Set inactive. ';
+		};
+		$CLOUD_MSG .= 'Check vCards failed for ' . $vcr['login'] . ': ' . $vcr['url'];
+		gs_log(GS_LOG_WARNING, $sudo_user . ': ' . $CLOUD_MSG, $CARDDAV_LOG, $FIFO );
+		// increment error counter
+	}
+
+	// inform on user display
+	$DB->execute('UPDATE `pb_cloud` SET `message` = CONCAT_WS(\' \', ' .
+				'\'' . $CLOUD_MSG . '\',\', last check: \', `modified` ) ' .
+				$error_counter . $unset_active .
+                     ' WHERE `id` = ' . $vcr['id']);
+}
+
+?>

From 4b8bae3c8db5e5424fe4fbf14f484bc72a8cad65 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 15 Feb 2016 09:08:30 +0100
Subject: [PATCH 86/87] Update gs-carddav-reader-to-db

---
 opt/gemeinschaft/sbin/gs-carddav-reader-to-db | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
index 28a1d820b..4abc25c88 100644
--- a/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
+++ b/opt/gemeinschaft/sbin/gs-carddav-reader-to-db
@@ -149,10 +149,10 @@ function gs_vcard_update( $vcr, $head, $vcard, $lvc=array() ) {
 				$k2 = explode('=', strtoupper( $param ));
 				$k2[1] = str_replace('"', '', $k2[1]);
 				if ( 'TYPE' == $k2[0] ) {
-					if ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
-					if ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
-					else $n[$number]['type'] .= strtolower( $k2[1] ) . ',';
 					if ( strpos($k2[1], 'PREF' ) !== false ) $n[$number]['pref'] = 1;
+					elseif ( $k2[1] == 'MAIN' ) $n[$number]['pref'] = 1;
+					elseif ( $k2[1] == 'PREF' ) $n[$number]['pref'] = 1;
+					$n[$number]['type'] .= strtolower( $k2[1] ) . ',';
 				}
 				elseif ( 'PREF' == $k2[0] ) $n[$number]['pref'] = (int)$k2[1];
 			}

From a7dd1c2287aae070280d9f8933729d581d1ec142 Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Mon, 27 Jun 2016 11:01:33 +0200
Subject: [PATCH 87/87] fixed for ansering external calls

---
 opt/gemeinschaft/dialplan-scripts/in-user-get-fw.agi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/opt/gemeinschaft/dialplan-scripts/in-user-get-fw.agi b/opt/gemeinschaft/dialplan-scripts/in-user-get-fw.agi
index 74b4bfb79..b06d5f6fe 100755
--- a/opt/gemeinschaft/dialplan-scripts/in-user-get-fw.agi
+++ b/opt/gemeinschaft/dialplan-scripts/in-user-get-fw.agi
@@ -147,6 +147,9 @@ foreach ($forwards as $source => $arr) {
 		
 		gs_agi_set_variable( '__fw_'.$source.'_'.$case, $fw['number'] );
 		
+		/* STD/MN Variable not set, so no content will be played - WORKAROUND */
+                if ($fw['file'] === '') $fw['file']=$fw['number'].'-external.alaw';
+		
 		gs_agi_set_variable( '__fw_file_'.$source.'_'.$case, '/opt/gemeinschaft/vm-rec/'.$fw['file'] );
 		
 		if (is_array($fw['number'])) {  # this is an array if we are forwarding to parallel-call
@@ -197,4 +200,4 @@ foreach ($msgs as $src => $file) {
 
 
 
-?>
\ No newline at end of file
+?>