xoops-cvs2 Mailing List for XOOPS Web Application System

Update of /cvsroot/xoops/xoops2/private/lib/xoops2/theme
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7565/private/lib/xoops2/theme

Modified Files:
      Tag: xoops2_1_0-branch
	theme.php 
Log Message:
Debugged page-level template selection (which was using theme.html as defaultFile and not the one defined in the theme description file).

Made the theme component generate debug events to track the templates it uses.

Index: theme.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/private/lib/xoops2/theme/Attic/theme.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** theme.php	22 Aug 2004 01:39:12 -0000	1.1.2.5
--- theme.php	22 Aug 2004 14:23:18 -0000	1.1.2.6
***************
*** 61,65 ****
     * @var string
     **/
!    var $file = 'theme.html';
  	/**
  	* Currently enabled themes
--- 61,65 ----
     * @var string
     **/
!    var $file = '';
  	/**
  	* Currently enabled themes
***************
*** 153,156 ****
--- 153,157 ----
  				 		$path['root'] .= '/' . $path['type'] . '/' . $path['name'];
  					}
+ 					$GLOBALS[XOOPS]->services['logger']->logEvent( 'theme', 'Template ' . $tplpath . 'spotted as ' . $thmpath . $ext );
  					return $this->templateFiles[$tplpath] = $thmpath . $ext;
  				}
***************
*** 163,166 ****
--- 164,168 ----
  			foreach ( $exts as $ext ) {
  				if ( is_readable( $defpath . $ext ) ) {
+ 					$GLOBALS[XOOPS]->services['logger']->logEvent( 'theme', 'Template ' . $tplpath . 'spotted as ' . $defpath . $ext );
  					return $this->templateFiles[$tplpath] = $defpath . $ext;
  				}
***************
*** 187,191 ****
  		}
  		if ( !is_string( $tpl ) ) {
! 			if ( false === ( $tpl = $this->templatePath( $this->file ) ) ) {
  				$tpl = $this->templatePath( $this->defaultFile );
  			}
--- 189,193 ----
  		}
  		if ( !is_string( $tpl ) ) {
! 			if ( empty($this->file) || (false === ( $tpl = $this->templatePath($this->file) ) ) ) {
  				$tpl = $this->templatePath( $this->defaultFile );
  			}

Update of /cvsroot/xoops/xoops2/private/lib/xoops2/theme
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23401/private/lib/xoops2/theme

Modified Files:
      Tag: xoops2_1_0-branch
	theme.php 
Log Message:
Debugged page-level template selection.

A theme can now contain several templates for the page (I said page, not content), and modules can choose the one to be used by modifying
$xoops2->services['theme']->file = 'template_name'    once 'header.php' has been included

As an example, I think we'll introduce a new 'page template' for popups in the new default theme.

Index: theme.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/private/lib/xoops2/theme/Attic/theme.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** theme.php	16 Aug 2004 06:54:11 -0000	1.1.2.4
--- theme.php	22 Aug 2004 01:39:12 -0000	1.1.2.5
***************
*** 171,175 ****
  	}
  
! 	function display( $tpl = '' ) {
  		if ( $this->backCompat) {
  			require ($this->classPath . '/theme_20.render.inc.php');
--- 171,175 ----
  	}
  
! 	function display( $tpl = null ) {
  		if ( $this->backCompat) {
  			require ($this->classPath . '/theme_20.render.inc.php');
***************
*** 183,187 ****
   		$this->tplEngine->caching = 0;				// ??? @todo: Kept from Xoops 2.0.x, but to be kicked out
  
! 		$str = $this->tplEngine->fetch( $this->templatePath( empty($tpl) ? $this->defaultFile : $tpl ) );
  		echo $this->document->postProcess( $str );
  	}
--- 183,195 ----
   		$this->tplEngine->caching = 0;				// ??? @todo: Kept from Xoops 2.0.x, but to be kicked out
  
! 		if ( isset($tpl) ) {
! 			$tpl = $this->templatePath( $tpl );
! 		}
! 		if ( !is_string( $tpl ) ) {
! 			if ( false === ( $tpl = $this->templatePath( $this->file ) ) ) {
! 				$tpl = $this->templatePath( $this->defaultFile );
! 			}
! 		}
! 		$str = $this->tplEngine->fetch( $tpl );
  		echo $this->document->postProcess( $str );
  	}

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21714

Modified Files:
      Tag: xoops2_1_0-branch
	header.php 
Log Message:
Enhanced theme instanciation:
Modules can now change the current theme by modifying $xoops2->defaults['xoops.theme']['name'] = 'mytheme';

This should allow articles management modules to change the theme depending on the article to be displayed :-D

PS: The theme selection block became a bit buggy, but it should be updated later anyway, so this can wait a little.
In the meantime, you can switch themes by adding  ?xoops_theme_select=themename to the query string (should be enough for dev / testing purposes )

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/header.php,v
retrieving revision 1.40.10.6
retrieving revision 1.40.10.7
diff -C2 -d -r1.40.10.6 -r1.40.10.7
*** header.php	16 Aug 2004 07:07:45 -0000	1.40.10.6
--- header.php	22 Aug 2004 01:32:15 -0000	1.40.10.7
***************
*** 37,47 ****
  
  // @todo make a real class for this block once blocks have been rethought
  function xoops_block_system_themechooser_init() {
! 	$allowed = $GLOBALS[XOOPS]->getClassVar( 'xoops.theme', 'allowedThemes' );
  	if ( in_array( @$_REQUEST['xoops_theme_select'], $allowed ) ) {
- 		$GLOBALS[XOOPS]->defaults['xoops.theme']['name'] = $_REQUEST['xoops_theme_select'];
  		$_SESSION['xoopsUserTheme'] = $_REQUEST['xoops_theme_select'];
! 	} elseif ( in_array( @$_SESSION['xoopsUserTheme'], $allowed ) ) {
! 		$GLOBALS[XOOPS]->defaults['xoops.theme']['name'] = $_SESSION['xoopsUserTheme'];
  	}
  }
--- 37,54 ----
  
  // @todo make a real class for this block once blocks have been rethought
+ /*
+ * Yet another lame workaround
+ * I want modules to be able to change the current theme (so an article management module can allow users
+ * to associate different themes to articles) by changing defaults['xoops.theme']['name'] before header.php is included.
+ * This explains the tests made in this function.
+ */
  function xoops_block_system_themechooser_init() {
! 	global $xoops2;
!   	$allowed = $xoops2->getClassVar( 'xoops.theme', 'allowedThemes' );
  	if ( in_array( @$_REQUEST['xoops_theme_select'], $allowed ) ) {
  		$_SESSION['xoopsUserTheme'] = $_REQUEST['xoops_theme_select'];
! 	}
! 	if ( ($xoops2->defaults['xoops.theme']['name'] == $GLOBALS['xoopsConfig']['theme_set']) && isset($_SESSION['xoopsUserTheme']) ) {
! 		$xoops2->defaults['xoops.theme']['name'] = $_SESSION['xoopsUserTheme'];
  	}
  }

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8735/include

Modified Files:
	version.php 
Log Message:
Updated version to 2.0.7.1

Index: version.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/version.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** version.php	14 Jun 2004 14:22:13 -0000	1.13
--- version.php	18 Aug 2004 03:29:37 -0000	1.14
***************
*** 1,3 ****
  <?php
! define("XOOPS_VERSION","XOOPS 2.0.7");
  ?>
\ No newline at end of file
--- 1,5 ----
  <?php
! // $Id$
! 
! define("XOOPS_VERSION","XOOPS 2.0.7.1");
  ?>
\ No newline at end of file

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27653

Modified Files:
	userinfo.php 
Log Message:
Changed the hardcoded value and used the correct XOOPS_SYSTEM_USER constant instead ( I just found where those were defined :-)

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/userinfo.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** userinfo.php	18 Aug 2004 00:55:13 -0000	1.16
--- userinfo.php	18 Aug 2004 01:49:11 -0000	1.17
***************
*** 30,33 ****
--- 30,35 ----
  include_once XOOPS_ROOT_PATH.'/class/module.textsanitizer.php';
  
+ include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+ 
  $uid = intval($HTTP_GET_VARS['uid']);
  if ($uid <= 0) {
***************
*** 39,43 ****
  $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
  
! $isAdmin = $gperm_handler->checkRight( 'system_admin', 2, $groups);			// isadmin is true if user has 'edit users' admin rights
  
  if (is_object($xoopsUser)) {
--- 41,45 ----
  $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
  
! $isAdmin = $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_USER, $groups);			// isadmin is true if user has 'edit users' admin rights
  
  if (is_object($xoopsUser)) {

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101/include

Modified Files:
	comment_view.php 
Log Message:
Fixed permissions checking in the comments system, so only users with comments admin rights can see administration links.

Index: comment_view.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_view.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** comment_view.php	14 Jun 2004 14:22:13 -0000	1.19
--- comment_view.php	18 Aug 2004 01:46:45 -0000	1.20
***************
*** 34,40 ****
  }
  include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
  if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
! 	
! 	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  	$comment_config = $xoopsModule->getInfo('comments');
  	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
--- 34,46 ----
  }
  include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+ include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
+ 
  if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
! 
! 	$gperm_handler = & xoops_gethandler( 'groupperm' );
! 	$groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
! 	$xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_COMMENT, $groups) );
! 
!  	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  	$comment_config = $xoopsModule->getInfo('comments');
  	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
***************
*** 173,177 ****
  		if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
  			$postcomment_link = 'comment_new.php?com_itemid='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode;
! 			
  			$xoopsTpl->assign('anon_canpost', true);
  		}
--- 179,183 ----
  		if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
  			$postcomment_link = 'comment_new.php?com_itemid='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode;
! 
  			$xoopsTpl->assign('anon_canpost', true);
  		}

Update of /cvsroot/xoops/xoops2/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26876/kernel

Modified Files:
	user.php 
Log Message:
Changes the default behavior of XoopsUser::isAdmin() when called without parameters. It now returns true only if the current user has administration rights for the current module.

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/user.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** user.php	11 Jan 2004 23:23:50 -0000	1.9
--- user.php	18 Aug 2004 01:45:50 -0000	1.10
***************
*** 199,208 ****
      }
      /**
!      * is the user admin? 
       * @param int $module_id check if user is admin of this module
  	 * @return bool is the user admin of that module?
       */
!     function isAdmin($module_id = 0)
!     {
          $moduleperm_handler =& xoops_gethandler('groupperm');
          return $moduleperm_handler->checkRight('module_admin', $module_id, $this->getGroups());
--- 199,217 ----
      }
      /**
!      * Is the user admin ?
!      *
!      * This method will return true if this user has admin rights for the specified module.<br />
!      * - If you don't specify any module ID, the current module will be checked.<br />
!      * - If you set the module_id to -1, it will return true if the user has admin rights for at least one module
!      *
       * @param int $module_id check if user is admin of this module
  	 * @return bool is the user admin of that module?
       */
!     function isAdmin( $module_id = null ) {
! 		if ( is_null( $module_id ) ) {
! 			$module_id = isset($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar( 'mid', 'n' ) : 1;
! 		} elseif ( intval($module_id) < 1 ) {
! 			$module_id = 0;
! 		}
          $moduleperm_handler =& xoops_gethandler('groupperm');
          return $moduleperm_handler->checkRight('module_admin', $module_id, $this->getGroups());
***************
*** 654,656 ****
      }
  }
! ?>
--- 663,665 ----
      }
  }
! ?>
\ No newline at end of file

Update of /cvsroot/xoops/xoops2/modules/system/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26439/modules/system/templates

Modified Files:
	system_comment.html 
Log Message:
Fixed permissions checking in the comments system, so only users with comments admin rights can see administration links.

Index: system_comment.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/templates/system_comment.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** system_comment.html	8 Jul 2003 12:38:10 -0000	1.4
--- system_comment.html	18 Aug 2004 01:42:43 -0000	1.5
***************
*** 23,27 ****
            <td class="even"></td>
  
!           <{if $xoops_isadmin == true}>
  
            <td class="even" align="right">
--- 23,27 ----
            <td class="even"></td>
  
!           <{if $xoops_iscommentadmin == true}>
  
            <td class="even" align="right">
***************
*** 48,50 ****
  
          </tr>
! <!-- end comment post -->
--- 48,50 ----
  
          </tr>
! <!-- end comment post -->
\ No newline at end of file

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19014

Modified Files:
	userinfo.php 
Log Message:
Updated permissions checking so only users with "edit users" system admin rights will see user-admin links.

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/userinfo.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** userinfo.php	18 Aug 2004 00:43:03 -0000	1.15
--- userinfo.php	18 Aug 2004 00:55:13 -0000	1.16
***************
*** 36,39 ****
--- 36,44 ----
  }
  
+ $gperm_handler = & xoops_gethandler( 'groupperm' );
+ $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
+ 
+ $isAdmin = $gperm_handler->checkRight( 'system_admin', 2, $groups);			// isadmin is true if user has 'edit users' admin rights
+ 
  if (is_object($xoopsUser)) {
  	if ($uid == $xoopsUser->getVar('uid')) {
***************
*** 77,81 ****
  }
  $myts =& MyTextSanitizer::getInstance();
! if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
  	$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
  	$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
--- 82,86 ----
  }
  $myts =& MyTextSanitizer::getInstance();
! if ( is_object($xoopsUser) && $isAdmin ) {
  	$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);
  	$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
***************
*** 126,129 ****
--- 131,135 ----
  } else {
  	if (is_object($xoopsUser)) {
+ 	 	// All admins will be allowed to see emails, even those that are not allowed to edit users (I think it's ok like this)
  		if ($xoopsUser->isAdmin() || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
  			$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
***************
*** 154,162 ****
  $mids =& array_keys($module_handler->getList($criteria));
  
- // Hack by marcan : only return results of modules for which user has access permission
- $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
- $gperm_handler = & xoops_gethandler( 'groupperm' );
- //End of hack by marcan
- 
  foreach ($mids as $mid) {
      // Hack by marcan : only return results of modules for which user has access permission
--- 160,163 ----

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17030

Modified Files:
	userinfo.php 
Log Message:
Removed extra spaces

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/userinfo.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** userinfo.php	14 Jun 2004 14:00:20 -0000	1.14
--- userinfo.php	18 Aug 2004 00:43:03 -0000	1.15
***************
*** 161,165 ****
  foreach ($mids as $mid) {
      // Hack by marcan : only return results of modules for which user has access permission
!   if ( $gperm_handler -> checkRight('module_read', $mid, $groups)) {
  	$module =& $module_handler->get($mid);
  	$results =& $module->search('', '', 5, 0, $thisUser->getVar('uid'));
--- 161,165 ----
  foreach ($mids as $mid) {
      // Hack by marcan : only return results of modules for which user has access permission
!   if ( $gperm_handler->checkRight('module_read', $mid, $groups)) {
  	$module =& $module_handler->get($mid);
  	$results =& $module->search('', '', 5, 0, $thisUser->getVar('uid'));

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31003

Modified Files:
	search.php 
Log Message:
Merging changes made on the 2.0.7.1 branch ( the ones done after  xoops2071-branch-pre_php5 ).

These are:
- bug #988715 fix (21/07 11:42)
- patch #928503  (21/07 14:35)
- the admin section $xoopsModule fix (27/07 20:47)
- the admin section $xoopsModuleConfig fix ( 27/07 12:05 )

Index: search.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/search.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** search.php	14 Jun 2004 14:22:13 -0000	1.15
--- search.php	17 Aug 2004 03:52:35 -0000	1.16
***************
*** 33,38 ****
  
  if ($xoopsConfigSearch['enable_search'] != 1) {
! 	header('Location: '.XOOPS_URL.'/index.php');
! 	exit();
  }
  
--- 33,38 ----
  
  if ($xoopsConfigSearch['enable_search'] != 1) {
!     header('Location: '.XOOPS_URL.'/index.php');
!     exit();
  }
  
***************
*** 48,261 ****
  $queries = array();
  
- if ($action == 'search') {
- 	include XOOPS_ROOT_PATH.'/header.php';
- 	include 'include/searchform.php';
- 	$search_form->display();
- 	include XOOPS_ROOT_PATH.'/footer.php';
- 	exit();
- }
- 
  if ( $action == "results" && $query == "" ) {
! 	redirect_header("search.php",1,_SR_PLZENTER);
! 	exit();
  }
  
  if ( $action == "showall" && ($query == "" || empty($mid)) ) {
! 	redirect_header("search.php",1,_SR_PLZENTER);
! 	exit();
  }
  
  if ($action == "showallbyuser" && (empty($mid) || empty($uid))) {
! 	redirect_header("search.php",1,_SR_PLZENTER);
! 	exit();
  }
  
  if ( $andor != "OR" && $andor != "exact" && $andor != "AND" ) {
! 	$andor = "AND";
  }
  
  $myts =& MyTextSanitizer::getInstance();
  if ($action != 'showallbyuser') {
! 	if ( $andor != "exact" ) {
! 		$ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
! 		$temp_queries = preg_split('/[\s,]+/', $query);
! 		foreach ($temp_queries as $q) {
! 			$q = trim($q);
! 			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
! 				$queries[] = $myts->addSlashes($q);
! 			} else {
! 				$ignored_queries[] = $myts->addSlashes($q);
! 			}
! 		}
! 		if (count($queries) == 0) {
! 			redirect_header('search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
! 			exit();
! 		}
! 	} else {
! 		$query = trim($query);
! 		if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
! 			redirect_header('search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
! 			exit();
! 		}
! 		$queries = array($myts->addSlashes($query));
! 	}
  }
- 
  switch ($action) {
! case "results":
! 	if (empty($mids) || !is_array($mids)) {
! 		unset($mids);
! 		$module_handler =& xoops_gethandler('module');
! 		$criteria = new CriteriaCompo(new Criteria('hassearch', 1));
! 		$criteria->add(new Criteria('isactive', 1));
! 		$mids =& array_keys($module_handler->getList($criteria));
! 	}
! 	include XOOPS_ROOT_PATH."/header.php";
! 	echo "<h3>"._SR_SEARCHRESULTS."</h3>\n";
! 	echo _SR_KEYWORDS.':';
! 	if ($andor != 'exact') {
! 		foreach ($queries as $q) {
! 			echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
! 		}
! 		if (!empty($ignored_queries)) {
! 			echo '<br />';
! 			printf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
! 			foreach ($ignored_queries as $q) {
! 				echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
! 			}
! 		}
! 	} else {
! 		echo ' "<b>'.htmlspecialchars(stripslashes($queries[0])).'</b>"';
! 	}
! 	echo '<br />';
! 	// Hack by marcan : only return results of modules for which user has access permission
! 	$groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
! 	$gperm_handler = & xoops_gethandler( 'groupperm' );
! 	//End of hack by marcan
! 	
! 	$module_handler =& xoops_gethandler('module');
! 	foreach ($mids as $mid) {
! 	    $mid = intval($mid);
! 	    $module =& $module_handler->get($mid);
! 	    if ( $gperm_handler -> checkRight('module_read', $mid, $groups)) {
! 	        $results =& $module->search($queries, $andor, 5, 0);
! 	        echo "<h4>".$myts->makeTboxData4Show($module->getVar('name'))."</h4>";
! 	        $count = count($results);
! 	        if (!is_array($results) || $count == 0) {
! 	            echo "<p>"._SR_NOMATCH."</p>";
! 	        } else {
! 	            for ($i = 0; $i < $count; $i++) {
! 	                if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
! 	                    echo "<img src='modules/".$module->getVar('dirname')."/".$results[$i]['image']."' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' />&nbsp;";
! 	                } else {
! 	                    echo "<img src='images/icons/posticon2.gif' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' width='26' height='26' />&nbsp;";
! 	                }
! 	                echo "<b><a href='modules/".$module->getVar('dirname')."/".$results[$i]['link']."'>".$myts->makeTboxData4Show($results[$i]['title'])."</a></b><br />\n";
! 	                echo "<small>";
! 	                $results[$i]['uid'] = intval($results[$i]['uid']);
! 	                if ( !empty($results[$i]['uid']) ) {
! 	                    $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
! 	                    echo "&nbsp;&nbsp;<a href='".XOOPS_URL."/userinfo.php?uid=".$results[$i]['uid']."'>".$uname."</a>\n";
! 	                }
! 	                echo $results[$i]['time'] ? " (". formatTimestamp(intval($results[$i]['time'])).")" : "";
! 	                echo "</small><br />\n";
! 	            }
! 	            if ( $count == 5 ) {
! 	                $search_url = XOOPS_URL.'/search.php?query='.urlencode(stripslashes(implode(' ', $queries)));
! 	                $search_url .= "&mid=$mid&action=showall&andor=$andor";
! 	                echo '<br /><a href="'.$search_url.'">'._SR_SHOWALLR.'</a></p>';
! 	            }
! 	        }
! 	    }
! 	    unset($results);
! 	    unset($module);
! 	}
! 	include "include/searchform.php";
! 	$search_form->display();
! 	break;
! case "showall":
! case 'showallbyuser':
! 	include XOOPS_ROOT_PATH."/header.php";
! 	$module_handler =& xoops_gethandler('module');
! 	$module =& $module_handler->get($mid);
! 	$results =& $module->search($queries, $andor, 20, $start, $uid);
! 	$count = count($results);
! 	if (is_array($results) && $count > 0) {
! 		$next_results =& $module->search($queries, $andor, 1, $start + 20, $uid);
! 		$next_count = count($next_results);
! 		$has_next = false;
! 		if (is_array($next_results) && $next_count == 1) {
! 				$has_next = true;
! 		}
! 		echo "<h4>"._SR_SEARCHRESULTS."</h4>\n";
! 		if ($action == 'showall') {
! 			echo _SR_KEYWORDS.':';
! 			if ($andor != 'exact') {
! 				foreach ($queries as $q) {
! 					echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
! 				}
! 			} else {
! 				echo ' "<b>'.htmlspecialchars(stripslashes($queries[0])).'</b>"';
! 			}
! 			echo '<br />';
! 		}
! 	//	printf(_SR_FOUND,$count);
! 	//	echo "<br />";
! 		printf(_SR_SHOWING, $start+1, $start + $count);
! 		echo "<h5>".$myts->makeTboxData4Show($module->getVar('name'))."</h5>";
! 		for ($i = 0; $i < $count; $i++) {
! 			if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
! 				echo "<img src='modules/".$module->getVar('dirname')."/".$results[$i]['image']."' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' />&nbsp;";
! 			} else {
! 				echo "<img src='images/icons/posticon2.gif' alt='".$myts->makeTboxData4Show($module->name())."' width='26' height='26' />&nbsp;";
! 			}
! 			echo "<b><a href='modules/".$module->getVar('dirname')."/".$results[$i]['link']."'>".$myts->makeTboxData4Show($results[$i]['title'])."</a></b><br />\n";
! 			echo "<small>";
! 			$results[$i]['uid'] = intval($results[$i]['uid']);
! 			if ( !empty($results[$i]['uid']) ) {
! 				$uname = XoopsUser::getUnameFromId($results[$i]['uid']);
! 				echo "&nbsp;&nbsp;<a href='".XOOPS_URL."/userinfo.php?uid=".$results[$i]['uid']."'>".$uname."</a>\n";
! 			}
! 			echo $results[$i]['time'] ? " (". formatTimestamp(intval($results[$i]['time'])).")" : "";
! 			echo "</small><br />\n";
! 		}
! 		echo '
  		<table>
  		  <tr>
  		';
! 		$search_url = XOOPS_URL.'/search.php?query='.urlencode(stripslashes(implode(' ', $queries)));
! 		$search_url .= "&mid=$mid&action=$action&andor=$andor";
! 		if ($action=='showallbyuser') {
! 			$search_url .= "&uid=$uid";
! 		}
! 		if ( $start > 0 ) {
! 			$prev = $start - 20;
! 			echo '<td align="left">
  			';
! 			$search_url_prev = $search_url."&start=$prev";
! 			echo '<a href="'.htmlspecialchars($search_url_prev).'">'._SR_PREVIOUS.'</a></td>
  			';
! 		}
! 		echo '<td>&nbsp;&nbsp;</td>
  		';
! 		if (false != $has_next) {
! 			$next = $start + 20;
! 			$search_url_next = $search_url."&start=$next";
! 			echo '<td align="right"><a href="'.htmlspecialchars($search_url_next).'">'._SR_NEXT.'</a></td>
  			';
! 		}
! 		echo '
  		  </tr>
  		</table>
  		<p>
  		';
! 	} else {
! 		echo '<p>'._SR_NOMATCH.'</p>';
! 	}
! 	include "include/searchform.php";
! 	$search_form->display();
! 	echo '</p>
  	';
! 	break;
  }
  include XOOPS_ROOT_PATH."/footer.php";
--- 48,260 ----
  $queries = array();
  
  if ( $action == "results" && $query == "" ) {
!     redirect_header("search.php",1,_SR_PLZENTER);
!     exit();
  }
  
  if ( $action == "showall" && ($query == "" || empty($mid)) ) {
!     redirect_header("search.php",1,_SR_PLZENTER);
!     exit();
  }
  
  if ($action == "showallbyuser" && (empty($mid) || empty($uid))) {
!     redirect_header("search.php",1,_SR_PLZENTER);
!     exit();
! }
! 
! $groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
! $gperm_handler = & xoops_gethandler( 'groupperm' );
! $available_modules = $gperm_handler->getItemIds('module_read', $groups);
! 
! if ($action == 'search') {
!     include XOOPS_ROOT_PATH.'/header.php';
!     include 'include/searchform.php';
!     $search_form->display();
!     include XOOPS_ROOT_PATH.'/footer.php';
!     exit();
  }
  
  if ( $andor != "OR" && $andor != "exact" && $andor != "AND" ) {
!     $andor = "AND";
  }
  
  $myts =& MyTextSanitizer::getInstance();
  if ($action != 'showallbyuser') {
!     if ( $andor != "exact" ) {
!         $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
!         $temp_queries = preg_split('/[\s,]+/', $query);
!         foreach ($temp_queries as $q) {
!             $q = trim($q);
!             if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
!                 $queries[] = $myts->addSlashes($q);
!             } else {
!                 $ignored_queries[] = $myts->addSlashes($q);
!             }
!         }
!         if (count($queries) == 0) {
!             redirect_header('search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
!             exit();
!         }
!     } else {
!         $query = trim($query);
!         if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
!             redirect_header('search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
!             exit();
!         }
!         $queries = array($myts->addSlashes($query));
!     }
  }
  switch ($action) {
!     case "results":
!     $module_handler =& xoops_gethandler('module');
!     $criteria = new CriteriaCompo(new Criteria('hassearch', 1));
!     $criteria->add(new Criteria('isactive', 1));
!     $criteria->add(new Criteria('mid', "(".implode(',', $available_modules).")", 'IN'));
!     $modules =& $module_handler->getObjects($criteria, true);
!     if (empty($mids) || !is_array($mids)) {
!         unset($mids);
!         $mids = array_keys($modules);
!     }
!     include XOOPS_ROOT_PATH."/header.php";
!     echo "<h3>"._SR_SEARCHRESULTS."</h3>\n";
!     echo _SR_KEYWORDS.':';
!     if ($andor != 'exact') {
!         foreach ($queries as $q) {
!             echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
!         }
!         if (!empty($ignored_queries)) {
!             echo '<br />';
!             printf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
!             foreach ($ignored_queries as $q) {
!                 echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
!             }
!         }
!     } else {
!         echo ' "<b>'.htmlspecialchars(stripslashes($queries[0])).'</b>"';
!     }
!     echo '<br />';
!     foreach ($mids as $mid) {
!         $mid = intval($mid);
!         if ( in_array($mid, $available_modules) ) {
!             $module =& $modules[$mid];
!             $results =& $module->search($queries, $andor, 5, 0);
!             echo "<h4>".$myts->makeTboxData4Show($module->getVar('name'))."</h4>";
!             $count = count($results);
!             if (!is_array($results) || $count == 0) {
!                 echo "<p>"._SR_NOMATCH."</p>";
!             } else {
!                 for ($i = 0; $i < $count; $i++) {
!                     if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
!                         echo "<img src='modules/".$module->getVar('dirname')."/".$results[$i]['image']."' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' />&nbsp;";
!                     } else {
!                         echo "<img src='images/icons/posticon2.gif' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' width='26' height='26' />&nbsp;";
!                     }
!                     echo "<b><a href='modules/".$module->getVar('dirname')."/".$results[$i]['link']."'>".$myts->makeTboxData4Show($results[$i]['title'])."</a></b><br />\n";
!                     echo "<small>";
!                     $results[$i]['uid'] = intval($results[$i]['uid']);
!                     if ( !empty($results[$i]['uid']) ) {
!                         $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
!                         echo "&nbsp;&nbsp;<a href='".XOOPS_URL."/userinfo.php?uid=".$results[$i]['uid']."'>".$uname."</a>\n";
!                     }
!                     echo $results[$i]['time'] ? " (". formatTimestamp(intval($results[$i]['time'])).")" : "";
!                     echo "</small><br />\n";
!                 }
!                 if ( $count == 5 ) {
!                     $search_url = XOOPS_URL.'/search.php?query='.urlencode(stripslashes(implode(' ', $queries)));
!                     $search_url .= "&mid=$mid&action=showall&andor=$andor";
!                     echo '<br /><a href="'.$search_url.'">'._SR_SHOWALLR.'</a></p>';
!                 }
!             }
!         }
!         unset($results);
!         unset($module);
!     }
!     include "include/searchform.php";
!     $search_form->display();
!     break;
!     case "showall":
!     case 'showallbyuser':
!     include XOOPS_ROOT_PATH."/header.php";
!     $module_handler =& xoops_gethandler('module');
!     $module =& $module_handler->get($mid);
!     $results =& $module->search($queries, $andor, 20, $start, $uid);
!     $count = count($results);
!     if (is_array($results) && $count > 0) {
!         $next_results =& $module->search($queries, $andor, 1, $start + 20, $uid);
!         $next_count = count($next_results);
!         $has_next = false;
!         if (is_array($next_results) && $next_count == 1) {
!             $has_next = true;
!         }
!         echo "<h4>"._SR_SEARCHRESULTS."</h4>\n";
!         if ($action == 'showall') {
!             echo _SR_KEYWORDS.':';
!             if ($andor != 'exact') {
!                 foreach ($queries as $q) {
!                     echo ' <b>'.htmlspecialchars(stripslashes($q)).'</b>';
!                 }
!             } else {
!                 echo ' "<b>'.htmlspecialchars(stripslashes($queries[0])).'</b>"';
!             }
!             echo '<br />';
!         }
!         //	printf(_SR_FOUND,$count);
!         //	echo "<br />";
!         printf(_SR_SHOWING, $start+1, $start + $count);
!         echo "<h5>".$myts->makeTboxData4Show($module->getVar('name'))."</h5>";
!         for ($i = 0; $i < $count; $i++) {
!             if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
!                 echo "<img src='modules/".$module->getVar('dirname')."/".$results[$i]['image']."' alt='".$myts->makeTboxData4Show($module->getVar('name'))."' />&nbsp;";
!             } else {
!                 echo "<img src='images/icons/posticon2.gif' alt='".$myts->makeTboxData4Show($module->name())."' width='26' height='26' />&nbsp;";
!             }
!             echo "<b><a href='modules/".$module->getVar('dirname')."/".$results[$i]['link']."'>".$myts->makeTboxData4Show($results[$i]['title'])."</a></b><br />\n";
!             echo "<small>";
!             $results[$i]['uid'] = intval($results[$i]['uid']);
!             if ( !empty($results[$i]['uid']) ) {
!                 $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
!                 echo "&nbsp;&nbsp;<a href='".XOOPS_URL."/userinfo.php?uid=".$results[$i]['uid']."'>".$uname."</a>\n";
!             }
!             echo $results[$i]['time'] ? " (". formatTimestamp(intval($results[$i]['time'])).")" : "";
!             echo "</small><br />\n";
!         }
!         echo '
  		<table>
  		  <tr>
  		';
!         $search_url = XOOPS_URL.'/search.php?query='.urlencode(stripslashes(implode(' ', $queries)));
!         $search_url .= "&mid=$mid&action=$action&andor=$andor";
!         if ($action=='showallbyuser') {
!             $search_url .= "&uid=$uid";
!         }
!         if ( $start > 0 ) {
!             $prev = $start - 20;
!             echo '<td align="left">
  			';
!             $search_url_prev = $search_url."&start=$prev";
!             echo '<a href="'.htmlspecialchars($search_url_prev).'">'._SR_PREVIOUS.'</a></td>
  			';
!         }
!         echo '<td>&nbsp;&nbsp;</td>
  		';
!         if (false != $has_next) {
!             $next = $start + 20;
!             $search_url_next = $search_url."&start=$next";
!             echo '<td align="right"><a href="'.htmlspecialchars($search_url_next).'">'._SR_NEXT.'</a></td>
  			';
!         }
!         echo '
  		  </tr>
  		</table>
  		<p>
  		';
!     } else {
!         echo '<p>'._SR_NOMATCH.'</p>';
!     }
!     include "include/searchform.php";
!     $search_form->display();
!     echo '</p>
  	';
!     break;
  }
  include XOOPS_ROOT_PATH."/footer.php";

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31003/include

Modified Files:
	common.php cp_header.php functions.php searchform.php 
Log Message:
Merging changes made on the 2.0.7.1 branch ( the ones done after  xoops2071-branch-pre_php5 ).

These are:
- bug #988715 fix (21/07 11:42)
- patch #928503  (21/07 14:35)
- the admin section $xoopsModule fix (27/07 20:47)
- the admin section $xoopsModuleConfig fix ( 27/07 12:05 )

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/functions.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** functions.php	14 Jun 2004 14:22:13 -0000	1.67
--- functions.php	17 Aug 2004 03:52:35 -0000	1.68
***************
*** 385,388 ****
--- 385,396 ----
  			}
  		}
+ 		if (defined('SID') && (! isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
+ 		    if (!strstr($url, '?')) {
+ 		        $url .= '?' . SID;		        
+ 		    }
+ 		    else {
+ 		        $url .= '&'.SID;
+ 		    }
+ 		}
  		$url = preg_replace("/&/i", '&', htmlspecialchars($url, ENT_QUOTES));
  		$xoopsTpl->assign('url', $url);

Index: cp_header.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/cp_header.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cp_header.php	17 Aug 2004 03:29:51 -0000	1.8
--- cp_header.php	17 Aug 2004 03:52:35 -0000	1.9
***************
*** 10,13 ****
--- 10,18 ----
  $moduleperm_handler = & xoops_gethandler( 'groupperm' );
  if ( $xoopsUser ) {
+     $url_arr = explode('/',strstr($xoopsRequestUri,'/modules/'));
+     $module_handler =& xoops_gethandler('module');
+     $xoopsModule =& $module_handler->getByDirname($url_arr[2]);
+     unset($url_arr);
+     
      if ( !$moduleperm_handler->checkRight( 'module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups() ) ) {
          redirect_header( XOOPS_URL . "/user.php", 1, _NOPERM );
***************
*** 17,25 ****
      redirect_header( XOOPS_URL . "/user.php", 1, _NOPERM );
      exit();
! } 
  // include the default language file for the admin interface
  if ( file_exists( "../language/" . $xoopsConfig['language'] . "/admin.php" ) ) {
      include "../language/" . $xoopsConfig['language'] . "/admin.php";
  }
! 
  ?>
\ No newline at end of file
--- 22,38 ----
      redirect_header( XOOPS_URL . "/user.php", 1, _NOPERM );
      exit();
! }
! // set config values for this module
! if ( $xoopsModule->getVar( 'hasconfig' ) == 1 || $xoopsModule->getVar( 'hascomments' ) == 1 ) {
!     $config_handler = & xoops_gethandler( 'config' );
!     $xoopsModuleConfig = & $config_handler->getConfigsByCat( 0, $xoopsModule->getVar( 'mid' ) );
! }
! 
  // include the default language file for the admin interface
  if ( file_exists( "../language/" . $xoopsConfig['language'] . "/admin.php" ) ) {
      include "../language/" . $xoopsConfig['language'] . "/admin.php";
  }
! elseif ( file_exists( "../language/english/admin.php" ) ) {
!     include "../language/english/admin.php";
! }
  ?>
\ No newline at end of file

Index: searchform.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/searchform.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** searchform.php	14 Jun 2004 14:22:13 -0000	1.9
--- searchform.php	17 Aug 2004 03:52:35 -0000	1.10
***************
*** 40,48 ****
  	$mods_checkbox = new XoopsFormCheckBox(_SR_SEARCHIN, "mids[]", $mid);
  }
! $criteria = new CriteriaCompo();
! $criteria->add(new Criteria('hassearch', 1));
! $criteria->add(new Criteria('isactive', 1));
! $module_handler =& xoops_gethandler('module');
! $mods_checkbox->addOptionArray($module_handler->getList($criteria));
  $search_form->addElement($mods_checkbox);
  if ($xoopsConfigSearch['keyword_min'] > 0) {
--- 40,59 ----
  	$mods_checkbox = new XoopsFormCheckBox(_SR_SEARCHIN, "mids[]", $mid);
  }
! if (empty($modules)) {
!     $criteria = new CriteriaCompo();
!     $criteria->add(new Criteria('hassearch', 1));
!     $criteria->add(new Criteria('isactive', 1));
!     if (!empty($available_modules)) {
!         $criteria->add(new Criteria('mid', "(".implode(',', $available_modules).")", 'IN'));
!     }
!     $module_handler =& xoops_gethandler('module');
!     $mods_checkbox->addOptionArray($module_handler->getList($criteria));
! }
! else {
!     foreach ($modules as $mid => $module) {
!         $module_array[$mid] = $module->getVar('name');
!     }
!     $mods_checkbox->addOptionArray($module_array);
! }
  $search_form->addElement($mods_checkbox);
  if ($xoopsConfigSearch['keyword_min'] > 0) {

Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/common.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** common.php	17 Aug 2004 03:29:51 -0000	1.58
--- common.php	17 Aug 2004 03:52:34 -0000	1.59
***************
*** 249,253 ****
  
  	if (file_exists('./xoops_version.php')) {
! 		$url_arr = explode('/',strstr($xoopsRequestUri,'/modules/')); 
  		$module_handler =& xoops_gethandler('module');
  		$xoopsModule =& $module_handler->getByDirname($url_arr[2]);
--- 249,253 ----
  
  	if (file_exists('./xoops_version.php')) {
! 		$url_arr = explode('/',strstr($xoopsRequestUri,'/modules/'));
  		$module_handler =& xoops_gethandler('module');
  		$xoopsModule =& $module_handler->getByDirname($url_arr[2]);

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27825/include

Modified Files:
	comment_new.php comment_reply.php commentform.inc.php 
	common.php cp_header.php 
Log Message:
Merging changes made on the 2.0.7.1 branch ( corresponding tag is xoops2071-branch-pre_php5 )

Index: cp_header.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/cp_header.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cp_header.php	18 Mar 2003 00:26:09 -0000	1.7
--- cp_header.php	17 Aug 2004 03:29:51 -0000	1.8
***************
*** 1,3 ****
--- 1,4 ----
  <?php 
+ // $Id$
  /**
   * module files can include this file for admin authorization
***************
*** 7,18 ****
  include_once '../../../mainfile.php';
  include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
- $url_arr = explode( '/', str_replace( str_replace( 'https://', 'http://', XOOPS_URL . '/modules/' ), '', 'http://' . $HTTP_SERVER_VARS['HTTP_HOST'] . $xoopsRequestUri ) );
- $module_handler = & xoops_gethandler( 'module' );
- $xoopsModule = & $module_handler->getByDirname( $url_arr[0] );
- unset( $url_arr );
- if ( !is_object( $xoopsModule ) || !$xoopsModule->getVar( 'isactive' ) ) {
-     redirect_header( XOOPS_URL . '/', 1, _MODULENOEXIST );
-     exit();
- } 
  $moduleperm_handler = & xoops_gethandler( 'groupperm' );
  if ( $xoopsUser ) {
--- 8,11 ----
***************
*** 25,37 ****
      exit();
  } 
- // set config values for this module
- if ( $xoopsModule->getVar( 'hasconfig' ) == 1 || $xoopsModule->getVar( 'hascomments' ) == 1 ) {
-     $config_handler = & xoops_gethandler( 'config' );
-     $xoopsModuleConfig = & $config_handler->getConfigsByCat( 0, $xoopsModule->getVar( 'mid' ) );
- } 
  // include the default language file for the admin interface
  if ( file_exists( "../language/" . $xoopsConfig['language'] . "/admin.php" ) ) {
      include "../language/" . $xoopsConfig['language'] . "/admin.php";
! } 
  
  ?>
\ No newline at end of file
--- 18,25 ----
      exit();
  } 
  // include the default language file for the admin interface
  if ( file_exists( "../language/" . $xoopsConfig['language'] . "/admin.php" ) ) {
      include "../language/" . $xoopsConfig['language'] . "/admin.php";
! }
  
  ?>
\ No newline at end of file

Index: comment_new.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** comment_new.php	22 Feb 2003 12:41:56 -0000	1.8
--- comment_new.php	17 Aug 2004 03:29:51 -0000	1.9
***************
*** 51,55 ****
  		$com_title = $myts->htmlSpecialChars($com_replytitle);
  		if (!preg_match("/^re:/i", $com_title)) {
! 			$com_title = "Re: ".substr($com_title, 0, 56);
  		}
  	} else {
--- 51,55 ----
  		$com_title = $myts->htmlSpecialChars($com_replytitle);
  		if (!preg_match("/^re:/i", $com_title)) {
! 			$com_title = "Re: ".xoops_substr($com_title, 0, 56);
  		}
  	} else {

Index: comment_reply.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_reply.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** comment_reply.php	12 Feb 2003 11:34:53 -0000	1.7
--- comment_reply.php	17 Aug 2004 03:29:51 -0000	1.8
***************
*** 57,61 ****
  $r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
  if (!preg_match("/^re:/i", $com_title)) {
! 	$com_title = "Re: ".substr($com_title, 0, 56);
  }
  $com_pid = $com_id;
--- 57,61 ----
  $r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
  if (!preg_match("/^re:/i", $com_title)) {
! 	$com_title = "Re: ".xoops_substr($com_title, 0, 56);
  }
  $com_pid = $com_id;

Index: commentform.inc.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/commentform.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** commentform.inc.php	12 Feb 2003 11:34:53 -0000	1.5
--- commentform.inc.php	17 Aug 2004 03:29:51 -0000	1.6
***************
*** 30,34 ****
  $cform = new XoopsThemeForm(_CM_POSTCOMMENT, "commentform", "postcomment.php");
  if (!preg_match("/^re:/i", $subject)) {
! 	$subject = "Re: ".substr($subject,0,56);
  }
  $cform->addElement(new XoopsFormText(_CM_TITLE, 'subject', 50, 255, $subject), true);
--- 30,34 ----
  $cform = new XoopsThemeForm(_CM_POSTCOMMENT, "commentform", "postcomment.php");
  if (!preg_match("/^re:/i", $subject)) {
! 	$subject = "Re: ".xoops_substr($subject,0,56);
  }
  $cform->addElement(new XoopsFormText(_CM_TITLE, 'subject', 50, 255, $subject), true);

Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/common.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** common.php	17 Aug 2004 01:43:51 -0000	1.57
--- common.php	17 Aug 2004 03:29:51 -0000	1.58
***************
*** 249,255 ****
  
  	if (file_exists('./xoops_version.php')) {
! 		preg_match("/modules\/(\w*)/",$xoopsRequestUri,$url_arr);
  		$module_handler =& xoops_gethandler('module');
! 		$xoopsModule =& $module_handler->getByDirname($url_arr[1]);
  		unset($url_arr);
  		if (!$xoopsModule || !$xoopsModule->getVar('isactive')) {
--- 249,255 ----
  
  	if (file_exists('./xoops_version.php')) {
! 		$url_arr = explode('/',strstr($xoopsRequestUri,'/modules/')); 
  		$module_handler =& xoops_gethandler('module');
! 		$xoopsModule =& $module_handler->getByDirname($url_arr[2]);
  		unset($url_arr);
  		if (!$xoopsModule || !$xoopsModule->getVar('isactive')) {

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27825

Modified Files:
	edituser.php header.php 
Log Message:
Merging changes made on the 2.0.7.1 branch ( corresponding tag is xoops2071-branch-pre_php5 )

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/header.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** header.php	13 Jun 2004 05:47:31 -0000	1.40
--- header.php	17 Aug 2004 03:29:51 -0000	1.41
***************
*** 66,70 ****
  		$xoopsTpl->xoops_setDebugging(true);
  	}
! 	$xoopsTpl->assign(array('xoops_theme' => $xoopsConfig['theme_set'], 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/', 'xoops_themecss'=> xoops_getcss($xoopsConfig['theme_set']), 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
  	// Meta tags
  	$config_handler =& xoops_gethandler('config');
--- 66,70 ----
  		$xoopsTpl->xoops_setDebugging(true);
  	}
! 	$xoopsTpl->assign(array('xoops_theme' => $xoopsConfig['theme_set'], 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/', 'xoops_themecss'=> xoops_getcss($xoopsConfig['theme_set']), 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
  	// Meta tags
  	$config_handler =& xoops_gethandler('config');

Index: edituser.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/edituser.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** edituser.php	14 Jun 2004 14:22:12 -0000	1.22
--- edituser.php	17 Aug 2004 03:29:51 -0000	1.23
***************
*** 73,77 ****
  		$errors[] = _US_PASSNOTSAME;
  	} elseif ( ($password != '') && (strlen($password) < $xoopsConfigUser['minpass']) ) {
! 		$errors[] = printf(_US_PWDTOOSHORT,$xoopsConfigUser['minpass']);
  	}
  	if (count($errors) > 0) {
--- 73,77 ----
  		$errors[] = _US_PASSNOTSAME;
  	} elseif ( ($password != '') && (strlen($password) < $xoopsConfigUser['minpass']) ) {
! 		$errors[] = sprintf(_US_PWDTOOSHORT,$xoopsConfigUser['minpass']);
  	}
  	if (count($errors) > 0) {

Update of /cvsroot/xoops/xoops2/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27825/class

Modified Files:
	pagenav.php 
Log Message:
Merging changes made on the 2.0.7.1 branch ( corresponding tag is xoops2071-branch-pre_php5 )

Index: pagenav.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/pagenav.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pagenav.php	30 Sep 2003 06:44:13 -0000	1.8
--- pagenav.php	17 Aug 2004 03:29:50 -0000	1.9
***************
*** 141,145 ****
  			$ret .= '</select>';
  			if ($showbutton) {
! 				$ret .= '&nbsp;<input type="submit" vallue="'._GO.'" />';
  			}
  			$ret .= '</form>';
--- 141,145 ----
  			$ret .= '</select>';
  			if ($showbutton) {
! 				$ret .= '&nbsp;<input type="submit" value="'._GO.'" />';
  			}
  			$ret .= '</form>';

Update of /cvsroot/xoops/xoops2/private/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14303/private/etc

Removed Files:
	config_core.php rc_core.php services_registry.php 
Log Message:
Rollback...

Removing all 2.1.x related updates from the trunk, preparing the 2.0.7.1 release

--- rc_core.php DELETED ---

--- services_registry.php DELETED ---

--- config_core.php DELETED ---

Update of /cvsroot/xoops/xoops2/private
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14303/private

Removed Files:
	.htaccess 
Log Message:
Rollback...

Removing all 2.1.x related updates from the trunk, preparing the 2.0.7.1 release

--- .htaccess DELETED ---

Update of /cvsroot/xoops/xoops2/private/lib/xoops2/coca/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14303/private/lib/xoops2/coca/kernel

Removed Files:
	kernel.php kernel_rebuildregistry.php registry.php 
Log Message:
Rollback...

Removing all 2.1.x related updates from the trunk, preparing the 2.0.7.1 release

--- kernel.php DELETED ---

--- kernel_rebuildregistry.php DELETED ---

--- registry.php DELETED ---

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14013/include

Modified Files:
	common.php 
Log Message:
Rollback...

Removing all 2.1.x related updates from the trunk, preparing the 2.0.7.1 release

Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/common.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** common.php	3 Jul 2004 18:46:05 -0000	1.56
--- common.php	17 Aug 2004 01:43:51 -0000	1.57
***************
*** 29,49 ****
  	exit();
  } else {
- 	// @TODO: This should be defined in mainfile.php, and the /private folder moved outside of webroot when possible
- 	define( 'XOOPS_PRIVATE_PATH', XOOPS_ROOT_PATH . '/private' );
- 	define( 'XOOPS_PUBLIC_PATH', XOOPS_ROOT_PATH );
- 	define( 'XOOPS_ETC_PATH', XOOPS_PRIVATE_PATH . '/etc' );
- 	define( 'XOOPS_LIB_PATH', XOOPS_PRIVATE_PATH . '/lib' );
- 	define( 'XOOPS_VAR_PATH', XOOPS_PRIVATE_PATH . '/var' );
- 	define( 'XOOPS_CACHE_PATH', XOOPS_ROOT_PATH . '/cache' );
- 
- 	require_once XOOPS_LIB_PATH . '/xoops2/coca/kernel/kernel.php';
- 	// Initialize xoops kernel
- 	$GLOBALS[XOOPS] =& new Xoops2Kernel();
- 	$GLOBALS[XOOPS]->init( 'xoops.coca.kernel', array(
- 		'isAdmin' => ( defined('XOOPS_ADMIN_MODE') && XOOPS_ADMIN_MODE ) ? true : false,
- 		'instanceName' => defined('XOOPS_INSTANCE_NAME') ? XOOPS_INSTANCE_NAME : '',
- 		'bootfile' => defined('XOOPS_BOOT_FILE') ? XOOPS_BOOT_FILE : 'core'
- 	));
- 
  	// ############## Activate error handler ##############
  	include_once XOOPS_ROOT_PATH . '/class/errorhandler.php';
--- 29,32 ----
***************
*** 66,69 ****
--- 49,53 ----
  	define("XOOPS_MATCH_CONTAIN",3);
  	define("SMARTY_DIR", XOOPS_ROOT_PATH."/class/smarty/");
+ 	define("XOOPS_CACHE_PATH", XOOPS_ROOT_PATH."/cache");
  	define("XOOPS_UPLOAD_PATH", XOOPS_ROOT_PATH."/uploads");
  	define("XOOPS_THEME_PATH", XOOPS_ROOT_PATH."/themes");
***************
*** 86,90 ****
      // #################### Connect to DB ##################
  	require_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
! 	if ($_SERVER['REQUEST_METHOD'] != 'POST' || !xoops_refcheck(XOOPS_DB_CHKREF)) {
  		define('XOOPS_DB_PROXY', 1);
  	}
--- 70,74 ----
      // #################### Connect to DB ##################
  	require_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
! 	if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != 'POST' || !xoops_refcheck(XOOPS_DB_CHKREF)) {
  		define('XOOPS_DB_PROXY', 1);
  	}
***************
*** 112,118 ****
  	}
  
! 	if ($xoopsConfig['enable_badips'] == 1 && isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != '') {
  		foreach ($xoopsConfig['bad_ips'] as $bi) {
! 			if (!empty($bi) && preg_match("/".$bi."/", $_SERVER['REMOTE_ADDR'])) {
  				exit();
  			}
--- 96,102 ----
  	}
  
! 	if ($xoopsConfig['enable_badips'] == 1 && isset($HTTP_SERVER_VARS['REMOTE_ADDR']) && $HTTP_SERVER_VARS['REMOTE_ADDR'] != '') {
  		foreach ($xoopsConfig['bad_ips'] as $bi) {
! 			if (!empty($bi) && preg_match("/".$bi."/", $HTTP_SERVER_VARS['REMOTE_ADDR'])) {
  				exit();
  			}
***************
*** 178,189 ****
  	$member_handler =& xoops_gethandler('member');
  	$sess_handler =& xoops_gethandler('session');
! 	if ($xoopsConfig['use_ssl'] && isset($_POST[$xoopsConfig['sslpost_name']]) && $_POST[$xoopsConfig['sslpost_name']] != '') {
! 		session_id($_POST[$xoopsConfig['sslpost_name']]);
  	} elseif ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
! 		if (isset($_COOKIE[$xoopsConfig['session_name']])) {
! 			session_id($_COOKIE[$xoopsConfig['session_name']]);
  		} else {
  			// no custom session cookie set, destroy session if any
! 			$_SESSION = array();
  			//session_destroy();
  		}
--- 162,173 ----
  	$member_handler =& xoops_gethandler('member');
  	$sess_handler =& xoops_gethandler('session');
! 	if ($xoopsConfig['use_ssl'] && isset($HTTP_POST_VARS[$xoopsConfig['sslpost_name']]) && $HTTP_POST_VARS[$xoopsConfig['sslpost_name']] != '') {
! 		session_id($HTTP_POST_VARS[$xoopsConfig['sslpost_name']]);
  	} elseif ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
! 		if (isset($HTTP_COOKIE_VARS[$xoopsConfig['session_name']])) {
! 			session_id($HTTP_COOKIE_VARS[$xoopsConfig['session_name']]);
  		} else {
  			// no custom session cookie set, destroy session if any
! 			$HTTP_SESSION_VARS = array();
  			//session_destroy();
  		}
***************
*** 196,200 ****
  
  	//autologin
! 	//if(empty($_SESSION['xoopsUserId']) && isset($HTTP_COOKIE_VARS['autologin_uname']) && isset($HTTP_COOKIE_VARS['autologin_pass'])) {
  	//	$myts =& MyTextSanitizer::getInstance();
  	//	$uname = $myts->stripSlashesGPC($HTTP_COOKIE_VARS['autologin_uname']);
--- 180,184 ----
  
  	//autologin
! 	//if(empty($HTTP_SESSION_VARS['xoopsUserId']) && isset($HTTP_COOKIE_VARS['autologin_uname']) && isset($HTTP_COOKIE_VARS['autologin_pass'])) {
  	//	$myts =& MyTextSanitizer::getInstance();
  	//	$uname = $myts->stripSlashesGPC($HTTP_COOKIE_VARS['autologin_uname']);
***************
*** 208,213 ****
  	//		}
  			//$HTTP_SESSION_VARS = array();
! 	//		$_SESSION['xoopsUserId'] = $user->getVar('uid');
! 	//		$_SESSION['xoopsUserGroups'] = $user->getGroups();
  			// update autologin cookies
  	//		$expire = time() + $xoopsConfig['session_expire'] * 60 ;
--- 192,197 ----
  	//		}
  			//$HTTP_SESSION_VARS = array();
! 	//		$HTTP_SESSION_VARS['xoopsUserId'] = $user->getVar('uid');
! 	//		$HTTP_SESSION_VARS['xoopsUserGroups'] = $user->getGroups();
  			// update autologin cookies
  	//		$expire = time() + $xoopsConfig['session_expire'] * 60 ;
***************
*** 220,241 ****
  	//}
  
! 	if (!empty($_SESSION['xoopsUserId'])) {
! 		$xoopsUser =& $member_handler->getUser($_SESSION['xoopsUserId']);
  		if (!is_object($xoopsUser)) {
  			$xoopsUser = '';
! 			$_SESSION = array();
  		} else {
  			if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
  				setcookie($xoopsConfig['session_name'], session_id(), time()+(60*$xoopsConfig['session_expire']), '/',  '', 0);
  			}
! 			$xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
  			$xoopsUserIsAdmin = $xoopsUser->isAdmin();
  		}
  	}
! 	if (!empty($_POST['xoops_theme_select']) && in_array($_POST['xoops_theme_select'], $xoopsConfig['theme_set_allowed'])) {
! 		$xoopsConfig['theme_set'] = $_POST['xoops_theme_select'];
! 		$_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
! 	} elseif (!empty($_SESSION['xoopsUserTheme']) && in_array($_SESSION['xoopsUserTheme'], $xoopsConfig['theme_set_allowed'])) {
! 		$xoopsConfig['theme_set'] = $_SESSION['xoopsUserTheme'];
  	}
  
--- 204,225 ----
  	//}
  
! 	if (!empty($HTTP_SESSION_VARS['xoopsUserId'])) {
! 		$xoopsUser =& $member_handler->getUser($HTTP_SESSION_VARS['xoopsUserId']);
  		if (!is_object($xoopsUser)) {
  			$xoopsUser = '';
! 			$HTTP_SESSION_VARS = array();
  		} else {
  			if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
  				setcookie($xoopsConfig['session_name'], session_id(), time()+(60*$xoopsConfig['session_expire']), '/',  '', 0);
  			}
! 			$xoopsUser->setGroups($HTTP_SESSION_VARS['xoopsUserGroups']);
  			$xoopsUserIsAdmin = $xoopsUser->isAdmin();
  		}
  	}
! 	if (!empty($HTTP_POST_VARS['xoops_theme_select']) && in_array($HTTP_POST_VARS['xoops_theme_select'], $xoopsConfig['theme_set_allowed'])) {
! 		$xoopsConfig['theme_set'] = $HTTP_POST_VARS['xoops_theme_select'];
! 		$HTTP_SESSION_VARS['xoopsUserTheme'] = $HTTP_POST_VARS['xoops_theme_select'];
! 	} elseif (!empty($HTTP_SESSION_VARS['xoopsUserTheme']) && in_array($HTTP_SESSION_VARS['xoopsUserTheme'], $xoopsConfig['theme_set_allowed'])) {
! 		$xoopsConfig['theme_set'] = $HTTP_SESSION_VARS['xoopsUserTheme'];
  	}
  
***************
*** 249,253 ****
  				}
  			}
! 		} elseif (!empty($_POST['xoops_login'])) {
  			include_once XOOPS_ROOT_PATH.'/include/checklogin.php';
  			exit();
--- 233,237 ----
  				}
  			}
! 		} elseif (!empty($HTTP_POST_VARS['xoops_login'])) {
  			include_once XOOPS_ROOT_PATH.'/include/checklogin.php';
  			exit();

Update of /cvsroot/xoops/xoops2/themes/default22
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14916/themes/default22

Added Files:
      Tag: xoops2_1_0-branch
	page_default.stytpl theme.coca.php theme.css 
	theme_block.stytpl theme_blocks.css theme_layout.css 
Log Message:
Massive update (sorry, but couldn't really do otherwise)....
Am posting explanations on sourceforge :-)

- Added the new xoops debug console
- Added the dragibus php-based template engine
- Really implemented the xoops virtual path system and the xoops: smarty resource handler
- Added the xoops.output.document components
- Added the xoops.output.galerist component ( the viewer class )

see you soon pals...

--- NEW FILE: theme.coca.php ---
<?php
// $Id: theme.coca.php,v 1.1.2.1 2004/08/16 07:15:58 skalpa Exp $

return array(
	'fullName' => 'Xoops 2.1+ default XHTML theme',

	'contentType' => 'text/html',
	'defaultFile' => 'page_default',

	'templateTypes' => array(
		'smarty' => '.stytpl;.html'
	),
	'resources' => '*.gif;*.jpg;*.jpeg;*.png;*.css;*.htc;*.xbl;*.js;*.vbs;*.swf;*.mov',

	'columns' => array(
		XOOPS_THEMECOL_LEFT =>		'left column',
		XOOPS_THEMECOL_RIGHT =>		'right column',
		XOOPS_THEMECOL_ABOVE =>		'above content',
		XOOPS_THEMECOL_BELOW =>		'below content',
	),

);




?>
--- NEW FILE: theme_blocks.css ---
/* $Id: theme_blocks.css,v 1.1.2.1 2004/08/16 07:15:58 skalpa Exp $ */

.column_left .block {
	border-bottom:			1px solid #dddddd;
}
.column_left .blockcontent {
	padding:		.2em 0px .5em;
}

.column_left .blocktitle {
	color:			#666666;
	padding:		.3em .9em .1em;
	font-weight:	bold;
}

#content .block {
	border:				1px solid black;
	margin:				6px;
}

#content .blocktitle, #content table.block caption {
	font-weight:		bold;
	color:				#000000;
	background: 		#cccccc;
	text-align:			left;
	padding:			2px 0px 0px 1em;
	height:				21px;
	margin-left:		1px;
	margin-right:		1px;
}

#content .blockcontent {
	padding:			.1em .5em;
}



#content .block caption {
}
#content table.block {
	padding-top:			27px;
}
#content table.block caption {
	margin:			 	0px 6px -27px 6px;
}
table.block tbody tr {
	vertical-align:			top;
}
table.block tbody tr:hover {
	background-color:		#eeeeee;
}
table.block tbody th, table.block tbody td {
	padding:		.1em .5em ;
}

table.block tbody th {
	text-align:				left;
}

ul.menu {
	font-size:			85%;
}

ul.menu, ul.menu ul {
	list-style-type:	none;
	padding:			0px 1em 0px 1em;
	margin:				0px;
}

ul.menu a {
	display:		block;
	text-decoration:	none;
	color:			#639AD6;
}
ul.menu a:hover {
	color:				#00558B;
	background-color:	#EEEEFF;
}

--- NEW FILE: theme.css ---

@import url('theme_layout.css');
@import url('theme_blocks.css');



--- NEW FILE: theme_layout.css ---
/* $Id: theme_layout.css,v 1.1.2.1 2004/08/16 07:15:58 skalpa Exp $ */

html, body {
	height:		100%;
	margin:		0px;
}

body {
	border-left:	6px solid #2F5376;
	background:	url('images/page_bg.png') repeat-y left top;
}

.theme_header {
	display:	block;
	height:		80px;
	background-color:	#2F5376;
	color:				#ffffff;
}

.theme_bar {
	display:		block;
	color:			#000000;
	background:		#ffffff url('images/menubar.png') repeat-x left top;
	border-top:		1px solid #cccccc;
	border-bottom:	1px solid #cccccc;
	padding:		2px 1em;
	margin-bottom:	.4em;
}

