- Use relative include paths, removes dependency on lib/ path - Added experimental AccessDB
/trunk/View.php |
---|
1,7 → 1,7 |
<?php |
require_once __DIR__ . '/Application.php'; |
require_once __DIR__ . '/AbstractModel.php'; |
require_once 'Application.php'; |
require_once 'AbstractModel.php'; |
/** |
* A general view handled by a controller according to the MVC pattern |
/trunk/Db/AccessDB.php |
---|
File deleted |
\ No newline at end of file |
/trunk/Db/MySQLDB.php |
---|
1,6 → 1,6 |
<?php |
require_once __DIR__ . '/Database.php'; |
require_once 'lib/Db/Database.php'; |
class MySQLDB extends Database |
{ |
/trunk/Db/ODBCDB.php |
---|
1,6 → 1,6 |
<?php |
require_once __DIR__ . '/Database.php'; |
require_once 'lib/Db/Database.php'; |
class ODBCDB extends Database |
{ |
12,13 → 12,38 |
public function __construct() |
{ |
// $this->_connection = @odbc_connect($this->_alias, $this->_username, $this->_password); |
$this->_dsn = 'odbc:' . $this->_alias; |
parent::__construct(); |
$this->_connection = @odbc_connect($this->_alias, "" ,""); |
} |
/** |
* Escapes a database name so that it can be used in a query. |
* |
* @param string $name |
* The name to be escaped |
* @return string |
* The escaped name |
*/ |
public function escapeName($name) |
{ |
return '[' . $name . ']'; |
} |
/** |
* (non-PHPdoc) |
* @see Database::_escapeAliasArray() |
*/ |
protected function _escapeAliasArray(array &$array) |
{ |
foreach ($array as $column => &$value) |
{ |
$value = $value . ' AS [' . $column . ']'; |
} |
return $array; |
} |
/** |
* (non-PHPdoc) |
* @see Database::_escapeValueArray() |
*/ |
protected function _escapeValueArray(array &$array, $suffix = '', array &$escape = array('`', '`')) |
/trunk/Db/Adapter.php |
---|
1,6 → 1,6 |
<?php |
require_once __DIR__ . '/../Model.php'; |
require_once 'lib/Model.php'; |
abstract class Adapter |
{ |
/trunk/Db/Database.php |
---|
1,8 → 1,8 |
<?php |
require_once __DIR__ . '/../global.inc'; |
require_once 'lib/global.inc'; |
require_once __DIR__ . '/../AbstractModel.php'; |
require_once 'lib/AbstractModel.php'; |
/** |
* Generic database model class using PDO (PHP Data Objects) |
/trunk/Db/Mapper.php |
---|
1,6 → 1,6 |
<?php |
require_once __DIR__ . '/Table.php'; |
require_once 'lib/Db/Table.php'; |
/** |
* Generic abstract database mapper class |
/trunk/Db/MySQLAdapter.php |
---|
1,7 → 1,7 |
<?php |
require_once __DIR__ . '/Adapter.php'; |
require_once __DIR__ . '/MySQLDB.php'; |
require_once 'lib/Db/Adapter.php'; |
require_once 'lib/Db/MySQLDB.php'; |
class MySQLAdapter extends Adapter |
{ |
/trunk/Db/Table.php |
---|
1,6 → 1,6 |
<?php |
require_once __DIR__ . '/../AbstractModel.php'; |
require_once 'lib/AbstractModel.php'; |
/** |
* Generic database table model class |
/trunk/Db/database.class.php |
---|
1,6 → 1,6 |
<?php |
require_once __LIB__ . '/../global.inc'; |
require_once 'global.inc'; |
/* NOTE: Obsolete with autoloader */ |
//require_once 'Zend/Registry.php'; |
/trunk/Model.php |
---|
1,7 → 1,5 |
<?php |
require_once __DIR__ . '/AbstractModel.php'; |
/** |
* Abstract model class |
* |
/trunk/Application.php |
---|
1,7 → 1,7 |
<?php |
require_once __DIR__ . '/AbstractModel.php'; |
require_once __DIR__ . '/Registry.php'; |
require_once 'lib/AbstractModel.php'; |
require_once 'lib/Registry.php'; |
/** |
* Basic application class |
/trunk/Controller.php |
---|
1,7 → 1,7 |
<?php |
require_once __DIR__ . '/Application.php'; |
require_once __DIR__ . '/View.php'; |
require_once 'lib/Application.php'; |
require_once 'lib/View.php'; |
/* lcfirst() is unavailable before PHP 5.3 */ |
if (false === function_exists('lcfirst')) |