Skip to content

Commit

Permalink
Consolidates the bulk of the admin and public bootstraps into core.php
Browse files Browse the repository at this point in the history
  • Loading branch information
@kriskelly
kriskelly committed Mar 13, 2007
1 parent 8eb22e3 commit 2e94607
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 232 deletions.
99 changes: 1 addition & 98 deletions admin/index.php
View file
Expand Up @@ -6,78 +6,7 @@
include '../paths.php'; include '../paths.php';
define('THEME_DIR', ADMIN_DIR.DIRECTORY_SEPARATOR.'themes'); define('THEME_DIR', ADMIN_DIR.DIRECTORY_SEPARATOR.'themes');


/** require_once '../core.php';
* Check for a config file which, if not present implies that the
* app has not been installed.
*/
if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'db.ini')) {
echo 'It looks like you have not properly setup Omeka to run. <a href="'.$root.dirname(dirname($_SERVER['PHP_SELF'])).DIRECTORY_SEPARATOR.'install/install.php">Click here to install Omeka.</a>';
exit;
}

require_once 'Doctrine.compiled.php';

require_once 'Zend/Config/Ini.php';
$db = new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'db.ini', 'database');
Zend::register('db_ini', $db);

$dbh = new PDO($db->type.':host='.$db->host.';dbname='.$db->name, $db->username, $db->password);

Doctrine_Manager::connection($dbh);

// sets a final attribute validation setting to true
$manager = Doctrine_Manager::getInstance();
$manager->setAttribute(Doctrine::ATTR_VLD, true);
// not even sure that this does anything... n8
$manager->setAttribute(Doctrine::ATTR_FETCHMODE, Doctrine::FETCH_LAZY);

/**
* The search listener causes a 1.5x - 2x decrease in speed on my machine -n8
* Are we still planning on using Zend_Lucene for searching? If not let's
* pull these includes out
*/
// tack on the search capabilities
//require_once 'Kea'.DIRECTORY_SEPARATOR.'SearchListener.php';
require_once 'Kea'.DIRECTORY_SEPARATOR.'TimestampListener.php';
$chainListeners = new Doctrine_EventListener_Chain();
$chainListeners->add(new Kea_TimestampListener());
//$chainListeners->add(new Kea_SearchListener());
$manager->setAttribute(Doctrine::ATTR_LISTENER, $chainListeners);


// Use Zend_Config_Ini to store the info for the routes and db ini files
require_once 'Zend.php';

// Register the Doctrine Manager
Zend::register('doctrine', $manager);

Zend::register('routes_ini', new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'routes.ini'));
$config = new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'config.ini', 'site');
Zend::register('config_ini', $config);

// Require the front controller and router
require_once 'Zend/Controller/Front.php';
require_once 'Zend/Controller/RewriteRouter.php';

// Retrieve the ACL from the db, or create a new ACL object
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Option.php';
$options = $manager->getTable('option');
$results = $options->findByDql('name LIKE "acl"');
$acl = unserialize($results[0]->value);
Zend::register('acl', $acl);

// Initialize some stuff
$front = Kea_Controller_Front::getInstance();
$router = new Zend_Controller_RewriteRouter();
$router->addConfig(Zend::registry('routes_ini'), 'routes');
$front->setRouter($router);

require_once 'Zend/Controller/Request/Http.php';
$request = new Zend_Controller_Request_Http();
$front->setRequest($request);

// Removed 3/9/07 n8
//Zend::register('request', $request);


############################################# #############################################
# HERE IS WHERE WE SET THE ADMIN SWITCH # HERE IS WHERE WE SET THE ADMIN SWITCH
Expand All @@ -87,32 +16,6 @@
# END ADMIN SWITCH # END ADMIN SWITCH
############################################# #############################################


require_once 'Zend/Controller/Response/Http.php';
$response = new Zend_Controller_Response_Http();
$front->setResponse($response);

// Removed 3/9/07 n8
//Zend::register('response', $response);

#############################################
# INITIALIZE PLUGINS
#############################################
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'PluginTable.php';
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Plugin.php';

//Register all of the active plugins
$plugins = $manager->getTable('Plugin')->activeArray($router);
foreach( $plugins as $plugin )
{
$front->registerPlugin($plugin);
}
$front->throwExceptions((boolean) $config->debug->exceptions);

#############################################
# SET THE CONTROLLER DIRECTORY IN THE FRONT CONTROLLER
#############################################
$front->addControllerDirectory(CONTROLLER_DIR);

############################################# #############################################
# CHECKING TO SEE IF THE USER IS LOGGED IN IS HANDLED BY # CHECKING TO SEE IF THE USER IS LOGGED IN IS HANDLED BY
# THE Kea_Controller_Action::preDispatch() method # THE Kea_Controller_Action::preDispatch() method
Expand Down
134 changes: 134 additions & 0 deletions core.php
View file
@@ -0,0 +1,134 @@
<?php

require_once 'Doctrine.compiled.php';
require_once 'Zend.php';

/**
* Check for a config file which, if not present implies that the
* app has not been installed.
*/
if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'db.ini')) {
echo 'It looks like you have not properly setup Omeka to run. <a href="'.$root.dirname(dirname($_SERVER['PHP_SELF'])).DIRECTORY_SEPARATOR.'install/install.php">Click here to install Omeka.</a>';
exit;
}

require_once 'Zend/Config/Ini.php';
$db = new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'db.ini', 'database');
Zend::register('db_ini', $db);

$dbh = new PDO($db->type.':host='.$db->host.';dbname='.$db->name, $db->username, $db->password);

Doctrine_Manager::connection($dbh);

// sets a final attribute validation setting to true
$manager = Doctrine_Manager::getInstance();
$manager->setAttribute(Doctrine::ATTR_VLD, true);

//@todo Uncomment this prior to production release for increase in speed
//$manager->setAttribute(Doctrine::ATTR_CREATE_TABLES, false);

$manager->setAttribute(Doctrine::ATTR_FETCHMODE, Doctrine::FETCH_LAZY);



// tack on the search capabilities
require_once 'Kea'.DIRECTORY_SEPARATOR.'SearchListener.php';
require_once 'Kea'.DIRECTORY_SEPARATOR.'TimestampListener.php';
$chainListeners = new Doctrine_EventListener_Chain();
$chainListeners->add(new Kea_TimestampListener());
$chainListeners->add(new Kea_SearchListener());
$manager->setAttribute(Doctrine::ATTR_LISTENER, $chainListeners);



// Use Zend_Config_Ini to store the info for the routes and db ini files
require_once 'Zend.php';

require_once 'Kea.php';
spl_autoload_register(array('Kea', 'autoload'));

// Register the Doctrine Manager
Zend::register('doctrine', $manager);

Zend::register('routes_ini', new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'routes.ini'));
$config = new Zend_Config_Ini(CONFIG_DIR.DIRECTORY_SEPARATOR.'config.ini', 'site');
Zend::register('config_ini', $config);

// Require the front controller and router
require_once 'Zend/Controller/Front.php';
require_once 'Zend/Controller/RewriteRouter.php';


// Retrieve the ACL from the db, or create a new ACL object
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Option.php';
$options = $manager->getTable('option');
$results = $options->findByDql('name LIKE "acl"');
if (count($results) == 0) {
require_once 'Kea/Acl.php';
require_once 'Zend/Acl/Role.php';
require_once 'Zend/Acl/Resource.php';

$acl = new Kea_Acl();
$role = new Zend_Acl_Role('super');

$acl->addRole($role);

$acl->add(new Zend_Acl_Resource('item'));
$acl->add(new Zend_Acl_Resource('add'), 'item');
$acl->add(new Zend_Acl_Resource('edit'), 'item');
$acl->add(new Zend_Acl_Resource('delete'), 'item');
$acl->add(new Zend_Acl_Resource('read'), 'item');

$acl->add(new Zend_Acl_Resource('themes'));
$acl->add(new Zend_Acl_Resource('set'),'themes');

$acl->allow('super');

$option = new Option;
$option->name = 'acl';
$option->value = serialize($acl);
$option->save();
Zend::register('acl', $acl);
}
else {
$acl = unserialize($results[0]->value);
Zend::register('acl', $acl);
}

// Initialize some stuff
$front = Kea_Controller_Front::getInstance();
$router = new Zend_Controller_RewriteRouter();
$router->addConfig(Zend::registry('routes_ini'), 'routes');
$front->setRouter($router);

require_once 'Zend/Controller/Request/Http.php';
$request = new Zend_Controller_Request_Http();
// Removed 3/9/07 n8
//Zend::register('request', $request);
$front->setRequest($request);

require_once 'Zend/Controller/Response/Http.php';
$response = new Zend_Controller_Response_Http();
// Removed 3/9/07 n8
//Zend::register('response', $response);
$front->setResponse($response);

#############################################
# INITIALIZE PLUGINS
#############################################
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'PluginTable.php';
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Plugin.php';


//Register all of the active plugins
$plugins = $manager->getTable('Plugin')->activeArray($router);
foreach( $plugins as $plugin )
{
$front->registerPlugin($plugin);
}

$front->throwExceptions((boolean) $config->debug->exceptions);

$front->addControllerDirectory(CONTROLLER_DIR);

?>
137 changes: 3 additions & 134 deletions index.php
View file
Expand Up @@ -2,144 +2,13 @@
// Ladies and Gentlemen, start your timers // Ladies and Gentlemen, start your timers
define('APP_START', microtime(true)); define('APP_START', microtime(true));


// Define the base path require_once 'paths.php';
define('BASE_DIR', dirname(__FILE__));


// Define some primitive settings so we don't need to load Zend_Config_Ini, yet //define('WEB_ADMIN', WEB_PUBLIC.DIRECTORY_SEPARATOR.'admin');
$site['application'] = 'application';
$site['libraries'] = 'libraries';
$site['controllers'] = 'controllers';
$site['models'] = 'models';
$site['config'] = 'config';

// Define Web routes
$root = 'http://'.$_SERVER['HTTP_HOST'];
define('WEB_DIR', $root.dirname($_SERVER['PHP_SELF']));
define('WEB_PUBLIC', WEB_DIR.DIRECTORY_SEPARATOR.'public');
define('WEB_ADMIN', WEB_PUBLIC.DIRECTORY_SEPARATOR.'admin');
define('WEB_THEME', WEB_PUBLIC.DIRECTORY_SEPARATOR.'themes');
define('WEB_SHARED', WEB_DIR.DIRECTORY_SEPARATOR.'shared');

// Define some constants based on those settings
define('MODEL_DIR', BASE_DIR.DIRECTORY_SEPARATOR.$site['application'].DIRECTORY_SEPARATOR.$site['models']);
define('LIB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.$site['application'].DIRECTORY_SEPARATOR.$site['libraries']);
define('APP_DIR', BASE_DIR.DIRECTORY_SEPARATOR.$site['application']);
define('PLUGIN_DIR', BASE_DIR .DIRECTORY_SEPARATOR.'plugins' );
define('ADMIN_THEME_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'themes'); define('ADMIN_THEME_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'themes');
define('THEME_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'themes'); define('THEME_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'themes');
define('SHARED_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'shared');

// Set the include path to the library path
// do we want to include the model paths here too? [NA]
set_include_path(get_include_path().PATH_SEPARATOR.BASE_DIR.DIRECTORY_SEPARATOR.$site['application'].DIRECTORY_SEPARATOR.$site['libraries'].DIRECTORY_SEPARATOR.'Zend_Incubator'.PATH_SEPARATOR.BASE_DIR.DIRECTORY_SEPARATOR.$site['application'].DIRECTORY_SEPARATOR.$site['libraries']);

require_once 'Doctrine.compiled.php';
require_once 'Zend.php';

require_once 'Zend/Config/Ini.php';
$db = new Zend_Config_Ini($site['application'].DIRECTORY_SEPARATOR.$site['config'].DIRECTORY_SEPARATOR.'db.ini', 'database');
Zend::register('db_ini', $db);

$dbh = new PDO($db->type.':host='.$db->host.';dbname='.$db->name, $db->username, $db->password);

Doctrine_Manager::connection($dbh);

// sets a final attribute validation setting to true
$manager = Doctrine_Manager::getInstance();
$manager->setAttribute(Doctrine::ATTR_VLD, true);
$manager->setAttribute(Doctrine::ATTR_FETCHMODE, Doctrine::FETCH_LAZY);

// tack on the search capabilities
require_once 'Kea'.DIRECTORY_SEPARATOR.'SearchListener.php';
require_once 'Kea'.DIRECTORY_SEPARATOR.'TimestampListener.php';
$chainListeners = new Doctrine_EventListener_Chain();
$chainListeners->add(new Kea_TimestampListener());
$chainListeners->add(new Kea_SearchListener());
$manager->setAttribute(Doctrine::ATTR_LISTENER, $chainListeners);

// Use Zend_Config_Ini to store the info for the routes and db ini files
require_once 'Zend.php';

require_once 'Kea.php';
spl_autoload_register(array('Kea', 'autoload'));

// Register the Doctrine Manager
Zend::register('doctrine', $manager);

Zend::register('routes_ini', new Zend_Config_Ini($site['application'].DIRECTORY_SEPARATOR.$site['config'].DIRECTORY_SEPARATOR.'routes.ini'));
$config = new Zend_Config_Ini($site['application'].DIRECTORY_SEPARATOR.$site['config'].DIRECTORY_SEPARATOR.'config.ini', 'site');
Zend::register('config_ini', $config);

// Require the front controller and router
require_once 'Zend/Controller/Front.php';
require_once 'Zend/Controller/RewriteRouter.php';


// Retrieve the ACL from the db, or create a new ACL object
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Option.php';
$options = $manager->getTable('option');
$results = $options->findByDql('name LIKE "acl"');
if (count($results) == 0) {
require_once 'Kea/Acl.php';
require_once 'Zend/Acl/Role.php';
require_once 'Zend/Acl/Resource.php';

$acl = new Kea_Acl();
$role = new Zend_Acl_Role('super');

$acl->addRole($role);

$acl->add(new Zend_Acl_Resource('item'));
$acl->add(new Zend_Acl_Resource('add'), 'item');
$acl->add(new Zend_Acl_Resource('edit'), 'item');
$acl->add(new Zend_Acl_Resource('delete'), 'item');
$acl->add(new Zend_Acl_Resource('read'), 'item');

$acl->add(new Zend_Acl_Resource('themes'));
$acl->add(new Zend_Acl_Resource('set'),'themes');

$acl->allow('super');

$option = new Option;
$option->name = 'acl';
$option->value = serialize($acl);
$option->save();
Zend::register('acl', $acl);
}
else {
Zend::register('acl', unserialize($results[0]->value));
$acl = unserialize($results[0]->value);
}

// Initialize some stuff
$front = Kea_Controller_Front::getInstance();
$router = new Zend_Controller_RewriteRouter();
$router->addConfig(Zend::registry('routes_ini'), 'routes');
$front->setRouter($router);

require_once 'Zend/Controller/Request/Http.php';
$request = new Zend_Controller_Request_Http();
Zend::register('request', $request);
$front->setRequest($request);

require_once 'Zend/Controller/Response/Http.php';
$response = new Zend_Controller_Response_Http();
Zend::register('response', $response);
$front->setResponse($response);


require_once MODEL_DIR.DIRECTORY_SEPARATOR.'PluginTable.php';
require_once MODEL_DIR.DIRECTORY_SEPARATOR.'Plugin.php';

//Register all of the active plugins
$plugins = $manager->getTable('Plugin')->activeArray($router);
foreach( $plugins as $plugin )
{
$front->registerPlugin($plugin);
}


$front->throwExceptions((boolean) $config->debug->exceptions); require_once 'core.php';
$front->addControllerDirectory($site['application'].DIRECTORY_SEPARATOR.$site['controllers']);


try{ try{
$front->dispatch(); $front->dispatch();
Expand Down

0 comments on commit 2e94607

Please sign in to comment.