R55109 - /trunk/phpgwapi/inc/class.accounts_sql.inc.php

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55109

URL: http://svn.stylite.de/viewvc/egroupware?rev=55109&view=rev
Log:
no longer use old contacts class via egw object, but addressbook_bo directly, fixes diverse warnings caused by old class

Modified:
trunk/phpgwapi/inc/class.accounts_sql.inc.php

Modified: trunk/phpgwapi/inc/class.accounts_sql.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.accounts_sql.inc.php?rev=55109&r1=55108&r2=55109&view=diff

— trunk/phpgwapi/inc/class.accounts_sql.inc.php (original)
+++ trunk/phpgwapi/inc/class.accounts_sql.inc.php Mon Feb 22 18:30:20 2016
@@ -74,6 +74,13 @@
private $frontend;

/**

• • Instance of contacts object / addressbook_bo, NOT automatic instanciated!
• • @var addressbook_bo
• */
• private $contacts;
• /**
  • does backend allow to change account_lid
    */
    const CHANGE_ACCOUNT_LID = true;
    @@ -280,7 +287,8 @@
    }
    if ($contact_id)
    {

•   	$GLOBALS['egw']->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
  

•   	if (!isset($this->contacts)) $this->contacts = new addressbook_bo();
  

•   	$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
    }
    return true;
  

  }
  @@ -449,6 +457,7 @@
  $members = array();
  foreach((array)$this->memberships($GLOBALS[‘egw_info’][‘user’][‘account_id’], true) as $grp => $name)
  {

•   			unset($name);
    			$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
    			if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
    		}
  

@@ -523,10 +532,10 @@
break;
}
}

•   if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!');
  

•   if (!isset($this->contacts)) $this->contacts = new addressbook_bo();
  
    $accounts = array();
  

•   foreach((array) $GLOBALS['egw']->contacts->search($criteria,
  

•   foreach((array) $this->contacts->search($criteria,
    	array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
    	$order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
    	$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
  

@@ -554,7 +563,7 @@
);
}
}

•   $this->total = $GLOBALS['egw']->contacts->total;
  

•   $this->total = $this->contacts->total;
    //error_log(__METHOD__."(".array2string($param).") returning ".count($accounts).'/'.$this->total);
    return $accounts;
  

  }

---

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs