openfirst-cvscommit

[Astronouth7303 <ast...@us...>]

Update of /cvsroot/openfirst/base/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10354/config

Modified Files:
	globals.tpl 
Log Message:
-Replaced double quotes with singles
-Fixed Bug#157

Index: globals.tpl
===================================================================
RCS file: /cvsroot/openfirst/base/config/globals.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** globals.tpl	14 Mar 2005 00:50:00 -0000	1.8
--- globals.tpl	27 Apr 2005 20:37:30 -0000	1.9
***************
*** 45,55 ****
  // Determine what module the user is viewing
  
!  $currentmodule = str_replace($basepath, "", $_SERVER["SCRIPT_NAME"]);
!  $currentmodule = substr($currentmodule, 1, strpos($currentmodule, "/", 2) - 1);
  
  #FIXME: Use $fbasepath instead of getcwd()
   session_start();
   include('auth.php');
!  if(function_exists("glob")) {
     // Include the functions using glob();
     if(is_readable(getcwd() . "/../config/functions/")) {
--- 45,55 ----
  // Determine what module the user is viewing
  
!  $currentmodule = str_replace($basepath, '', $_SERVER['SCRIPT_NAME']);
!  $currentmodule = substr($currentmodule, 1, strpos($currentmodule, '/', 2) - 1);
  
  #FIXME: Use $fbasepath instead of getcwd()
   session_start();
   include('auth.php');
!  if(function_exists('glob')) {
     // Include the functions using glob();
     if(is_readable(getcwd() . "/../config/functions/")) {
***************
*** 66,72 ****
   }
  
!  $headers = "";
  
!  $incl = ofirst_dbquery("SELECT * FROM ofirst_config");
  
   // If there is no error then run the module add feature
--- 66,72 ----
   }
  
!  $headers = '';
  
!  $incl = ofirst_dbquery('SELECT * FROM ofirst_config');
  
   // If there is no error then run the module add feature
***************
*** 77,83 ****
       if( (bool) $module->active == true) {
         // Check if there are includes that need to be included
!        if(! $module->includes == ""){
           // If the list is not empty then explode the value and put it into inclist
!          $inclist = explode(",",$module->includes);
           // This is to remove an error that you have if you don't check if there are more then 2
           if(count($inclist) >= 2){
--- 77,83 ----
       if( (bool) $module->active == true) {
         // Check if there are includes that need to be included
!        if(!( $module->includes == '')){
           // If the list is not empty then explode the value and put it into inclist
!          $inclist = explode(',',$module->includes);
           // This is to remove an error that you have if you don't check if there are more then 2
           if(count($inclist) >= 2){
***************
*** 97,101 ****
            // If it is the current module then color the item
            if ($currentmodule == $module->modulename){
!             $headers .= " &#187; <font color='red'><u><a class='menu' href='$home$basepath/$module->modulename'>".ucwords($module->modulename)."</a></u></font> |";
  
              // Declare important variables so that headers can pick them up and preview them
--- 97,102 ----
            // If it is the current module then color the item
            if ($currentmodule == $module->modulename){
!             $headers .= " &#187; <font color='red'><u><a class='menu' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a></u></font> |
! ";
  
              // Declare important variables so that headers can pick them up and preview them
***************
*** 105,109 ****
  
            } else {
!             $headers .= " &#187; <a class='menu' href='$home$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |";
            }
          }
--- 106,111 ----
  
            } else {
!             $headers .= " &#187; <a class='menu' href='$basepath/$module->modulename'>".ucwords($module->modulename)."</a> |
! ";
            }
          }
***************
*** 112,115 ****
--- 114,119 ----
    }
  
+   if (!preg_match('/\A[a-zA-Z0-9]+\z/',session_id())) session_regenerate_id();
+ 
  session_write_close();
  ?>