R55471 - in /trunk/egroupware/api: js/etemplate/ src/ src/Accounts/ src/Contacts/ src/Db/ src/Etemplate/Widget/ src/Html/ sr

ralfbecker_sf 2016-03-21 21:21:40 UTC #1

Author: ralfbecker
New Revision: 55471

URL: http://svn.stylite.de/viewvc/egroupware?rev=55471&view=rev
Log:
fixed more namespace issues found by doc/check_namespace.php I wrote and forgot about it

Modified:
trunk/egroupware/api/js/etemplate/et2_core_widget.js
trunk/egroupware/api/src/Accounts/Ads.php
trunk/egroupware/api/src/Accounts/Ldap.php
trunk/egroupware/api/src/Contacts/Ads.php
trunk/egroupware/api/src/Contacts/Storage.php
trunk/egroupware/api/src/Contacts/Univention.php
trunk/egroupware/api/src/DateTime.php
trunk/egroupware/api/src/Db.php
trunk/egroupware/api/src/Db/Backup.php
trunk/egroupware/api/src/Db/Deprecated.php
trunk/egroupware/api/src/Etemplate/Widget/Contact.php
trunk/egroupware/api/src/Etemplate/Widget/Customfields.php
trunk/egroupware/api/src/Html.php
trunk/egroupware/api/src/Html/HtmLawed.php
trunk/egroupware/api/src/Link.php
trunk/egroupware/api/src/Storage/Base.php
trunk/egroupware/api/src/Vfs/Sqlfs/Utils.php

Modified: trunk/egroupware/api/js/etemplate/et2_core_widget.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_core_widget.js?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/js/etemplate/et2_core_widget.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_core_widget.js Mon Mar 21 22:21:40 2016
@@ -74,6 +74,11 @@
_attrs = {};
}

if (typeof _attrs != “object”)
{
```
  _attrs = {};
```
}
if (typeof _parent == “undefined”)
{
_parent = null;

Modified: trunk/egroupware/api/src/Accounts/Ads.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Accounts/Ads.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Accounts/Ads.php (original)
+++ trunk/egroupware/api/src/Accounts/Ads.php Mon Mar 21 22:21:40 2016
@@ -214,7 +214,7 @@
if ($set_if_empty && ($dn = $this->id2name(-self::DOMAIN_USERS_GROUP, ‘account_dn’)))
{
$dn = preg_replace(’/^CN=.*?,(CN|OU)=/i’, ‘$1=’, $dn);

  		config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');

  		Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
  	}
  	else
  	{

@@ -522,7 +522,7 @@
public function user_active(array $data)
{
$user = $this->_ldap2user($data);

  $active = accounts::is_active($user);

  $active = Api\Accounts::is_active($user);
  //error_log(__METHOD__."(cn={$data['cn'][0]}, useraccountcontrol={$data['useraccountcontrol'][0]}, accountexpires={$data['accountexpires'][0]}) user=".array2string($user)." returning ".array2string($active));
  return $active;

}
@@ -562,7 +562,7 @@
protected static function _when2ts($_when)
{
static $utc=null;

  if (!isset($utc)) $utc = new DateTimeZone('UTC');

  if (!isset($utc)) $utc = new \DateTimeZone('UTC');

  list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
  $datetime = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);

@@ -778,8 +778,8 @@
break;
case ‘account_lastpwd_change’:
// Samba4 does not understand -1 for current time, but Win2008r2 only allows to set -1 (beside 0)

  				// call auth_ads::setLastPwdChange with true to get correct modification for both

  				$ldap = array_merge($ldap, auth_ads::setLastPwdChange($data['account_lid'], null, $data[$egw], true));

  				// call Api\Auth\Ads::setLastPwdChange with true to get correct modification for both

  				$ldap = array_merge($ldap, Api\Auth\Ads::setLastPwdChange($data['account_lid'], null, $data[$egw], true));
  				break;
  			default:
  				$attributes[$adldap] = $data[$egw];

@@ -910,7 +910,7 @@
{
continue;
}

  			$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);

  			$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
  			$accounts[$account_id] = $account;
  		}
  	}

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

— trunk/egroupware/api/src/Accounts/Ldap.php (original)
+++ trunk/egroupware/api/src/Accounts/Ldap.php Mon Mar 21 22:21:40 2016
@@ -23,6 +23,7 @@

// explicitly reference classes still in phpgwapi or old structure
use common; // next_id
+use setup_cmd_ldap;

/**

LDAP Backend for accounts
@@ -595,7 +596,7 @@
{
if (preg_match(’/^[a-f0-9]{32}$/’, $data[‘account_passwd’])) // md5 --> ldap md5
{

  		$data['account_passwd'] = setup_cmd_Api\Ldap::hash_sql2ldap($data['account_passwd']);

  		$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
  	}
  	elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
  	{

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

— trunk/egroupware/api/src/Contacts/Ads.php (original)
+++ trunk/egroupware/api/src/Contacts/Ads.php Mon Mar 21 22:21:40 2016
@@ -158,7 +158,7 @@
// we cant use ldap::quote() for win2008r2 hex GUID, as it contains backslashes
if (!preg_match(’/^[0-9A-Fa-f-]+/’, $contact_id))
{

  	throw new egw_exception_assertion_failed("'$contact_id' is NOT a valid GUID!");

  	throw new Api\Exception\AssertionFailed("'$contact_id' is NOT a valid GUID!");
  }

  // samba4 can only search by string representation of objectGUID, while win2008r2 requires hex representation

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

— trunk/egroupware/api/src/Contacts/Storage.php (original)
+++ trunk/egroupware/api/src/Contacts/Storage.php Mon Mar 21 22:21:40 2016
@@ -909,7 +909,7 @@
$sql_contacts = new Sql();
// we need an admin connection
$ds = $GLOBALS[‘egw’]->ldap->ldapConnect();

  $ldap_contacts = new addressbook_ldap(null, $ds);

  $ldap_contacts = new Ldap(null, $ds);

  if (!is_array($type)) $type = explode(',', $type);

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

— trunk/egroupware/api/src/Contacts/Univention.php (original)
+++ trunk/egroupware/api/src/Contacts/Univention.php Mon Mar 21 22:21:40 2016
@@ -12,6 +12,8 @@

namespace EGroupware\Api\Contacts;

+use EGroupware\Api\Accounts;
+
/**

Univention backend for addressbook

@@ -22,7 +24,7 @@
function __construct($ldap_config = null, $ds = null)
{
$this->schema2egw[‘univentionmail’] = array(

  	'email'			=> accounts_univention::MAIL_ATTR,

  	'email'			=> Accounts\Univention::MAIL_ATTR,
  );
  parent::__construct($ldap_config, $ds);

}

Modified: trunk/egroupware/api/src/DateTime.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/DateTime.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/DateTime.php (original)
+++ trunk/egroupware/api/src/DateTime.php Mon Mar 21 22:21:40 2016
@@ -167,7 +167,7 @@
}
// fall through
default:

  		throw new egw_exception_assertion_failed("Not implemented for type ($type)$time!");

  		throw new Exception\AssertionFailed("Not implemented for type ($type)$time!");
  }

}

@@ -483,7 +483,6 @@
* @param string $tz timezone, eg. ‘Europe/Berlin’ or ‘UTC’
* @param string $dateformat =’’ eg. ‘Y-m-d’ or ‘d.m.Y’
* @param string|int $timeformat =’’ integer 12, 24, or format string eg. ‘H:i’

- @throws egw_exception_wrong_userinput if invalid $tz parameter
- @return DateTimeZone
  */
  public static function setUserPrefs($tz,$dateformat=’’,$timeformat=’’)
  @@ -508,7 +507,7 @@
  try {
  self::$user_timezone = new DateTimeZone($tz);
  }
