0
@@ -1,6 +1,8 @@
0
 Version 0.11.2 -- Subversion
0
 -----------------
0
 
0
+* Removed log4php, since it wasn't being used to
0
+it's full potential
0
 * Updated smarty to 2.6.10
0
 
0
 Version 0.11.1 "Tobago" -- Dec 05 2005

0
@@ -2,7 +2,4 @@
0
 define("CONFIG_FILE_LOCATION", dirname(__FILE__).'/config.php');
0
 define("TMP_CACHE_LOCATION", dirname(__FILE__).'/tmp/cache');
0
 define("TMP_TEMPLATES_C_LOCATION", dirname(__FILE__).'/tmp/templates_c');
0
-define("LOG4PHP_LOGDIR", dirname(__FILE__).'/tmp/cache');
0
-define("LOG4PHP_CONFIGURATION", dirname(__FILE__).'/lib/log4php/log4php.properties');
0
-require_once(dirname(__FILE__).'/lib/log4php/LoggerManager.php');
0
 ?>

0
@@ -20,9 +20,6 @@
0
 
0
 require_once(dirname(__FILE__).'/fileloc.php');
0
 
0
-$log =& LoggerManager::getLogger('include.php');
0
-$log->debug('Starting include.php');
0
-
0
 /**
0
  * This file is included in every page.  It does all seutp functions including
0
  * importing additional functions/classes, setting up sessions and nls, and
0
@@ -204,7 +201,5 @@ else
0
   ModuleOperations::LoadModules(false);
0
 }
0
 
0
-$log->debug('Leaving include.php');
0
-
0
 # vim:ts=4 sw=4 noet
0
 ?>

0
@@ -20,10 +20,6 @@
0
 
0
 require_once(dirname(__FILE__).'/fileloc.php');
0
 
0
-$log =& LoggerManager::getLogger('index.php');
0
-$log->info('Serving URL:' . $_SERVER['REQUEST_URI']);
0
-$log->debug('Starting index.php');
0
-
0
 /**
0
  * Entry point for all non-admin pages
0
  *
0
@@ -118,7 +114,6 @@ $html = "";
0
 if (isset($_GET["print"]))
0
 {
0
   ($smarty->is_cached('print:'.$page, '', $pageinfo->template_id)?$cached="":$cached="not ");
0
-	$log->debug('Fetching: print:' . $pageinfo->template_id);
0
   $html = $smarty->fetch('print:'.$page, '', $pageinfo->template_id) . "\n";
0
 }
0
 else
0
@@ -127,12 +122,10 @@ else
0
   #If this is a case where a module doesn't want a template to be shown, just disable caching
0
   if (isset($_GET['id']) && isset($_GET[$_GET['id'].'showtemplate']) && $_GET[$_GET['id'].'showtemplate'] == 'false')
0
   {
0
-		$log->debug('Fetching: template:notemplate');
0
     $html = $smarty->fetch('template:notemplate') . "\n";
0
   }
0
   else
0
   {
0
-		$log->debug('Fetching: template:' . $pageinfo->template_id);
0
     $html = $smarty->fetch('template:'.$pageinfo->template_id) . "\n";
0
   }
0
 }
0
@@ -188,8 +181,6 @@ if (get_site_preference('enablesitedownmessage') == "1")
0
   $smarty->clear_all_cache();
0
 }
0
 
0
-$log->debug('Leaving index.php');
0
-
0
 if ($config["debug"] == true)
0
 {
0
   echo $sql_queries;

0
@@ -496,7 +496,6 @@ class CMSModule extends ModuleOperations
0
     $this->langhash = array();
0
     $this->params = array();
0
     $this->error = '';
0
-		$this->log =& LoggerManager::getLogger('module.php');
0
     array_push($this->params, array(
0
       'name' => 'lang',
0
       'default' => 'en_US',

0
@@ -141,9 +141,6 @@ class Smarty_CMS extends Smarty {
0
 
0
     function module_db_template($tpl_name, &$tpl_source, &$smarty_obj)
0
     {   
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting module_db_template');
0
-    	
0
         global $gCms;
0
 
0
         $db = &$gCms->db;
0
@@ -347,16 +344,12 @@ class Smarty_CMS extends Smarty {
0
 
0
   function template_get_template($tpl_name, &$tpl_source, &$smarty_obj)
0
   {
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting template_get_template');
0
-
0
     global $gCms;
0
     $config = $gCms->config;
0
 
0
     if (get_site_preference('enablesitedownmessage') == "1")
0
     {
0
       $tpl_source = get_site_preference('sitedownmessage');
0
-			$log->debug('Site down.  Leaving template_get_template');
0
       return true;
0
     }
0
     else
0
@@ -366,7 +359,6 @@ class Smarty_CMS extends Smarty {
0
       if ($tpl_name == 'notemplate')
0
       {
0
         $tpl_source = '{content}';
0
-				$log->debug('No Template.  Leaving template_get_template');
0
         return true;
0
       }
0
       else
0
@@ -402,32 +394,25 @@ class Smarty_CMS extends Smarty {
0
             $tpl_source = ereg_replace("\{\/?php\}", "", $tpl_source);
0
           }
0
 
0
-					$log->debug('Template Found.  Leaving template_get_template');
0
           return true;
0
         }
0
       }
0
-			$log->warn('No Template Found.  Leaving template_get_template');
0
       return false;
0
     }
0
   }
0
 
0
   function template_get_timestamp($tpl_name, &$tpl_timestamp, &$smarty_obj)
0
   {
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting template_get_timestamp');
0
-
0
     global $gCms;
0
 
0
     if (get_site_preference('enablesitedownmessage') == "1")
0
     {
0
       $tpl_timestamp = time();
0
-			$log->debug('Site down.  Leaving template_get_timestamp');
0
       return true;
0
     }
0
     else if (isset($_GET['id']) && isset($_GET[$_GET['id'].'showtemplate']) && $_GET[$_GET['id'].'showtemplate'] == 'false')
0
     {
0
       $tpl_timestamp = time();
0
-			$log->debug('No template needed.  Leaving template_get_timestamp');
0
       return true;
0
     }
0
     else
0
@@ -435,16 +420,12 @@ class Smarty_CMS extends Smarty {
0
       $pageinfo = &$gCms->variables['pageinfo'];
0
 
0
       $tpl_timestamp = $pageinfo->template_modified_date;
0
-			$log->debug('Template found.  Leaving template_get_timestamp');
0
       return true;
0
     }
0
   }
0
 
0
   function content_get_template($tpl_name, &$tpl_source, &$smarty_obj)
0
   {
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting content_get_template');
0
-
0
     global $gCms;
0
 
0
     $pageinfo = &$gCms->variables['pageinfo'];
0
@@ -454,7 +435,6 @@ class Smarty_CMS extends Smarty {
0
       #We've a custom error message...  return it here
0
       header("HTTP/1.0 404 Not Found");
0
       $tpl_source = get_site_preference('custom404');
0
-			$log->debug('Custom 404 message.  Leaving content_get_template');
0
       return true;
0
     }
0
     else
0
@@ -468,9 +448,7 @@ class Smarty_CMS extends Smarty {
0
           $contentobj->GetAdditionalContentBlocks();
0
         }
0
 
0
-				$log->debug('Running Show() now');
0
         $tpl_source = $contentobj->Show($tpl_name);
0
-				$log->debug('Done running Show()');
0
 
0
         #Perform the content data callback
0
         #This needs to go...
0
@@ -500,19 +478,14 @@ class Smarty_CMS extends Smarty {
0
           $tpl_source = ereg_replace("\{\/?php\}", "", $tpl_source);
0
         }
0
 
0
-				$log->debug('Content found.  Leaving content_get_template');
0
         return true;
0
       }
0
     }
0
-		$log->warn('Content not found.  Leaving content_get_template');
0
     return false;
0
   }
0
 
0
   function content_get_timestamp($tpl_name, &$tpl_timestamp, &$smarty_obj)
0
   {
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting content_get_timestamp');
0
-
0
     global $gCms;
0
 
0
     $pageinfo = $gCms->variables['pageinfo'];
0
@@ -533,7 +506,6 @@ class Smarty_CMS extends Smarty {
0
         $tpl_timestamp = time();
0
       }
0
     }
0
-		$log->debug('Leaving content_get_timestamp');
0
     return true;
0
   }
0
   
0
@@ -543,9 +515,6 @@ class Smarty_CMS extends Smarty {
0
     $pageinfo =& $gCms->variables['pageinfo'];
0
     $config = $gCms->config;
0
 
0
-		$log =& LoggerManager::getLogger('content.functions.php');
0
-		$log->debug('Starting module_get_template');
0
-
0
     #Run the execute_user function and replace {content} with it's output 
0
     if (isset($gCms->modules[$tpl_name]))
0
     {
0
@@ -586,7 +555,6 @@ class Smarty_CMS extends Smarty {
0
       }
0
     }
0
     
0
-		$log->debug("Encoding: " . (isset($line['encoding']) && $line['encoding'] != ''?$line['encoding']:get_encoding()));
0
     header("Content-Type: ".$gCms->variables['content-type']."; charset=" . (isset($line['encoding']) && $line['encoding'] != ''?$line['encoding']:get_encoding()));
0
     if (isset($gCms->variables['content-filename']) && $gCms->variables['content-filename'] != '')
0
     {

0
@@ -18,9 +18,6 @@
0
 
0
 function smarty_cms_function_bulletmenu($params, &$smarty) {
0
 
0
-	$log =& LoggerManager::getLogger('index.php');
0
-	$log->debug('Starting smarty_cms_function_bulletmenu');
0
-
0
   global $gCms;
0
   global $db;
0
   global $config;
0
@@ -181,19 +178,15 @@ function smarty_cms_function_bulletmenu($params, &$smarty) {
0
           # Now for the nasty part...  loop through all parents and show them and direct siblings
0
           if ($skipme)
0
           {
0
-						$log->debug('skipme is true');
0
             $blah = '';
0
             $count = 1;
0
             foreach (split('\.', $curpos) as $level)
0
             {
0
               $blah .= $level . '.';
0
-							#$log->debug('blah is ' . $blah . ' and hierarchy is ' . $onecontent->Hierarchy());
0
               if (strstr($onecontent->Hierarchy(), ContentManager::CreateFriendlyHierarchyPosition($blah)) == $onecontent->Hierarchy())
0
               {
0
-								$log->debug('It\'s a match -- ' . $depth . ' -- ' . ($count + 1));
0
                 if ($depth == ($count + 1))
0
                 {
0
-									$log->debug('Setting skipme to false');
0
                   $skipme = false;
0
                   continue;
0
                 }

0
@@ -18,9 +18,6 @@
0
 
0
 function smarty_cms_function_cms_module($params, &$smarty)
0
 {
0
-	$log =& LoggerManager::getLogger('function.cms_module.php');
0
-	$log->debug('Starting smarty_cms_function_cms_module');
0
-
0
   global $gCms;
0
   $cmsmodules = &$gCms->modules;
0
 
0
@@ -70,7 +67,6 @@ function smarty_cms_function_cms_module($params, &$smarty)
0
         }
0
         else
0
         {
0
-					$log->debug('Leaving smarty_cms_function_cms_module');
0
           return "<!-- Not a tag module -->\n";
0
         }
0
       }

0
@@ -18,9 +18,6 @@
0
 
0
 function smarty_cms_function_content($params, &$smarty)
0
 {
0
-	$log =& LoggerManager::getLogger('function.content.php');
0
-	$log->debug('Starting smarty_cms_function_content');
0
-
0
   global $gCms;
0
   $pageinfo = $gCms->variables['pageinfo'];
0
   if (isset($pageinfo) && $pageinfo !== FALSE)
0
@@ -80,7 +77,6 @@ function smarty_cms_function_content($params, &$smarty)
0
               }
0
               else
0
               {
0
-								$log->debug('Leaving smarty_cms_function_cms_module');
0
                 return "<!-- Not a tag module -->\n";
0
               }
0
             }
0
@@ -90,17 +86,14 @@ function smarty_cms_function_content($params, &$smarty)
0
     }
0
     else
0
     {
0
-			$log->debug('Content cachable: ' . $pageinfo->content_cachable);
0
       $result = '';
0
       $oldvalue = $smarty->caching;
0
       $smarty->caching = $pageinfo->content_cachable;
0
       $result = $smarty->fetch(str_replace(' ', '_', 'content:' . (isset($params['block'])?$params['block']:'content_en')), '', $pageinfo->content_id);
0
       $smarty->caching = $oldvalue;
0
-			$log->debug('Leaving smarty_cms_function_content');
0
       return $result;
0
     }
0
   }
0
-	$log->debug('Leaving smarty_cms_function_content');
0
   return '';
0
 }
0
 

0
@@ -18,9 +18,6 @@
0
 
0
 function smarty_cms_postfilter_postcompilefunc($tpl_output, &$smarty)
0
 {
0
-	$log =& LoggerManager::getLogger('postfilter.postcompile.php');
0
-	$log->debug('Starting smarty_cms_postfilter_postcompilefunc');
0
-
0
   $result = explode(':', $smarty->_current_file);
0
   if (count($result) > 1)
0
   {
0
@@ -35,7 +32,6 @@ function smarty_cms_postfilter_postcompilefunc($tpl_output, &$smarty)
0
           if ($gCms->modules[$key]['installed'] == true &&
0
             $gCms->modules[$key]['active'] == true)
0
           {
0
-						$log->debug('Calling ContentPostCompile');
0
             $gCms->modules[$key]['object']->ContentPostCompile($tpl_output);
0
           }
0
         }
0
@@ -47,7 +43,6 @@ function smarty_cms_postfilter_postcompilefunc($tpl_output, &$smarty)
0
           if ($gCms->modules[$key]['installed'] == true &&
0
             $gCms->modules[$key]['active'] == true)
0
           {
0
-						$log->debug('Calling TemplatePostCompile');
0
             $gCms->modules[$key]['object']->TemplatePostCompile($tpl_output);
0
           }
0
         }

0
@@ -18,8 +18,6 @@
0
 
0
 function smarty_cms_prefilter_precompilefunc($tpl_output, &$smarty)
0
 {
0
-	$log =& LoggerManager::getLogger('prefilter.precompilefunc.php');
0
-	$log->debug('Starting smarty_cms_prefilter_precompilefunc');
0
 
0
   $result = explode(':', $smarty->_current_file);
0
   if (count($result) > 1)
0
@@ -35,11 +33,9 @@ function smarty_cms_prefilter_precompilefunc($tpl_output, &$smarty)
0
           if ($gCms->modules[$key]['installed'] == true &&
0
             $gCms->modules[$key]['active'] == true)
0
           {
0
-						$log->debug('Calling ContentPreCompile');
0
             $gCms->modules[$key]['object']->ContentPreCompile($tpl_output);
0
             
0
             #For backwards compatibility, though I think PreCompile makes more sense
0
-						$log->debug('Calling ContentPreRender');
0
             $gCms->modules[$key]['object']->ContentPreRender($tpl_output);
0
           }
0
         }
0
@@ -51,7 +47,6 @@ function smarty_cms_prefilter_precompilefunc($tpl_output, &$smarty)
0
           if ($gCms->modules[$key]['installed'] == true &&
0
             $gCms->modules[$key]['active'] == true)
0
           {
0
-						$log->debug('Calling TemplatePreCompile');
0
             $gCms->modules[$key]['object']->TemplatePreCompile($tpl_output);
0
           }
0
         }

0
@@ -20,10 +20,6 @@
0
 
0
 require_once(dirname(__FILE__).'/fileloc.php');
0
 
0
-$log =& LoggerManager::getLogger('soap.php');
0
-$log->info('Serving URL:' . $_SERVER['REQUEST_URI']);
0
-$log->debug('Starting soap.php');
0
-
0
 /**
0
  * Entry point for all non-admin pages
0
  *
0
@@ -115,7 +111,6 @@ if (isset($cmsmodules))
0
         }
0
       else
0
         {
0
-		$log->debug('Leaving smarty_cms_function_cms_module');
0
     return "<!-- Not a tag module -->\n";
0
         }
0
     }
0
@@ -130,8 +125,6 @@ echo $modresult;
0
 
0
 $endtime = microtime();
0
 
0
-$log->debug('Leaving soap.php');
0
-
0
 if ($config["debug"] == true)
0
 {
0
   echo $sql_queries;