Exponent Content Management System

Update of /cvsroot/exponent/exponent/datatypes/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10302

Modified Files:
      Tag: release_0_96_5
	calendarmodule_config.php 
Log Message:
RSVP Template File updates
Fred

Index: calendarmodule_config.php
===================================================================
RCS file: /cvsroot/exponent/exponent/datatypes/definitions/calendarmodule_config.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** calendarmodule_config.php	6 Apr 2006 05:35:55 -0000	1.8
--- calendarmodule_config.php	27 Apr 2006 03:52:34 -0000	1.8.2.1
***************
*** 31,35 ****
  		DB_FIELD_TYPE=>DB_DEF_BOOLEAN),
  	'enable_feedback'=>array(
! 		DB_FIELD_TYPE=>DB_DEF_BOOLEAN)
  );
  
--- 31,35 ----
  		DB_FIELD_TYPE=>DB_DEF_BOOLEAN),
  	'enable_feedback'=>array(
! 		DB_FIELD_TYPE=>DB_DEF_BOOLEAN)	
  );

Update of /cvsroot/exponent/exponent/forms/email
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9272

Added Files:
      Tag: release_0_96_5
	RSVP Form.tpl _RSVP Form.tpl 
Log Message:
RSVP Template File updates
Fred

--- NEW FILE: RSVP Form.tpl ---
{*
 * Copyright (c) 2004-2006 OIC Group, Inc.
 * Written and Designed by James Hunt
 *
 * This file is part of Exponent
 *
 * Exponent is free software; you can redistribute
 * it and/or modify it under the terms of the GNU
 * General Public License as published by the Free
 * Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * GPL: http://www.gnu.org/licenses/gpl.txt
 *
 *}
<form method="post" action="">
<input type="hidden" name="module" value="{$module}"/>
<input type="hidden" name="formname" value="{$formname}"/>
<input type="hidden" name="action" value="{$action}"/>
<input type="hidden" name="src" value="{$loc->src}" />
<input type="hidden" name="msg" value="_Default" />
<input type="hidden" name="subject" value="RSVP Event Submisson" />
<input type="hidden" name="id" value="{$item->id}" />
<input type="hidden" name="eventtitle" value="{$item->title}" />
<input type="hidden" name="eventdate" value="{$item->eventstart|format_date:"%B %e, %Y, %l:%M %P"} - {$item->eventend|format_date:"%l:%M %P"}" />

<table cellpadding="2" cellspacing="0" border="0">
<tr>
	<td width="10" style="width: 10px" valign="top" colspan="2"><b>RSVP to This Event</b></td>
</tr>
<tr>
	<td valign="top">Your Name:</td>
	<td>
		<input type="text" name="name" />
	</td>
</tr>
<tr>
	<td valign="top">Your Email Address:</td>
	<td>
		<input type="text" name="email" />
	</td>
</tr>
<tr>
	<td valign="top">Your Phone:</td>
	<td>
		<input type="text" name="phone" />
	</td>
</tr>
<tr>
	<td valign="top">Number of Attendees:</td>
	<td>
		<input type="text" name="attendees" />
	</td>
</tr>

<tr>
	<td valign="top">Comments:</td>
	<td>
		<textarea name="Comments"></textarea>
	</td>
</tr>
<tr>
	<td colspan="2">
		<input type="submit" value="Send" />
	</td>
</tr>
</table>
</form>

--- NEW FILE: _RSVP Form.tpl ---
{*
 * Copyright (c) 2004-2006 OIC Group, Inc.
 * Written and Designed by James Hunt
 *
 * This file is part of Exponent
 *
 * Exponent is free software; you can redistribute
 * it and/or modify it under the terms of the GNU
 * General Public License as published by the Free
 * Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * GPL: http://www.gnu.org/licenses/gpl.txt
 *
 *}
RSVP for event: 
{$post.eventtitle}
{$post.eventdate}

Name:  {$post.name}
Email:    {$post.email}
Phone:    {$post.phone}
Attendees: {$post.attendees}
Comments:  {$post.comments}

Update of /cvsroot/exponent/exponent/modules/navigationmodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/navigationmodule/actions

Modified Files:
      Tag: release_0_96_5
	delete.php delete_template.php move_standalone.php order.php 
	order_templates.php remove.php reparent_standalone.php 
	save_contentpage.php save_externalalias.php 
	save_internalalias.php save_pagesetpage.php save_template.php 
Log Message:
cache clearing changes.
Fred

Index: remove.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/remove.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** remove.php	6 Apr 2006 05:36:22 -0000	1.8
--- remove.php	27 Apr 2006 03:47:46 -0000	1.8.2.1
***************
*** 27,32 ****
  		$section->parent = -1;
  		$db->updateObject($section,'section');
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		exponent_flow_redirect();
--- 27,31 ----
  		$section->parent = -1;
  		$db->updateObject($section,'section');
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		exponent_flow_redirect();

Index: reparent_standalone.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/reparent_standalone.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** reparent_standalone.php	6 Apr 2006 05:36:22 -0000	1.7
--- reparent_standalone.php	27 Apr 2006 03:47:46 -0000	1.7.2.1
***************
*** 27,32 ****
  		$db->increment('section','rank',1,'parent='.$standalone->parent.' AND rank >= '.$standalone->rank);
  		$db->updateObject($standalone,'section');
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		exponent_flow_redirect();
--- 27,31 ----
  		$db->increment('section','rank',1,'parent='.$standalone->parent.' AND rank >= '.$standalone->rank);
  		$db->updateObject($standalone,'section');
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		exponent_flow_redirect();

Index: delete_template.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/delete_template.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** delete_template.php	6 Apr 2006 05:36:22 -0000	1.10
--- delete_template.php	27 Apr 2006 03:47:46 -0000	1.10.2.1
***************
*** 40,45 ****
  			$db->decrement('section_template','rank',1,'parent='.$page->parent.' AND rank >= '.$page->rank);
  		}
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  		tmp_deleteLevel($page->id);
  
--- 40,44 ----
  			$db->decrement('section_template','rank',1,'parent='.$page->parent.' AND rank >= '.$page->rank);
  		}
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  		tmp_deleteLevel($page->id);
  

Index: delete.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/delete.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** delete.php	6 Apr 2006 05:36:22 -0000	1.10
--- delete.php	27 Apr 2006 03:47:46 -0000	1.10.2.1
***************
*** 27,32 ****
  		$db->decrement('section','rank',1,'rank > ' . $section->rank . ' AND parent='.$section->parent);
  		
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		exponent_flow_redirect();
--- 27,31 ----
  		$db->decrement('section','rank',1,'rank > ' . $section->rank . ' AND parent='.$section->parent);
  		
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		exponent_flow_redirect();

Index: save_pagesetpage.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/save_pagesetpage.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** save_pagesetpage.php	6 Apr 2006 05:36:22 -0000	1.10
--- save_pagesetpage.php	27 Apr 2006 03:47:46 -0000	1.10.2.1
***************
*** 38,43 ****
  	// that the pageset writer added to each element of the set.
  	
! 	if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  	navigationmodule::process_section($section,$_POST['pageset']);
--- 38,42 ----
  	// that the pageset writer added to each element of the set.
  	
! 	exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  	navigationmodule::process_section($section,$_POST['pageset']);

Index: save_internalalias.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/save_internalalias.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** save_internalalias.php	6 Apr 2006 05:36:22 -0000	1.14
--- save_internalalias.php	27 Apr 2006 03:47:46 -0000	1.14.2.1
***************
*** 61,66 ****
  		// Existing section.  Update the database record.
  		// The 'id=x' WHERE clause is implicit with an updateObject
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->updateObject($section,'section');
--- 61,65 ----
  		// Existing section.  Update the database record.
  		// The 'id=x' WHERE clause is implicit with an updateObject
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->updateObject($section,'section');
***************
*** 71,76 ****
  		// New section.  Insert a new database record.
  		
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->insertObject($section,'section');
--- 70,74 ----
  		// New section.  Insert a new database record.
  		
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');ule');
  			
  		$db->insertObject($section,'section');

Index: save_template.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/save_template.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** save_template.php	6 Apr 2006 05:36:22 -0000	1.12
--- save_template.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 29,34 ****
  	
  	if (isset($page->id)) {
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->updateObject($page,'section_template');	
--- 29,33 ----
  	
  	if (isset($page->id)) {
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->updateObject($page,'section_template');	
***************
*** 38,43 ****
  			$db->increment('section_template','rank',1,'parent='.$page->parent.' AND rank >= ' . $page->rank);
  		}
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->insertObject($page,'section_template');
--- 37,41 ----
  			$db->increment('section_template','rank',1,'parent='.$page->parent.' AND rank >= ' . $page->rank);
  		}
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->insertObject($page,'section_template');

Index: move_standalone.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/move_standalone.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** move_standalone.php	6 Apr 2006 05:36:22 -0000	1.9
--- move_standalone.php	27 Apr 2006 03:47:46 -0000	1.9.2.1
***************
*** 24,29 ****
  	$sect->parent = intval($_GET['parent']);
  	$form = section::moveStandaloneForm($sect);
! 	if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  	$form->meta('action','reparent_standalone');
  	$form->meta('module','navigationmodule');
--- 24,28 ----
  	$sect->parent = intval($_GET['parent']);
  	$form = section::moveStandaloneForm($sect);
! 	exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  	$form->meta('action','reparent_standalone');
  	$form->meta('module','navigationmodule');

