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

some more resolved dependencies

Browse Source
This commit is contained in:
Ralf Becker 2016-03-06 20:56:09 +00:00
parent f116751110
commit 3742ecec05
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Contacts/Ldap.php
View File

@ -16,9 +16,6 @@ namespace EGroupware\Api\Contacts;
use EGroupware\Api;
// explicitly reference classes still in phpgwapi
use common; // randomstring
/**
* LDAP Backend for contacts, compatible with vars and parameters of eTemplate's so_sql.
* Maybe one day this becomes a generalized ldap storage object :-)
@ -514,7 +511,7 @@ class Ldap
if(empty($contactUID))
{
$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5(common::randomstring(15));
$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5(Api\Auth::randomstring(15));
}
//error_log(__METHOD__."() contactUID='$contactUID', isUpdate=".array2string($isUpdate).", oldContactInfo=".array2string($oldContactInfo));
// add for all supported objectclasses the objectclass and it's attributes

10
api/src/Storage/Tracking.php
View File

@ -17,7 +17,6 @@ use EGroupware\Api;
// explicitly reference classes still in phpgwapi
use egw_link;
use historylog;
use html;
/**
@ -139,12 +138,11 @@ abstract class Tracking
var $errors = array();
/**
* instance of the historylog object for the app we are tracking
* Instance of the History object for the app we are tracking
*
* @access private
* @var historylog
* @var History
*/
var $historylog;
protected $historylog;
/**
* Current user, can be set via bo_tracking::track(,,$user)
@ -403,7 +401,7 @@ abstract class Tracking
if (!is_object($this->historylog) || $this->historylog->user != $this->user)
{
$this->historylog = new historylog($this->app,$this->user);
$this->historylog = new History($this->app, $this->user);
}
// log user-agent and session-action
if ($GLOBALS['egw_info']['server']['log_user_agent_action'] && ($changed_fields || !$old))