From cb9b95f26da7057dc61baec4716f4763be211ca2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 17 Aug 2007 09:16:19 +0000 Subject: [PATCH] renommage de PEAR en DOLIPEAR --- htdocs/includes/pear/Auth/Container/DB.php | 2 +- htdocs/includes/pear/Auth/Container/MDB2.php | 2 +- htdocs/includes/pear/DB/mysql.php | 2 +- htdocs/includes/pear/DB/mysqli.php | 2 +- htdocs/includes/pear/DB/pgsql.php | 4 +- htdocs/includes/pear/MDB2.php | 4 +- .../pear/MDB2/Driver/Datatype/Common.php | 2 +- .../pear/MDB2/Driver/Native/pgsql.php | 4 +- htdocs/includes/pear/MDB2/Extended.php | 48 +++++++++---------- htdocs/includes/pear/MDB2/Iterator.php | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/htdocs/includes/pear/Auth/Container/DB.php b/htdocs/includes/pear/Auth/Container/DB.php index 155a91f727d..41bac5f96c3 100644 --- a/htdocs/includes/pear/Auth/Container/DB.php +++ b/htdocs/includes/pear/Auth/Container/DB.php @@ -102,7 +102,7 @@ class Auth_Container_DB extends Auth_Container } else { return DOLIPEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__, 41, - PEAR_ERROR_RETURN, + DOLIPEAR_ERROR_RETURN, null, null ); diff --git a/htdocs/includes/pear/Auth/Container/MDB2.php b/htdocs/includes/pear/Auth/Container/MDB2.php index 716c50ffd35..064942db46a 100644 --- a/htdocs/includes/pear/Auth/Container/MDB2.php +++ b/htdocs/includes/pear/Auth/Container/MDB2.php @@ -120,7 +120,7 @@ class Auth_Container_MDB2 extends Auth_Container } else { return DOLIPEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__, 41, - PEAR_ERROR_RETURN, + DOLIPEAR_ERROR_RETURN, null, null ); diff --git a/htdocs/includes/pear/DB/mysql.php b/htdocs/includes/pear/DB/mysql.php index fee3db43ff5..b2ddd4b4e98 100644 --- a/htdocs/includes/pear/DB/mysql.php +++ b/htdocs/includes/pear/DB/mysql.php @@ -488,7 +488,7 @@ class DB_mysql extends DB_common $seqname = $this->getSequenceName($seq_name); do { $repeat = 0; - $this->pushErrorHandling(PEAR_ERROR_RETURN); + $this->pushErrorHandling(DOLIPEAR_ERROR_RETURN); $result = $this->query("UPDATE ${seqname} ". 'SET id=LAST_INSERT_ID(id+1)'); $this->popErrorHandling(); diff --git a/htdocs/includes/pear/DB/mysqli.php b/htdocs/includes/pear/DB/mysqli.php index 762bbebf8c1..44d68eb9b3c 100644 --- a/htdocs/includes/pear/DB/mysqli.php +++ b/htdocs/includes/pear/DB/mysqli.php @@ -660,7 +660,7 @@ class DB_mysqli extends DB_common $seqname = $this->getSequenceName($seq_name); do { $repeat = 0; - $this->pushErrorHandling(PEAR_ERROR_RETURN); + $this->pushErrorHandling(DOLIPEAR_ERROR_RETURN); $result = $this->query('UPDATE ' . $seqname . ' SET id = LAST_INSERT_ID(id + 1)'); $this->popErrorHandling(); diff --git a/htdocs/includes/pear/DB/pgsql.php b/htdocs/includes/pear/DB/pgsql.php index a6cec7780be..a2b085564e8 100644 --- a/htdocs/includes/pear/DB/pgsql.php +++ b/htdocs/includes/pear/DB/pgsql.php @@ -474,13 +474,13 @@ class DB_pgsql extends DB_common $seqname = $this->getSequenceName($seq_name); $repeat = false; do { - $this->pushErrorHandling(PEAR_ERROR_RETURN); + $this->pushErrorHandling(DOLIPEAR_ERROR_RETURN); $result = $this->query("SELECT NEXTVAL('${seqname}')"); $this->popErrorHandling(); if ($ondemand && DB::isError($result) && $result->getCode() == DB_ERROR_NOSUCHTABLE) { $repeat = true; - $this->pushErrorHandling(PEAR_ERROR_RETURN); + $this->pushErrorHandling(DOLIPEAR_ERROR_RETURN); $result = $this->createSequence($seq_name); $this->popErrorHandling(); if (DB::isError($result)) { diff --git a/htdocs/includes/pear/MDB2.php b/htdocs/includes/pear/MDB2.php index 8937f890c13..4ba92cbcc84 100644 --- a/htdocs/includes/pear/MDB2.php +++ b/htdocs/includes/pear/MDB2.php @@ -964,7 +964,7 @@ class MDB2_Error extends DOLIPEAR_Error * @param int what error level to use for $mode & PEAR_ERROR_TRIGGER * @param smixed additional debug info, such as the last query */ - function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN, + function MDB2_Error($code = MDB2_ERROR, $mode = DOLIPEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null) { if (is_null($code)) { @@ -1441,7 +1441,7 @@ class MDB2_Driver_Common extends DOLIPEAR } $err =& DOLIPEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true); - if ($err->getMode() !== PEAR_ERROR_RETURN + if ($err->getMode() !== DOLIPEAR_ERROR_RETURN && isset($this->nested_transaction_counter) && !$this->has_transaction_error) { $this->has_transaction_error =& $err; } diff --git a/htdocs/includes/pear/MDB2/Driver/Datatype/Common.php b/htdocs/includes/pear/MDB2/Driver/Datatype/Common.php index 45e02b8c24c..261b5a7f145 100644 --- a/htdocs/includes/pear/MDB2/Driver/Datatype/Common.php +++ b/htdocs/includes/pear/MDB2/Driver/Datatype/Common.php @@ -45,7 +45,7 @@ // $Id$ //require_once 'MDB2/LOB.php'; -require_once PEAR_PATH."/MDB2/LOB.php'; +require_once PEAR_PATH."/MDB2/LOB.php"; /** * @package MDB2 diff --git a/htdocs/includes/pear/MDB2/Driver/Native/pgsql.php b/htdocs/includes/pear/MDB2/Driver/Native/pgsql.php index 24b604fb31b..6ad007c876b 100644 --- a/htdocs/includes/pear/MDB2/Driver/Native/pgsql.php +++ b/htdocs/includes/pear/MDB2/Driver/Native/pgsql.php @@ -69,12 +69,12 @@ class MDB2_Driver_Native_pgsql extends MDB2_Driver_Native_Common function deleteOID($OID) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } $connection = $db->getConnection(); - if (PEAR::isError($connection)) { + if (DOLIPEAR::isError($connection)) { return $connection; } diff --git a/htdocs/includes/pear/MDB2/Extended.php b/htdocs/includes/pear/MDB2/Extended.php index baac5a9e383..7d80062316e 100644 --- a/htdocs/includes/pear/MDB2/Extended.php +++ b/htdocs/includes/pear/MDB2/Extended.php @@ -93,11 +93,11 @@ class MDB2_Extended extends MDB2_Module_Common $where = false, $types = null, $result_types = MDB2_PREPARE_MANIP) { $query = $this->buildManipSQL($table, $table_fields, $mode, $where); - if (PEAR::isError($query)) { + if (DOLIPEAR::isError($query)) { return $query; } $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } return $db->prepare($query, $types, $result_types); @@ -148,7 +148,7 @@ class MDB2_Extended extends MDB2_Module_Common $query = $this->buildManipSQL($table, $keys, $mode, $where); $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } if ($mode == MDB2_AUTOQUERY_SELECT) { @@ -158,7 +158,7 @@ class MDB2_Extended extends MDB2_Module_Common } } else { $stmt = $this->autoPrepare($table, $keys, $mode, $where, $types, $result_types); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } $result =& $stmt->execute($params, $result_class); @@ -194,7 +194,7 @@ class MDB2_Extended extends MDB2_Module_Common function buildManipSQL($table, $table_fields, $mode, $where = false) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -268,12 +268,12 @@ class MDB2_Extended extends MDB2_Module_Common $result_wrap_class = false) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } $result = $db->setLimit($limit, $offset); - if (PEAR::isError($result)) { + if (DOLIPEAR::isError($result)) { return $result; } $result =& $db->query($query, $types, $result_class, $result_wrap_class); @@ -297,7 +297,7 @@ class MDB2_Extended extends MDB2_Module_Common function execParam($query, $params = array(), $param_types = null) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -307,12 +307,12 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, MDB2_PREPARE_MANIP); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } $result = $stmt->execute($params); - if (PEAR::isError($result)) { + if (DOLIPEAR::isError($result)) { return $result; } @@ -341,7 +341,7 @@ class MDB2_Extended extends MDB2_Module_Common $param_types = null, $colnum = 0) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -352,7 +352,7 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, $type); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } @@ -388,7 +388,7 @@ class MDB2_Extended extends MDB2_Module_Common $param_types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -398,7 +398,7 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, $types); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } @@ -434,7 +434,7 @@ class MDB2_Extended extends MDB2_Module_Common $param_types = null, $colnum = 0) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -445,7 +445,7 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, $type); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } @@ -490,7 +490,7 @@ class MDB2_Extended extends MDB2_Module_Common $rekey = false, $force_array = false, $group = false) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -500,7 +500,7 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, $types); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } @@ -595,7 +595,7 @@ class MDB2_Extended extends MDB2_Module_Common $fetchmode = MDB2_FETCHMODE_DEFAULT, $force_array = false, $group = false) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } @@ -605,7 +605,7 @@ class MDB2_Extended extends MDB2_Module_Common } $stmt = $db->prepare($query, $param_types, $types); - if (PEAR::isError($stmt)) { + if (DOLIPEAR::isError($stmt)) { return $stmt; } @@ -642,7 +642,7 @@ class MDB2_Extended extends MDB2_Module_Common { for ($i = 0, $j = count($params); $i < $j; $i++) { $result = $stmt->execute($params[$i]); - if (PEAR::isError($result)) { + if (DOLIPEAR::isError($result)) { return $result; } } @@ -667,14 +667,14 @@ class MDB2_Extended extends MDB2_Module_Common function getBeforeID($table, $field = null, $ondemand = true, $quote = true) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } if ($db->supports('auto_increment') !== true) { $seq = $table.(empty($field) ? '' : '_'.$field); $id = $db->nextID($seq, $ondemand); - if (!$quote || PEAR::isError($id)) { + if (!$quote || DOLIPEAR::isError($id)) { return $id; } return $db->quote($id, 'integer'); @@ -700,7 +700,7 @@ class MDB2_Extended extends MDB2_Module_Common function getAfterID($id, $table, $field = null) { $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { + if (DOLIPEAR::isError($db)) { return $db; } diff --git a/htdocs/includes/pear/MDB2/Iterator.php b/htdocs/includes/pear/MDB2/Iterator.php index 80fc63f7337..2c4635544f9 100644 --- a/htdocs/includes/pear/MDB2/Iterator.php +++ b/htdocs/includes/pear/MDB2/Iterator.php @@ -114,7 +114,7 @@ class MDB2_Iterator implements Iterator { if (is_null($this->row)) { $row = $this->result->fetchRow($this->fetchmode); - if (PEAR::isError($row)) { + if (DOLIPEAR::isError($row)) { $row = false; } $this->row = $row;