```
  catch(Exception $e)
```

  catch(\Exception $e)
  {
  	unset($e);
  	// silently use server timezone, as we have no means to report the wrong timezone to the user from this class

Modified: trunk/egroupware/api/src/Db.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Db.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Db.php (original)
+++ trunk/egroupware/api/src/Db.php Mon Mar 21 22:21:40 2016
@@ -1562,7 +1562,7 @@
if ($this === $GLOBALS[‘egw’]->db && $app != self::API_APPNAME)
{
// prevent that anyone switches the global db object to an other app

  	throw new Api\Exception\WrongParameter('You are not allowed to call set_app for $GLOBALS[egw]->db or a refence to it, you have to clone it!');

  	throw new Exception\WrongParameter('You are not allowed to call set_app for $GLOBALS[egw]->db or a refence to it, you have to clone it!');
  }
  $this->app = $app;

}
@@ -1735,7 +1735,7 @@
$inputarr = false;
if (isset($data[0]) && is_array($data[0])) // multiple data rows
{

  	if ($where) throw new Api\Exception\WrongParameter('Can NOT use $where together with multiple data rows in $data!');

  	if ($where) throw new Exception\WrongParameter('Can NOT use $where together with multiple data rows in $data!');

  	$sql = "$cmd INTO $table ";
  	foreach($data as $k => $d)

Modified: trunk/egroupware/api/src/Db/Backup.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Db/Backup.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Db/Backup.php (original)
+++ trunk/egroupware/api/src/Db/Backup.php Mon Mar 21 22:21:40 2016
@@ -313,11 +313,11 @@
*/
function saveConfig($minCount,$backupFiles=null)
{

  Config::save_value('backup_mincount',$this->backup_mincount=(int)$minCount,'phpgwapi');

  Api\Config::save_value('backup_mincount',$this->backup_mincount=(int)$minCount,'phpgwapi');

  if (!is_null($backupFiles))
  {

  	Config::save_value('backup_files',$this->backup_files=(boolean)$backupFiles,'phpgwapi');

  	Api\Config::save_value('backup_files',$this->backup_files=(boolean)$backupFiles,'phpgwapi');
  }

}

@@ -426,7 +426,7 @@

	if ($convert_to_system_charset)	// store the changed charset
	{

  	$this->db->insert(Config::TABLE, array(

  	$this->db->insert(Api\Config::TABLE, array(
  		'config_value' => $this->schema_proc->system_charset,
  	),array(
  		'config_app' => 'phpgwapi',

@@ -918,7 +918,7 @@
{
$zippresent = true;
//echo ‘-> is_object($zip); ‘.$filename.’
’; // !

  		$res = $zip->open($filename, ZIPARCHIVE::CREATE);

  		$res = $zip->open($filename, ZipArchive::CREATE);
  		if($res !== TRUE)
  		{
  			//echo '   -> !$res<br>';	// !

Modified: trunk/egroupware/api/src/Db/Deprecated.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Db/Deprecated.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Db/Deprecated.php (original)
+++ trunk/egroupware/api/src/Db/Deprecated.php Mon Mar 21 22:21:40 2016
@@ -119,7 +119,7 @@
{
if (!$this->Query_ID)
{

  	throw new Exception\Db('next_record called with no query pending.');

  	throw new Exception('next_record called with no query pending.');
  }
  if ($this->Row)	// first row is already fetched
  {

@@ -174,7 +174,7 @@
{
if (!$this->Query_ID || !$this->Query_ID->Move($this->Row = $pos))
{

  	throw new Exception\Db("seek($pos) failed: resultset has " . $this->num_rows() . " rows");

  	throw new Exception("seek($pos) failed: resultset has " . $this->num_rows() . " rows");
  }
  return True;

}

Modified: trunk/egroupware/api/src/Etemplate/Widget/Contact.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Contact.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Contact.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Contact.php Mon Mar 21 22:21:40 2016
@@ -124,7 +124,7 @@
*/
public function get_contact_fields()
{

  ApiTranslation::add_app('addressbook');

  Api\Translation::add_app('addressbook');

  $this->contacts->__construct();
  $options = $this->contacts->contact_fields;

Modified: trunk/egroupware/api/src/Etemplate/Widget/Customfields.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Customfields.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Customfields.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Customfields.php Mon Mar 21 22:21:40 2016
@@ -130,10 +130,8 @@
}

	// if we are in the etemplate editor or the app has no cf's, load the cf's from the app the tpl belongs too

  if ($app && $app != 'stylite' && $app != $GLOBALS['egw_info']['flags']['currentapp'] && !isset($customfields) && (

  	$GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' || !$this->attrs['customfields'] ||

```
  	Etemplate::$hooked
```
```
  ) || !isset($customfields))
```

  if ($app && $app != 'stylite' && $app != $GLOBALS['egw_info']['flags']['currentapp'] && !isset($customfields) &&

  	($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' || !$this->attrs['customfields']) || !isset($customfields))
  {
  	// app changed
  	$customfields =& Api\Storage\Customfields::get($app);

Modified: trunk/egroupware/api/src/Html.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Html.php (original)
+++ trunk/egroupware/api/src/Html.php Mon Mar 21 22:21:40 2016
@@ -1133,7 +1133,7 @@
$html .= “\n”;
$html .= “var $tree;”;
$html .= “egw_LAB.wait(function() {”;

  $html .= "$tree = new dhtmlXTreeObject('$tree','100%','100%',0);\n";

  $html .= "$tree = new"." dhtmlXTreeObject('$tree','100%','100%',0);\n";
  $html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
  if (Translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
  $html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";

Modified: trunk/egroupware/api/src/Html/HtmLawed.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html/HtmLawed.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Html/HtmLawed.php (original)
+++ trunk/egroupware/api/src/Html/HtmLawed.php Mon Mar 21 22:21:40 2016
@@ -11,8 +11,12 @@
*/

namespace EGroupware\Api\Html;
+
use EGroupware\Api;
-use translation;
+
+// explicitly name old, not yet converted api classes
+use translation; // mail specific stuff not in Api\Translation
+use emailadmin_imapbase;

require_once(DIR.’/htmLawed/htmLawed.php’);

Modified: trunk/egroupware/api/src/Link.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Link.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Link.php (original)
+++ trunk/egroupware/api/src/Link.php Mon Mar 21 22:21:40 2016
@@ -791,7 +791,7 @@
else
{
// if there is no object or no method, give a more explaining error message

  	throw new egw_exception_assertion_failed("Object has no method '$reg[query]'!");

  	throw new Exception\AssertionFailed("Object has no method '$reg[query]'!");
  }

  if (!isset($options['total']))

@@ -1073,7 +1073,7 @@
}
else
{

  		throw new egw_exception_assertion_failed("Missing 'mime_id' or 'mime_url' for mime-type '$type'!");

  		throw new Exception\AssertionFailed("Missing 'mime_id' or 'mime_url' for mime-type '$type'!");
  	}
  	unset($data['mime_popup']);
  }

@@ -1473,10 +1473,10 @@
{
self::notify(‘update’,$link[‘app’],$link[‘id’],$app,$id,$link_id,$data);
}

  if($data[Link::OLD_LINK_TITLE] && Api\Json\Response::isJSONResponse())

  if($data[Link::OLD_LINK_TITLE] && Json\Response::isJSONResponse())
  {
  	// Update client side with new title

  	Api\Json\Response::get()->apply('egw.link_title_callback',array(array($app => array($id => self::title($app, $id)))));

  	Json\Response::get()->apply('egw.link_title_callback',array(array($app => array($id => self::title($app, $id)))));
  }

}

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

— trunk/egroupware/api/src/Storage/Base.php (original)
+++ trunk/egroupware/api/src/Storage/Base.php Mon Mar 21 22:21:40 2016
@@ -1089,7 +1089,7 @@
// ToDo: Implement that as an iterator, as $rs is also an interator and we could return one instead of an array
if ($this->search_return_iterator)
{

  	return new so_sql_db2data_iterator($this,$rs);

  	return new Db2DataIterator($this,$rs);
  }
  $arr = array();
  $n = 0;

Modified: trunk/egroupware/api/src/Vfs/Sqlfs/Utils.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs/Sqlfs/Utils.php?rev=55471&r1=55470&r2=55471&view=diff

— trunk/egroupware/api/src/Vfs/Sqlfs/Utils.php (original)
+++ trunk/egroupware/api/src/Vfs/Sqlfs/Utils.php Mon Mar 21 22:21:40 2016
@@ -43,8 +43,8 @@
$stmt->bindColumn(1,$fs_id);
$stmt->bindColumn(2,$fs_name);
$stmt->bindColumn(3,$fs_size);

  $stmt->bindColumn(4,$fs_content,PDO::PARAM_LOB);

  $stmt->bindValue(':offset', $n, PDO::PARAM_INT);

  $stmt->bindColumn(4,$fs_content,\PDO::PARAM_LOB);

  $stmt->bindValue(':offset', $n, \PDO::PARAM_INT);

  while ($stmt->execute())
  {

@@ -88,7 +88,7 @@
}
if (!$n) break; // just in case nothing is found, statement will execute just fine

  	$stmt->bindValue(':offset', $n, PDO::PARAM_INT);

  	$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
  }
  unset($row);	// not used, as we access bound variables
  unset($stmt);

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

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