Index: order.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/order.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** order.php	6 Apr 2006 05:36:22 -0000	1.12
--- order.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 22,27 ****
  if (exponent_permissions_check('manage',exponent_core_makeLocation('navigationmodule','',intval($_GET['parent'])))) {
  	$db->switchValues('section','rank',intval($_GET['a']),intval($_GET['b']),'parent=' . intval($_GET['parent']));
! 	if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  	exponent_flow_redirect();
  } else {
--- 22,26 ----
  if (exponent_permissions_check('manage',exponent_core_makeLocation('navigationmodule','',intval($_GET['parent'])))) {
  	$db->switchValues('section','rank',intval($_GET['a']),intval($_GET['b']),'parent=' . intval($_GET['parent']));
! 	exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  	exponent_flow_redirect();
  } else {

Index: order_templates.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/order_templates.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** order_templates.php	6 Apr 2006 05:36:22 -0000	1.11
--- order_templates.php	27 Apr 2006 03:47:46 -0000	1.11.2.1
***************
*** 23,28 ****
  	$db->switchValues('section_template','rank',intval($_GET['a']),intval($_GET['b']),'parent='.intval($_GET['parent']));
  	
! 	if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  	exponent_flow_redirect();
  } else {
--- 23,27 ----
  	$db->switchValues('section_template','rank',intval($_GET['a']),intval($_GET['b']),'parent='.intval($_GET['parent']));
  	
! 	exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  	exponent_flow_redirect();
  } else {

Index: save_contentpage.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/save_contentpage.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** save_contentpage.php	6 Apr 2006 05:36:22 -0000	1.13
--- save_contentpage.php	27 Apr 2006 03:47:46 -0000	1.13.2.1
***************
*** 55,60 ****
  		// Existing section.  Update the database record.
  		// The 'id=x' where clause is implicit with an updateObject
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->updateObject($section,'section');
--- 55,59 ----
  		// Existing section.  Update the database record.
  		// The 'id=x' where clause is implicit with an updateObject
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->updateObject($section,'section');
***************
*** 64,69 ****
  		$db->increment('section','rank',1,'rank >= ' . $section->rank . ' AND parent=' . $section->parent);
  		// New section.  Insert a new database record.
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->insertObject($section,'section');
--- 63,67 ----
  		$db->increment('section','rank',1,'rank >= ' . $section->rank . ' AND parent=' . $section->parent);
  		// New section.  Insert a new database record.
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->insertObject($section,'section');

Index: save_externalalias.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/actions/save_externalalias.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** save_externalalias.php	6 Apr 2006 05:36:22 -0000	1.12
--- save_externalalias.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 49,54 ****
  		// Existing section.  Update the database record.
  		// The 'id=x' where clause is implicit with an updateObject
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->updateObject($section,'section');
--- 49,53 ----
  		// Existing section.  Update the database record.
  		// The 'id=x' where clause is implicit with an updateObject
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->updateObject($section,'section');
***************
*** 59,64 ****
  		// New section.  Insert a new database record.
  		
! 		if (isset($_SESSION['nav_cache']['kids']))
! 			unset($_SESSION['nav_cache']['kids']);
  			
  		$db->insertObject($section,'section');
--- 58,62 ----
  		// New section.  Insert a new database record.
  		
! 		exponent_sessions_clearAllUsersSessionCache('navigationmodule');
  			
  		$db->insertObject($section,'section');

Update of /cvsroot/exponent/exponent/modules/imagemanagermodule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/imagemanagermodule

Modified Files:
      Tag: release_0_96_5
	class.php 
Log Message:
cache clearing changes.
Fred

Index: class.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/imagemanagermodule/class.php,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** class.php	6 Apr 2006 05:36:14 -0000	1.16
--- class.php	27 Apr 2006 03:47:46 -0000	1.16.2.1
***************
*** 68,77 ****
  		
  		$location = serialize($loc);
  		
! 		if (!isset($_SESSION['image_cache'][$location])) {
  			$items = $db->selectObjects("imagemanageritem","location_data='".serialize($loc)."'");
! 			$_SESSION['image_cache'][$location] = $items;		
  		} else {
! 			$items = $_SESSION['image_cache'][$location];	
  		}
  		
--- 68,79 ----
  		
  		$location = serialize($loc);
+ 		$cache = exponent_sessions_getCacheValue('imagemanagermodule');
  		
! 		if (!isset($cache[$location])) {
  			$items = $db->selectObjects("imagemanageritem","location_data='".serialize($loc)."'");
! 			$cache[$location] = $items;		
! 			exponent_sessions_setCacheValue('imagermanagermodule', $cache);
  		} else {
! 			$items = $cache[$location];	
  		}

Update of /cvsroot/exponent/exponent/modules/containermodule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/containermodule

Modified Files:
      Tag: release_0_96_5
	class.php 
Log Message:
cache clearing changes.
Fred

Index: class.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/class.php,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** class.php	6 Apr 2006 05:36:03 -0000	1.20
--- class.php	27 Apr 2006 03:47:46 -0000	1.20.2.1
***************
*** 103,108 ****
  
          $container_key = serialize( $loc );
! 
!         if(!isset($_SESSION['containers_cache'][$container_key]))
          {
  		    foreach ($db->selectObjects('container',"external='" . serialize($loc) . "'") as $c) {
--- 103,108 ----
  
          $container_key = serialize( $loc );
! 		$cache = exponent_sessions_getCacheValue('containermodule');
!         if(!isset($cache[$container_key]))
          {
  		    foreach ($db->selectObjects('container',"external='" . serialize($loc) . "'") as $c) {
***************
*** 111,119 ****
  			    }
  		    }
!             $_SESSION['containers_cache'][$container_key] = serialize($containers);
          }
          else
          {
!             $containers = unserialize($_SESSION['containers_cache'][$container_key]);
          }
   
--- 111,120 ----
  			    }
  		    }
!             $cache[$container_key] = serialize($containers);
!             exponent_sessions_setCacheValue('containermodule', $cache);
          }
          else
          {
!             $containers = unserialize($cache[$container_key]);
          }

Update of /cvsroot/exponent/exponent/modules/textmodule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/textmodule

Modified Files:
      Tag: release_0_96_5
	class.php 
Log Message:
cache clearing changes.
Fred

Index: class.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/textmodule/class.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** class.php	6 Apr 2006 05:36:30 -0000	1.11
--- class.php	27 Apr 2006 03:47:46 -0000	1.11.2.1
***************
*** 66,75 ****
  		
  		$template = new template('textmodule',$view,$loc);
! 		
! 		$textitem = $db->selectObject('textitem',"location_data='" . serialize($loc) . "'");
! 		if (!$textitem) {
! 			$textitem->id = 0;
! 			$textitem->approved = 1;
! 			$textitem->text = '';
  		}
  		$template->assign('textitem',$textitem);
--- 66,82 ----
  		
  		$template = new template('textmodule',$view,$loc);
! 		$location = serialize($loc);
! 		$cache = exponent_sessions_getCacheValue('textmodule');
! 		if (!isset($cache[$location])){
! 			$textitem = $db->selectObject('textitem',"location_data='" . $location . "'");
! 			if (!$textitem) {
! 				$textitem->id = 0;
! 				$textitem->approved = 1;
! 				$textitem->text = '';
! 			}
! 			$cache[$location] = $textitem;
! 			exponent_sessions_setCacheValue('textmodule', $cache);
! 		}else{
! 			$textitem = $cache[$location];
  		}
  		$template->assign('textitem',$textitem);

Update of /cvsroot/exponent/exponent/modules/navigationmodule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/navigationmodule

Modified Files:
      Tag: release_0_96_5
	class.php 
Log Message:
cache clearing changes.
Fred

Index: class.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/navigationmodule/class.php,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C2 -d -r1.32.2.1 -r1.32.2.2
*** class.php	22 Apr 2006 19:29:47 -0000	1.32.2.1
--- class.php	27 Apr 2006 03:47:46 -0000	1.32.2.2
***************
*** 166,175 ****
  		global $db, $user;
  		$nodes = array();
! 		
! 		if (!isset($_SESSION['nav_cache']['kids'][$parent])) {
  			$kids = $db->selectObjects('section','parent='.$parent);
! 			$_SESSION['nav_cache']['kids'][$parent] = $kids;
  		} else {
! 			$kids = $_SESSION['nav_cache']['kids'][$parent];
  		}
  		
--- 166,176 ----
  		global $db, $user;
  		$nodes = array();
! 		$cache = exponent_sessions_getCacheValue('navigationmodule');
! 		if (!isset($cache['kids'][$parent])) {
  			$kids = $db->selectObjects('section','parent='.$parent);
! 			$cache['kids'][$parent] = $kids;			
! 			exponent_sessions_setCacheValue('navigationmodule', $cache);
  		} else {
! 			$kids = $cache['kids'][$parent];
  		}

Update of /cvsroot/exponent/exponent/modules/containermodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/containermodule/actions

Modified Files:
      Tag: release_0_96_5
	delete.php delete_content.php edit.php order.php 
	orphans_content.php orphans_modules.php save.php 
Log Message:
cache clearing changes.
Fred

Index: save.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/save.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** save.php	6 Apr 2006 05:36:05 -0000	1.12
--- save.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 51,57 ****
  	}
  	
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
!     
  	exponent_flow_redirect();
  } else {
--- 51,55 ----
  	}
  	
!     exponent_sessions_clearAllUsersSessionCache('containermodule');
  	exponent_flow_redirect();
  } else {

Index: delete.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/delete.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** delete.php	6 Apr 2006 05:36:05 -0000	1.10
--- delete.php	27 Apr 2006 03:47:46 -0000	1.10.2.1
***************
*** 35,40 ****
  		$db->delete('container','id='.$container->id);
  
!         if (isset($_SESSION['containers_cache']))
!             unset($_SESSION['containers_cache']);
  
  		// Check to see if its the last reference
--- 35,39 ----
  		$db->delete('container','id='.$container->id);
  
!         exponent_sessions_clearAllUsersSessionCache('containermodule');
  
  		// Check to see if its the last reference

Index: orphans_content.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/orphans_content.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** orphans_content.php	6 Apr 2006 05:36:05 -0000	1.12
--- orphans_content.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 36,41 ****
  	}
  
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
  
  	$orphans = array();
--- 36,40 ----
  	}
  
!    exponent_sessions_clearAllUsersSessionCache('containermodule');
  
  	$orphans = array();

Index: order.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/order.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** order.php	6 Apr 2006 05:36:05 -0000	1.10
--- order.php	27 Apr 2006 03:47:46 -0000	1.10.2.1
***************
*** 22,27 ****
  if (exponent_permissions_check('order_modules',$loc)) {
  	$db->switchValues('container','rank',$_GET['a'],$_GET['b'],"external='".serialize($loc)."'");
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
      exponent_flow_redirect();
  } else {
--- 22,26 ----
  if (exponent_permissions_check('order_modules',$loc)) {
  	$db->switchValues('container','rank',$_GET['a'],$_GET['b'],"external='".serialize($loc)."'");
!    	exponent_sessions_clearAllUsersSessionCache('containermodule');
      exponent_flow_redirect();
  } else {

Index: orphans_modules.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/orphans_modules.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** orphans_modules.php	6 Apr 2006 05:36:05 -0000	1.9
--- orphans_modules.php	27 Apr 2006 03:47:46 -0000	1.9.2.1
***************
*** 21,26 ****
  
  // PERM CHECK
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
  
  	$orphan_mods = array();
--- 21,25 ----
  
  // PERM CHECK
!    	exponent_sessions_clearAllUsersSessionCache('containermodule');
  
  	$orphan_mods = array();
***************
*** 30,33 ****
--- 29,33 ----
  			$mod = new $modclass();
  			$orphan_mods[$modclass] = $mod->name();
+ 	
  		}
  	}

Index: delete_content.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/delete_content.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** delete_content.php	6 Apr 2006 05:36:05 -0000	1.9
--- delete_content.php	27 Apr 2006 03:47:46 -0000	1.9.2.1
***************
*** 27,33 ****
  	// delete in location.
  	$modclass = $iloc->mod;
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
! 
  	$mod = new $modclass();
  	$mod->deleteIn($iloc);
--- 27,32 ----
  	// delete in location.
  	$modclass = $iloc->mod;
!     exponent_sessions_clearAllUsersSessionCache('containermodule');
!     exponent_sessions_clearAllUsersSessionCache($iloc);
  	$mod = new $modclass();
  	$mod->deleteIn($iloc);

Index: edit.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/containermodule/actions/edit.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** edit.php	6 Apr 2006 05:36:05 -0000	1.15
--- edit.php	27 Apr 2006 03:47:46 -0000	1.15.2.1
***************
*** 54,59 ****
  	}
  
!     if (isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
  
  	$template = new template('containermodule','_form_edit',$loc);
--- 54,58 ----
  	}
  
!    exponent_sessions_clearAllUsersSessionCache('containermodule');
  
  	$template = new template('containermodule','_form_edit',$loc);

Update of /cvsroot/exponent/exponent/modules/resourcesmodule
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/resourcesmodule

Modified Files:
      Tag: release_0_96_5
	class.php 
Log Message:
cache clearing changes.
Fred

Index: class.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/class.php,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** class.php	6 Apr 2006 05:36:26 -0000	1.17
--- class.php	27 Apr 2006 03:47:46 -0000	1.17.2.1
***************
*** 72,83 ****
  		
  		global $db;
  		
! 		$location = serialize($loc);
! 		if(!isset($_SESSION['resource_cache'][$location])) {
! 			$resources = $db->selectObjects('resourceitem',"location_data='".serialize($loc)."'");
! 			$_SESSION['resource_cache'][$location] = $resources;
  		} else {
! 			$resources = $_SESSION['resource_cache'][$location];
! 		}
  		$iloc = exponent_core_makeLocation($loc->mod,$loc->src);
  		for ($i = 0; $i < count($resources); $i++) {
--- 72,85 ----
  		
  		global $db;
+ 		$location = serialize($loc);		
+ 		$cache = exponent_sessions_getCacheValue('resourcesmodule');
  		
!         if(!isset($cache[$location])){
! 			$resources = $db->selectObjects('resourceitem',"location_data='".$location."'");			
! 			$cache[$location] = $resources;
! 			exponent_sessions_setCacheValue('resourcesmodule', $cache);
  		} else {
! 			$resources = $cache[$location];
! 		}		
  		$iloc = exponent_core_makeLocation($loc->mod,$loc->src);
  		for ($i = 0; $i < count($resources); $i++) {

Update of /cvsroot/exponent/exponent/install/pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/install/pages

Modified Files:
      Tag: release_0_96_5
	final.php 
Log Message:
cache clearing changes.
Fred

Index: final.php
===================================================================
RCS file: /cvsroot/exponent/exponent/install/pages/final.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** final.php	6 Apr 2006 05:35:56 -0000	1.13
--- final.php	27 Apr 2006 03:47:45 -0000	1.13.2.1
***************
*** 36,40 ****
  <br /><br />
  <?php echo $i18n['success']; ?>
! <?php unset($_SESSION['nav_cache']); ?>
  <br /><br />
  <a href="<?php echo URL_FULL; ?>index.php"><?php echo $i18n['visit']; ?></a>.
--- 36,40 ----
  <br /><br />
  <?php echo $i18n['success']; ?>
! <?php exponent_sessions_clearCurrentUserSessionCache('navigationmodule');?>
  <br /><br />
  <a href="<?php echo URL_FULL; ?>index.php"><?php echo $i18n['visit']; ?></a>.

Update of /cvsroot/exponent/exponent/modules/resourcesmodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/resourcesmodule/actions

Modified Files:
      Tag: release_0_96_5
	changelock.php delete.php save.php saveupdatedfile.php 
	updatefile.php 
Log Message:
cache clearing changes.
Fred

Index: save.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/actions/save.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** save.php	6 Apr 2006 05:36:27 -0000	1.12
--- save.php	27 Apr 2006 03:47:46 -0000	1.12.2.1
***************
*** 61,65 ****
  			$resource->posted = time();
  			exponent_workflow_post($resource,'resourceitem',$loc);
! 			unset($_SESSION['resource_cache']);
  		} else {
  			// If file::update() returns a non-object, it should be a string.  That string is the error message.
--- 61,65 ----
  			$resource->posted = time();
  			exponent_workflow_post($resource,'resourceitem',$loc);
! 			exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  		} else {
  			// If file::update() returns a non-object, it should be a string.  That string is the error message.

Index: changelock.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/actions/changelock.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** changelock.php	6 Apr 2006 05:36:27 -0000	1.11
--- changelock.php	27 Apr 2006 03:47:46 -0000	1.11.2.1
***************
*** 29,33 ****
  		}
  		$db->updateObject($item,'resourceitem');
! 		unset($_SESSION['resource_cache']);
  		exponent_flow_redirect();
  	}
--- 29,33 ----
  		}
  		$db->updateObject($item,'resourceitem');
! 		exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  		exponent_flow_redirect();
  	}

Index: saveupdatedfile.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/actions/saveupdatedfile.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** saveupdatedfile.php	6 Apr 2006 05:36:27 -0000	1.13
--- saveupdatedfile.php	27 Apr 2006 03:47:46 -0000	1.13.2.1
***************
*** 41,45 ****
  			if (!defined('SYS_WORKFLOW')) include_once(BASE.'subsystems/workflow.php');
  			exponent_workflow_post($resource,'resourceitem',$loc);
! 			unset($_SESSION['resource_cache']);
  		} else {
  			// If file::update() returns a non-object, it should be a string.  That string is the error message.
--- 41,45 ----
  			if (!defined('SYS_WORKFLOW')) include_once(BASE.'subsystems/workflow.php');
  			exponent_workflow_post($resource,'resourceitem',$loc);
! 			exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  		} else {
  			// If file::update() returns a non-object, it should be a string.  That string is the error message.
***************
*** 47,51 ****
  			$post['_formError'] = $file;
  			exponent_sessions_set('last_POST',$post);
! 			unset($_SESSION['resource_cache']);
  			header('Location: ' . $_SERVER['HTTP_REFERER']);
  		}	
--- 47,51 ----
  			$post['_formError'] = $file;
  			exponent_sessions_set('last_POST',$post);
! 			exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  			header('Location: ' . $_SERVER['HTTP_REFERER']);
  		}	

Index: updatefile.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/actions/updatefile.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** updatefile.php	6 Apr 2006 05:36:27 -0000	1.13
--- updatefile.php	27 Apr 2006 03:47:46 -0000	1.13.2.1
***************
*** 31,35 ****
  		exponent_forms_initialize();
  		
! 		unset($_SESSION['resource_cache']);
  		
  		$i18n = exponent_lang_loadFile('modules/resourcesmodule/actions/updatefile.php');
--- 31,35 ----
  		exponent_forms_initialize();
  		
! 		exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  		
  		$i18n = exponent_lang_loadFile('modules/resourcesmodule/actions/updatefile.php');

Index: delete.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/resourcesmodule/actions/delete.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** delete.php	6 Apr 2006 05:36:27 -0000	1.9
--- delete.php	27 Apr 2006 03:47:46 -0000	1.9.2.1
***************
*** 36,40 ****
  		$db->delete('search',"ref_module='resourcesmodule' AND ref_type='resourceitem' AND original_id=".$resource->id);
  		
! 		unset($_SESSION['resource_cache']);
  		exponent_flow_redirect(SYS_FLOW_SECTIONAL);
  	} else {
--- 36,40 ----
  		$db->delete('search',"ref_module='resourcesmodule' AND ref_type='resourceitem' AND original_id=".$resource->id);
  		
! 		exponent_sessions_clearAllUsersSessionCache('resourcesmodule');
  		exponent_flow_redirect(SYS_FLOW_SECTIONAL);
  	} else {

Update of /cvsroot/exponent/exponent/modules/imagemanagermodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/imagemanagermodule/actions

Modified Files:
      Tag: release_0_96_5
	delete.php save.php 
Log Message:
cache clearing changes.
Fred

Index: save.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/imagemanagermodule/actions/save.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** save.php	6 Apr 2006 05:36:15 -0000	1.13
--- save.php	27 Apr 2006 03:47:46 -0000	1.13.2.1
***************
*** 33,38 ****
  
  	// unset the image cache
! 	unset($_SESSION['image_cache']);
! 
      // check for real images.
      $filenew = $_FILES['file']['tmp_name'];
--- 33,38 ----
  
  	// unset the image cache
! 	exponent_sessions_clearAllUsersSessionCache('imagemanagermodule');
! 	
      // check for real images.
      $filenew = $_FILES['file']['tmp_name'];

Index: delete.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/imagemanagermodule/actions/delete.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** delete.php	6 Apr 2006 05:36:15 -0000	1.11
--- delete.php	27 Apr 2006 03:47:46 -0000	1.11.2.1
***************
*** 31,35 ****
         
          unlink("$file->directory/$file->filename");
!         unset($_SESSION['image_cache']);
         
          exponent_flow_redirect();
--- 31,35 ----
         
          unlink("$file->directory/$file->filename");
!         exponent_sessions_clearAllUsersSessionCache('imagemanagermodule');
         
          exponent_flow_redirect();

Update of /cvsroot/exponent/exponent/modules/loginmodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/loginmodule/actions

Modified Files:
      Tag: release_0_96_5
	login.php logout.php 
Log Message:
cache clearing changes.
Fred

Index: login.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/loginmodule/actions/login.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** login.php	6 Apr 2006 05:36:19 -0000	1.15
--- login.php	27 Apr 2006 03:47:46 -0000	1.15.2.1
***************
*** 28,42 ****
  	echo $i18n['login_error'];
  } else {
! 	if (isset($_SESSION['nav_cache']['kids']))
! 		unset($_SESSION['nav_cache']['kids']);
! 
!     if(isset($_SESSION['containers_cache']))
!         unset($_SESSION['containers_cache']);
!             
!     if(isset($_SESSION['image_cache']))
!     		unset($_SESSION['image_cache']);
! 
! 	if(isset($_SESSION['resource_cache']))    
!     		unset($_SESSION['resource_cache']);             
  	exponent_flow_redirect();
  }
--- 28,32 ----
  	echo $i18n['login_error'];
  } else {
! 	//exponent_sessions_clearCurrentUserSessionCache(); 
  	exponent_flow_redirect();
  }

Index: logout.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/loginmodule/actions/logout.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** logout.php	6 Apr 2006 05:36:19 -0000	1.14
--- logout.php	27 Apr 2006 03:47:46 -0000	1.14.2.1
***************
*** 24,35 ****
  exponent_permissions_clear();
  exponent_sessions_unset('uilevel');
! if (isset($_SESSION['nav_cache']['kids']))
!     unset($_SESSION['nav_cache']['kids']);
! if(isset($_SESSION['containers_cache']))
!     unset($_SESSION['containers_cache']);
! if(isset($_SESSION['image_cache']))
!     unset($_SESSION['image_cache']);
! if(isset($_SESSION['resource_cache']))    
!     unset($_SESSION['resource_cache']);    
  exponent_flow_redirect();
  
--- 24,28 ----
  exponent_permissions_clear();
  exponent_sessions_unset('uilevel');
! //exponent_sessions_clearCurrentUserSessionCache();
  exponent_flow_redirect();

Update of /cvsroot/exponent/exponent/modules/calendarmodule/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/modules/calendarmodule/actions

Modified Files:
      Tag: release_0_96_5
	send_feedback.php 
Log Message:
cache clearing changes.
Fred

Index: send_feedback.php
===================================================================
RCS file: /cvsroot/exponent/exponent/modules/calendarmodule/actions/send_feedback.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** send_feedback.php	6 Apr 2006 05:35:59 -0000	1.9
--- send_feedback.php	27 Apr 2006 03:47:46 -0000	1.9.2.1
***************
*** 35,39 ****
  		$email_addrs = split(',', $event->feedback_email);
  		$email_addrs = array_map('trim', $email_addrs);
! 		$ret = exponent_smtp_mail($email_addrs, 'website@...);
  	}
  }
--- 35,39 ----
  		$email_addrs = split(',', $event->feedback_email);
  		$email_addrs = array_map('trim', $email_addrs);
! 		$ret = exponent_smtp_mail($email_addrs, SMTP_FROMADDRESS,$_POST['subject'],$msg);
  	}
  }

Update of /cvsroot/exponent/exponent/subsystems
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093a/subsystems

Modified Files:
      Tag: release_0_96_5
	sessions.php template.php workflow.php 
Log Message:
cache clearing changes.
Fred

Index: template.php
===================================================================
RCS file: /cvsroot/exponent/exponent/subsystems/template.php,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -d -r1.31 -r1.31.2.1
*** template.php	6 Apr 2006 05:36:39 -0000	1.31
--- template.php	27 Apr 2006 03:47:47 -0000	1.31.2.1
***************
*** 87,91 ****
  	function render() { // Caching support?
  		// Load language constants
! 		$this->tpl->assign('_TR',exponent_lang_loadFile($this->viewdir.'/'.$this->view.'.php'));
  		return $this->tpl->fetch($this->view.'.tpl');
  	}
--- 87,92 ----
  	function render() { // Caching support?
  		// Load language constants
! 		//$this->tpl->assign('_TR',exponent_lang_loadFile($this->viewdir.'/'.$this->view.'.php'));
! 		$this->tpl->assign('_TR',exponent_lang_loadFile($this->langdir."".$this->view.'.php')); //fix lamp issue
  		return $this->tpl->fetch($this->view.'.tpl');
  	}

Index: workflow.php
===================================================================
RCS file: /cvsroot/exponent/exponent/subsystems/workflow.php,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** workflow.php	6 Apr 2006 05:36:39 -0000	1.18
--- workflow.php	27 Apr 2006 03:47:47 -0000	1.18.2.1
***************
*** 382,385 ****
--- 382,387 ----
  	}
  	