.theme_menubar {
	font-weight:	bold;
	text-align:		right;
	margin-left:	166px;
}

.column_left {
	border-top:		1px solid #cccccc;
	float:			left;
	width:			166px;
}

.column_center {
	margin-left:	166px;
}

.column_right {
	float:			left;
	width:			170px;
}

.theme_footer {
	clear:			both;
	text-align:		center;
	text-transform:	lowercase;
	font-variant:	small-caps;
}

.theme_footer a {
	color:				inherit;
	text-decoration:	none;
}
--- NEW FILE: theme_block.stytpl ---
<div class="block">
	<div class="blocktitle"><{$me.title}></div>
	<div class="blockcontent"><{$me.content}></div>
</div>
--- NEW FILE: page_default.stytpl ---
<{document->doctype}>
<html xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>"
	<{document->namespaces}>
><head>
	<{* $Id: page_default.stytpl,v 1.1.2.1 2004/08/16 07:15:58 skalpa Exp $ *}>
	<!-- Xoops default22 theme -->
	<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
	<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
	<!--XOOPS_DOCUMENT_METAS-->
	<link rel="stylesheet" type="text/css" media="screen" href="<{xoopsurl /theme.css}>" />
	<link href="<{$xoops_url}>/favicon.ico" rel="SHORTCUT ICON" />

	<{theme->titleString}>
	<title><{$xoops_sitename}> - <{$xoops_pagetitle}></title>

