githubFork/roundcubemail.git

			@@ -45,7 +45,6 @@
			private $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'nickname',
			'jobtitle', 'organization', 'department', 'maidenname', 'email', 'phone',
			'address', 'street', 'locality', 'zipcode', 'region', 'country', 'website', 'im', 'notes');
			protected $date_types = array('birthday', 'anniversary');

			// public properties
			public $primary_key = 'contact_id';
			@@ -61,6 +60,7 @@
			'jobtitle', 'organization', 'department', 'assistant', 'manager',
			'gender', 'maidenname', 'spouse', 'email', 'phone', 'address',
			'birthday', 'anniversary', 'website', 'im', 'notes', 'photo');
			public $date_cols = array('birthday', 'anniversary');

			const SEPARATOR = ',';

			@@ -137,23 +137,39 @@
			* List all active contact groups of this source
			*
			* @param string Search string to match group name
			* @param int Matching mode:
			* 0 - partial (abc),
			* 1 - strict (=),
			* 2 - prefix (abc*)
			*
			* @return array Indexed list of contact groups, each a hash array
			*/
			function list_groups($search = null)
			function list_groups($search = null, $mode = 0)
			{
			$results = array();

			if (!$this->groups)
			return $results;

			$sql_filter = $search ? " AND " . $this->db->ilike('name', '%'.$search.'%') : '';
			if ($search) {
			switch (intval($mode)) {
			case 1:
			$sql_filter = $this->db->ilike('name', $search);
			break;
			case 2:
			$sql_filter = $this->db->ilike('name', $search . '%');
			break;
			default:
			$sql_filter = $this->db->ilike('name', '%' . $search . '%');
			}

			$sql_filter = " AND $sql_filter";
			}

			$sql_result = $this->db->query(
			"SELECT * FROM ".$this->db->table_name($this->db_groups).
			" WHERE del<>1".
			" AND user_id=?".
			$sql_filter.
			" ORDER BY name",
			"SELECT * FROM " . $this->db->table_name($this->db_groups, true)
			. " WHERE `del` <> 1 AND `user_id` = ?" . $sql_filter
			. " ORDER BY `name`",
			$this->user_id);

			while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
			@@ -174,10 +190,8 @@
			function get_group($group_id)
			{
			$sql_result = $this->db->query(
			"SELECT * FROM ".$this->db->table_name($this->db_groups).
			" WHERE del<>1".
			" AND contactgroup_id=?".
			" AND user_id=?",
			"SELECT * FROM " . $this->db->table_name($this->db_groups, true)
			. " WHERE `del` <> 1 AND `contactgroup_id` = ? AND `user_id` = ?",
			$group_id, $this->user_id);

			if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
			@@ -210,25 +224,25 @@
			$length = $subset != 0 ? abs($subset) : $this->page_size;

			if ($this->group_id)
			$join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
			" ON (m.contact_id = c.".$this->primary_key.")";
			$join = " LEFT JOIN " . $this->db->table_name($this->db_groupmembers, true) . " AS m".
			" ON (m.`contact_id` = c.`".$this->primary_key."`)";

			$order_col = (in_array($this->sort_col, $this->table_cols) ? $this->sort_col : 'name');
			$order_cols = array('c.'.$order_col);
			$order_cols = array("c.`$order_col`");
			if ($order_col == 'firstname')
			$order_cols[] = 'c.surname';
			$order_cols[] = 'c.`surname`';
			else if ($order_col == 'surname')
			$order_cols[] = 'c.firstname';
			$order_cols[] = 'c.`firstname`';
			if ($order_col != 'name')
			$order_cols[] = 'c.name';
			$order_cols[] = 'c.email';
			$order_cols[] = 'c.`name`';
			$order_cols[] = 'c.`email`';

			$sql_result = $this->db->limitquery(
			"SELECT * FROM ".$this->db->table_name($this->db_name)." AS c" .
			"SELECT * FROM " . $this->db->table_name($this->db_name, true) . " AS c" .
			$join .
			" WHERE c.del<>1" .
			" AND c.user_id=?" .
			($this->group_id ? " AND m.contactgroup_id=?" : "").
			" WHERE c.`del` <> 1" .
			" AND c.`user_id` = ?" .
			($this->group_id ? " AND m.`contactgroup_id` = ?" : "").
			($this->filter ? " AND (".$this->filter.")" : "") .
			" ORDER BY ". $this->db->concat($order_cols) .
			" " . $this->sort_order,
			@@ -246,7 +260,7 @@
			if ($read_vcard)
			$sql_arr = $this->convert_db_data($sql_arr);
			else {
			$sql_arr['email'] = explode(self::SEPARATOR, $sql_arr['email']);
			$sql_arr['email'] = $sql_arr['email'] ? explode(self::SEPARATOR, $sql_arr['email']) : array();
			$sql_arr['email'] = array_map('trim', $sql_arr['email']);
			}

			@@ -332,7 +346,7 @@
			if (in_array($col, $this->table_cols)) {
			switch ($mode) {
			case 1: // strict
			$where[] = '(' . $this->db->quoteIdentifier($col) . ' = ' . $this->db->quote($val)
			$where[] = '(' . $this->db->quote_identifier($col) . ' = ' . $this->db->quote($val)
			. ' OR ' . $this->db->ilike($col, $val . $AS . '%')
			. ' OR ' . $this->db->ilike($col, '%' . $AS . $val . $AS . '%')
			. ' OR ' . $this->db->ilike($col, '%' . $AS . $val) . ')';
			@@ -372,7 +386,7 @@
			}

			foreach (array_intersect($required, $this->table_cols) as $col) {
			$and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote('');
			$and_where[] = $this->db->quote_identifier($col).' <> '.$this->db->quote('');
			}

			if (!empty($where)) {
			@@ -424,7 +438,7 @@

			// build WHERE clause
			$ids = $this->db->array2list($ids, 'integer');
			$where = 'c.' . $this->primary_key.' IN ('.$ids.')';
			$where = 'c.`' . $this->primary_key.'` IN ('.$ids.')';
			// reset counter
			unset($this->cache['count']);

			@@ -468,17 +482,17 @@
			private function _count()
			{
			if ($this->group_id)
			$join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
			" ON (m.contact_id=c.".$this->primary_key.")";
			$join = " LEFT JOIN " . $this->db->table_name($this->db_groupmembers, true) . " AS m".
			" ON (m.`contact_id` = c.`".$this->primary_key."`)";

			// count contacts for this user
			$sql_result = $this->db->query(
			"SELECT COUNT(c.contact_id) AS rows".
			" FROM ".$this->db->table_name($this->db_name)." AS c".
			"SELECT COUNT(c.`contact_id`) AS rows".
			" FROM " . $this->db->table_name($this->db_name, true) . " AS c".
			$join.
			" WHERE c.del<>1".
			" AND c.user_id=?".
			($this->group_id ? " AND m.contactgroup_id=?" : "").
			" WHERE c.`del` <> 1".
			" AND c.`user_id` = ?".
			($this->group_id ? " AND m.`contactgroup_id` = ?" : "").
			($this->filter ? " AND (".$this->filter.")" : ""),
			$this->user_id,
			$this->group_id
			@@ -516,10 +530,10 @@
			return $assoc ? $first : $this->result;

			$this->db->query(
			"SELECT * FROM ".$this->db->table_name($this->db_name).
			" WHERE contact_id=?".
			" AND user_id=?".
			" AND del<>1",
			"SELECT * FROM " . $this->db->table_name($this->db_name, true).
			" WHERE `contact_id` = ?".
			" AND `user_id` = ?".
			" AND `del` <> 1",
			$id,
			$this->user_id
			);
			@@ -548,9 +562,11 @@
			return $results;

			$sql_result = $this->db->query(
			"SELECT cgm.contactgroup_id, cg.name FROM " . $this->db->table_name($this->db_groupmembers) . " AS cgm" .
			" LEFT JOIN " . $this->db->table_name($this->db_groups) . " AS cg ON (cgm.contactgroup_id = cg.contactgroup_id AND cg.del<>1)" .
			" WHERE cgm.contact_id=?",
			"SELECT cgm.`contactgroup_id`, cg.`name` "
			. " FROM " . $this->db->table_name($this->db_groupmembers, true) . " AS cgm"
			. " LEFT JOIN " . $this->db->table_name($this->db_groups, true) . " AS cg"
			. " ON (cgm.`contactgroup_id` = cg.`contactgroup_id` AND cg.`del` <> 1)"
			. " WHERE cgm.`contact_id` = ?",
			$id
			);
			while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
			@@ -574,8 +590,8 @@
			// validate e-mail addresses
			$valid = parent::validate($save_data, $autofix);

			// require at least one e-mail address (syntax check is already done)
			if ($valid && !array_filter($this->get_col_values('email', $save_data, true))) {
			// require at least one email address or a name
			if ($valid && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name']) && !array_filter($this->get_col_values('email', $save_data, true))) {
			$this->set_error(self::ERROR_VALIDATE, 'noemailwarning');
			$valid = false;
			}
			@@ -608,27 +624,23 @@
			}
			}

			$save_data = $this->convert_save_data($save_data);
			$save_data = $this->convert_save_data($save_data);
			$a_insert_cols = $a_insert_values = array();

			foreach ($save_data as $col => $value) {
			$a_insert_cols[] = $this->db->quoteIdentifier($col);
			$a_insert_cols[] = $this->db->quote_identifier($col);
			$a_insert_values[] = $this->db->quote($value);
			}

			if (!$existing->count && !empty($a_insert_cols)) {
			$this->db->query(
			"INSERT INTO ".$this->db->table_name($this->db_name).
			" (user_id, changed, del, ".join(', ', $a_insert_cols).")".
			"INSERT INTO " . $this->db->table_name($this->db_name, true).
			" (`user_id`, `changed`, `del`, ".join(', ', $a_insert_cols).")".
			" VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
			);

			$insert_id = $this->db->insert_id($this->db_name);
			}

			// also add the newly created contact to the active group
			if ($insert_id && $this->group_id)
			$this->add_to_group($this->group_id, $insert_id);

			$this->cache = null;

			@@ -641,26 +653,27 @@
			*
			* @param mixed Record identifier
			* @param array Assoziative array with save data
			*
			* @return boolean True on success, False on error
			*/
			function update($id, $save_cols)
			{
			$updated = false;
			$updated = false;
			$write_sql = array();
			$record = $this->get_record($id, true);
			$record = $this->get_record($id, true);
			$save_cols = $this->convert_save_data($save_cols, $record);

			foreach ($save_cols as $col => $value) {
			$write_sql[] = sprintf("%s=%s", $this->db->quoteIdentifier($col), $this->db->quote($value));
			$write_sql[] = sprintf("%s=%s", $this->db->quote_identifier($col), $this->db->quote($value));
			}

			if (!empty($write_sql)) {
			$this->db->query(
			"UPDATE ".$this->db->table_name($this->db_name).
			" SET changed=".$this->db->now().", ".join(', ', $write_sql).
			" WHERE contact_id=?".
			" AND user_id=?".
			" AND del<>1",
			"UPDATE " . $this->db->table_name($this->db_name, true).
			" SET `changed` = ".$this->db->now().", ".join(', ', $write_sql).
			" WHERE `contact_id` = ?".
			" AND `user_id` = ?".
			" AND `del` <> 1",
			$id,
			$this->user_id
			);
			@@ -669,7 +682,7 @@
			$this->result = null; // clear current result (from get_record())
			}

			return $updated;
			return $updated ? true : false;
			}


			@@ -704,6 +717,10 @@
			foreach ($save_data as $key => $values) {
			list($field, $section) = explode(':', $key);
			$fulltext = in_array($field, $this->fulltext_cols);
			// avoid casting DateTime objects to array
			if (is_object($values) && is_a($values, 'DateTime')) {
			$values = array(0 => $values);
			}
			foreach ((array)$values as $value) {
			if (isset($value))
			$vcard->set($field, $value, $section);
			@@ -752,10 +769,10 @@

			// flag record as deleted (always)
			$this->db->query(
			"UPDATE ".$this->db->table_name($this->db_name).
			" SET del=1, changed=".$this->db->now().
			" WHERE user_id=?".
			" AND contact_id IN ($ids)",
			"UPDATE " . $this->db->table_name($this->db_name, true).
			" SET `del` = 1, `changed` = ".$this->db->now().
			" WHERE `user_id` = ?".
			" AND `contact_id` IN ($ids)",
			$this->user_id
			);

			@@ -779,10 +796,10 @@

			// clear deleted flag
			$this->db->query(
			"UPDATE ".$this->db->table_name($this->db_name).
			" SET del=0, changed=".$this->db->now().
			" WHERE user_id=?".
			" AND contact_id IN ($ids)",
			"UPDATE " . $this->db->table_name($this->db_name, true).
			" SET `del` = 0, `changed` = ".$this->db->now().
			" WHERE `user_id` = ?".
			" AND `contact_id` IN ($ids)",
			$this->user_id
			);

			@@ -794,16 +811,32 @@

			/**
			* Remove all records from the database
			*
			* @param bool $with_groups Remove also groups
			*
			* @return int Number of removed records
			*/
			function delete_all()
			function delete_all($with_groups = false)
			{
			$this->cache = null;

			$this->db->query("UPDATE ".$this->db->table_name($this->db_name).
			" SET del=1, changed=".$this->db->now().
			" WHERE user_id = ?", $this->user_id);
			$now = $this->db->now();

			return $this->db->affected_rows();
			$this->db->query("UPDATE " . $this->db->table_name($this->db_name, true)
			. " SET `del` = 1, `changed` = $now"
			. " WHERE `user_id` = ?", $this->user_id);

			$count = $this->db->affected_rows();

			if ($with_groups) {
			$this->db->query("UPDATE " . $this->db->table_name($this->db_groups, true)
			. " SET `del` = 1, `changed` = $now"
			. " WHERE `user_id` = ?", $this->user_id);

			$count += $this->db->affected_rows();
			}

			return $count;
			}


			@@ -821,13 +854,14 @@
			$name = $this->unique_groupname($name);

			$this->db->query(
			"INSERT INTO ".$this->db->table_name($this->db_groups).
			" (user_id, changed, name)".
			"INSERT INTO " . $this->db->table_name($this->db_groups, true).
			" (`user_id`, `changed`, `name`)".
			" VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
			);

			if ($insert_id = $this->db->insert_id($this->db_groups))
			if ($insert_id = $this->db->insert_id($this->db_groups)) {
			$result = array('id' => $insert_id, 'name' => $name);
			}

			return $result;
			}
			@@ -842,11 +876,11 @@
			function delete_group($gid)
			{
			// flag group record as deleted
			$sql_result = $this->db->query(
			"UPDATE ".$this->db->table_name($this->db_groups).
			" SET del=1, changed=".$this->db->now().
			" WHERE contactgroup_id=?".
			" AND user_id=?",
			$this->db->query(
			"UPDATE " . $this->db->table_name($this->db_groups, true)
			. " SET `del` = 1, `changed` = " . $this->db->now()
			. " WHERE `contactgroup_id` = ?"
			. " AND `user_id` = ?",
			$gid, $this->user_id
			);

			@@ -854,7 +888,6 @@

			return $this->db->affected_rows();
			}


			/**
			* Rename a specific contact group
			@@ -869,10 +902,10 @@
			$name = $this->unique_groupname($newname);

			$sql_result = $this->db->query(
			"UPDATE ".$this->db->table_name($this->db_groups).
			" SET name=?, changed=".$this->db->now().
			" WHERE contactgroup_id=?".
			" AND user_id=?",
			"UPDATE " . $this->db->table_name($this->db_groups, true).
			" SET `name` = ?, `changed` = ".$this->db->now().
			" WHERE `contactgroup_id` = ?".
			" AND `user_id` = ?",
			$name, $gid, $this->user_id
			);

			@@ -883,9 +916,10 @@
			/**
			* Add the given contact records the a certain group
			*
			* @param string Group identifier
			* @param array List of contact identifiers to be added
			* @return int Number of contacts added
			* @param string Group identifier
			* @param array\|string List of contact identifiers to be added
			*
			* @return int Number of contacts added
			*/
			function add_to_group($group_id, $ids)
			{
			@@ -897,9 +931,9 @@

			// get existing assignments ...
			$sql_result = $this->db->query(
			"SELECT contact_id FROM ".$this->db->table_name($this->db_groupmembers).
			" WHERE contactgroup_id=?".
			" AND contact_id IN (".$this->db->array2list($ids, 'integer').")",
			"SELECT `contact_id` FROM " . $this->db->table_name($this->db_groupmembers, true).
			" WHERE `contactgroup_id` = ?".
			" AND `contact_id` IN (".$this->db->array2list($ids, 'integer').")",
			$group_id
			);
			while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
			@@ -910,8 +944,8 @@

			foreach ($ids as $contact_id) {
			$this->db->query(
			"INSERT INTO ".$this->db->table_name($this->db_groupmembers).
			" (contactgroup_id, contact_id, created)".
			"INSERT INTO " . $this->db->table_name($this->db_groupmembers, true).
			" (`contactgroup_id`, `contact_id`, `created`)".
			" VALUES (?, ?, ".$this->db->now().")",
			$group_id,
			$contact_id
			@@ -930,9 +964,10 @@
			/**
			* Remove the given contact records from a certain group
			*
			* @param string Group identifier
			* @param array List of contact identifiers to be removed
			* @return int Number of deleted group members
			* @param string Group identifier
			* @param array\|string List of contact identifiers to be removed
			*
			* @return int Number of deleted group members
			*/
			function remove_from_group($group_id, $ids)
			{
			@@ -942,9 +977,9 @@
			$ids = $this->db->array2list($ids, 'integer');

			$sql_result = $this->db->query(
			"DELETE FROM ".$this->db->table_name($this->db_groupmembers).
			" WHERE contactgroup_id=?".
			" AND contact_id IN ($ids)",
			"DELETE FROM " . $this->db->table_name($this->db_groupmembers, true).
			" WHERE `contactgroup_id` = ?".
			" AND `contact_id` IN ($ids)",
			$group_id
			);

			@@ -965,10 +1000,10 @@

			do {
			$sql_result = $this->db->query(
			"SELECT 1 FROM ".$this->db->table_name($this->db_groups).
			" WHERE del<>1".
			" AND user_id=?".
			" AND name=?",
			"SELECT 1 FROM " . $this->db->table_name($this->db_groups, true).
			" WHERE `del` <> 1".
			" AND `user_id` = ?".
			" AND `name` = ?",
			$this->user_id,
			$checkname);

			@@ -980,5 +1015,4 @@

			return $checkname;
			}

			}