diff options
46 files changed, 99 insertions, 99 deletions
diff --git a/adodb-active-record.inc.php b/adodb-active-record.inc.php index 3c2967f8..defa831c 100644 --- a/adodb-active-record.inc.php +++ b/adodb-active-record.inc.php @@ -1228,7 +1228,7 @@ global $_ADODB_ACTIVE_DBS; // arrRef will be the structure that knows about our objects. // It is an associative array. // We will, however, return arr, preserving regular 0.. order so that - // obj[0] can be used by app developpers. + // obj[0] can be used by app developers. $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php index 36741300..729f1f6b 100644 --- a/adodb-active-recordx.inc.php +++ b/adodb-active-recordx.inc.php @@ -1309,7 +1309,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind // arrRef will be the structure that knows about our objects. // It is an associative array. // We will, however, return arr, preserving regular 0.. order so that - // obj[0] can be used by app developpers. + // obj[0] can be used by app developers. $arrRef = array(); $bTos = array(); // Will store belongTo's indices if any foreach($rows as $row) { diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php index e7edf1b4..0d0c3613 100644 --- a/adodb-csvlib.inc.php +++ b/adodb-csvlib.inc.php @@ -27,7 +27,7 @@ $ADODB_INCLUDED_CSV = 1; * * @param rs the recordset * - * @return the CSV formated data + * @return the CSV formatted data */ function _rs2serialize(&$rs,$conn=false,$sql='') { @@ -85,7 +85,7 @@ $ADODB_INCLUDED_CSV = 1; * @param err returns the error message * @param timeout dispose if recordset has been alive for $timeout secs * -* @return recordset, or false if error occured. If no +* @return recordset, or false if error occurred. If no * error occurred in sql INSERT/UPDATE/DELETE, * empty recordset is returned */ diff --git a/adodb-datadict.inc.php b/adodb-datadict.inc.php index 1c80135e..1a96eff6 100644 --- a/adodb-datadict.inc.php +++ b/adodb-datadict.inc.php @@ -181,7 +181,7 @@ class ADODB_DataDict { var $dataProvider; var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob - /// in other words, we use a text area for editting. + /// in other words, we use a text area for editing. function GetCommentSQL($table,$col) { @@ -474,11 +474,11 @@ class ADODB_DataDict { /** * Change the definition of one column * - * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * As some DBM's can't do that on there own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ @@ -529,11 +529,11 @@ class ADODB_DataDict { /** * Drop one column * - * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * Some DBM's can't do that on there own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ diff --git a/adodb-errorpear.inc.php b/adodb-errorpear.inc.php index 4f1c98a7..404c6a81 100644 --- a/adodb-errorpear.inc.php +++ b/adodb-errorpear.inc.php @@ -78,7 +78,7 @@ global $ADODB_Last_PEAR_Error; /** * Returns last PEAR_Error object. This error might be for an error that -* occured several sql statements ago. +* occurred several sql statements ago. */ function ADODB_PEAR_Error() { diff --git a/adodb-lib.inc.php b/adodb-lib.inc.php index 8a822771..81ee668e 100644 --- a/adodb-lib.inc.php +++ b/adodb-lib.inc.php @@ -726,7 +726,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq switch ($force) { //case 0: - // //Ignore empty values. This is allready handled in "adodb_key_exists" function. + // //Ignore empty values. This is already handled in "adodb_key_exists" function. //break; case 1: diff --git a/adodb-pager.inc.php b/adodb-pager.inc.php index b1b05f0f..e2e8737a 100644 --- a/adodb-pager.inc.php +++ b/adodb-pager.inc.php @@ -275,7 +275,7 @@ class ADODB_Pager { } //------------------------------------------------------ - // override this to control overall layout and formating + // override this to control overall layout and formatting function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') { echo "<table ".$attributes."><tr><td>", diff --git a/adodb-pear.inc.php b/adodb-pear.inc.php index 96de6e88..f0e5702c 100644 --- a/adodb-pear.inc.php +++ b/adodb-pear.inc.php @@ -336,7 +336,7 @@ class DB $parsed['hostspec'] = urldecode($str); } - // Get dabase if any + // Get database if any // $dsn => database if (!empty($dsn)) { $parsed['database'] = $dsn; diff --git a/adodb-perf.inc.php b/adodb-perf.inc.php index 33070977..36627b35 100644 --- a/adodb-perf.inc.php +++ b/adodb-perf.inc.php @@ -596,7 +596,7 @@ Committed_AS: 348732 kB } /* - Raw function returning array of poll paramters + Raw function returning array of poll parameters */ function PollParameters() { diff --git a/adodb-time.inc.php b/adodb-time.inc.php index 8573b2e2..1d4d25d6 100644 --- a/adodb-time.inc.php +++ b/adodb-time.inc.php @@ -38,7 +38,7 @@ of date()'s field formats. Mktime() will convert from local time to GMT, and date() will convert from GMT to local time, but daylight savings is not handled currently. -This library is independant of the rest of ADOdb, and can be used +This library is independent of the rest of ADOdb, and can be used as standalone code. PERFORMANCE @@ -268,7 +268,7 @@ Changed adodb_get_gm_diff to use DateTimeZone(). * Now adodb_mktime(0,0,0,24,1,2037) works correctly. - 15 July 2007 0.30 -Added PHP 5.2.0 compatability fixes. +Added PHP 5.2.0 compatibility fixes. * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the * timezone, otherwise we use the current year as the baseline to retrieve the timezone. * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but @@ -532,8 +532,8 @@ function adodb_date_test() if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>"; if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>"; - // Test string formating - print "<p>Testing date formating</p>"; + // Test string formatting + print "<p>Testing date formatting</p>"; $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003'; $s1 = date($fmt,0); diff --git a/adodb.inc.php b/adodb.inc.php index c6145751..1f90317d 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -1975,7 +1975,7 @@ if (!defined('_ADODB_LAYER')) { * $table table name * $fieldArray associative array of data (you must quote strings yourself). * $keyCol the primary key field name or if compound key, array of field names - * autoQuote set to true to use a hueristic to quote strings. Works with nulls and numbers + * autoQuote set to true to use a heuristic to quote strings. Works with nulls and numbers * but does not work with dates nor SQL functions. * has_autoinc the primary key is an auto-inc field, so skip in insert. * @@ -2549,7 +2549,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 } /** - * If database does not support transactions, always return true as data always commited + * If database does not support transactions, always return true as data always committed * * @param $ok set to false to rollback transaction, true to commit * @@ -2966,7 +2966,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * @param v is the character date in YYYY-MM-DD format, returned by database * @param fmt is the format to apply to it, using date() * - * @return a date formated as user desires + * @return a date formatted as user desires */ function UserDate($v,$fmt='Y-m-d',$gmt=false) { $tt = $this->UnixDate($v); @@ -2989,7 +2989,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * @param v is the character timestamp in YYYY-MM-DD hh:mm:ss format * @param fmt is the format to apply to it, using date() * - * @return a timestamp formated as user desires + * @return a timestamp formatted as user desires */ function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false) { if (!isset($v)) { @@ -3227,18 +3227,18 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 /** * Compare a previously stored error message with the last error recorded by PHP - * to determine whether a new error has occured. + * to determine whether a new error has occurred. * * @param array|null $old Optional. Previously stored return value of error_get_last(). * - * @return string The error message if a new error has occured - * or an empty string if no (new) errors have occured.. + * @return string The error message if a new error has occurred + * or an empty string if no (new) errors have occurred.. */ protected function getChangedErrorMsg($old = null) { $new = error_get_last(); if (is_null($new)) { - // No error has occured yet at all. + // No error has occurred yet at all. return ''; } @@ -3730,7 +3730,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 if ($numberOfFields == 2) /* * Key is always value of first element - * Value is alway value of second element + * Value is always value of second element */ $showArrayMethod = 1; @@ -3816,7 +3816,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * @param v is the character timestamp in YYYY-MM-DD hh:mm:ss format * @param fmt is the format to apply to it, using date() * - * @return a timestamp formated as user desires + * @return a timestamp formatted as user desires */ function UserTimeStamp($v,$fmt='Y-m-d H:i:s') { if (is_numeric($v) && strlen($v)<14) { @@ -3838,7 +3838,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * @param v is the character date in YYYY-MM-DD format, returned by database * @param fmt is the format to apply to it, using date() * - * @return a date formated as user desires + * @return a date formatted as user desires */ function UserDate($v,$fmt='Y-m-d') { $tt = $this->UnixDate($v); @@ -4672,7 +4672,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * * @param array is a 2-dimensional array holding the data. * The first row should hold the column names - * unless paramter $colnames is used. + * unless parameter $colnames is used. * @param typearr holds an array of types. These are the same types * used in MetaTypes (C,B,L,I,N). * @param [colnames] array of column names. If set, then the first row of @@ -4695,7 +4695,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 * * @param array is a 2-dimensional array holding the data. * The first row should hold the column names - * unless paramter $colnames is used. + * unless parameter $colnames is used. * @param fieldarr holds an array of ADOFieldObject's. */ function InitArrayFields(&$array,&$fieldarr) { diff --git a/datadict/datadict-firebird.inc.php b/datadict/datadict-firebird.inc.php index acf605c1..548a172b 100644 --- a/datadict/datadict-firebird.inc.php +++ b/datadict/datadict-firebird.inc.php @@ -194,11 +194,11 @@ end; /** * Change the definition of one column * - * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * As some DBM's can't do that on there own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds='' complete definition of the new table, eg. for postgres, default '' * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ diff --git a/datadict/datadict-postgres.inc.php b/datadict/datadict-postgres.inc.php index d2d3d6da..243c7b89 100644 --- a/datadict/datadict-postgres.inc.php +++ b/datadict/datadict-postgres.inc.php @@ -164,11 +164,11 @@ class ADODB2_postgres extends ADODB_DataDict { /** * Change the definition of one column * - * Postgres can't do that on it's own, you need to supply the complete defintion of the new table, + * Postgres can't do that on it's own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds complete definition of the new table, eg. for postgres, default '' * @param array/ $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ @@ -200,7 +200,7 @@ class ADODB2_postgres extends ADODB_DataDict { // this next block doesn't work - there is no way that I can see to // explicitly ask a column to be null using $flds else if ($set_null = preg_match('/NULL/i',$v)) { - // if they didn't specify not null, see if they explicitely asked for null + // if they didn't specify not null, see if they explicitly asked for null // Lookbehind pattern covers the case 'fieldname NULL datatype DEFAULT NULL' // only the first NULL should be removed, not the one specifying // the default value @@ -274,11 +274,11 @@ class ADODB2_postgres extends ADODB_DataDict { /** * Drop one column * - * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table, + * Postgres < 7.3 can't do that on it's own, you need to supply the complete definition of the new table, * to allow, recreating the table and copying the content over to the new table * @param string $tabname table-name * @param string $flds column-name and type for the changed column - * @param string $tableflds complete defintion of the new table, eg. for postgres, default '' + * @param string $tableflds complete definition of the new table, eg. for postgres, default '' * @param array/ $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ @@ -303,7 +303,7 @@ class ADODB2_postgres extends ADODB_DataDict { * @internal * @param string $tabname table-name * @param string $dropflds column-names to drop - * @param string $tableflds complete defintion of the new table, eg. for postgres + * @param string $tableflds complete definition of the new table, eg. for postgres * @param array/string $tableoptions options for the new table see CreateTableSQL, default '' * @return array with SQL strings */ @@ -341,7 +341,7 @@ class ADODB2_postgres extends ADODB_DataDict { $aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname"; } $aSql[] = "DROP TABLE $tempname"; - // recreate the indexes, if they not contain one of the droped columns + // recreate the indexes, if they not contain one of the dropped columns foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data) { if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) { @@ -377,7 +377,7 @@ class ADODB2_postgres extends ADODB_DataDict { return $suffix; } - // search for a sequece for the given table (asumes the seqence-name contains the table-name!) + // search for a sequence for the given table (asumes the seqence-name contains the table-name!) // if yes return sql to drop it // this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!! function _DropAutoIncrement($tabname) @@ -386,7 +386,7 @@ class ADODB2_postgres extends ADODB_DataDict { $seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'"); - // check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly + // check if a tables depends on the sequence and it therefore can't and don't need to be dropped separately if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) { return False; } diff --git a/docs/changelog.md b/docs/changelog.md index 4adf83db..cdb92398 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -267,7 +267,7 @@ other database types as well; all drivers derived from the above are also impact - odbc: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539 - oci8: GetRowAssoc now works in ADODB_FETCH_ASSOC fetch mode - oci8: MetaType and MetaForeignKeys argument count are now strict-standards compliant -- oci8: Added trailing `;` on trigger creation for sequence fields, prevents occurence of ORA-24344 +- oci8: Added trailing `;` on trigger creation for sequence fields, prevents occurrence of ORA-24344 - oci8quercus: new oci8 driver with support for quercus jdbc data types. - pdo: Fixed concat recursion bug in 5.3. See http://phplens.com/lens/lensforum/msgs.php?id=19285 - pgsql: Default driver (postgres/pgsql) is now postgres8 diff --git a/docs/changelog_v2.x.md b/docs/changelog_v2.x.md index 21db47b3..753322a5 100644 --- a/docs/changelog_v2.x.md +++ b/docs/changelog_v2.x.md @@ -31,7 +31,7 @@ $conn->Connect($dsn); - Now MetaType() can accept a field object as the first parameter. - New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which is the string description, and $arr['version']. - PostgreSQL and MSSQL speedups for insert/updates. -- Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. Each connection has independant fetchMode. +- Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. Each connection has independent fetchMode. - ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we would break backward compat for too many applications otherwise. - Patched encrypted sessions to use replace() - The qstr function supports quoting of nulls when escape character is \ @@ -209,7 +209,7 @@ $conn->Connect($dsn); - Properly implemented Prepare() in oci8 and ODBC. - Added Bind() support to oci8 to support Prepare(). - Improved error handler. Catches CacheExecute() and GenID() errors now. -- Now if you are running php from the command line, debugging messages do not output html formating. Not 100% complete, but getting there. +- Now if you are running php from the command line, debugging messages do not output html formatting. Not 100% complete, but getting there. ## 1.81 - 22 March 2002 @@ -471,7 +471,7 @@ $conn->Connect($dsn); ## 0.71 - 22 Nov 2000 -- Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier. +- Switched from using require_once to include/include_once for backward compatibility with PHP 4.02 and earlier. ## 0.70 - 15 Nov 2000 diff --git a/docs/changelog_v3.x.md b/docs/changelog_v3.x.md index ee2bded4..4b058664 100644 --- a/docs/changelog_v3.x.md +++ b/docs/changelog_v3.x.md @@ -65,7 +65,7 @@ Older changelogs: - Added better debugging for Smart Transactions. - Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. - ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define it after including adodb.inc.php. -- Added portugese (brazilian) to languages. Thx to "Levi Fukumori". +- Added portuguese (brazilian) to languages. Thx to "Levi Fukumori". - Removed arg3 parameter from Execute/SelectLimit/Cache* functions. - Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() to note change in sql query counting with 2-d arrays. - Added MONEY to MetaType in PostgreSQL. @@ -85,7 +85,7 @@ Older changelogs: - Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. - Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. - Error handling in oci8 bugfix - if there was an error in Execute(), then when calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but the 2nd call would return no error. -- Error handling in odbc bugfix. ODBC would always return the last error, even if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 0 everytime before CacheExecute() and Execute(). +- Error handling in odbc bugfix. ODBC would always return the last error, even if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 0 every time before CacheExecute() and Execute(). ## 3.70 - 29 July 2003 @@ -239,4 +239,4 @@ Older changelogs: - Fixed adodb-pear.inc.php syntax error. - Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages that accept it. - Fixed _adodb_getcount() caching error. -- Added sql to retrive table and column info for odbc_mssql. +- Added sql to retrieve table and column info for odbc_mssql. diff --git a/docs/changelog_v4.x.md b/docs/changelog_v4.x.md index e346921b..fae9d28d 100644 --- a/docs/changelog_v4.x.md +++ b/docs/changelog_v4.x.md @@ -120,7 +120,7 @@ $db->CacheExecute($sql); - Fixed GetActiveRecordsClass() reference bug. See http://phplens.com/lens/lensforum/msgs.php?id=16120 - Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix Rabinovich. - Adodb-dict contributions by Gaetano - - Support for INDEX in data-dict. Example: idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features mutiple indexes, including a compound index idx_ev1. + - Support for INDEX in data-dict. Example: idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features multiple indexes, including a compound index idx_ev1. ``` event_id I(11) NOTNULL AUTOINCREMENT PRIMARY, @@ -139,7 +139,7 @@ $db->CacheExecute($sql); - makes any date defined as DEFAULT value for D and T columns work cross-database, not just the "sysdate" value (as long as it is specified using adodb standard format). See above example. - Fixed pdo's GetInsertID() support. Thx Ricky Su. - oci8 Prepare() now sets error messages if an error occurs. -- Added 'PT_BR' to SetDateLocale() -- brazilian portugese. +- Added 'PT_BR' to SetDateLocale() -- brazilian portuguese. - charset in oci8 was not set correctly on `*Connect()` - ADOConnection::Transpose() now appends as first column the field names. - Added $ADODB_QUOTE_FIELDNAMES. If set to true, will autoquote field names in AutoExecute(),GetInsertSQL(), GetUpdateSQL(). @@ -446,7 +446,7 @@ fbird: X->VARCHAR(4000) XL->VARCHAR(32000) - MaxDB was padding the defaults of none-string types with spaces - MySql now correctly converts enum columns to varchar - Ralf also changed Postgresql datadict: - - you cant add NOT NULL columns in postgres in one go, they need to be added as NULL and then altered to NOT NULL + - you can't add NOT NULL columns in postgres in one go, they need to be added as NULL and then altered to NOT NULL - AlterColumnSQL could not change a varchar column with numbers into an integer column, postgres need an explicit conversation - a re-created sequence was not set to the correct value, if the name was the old name (no implicit sequence), now always the new name of the implicit sequence is used - Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in datadict code. @@ -521,7 +521,7 @@ fbird: X->VARCHAR(4000) XL->VARCHAR(32000) - More XHTML changes for GetMenu. By Jeremy Evans. - Fixes some ibase date issues. Thx to stefan bogdan. - Improvements to mysqli driver to support $ADODB_COUNTRECS. -- Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continiously. +- Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continuously. ## 4.23 - 16 June 2004 @@ -655,7 +655,7 @@ echo "return = ".$rs."<br>";</pre> - CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio. - Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html). - Fixed some fr and it lang errors. Thx to Gaetano G. -- Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G. +- Added contrib directory, with adodb rs to xmlrpc converter by Gaetano G. - Fixed array recordset bugs when `_skiprow1` is true. Thx to Gaetano G. - Fixed pivot table code when count is false. diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php index 71ee130a..855f909b 100644 --- a/drivers/adodb-ado.inc.php +++ b/drivers/adodb-ado.inc.php @@ -81,7 +81,7 @@ class ADODB_ado extends ADOConnection { // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - //use trusted conection for SQL if username not specified + //use trusted connection for SQL if username not specified if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes"; } else if ($argProvider=='access') $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php index 21ead3c3..c1f19730 100644 --- a/drivers/adodb-ado5.inc.php +++ b/drivers/adodb-ado5.inc.php @@ -97,7 +97,7 @@ class ADODB_ado extends ADOConnection { // not yet //if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename"; - //use trusted conection for SQL if username not specified + //use trusted connection for SQL if username not specified if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes"; } else if ($argProvider=='access') $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider diff --git a/drivers/adodb-ads.inc.php b/drivers/adodb-ads.inc.php index 50517668..7a234606 100644 --- a/drivers/adodb-ads.inc.php +++ b/drivers/adodb-ads.inc.php @@ -248,8 +248,8 @@ class ADODB_ads extends ADOConnection { } - // Returns tables,Views or both on succesfull execution. Returns - // tables by default on succesfull execustion. + // Returns tables,Views or both on successful execution. Returns + // tables by default on successful execution. function &MetaTables($ttype = false, $showSchema = false, $mask = false) { $recordSet1 = $this->Execute("select * from system.tables"); @@ -386,7 +386,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - /*if (false) { // after testing, confirmed that the following does not work becoz of a bug + /*if (false) { // after testing, confirmed that the following does not work because of a bug $qid2 = ads_tables($this->_connectionID); $rs = new ADORecordSet_ads($qid2); $ADODB_FETCH_MODE = $savem; diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php index 4b1bbb54..2f883df5 100644 --- a/drivers/adodb-db2.inc.php +++ b/drivers/adodb-db2.inc.php @@ -994,7 +994,7 @@ class ADODB_db2 extends ADOConnection { } /** - * Lists databases. Because instances are independant, we only know about + * Lists databases. Because instances are independent, we only know about * the current database name * * @return string[] @@ -1347,7 +1347,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 /* * We now have a stored parameter resource * to bind to. The spResource and sql that is returned are - * not usable, its for dummy compatibilty. Everything + * not usable, its for dummy compatibility. Everything * will be handled by the storedProcedureParameters * array */ @@ -2005,4 +2005,4 @@ class ADORecordSet_db2 extends ADORecordSet { } -}
\ No newline at end of file +} diff --git a/drivers/adodb-informix72.inc.php b/drivers/adodb-informix72.inc.php index 385eeab6..123fc0e5 100644 --- a/drivers/adodb-informix72.inc.php +++ b/drivers/adodb-informix72.inc.php @@ -501,7 +501,7 @@ class ADORecordset_informix72 extends ADORecordSet { } /** !Eos -* Auxiliar function to Parse coltype,collength. Used by Metacolumns +* Auxiliary function to Parse coltype,collength. Used by Metacolumns * return: array ($mtype,$length,$precision,$nullable) (similar to ifx_fieldpropierties) */ function ifx_props($coltype,$collength){ diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php index a61f1fcf..b60d28c3 100644 --- a/drivers/adodb-mssql.inc.php +++ b/drivers/adodb-mssql.inc.php @@ -39,7 +39,7 @@ if (!defined('ADODB_DIR')) die(); //---------------------------------------------------------------- -// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc +// has datetime conversion to YYYY-MM-DD format, and also mssql_fetch_assoc if (ADODB_PHPVER >= 0x4300) { // docs say 4.2.0, but testing shows only since 4.3.0 does it work! ini_set('mssql.datetimeconvert',0); diff --git a/drivers/adodb-mssql_n.inc.php b/drivers/adodb-mssql_n.inc.php index ddd4a2d5..0c44cad1 100644 --- a/drivers/adodb-mssql_n.inc.php +++ b/drivers/adodb-mssql_n.inc.php @@ -66,7 +66,7 @@ class ADODB_mssql_n extends ADODB_mssql { * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add * the "N" notation when working against MSSQL. * - * The orginal note indicated that this hack should only be used if ALL the char-based columns + * The original note indicated that this hack should only be used if ALL the char-based columns * in your DB are of type nchar, nvarchar and ntext, but testing seems to indicate that SQL server * doesn't seem to care if the statement is used against char etc fields. * diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php index b6b7ac4b..93a7e473 100644 --- a/drivers/adodb-mssqlnative.inc.php +++ b/drivers/adodb-mssqlnative.inc.php @@ -68,7 +68,7 @@ if (!function_exists('sqlsrv_log_set_subsystems')) { //---------------------------------------------------------------- -// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc +// has datetime conversion to YYYY-MM-DD format, and also mssql_fetch_assoc if (ADODB_PHPVER >= 0x4300) { // docs say 4.2.0, but testing shows only since 4.3.0 does it work! ini_set('mssql.datetimeconvert',0); @@ -508,7 +508,7 @@ class ADODB_mssqlnative extends ADOConnection { else { /* - * If they don't pass either value, we wont add them to the + * If they don't pass either value, we won't add them to the * connection parameters. This will then force an attempt * to use windows authentication */ diff --git a/drivers/adodb-mysql.inc.php b/drivers/adodb-mysql.inc.php index 5d92c419..9da7659b 100644 --- a/drivers/adodb-mysql.inc.php +++ b/drivers/adodb-mysql.inc.php @@ -9,7 +9,7 @@ Set tabs to 8. This driver only supports the original non-transactional MySQL driver. It - is deprected in PHP version 5.5 and removed in PHP version 7. It is deprecated + is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both transactional and non-transactional updates diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php index 83217ed4..b041c54e 100644 --- a/drivers/adodb-mysqli.inc.php +++ b/drivers/adodb-mysqli.inc.php @@ -1126,8 +1126,8 @@ class ADORecordSet_mysqli extends ADORecordSet{ function _close() { - //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014 - //only a problem with persistant connections + //if results are attached to this pointer from Stored Procedure calls, the next standard query will die 2014 + //only a problem with persistent connections if(isset($this->connection->_connectionID) && $this->connection->_connectionID) { while(mysqli_more_results($this->connection->_connectionID)){ @@ -1246,7 +1246,7 @@ class ADORecordSet_mysqli extends ADORecordSet{ return 'I'; // Added floating-point types - // Maybe not necessery. + // Maybe not necessary. case 'FLOAT': case 'DOUBLE': // case 'DOUBLE PRECISION': @@ -1347,7 +1347,7 @@ class ADORecordSet_array_mysqli extends ADORecordSet_array { // Added floating-point types - // Maybe not necessery. + // Maybe not necessary. case 'FLOAT': case 'DOUBLE': // case 'DOUBLE PRECISION': diff --git a/drivers/adodb-mysqlt.inc.php b/drivers/adodb-mysqlt.inc.php index c627643e..d912db59 100644 --- a/drivers/adodb-mysqlt.inc.php +++ b/drivers/adodb-mysqlt.inc.php @@ -10,7 +10,7 @@ Set tabs to 8. This driver only supports the original MySQL driver in transactional mode. It - is deprected in PHP version 5.5 and removed in PHP version 7. It is deprecated + is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both transactional and non-transactional updates diff --git a/drivers/adodb-netezza.inc.php b/drivers/adodb-netezza.inc.php index 398472ac..3b02b904 100644 --- a/drivers/adodb-netezza.inc.php +++ b/drivers/adodb-netezza.inc.php @@ -14,7 +14,7 @@ Fixed the way data types and lengths are returned in MetaColumns() as well as added the default lengths for certain types Updated public variables for Netezza - Still need to remove blob functions, as Netezza doesn't suppport blob + Still need to remove blob functions, as Netezza doesn't support blob */ // security - hide paths if (!defined('ADODB_DIR')) die(); diff --git a/drivers/adodb-odbc.inc.php b/drivers/adodb-odbc.inc.php index e4e44f22..66a3cadd 100644 --- a/drivers/adodb-odbc.inc.php +++ b/drivers/adodb-odbc.inc.php @@ -407,7 +407,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - /*if (false) { // after testing, confirmed that the following does not work becoz of a bug + /*if (false) { // after testing, confirmed that the following does not work because of a bug $qid2 = odbc_tables($this->_connectionID); $rs = new ADORecordSet_odbc($qid2); $ADODB_FETCH_MODE = $savem; diff --git a/drivers/adodb-odbc_db2.inc.php b/drivers/adodb-odbc_db2.inc.php index 9f210c90..4975028a 100644 --- a/drivers/adodb-odbc_db2.inc.php +++ b/drivers/adodb-odbc_db2.inc.php @@ -28,7 +28,7 @@ to SQL_CUR_USE_ODBC Cursor Type, then the whole query speed up from 1 till 10 seconds to 0.2 till 0.3 seconds for 100 records. Amazing!!! -Therfore, PHP is just almost fast as calling the DB2 +Therefore, PHP is just almost fast as calling the DB2 from Servlets using JDBC (don't take too much care about the speed at whole: the database was on a completely other location, so the whole connection diff --git a/drivers/adodb-postgres64.inc.php b/drivers/adodb-postgres64.inc.php index bec7528b..5dd7bdc9 100644 --- a/drivers/adodb-postgres64.inc.php +++ b/drivers/adodb-postgres64.inc.php @@ -126,7 +126,7 @@ class ADODB_postgres64 extends ADOConnection{ /** * Retrieve Server information. - * In addition to server version and desription, the function also returns + * In addition to server version and description, the function also returns * the client version. * @param bool $detailed If true, retrieve detailed version string (executes * a SQL query) in addition to the version number @@ -414,7 +414,7 @@ class ADODB_postgres64 extends ADOConnection{ } /* - Hueristic - not guaranteed to work. + Heuristic - not guaranteed to work. */ function GuessOID($oid) { diff --git a/lang/adodb-pt-br.inc.php b/lang/adodb-pt-br.inc.php index 9c687b06..ba67167e 100644 --- a/lang/adodb-pt-br.inc.php +++ b/lang/adodb-pt-br.inc.php @@ -1,6 +1,6 @@ <?php // contributed by "Levi Fukumori" levi _AT_ fukumori _DOT_ com _DOT_ br -// portugese (brazilian) +// portuguese (brazilian) $ADODB_LANG_ARRAY = array ( 'LANG' => 'pt-br', DB_ERROR => 'erro desconhecido', diff --git a/pear/Auth/Container/ADOdb.php b/pear/Auth/Container/ADOdb.php index 1c60b553..e28bcb8d 100644 --- a/pear/Auth/Container/ADOdb.php +++ b/pear/Auth/Container/ADOdb.php @@ -58,7 +58,7 @@ class Auth_Container_ADOdb extends Auth_Container /** * Constructor of the container class * - * Initate connection to the database via PEAR::ADOdb + * Initiate connection to the database via PEAR::ADOdb * * @param string Connection data or DB object * @return object Returns an error object if something went wrong @@ -262,7 +262,7 @@ class Auth_Container_ADOdb extends Auth_Container continue; } // Use reference to the auth object if exists - // This is because the auth session variable can change so a static call to setAuthData does not make sence + // This is because the auth session variable can change so a static call to setAuthData does not make sense if(is_object($this->_auth_obj)){ $this->_auth_obj->setAuthData($key, $value); } else { diff --git a/perf/perf-informix.inc.php b/perf/perf-informix.inc.php index 15eb3128..c6874b07 100644 --- a/perf/perf-informix.inc.php +++ b/perf/perf-informix.inc.php @@ -23,7 +23,7 @@ if (!defined('ADODB_DIR')) die(); // class perf_informix extends adodb_perf{ - // Maximum size on varchar upto 9.30 255 chars + // Maximum size on varchar up to 9.30 255 chars // better truncate varchar to 255 than char(4000) ? var $createTableSQL = "CREATE TABLE adodb_logsql ( created datetime year to second NOT NULL, diff --git a/perf/perf-mysql.inc.php b/perf/perf-mysql.inc.php index 28848a19..381d652b 100644 --- a/perf/perf-mysql.inc.php +++ b/perf/perf-mysql.inc.php @@ -302,7 +302,7 @@ class perf_mysql extends adodb_perf{ case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break; case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break; default : - // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0) + // May don't use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0) ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined mode '%s'</p>", __CLASS__, __FUNCTION__, $mode)); return false; } diff --git a/scripts/buildrelease.py b/scripts/buildrelease.py index 2c67343a..e151b5a2 100755 --- a/scripts/buildrelease.py +++ b/scripts/buildrelease.py @@ -227,7 +227,7 @@ def main(): retry = False continue else: - # We already tried to delete or some other error occured + # We already tried to delete or some other error occurred raise # Create tarballs diff --git a/scripts/updateversion.py b/scripts/updateversion.py index 0c39fd53..a4450707 100755 --- a/scripts/updateversion.py +++ b/scripts/updateversion.py @@ -261,7 +261,7 @@ def update_changelog(version): ) # Stable release (X.Y.0) - # Replace the 1st occurence of markdown level 2 header matching version + # Replace the 1st occurrence of markdown level 2 header matching version # and release date patterns elif not version_is_patch(version): print " Updating release date for v%s" % version diff --git a/session/adodb-sess.txt b/session/adodb-sess.txt index c6c76858..1e9a8aac 100644 --- a/session/adodb-sess.txt +++ b/session/adodb-sess.txt @@ -58,10 +58,10 @@ Originally, the user had to call adodb_sess_open(). Postgres SAP -* filter(): Used to support multiple, simulataneous encryption/compression +* filter(): Used to support multiple, simultaneous encryption/compression schemes. -* Debug support is improved thru _rsdump() function, which is called after +* Debug support is improved through _rsdump() function, which is called after every database call. ------------ @@ -120,7 +120,7 @@ next release of ADODB. If so, I will modify the current documentation to detail the new functionality. To that end, what file(s) contain the documentation? Please -send them to me if they are not publically available. +send them to me if they are not publicly available. Also, if there is *anything* in the code that you like to see changed, let me know. diff --git a/session/adodb-session.php b/session/adodb-session.php index 66ff3559..e1a04928 100644 --- a/session/adodb-session.php +++ b/session/adodb-session.php @@ -599,7 +599,7 @@ class ADODB_Session { $sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time(); /* Lock code does not work as it needs to hold transaction within whole page, and we don't know if - developer has commited elsewhere... :( + developer has committed elsewhere... :( */ #if (ADODB_Session::Lock()) # $rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data); @@ -921,12 +921,12 @@ ADODB_Session::_init(); if (empty($ADODB_SESSION_READONLY)) register_shutdown_function('session_write_close'); -// for backwards compatability only +// for backwards compatibility only function adodb_sess_open($save_path, $session_name, $persist = true) { return ADODB_Session::open($save_path, $session_name, $persist); } -// for backwards compatability only +// for backwards compatibility only function adodb_sess_gc($t) { return ADODB_Session::gc($t); diff --git a/session/adodb-session2.php b/session/adodb-session2.php index 3619b20b..a0ce0efa 100644 --- a/session/adodb-session2.php +++ b/session/adodb-session2.php @@ -643,7 +643,7 @@ class ADODB_Session { $sql = "SELECT $ADODB_SESSION_SELECT_FIELDS FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp; /* Lock code does not work as it needs to hold transaction within whole page, and we don't know if - developer has commited elsewhere... :( + developer has committed elsewhere... :( */ #if (ADODB_Session::Lock()) # $rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata); @@ -941,12 +941,12 @@ ADODB_Session::_init(); if (empty($ADODB_SESSION_READONLY)) register_shutdown_function('session_write_close'); -// for backwards compatability only +// for backwards compatibility only function adodb_sess_open($save_path, $session_name, $persist = true) { return ADODB_Session::open($save_path, $session_name, $persist); } -// for backwards compatability only +// for backwards compatibility only function adodb_sess_gc($t) { return ADODB_Session::gc($t); diff --git a/session/old/adodb-cryptsession.php b/session/old/adodb-cryptsession.php index c6246b80..3d7589eb 100644 --- a/session/old/adodb-cryptsession.php +++ b/session/old/adodb-cryptsession.php @@ -197,7 +197,7 @@ $Crypt = new MD5Crypt; ADOConnection::outp( ' -- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'</p>',false); } else { - // bug in access driver (could be odbc?) means that info is not commited + // bug in access driver (could be odbc?) means that info is not committed // properly unless select statement executed in Win2000 if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'"); diff --git a/session/old/adodb-session-clob.php b/session/old/adodb-session-clob.php index e7c00388..8c03ddc3 100644 --- a/session/old/adodb-session-clob.php +++ b/session/old/adodb-session-clob.php @@ -318,7 +318,7 @@ function adodb_sess_write($key, $val) ADOConnection::outp( ' -- Session Replace: '.nl2br($err).'</p>',false); } else { - // bug in access driver (could be odbc?) means that info is not commited + // bug in access driver (could be odbc?) means that info is not committed // properly unless select statement executed in Win2000 if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'"); diff --git a/session/old/adodb-session.php b/session/old/adodb-session.php index 548b32e5..60ec0eb8 100644 --- a/session/old/adodb-session.php +++ b/session/old/adodb-session.php @@ -307,7 +307,7 @@ function adodb_sess_write($key, $val) ADOConnection::outp( ' -- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'</p>',false); } else { - // bug in access driver (could be odbc?) means that info is not commited + // bug in access driver (could be odbc?) means that info is not committed // properly unless select statement executed in Win2000 if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'"); diff --git a/tests/test.php b/tests/test.php index e32053b1..983edc12 100644 --- a/tests/test.php +++ b/tests/test.php @@ -1583,7 +1583,7 @@ END Adodb; else { $name = $db->GetOne("Select firstname from ADOXYZ where id=1"); if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name"); - else echo "<p> -- Passed StartTrans test2 - commiting</p>"; + else echo "<p> -- Passed StartTrans test2 - committing</p>"; } } flush(); diff --git a/tests/testdatabases.inc.php b/tests/testdatabases.inc.php index 5df07011..a35781ef 100644 --- a/tests/testdatabases.inc.php +++ b/tests/testdatabases.inc.php @@ -432,7 +432,7 @@ if (!empty($testmssql)) { // MS SQL Server via ODBC } ADOLoadCode("ado_mssql"); -if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less +if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- through ODBC -- DSN-less $db = ADONewConnection("ado_mssql"); //$db->debug=1; |