Fix typos

Author: deining

adodb-csvlib.inc.php

@@ -270,7 +270,7 @@ function csv2rs($url, &$err, $timeout=0, $rsclass='ADORecordSet_array')
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
 	{
-	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# https://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
 	# So to simulate locking, we assume that rename is an atomic operation.
 	# First we delete $filename, then we create a $tempfile write to it and
 	# rename to the desired $filename. If the rename works, then we successfully

adodb-memcache.lib.inc.php

@@ -35,7 +35,7 @@
 class ADODB_Cache_MemCache
 {
 	/**
-	 * @var bool Prevents parent class calling non-existant function
+	 * @var bool Prevents parent class calling non-existent function
 	 */
 	public $createdir = false;
 

adodb-perf.inc.php

@@ -1059,7 +1059,7 @@ function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
     /**
      * Reorganise current database.
      * Default implementation loops over all <code>MetaTables()</code> and
-     * optimize each using <code>optmizeTable()</code>
+     * optimize each using <code>optimizeTable()</code>
      *
      * @author Markus Staab
 	 * @return bool true on success, false on error

adodb-xmlschema.inc.php

@@ -188,7 +188,7 @@ function FieldID( $field ) {
 /**
  * Creates a table object in ADOdb's datadict format
  *
- * This class stores information about a database table. As charactaristics
+ * This class stores information about a database table. As characteristics
  * of the table are loaded from the external source, methods and properties
  * of this class are used to build up the table description in ADOdb's
  * datadict format.
@@ -245,7 +245,7 @@ class dbTable extends dbObject {
 	var $data;
 
 	/**
-	 * Iniitializes a new table object.
+	 * Initializes a new table object.
 	 *
 	 * @param string $prefix DB Object prefix
 	 * @param array $attributes Array of table attributes.
@@ -607,7 +607,7 @@ function drop() {
 /**
  * Creates an index object in ADOdb's datadict format
  *
- * This class stores information about a database index. As charactaristics
+ * This class stores information about a database index. As characteristics
  * of the index are loaded from the external source, methods and properties
  * of this class are used to build up the index description in ADOdb's
  * datadict format.

adodb-xmlschema03.inc.php

@@ -206,7 +206,7 @@ function fieldID( $field ) {
 /**
  * Creates a table object in ADOdb's datadict format
  *
- * This class stores information about a database table. As charactaristics
+ * This class stores information about a database table. As characteristics
  * of the table are loaded from the external source, methods and properties
  * of this class are used to build up the table description in ADOdb's
  * datadict format.
@@ -263,7 +263,7 @@ class dbTable extends dbObject {
 	var $data;
 
 	/**
-	 * Iniitializes a new table object.
+	 * Initializes a new table object.
 	 *
 	 * @param string $prefix DB Object prefix
 	 * @param array $attributes Array of table attributes.
@@ -656,7 +656,7 @@ function drop() {
 /**
  * Creates an index object in ADOdb's datadict format
  *
- * This class stores information about a database index. As charactaristics
+ * This class stores information about a database index. As characteristics
  * of the index are loaded from the external source, methods and properties
  * of this class are used to build up the index description in ADOdb's
  * datadict format.

adodb.inc.php

@@ -1484,7 +1484,7 @@ function StartTrans($errfn = 'ADODB_TransMonitor') {
 
 
 	/**
-	 * Complete a transation.
+	 * Complete a transaction.
 	 *
 	 * Used together with StartTrans() to end a transaction. Monitors connection
 	 * for sql errors, and will commit or rollback as appropriate.
@@ -2301,7 +2301,7 @@ function CacheGetOne($secs2cache,$sql=false,$inputarr=false) {
 	 *                             This is only relevant if the returned string
 	 *                             is coming from a CHAR type field.
 	 *
-	 * @return array|bool 1D array containning the first row of the query
+	 * @return array|bool 1D array containing the first row of the query
 	 */
 	function GetCol($sql, $inputarr = false, $trim = false) {
 
@@ -3085,9 +3085,9 @@ function SetTransactionMode( $transaction_mode ) {
 		$this->_transmode  = $transaction_mode;
 	}
 /*
-http://msdn2.microsoft.com/en-US/ms173763.aspx
-http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
-http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+https://msdn2.microsoft.com/en-US/ms173763.aspx
+https://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+https://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
 http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
 */
 	function MetaTransaction($mode,$db) {
@@ -4533,7 +4533,7 @@ function getAssoc($force_array = false, $first2cols = false)
 	 * @param mixed $v		is the character timestamp in YYYY-MM-DD hh:mm:ss format
 	 * @param string [$fmt]	is the format to apply to it, using date()
 	 *
-	 * @return string a timestamp formated as user desires
+	 * @return string a timestamp formatted as user desires
 	 */
 	function UserTimeStamp($v,$fmt='Y-m-d H:i:s') {
 		if (is_numeric($v) && strlen($v)<14) {

datadict/datadict-postgres.inc.php

@@ -284,7 +284,7 @@ function alterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 
 		// does not have alter column
 		if (!$tableflds) {
-			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definition for PostgreSQL");
 			return array();
 		}
 		return $this->_recreate_copy_table($tabname, false, $tableflds,$tableoptions);
@@ -306,7 +306,7 @@ function dropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
 		if (!$has_drop_column && !$tableflds) {
 			if ($this->debug) {
-				ADOConnection::outp("dropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+				ADOConnection::outp("dropColumnSQL needs complete table-definition for PostgreSQL < 7.3");
 			}
 			return array();
 		}
@@ -335,7 +335,7 @@ function _recreate_copy_table($tabname, $dropflds, $tableflds, $tableoptions='')
 		foreach($this->metaColumns($tabname) as $fld) {
 			if (preg_match('/'.$fld->name.' (\w+)/i', $tableflds, $matches)) {
 				$new_type = strtoupper($matches[1]);
-				// AlterColumn of a char column to a nummeric one needs an explicit conversation
+				// AlterColumn of a char column to a numeric one needs an explicit conversation
 				if (in_array($new_type, array('I', 'I2', 'I4', 'I8', 'N', 'F')) &&
 					in_array($fld->type, array('varchar','char','text','bytea'))
 				) {
@@ -412,7 +412,7 @@ function _createSuffix($fname, &$ftype, $fnotnull, $fdefault, $fautoinc, $fconst
 		return $suffix;
 	}
 
-	// search for a sequence for the given table (asumes the seqence-name contains the table-name!)
+	// search for a sequence for the given table (assumes the sequence-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)

docs/changelog.md

@@ -1162,7 +1162,7 @@ other database types as well; all drivers derived from the above are also impact
 - odbc: clear fields before fetching. See PHPLens Issue No: 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 PHPLens Issue No: 19285
 - pgsql: Default driver (postgres/pgsql) is now postgres8

docs/changelog_v2.x.md

@@ -249,7 +249,7 @@ $conn->Connect($dsn);
 - Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
 - DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can be removed. Also if these functions are passed '' or null or false, we return a SQL null.
 - GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to indicate whether quotes should be inserted based on magic quote settings - suggested by dj#4ict.com.
-- Reformated docs slightly based on suggestions by Chris Small.
+- Reformatted docs slightly based on suggestions by Chris Small.
 
 ## 1.65 - 28 Dec 2001
 
@@ -462,7 +462,7 @@ $conn->Connect($dsn);
 - Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.
 - Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent empty dates.
 - Added MetaColumns($table) that returns an array of ADOFieldObject's listing the columns of a table.
-- Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.
+- Added transaction support for PostgreSQL -- thanks to "Eric G. Werk" egw#netguide.dk.
 - Added adodb-session.php for session support.
 
 ## 0.80 - 30 Nov 2000

drivers/adodb-ado.inc.php

@@ -122,7 +122,7 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDAS
 	adSchemaConstraintColumnUsage	= 6,
 	adSchemaConstraintTableUsage	= 7,
 	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
+	adSchemaReferentialConstraints	= 9,
 	adSchemaTableConstraints	= 10,
 	adSchemaColumnsDomainUsage	= 11,
 	adSchemaIndexes	= 12,

drivers/adodb-ado5.inc.php

@@ -147,7 +147,7 @@ function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDAS
 	adSchemaConstraintColumnUsage	= 6,
 	adSchemaConstraintTableUsage	= 7,
 	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
+	adSchemaReferentialConstraints	= 9,
 	adSchemaTableConstraints	= 10,
 	adSchemaColumnsDomainUsage	= 11,
 	adSchemaIndexes	= 12,

drivers/adodb-db2.inc.php

@@ -11,7 +11,7 @@
  * about all the changes, see the update information on the ADOdb website
  * for version 5.21.0.
  *
- * @link http://pecl.php.net/package/ibm_db2 PECL Extension For DB2
+ * @link https://pecl.php.net/package/ibm_db2 PECL Extension For DB2
  *
  * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
@@ -179,7 +179,7 @@ private function doDB2Connect($argDSN, $argUsername, $argPassword, $argDatabasen
 												$db2Options);
 		}
 		else
-		
+
 			$this->_connectionID = $db2Function($argDSN,
 												'',
 												'',
@@ -193,7 +193,7 @@ private function doDB2Connect($argDSN, $argUsername, $argPassword, $argDatabasen
 
 		if ($this->_connectionID && $argDatabasename)
 			$this->execute("SET SCHEMA=$argDatabasename");
-		
+
 		return $this->_connectionID != false;
 
 	}
@@ -228,7 +228,7 @@ private function unpackParameters($argDSN, $argUsername, $argPassword, $argDatab
 			$connectionParameters['dsn']      = $argDSN;
 			$connectionParameters['database'] = $argDatabasename;
 			$connectionParameters['catalogue'] = false;
-			
+
 			return $connectionParameters;
 		}
 

drivers/adodb-netezza.inc.php

@@ -61,7 +61,7 @@ class ADODB_netezza extends ADODB_postgres64 {
 	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
 	var $ansiOuter = true;
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
+							// https://bugs.php.net/bug.php?id=25404
 
 
 	function MetaColumns($table,$upper=true)

drivers/adodb-oci8.inc.php

@@ -105,7 +105,7 @@ class ADODB_oci8 extends ADOConnection {
 	var $_bind = array();
 	var $_nestedSQL = true;
 	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
+	var $leftOuter = '';  // oracle weirdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
 	var $session_sharing_force_blob = false; // alter session on updateblob if set to true
 	var $firstrows = true; // enable first rows optimization on SelectLimit()
 	var $selectOffsetAlg1 = 1000; // when to use 1st algorithm of selectlimit.

drivers/adodb-pdo_firebird.inc.php

@@ -33,7 +33,7 @@ class ADODB_pdo_firebird extends ADODB_pdo
 	var $arrayClass = 'ADORecordSet_array_pdo_firebird';
 
 	/**
-	 * Gets the version iformation from the server
+	 * Gets the version information from the server
 	 *
 	 * @return string[]
 	 */

drivers/adodb-postgres64.inc.php

@@ -82,7 +82,7 @@ class ADODB_postgres64 extends ADOConnection{
 							// http://bugs.php.net/bug.php?id=25404
 
 	var $uniqueIisR = true;
-	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
+	var $_bindInputArray = false; // requires PostgreSQL 7.3+ and ability to modify database
 	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
 
 	/** @var int $_pnum Number of the last assigned query parameter {@see param()} */
@@ -96,7 +96,7 @@ class ADODB_postgres64 extends ADOConnection{
 	// and writes these time in this format: "2001-03-01 18:59:26+02".
 	// There is no code for the "+02" time zone information, so I just left that out.
 	// I'm not familiar enough with both ADODB as well as Postgres
-	// to know what the concequences are. The other values are correct (wheren't in 0.94)
+	// to know what the consequences are. The other values are correct (weren't in 0.94)
 	// -- Freek Dijkstra
 
 	/**

pear/Auth/Container/ADOdb.php

@@ -289,7 +289,7 @@ function listUsers()
 
         $retVal = array();
 
-        // Find if db_fileds contains a *, i so assume all col are selected
+        // Find if db_fields contains a *, i so assume all col are selected
         if(strstr($this->options['db_fields'], '*')){
             $sql_from = "*";
         }

tests/test-active-relationsx.php

@@ -106,7 +106,7 @@ function ar_echo($txt)
 	$db->Execute("insert into songs (recordid, name, artistid) values(1,'No Hiding Place', 1)");
 	$db->Execute("insert into songs (recordid, name, artistid) values(2,'American Gangster Time', 1)");
 
-	// This class _implicitely_ relies on the 'people' table (pluralized form of 'person')
+	// This class _implicitly_ relies on the 'people' table (pluralized form of 'person')
 	class Person extends ADOdb_Active_Record
 	{
 		function __construct()
@@ -115,7 +115,7 @@ function __construct()
 			$this->hasMany('children');
 		}
 	}
-	// This class _implicitely_ relies on the 'children' table
+	// This class _implicitly_ relies on the 'children' table
 	class Child extends ADOdb_Active_Record
 	{
 		function __construct()
@@ -124,7 +124,7 @@ function __construct()
 			$this->belongsTo('person');
 		}
 	}
-	// This class _explicitely_ relies on the 'children' table and shares its metadata with Child
+	// This class _explicitly_ relies on the 'children' table and shares its metadata with Child
 	class Kid extends ADOdb_Active_Record
 	{
 		function __construct()
@@ -133,7 +133,7 @@ function __construct()
 			$this->belongsTo('person');
 		}
 	}
-	// This class _explicitely_ relies on the 'children' table but does not share its metadata
+	// This class _explicitly_ relies on the 'children' table but does not share its metadata
 	class Rugrat extends ADOdb_Active_Record
 	{
 		function __construct()

xsl/convert-0.1-0.2.xsl

@@ -8,7 +8,7 @@
 	<xsl:template match="/">
 		<xsl:comment>
 ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
+https://adodb-xmlschema.sourceforge.net
 </xsl:comment>
 
 		<xsl:element name="schema">
@@ -202,4 +202,4 @@ http://adodb-xmlschema.sourceforge.net
 			<xsl:value-of select="normalize-space(text())"/>
 		</xsl:element>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

xsl/convert-0.1-0.3.xsl

@@ -8,7 +8,7 @@
 	<xsl:template match="/">
 		<xsl:comment>
 ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
+https://adodb-xmlschema.sourceforge.net
 </xsl:comment>
 
 		<xsl:element name="schema">
@@ -218,4 +218,4 @@ http://adodb-xmlschema.sourceforge.net
 			<xsl:value-of select="normalize-space(text())"/>
 		</xsl:element>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

xsl/convert-0.2-0.1.xsl

@@ -8,7 +8,7 @@
 	<xsl:template match="/">
 		<xsl:comment>
 ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
+https://adodb-xmlschema.sourceforge.net
 </xsl:comment>
 
 		<xsl:element name="schema">
@@ -204,4 +204,4 @@ http://adodb-xmlschema.sourceforge.net
 			<xsl:value-of select="normalize-space(text())"/>
 		</xsl:element>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

xsl/convert-0.2-0.3.xsl

@@ -8,7 +8,7 @@
 	<xsl:template match="/">
 		<xsl:comment>
 ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
+https://adodb-xmlschema.sourceforge.net
 </xsl:comment>
 
 		<xsl:element name="schema">
@@ -278,4 +278,4 @@ http://adodb-xmlschema.sourceforge.net
 			<xsl:value-of select="normalize-space(text())"/>
 		</xsl:element>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>