index.php

Update of /var/cvs/Geeklog-2.x/Geeklog-2.x/public_html
In directory iowaoutdoors:/tmp/cvs-serv5325/public_html

Modified Files:
	index.php 
Log Message:
APC enhancements made


Index: index.php
============================================================
=======
RCS file:
/var/cvs/Geeklog-2.x/Geeklog-2.x/public_html/index.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** index.php	9 May 2006 19:03:34 -0000	1.20
--- index.php	6 Jul 2006 15:50:37 -0000	1.21
***************
*** 12,23 ****
  /**
   * Bring in the Geeklog 2 configuration file. NOTE: you
can't start the timer before this because
!  * the config file sets up the include_path
   */
! require_once '../config.php';
  
  /**
   * Timer object
   */
! require_once 'Timer.php';
  
  //Initialize and start timer
--- 12,27 ----
  /**
   * Bring in the Geeklog 2 configuration file. NOTE: you
can't start the timer before this because
!  * the config file sets up the include_path. 
!  * 
!  * This should be the only relative path for a require. 
The rest should be absolute if you want APC to
!  * help with performance a bit more.
!  * 
   */
! require '../config.php';
  
  /**
   * Timer object
   */
! require $glConf['path_system'] . 'Timer.php';
  
  //Initialize and start timer
***************
*** 29,58 ****
   * Simply class that allows clean access to values in
config.php (see above)
   */
! require_once 'system/Config.php';
  
  /**
   * Bring in the MVC controller 
   */
! require_once 'Geeklog/MVCnPHP/Controller.php';
  
  /**
   * Bring in Propel
   */
! require_once 'propel/Propel.php';
  
  /**
   * DAO Factory
   */
! require_once 'DataAccess/DAO.php';
  
  /**
   * Plugin model object
   */
! require_once 'models/Gl2Plugin.php';
  
  /**
   * The propel user model class
   */
! require_once 'models/Gl2User.php';
  
  /**
--- 33,62 ----
   * Simply class that allows clean access to values in
config.php (see above)
   */
! require $glConf['path_system'] . 'Config.php';
  
  /**
   * Bring in the MVC controller 
   */
! require $glConf['path_libraries'] .
'Geeklog/MVCnPHP/Controller.php';
  
  /**
   * Bring in Propel
   */
! require $glConf['path_libraries'] .
'propel/Propel.php';
  
  /**
   * DAO Factory
   */
! require $glConf['path_system'] . 'DataAccess/DAO.php';
  
  /**
   * Plugin model object
   */
! require $glConf['path_models'] . 'Gl2Plugin.php';
  
  /**
   * The propel user model class
   */
! require $glConf['path_models'] . 'Gl2User.php';
  
  /**
***************
*** 60,64 ****
   * works.
   */
! require_once 'models/Gl2Group.php';
  
  /**
--- 64,68 ----
   * works.
   */
! require $glConf['path_models'] . 'Gl2Group.php';
  
  /**
***************
*** 66,75 ****
   * that the event has been fired
   */
! require_once 'ActionManager.php';
  
  /**
   * Geeklog log 
   */
! require_once 'system/Log.php';
  
  // Initialize Propel
--- 70,79 ----
   * that the event has been fired
   */
! require $glConf['path_system'] . 'ActionManager.php';
  
  /**
   * Geeklog log 
   */
! require $glConf['path_system'] . 'Log.php';
  
  // Initialize Propel
***************
*** 88,92 ****
       * PEAR::HTTP_Session2
       */
!     require_once 'HTTP/Session2.php';
      
      try {
--- 92,96 ----
       * PEAR::HTTP_Session2
       */
!     require $glConf['path_libraries'] .
'HTTP/Session2.php';
      
      try {
***************
*** 110,114 ****
  }
  
! require_once 'PluginFactory.php';
  
  // Now load the set of enabled plugins. 
--- 114,118 ----
  }
  
! require $glConf['path_system'] . 'PluginFactory.php';
  
  // Now load the set of enabled plugins. 
***************
*** 137,141 ****
      }
      $configData = $glConf['path'] . 'mvcconfig.xml';
!     $controller = new MVCnPHP_Controller($configData,
MVC_XML);
      $controller->setBaseURL($glConf['site_url']);
      $controller->setViewDir($glConf['path_views']);
--- 141,145 ----
      }
      $configData = $glConf['path'] . 'mvcconfig.xml';
!     $controller = new MVCnPHP_Controller($configData);
      $controller->setBaseURL($glConf['site_url']);
      $controller->setViewDir($glConf['path_views']);
***************
*** 168,172 ****
          
      // Now show the exception to the user
!     require_once
"{$glConf['path_views']}Geeklog_showErrorView.php&q
uot;;
      $errorView = new Geeklog_showErrorView($e);
      $errorView->getView();
--- 172,176 ----
          
      // Now show the exception to the user
!     require
"{$glConf['path_views']}Geeklog_showErrorView.php&q
uot;;
      $errorView = new Geeklog_showErrorView($e);
      $errorView->getView();

_______________________________________________
geeklog2-cvs mailing list
geeklog2-cvslists.geeklog.net
http://lists.geeklog.net/mailman/listinfo/geeklog2-cvs