+ 	exponent_sessions_clearAllUsersSessionCache(); 
+ 	
  	if ($policy != null) {
  		// run actions, either EDIT or POST or IMPLICIT_APPROVAL

Index: sessions.php
===================================================================
RCS file: /cvsroot/exponent/exponent/subsystems/sessions.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** sessions.php	23 Apr 2006 01:21:06 -0000	1.12.2.1
--- sessions.php	27 Apr 2006 03:47:46 -0000	1.12.2.2
***************
*** 74,77 ****
--- 74,79 ----
  	global $db;
  
+ 	//eDebug($_SESSION);
+ 	
  	//FJD - create a ticket for every session instead of just logged in users
  	if (!isset($_SESSION[SYS_SESSION_KEY]['ticket'])) {	
***************
*** 95,99 ****
  	if ($ticket->refresh == 1) {				
  		if (isset($user)) exponent_permissions_load($user);			
! 		exponent_sessions_expireCache();
  		$ticket->refresh = 0;		
  	}	
--- 97,101 ----
  	if ($ticket->refresh == 1) {				
  		if (isset($user)) exponent_permissions_load($user);			
! 		exponent_sessions_clearCurrentUserSessionCache();
  		$ticket->refresh = 0;		
  	}	
***************
*** 103,117 ****
  }
  
- function exponent_sessions_expireCache($user = null){
- 	if (isset($_SESSION['nav_cache']['kids']))
- 	    unset($_SESSION['nav_cache']['kids']);
- 	if(isset($_SESSION['containers_cache']))
- 	    unset($_SESSION['containers_cache']);
- 	if(isset($_SESSION['image_cache']))
- 	    unset($_SESSION['image_cache']);
- 	if(isset($_SESSION['resource_cache']))    
- 	    unset($_SESSION['resource_cache']);    
- }
- 
  /* exdoc
   * Creates and stores a session ticket for the given user,
--- 105,108 ----
***************
*** 180,184 ****
  	//exit();
  	//if (isset($_SESSION[SYS_SESSION_KEY]['ticket'])) $db->delete('sessionticket',"ticket='" . $_SESSION[SYS_SESSION_KEY]['ticket'] . "'");
! 	$ticket = $db->selectObject('sessionticket', "ticket=$_SESSION[SYS_SESSION_KEY]['ticket']");
  	
  	//unset($_SESSION[SYS_SESSION_KEY]['vars']['display_theme']);
--- 171,175 ----
  	//exit();
  	//if (isset($_SESSION[SYS_SESSION_KEY]['ticket'])) $db->delete('sessionticket',"ticket='" . $_SESSION[SYS_SESSION_KEY]['ticket'] . "'");
! 	$ticket = $db->selectObject('sessionticket', "ticket='" . $_SESSION[SYS_SESSION_KEY]['ticket'] . "'");
  	
  	//unset($_SESSION[SYS_SESSION_KEY]['vars']['display_theme']);
***************
*** 188,191 ****
--- 179,183 ----
  	//FJD - set ticker user back to 0 instead of deleting the ticket
  	$user->id = 0;
+ 	$ticket->refresh = 0;
  	exponent_sessions_updateTicket($ticket, $user);
  	
***************
*** 211,215 ****
  	if (isset($_SESSION[SYS_SESSION_KEY]['ticket'])) {
  		return $_SESSION[SYS_SESSION_KEY]['ticket'];
! 	} else return "";
  }
  
--- 203,207 ----
  	if (isset($_SESSION[SYS_SESSION_KEY]['ticket'])) {
  		return $_SESSION[SYS_SESSION_KEY]['ticket'];
! 	} else return null;
  }
  
***************
*** 268,271 ****
--- 260,338 ----
  }
  
+ /* exdoc
+  * Clears current users session cache
+  *
+  * @param Modules $modules Array or string. If not set, applies to all modules.  If set, will only clear cache for that module
+  * @param User $user if not set,applies to all users. If set, will only clear for that user
+  * @node Subsystems:Sessions
+  */
+ function exponent_sessions_clearCurrentUserSessionCache($modules = null) {	
+ 		
+ 	if (isset($modules)){	
+ 		if (is_array($modules)){
+ 			foreach ($modules as $mod){
+ 				if (isset($_SESSION[SYS_SESSION_KEY]['cache'][$mod])) unset($_SESSION[SYS_SESSION_KEY]['cache'][$mod]);
+ 			}
+ 		}else{
+ 			if (isset($_SESSION[SYS_SESSION_KEY]['cache'][$modules])) unset($_SESSION[SYS_SESSION_KEY]['cache'][$modules]);	
+ 		}		
+ 	}else{
+ 		if (isset($_SESSION[SYS_SESSION_KEY]['cache'])) unset($_SESSION[SYS_SESSION_KEY]['cache']);
+ 	}		
+ }
+ 
+ function exponent_sessions_getCacheValue($module){
+ 	//returns array or null
+ 	if (isset($_SESSION[SYS_SESSION_KEY]['cache'][$module])) return($_SESSION[SYS_SESSION_KEY]['cache'][$module]);
+ 	else return null;
+ }
+ 
+ function exponent_sessions_setCacheValue($module, $val){
+ 	//should always be an array, even if single index
+ 	$_SESSION[SYS_SESSION_KEY]['cache'][$module] = $val;
+ }
+ 
+ /* exdoc
+  * Clears global users session cache
+  *
+  * @param Modules $modules If not set, applies to all modules.  If set, will only clear cache for that module
+  * @param User $user if not set,applies to all users. If set, will only clear for that user
+  * @node Subsystems:Sessions
+  */
+ function exponent_sessions_clearAllUsersSessionCache($modules = null, $user = null) {	
+ 	//ignoring module for now, as we can only easily clear entire cache
+ 	//by just flagging the refresh field in the session ticket. 
+ 	//Maybe we'll enhance this later to store the session cache in the db
+ 	//and we can then use this to only clear certain modules' cache.
+ 	//We can easily clear for just an individual user or all users though,
+ 	//but I don't see why we need to clear just one other specified user's cache 
+ 	//at this point either.  This just updates all sessionticket records to refresh=1
+ 		
+ 	global $db;
+ 	$sessionticket->refresh = 1;
+ 	$db->updateObject($sessionticket, 'sessionticket', '1');
+ 		
+ 	/* Possible future code
+ 	if (isset($user)){
+ 		$where = " uid='" . $user->id . "'";
+ 	}else {
+ 		$where = '';
+ 	}	
+ 	
+ 	if (isset($modules)){	
+ 		if (is_array($modules)){
+ 			foreach ($modules as $mod){
+ 				
+ 			}
+ 		}else{
+ 				
+ 		}		
+ 	}else{
+ 		
+ 	}	
+ 	*/	
+ }
+ 
+ 
  // Database-stored session handling
  //

Update of /cvsroot/exponent/exponent/external/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1491/external/editors

Modified Files:
	FCKeditor.glue 
Log Message:
fixed stupid toolbar row number parsing bug in fckeditor

Index: FCKeditor.glue
===================================================================
RCS file: /cvsroot/exponent/exponent/external/editors/FCKeditor.glue,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FCKeditor.glue	25 Apr 2006 13:23:32 -0000	1.1
--- FCKeditor.glue	25 Apr 2006 15:58:27 -0000	1.2
***************
*** 71,76 ****
  		
  		myConfig.setupToolbar = function(myToolbar) {
! 			for(currRow = 1; currRow < myToolbar.length - 1; currRow++) {
! 				//FCKeditor's way of forcing rowbreaks is setting an "/" behind every array element
  				myToolbar.splice(currRow, 0, "/");
  			}
--- 71,77 ----
  		
  		myConfig.setupToolbar = function(myToolbar) {
! 			myLength = myToolbar.length;
! 			for(currRow = 1; currRow < myLength; currRow++) {
! 				//FCKeditor's way of forcing rowbreaks is placing an "/" behind an array element
  				myToolbar.splice(currRow, 0, "/");
  			}
***************
*** 110,114 ****
  		
  		//HACK: god, i do hate this editor ! Why can't i simply configure the toolbars and plugins from here ? There ARE other reasons to hate it ...
! 		oFCKeditor.Config["CustomConfigurationsPath"] = "http://localhost:8080/external/editors/fcktoolbarconfig.js.php?toolbar=" + encodeURI(myConfig.setupToolbar(Exponent.WYSIWYG_toolbar)) + "&plugins=" + encodeURI(myConfig.setupPlugins(Exponent.WYSIWYG_toolbar));
  		
  		oFCKeditor.Create();
--- 111,115 ----
  		
  		//HACK: god, i do hate this editor ! Why can't i simply configure the toolbars and plugins from here ? There ARE other reasons to hate it ...
! 		oFCKeditor.Config["CustomConfigurationsPath"] = "http://localhost:8080/external/editors/fcktoolbarconfig.js.php?plugins=" + encodeURI(myConfig.setupPlugins(Exponent.WYSIWYG_toolbar)) + "&toolbar=" + encodeURI(myConfig.setupToolbar(Exponent.WYSIWYG_toolbar));
  		
  		oFCKeditor.Create();

Update of /cvsroot/exponent/exponent/datatypes/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/datatypes/definitions

Added Files:
	toolbar_FCKeditor.php toolbar_TinyMCE.php toolbar_Xinha.php 
Removed Files:
	htmlareatoolbar.php 
Log Message:
i hate cvs ! placing missing files under source control

--- htmlareatoolbar.php DELETED ---

--- NEW FILE: toolbar_TinyMCE.php ---
<?php

##################################################
#
# Copyright (c) 2004-2006 OIC Group, Inc.
# Written and Designed by James Hunt
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

if (!defined('EXPONENT')) exit('');

return array(
	'id'=>array(
		DB_FIELD_TYPE=>DB_DEF_ID,
		DB_PRIMARY=>true,
		DB_INCREMENT=>true),
	'name'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>100),
	'data'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>10000),
	'active'=>array(
		DB_FIELD_TYPE=>DB_DEF_BOOLEAN)
);

?>
--- NEW FILE: toolbar_Xinha.php ---
<?php

##################################################
#
# Copyright (c) 2004-2006 OIC Group, Inc.
# Written and Designed by James Hunt
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

if (!defined('EXPONENT')) exit('');

return array(
	'id'=>array(
		DB_FIELD_TYPE=>DB_DEF_ID,
		DB_PRIMARY=>true,
		DB_INCREMENT=>true),
	'name'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>100),
	'data'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>10000),
	'active'=>array(
		DB_FIELD_TYPE=>DB_DEF_BOOLEAN)
);

?>
--- NEW FILE: toolbar_FCKeditor.php ---
<?php

##################################################
#
# Copyright (c) 2004-2006 OIC Group, Inc.
# Written and Designed by James Hunt
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

if (!defined('EXPONENT')) exit('');

return array(
	'id'=>array(
		DB_FIELD_TYPE=>DB_DEF_ID,
		DB_PRIMARY=>true,
		DB_INCREMENT=>true),
	'name'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>100),
	'data'=>array(
		DB_FIELD_TYPE=>DB_DEF_STRING,
		DB_FIELD_LEN=>10000),
	'active'=>array(
		DB_FIELD_TYPE=>DB_DEF_BOOLEAN)
);

?>

Update of /cvsroot/exponent/exponent/external/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/external/editors

Added Files:
	FCKeditor.glue FCKeditor_toolbox.js TinyMCE.glue 
	TinyMCE_toolbox.js Xinha.glue Xinha_toolbox.js 
	fcktoolbarconfig.js.php 
Log Message:
i hate cvs ! placing missing files under source control

--- NEW FILE: TinyMCE.glue ---
<?PHP
##################################################
#
# Copyright (c) 2005-2006  Maxim Mueller
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

#This glue file is included by subsystems/forms/controls/htmleditorcontrol.php
#it provides the code for the htmleditorcontrol class' controltoHTML() method
# it's based on James Hunt's code for that original class

