extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Db errors with PHP 7.4+

Browse Source 
caused by private $this->app not stored in session when Db\Depricated was instaciated
also move $GLOBALS[egw]->ADOdb to a static class var to fix session restore order caused $GLOBALS[egw] not yet restored giving a warning
This commit is contained in:
Ralf Becker 2021-03-21 17:39:03 +01:00
parent 70ebe8edbb
commit 49d9df43c2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/Db.php
View File

@ -152,9 +152,13 @@ class Db
/** /**
* ADOdb connection * ADOdb connection
* *
* @var ADOConnection * @var boolean
*/ */
var $privat_Link_ID = False; // do we use a privat Link_ID or a reference to the global ADOdb object var $privat_Link_ID = False; // do we use a privat Link_ID or a reference to the global ADOdb object
/**
* Global ADOdb connection
*/
static public $ADOdb = null;
/** /**
* Can be used to transparently convert tablenames, eg. 'mytable' => 'otherdb.othertable' * Can be used to transparently convert tablenames, eg. 'mytable' => 'otherdb.othertable'
@ -493,7 +497,7 @@ class Db
if ($Port) $Host .= ':'.$Port; if ($Port) $Host .= ':'.$Port;
break; break;
} }
if (!isset($GLOBALS['egw']->ADOdb) || // we have no connection so far if (!isset(self::$ADOdb) || // we have no connection so far
(is_object($GLOBALS['egw']->db) && // we connect to a different db, then the global one (is_object($GLOBALS['egw']->db) && // we connect to a different db, then the global one
($this->Type != $GLOBALS['egw']->db->Type || ($this->Type != $GLOBALS['egw']->db->Type ||
$this->Database != $GLOBALS['egw']->db->Database || $this->Database != $GLOBALS['egw']->db->Database ||
@ -505,15 +509,15 @@ class Db
{ {
throw new Db\Exception\Connection("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!"); throw new Db\Exception\Connection("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
} }
if (!isset($GLOBALS['egw']->ADOdb)) // use the global object to store the connection $this->Link_ID = ADONewConnection($Type);
if (!isset(self::$ADOdb)) // use the global object to store the connection
{ {
$this->Link_ID =& $GLOBALS['egw']->ADOdb; self::$ADOdb = $this->Link_ID;
} }
else else
{ {
$this->privat_Link_ID = True; // remember that we use a privat Link_ID for disconnect $this->privat_Link_ID = True; // remember that we use a privat Link_ID for disconnect
} }
$this->Link_ID = ADONewConnection($Type);
if (!$this->Link_ID) if (!$this->Link_ID)
{ {
throw new Db\Exception\Connection("No ADOdb support for '$Type' ($this->Type) !!!"); throw new Db\Exception\Connection("No ADOdb support for '$Type' ($this->Type) !!!");
@ -547,7 +551,7 @@ class Db
if ($this->Debug) if ($this->Debug)
{ {
echo function_backtrace(); echo function_backtrace();
echo "<p>new ADOdb connection to $Type://$Host/$Database: Link_ID".($this->Link_ID === $GLOBALS['egw']->ADOdb ? '===' : '!==')."\$GLOBALS[egw]->ADOdb</p>"; echo "<p>new ADOdb connection to $Type://$Host/$Database: Link_ID".($this->Link_ID === self::$ADOdb ? '===' : '!==')."self::\$ADOdb</p>";
//echo "<p>".print_r($this->Link_ID->ServerInfo(),true)."</p>\n"; //echo "<p>".print_r($this->Link_ID->ServerInfo(),true)."</p>\n";
_debug_array($this); _debug_array($this);
echo "\$GLOBALS[egw]->db="; _debug_array($GLOBALS[egw]->db); echo "\$GLOBALS[egw]->db="; _debug_array($GLOBALS[egw]->db);
@ -567,7 +571,7 @@ class Db
} }
else else
{ {
$this->Link_ID =& $GLOBALS['egw']->ADOdb; $this->Link_ID = self::ADOdb;
} }
} }
if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect()) if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect())
@ -671,7 +675,7 @@ class Db
{ {
if (!$this->privat_Link_ID) if (!$this->privat_Link_ID)
{ {
unset($GLOBALS['egw']->ADOdb); self::$ADOdb = null;
} }
unset($this->Link_ID); unset($this->Link_ID);
$this->Link_ID = 0; $this->Link_ID = 0;
@ -1672,7 +1676,7 @@ class Db
* *
* @var string * @var string
*/ */
private $app=self::API_APPNAME; protected $app=self::API_APPNAME;
/** /**
* Sets the application in which the db-class looks for table-defintions * Sets the application in which the db-class looks for table-defintions

2
api/tests/Db/SchemaTest.php
View File

@ -64,7 +64,7 @@ class SchemaTest extends LoggedInTest {
parent::setUpBeforeClass(); parent::setUpBeforeClass();
// now we should have a valid db-connection // now we should have a valid db-connection
self::$adodb = $GLOBALS['egw']->ADOdb; self::$adodb = $GLOBALS['egw']->db->Link_ID;
self::$db = $GLOBALS['egw']->db; self::$db = $GLOBALS['egw']->db;
// Show lots of debug // Show lots of debug