<!-- RMV: added module header -->
<{$xoops_module_header}>
</head>
<body>
	<div class="theme_header">
		<a href="<{$xoops_url}>"><img src="<{xoopsurl /images/logo.png}>" style="width:115px;height:50px;margin:15px 5px" alt="" /></a>
	</div>
	<div class="column_left">
		<div class="theme_blocks" id="x2blocks_left">
			<{foreach item=me from=$xoops_lblocks}>
				<{include file="xoops:theme_block"}>
			<{/foreach}>
		</div>
	</div>
	<div class="theme_menubar theme_bar">
		Menu bar
	</div>
	<div class="column_center">
		<div class="theme_blocks" id="x2blocks_above">
			<{foreach item=block from=$xoops_ccblocks}>
			<{include file="default/theme_blockcenter_c.html"}>
			<{/foreach}>
		</div>
		<div id="content">
			<{$xoops_contents}>
		</div>
		<{include file="xoops:library/xoops.arch.logger/logger"}>
	</div>
	<div class="column_right">
		<div class="theme_blocks" id="x2blocks_right">
			<{foreach item=block from=$xoops_rblocks}>
			<{include file="default/theme_blockright.html"}>
			<{/foreach}>
		</div>
	</div>
	<div class="theme_footer theme_bar" style="display:none">
		<a href="http://www.xoops.org/">Powered by XOOPS &#169; 2oo2-2oo4 The XOOPS project.</a>
	</div>