ob_start(); 
if (!defined("CTL_HTMLAREAINIT")) {
?>
	<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>/jscripts/tiny_mce/tiny_mce.js"></script>
	<script type="text/javascript" src="<?php echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>_toolbox.js"></script>
	
	<!-- load languagefile, prepare for HTMLArea popup(Link + Image Browsers) -->
	<script type="text/javascript">
	/* <![CDATA[ */
<?php
	global $db;
	$config = $db->selectObject("toolbar_TinyMCE", "active=1");
	if ($config) {
		echo "		Exponent.WYSIWYG_toolbar = " . $config->data . ";\n";
	}
?>
		// new namespace for our config
		myConfig = new Object();
		
		// if plugins are needed, set them up
		myConfig.setupPlugins = function (myToolbar) {
			plugins = new Array();
			
			for(currRow = 0; currRow < myToolbar.length; currRow++) {
				for(currButton = 0; currButton < myToolbar[currRow].length; currButton++) {
					currItem = myToolbar[currRow][currButton];
					// plugin required ?
					if(Exponent.WYSIWYG_toolboxbuttons[currItem][2] != "") {
						plugins.push(Exponent.WYSIWYG_toolboxbuttons[currItem][2]);
					}
				}
			}
			
			//serialize 
			if(plugins.length != 0) {
				var myStr = '';
				for(currPlugin = 0; currPlugin < plugins.length; currPlugin++) {
					myStr += plugins[currPlugin];
					if (currPlugin != plugins.length-1) {
						myStr+= ', ';
					}
				}
				this.config["plugins"] = String(myStr);
 			}
		}
		
		// convert from JS Array into Toolbar init syntax
		myConfig.setupToolbar = function (myToolbar) {
			for(currRow = 0; currRow < myToolbar.length; currRow++) {
				this.config['theme_advanced_buttons' + String(currRow + 1)] = String(myToolbar[currRow]);
			}
			// the advanced theme always provides at least three rows, clear the ones that are not set by us
			if(myToolbar.length < 3) {
				this.config['theme_advanced_buttons3'] = "";
				if(myToolbar.length < 2) {
					this.config['theme_advanced_buttons2'] = "";
					//the case of myToolbar.length < 1 REALLY should not happen	
				}	
			}
		}
		
		
		//we need this to get the data from the popup(object for "opener" interaction)
		var Dialog = new Object();
		//callback from the HTMLArea popup(__dlg_close())
		Dialog._return = function (val) {
			if (val) {
				if (val['f_dialogType'] == "Link") {
					tinyMCE.execCommand('mceInsertContent',false,'<a href="' + val['f_href'] + '" target="' + val['f_target'] + '" title="' + val['f_title'] + '">' + tinyMCE.getInstanceById('<?php echo $name; ?>').selection.getSelectedHTML() + '</a>');
				}
				if (val['f_dialogType'] == "Image") {
					// TODO: generate CSS styled images 
					// if ((val['f_align'] == 'right') or (val['f_align'] == 'right')) {
					// 	csscode = "float: " + val['f_align'];
					// } else {
					// 	csscode = "vertical-align: " + val['f_align'];
					// }
					// tinyMCE.execCommand('mceInsertContent',false,'<img src="' + val['f_url'] + '" alt="' + val['f_alt'] + '" style="margin: ' + val['f_vert'] + 'px ' + val['f_horiz'] + 'px; border: ' + val['f_border'] + 'px solid black;' + csscode + '"/>');
					//
					tinyMCE.execCommand('mceInsertContent',false,'<img src="' + val['f_url'] + '" alt="' + val['f_alt'] + '" align="' + val['f_align'] + '" vspace="' + val['f_vert'] + '" hspace="' + val['f_horiz'] + '" border="' + val['f_border'] + '"/>');
				}
			} 
		};

		function myCustomExecCommandHandler(editor_id, elm, command, user_interface, value) {
			var linkElm, imageElm, inst;
		
			switch (command) {
				case "mceLink":
					inst = tinyMCE.getInstanceById(editor_id);
					linkElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "a");
		
					//do we update or create ?
					//if (linkElm) {
						Dialog._arguments = new Array();
						Dialog._arguments['f_href'] = tinyMCE.getAttrib(linkElm, "href");
						Dialog._arguments['f_target'] = tinyMCE.getAttrib(linkElm, "target");
						Dialog._arguments['f_title'] = tinyMCE.getAttrib(linkElm, "title");
					//} else {
						// just in case values were set in a previous run
					//	if (Dialog._arguments) {
					//		delete Dialog._arguments;
					//	}
					//}
					var LinkWindow = window.open("<?PHP echo PATH_RELATIVE ?>external/editors/connector/link.php", "Link", "width=400, height=275, resizable=yes");
					LinkWindow.focus();
					
					return true;
		
				case "mceImage":
					inst = tinyMCE.getInstanceById(editor_id);
					imageElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "img");
		
					//do we update or create ?
					//if (imageElm) {
						Dialog._arguments = new Array();
						Dialog._arguments['f_url'] = tinyMCE.getAttrib(imageElm, "src");
						Dialog._arguments['f_alt'] = tinyMCE.getAttrib(imageElm, "alt");
						Dialog._arguments['f_border'] = tinyMCE.getAttrib(imageElm, "border");;
						Dialog._arguments['f_horiz'] = tinyMCE.getAttrib(imageElm, "hspace");;
						Dialog._arguments['f_vert'] = tinyMCE.getAttrib(imageElm, "vspace");;
						Dialog._arguments['f_align'] = tinyMCE.getAttrib(imageElm, "align");
					//} else {
						// just in case values were set in a previous run
					//	if (Dialog._arguments) {
					//		delete Dialog._arguments;
					//	}
					//}
					var ImageWindow = window.open("<?PHP echo PATH_RELATIVE ?>external/editors/connector/insert_image.php", "Image", "width=400, height=390, resizable=yes");
					ImageWindow.focus();
					
					return true;
			}
		
			return false;
		}

		// initialize TinyMCE
		myConfig.config =	{
								mode							: "textareas",
								editor_selector					: "mceEditor",
								theme 							: "advanced",
								theme_advanced_toolbar_location : "top",
								theme_advanced_layout_manager	: "SimpleLayout",
								add_unload_trigger				: false,
								language						: "<?PHP echo LANG?>",
								execcommand_callback 			: "myCustomExecCommandHandler",
								convert_urls					: false
							};
		if (Exponent.WYSIWYG_toolbar) {
			myConfig.setupPlugins(Exponent.WYSIWYG_toolbar);
			myConfig.setupToolbar(Exponent.WYSIWYG_toolbar);
		}
		
		tinyMCE.init(myConfig.config);
		delete myConfig;
		/* ]]> */
	</script>


<?PHP
	define("CTL_HTMLAREAINIT",1);
	echo '<script type="text/javascript">htmleditorcontrols = new Array();</script>'; 
} 
?>


	<script type="text/javascript">
	/* <![CDATA[ */
		htmleditorcontrols[htmleditorcontrols.length] = "<?php echo $name; ?>";
	/* ]]> */
	</script> 

	<textarea class="mceEditor" id="<?php echo $name; ?>" name="<?php echo $name; ?>" style="width:100%" rows="24" cols="80"><?php echo htmlentities($this->default, ENT_COMPAT, LANG_CHARSET);?></textarea> 


<?PHP

$html = ob_get_contents();
ob_end_clean(); 

?>
--- NEW FILE: FCKeditor.glue ---
<?PHP

##################################################
#
# Copyright (c) 2005-2006  Maxim Mueller
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

#This glue file is included by subsystems/forms/controls/htmleditorcontrol.php
#it provides the code for the htmleditorcontrol class' controltoHTML() method 
# it's based on James Hunt's code for that original class
 
ob_start(); 
if (!defined("CTL_HTMLAREAINIT")) { 
	// We are the first htmleditor control. Set up basic initializations 
?>
	<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>/fckeditor.js"></script>
	<script type="text/javascript" src="<?php echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>_toolbox.js"></script>
	
	<!-- load languagefile, prepare for HTMLArea popup(Link + Image Browsers) -->
	<script type="text/javascript">
	/* <![CDATA[ */
<?php

	$path_to_editor = PATH_RELATIVE . "external/editors/" . SITE_WYSIWYG_EDITOR . "/";
	
	global $db;
	$config = $db->selectObject("toolbar_FCKeditor", "active=1");
	if ($config) {
		echo "		Exponent.WYSIWYG_toolbar = " . $config->data . ";\n";
	}
?>
		// create namespace object
		myConfig = new Object();
		
		myConfig.serialize = function(myArray) {
			var myStr = "[";
			for (i = 0; i < myArray.length; i++) {
				// do we have more than one dimension ?
				//HACK: hoping there will never be plugins or commands that just have one character 
				if(myArray[i][0].length > 1) {
					myStr += "['";
					for (j = 0; j < myArray[i].length; j++) {
						myStr += myArray[i][j];
						if (j != myArray[i].length-1) {
							myStr+="', '";
						}
					}
					myStr += "']";
				} else {
					myStr += "'" + myArray[i] + "'";
				}
				
				if (i != myArray.length - 1) {
					myStr += ", ";
				}
			}
			myStr += "]";
			return myStr;
		}
		
		myConfig.setupToolbar = function(myToolbar) {
			for(currRow = 1; currRow < myToolbar.length - 1; currRow++) {
				//FCKeditor's way of forcing rowbreaks is setting an "/" behind every array element
				myToolbar.splice(currRow, 0, "/");
			}
			return this.serialize(myToolbar);
		}
	
		myConfig.setupPlugins = function(myToolbar) {
			plugins = new Array();
			
			for(currRow = 0; currRow < myToolbar.length; currRow++) {
				for(currButton = 0; currButton < myToolbar[currRow].length; currButton++) {
					currItem = myToolbar[currRow][currButton];
					// plugin required ?
					if(Exponent.WYSIWYG_toolboxbuttons[currItem][2] != "") {
						plugins.push(Exponent.WYSIWYG_toolboxbuttons[currItem][2]);
					}
				}
			}
			return this.serialize(plugins);
		}

		var oFCKeditor = new FCKeditor('<?PHP echo $name; ?>');
		
			
		oFCKeditor.BasePath = "<?PHP echo $path_to_editor; ?>";
		//why do the demo articles contain newline characters ?
		oFCKeditor.Value = "<?PHP echo addslashes(str_replace(array("\n","\r"), "", $this->default)); ?>";
		
		oFCKeditor.Height= '300';

		oFCKeditor.Config['LinkUpload'] = "false";
		oFCKeditor.Config['ImageUpload'] = "false";
		oFCKeditor.Config['FlashUpload'] = "false";
	
		oFCKeditor.Config['LinkBrowserURL'] = "<?PHP echo $path_to_editor; ?>../connector/FCKeditor_link.php";
		oFCKeditor.Config['ImageBrowserURL'] = "<?PHP echo $path_to_editor; ?>../../../modules/filemanagermodule/actions/picker.php?id=0";
		
		//HACK: god, i do hate this editor ! Why can't i simply configure the toolbars and plugins from here ? There ARE other reasons to hate it ...
		oFCKeditor.Config["CustomConfigurationsPath"] = "http://localhost:8080/external/editors/fcktoolbarconfig.js.php?toolbar=" + encodeURI(myConfig.setupToolbar(Exponent.WYSIWYG_toolbar)) + "&plugins=" + encodeURI(myConfig.setupPlugins(Exponent.WYSIWYG_toolbar));
		
		oFCKeditor.Create();
		
	/* ]]> */
	</script>
<?PHP 
	define("CTL_HTMLAREAINIT",1);
	 
} 

 
$html = ob_get_contents();
ob_end_clean(); 

?>
--- NEW FILE: Xinha_toolbox.js ---
//##################################################
//#
//# Copyright (c) 2006 Maxim Mueller
//#
//# This file is part of Exponent
//#
//# Exponent is free software; you can redistribute
//# it and/or modify it under the terms of the GNU
//# General Public License as published by the Free
//# Software Foundation; either version 2 of the
//# License, or (at your option) any later version.
//#
//# GPL: http://www.gnu.org/licenses/gpl.txt
//#
//##################################################

//this file provides an Array associating availiable Actions, their Icons, and, if required for this action, their plugins, with their internal ids
//TODO: determine whether the Editor provides a queryable API for that
//TODO: adjust for themes

//TODO: possibly create a subobject WYSIWYG ?
// first = action name
// second = icon location
// third = required plugin
Exponent.WYSIWYG_toolboxbuttons =	{
									"about" : ["About Xinha", "/external/editors/Xinha/images/ed_about.gif", ""],
									"cut" : ["cut", "/external/editors/Xinha/images/ed_cut.gif", ""],
									"createlink" : ["link", "/external/editors/Xinha/images/ed_link.gif", ""],
									"insertimage" : ["image", "/external/editors/Xinha/images/ed_image.gif", ""],
									"abbreviation" : ["Abbreviation Dialog", "/external/editors/Xinha/plugins/Abbreviation/img/ed_abbreviation.gif", "Abbreviation"]
									};
--- NEW FILE: TinyMCE_toolbox.js ---
//##################################################
//#
//# Copyright (c) 2006 Maxim Mueller
//#
//# This file is part of Exponent
//#
//# Exponent is free software; you can redistribute
//# it and/or modify it under the terms of the GNU
//# General Public License as published by the Free
//# Software Foundation; either version 2 of the
//# License, or (at your option) any later version.
//#
//# GPL: http://www.gnu.org/licenses/gpl.txt
//#
//##################################################

//this file provides an Array associating availiable Actions, their Icons, and, if required for this action, their plugins, with their internal ids
//TODO: determine whether the Editor provides a queryable API for that
//TODO: adjust for themes

//TODO: possibly create a subobject WYSIWYG ?
// first = action name
// second = icon location
// third = required plugin
Exponent.WYSIWYG_toolboxbuttons =	{
									"cut" : ["cut", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/cut.gif", ""],
									"paste" : ["paste", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/paste.gif", ""],
									"copy" : ["copy", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/copy.gif", ""],
									"bold" : ["bold", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/bold.gif", ""],
									"strikethrough" : ["strikethrough", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/strikethrough.gif", ""],
									"underline" : ["underline", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/underline.gif", ""],
									"anchor" : ["anchor", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/anchor.gif", ""],
									"bullist" : ["bullist", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/bullist.gif", ""],
									"backcolor" : ["backcolor", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/backcolor.gif", ""],
									"browse" : ["browse", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/browse.gif", ""],
									"charmap" : ["charmap", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/charmap.gif", ""],
									"cleanup" : ["cleanup", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/cleanup.gif", ""],
									"close" : ["close", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/close.gif", ""],
									"code" : ["code", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/code.gif", ""],
									"color" : ["color", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/color.gif", ""],
									"forecolor" : ["forecolor", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/forecolor.gif", ""],
									"help" : ["help", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/help.gif", ""],
									"hr" : ["hr", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/hr.gif", ""],
									"image" : ["image", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/image.gif", ""],
									"indent" : ["indent", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/indent.gif", ""],
									"italic" : ["italic", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/italic.gif", ""],
									"justifycenter" : ["justify center", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/justifycenter.gif", ""],
									"justifyfull" : ["justify full", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/justifyfull.gif", ""],
									"justifyleft" : ["justify left", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/justifyleft.gif", ""],
									"justifyright" : ["justify right", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/justifyright.gif", ""],
									"link" : ["link", "/external/editors/TinyMCE/jscripts/tiny_mce/themes/advanced/images/link.gif", ""],
									"replace" : ["replace", "/external/editors/TinyMCE/jscripts/tiny_mce/plugins/searchreplace/images/replace.gif", "searchreplace"],
									"search" : ["search", "/external/editors/TinyMCE/jscripts/tiny_mce/plugins/searchreplace/images/search.gif", "searchreplace"]
									};
--- NEW FILE: FCKeditor_toolbox.js ---
//##################################################
//#
//# Copyright (c) 2006 Maxim Mueller
//#
//# This file is part of Exponent
//#
//# Exponent is free software; you can redistribute
//# it and/or modify it under the terms of the GNU
//# General Public License as published by the Free
//# Software Foundation; either version 2 of the
//# License, or (at your option) any later version.
//#
//# GPL: http://www.gnu.org/licenses/gpl.txt
//#
//##################################################

//this file provides an Array associating availiable Actions, their Icons, and, if required for this action, their plugins, with their internal ids
//TODO: determine whether the Editor provides a queryable API for that
//TODO: adjust for themes

//TODO: possibly create a subobject WYSIWYG ?
// first = action name
// second = icon location
// third = required plugin
Exponent.WYSIWYG_toolboxbuttons =	{
									"About" : ["About FCKEditor", "/external/editors/FCKeditor/editor/skins/default/toolbar/about.gif", ""],
									"Image" : ["Image", "/external/editors/FCKeditor/editor/skins/default/toolbar/image.gif", ""],
									"Link" : ["Link", "/external/editors/FCKeditor/editor/skins/default/toolbar/link.gif", ""],
									"TableInsertRow" : ["Insert a Table", "/external/editors/FCKeditor/editor/skins/default/toolbar/tableinsertrow.gif", "tablecommands"]
									};
--- NEW FILE: Xinha.glue ---
<?PHP

##################################################
#
# Copyright (c) 2005-2006  Maxim Mueller
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

#This glue file is included by subsystems/forms/controls/htmleditorcontrol.php
#it provides the code for the htmleditorcontrol class' controltoHTML() method 
# it's based on James Hunt's code for that original class

ob_start();
if (!defined("CTL_HTMLAREAINIT")) {
	$path_to_editor = PATH_RELATIVE . "external/editors/" . SITE_WYSIWYG_EDITOR . "/";
?>
	<script type="text/javascript">
	/* <![CDATA[ */
		_editor_url = "<?php echo $path_to_editor; ?>";
		_editor_lang = "<?PHP echo LANG; ?>";
	/* ]]> */
	</script>
	
	<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>/htmlarea.js"></script>
	<script type="text/javascript" src="<?php echo PATH_RELATIVE . 'external/editors/' . SITE_WYSIWYG_EDITOR; ?>_toolbox.js"></script>
	
	<script type="text/javascript">
	/* <![CDATA[ */
<?php
	global $db;
		
	$config = $db->selectObject("toolbar_Xinha", "active=1");
	if ($config) {
		echo "		Exponent.WYSIWYG_toolbar = " . $config->data . ";\n";
	}
?>
		// new namespace for our config
		myConfig = new Object();
		
		// if plugins are needed, set them up
		myConfig.setupPlugins = function (myToolbar) {
			plugins = new Array();
			
			for(currRow = 0; currRow < myToolbar.length; currRow++) {
				for(currButton = 0; currButton < myToolbar[currRow].length; currButton++) {
					currItem = myToolbar[currRow][currButton];
					// plugin required ?
					if(Exponent.WYSIWYG_toolboxbuttons[currItem][2] != "") {
						plugins.push(Exponent.WYSIWYG_toolboxbuttons[currItem][2]);
					}
				}
			}
			
			//serialize 
			for(currPlugin = 0; currPlugin < plugins.length; currPlugin++) {
				HTMLArea.loadPlugin(plugins[currPlugin]);
			}
		}
		
		myConfig.setupToolbar = function (myToolbar) {
			return myToolbar;
		}
		
		<!-- Setup initialization functions for htmleditorcontrol -->
		// Setup the basic HTMLArea environment
		HTMLArea.loadPlugin("ContextMenu");
		HTMLArea.loadPlugin("Template");
			
		var htmleditorcontrols = new Array(); // an array of textareanames.
		var editors = new Array();
			
		// Register an initialization function with the Exponent JS Support System.
		// This will be called onLoad (assuming the theme is playing nice)
		var once = false;
		exponentJSregister(function () {
			for (i = 0; i < htmleditorcontrols.length; i++) {
				editors[i] = new HTMLArea(htmleditorcontrols[i]);
				editors[i].config = htmleditorconfig;
				
				setTimeout("editors["+i+"].generate();",i*500+100);
			}
		});

		var htmleditorconfig = new HTMLArea.Config();
		
		htmleditorconfig.debug = false;

		//redirect Image&Link browsers to E's connector
		htmleditorconfig.URIs = {
			"blank": "blank.html",
			"link": "../../connector/link.php",
			"insert_image": "../../connector/insert_image.php",
			"insert_table": "insert_table.html",
			"select_color": "select_color.html",
			"about": "about.html",
			"help": "editor_help.html"
		};
		
		if (Exponent.WYSIWYG_toolbar) {
			myConfig.setupPlugins(Exponent.WYSIWYG_toolbar);
			htmleditorconfig.toolbar = myConfig.setupToolbar(Exponent.WYSIWYG_toolbar);
		}
		
	/* ]]> */
	</script>
<?php
	define("CTL_HTMLAREAINIT", 1);
}
// all setup has been done.
?>
		<script type="text/javascript">
			htmleditorcontrols[htmleditorcontrols.length] = "<?php echo $name; ?>";
		</script>
		<textarea id="<?php echo $name; ?>" name="<?php echo $name; ?>" style="width:100%" rows="24" cols="80"><?php echo htmlentities($this->default, ENT_COMPAT, LANG_CHARSET);?></textarea>
		
<?php
$html = ob_get_contents();
ob_end_clean();
?>
--- NEW FILE: fcktoolbarconfig.js.php ---
<?PHP

##################################################
#
# Copyright (c) 2006  Maxim Mueller
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# GPL: http://www.gnu.org/licenses/gpl.txt
#
##################################################

header('Content-type: text/javascript', true);
?>

FCKConfig.ToolbarSets["Default"] = <?PHP echo stripslashes($_GET['toolbar']); ?>;

plugins = <?PHP echo stripslashes($_GET['plugins']); ?>;

for(currPlugin = 0; currPlugin < plugins.length; currPlugin++) {
	FCKConfig.Plugins.Add(plugins[currPlugin], null );
}

Update of /cvsroot/exponent/exponent/external/editors/connector
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/external/editors/connector

Added Files:
	FCKeditor_link.php content_linked.php insert_image.php 
	link.php popup.js section_linked.php 
Log Message:
i hate cvs ! placing missing files under source control

--- NEW FILE: popup.js ---
// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
// This copyright notice MUST stay intact for use (see license.txt).
//
// Portions (c) dynarch.com, 2003
//
// A free WYSIWYG editor replacement for <textarea> fields.
// For full source code and docs, visit http://www.interactivetools.com/
//
// Version 3.0 developed by Mihai Bazon.
//   http://dynarch.com/mishoo
//
// $Id: popup.js,v 1.1 2006/04/25 13:23:32 maxxcorp Exp $
// v 1.3 2005/12/15 MaxxCorp

function getAbsolutePos(el) {
	var r = { x: el.offsetLeft, y: el.offsetTop };
	if (el.offsetParent) {
		var tmp = getAbsolutePos(el.offsetParent);
		r.x += tmp.x;
		r.y += tmp.y;
	}
	return r;
};

function comboSelectValue(c, val) {
	var ops = c.getElementsByTagName("option");
	for (var i = ops.length; --i >= 0;) {
		var op = ops[i];
		op.selected = (op.value == val);
	}
	c.value = val;
};

function __dlg_onclose() {
	opener.Dialog._return(null);
};

function __dlg_init(bottom) {
	var body = document.body;
	var body_height = 0;
	if (typeof bottom == "undefined") {
		var div = document.createElement("div");
		body.appendChild(div);
		var pos = getAbsolutePos(div);
		body_height = pos.y;
	} else {
		var pos = getAbsolutePos(bottom);
		body_height = pos.y + bottom.offsetHeight;
	}
	window.dialogArguments = opener.Dialog._arguments;
	if (!document.all) {
		window.sizeToContent();
		window.sizeToContent();	// for reasons beyond understanding,
					// only if we call it twice we get the
					// correct size.
		window.addEventListener("unload", __dlg_onclose, true);
		// center on parent
		var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
		var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
		window.moveTo(x, y);
		window.innerWidth = body.offsetWidth + 5;
		window.innerHeight = body_height + 2;
	} else {
		// window.dialogHeight = body.offsetHeight + 50 + "px";
		// window.dialogWidth = body.offsetWidth + "px";
		window.resizeTo(body.offsetWidth, body_height);
		var ch = body.clientHeight;
		var cw = body.clientWidth;
		window.resizeBy(body.offsetWidth - cw, body_height - ch);
		var W = body.offsetWidth;
		var H = 2 * body_height - ch;
		var x = (screen.availWidth - W) / 2;
		var y = (screen.availHeight - H) / 2;
		window.moveTo(x, y);
	}
	document.body.onkeypress = __dlg_close_on_esc;
};

function __dlg_translate(i18n) {
	var types = ["span", "option", "td", "button", "div", "legend", "a", "input", "select"];
	for (var type in types) {
		var spans = document.getElementsByTagName(types[type]);
		for (var i = spans.length; --i >= 0;) {
			var span = spans[i];
			if (span.firstChild && span.firstChild.data) {
				var txt = i18n[span.firstChild.data];
				if (txt)
					span.firstChild.data = txt;
			}
			if (span.getAttributeNode("title")) {
				var txt = i18n[span.getAttribute("title")];
				if (txt) {
					span.setAttribute("title", txt);
				}
			}
		}
	}
	var txt = i18n[document.title];
	if (txt)
		document.title = txt;
};

// closes the dialog and passes the return info upper.
function __dlg_close(val) {
	if (typeof opener.Dialog._return != 'undefined') {
		opener.Dialog._return(val);
	}
	window.close();
};

function __dlg_close_on_esc(ev) {
	ev || (ev = window.event);
	if (ev.keyCode == 27) {
		window.close();
		return false;
	}
	return true;
};

--- NEW FILE: insert_image.php ---
<?PHP
	define("SCRIPT_EXP_RELATIVE","external/editors/connector/");
	define("SCRIPT_FILENAME","insert_image.php");

	require_once("../../../exponent.php");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<title>Insert/Modify Image</title>

		<script type="text/javascript" src="../../../exponent.js.php"></script>
		<script type="text/javascript" src="popup.js"></script>
		<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/connector/lang/'  . LANG . '.js';?>"></script>
		<script type="text/javascript">
		/* <![CDATA[ */
			I18N = Exponent.I18N;
					
			function i18n(str) {
			  return (I18N[str] || str);
			};
			
			function efm_pickedFile(file_id,file_path) {
				document.getElementById("f_url").value = file_path;
				window.onPreview();
			}
			
			function Init() {
				__dlg_translate(I18N);
				__dlg_init();
				var param = window.dialogArguments;
			
				if (param) {
					document.getElementById("f_url").value = param["f_url"];
					document.getElementById("f_alt").value = param["f_alt"];
					document.getElementById("f_border").value = param["f_border"];
					document.getElementById("f_align").value = param["f_align"];
					document.getElementById("f_vert").value = param["f_vert"];
					document.getElementById("f_horiz").value = param["f_horiz"];
			
					if (param.f_url.substr(0,7) == "http://") {
						window.ipreview.location.replace(param.f_url);
					}
					else {
						window.ipreview.location.replace(Exponent.PATH_RELATIVE + param.f_url);
					}
				}
			
				document.getElementById("f_url").focus();
			};
			
			
			function onOK() {
				var required = {"f_url": "You must enter the URL"  };
			
				for (var i in required) {
					var el = document.getElementById(i);
			
					if (!el.value) {
						alert(required[i]);
						el.focus();
						return false;
					}
				}  // pass data back to the calling window
			
				var fields = ["f_url", "f_alt", "f_align", "f_border","f_horiz", "f_vert"];
				var param = new Object();
			
				for (var i in fields) {
					var id = fields[i];
					var el = document.getElementById(id);
					param[id] = el.value;
				}
		
				// TinyMCE integration, indicates this comes from an image browser
			  	param["f_dialogType"] = "Image";
			
				__dlg_close(param);
				window.close();
				return false;
			};
			
			
			function onCancel() {
				__dlg_close(null);
				window.close();
				return false;
			};
			
			
			function onPreview() {
				var f_url = document.getElementById("f_url");
				var url = f_url.value;
			
				if (!url) {
					alert("You have to enter an URL first");
					f_url.focus();
					return false;
				};
			
				if (url.substr(0,7) == "http://") {
					window.ipreview.location.replace(url);
				} else {
					window.ipreview.location.replace(Exponent.PATH_RELATIVE + url);
				}
			
				return false;
			};
			
			function onBrowse() {
				window.open("../../../modules/filemanagermodule/actions/picker.php?id=0", "Browser");
				return false;
			
			//	window.open("../../../source_selector.php?showmodules=imagemanagermodule&dest=&vmod=imagemanagermodule&vview=_sourcePicker&hideOthers=1","palette","toolbar=no,title=no,width=640,height=480,scrollbars=yes");
			}
	/* ]]> */		
	</script>
	<style type="text/css">
	/* <![CDATA[ */
		html, body {
			background: ButtonFace;
			color: ButtonText;
			font: 11px
			Tahoma,Verdana,sans-serif;
			margin: 0px;
			padding: 0px;
		}
		body {
			padding: 5px;
		}
		table {
			font: 11px Tahoma,Verdana,sans-serif;
		}
		form p {
			margin-top: 5px;
			margin-bottom: 5px;
		}
		.fl {
			width: 9em;
			float: left;
			padding: 2px 5px;
			text-align: right;
		}
		.fr {
			width: 6em;
			float: left;
			padding: 2px 5px;
			text-align: right;
		}
		fieldset {
			padding: 0px 10px 5px 5px;
		}
		select, input, button {
			font: 11px Tahoma,Verdana,sans-serif;
		}
		button {
			width: 70px;
		}
		.space {
			padding: 2px;
		}
		.title {
			background: #ddf;
			color: #000;
			font-weight: bold;
			font-size: 120%;
			padding: 3px 10px;
			margin-bottom: 10px;
			border-bottom: 1px solid black;
			letter-spacing: 2px;
		}
		form {
			padding: 0px;
			margin: 0px;
		}
	/* ]]> */
	</style>
</head>
<body onload="Init()">
	<div class="title">Insert/Modify Image</div>
	<!--- new stuff -->
	<form action="" method="get">
		<table border="0" width="100%" style="padding: 0px; margin: 0px">
			<tbody>
				<tr>
					<td style="width: 7em; text-align: right">Image URL</td>
					
					<td>
						<input type="text" name="url" id="f_url" style="width:75%" title="Enter the image URL here" onchange="onPreview();" />
       					<button name="preview" onclick="return onBrowse();" title="Browse Uploaded Images and Select One">Browse</button>
      					<!-- Taken out to tie ImageManager in <button name="preview" onclick="return onPreview();"      title="Preview the image in a new window">Preview</button> -->
      				</td>
      			</tr>
      			<tr>
      				<td style="width: 7em; text-align: right">Alternate Text</td>
      				
      				<td>
      					<input type="text" name="alt" id="f_alt" style="width:100%" title="For browsers that don't support images"/>
      				</td>
      			</tr>
      		</tbody>
      	</table>
      	<p/>
      	<fieldset style="float: left; margin-left: 5px;">
      		<legend>Layout</legend>
      		
      		<div class="space"/>
      		
      		<div class="fl">Alignment</div>
      		<select size="1" name="align" id="f_align"  title="Positioning of this image">
      			<option value="">Not Set</option>
      			<option value="left">Left</option>
      			<option value="right">Right</option>
      			<option value="texttop">Texttop</option>
      			<option value="absmiddle">Absmiddle</option>
      			<option value="baseline" selected="1">Baseline</option>
      			<option value="absbottom">Absbottom</option>
      			<option value="bottom">Bottom</option>
      			<option value="middle">Middle</option>
      			<option value="top">Top</option>
      		</select>
      		
      		<p/>
      		
      		<div class="fl">Border Thickness</div>
      		<input type="text" name="border" id="f_border" size="5" title="Leave empty for no border"/>
      		
      		<div class="space"/>
      	</fieldset>
      	<fieldset style="float:right; margin-right: 5px;">
      		<legend>Spacing</legend>
      		
      		<div class="space"/>
      		
      		<div class="fr">Horizontal</div>
      		<input type="text" name="horiz" id="f_horiz" size="5" title="Horizontal padding"/>
      		
      		<p/>
      		
      		<div class="fr">Vertical</div>
      		<input type="text" name="vert" id="f_vert" size="5" title="Vertical padding"/>
      		
      		<div class="space"/>
      		
      	</fieldset>
      	
      	<br clear="all"/>
      	
      	<table width="100%" style="margin-bottom: 0.2em">
      		<tr>
      			<td valign="bottom">
      				<span>Image Preview</span><br/>
      				<iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" height="200" width="300" src=""></iframe>
      			</td>
      			<td valign="bottom" style="text-align: right">
      				<button type="button" name="ok" onclick="return onOK();">OK</button><br/>
      				<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
      			</td>
      		</tr>
      	</table>
	</form>
</body>
</html>
--- NEW FILE: section_linked.php ---
<?php

##################################################
#
# Copyright (c) 2004-2005 James Hunt and the OIC Group, Inc.
#
# This file is part of Exponent
#
# Exponent is free software; you can redistribute
# it and/or modify it under the terms of the GNU
# General Public License as published by the Free
# Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# Exponent is distributed in the hope that it
# will be useful, but WITHOUT ANY WARRANTY;
# without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE.  See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU
# General Public License along with Exponent; if
# not, write to:
#
# Free Software Foundation, Inc.,
# 59 Temple Place,
# Suite 330,
# Boston, MA 02111-1307  USA
#
# $Id: section_linked.php,v 1.1 2006/04/25 13:23:32 maxxcorp Exp $
##################################################

#  Thanks to Daniel Grabert for this patch. - 1/12/05

	if (isset($_REQUEST['section'])) {
		$section_id = $_REQUEST['section'];
		$section_name = isset($_REQUEST['section_name']) ? $_REQUEST['section_name'] : '';
	} else {
		// bad request - no section found

		// go back to referring page, if available
		$referer_url = $_SERVER['HTTP_REFERER'];
		if ( $referer_url ) {
			header("Location: $referer_url");
		} else {
			echo SITE_403_HTML;
			exit();
		}
	}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
	<body>
	<script type="text/javascript">
	var f_url = window.opener.document.getElementById("f_href");
	var f_extern = window.opener.document.getElementById("f_extern");
	var f_title = window.opener.document.getElementById("f_title");
	
	// set value for url form element in opener
	f_url.value = "?section=<?php echo $section_id; ?>";
	
	// uncheck external link box in parent window
	f_extern.checked = false;

	// set title
	f_title.value = "<?php echo 'Link to section ' . $section_name; ?>";
	
	window.close();
	</script>
	</body>
</html>
--- NEW FILE: FCKeditor_link.php ---
<?PHP
	define("SCRIPT_EXP_RELATIVE","external/editors/connector/");
	define("SCRIPT_FILENAME","FCKeditor_link.php");
	
	require_once("../../../exponent.php");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

	<head>
		<title>Insert/Modify Link</title>

		<script type="text/javascript" src="../../../exponent.js.php"></script>
		<script type="text/javascript" src="popup.js"></script>
		<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/connector/lang/' . LANG . '.js'?>"></script>
  		<script type="text/javascript">
		/* <![CDATA[ */
			I18N = Exponent.I18N;
			
			function i18n(str) {
  				return (I18N[str] || str);
			};
			
			
			
			function onOK() {
				
				// FCKeditor integration
				window.opener.SetUrl(document.getElementById("f_href").value);

				window.close();
				return false;
			};

			function onCancel() {
				window.close();
				return false;
			};



			function openSectionLinker() {
				window.open("../../../modules/navigationmodule/nav.php?linkbase="+escape("../../external/editors/connector/section_linked.php?dummy"),"sectionlinker","toolbar=no,title=no,width=250,height=480,scrollbars=yes");
			}

			function openContentLinker() {
				window.open("../../../content_selector.php?dest="+escape("external/editors/connector/content_linked.php?dummy")+"&vview=_linkPicker&vmod=containermodule&showmodules=all","contentlinker","toolbar=no,title=no,width=640,height=480,scrollbars=yes");
			}
		/* ]]> */
		</script>

		<style type="text/css">
		/* <![CDATA[ */
			html, body {
  				background: ButtonFace;
				color: ButtonText;
				font: 11px Tahoma,Verdana,sans-serif;
				margin: 0px;
				padding: 0px;
			}
			body {
				padding: 5px;
			}
			table {
				font: 11px Tahoma,Verdana,sans-serif;
			}
			select, input, button {
				font: 11px Tahoma,Verdana,sans-serif;
			}
			button {
				width: 70px;
			}
			table .label {
				text-align: right;
				font-weight: normal;
				vertical-align: top;
				width: 8em;
			}

			.title {
				background: #ddf;
				color: #000;
				font-weight: bold;
				font-size: 120%;
				padding: 3px 10px;
				margin-bottom: 10px;
				border-bottom: 1px
				solid black;
				letter-spacing: 2px;
			}

			a {
				text-decoration: none;
				color: rgb(97,115,132);
				font-weight: bold;
			}

			#buttons {
				margin-top: 1em;
				border-top: 1px
				solid #999;
				padding: 2px;
				text-align: right;
			}
		/* ]]> */
		</style>

	</head>

	<body onload="__dlg_translate(I18N);">
		<div class="title">Insert/Modify Link</div>

		<table border="0" style="width: 100%;">
			<tbody>
				<tr>
					<td colspan="2"><hr size="1" />
						<a class="header">Select a Page, or Content</a>
					</td>
				</tr>
				<tr>
					<td class="label">Internal Links</td>
					<td align="center">
						<a href="#" onclick="openSectionLinker(); return false;">Link to a Page</a>&nbsp;|&nbsp;<a href="#" onclick="openContentLinker(); return false;">Link to Content</a>
						<input id="f_href" type="hidden"/>
						<input id="f_extern" checked="checked" type="hidden"/>
						<input id="f_title" type="hidden"/>
					</td>
				</tr>
			</tbody>
		</table>

		<div id="buttons">
			<button type="button" name="ok" onclick="return onOK();">OK</button>
			<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
		</div>
	</body>
</html>

--- NEW FILE: content_linked.php ---
<?php
define("SCRIPT_EXP_RELATIVE","external/editors/connector/");
define("SCRIPT_FILENAME","content_linked.php");

require_once("../../../exponent.js.php");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<script type="text/javascript">
		/* <![CDATA[ */
			var f_url = window.opener.document.getElementById("f_href");
			f_url.value = "?section=<?php echo exponent_sessions_get("last_section"); ?>#mod_<?php echo $_GET['cid']; ?>";
			var f_extern = window.opener.document.getElementById("f_extern");
			f_extern.checked = false;
			//TODO: find a way(maybe via containermod:_source_picker.tpl) to pass the title of the contained module to the Link Picker
			window.close();
		/* ]]> */
		</script>
	</head>
	<body/>
</html>
--- NEW FILE: link.php ---
<?PHP
	define("SCRIPT_EXP_RELATIVE","external/editors/connector/");
	define("SCRIPT_FILENAME","link.php");
	
	require_once("../../../exponent.php");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

	<head>
		<title>Insert/Modify Link</title>

		<script type="text/javascript" src="../../../exponent.js.php"></script>
		<script type="text/javascript" src="popup.js"></script>
		<script type="text/javascript" src="<?PHP echo PATH_RELATIVE . 'external/editors/connector/lang/' . LANG . '.js'?>"></script>
  		<script type="text/javascript">
		/* <![CDATA[ */
			I18N = Exponent.I18N;
			

			function i18n(str) {
  				return (I18N[str] || str);
			};

			function onTargetChanged() {
  				var f = document.getElementById("f_other_target");
  				if (this.value == "_other") {
    					f.style.visibility = "visible";
    					f.select();
    					f.focus();
  				} else f.style.visibility = "hidden";
			};

			function Init() {
				__dlg_translate(I18N);
				__dlg_init();
				var param = window.dialogArguments;
				var target_select = document.getElementById("f_target");
				if (param) {
					document.getElementById("f_href").value = param["f_href"];
					document.getElementById("f_extern").checked = (param["f_href"].substr(0,7) == "http://");
					document.getElementById("f_title").value = param["f_title"];
					comboSelectValue(target_select, param["f_target"]);
					if (target_select.value != param.f_target) {
						var opt = document.createElement("option");
						opt.value = param.f_target;
						opt.innerHTML = opt.value;
						target_select.appendChild(opt);
						opt.selected = true;
					}
				}
				var opt = document.createElement("option");
				opt.value = "_other";
				opt.innerHTML = i18n("Other");
				target_select.appendChild(opt);
				target_select.onchange = onTargetChanged;
				document.getElementById("f_href").focus();
				document.getElementById("f_href").select();
			};


			function onOK() {
				var required = {"f_href": "You must enter the URL where this link points to"};

				for (var i in required) {
					var el = document.getElementById(i);
					if (!el.value) {
						alert(required[i]);
						el.focus();
						return false;
					}
				}
  
				var el = document.getElementById("f_href");
				if (el.value.substr(0,7) != "http://") {
					var cb = document.getElementById("f_extern");
					if (cb.checked == true) {
						//alert("External!");
						//el.setAttribute("value","http://"+el.value);
						el.value = "http://"+el.value;
					} else {
						//alert("Not External");
					}
					//return false;
				}
				// pass data back to the calling window
				var fields = ["f_href", "f_title", "f_target"];
				var param = new Object();
				for (var i in fields) {
					var id = fields[i];
					var el = document.getElementById(id);
					param[id] = el.value;
				}
				if (param.f_target == "_other") {
					param.f_target = document.getElementById("f_other_target").value;
				}
  
				// TinyMCE integration, indicates this comes from a link browser
				param["f_dialogType"] = "Link";
  
				__dlg_close(param);
				return false;
			};

			function onCancel() {
  				__dlg_close(null);
  				return false;
			};

			function openSectionLinker() {
				window.open("../../../modules/navigationmodule/nav.php?linkbase="+escape("../../external/editors/connector/section_linked.php?dummy"),"sectionlinker","toolbar=no,title=no,width=250,height=480,scrollbars=yes");
			}

			function openContentLinker() {
				window.open("../../../content_selector.php?dest="+escape("external/editors/connector/content_linked.php?dummy")+"&vview=_linkPicker&vmod=containermodule&showmodules=all","contentlinker","toolbar=no,title=no,width=640,height=480,scrollbars=yes");
			}
		/* ]]> */
		</script>

		<style type="text/css">
		/* <![CDATA[ */
			html, body {
  				background: ButtonFace;
				color: ButtonText;
				font: 11px Tahoma,Verdana,sans-serif;
				margin: 0px;
				padding: 0px;
			}
			body {
				padding: 5px;
			}
			table {
				font: 11px Tahoma,Verdana,sans-serif;
			}
			select, input, button {
				font: 11px Tahoma,Verdana,sans-serif;
			}
			button {
				width: 70px;
			}
			table .label {
				text-align: right;
				font-weight: normal;
				vertical-align: top;
				width: 8em;
			}

			.title {
				background: #ddf;
				color: #000;
				font-weight: bold;
				font-size: 120%;
				padding: 3px 10px;
				margin-bottom: 10px;
				border-bottom: 1px
				solid black;
				letter-spacing: 2px;
			}

			a {
				text-decoration: none;
				color: rgb(97,115,132);
				font-weight: bold;
			}

			#buttons {
				margin-top: 1em;
				border-top: 1px
				solid #999;
				padding: 2px;
				text-align: right;
			}
		/* ]]> */
		</style>

	</head>

	<body onload="Init()">
		<div class="title">Insert/Modify Link</div>

		<table border="0" style="width: 100%;">
		<tbody>
			<tr>
				<td colspan="2"><hr size="1" /><a class="header">Select a Page, or Content</a></td>
			</tr>
			<tr>
				<td class="label">Internal Links</td>
				<td align="center">
					<a href="#" onclick="openSectionLinker(); return false;">Link to a Page</a>&nbsp;|&nbsp;<a href="#" onclick="openContentLinker(); return false;">Link to Content</a>
				</td>
			</tr>
			<tr>
				<td colspan="2"><hr size="1" /><a class="header">Manually Enter Address</a></td>
			</tr>
			<tr>
				<td class="label">URL</td>
				<td><input type="text" id="f_href" style="width: 100%" /></td>
			</tr>
			<tr>
				<td class="label">&nbsp;</td>
				<td ><input type="checkbox" id="f_extern" checked="checked" /><a class="label">External Website</a></td>
			</tr>
			<tr>
				<td colspan="2"><hr size="1" /><a class="header">Additional Link Options</a></td>
			</tr>
  			<tr>
				<td class="label">Title (tooltip)</td>
				<td><input type="text" id="f_title" style="width: 100%" /></td>
			</tr>
			<tr>
				<td class="label">Target</td>
				<td>
					<select id="f_target">
						<option value="">None (use implicit)</option>
						<option value="_blank">New window (_blank)</option>
						<option value="_self">Same frame (_self)</option>
						<option value="_top">Top frame (_top)</option>
					</select>
					<input type="text" name="f_other_target" id="f_other_target" size="10" style="visibility: hidden" />
				</td>
			</tr>
		</tbody>
		</table>

		<div id="buttons">
			<button type="button" name="ok" onclick="return onOK();">OK</button>
			<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
		</div>

	</body>
</html>

Update of /cvsroot/exponent/exponent/external/editors/connector/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/external/editors/connector/lang

Added Files:
	de.js en.js 
Log Message:
i hate cvs ! placing missing files under source control

--- NEW FILE: en.js ---
// Placeholder

Exponent.I18N = {
		};


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

Update of /cvsroot/exponent/exponent/external/htmlarea/popups
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/external/htmlarea/popups

Removed Files:
	about.html blank.html content_linked.php custom2.html 
	editor_help.html fullscreen.html insert_image.php 
	insert_table.html link.html old-fullscreen.html 
	old_insert_image.html popup.js section_linked.php 
	select_color.html 
Log Message:
cleanup, but how to delete the drawers ?

--- popup.js DELETED ---

--- old-fullscreen.html DELETED ---

--- select_color.html DELETED ---

--- insert_image.php DELETED ---

--- content_linked.php DELETED ---

--- old_insert_image.html DELETED ---

--- insert_table.html DELETED ---

--- section_linked.php DELETED ---

--- blank.html DELETED ---

--- about.html DELETED ---

--- fullscreen.html DELETED ---

--- link.html DELETED ---

--- custom2.html DELETED ---

--- editor_help.html DELETED ---

Update of /cvsroot/exponent/exponent/external/htmlarea/plugins/Template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/external/htmlarea/plugins/Template

Removed Files:
	template.js 
Log Message:
cleanup, but how to delete the drawers ?

--- template.js DELETED ---

Update of /cvsroot/exponent/exponent/external/htmlarea/plugins/TableOperations/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/external/htmlarea/plugins/TableOperations/lang

Removed Files:
	cz.js da.js de.js el.js en.js fi.js hu.js it.js nl.js no.js 
	ro.js 
Log Message:
cleanup, but how to delete the drawers ?

--- da.js DELETED ---

--- hu.js DELETED ---

--- de.js DELETED ---

--- el.js DELETED ---

--- nl.js DELETED ---

--- no.js DELETED ---

--- en.js DELETED ---

--- fi.js DELETED ---

--- ro.js DELETED ---

--- cz.js DELETED ---

--- it.js DELETED ---

Update of /cvsroot/exponent/exponent/external/htmlarea/toolbaricons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/external/htmlarea/toolbaricons

Removed Files:
	about.gif bold.gif copy.gif createlink.gif cut.gif 
	ed_charmap.gif ed_custom.gif ed_delete.gif ed_save.gif 
	ed_show_border.gif ed_splitcel.gif fontname.gif fontsize.gif 
	forecolor.gif formatblock.gif fullscreen_minimize.gif 
	hilitecolor.gif htmlmode.gif indent.gif 
	inserthorizontalrule.gif insertimage.gif insertorderedlist.gif 
	inserttable.gif insertunorderedlist.gif italic.gif 
	justifycenter.gif justifyfull.gif justifyleft.gif 
	justifyright.gif lefttoright.gif outdent.gif paste.gif 
	popupeditor.gif redo.gif righttoleft.gif separator.gif 
	showhelp.gif space.gif strikethrough.gif subscript.gif 
	superscript.gif underline.gif undo.gif 
Log Message:
cleanup, but how to delete the drawers ?

--- ed_custom.gif DELETED ---

--- redo.gif DELETED ---

--- ed_charmap.gif DELETED ---

--- copy.gif DELETED ---

--- indent.gif DELETED ---

--- insertimage.gif DELETED ---

--- insertunorderedlist.gif DELETED ---

--- justifyleft.gif DELETED ---

--- formatblock.gif DELETED ---

--- ed_save.gif DELETED ---

--- createlink.gif DELETED ---

--- ed_show_border.gif DELETED ---

--- subscript.gif DELETED ---

--- separator.gif DELETED ---

--- fontname.gif DELETED ---

--- inserthorizontalrule.gif DELETED ---

--- bold.gif DELETED ---

--- about.gif DELETED ---

--- fullscreen_minimize.gif DELETED ---

--- fontsize.gif DELETED ---

--- inserttable.gif DELETED ---

--- superscript.gif DELETED ---

--- undo.gif DELETED ---

--- cut.gif DELETED ---

--- outdent.gif DELETED ---

--- showhelp.gif DELETED ---

--- popupeditor.gif DELETED ---

--- space.gif DELETED ---

--- hilitecolor.gif DELETED ---

--- italic.gif DELETED ---

--- ed_splitcel.gif DELETED ---

--- underline.gif DELETED ---

--- ed_delete.gif DELETED ---

--- strikethrough.gif DELETED ---

--- justifycenter.gif DELETED ---

--- justifyright.gif DELETED ---

--- justifyfull.gif DELETED ---

--- insertorderedlist.gif DELETED ---

--- lefttoright.gif DELETED ---

--- htmlmode.gif DELETED ---

--- paste.gif DELETED ---

--- righttoleft.gif DELETED ---

--- forecolor.gif DELETED ---

Update of /cvsroot/exponent/exponent/external/htmlarea/plugins/Template/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/external/htmlarea/plugins/Template/lang

Removed Files:
	en.js 
Log Message:
cleanup, but how to delete the drawers ?

--- en.js DELETED ---