holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addr_id function moved to importexport_basic_import_csv so it can be used for all apps

Browse Source
This commit is contained in:
Nathan Gray 2014-06-16 20:08:17 +00:00
parent 5dc1ad5e04
commit 52c9a86704
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -237,7 +237,7 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
if ($record['addressbook'] && !is_numeric($record['addressbook'])) if ($record['addressbook'] && !is_numeric($record['addressbook']))
{ {
list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']); list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name); $record['addressbook'] = importexport_basic_import_csv::addr_id($lastname,$firstname,$org_name);
} }
if ($record['projectmanager'] && !is_numeric($record['projectmanager'])) if ($record['projectmanager'] && !is_numeric($record['projectmanager']))
{ {
@ -501,45 +501,6 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
// end of iface_export_plugin // end of iface_export_plugin
// Extra conversion functions - must be static // Extra conversion functions - must be static
public static function addr_id( $n_family,$n_given=null,$org_name=null ) {
// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
static $contacts;
if (is_null($n_given) && is_null($org_name))
{
// Maybe all in one
list($n_family, $n_given, $org_name) = explode(',', $n_family);
}
$n_family = trim($n_family);
if(!is_null($n_given)) $n_given = trim($n_given);
if (!is_object($contacts))
{
$contacts =& CreateObject('phpgwapi.contacts');
}
if (!is_null($org_name)) // org_name given?
{
$org_name = trim($org_name);
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
if (!count($addrs))
{
$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
}
}
if (!is_null($n_given) && (is_null($org_name) || !count($addrs))) // first name given and no result so far
{
$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
}
if (is_null($n_given) && is_null($org_name)) // just one name given, check against fn (= full name)
{
$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
}
if (count($addrs))
{
return $addrs[0]['id'];
}
return False;
}
public static function project_id($num_or_title) public static function project_id($num_or_title)
{ {
static $boprojects; static $boprojects;

4
infolog/inc/class.infolog_wizard_import_infologs_csv.inc.php
View File

@ -3,10 +3,10 @@
* eGroupWare - Wizard for Infolog CSV import * eGroupWare - Wizard for Infolog CSV import
* *
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package addressbook * @package infolog
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Nathan Gray * @author Nathan Gray
* @version $Id: $ * @version $Id$
*/ */
class infolog_wizard_import_infologs_csv extends importexport_wizard_basic_import_csv class infolog_wizard_import_infologs_csv extends importexport_wizard_basic_import_csv