</body>
</html>

Update of /cvsroot/xoops/xoops2/themes/default22/modules/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14916/themes/default22/modules/system

Added Files:
      Tag: xoops2_1_0-branch
	system_userinfo.html 
Log Message:
Massive update (sorry, but couldn't really do otherwise)....
Am posting explanations on sourceforge :-)

- Added the new xoops debug console
- Added the dragibus php-based template engine
- Really implemented the xoops virtual path system and the xoops: smarty resource handler
- Added the xoops.output.document components
- Added the xoops.output.galerist component ( the viewer class )

see you soon pals...

--- NEW FILE: system_userinfo.html ---
<{* $Id: system_userinfo.html,v 1.1.2.1 2004/08/16 07:15:58 skalpa Exp $ *}>

<{if $user_ownpage == true}>

<form name="usernav" action="user.php" method="post">

<br /><br />

<table width="70%" align="center" border="0">
  <tr align="center">
    <td><input type="button" value="<{$lang_editprofile}>"  />
    <input type="button" value="<{$lang_avatar}>"  />
    <input type="button" value="<{$lang_inbox}>"  />

    <{if $user_candelete == true}>
    <input type="button" value="<{$lang_deleteaccount}>"  />
    <{/if}>

    <input type="button" value="<{$lang_logout}>"  /></td>
  </tr>
