class.egw_db.inc.php

ralfbecker_sf 2016-02-20 18:16:21 UTC #1

Author: ralfbecker
New Revision: 55085

URL: http://svn.stylite.de/viewvc/egroupware?rev=55085&view=rev
Log:
removing for some of our ADOdb patches

Modified:
trunk/egroupware/api/src/Vfs/Sqlfs/StreamWrapper.php
trunk/phpgwapi/inc/class.egw_db.inc.php

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

— trunk/egroupware/api/src/Vfs/Sqlfs/StreamWrapper.php (original)
+++ trunk/egroupware/api/src/Vfs/Sqlfs/StreamWrapper.php Sat Feb 20 19:16:21 2016
@@ -1685,6 +1685,16 @@
}
$pdo_available = true;
}

  // set client charset of the connection

```
  switch(self::$pdo_type)
```
```
  {
```
```
  	case 'mysql':
```
```
  		$dsn .= ';charset=utf8';
```
```
  		break;
```
```
  	case 'pgsql':
```
```
  		$query = "SET NAMES 'utf-8'";
```
```
  		break;
```

  }
  try {
  	self::$pdo = new \PDO($dsn,$egw_db->User,$egw_db->Password,array(
  		\PDO::ATTR_ERRMODE=>\PDO::ERRMODE_EXCEPTION,

@@ -1695,17 +1705,6 @@
unset($e);
// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
self::$pdo = new \PDO($dsn,$egw_db->User,’$egw_db->Password’);

```
  }
```

  // set client charset of the connection

```
  $charset = translation::charset();
```
```
  switch(self::$pdo_type)
```
```
  {
```
```
  	case 'mysql':
```

  		if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset];

```
  		// fall throught
```
```
  	case 'pgsql':
```
```
  		$query = "SET NAMES '$charset'";
```
```
  		break;
  }
  if ($query)
  {
```

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

— trunk/phpgwapi/inc/class.egw_db.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_db.inc.php Sat Feb 20 19:16:21 2016
@@ -7,7 +7,7 @@

@package api
@subpackage db
@author Ralf Becker <RalfBecker-AT-outdoor-training.de>

- @copyright © 2003-14 by Ralf Becker <RalfBecker-AT-outdoor-training.de>

- @copyright © 2003-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
- @version $Id$
  */

@@ -487,7 +487,16 @@
break;

			case 'mysqlt':

  			$php_extension = 'mysql';	// you can use $this->setupType to determine if it's mysqlt or mysql

```
  		case 'mysql':
```

  			// if mysqli is available silently switch to it, mysql extension is deprecated and no longer available in php7+

  			if (check_load_extension('mysqli'))

```
  			{
```

  				$php_extension = $Type = 'mysqli';

```
  			}
```
```
  			else
```
```
  			{
```

  				$php_extension = 'mysql';	// you can use $this->setupType to determine if it's mysqlt or mysql

  			}
  			// fall through
  		case 'mysqli':
  			$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!

@@ -521,6 +530,11 @@
{
throw new egw_exception_db_connection(“No ADOdb support for ‘$Type’ ($this->Type) !!!”);
}

```
  		if ($Type == 'mysqli')
```
```
  		{
```

  			// set a connection timeout of 1 second, to allow quicker failover to other db-nodes (default is 20s)

  			$this->Link_ID->setConnectionParameter(MYSQLI_OPT_CONNECT_TIMEOUT, 1);

  		}
  		$connect = $GLOBALS['egw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect';
  		if (($Ok = $this->Link_ID->$connect($Host, $User, $Password, $Database)))
  		{

@@ -549,7 +563,7 @@
ini_set(‘mssql.sizelimit’,2147483647);
}
// set our default charset

  		$this->Link_ID->SetCharSet('utf-8');

  		$this->Link_ID->SetCharSet($this->Type == 'mysql' ? 'utf8' : 'utf-8');

  		$new_connection = true;
  	}

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