[dZeeemp-cvs] dzeeemp.sources 404.php,1.3,1.4 iterate.php,1.8,1.9

[Boris B. <lo...@us...>]

Update of /cvsroot/dzeeemp/dzeeemp.sources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003

Modified Files:
	404.php iterate.php 
Log Message:
A lot of code fixed/improved

Index: 404.php
===================================================================
RCS file: /cvsroot/dzeeemp/dzeeemp.sources/404.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 404.php	24 May 2004 16:36:38 -0000	1.3
--- 404.php	13 Jun 2004 00:01:31 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  */
  
+ 
  /**
   * Started 
***************
*** 101,107 ****
  $query = parse_url($query);
  
  $query['path'] = str_replace($_CONFIG['core']['path'], '', $query['path']);
  
! if ( $query['path'][strlen($query['path'])-1] != '/' )
  {
      $query['path'] .= '/';
--- 102,113 ----
  $query = parse_url($query);
  
+ if ( !isset($query['path']) )
+ {
+     $query['path'] = '';
+ }
+ 
  $query['path'] = str_replace($_CONFIG['core']['path'], '', $query['path']);
  
! if ( isset($query['path'][strlen($query['path'])-1]) && $query['path'][strlen($query['path'])-1] != '/' )
  {
      $query['path'] .= '/';
***************
*** 133,137 ****
--- 139,146 ----
  // Fix url_rewrite's possible mistake -- make `new' parameter addition.
  if ( isset($query['query']) )
+ {
      $query['query'] = str_replace('?', $_CONFIG['urls']['get_delimeter'], $query['query']);
+ }
+ else $query['query'] = '';
  
  $data = explode ($_CONFIG['urls']['get_delimeter'], $query['query']);

Index: iterate.php
===================================================================
RCS file: /cvsroot/dzeeemp/dzeeemp.sources/iterate.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iterate.php	11 Jun 2004 10:57:26 -0000	1.8
--- iterate.php	13 Jun 2004 00:01:31 -0000	1.9
***************
*** 37,52 ****
  $__Debug     = &Thorn::getInstance('debug');
  
- // Short main libraries aliases
- // DEPRECATED!
- $db    = &$__Database;
- $log   = &$__Logs;
- $error = &$__Errors;
- 
  LibMisc::globalize('mod', 'section', 'rawquery');
  
! if ( !empty($section) ) 
! {
!     $dZeeemp->Data['section_key'] = $section;
! }
  $dZeeemp->Data['raw_query'] = $rawquery;
  
--- 37,45 ----
  $__Debug     = &Thorn::getInstance('debug');
  
  LibMisc::globalize('mod', 'section', 'rawquery');
  
! $dZeeemp->Data['section_key'] = empty($section)
!     ? ''
!     : $section;
  $dZeeemp->Data['raw_query'] = $rawquery;
  
***************
*** 85,89 ****
      $key = $__GlobCache->getActualKey($dZeeemp->Data['section_key']);
  
!     if ( $__GlobCache->exists($key) )
      {
          $__Debug->sign('Section taken from cache!', THORN_DEBUG_CACHE);
--- 78,82 ----
      $key = $__GlobCache->getActualKey($dZeeemp->Data['section_key']);
  
!     if ( $__GlobCache->exists($key) && !$__GlobCache->DenyCache )
      {
          $__Debug->sign('Section taken from cache!', THORN_DEBUG_CACHE);
***************
*** 234,240 ****
  $key = $__GlobCache->getActualKey($dZeeemp->Data['section_key']);
  
! if ( !$__GlobCache->exists($key) && !$__GlobCache->denyCache )
  {
!     $__GlobCache->insert($key, &$output);
  }
  
--- 227,234 ----
  $key = $__GlobCache->getActualKey($dZeeemp->Data['section_key']);
  
! 
! if ( !$__GlobCache->exists($key) && !$__GlobCache->DenyCache )
  {
!     $__GlobCache->insert($key, $output);
  }