From 1b11a038e49027d2e05182b0726397dd6aed650d Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 23 Feb 2009 13:03:51 -0700 Subject: [PATCH] Convert drivers to ucfirst names --- .../SessionHandler/lib/Horde/SessionHandler.php | 9 ++++---- .../Horde/SessionHandler/{ldap.php => Ldap.php} | 2 +- .../SessionHandler/{memcache.php => Memcache.php} | 2 +- .../Horde/SessionHandler/{mysql.php => Mysql.php} | 10 ++++----- .../Horde/SessionHandler/{none.php => None.php} | 4 ++-- .../Horde/SessionHandler/{oci8.php => Oci8.php} | 16 ++++++------- .../Horde/SessionHandler/{pgsql.php => Pgsql.php} | 12 +++++----- .../lib/Horde/SessionHandler/{sql.php => Sql.php} | 10 ++++----- framework/SessionHandler/package.xml | 26 +++++++++++----------- 9 files changed, 46 insertions(+), 45 deletions(-) rename framework/SessionHandler/lib/Horde/SessionHandler/{ldap.php => Ldap.php} (98%) rename framework/SessionHandler/lib/Horde/SessionHandler/{memcache.php => Memcache.php} (99%) rename framework/SessionHandler/lib/Horde/SessionHandler/{mysql.php => Mysql.php} (96%) rename framework/SessionHandler/lib/Horde/SessionHandler/{none.php => None.php} (92%) rename framework/SessionHandler/lib/Horde/SessionHandler/{oci8.php => Oci8.php} (94%) rename framework/SessionHandler/lib/Horde/SessionHandler/{pgsql.php => Pgsql.php} (96%) rename framework/SessionHandler/lib/Horde/SessionHandler/{sql.php => Sql.php} (97%) diff --git a/framework/SessionHandler/lib/Horde/SessionHandler.php b/framework/SessionHandler/lib/Horde/SessionHandler.php index 5a20f973b..48567485c 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler.php @@ -57,7 +57,8 @@ class Horde_SessionHandler * Attempts to return a concrete Horde_SessionHandler instance based on * $driver. * - * @param string $driver The type of concrete subclass to return. + * @param string $driver The type of concrete subclass to return + * (case-insensitive). * @param array $params A hash containing any additional configuration or * connection parameters a subclass might need. * @@ -66,7 +67,7 @@ class Horde_SessionHandler */ static public function factory($driver, $params = array()) { - $driver = basename($driver); + $driver = basename(strtolower($driver)); $persistent_params = array(); if ($driver == 'memcached') { @@ -79,7 +80,7 @@ class Horde_SessionHandler $params = array(); } - $class = 'Horde_SessionHandler_' . $driver; + $class = 'Horde_SessionHandler_' . ucfirst($driver); if (class_exists($class)) { if (empty($params)) { @@ -88,7 +89,7 @@ class Horde_SessionHandler return new $class(array_merge($params, $persistent_params)); } - throw new Horde_Exception('Class definition of ' . $class . ' not found.'); + throw new Horde_Exception('Driver "' . $driver . '" not found.'); } /** diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/ldap.php b/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php similarity index 98% rename from framework/SessionHandler/lib/Horde/SessionHandler/ldap.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php index 4aed3b523..a3e7767e6 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/ldap.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php @@ -17,7 +17,7 @@ * * @package Horde_SessionHandler */ -class Horde_SessionHandler_ldap extends Horde_SessionHandler +class Horde_SessionHandler_Ldap extends Horde_SessionHandler { /** * Handle for the current database connection. diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/memcache.php b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php similarity index 99% rename from framework/SessionHandler/lib/Horde/SessionHandler/memcache.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php index 7307516d4..59ba2cb63 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/memcache.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php @@ -25,7 +25,7 @@ * @author Michael Slusarz * @package Horde_SessionHandler */ -class Horde_SessionHandler_memcache extends Horde_SessionHandler +class Horde_SessionHandler_Memcache extends Horde_SessionHandler { /** * Horde_Memcache object. diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/mysql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php similarity index 96% rename from framework/SessionHandler/lib/Horde/SessionHandler/mysql.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php index 9a5aa0133..503c789c7 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/mysql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Mysql.php @@ -35,7 +35,7 @@ * @author Jan Schneider * @package Horde_SessionHandler */ -class Horde_SessionHandler_mysql extends Horde_SessionHandler +class Horde_SessionHandler_Mysql extends Horde_SessionHandler { /** * Handle for the current database connection. @@ -124,7 +124,7 @@ class Horde_SessionHandler_mysql extends Horde_SessionHandler } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_mysql::_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $result = @mysql_query($query, $this->_db); if (!$result) { @@ -195,7 +195,7 @@ class Horde_SessionHandler_mysql extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_mysql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = @mysql_query($query, $this->_db); @@ -235,7 +235,7 @@ class Horde_SessionHandler_mysql extends Horde_SessionHandler $this->_params['table'], (int)(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_mysql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = @mysql_query($query, $this->_db); @@ -264,7 +264,7 @@ class Horde_SessionHandler_mysql extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_mysql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $result = @mysql_query($query, $this->_db); if (!$result) { diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/none.php b/framework/SessionHandler/lib/Horde/SessionHandler/None.php similarity index 92% rename from framework/SessionHandler/lib/Horde/SessionHandler/none.php rename to framework/SessionHandler/lib/Horde/SessionHandler/None.php index c845cc95d..e886f7541 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/none.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/None.php @@ -1,6 +1,6 @@ * None. @@ -16,7 +16,7 @@ * @author Matt Selsky * @package Horde_SessionHandler */ -class Horde_SessionHandler_none extends Horde_SessionHandler +class Horde_SessionHandler_None extends Horde_SessionHandler { /** * Read the data for a particular session identifier from the backend. diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/oci8.php b/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php similarity index 94% rename from framework/SessionHandler/lib/Horde/SessionHandler/oci8.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php index 21c52ff6d..0dc3ce29f 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/oci8.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Oci8.php @@ -29,7 +29,7 @@ * @author Liam Hoekenga * @package Horde_SessionHandler */ -class Horde_SessionHandler_oci8 extends Horde_SessionHandler +class Horde_SessionHandler_Oci8 extends Horde_SessionHandler { /** * Handle for the current database connection. @@ -76,7 +76,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler /** * Close the backend. * - * @throws Horde_Exception + * @throws Horde_Exception */ protected function _close() { @@ -97,7 +97,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler $select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE', $this->_params['table'], $this->_quote($id)); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::_read(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $select_statement = OCIParse($this->_db, $select_query); OCIExecute($select_statement, OCI_DEFAULT); @@ -125,7 +125,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler $select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE', $this->_params['table'], $this->_quote($id)); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::_write(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_write(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $select_statement = OCIParse($this->_db, $select_query); OCIExecute($select_statement, OCI_DEFAULT); @@ -150,7 +150,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler $this->_quote($id), $this->_quote(time())); - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::_read(): query = "%s"', $insert_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $insert_query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $insert_statement = OCIParse($this->_db, $insert_query); $lob = OCINewDescriptor($this->_db); @@ -181,7 +181,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $statement = OCIParse($this->_db, $query); @@ -211,7 +211,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler $this->_params['table'], $this->_quote(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $statement = OCIParse($this->_db, $query); @@ -245,7 +245,7 @@ class Horde_SessionHandler_oci8 extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_oci8::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute query */ $statement = OCIParse($this->_db, $query); diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/pgsql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php similarity index 96% rename from framework/SessionHandler/lib/Horde/SessionHandler/pgsql.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php index e9de42718..8a9b4e1d0 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/pgsql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Pgsql.php @@ -36,7 +36,7 @@ * @author Jon Parise * @package Horde_SessionHandler */ -class Horde_SessionHandler_pgsql extends Horde_SessionHandler +class Horde_SessionHandler_Pgsql extends Horde_SessionHandler { /** * Handle for the current database connection. @@ -113,7 +113,7 @@ class Horde_SessionHandler_pgsql extends Horde_SessionHandler $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_pgsql::' . '_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $result = @pg_query($this->_db, $query); $data = pg_fetch_result($result, 0, 'session_data'); @@ -158,7 +158,7 @@ class Horde_SessionHandler_pgsql extends Horde_SessionHandler } /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_pgsql::' . '_write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); $result = @pg_query($this->_db, $query); $rows = pg_affected_rows($result); @@ -188,7 +188,7 @@ class Horde_SessionHandler_pgsql extends Horde_SessionHandler $this->_params['table'], $this->_quote($id)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_pgsql::' . 'destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = @pg_query($this->_db, $query); @@ -220,7 +220,7 @@ class Horde_SessionHandler_pgsql extends Horde_SessionHandler $this->_quote(time() - $maxlifetime)); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_pgsql::' . 'gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = @pg_query($this->_db, $query); @@ -251,7 +251,7 @@ class Horde_SessionHandler_pgsql extends Horde_SessionHandler time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_pgsql::' . 'getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = @pg_query($this->_db, $query); diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/sql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php similarity index 97% rename from framework/SessionHandler/lib/Horde/SessionHandler/sql.php rename to framework/SessionHandler/lib/Horde/SessionHandler/Sql.php index d9cd80e42..4f7ea5e08 100644 --- a/framework/SessionHandler/lib/Horde/SessionHandler/sql.php +++ b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php @@ -39,7 +39,7 @@ * @author Mike Cochrane * @package Horde_SessionHandler */ -class Horde_SessionHandler_sql extends Horde_SessionHandler +class Horde_SessionHandler_Sql extends Horde_SessionHandler { /** * Handle for the current database connection. @@ -170,7 +170,7 @@ class Horde_SessionHandler_sql extends Horde_SessionHandler $values = array($id); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_sql::write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = $this->_write_db->getOne($query, $values); @@ -222,7 +222,7 @@ class Horde_SessionHandler_sql extends Horde_SessionHandler $values = array($id); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_sql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = $this->_write_db->query($query, $values); @@ -255,7 +255,7 @@ class Horde_SessionHandler_sql extends Horde_SessionHandler $values = array(time() - $maxlifetime); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_sql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = $this->_write_db->query($query, $values); @@ -283,7 +283,7 @@ class Horde_SessionHandler_sql extends Horde_SessionHandler $values = array(time() - ini_get('session.gc_maxlifetime')); /* Log the query at a DEBUG log level. */ - Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_sql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG); /* Execute the query. */ $result = $this->_db->getCol($query, 0, $values); diff --git a/framework/SessionHandler/package.xml b/framework/SessionHandler/package.xml index cb58dffcc..c180a12f9 100644 --- a/framework/SessionHandler/package.xml +++ b/framework/SessionHandler/package.xml @@ -53,13 +53,13 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - + + + + + + + @@ -88,12 +88,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - + + + + + + -- 2.11.0