Fixing issues found by Roly and me
This commit is contained in:
8
thirdparty/pear/DB.php
vendored
8
thirdparty/pear/DB.php
vendored
@@ -353,7 +353,7 @@ class DB
|
|||||||
* @see DB::parseDSN(), DB_common::setOption(), DB::isError()
|
* @see DB::parseDSN(), DB_common::setOption(), DB::isError()
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function &connect($dsn, $options = array())
|
public static function &connect($dsn, $options = array())
|
||||||
{
|
{
|
||||||
$dsninfo = DB::parseDSN($dsn);
|
$dsninfo = DB::parseDSN($dsn);
|
||||||
$dsninfo['phptype'] = $dsninfo['phptype'] === 'mysql' ? 'mysqli' : $dsninfo['phptype'];
|
$dsninfo['phptype'] = $dsninfo['phptype'] === 'mysql' ? 'mysqli' : $dsninfo['phptype'];
|
||||||
@@ -427,7 +427,7 @@ class DB
|
|||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function isError($value)
|
public static function isError($value)
|
||||||
{
|
{
|
||||||
return is_a($value, 'DB_Error');
|
return is_a($value, 'DB_Error');
|
||||||
}
|
}
|
||||||
@@ -569,7 +569,7 @@ class DB
|
|||||||
*
|
*
|
||||||
* @author Tomas V.V.Cox <cox@idecnet.com>
|
* @author Tomas V.V.Cox <cox@idecnet.com>
|
||||||
*/
|
*/
|
||||||
function parseDSN($dsn)
|
public static function parseDSN($dsn)
|
||||||
{
|
{
|
||||||
$parsed = array(
|
$parsed = array(
|
||||||
'phptype' => false,
|
'phptype' => false,
|
||||||
@@ -703,7 +703,7 @@ class DB
|
|||||||
* @return boolean true if the extension was already or successfully
|
* @return boolean true if the extension was already or successfully
|
||||||
* loaded, false if it could not be loaded
|
* loaded, false if it could not be loaded
|
||||||
*/
|
*/
|
||||||
function assertExtension($name)
|
public static function assertExtension($name)
|
||||||
{
|
{
|
||||||
if (!extension_loaded($name)) {
|
if (!extension_loaded($name)) {
|
||||||
$dlext = OS_WINDOWS ? '.dll' : '.so';
|
$dlext = OS_WINDOWS ? '.dll' : '.so';
|
||||||
|
|||||||
2
thirdparty/pear/DB/mysqli.php
vendored
2
thirdparty/pear/DB/mysqli.php
vendored
@@ -117,7 +117,7 @@ class DB_mysqli extends DB_common
|
|||||||
*/
|
*/
|
||||||
function __construct()
|
function __construct()
|
||||||
{
|
{
|
||||||
$this->DB_common();
|
parent::__construct();
|
||||||
$this->phptype = 'mysqli';
|
$this->phptype = 'mysqli';
|
||||||
$this->dbsyntax = 'mysqli';
|
$this->dbsyntax = 'mysqli';
|
||||||
$this->features = array(
|
$this->features = array(
|
||||||
|
|||||||
2
thirdparty/pear/DB/oci8.php
vendored
2
thirdparty/pear/DB/oci8.php
vendored
@@ -67,7 +67,7 @@ class DB_oci8 extends DB_common
|
|||||||
|
|
||||||
function __construct()
|
function __construct()
|
||||||
{
|
{
|
||||||
$this->DB_common();
|
parent::__construct();
|
||||||
$this->phptype = 'oci8';
|
$this->phptype = 'oci8';
|
||||||
$this->dbsyntax = 'oci8';
|
$this->dbsyntax = 'oci8';
|
||||||
$this->features = array(
|
$this->features = array(
|
||||||
|
|||||||
2
thirdparty/pear/DB/odbc.php
vendored
2
thirdparty/pear/DB/odbc.php
vendored
@@ -52,7 +52,7 @@ class DB_odbc extends DB_common
|
|||||||
|
|
||||||
function __construct()
|
function __construct()
|
||||||
{
|
{
|
||||||
$this->DB_common();
|
parent::__construct();
|
||||||
$this->phptype = 'odbc';
|
$this->phptype = 'odbc';
|
||||||
$this->dbsyntax = 'sql92';
|
$this->dbsyntax = 'sql92';
|
||||||
$this->features = array(
|
$this->features = array(
|
||||||
|
|||||||
2
thirdparty/pear/DB/pgsql.php
vendored
2
thirdparty/pear/DB/pgsql.php
vendored
@@ -53,7 +53,7 @@ class DB_pgsql extends DB_common
|
|||||||
|
|
||||||
function __construct()
|
function __construct()
|
||||||
{
|
{
|
||||||
$this->DB_common();
|
parent::__construct();
|
||||||
$this->phptype = 'pgsql';
|
$this->phptype = 'pgsql';
|
||||||
$this->dbsyntax = 'pgsql';
|
$this->dbsyntax = 'pgsql';
|
||||||
$this->features = array(
|
$this->features = array(
|
||||||
|
|||||||
@@ -6804,7 +6804,7 @@ class ProcessMap
|
|||||||
return $aIDocs;
|
return $aIDocs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getMaximunTaskX($processUid)
|
public static function getMaximunTaskX($processUid)
|
||||||
{
|
{
|
||||||
$criteria = new Criteria('workflow');
|
$criteria = new Criteria('workflow');
|
||||||
$criteria->addSelectColumn('MAX(TAS_POSX) AS MAX_X');
|
$criteria->addSelectColumn('MAX(TAS_POSX) AS MAX_X');
|
||||||
|
|||||||
@@ -775,7 +775,7 @@ class ReportTables
|
|||||||
* @access public
|
* @access public
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function tableExist()
|
public static function tableExist()
|
||||||
{
|
{
|
||||||
$bExists = true;
|
$bExists = true;
|
||||||
|
|
||||||
|
|||||||
@@ -352,7 +352,7 @@ trait PluginStructure
|
|||||||
$valueField = [];
|
$valueField = [];
|
||||||
if ((array_key_exists($name, $fieldsInTable) && $fieldsInTable[$name])) {
|
if ((array_key_exists($name, $fieldsInTable) && $fieldsInTable[$name])) {
|
||||||
foreach ($fieldsInTable[$name] as $index => $item) {
|
foreach ($fieldsInTable[$name] as $index => $item) {
|
||||||
if (method_exists($item, 'getAttributes')) {
|
if (is_object($item) && method_exists($item, 'getAttributes')) {
|
||||||
$valueField[$index] = $item->getAttributes();
|
$valueField[$index] = $item->getAttributes();
|
||||||
} else {
|
} else {
|
||||||
$valueField[$index] = $item;
|
$valueField[$index] = $item;
|
||||||
|
|||||||
Reference in New Issue
Block a user