3.2 upgrade for cloud vcards for 3.3 version

README.textile

@@ -1,3 +1,8 @@
+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.
+
 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

etc/cron.d/gs-carddav-reader-to-db

@@ -0,0 +1,6 @@
+# Gemeinschaft
+# $Revision$
+
+# refresh cloud card phone books into the database
+
+*/17 *  * * *   root   sleep 23; nice -n 15 /opt/gemeinschaft/sbin/gs-carddav-reader.php 1>>/dev/null 2>>/dev/null

misc/scripts/upgrade-pb-3.2-3.3.sql

@@ -0,0 +1,112 @@
+// 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` (
+  `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',
+  `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_vcard` (`user_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;
+
+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` (
+  `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,
+  `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 ;
+
+// 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;
+
+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` (
+  `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;
+
+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,
+  `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 `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` VALUES (6, 3005);
+// needed dependency for public cloud entries
+INSERT INTO `users` VALUES ('1', 'public-abook', '', '', '', '', '', '1', '1', NULL, '', NULL, NULL, NULL, '');

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`,
 
 
 
-?>
+?>

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 . ' 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) . '\'';
 
@@ -49,22 +49,27 @@ 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;
 		}
 	}
 
 	//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);

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) {
 
 
 
-?>
+?>

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 `title` 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();