From: <al...@us...> - 2008-07-08 03:33:37
|
Revision: 599 http://sciret.svn.sourceforge.net/sciret/?rev=599&view=rev Author: alpeb Date: 2008-07-07 20:33:32 -0700 (Mon, 07 Jul 2008) Log Message: ----------- added some zend framework facilities, and play better with authenticated user objects coming from other apps Modified Paths: -------------- branches/release-candidates/sciret-1.2/index.php Modified: branches/release-candidates/sciret-1.2/index.php =================================================================== --- branches/release-candidates/sciret-1.2/index.php 2008-07-08 03:31:59 UTC (rev 598) +++ branches/release-candidates/sciret-1.2/index.php 2008-07-08 03:33:32 UTC (rev 599) @@ -13,14 +13,25 @@ error_reporting(E_ALL); ini_set('display_errors', 1); +$pathList = array( + get_include_path(), + dirname(__FILE__), + dirname(__FILE__).'/libs', + dirname(__FILE__).'/classes', + dirname(__FILE__).'/models', + dirname(__FILE__).'/modules/default/models', + dirname(__FILE__).'/modules/blog/models', + dirname(__FILE__).'/actions', +); +set_include_path(implode(PATH_SEPARATOR, $pathList)); +require_once 'Zend/Loader.php'; + $times = explode(' ', microtime()); $GLOBALS['startTime'] = $times[0] + $times[1]; -require 'classes/Library.php'; -require 'classes/DB.php'; -require 'models/User.php'; -require 'classes/Controller.php'; -require 'config.php'; +$config = new Zend_Config_Ini(dirname(__FILE__). '/config.ini', null, array('allowModifications' => true)); +Zend_Registry::set('config', $config); + require 'flowMap.php'; // MAGIC_QUOTES HANDLING @@ -32,22 +43,45 @@ } set_magic_quotes_runtime(0); -$db =& DB::DBFactory(DB_ENGINE, DB_HOST, DB_USER, DB_PASSWORD); +/************************** +* DATABASE +/**************************/ +$config->database->params->driver_options = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true); +$db = Zend_Db::factory($config->database); +$connectionFailed = false; +try { + $db->getConnection(); +} catch (Zend_Db_Adapter_Exception $e) { + $connectionFailed = true; +} +DB::setDBInstance($db); + if ((!in_array(@$_GET['action'], array('Install'))) && !in_array(@$_GET['view'], array('ConfigNotWritable', 'InstallEnterCredentials')) - && (DB_NAME == '' || !$db->connect() || !$db->selectDb(DB_NAME) || !$db->hasTables())) + && ($config->database->params->dbname == '' || $connectionFailed)) { $_GET['view'] = 'NotInstalled'; } -session_start(); -if (isset($_SESSION['userId'])) { - $user = new User($_SESSION['userId']); +Zend_Session::start(); +$auth = Zend_Auth::getInstance(); +if ($auth->hasIdentity()) { + $user = $auth->getStorage()->read(); + $user->init(); + if ($user->app == 'monkeys') { + $publicId = $user->publicId; + $user = new User($publicId); + $user->app = 'sciret'; + $auth->getStorage()->write($user); + } } else { - $user = new User; + // guest user + $user = new User(); } +Zend_Registry::set('user', $user); + $controller = new Controller($views, $actions, $user); if (isset($_GET['view'])) { @@ -58,4 +92,13 @@ $controller->processView(VIEW_DEFAULT); } + +/************************** +* AUTOLOADING FUNCTION +**************************/ +function __autoload($className) { + Zend_Loader::loadClass($className); +} + + ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |