Tracking.php

ralfbecker_sf 2016-03-06 20:56:10 UTC #1

Author: ralfbecker
New Revision: 55284

URL: http://svn.stylite.de/viewvc/egroupware?rev=55284&view=rev
Log:
some more resolved dependencies

Modified:
trunk/egroupware/api/src/Contacts/Ldap.php
trunk/egroupware/api/src/Storage/Tracking.php

Modified: trunk/egroupware/api/src/Contacts/Ldap.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Contacts/Ldap.php?rev=55284&r1=55283&r2=55284&view=diff

— trunk/egroupware/api/src/Contacts/Ldap.php (original)
+++ trunk/egroupware/api/src/Contacts/Ldap.php Sun Mar 6 21:56:09 2016
@@ -15,9 +15,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.
@@ -514,7 +511,7 @@
```
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

Modified: trunk/egroupware/api/src/Storage/Tracking.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Storage/Tracking.php?rev=55284&r1=55283&r2=55284&view=diff

— trunk/egroupware/api/src/Storage/Tracking.php (original)
+++ trunk/egroupware/api/src/Storage/Tracking.php Sun Mar 6 21:56:09 2016
@@ -17,7 +17,6 @@

// explicitly reference classes still in phpgwapi
use egw_link;
-use historylog;
use html;

/**
@@ -139,12 +138,11 @@
var $errors = array();

/**

- instance of the historylog object for the app we are tracking
- @access private
- @var historylog
*/
var $historylog;

- Instance of the History object for the app we are tracking
- @var History
*/
protected $historylog;

/**
- Current user, can be set via bo_tracking::track(,$user)
  @@ -403,7 +401,7 @@
  
  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))

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