</table>
</form>

<br /><br />
<{elseif $xoops_isadmin != false}>

<br /><br />

<table width="70%" align="center" border="0">
  <tr align="center">
    <td><input type="button" value="<{$lang_editprofile}>"  />
    <input type="button" value="<{$lang_deleteaccount}>"  />
  </tr>
</table>

<br /><br />
<{/if}>

<table cellspacing="1" class="block" style="float:left;width:47%">
	<caption><{$lang_allaboutuser}></caption>
	<tbody>
	<tr><th scope="row"><{$lang_avatar}></th>
		<td><img src="<{$user_avatarurl}>" alt="Avatar" /></td>
	</tr>
	<tr><th scope="row"><{$lang_realname}></th>
		<td><{$user_realname}></td>
	</tr>
	<tr><th scope="row"><{$lang_website}></th>
		<td><{$user_websiteurl}></td>
	</tr>
	<tr><th scope="row"><{$lang_email}></th>
		<td><{$user_email}></td>
	</tr>
	<tr><th scope="row"><{$lang_privmsg}></th>
		<td><{$user_pmlink}></td>
	</tr>
	<tr><th scope="row"><{$lang_icq}></th>
		<td><{$user_icq}></td>
	</tr>
	<tr><th scope="row"><{$lang_aim}></th>
		<td><{$user_aim}></td>
	</tr>
	<tr><th scope="row"><{$lang_yim}></th>
		<td><{$user_yim}></td>
	</tr>
	<tr><th scope="row"><{$lang_msnm}></th>
		<td><{$user_msnm}></td>
	</tr>
	<tr><th scope="row"><{$lang_location}></th>
		<td><{$user_location}></td>
	</tr>
	<tr><th scope="row"><{$lang_occupation}></th>
		<td><{$user_occupation}></td>
	</tr>
	<tr><th scope="row"><{$lang_interest}></th>
		<td><{$user_interest}></td>
	</tr>
	<tr><th scope="row"><{$lang_extrainfo}></th>
		<td><{$user_extrainfo}></td>
	</tr>
	</tbody>
</table>

<table cellspacing="1" class="block" style="float:right;width:47%">
	<caption><{$lang_statistics}></caption>
	<tr><th scope="row"><{$lang_membersince}></th>
		<td><{$user_joindate}></td>
	</tr>
	<tr><th scope="row"><{$lang_rank}></th>
		<td><{$user_rankimage}><br /><{$user_ranktitle}></td>
	</tr>
	<tr><th scope="row"><{$lang_posts}></th>
		<td><{$user_posts}></td>
	</tr>
	<tr><th scope="row"><{$lang_lastlogin}></th>
		<td><{$user_lastlogin}></td>
	</tr>
</table>

<div class="block" style="float:right;width:47%">
	<div class="blocktitle"><{$lang_signature}></div>
	<div class="blockcontent">skalpa.&gt;<{$user_signature}></div>
</div>
<br clear="both" />

<!-- start module search results loop -->
<{foreach item=module from=$modules}>

<p>
<h4><{$module.name}></h4>

  <!-- start results item loop -->
  <{foreach item=result from=$module.results}>

  <img src="<{$result.image}>" alt="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br /><small>(<{$result.time}>)</small><br />

  <{/foreach}>
  <!-- end results item loop -->

<{$module.showall_link}>
</p>

<{/foreach}>
<!-- end module search results loop -->

Update of /cvsroot/xoops/xoops2/themes/default22/modules/system/blocks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14916/themes/default22/modules/system/blocks

Added Files:
      Tag: xoops2_1_0-branch
	system_block_mainmenu.html system_block_themes.html 
	system_block_user.html 
Log Message:
Massive update (sorry, but couldn't really do otherwise)....
Am posting explanations on sourceforge :-)

- Added the new xoops debug console
- Added the dragibus php-based template engine
- Really implemented the xoops virtual path system and the xoops: smarty resource handler
- Added the xoops.output.document components
- Added the xoops.output.galerist component ( the viewer class )

see you soon pals...

--- NEW FILE: system_block_user.html ---
<ul class="system menu Usermenu">
	<li><a href="<{$xoops_url}>/user.php"><{$block.lang_youraccount}></a></li>
	<li><a href="<{$xoops_url}>/edituser.php"><{$block.lang_editaccount}></a></li>
	<li><a href="<{$xoops_url}>/notifications.php"><{$block.lang_notifications}></a></li>
	<li><a href="<{$xoops_url}>/user.php?op=logout"><{$block.lang_logout}></a></li>
	<li><a href="<{$xoops_url}>/notifications.php"><{$block.lang_notifications}></a></li>
	<li><{if $block.new_messages > 0}>
		<a class="important" href="<{$xoops_url}>/viewpmsg.php"><{$block.lang_inbox}> (<{$block.new_messages}>)</a>
	<{else}>
		<a href="<{$xoops_url}>/viewpmsg.php"><{$block.lang_inbox}></a>
	<{/if}></li>
	<{if $xoops_isadmin}><li><a href="<{$xoops_url}>/admin.php"><{$block.lang_adminmenu}></a></li><{/if}>
</ul>
--- NEW FILE: system_block_mainmenu.html ---
<ul class="system menu Mainmenu">
	<li><a href="<{$xoops_url}>/"><{$block.lang_home}></a></li>
	<{foreach item=module from=$block.modules}>
	<li><a href="<{$xoops_url}>/modules/<{$module.directory}>/"><{$module.name}></a>
		<{if $module.sublinks}>
		<ul><{foreach item=sublink from=$module.sublinks}>
			<li><a href="<{$sublink.url}>"><{$sublink.name}></a></li>
			<{/foreach}>
		</ul>
		<{/if}>
	</li>
	<{/foreach}>
</ul>
--- NEW FILE: system_block_themes.html ---
<form class="system Themes" action="<{$xoops_url}>/index.php" method="post">
	<{$block.theme_select}>
</form>

Update of /cvsroot/xoops/xoops2/themes/default22/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14916/themes/default22/images

Added Files:
      Tag: xoops2_1_0-branch
	input_bg.png left_blk_title_bg.png logo.png menubar.png 
	page_bg.png 
Log Message:
Massive update (sorry, but couldn't really do otherwise)....
Am posting explanations on sourceforge :-)

- Added the new xoops debug console
- Added the dragibus php-based template engine
- Really implemented the xoops virtual path system and the xoops: smarty resource handler
- Added the xoops.output.document components
- Added the xoops.output.galerist component ( the viewer class )

see you soon pals...

--- NEW FILE: left_blk_title_bg.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: page_bg.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: logo.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: menubar.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: input_bg.png ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/xoops/xoops2/themes/default22/modules/system/blocks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14771/blocks

Log Message:
Directory /cvsroot/xoops/xoops2/themes/default22/modules/system/blocks added to the repository
--> Using per-directory sticky tag `xoops2_1_0-branch'

Update of /cvsroot/xoops/xoops2/themes/default22/modules/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14737/system

Log Message:
Directory /cvsroot/xoops/xoops2/themes/default22/modules/system added to the repository
--> Using per-directory sticky tag `xoops2_1_0-branch'