From ariadne-cvs@muze.nl  Mon Jul  1 14:55:01 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 01 Jul 2002 13:55:01 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/modules mod_tar.phtml  /lib/stores axstore.phtml
Message-ID: <cvsgijs1025531701@cvsserver>

This is a MIME encoded message

--gijs1025531701
Content-Type: text/plain

gijs		Mon Jul  1 15:55:01 2002 EDT

  Added files:                 
    /ariadne/lib/modules	mod_tar.phtml 

  Modified files:              
    /ariadne/lib/stores	axstore.phtml 
  Log:
  Moved tar/untar functionality into mod_tar. This module
  now also support the PEAR Archive/Tar module. 
  
  
--gijs1025531701
Content-Type: text/plain
Content-Disposition: attachment; filename="gijs-20020701155501.txt"

Index: ariadne/lib/stores/axstore.phtml
diff -u ariadne/lib/stores/axstore.phtml:1.27 ariadne/lib/stores/axstore.phtml:1.28
--- ariadne/lib/stores/axstore.phtml:1.27	Thu Jun  6 17:04:20 2002
+++ ariadne/lib/stores/axstore.phtml	Mon Jul  1 15:55:01 2002
@@ -25,6 +25,9 @@
 	*****************/
 
 	function axstore($path, $config) {
+		debug("axstore($path, $config)", "store");
+		include_once($config["code"]."modules/mod_tar.phtml");
+
 		$this->database=$config["database"];
 
 		$this->writeable=$config["writeable"];
@@ -32,20 +35,20 @@
 		$this->files=$config["temp"];
 		$this->code=$config["code"];
 
-		$this->tar_error_handler=$config["tar_error_handler"];
-		$this->tar_tar=$config["tar_tar"];
-		$this->tar_untar=$config["tar_untar"];
-		$this->tar_nofail=$config["tar_nofail"];
+		$this->tar = new mod_tar($config["tar"]);
 
 		// create tempdir (and do some windows compat magic)
 		$this->tempdir=tempnam($this->temp, "axtemp");
 		@unlink($this->tempdir);
 
+		debug("creating tempdir (".$this->tempdir.")", "store");
 		if (@mkdir($this->tempdir, 0777)) {
 			if (file_exists($this->database)) {
-				if ($this->_untar($this->database, " ", $this->tempdir)) {
+				debug("extracting database (".$this->database.")", "store");
+				if ($this->tar->extract($this->database, " ", $this->tempdir)) {
 					if (file_exists($this->tempdir."/objects.data")) {
 						// now we have found our objects.data, lets make an index of it
+						debug("loading (".$this->tempdir."/objects.data)", "store");
 						$this->ofile=fopen($this->tempdir."/objects.data", "rb");
 						if ($this->ofile) {
 							$currentoffset=ftell($this->ofile);
@@ -86,6 +89,7 @@
 								$currentoffset=ftell($this->ofile);
 							}
 
+							debug("loading (".$this->tempdir."/nodes.data", "store");
 							// read nodes data
 							$fp_nodes=fopen($this->tempdir."/nodes.data", "rb");
 							if ($fp_nodes) {
@@ -125,13 +129,13 @@
 					}
 
 					if (!$this->error && file_exists($this->tempdir."/templates.tgz")) {
-						if (!$this->_untar($this->tempdir."/templates.tgz", "", $this->tempdir)) {
+						if (!$this->tar->extract($this->tempdir."/templates.tgz", "", $this->tempdir)) {
 							$this->error="Could not untar templates archive";
 						}
 					}
 
 					if (!$this->error && file_exists($this->tempdir."/files.tgz")) {
-						if (!$this->_untar($this->tempdir."/files.tgz", "", $this->tempdir)) {
+						if (!$this->tar->extract($this->tempdir."/files.tgz", "", $this->tempdir)) {
 							$this->error="Could not untar files archive";
 						}
 					}
@@ -140,6 +144,8 @@
 						/* create a temporary 'temp' directory */
 						@mkdir($this->files."temp/", 0755);
 					}
+				} else {
+					$this->error="Could not extract database";
 				}
 			} else 
 			if ($this->writeable) {
@@ -152,6 +158,7 @@
 			$this->error="Could not create tempdir";
 		}
 
+		debug("axstore [end]", "store");
 		return $result;
 	}
 
@@ -650,95 +657,6 @@
 		return $result;
 	}
 
-	function _fix_tar_paths($path) {
-	global $AR;
-		if ($AR->OS=="WIN32") {
-			$path=str_replace('\\', '/', $path);
-			if (eregi('^([a-z]):', $path, $regs)) {
-				$path="//".$regs[1].substr($path,2);
-			}
-		}
-		// escape spaces
-		$path=ereg_replace('([^\])[ ]', '\1\ ', $path);
-		return $path;
-	}
-
-	function _untar($tarfile, $file, $dstdir) {
-		if ($this->tar_error_handler) {
-			$errfile=$this->tempdir."/tar.errors";
-			$errfile=$this->_fix_tar_paths($errfile);
-			$handler=sprintf($this->tar_error_handler, $errfile);
-		}
-		$dstdir=$this->_fix_tar_paths($dstdir);
-		$tarfile=$this->_fix_tar_paths($tarfile);
-
-		//$command=sprintf($this->tar_untar, $dstdir, $file, $tarfile, $handler );
-		$arguments = Array(
-						"%destdir%" => $dstdir,
-						"%contents%" => $file,
-						"%archive%" => $tarfile,
-						"%errorhandler%" => $handler
-					 );
-
-		$command = $this->tar_untar;
-		while (list($key, $val) = each($arguments)) {
-			$command = str_replace($key, $val, $command);
-		}
-
-		system($command,$retVar);
-		if (!$this->tar_nofail && ($retVar!=0 && $retVar!=259)) {
-			$this->error.="Error:\n	($command):\n	Can't untar $tarfile, untar failed in $dstdir with errorcode ($retVar)\n";
-			if ($errfile && file_exists($errfile)) {
-				$this->error.=implode("",file($errfile));						
-				unlink($errfile);
-				$this->error.="\n";
-			}
-			$result=0;
-		} else {
-			$result=1; // ok
-		}
-		return $result;
-	}
-
-	function _tar($tarfile, $file, $dstdir) {
-		if ($this->tar_error_handler) {
-			$errfile=$this->tempdir."/tar.errors";
-			$errfile=$this->_fix_tar_paths($errfile);
-			$handler=sprintf($this->tar_error_handler, $errfile);
-		}
-
-		$dstdir=$this->_fix_tar_paths($dstdir);
-		$tarfile=$this->_fix_tar_paths($tarfile);
-
-		//$command=sprintf($this->tar_tar, $dstdir, $file, $tarfile, $handler );
-		$arguments = Array(
-						"%destdir%" => $dstdir,
-						"%contents%" => $file,
-						"%archive%" => $tarfile,
-						"%errorhandler%" => $handler
-					 );
-
-		$command = $this->tar_tar;
-
-		while (list($key, $val) = each($arguments)) {
-			$command = str_replace($key, $val, $command);
-		}
-
-		system($command,$retVar);
-		if (!$this->tar_nofail && $retVar!=0) {
-			$this->error="Error: ($command):\n	Can't tar to $tarfile, tar failed in $dstdir with errorcode ($retVar)\n";
-			if ($errfile && file_exists($errfile)) {
-				$this->error.=implode("",file($errfile));						
-				unlink($errfile);
-				$this->error.="\n";
-			}
-			$result=0;
-		} else {
-			$result=1; // ok
-		}
-		return $result;
-	}
-
 	function rm_dir($path) {
 	debug("axstore::rm_dir($path)");
 		$path=($path[strlen($path)-1]=="/") ? $path : $path."/";
@@ -810,14 +728,14 @@
 
 						// filestores:
 						if (file_exists($this->tempdir."/templates")) {
-							if (!$this->_tar($this->tempdir."/templates.tgz", "templates", $this->tempdir)) {
+							if (!$this->tar->create($this->tempdir."/templates.tgz", "templates", $this->tempdir)) {
 								$this->error="Could not create templates archive";
 							}
 							$this->rm_dir($this->tempdir."/templates");
 						}
 
 						if (file_exists($this->tempdir."/files")) {
-							if (!$this->_tar($this->tempdir."/files.tgz", "files", $this->tempdir)) {
+							if (!$this->tar->create($this->tempdir."/files.tgz", "files", $this->tempdir)) {
 								$this->error="Could not create files archive";
 							}
 							$this->rm_dir($this->tempdir."/files");
@@ -827,7 +745,7 @@
 							$this->rm_dir($this->files."/temp");
 						}
 
-						if (!$this->_tar($this->database, " . ", $this->tempdir)) {
+						if (!$this->tar->create($this->database, " . ", $this->tempdir)) {
 							$this->error="Could not save the new export file $this->database\n";
 						} else {
 							$this->rm_dir($this->tempdir);

Index: ariadne/lib/modules/mod_tar.phtml
+++ ariadne/lib/modules/mod_tar.phtml
<?php
	class mod_tar {
		function mod_tar($config) {
			$this->config = $config;
			$this->tar_error_handler = $config["error_handler"];
			$this->tar_tar = $config["tar"];
			$this->tar_untar = $config["untar"];
			$this->tar_nofail = $config["nofail"];
			$this->mode = $config["mode"];
			if ($this->mode == "pear" || !$this->mode) {
				$this->mode = "pear";
				include_once("Archive/Tar.php");
				PEAR::setErrorHandling(PEAR_ERROR_DIE);
			}
			debug("mod_tar:: mode='".$this->mode."'");
		}


		function extract($archive, $file, $dstdir) {
			if ($this->mode == "system") {
				$result = $this->untar_system($archive, $file, $dstdir);
			} else {
				$result = $this->untar_pear($archive, $file, $dstdir);
			}
			return $result;
		}

		function create($archive, $file, $srcdir) {
			if ($this->mode == "system") {
				$result = $this->tar_system($archive, $file, $srcdir);
			} else {
				$result = $this->tar_pear($archive, $file, $srcdir);
			}
			return $result;
		}

		function untar_pear($archive, $file, $dstdir) {
			debug("untar_pear($archive, $file, $dstdir)");

			$archive = new Archive_Tar($archive, true);
			$result = $archive->extract($dstdir);
			$archive->_Archive_Tar();

			debug("untar_pear [return]");
			return $result;
		}
	
		function tar_pear($archive, $filelist, $srcdir) {
			$archive = new Archive_Tar($archive, true);
			$filelist = trim($filelist);
			$filelist = explode(" ", $filelist);
			if ($srcdir && $srcdir[strlen($srcdir)-1] != '/') {
				$srcdir.='/';
			}
			if (is_array($filelist)) {
				while (list($key, $file) = each($filelist)) {
					$filelist[$key] = $srcdir.$file;
				}
			}
			$result = $archive->addModify($filelist, "", $srcdir);
			$archive->_Archive_Tar();
			return $result;
		}



		function untar_system($tarfile, $file, $dstdir) {
			debug("untar_system($tarfile, $file, $dstdir)");

			if ($this->tar_error_handler) {
				$errfile=$dstdir."/tar.errors";
				$errfile=$this->_fix_tar_paths($errfile);
				$handler=sprintf($this->tar_error_handler, $errfile);
			}
			$dstdir=$this->_fix_tar_paths($dstdir);
			$tarfile=$this->_fix_tar_paths($tarfile);

			//$command=sprintf($this->tar_untar, $dstdir, $file, $tarfile, $handler );
			$arguments = Array(
							"%destdir%" => $dstdir,
							"%contents%" => $file,
							"%archive%" => $tarfile,
							"%errorhandler%" => $handler
						 );

			$command = $this->tar_untar;
			while (list($key, $val) = each($arguments)) {
				$command = str_replace($key, $val, $command);
			}

			debug("untar cmd ($command)");
			system($command,$retVar);
			if (!$this->tar_nofail && ($retVar!=0 && $retVar!=259)) {
				$this->error.="Error:\n	($command):\n	Can't untar $tarfile, untar failed in $dstdir with errorcode ($retVar)\n";
				if ($errfile && file_exists($errfile)) {
					$this->error.=implode("",file($errfile));						
					@unlink($errfile);
					$this->error.="\n";
				}
				$result=0;
			} else {
				$result=1; // ok
			}
			return $result;
		}

		function tar_system($tarfile, $file, $dstdir) {
			if ($this->tar_error_handler) {
				$errfile=$this->tempdir."/tar.errors";
				$errfile=$this->_fix_tar_paths($errfile);
				$handler=sprintf($this->tar_error_handler, $errfile);
			}

			$dstdir=$this->_fix_tar_paths($dstdir);
			$tarfile=$this->_fix_tar_paths($tarfile);

			//$command=sprintf($this->tar_tar, $dstdir, $file, $tarfile, $handler );
			$arguments = Array(
							"%destdir%" => $dstdir,
							"%contents%" => $file,
							"%archive%" => $tarfile,
							"%errorhandler%" => $handler
						 );

			$command = $this->tar_tar;

			while (list($key, $val) = each($arguments)) {
				$command = str_replace($key, $val, $command);
			}

			system($command,$retVar);
			if (!$this->tar_nofail && $retVar!=0) {
				$this->error="Error: ($command):\n	Can't tar to $tarfile, tar failed in $dstdir with errorcode ($retVar)\n";
				if ($errfile && file_exists($errfile)) {
					$this->error.=implode("",file($errfile));						
					unlink($errfile);
					$this->error.="\n";
				}
				$result=0;
			} else {
				$result=1; // ok
			}
			return $result;
		}

		function _fix_tar_paths($path) {
		global $AR;
			if ($AR->OS=="WIN32") {
				$path=str_replace('\\', '/', $path);
				if (eregi('^([a-z]):', $path, $regs)) {
					$path="//".$regs[1].substr($path,2);
				}
			}
			// escape spaces
			$path=ereg_replace('([^\])[ ]', '\1\ ', $path);
			return $path;
		}

	}
?>
--gijs1025531701--



From ariadne-cvs@muze.nl  Mon Jul  1 15:03:49 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 01 Jul 2002 14:03:49 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/configs axstore.phtml
Message-ID: <cvsgijs1025532229@cvsserver>

gijs		Mon Jul  1 16:03:49 2002 EDT

  Modified files:              
    /ariadne/lib/configs	axstore.phtml 
  Log:
  Adjusted axstore config 
  
  
Index: ariadne/lib/configs/axstore.phtml
diff -u ariadne/lib/configs/axstore.phtml:1.4 ariadne/lib/configs/axstore.phtml:1.5
--- ariadne/lib/configs/axstore.phtml:1.4	Wed Apr 24 13:11:34 2002
+++ ariadne/lib/configs/axstore.phtml	Mon Jul  1 16:03:49 2002
@@ -30,27 +30,30 @@
   /* Tar configuration                                                     */
   /*************************************************************************/
 
-  if ($AR->OS=='WIN32') {
-    $tar_path=str_replace('\\', '/', $AR->dir->install);
-    if (eregi('^([a-z]):', $tar_path, $regs)) {
-      $tar_path="//".$regs[1].substr($tar_path,2);
-    }
-    $tar_path=ereg_replace('([^\])[ ]', '\1\ ', $tar_path);
-
-    $compress_cmd                     = '--use-compress-program='.($tar_path).'/bin/gzip.exe';
-    $tar_cmd                          = $AR->dir->install.'\bin\tar.exe '.$compress_cmd;
-    $ax_config['tar_error_handler']   = '';
-  } else {
-    $tar_cmd                          = 'tar -z ';
-    $ax_config['tar_error_handler']   = ' 2> %s ';
-  }
+  $ax_config["tar"]["mode"] = "system";
 
-  $ax_config["tar_tar"]               = $tar_cmd." -c -C %destdir% %contents% -f %archive% %errorhandler%";
-  $ax_config["tar_untar"]             = $tar_cmd." -x -C %destdir% %contents% -f %archive% %errorhandler%";
+  if ($ax_config["tar"]["mode"] == "system") {
+    if ($AR->OS=='WIN32') {
+      $tar_path=str_replace('\\', '/', $AR->dir->install);
+      if (eregi('^([a-z]):', $tar_path, $regs)) {
+        $tar_path="//".$regs[1].substr($tar_path,2);
+      }
+      $tar_path=ereg_replace('([^\])[ ]', '\1\ ', $tar_path);
+  
+      $compress_cmd                     = '--use-compress-program='.($tar_path).'/bin/gzip.exe';
+      $tar_cmd                          = $AR->dir->install.'\bin\tar.exe '.$compress_cmd;
+      $ax_config["tar"]["error_handler"]   = '';
+    } else {
+      $tar_cmd                          = 'tar -z ';
+      $ax_config["tar"]["error_handler"]   = ' 2> %s ';
+    }
 
-  // set this to true if you are really sure that tar throws errors which
-  // do not occur.
+    $ax_config["tar"]["tar"]               = $tar_cmd." -c -C %destdir% %contents% -f %archive% %errorhandler%";
+    $ax_config["tar"]["untar"]             = $tar_cmd." -x -C %destdir% %contents% -f %archive% %errorhandler%";
 
-  $ax_config['tar_nofail']            = false;
+    // set this to true if you are really sure that tar throws errors which
+    // do not occur.
 
+    $ax_config["tar"]["nofail"]            = false;
+  }
 ?>




From ariadne-cvs@muze.nl  Tue Jul  2 14:26:11 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Tue, 02 Jul 2002 13:26:11 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/puser system.save.grants.phtml
Message-ID: <cvsgijs1025616371@cvsserver>

gijs		Tue Jul  2 15:26:11 2002 EDT

  Modified files:              
    /ariadne/lib/templates/puser	system.save.grants.phtml 
  Log:
  Fixed saving of grants on user/group objects.
  
  
Index: ariadne/lib/templates/puser/system.save.grants.phtml
diff -u ariadne/lib/templates/puser/system.save.grants.phtml:1.17 ariadne/lib/templates/puser/system.save.grants.phtml:1.18
--- ariadne/lib/templates/puser/system.save.grants.phtml:1.17	Tue Jun 11 15:45:00 2002
+++ ariadne/lib/templates/puser/system.save.grants.phtml	Tue Jul  2 15:26:11 2002
@@ -92,7 +92,7 @@
 										"path"		=> $this->path,
 										"grant"		=> $grant,
 										"modifier"	=> $modifier)));
-					if ($result!="ok") {
+					if ($result!=$ARnls["ok"]) {
 						$this->error=sprintf($ARnls["err:notremovegrant"],$id,$path);
 						// FROP $this->error="Couldn't remove grant in $id ($path)";
 					}			
@@ -167,7 +167,7 @@
 														"path"		=> $this->path,
 														"grant"		=> $delgrant,
 														"modifier"	=> $modifier)));
-											if ($result!="ok") {
+											if ($result!=$ARnls["ok"]) {
 												$this->error=sprintf($ARnls["err:notsavegrant"],$path);
 												// FROP $this->error="Couldn't save grant in $path";
 											}
@@ -211,7 +211,7 @@
 													"grant"		=> $newgrant,
 													"modifier"	=> $modifier,
 													"granttype"	=> $granttype)));
-											if ($result!="ok") {
+											if ($result!=$ARnls["ok"]) {
 												$this->error=sprintf($ARnls["err:notsavegrant"],$path);
 												// FROP $this->error="Couldn't save grant in $path";
 											}




From ariadne-cvs@muze.nl  Wed Jul  3 23:05:07 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 03 Jul 2002 22:05:07 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/includes loader.web.php
Message-ID: <cvsgijs1025733907@cvsserver>

gijs		Thu Jul  4 00:05:07 2002 EDT

  Modified files:              
    /ariadne/lib/includes	loader.web.php 
  Log:
  Sessions without ARLogin will now stay alive after a login.
  
  
Index: ariadne/lib/includes/loader.web.php
diff -u ariadne/lib/includes/loader.web.php:1.29 ariadne/lib/includes/loader.web.php:1.30
--- ariadne/lib/includes/loader.web.php:1.29	Tue Jun 18 20:07:22 2002
+++ ariadne/lib/includes/loader.web.php	Thu Jul  4 00:05:07 2002
@@ -187,7 +187,20 @@
 		$ARCookie = stripslashes($HTTP_COOKIE_VARS["ARCookie"]);
 
 		debug("ldSetCredentials($login, [password])","object");
-		if (!$ARCurrent->session || (!$ARCurrent->session->get("ARSessionActivated",1)) || ($ARCurrent->session->get("ARLogin")!=$login)) {
+		if ($ARCurrent->session && 
+			(!$ARCurrent->session->get("ARSessionActivated",1) ||
+			!$ARCurrent->session->get("ARLogin"))) {
+
+			/* use the same sessionid if the user didn't login before */
+			ldStartSession($ARCurrent->session->id);
+			$ARCurrent->session->put("ARLogin",$login);
+			$ARCurrent->session->put("ARPassword",$password,1);
+			$ARCurrent->session->put("ARSessionActivated",false,1);
+
+		} else
+		if (!$ARCurrent->session || 
+			(!$ARCurrent->session->get("ARSessionActivated",1)) || 
+			($ARCurrent->session->get("ARLogin")!=$login)) {
 			// start a new session when there is no session yet, or
 			// when a user uses a new login. (su)
 			ldStartSession();
@@ -198,7 +211,6 @@
 				ldCheckCredentials($login, $password) &&
 				$ARCurrent->session->get("ARLogin") === $login &&
 				$ARCurrent->session->get("ARPassword",1) === $password ) {
-
 				/* cookie and login matches session */
 				$ARCurrent->session->put("ARSessionTimedout", false, 1);
 		}




From ariadne-cvs@muze.nl  Fri Jul  5 20:57:35 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Fri, 05 Jul 2002 19:57:35 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject classic.manage.html
Message-ID: <cvsgijs1025899055@cvsserver>

gijs		Fri Jul  5 21:57:35 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	classic.manage.html 
  Log:
  include widgets/menu/functions.js
  
  
Index: ariadne/lib/templates/pobject/classic.manage.html
diff -u ariadne/lib/templates/pobject/classic.manage.html:1.5 ariadne/lib/templates/pobject/classic.manage.html:1.6
--- ariadne/lib/templates/pobject/classic.manage.html:1.5	Thu Dec 13 17:07:08 2001
+++ ariadne/lib/templates/pobject/classic.manage.html	Fri Jul  5 21:57:34 2002
@@ -6,6 +6,7 @@
 <html>
 <head>
 <title><?php echo $ARnls["manage"]." ".$this->path; ?></title>
+<script src="<?php echo $AR->dir->www; ?>widgets/menu/functions.js"></script>
 <script>
 	function arEdit(object, arguments) {
 		document.location.href='<?php echo $this->store->root; ?>'+object+'classic.edit.phtml?'+arguments+'&arReturnPage=<?php echo RawUrlEncode($PHP_SELF."?".$QUERY_STRING); ?>'; 




From ariadne-cvs@muze.nl  Mon Jul  8 13:14:04 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 08 Jul 2002 12:14:04 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/modules mod_tar.phtml
Message-ID: <cvsgijs1026130444@cvsserver>

gijs		Mon Jul  8 14:14:04 2002 EDT

  Modified files:              
    /ariadne/lib/modules	mod_tar.phtml 
  Log:
  Fixed tar.errors redirection
  
  
Index: ariadne/lib/modules/mod_tar.phtml
diff -u ariadne/lib/modules/mod_tar.phtml:1.1 ariadne/lib/modules/mod_tar.phtml:1.2
--- ariadne/lib/modules/mod_tar.phtml:1.1	Mon Jul  1 15:55:01 2002
+++ ariadne/lib/modules/mod_tar.phtml	Mon Jul  8 14:14:03 2002
@@ -106,7 +106,7 @@
 
 		function tar_system($tarfile, $file, $dstdir) {
 			if ($this->tar_error_handler) {
-				$errfile=$this->tempdir."/tar.errors";
+				$errfile=$dstdir."/tar.errors";
 				$errfile=$this->_fix_tar_paths($errfile);
 				$handler=sprintf($this->tar_error_handler, $errfile);
 			}




From ariadne-cvs@muze.nl  Tue Jul  9 11:29:32 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Tue, 09 Jul 2002 10:29:32 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/objects pobject.phtml
Message-ID: <cvsgijs1026210572@cvsserver>

gijs		Tue Jul  9 12:29:32 2002 EDT

  Modified files:              
    /ariadne/lib/objects	pobject.phtml 
  Log:
  Fixed CheckConfig 'firstCall' check.
  
  
Index: ariadne/lib/objects/pobject.phtml
diff -u ariadne/lib/objects/pobject.phtml:1.108 ariadne/lib/objects/pobject.phtml:1.109
--- ariadne/lib/objects/pobject.phtml:1.108	Tue Jun 18 20:04:12 2002
+++ ariadne/lib/objects/pobject.phtml	Tue Jul  9 12:29:31 2002
@@ -460,7 +460,7 @@
 		$continue=true;
 		if (!$AR->user) {
 			if ($ARCurrent->session && $ARCurrent->session->get("ARSessionTimedout", 1)) {
-				debug("pobject: CheckLogin: session expired","object");
+				debug("pobject: CheckLogin: session disabled","object");
 
 				$arLoginMessage=$ARnls["accessdenied"];
 				ldAccessDenied($this->path, $arLoginMessage);
@@ -672,15 +672,11 @@
 	// defined for $path/$function. Else it takes care of output to the
 	// browser.
 	// All these templates must exist under a fixed directory, $AR->dir->templates
-	global $nocache, $AR, $ARConfig, $ARCurrent, $ARBeenHere, $ARnls, $HTTP_POST_VARS, $HTTP_GET_VARS;
+	global $nocache, $AR, $ARConfig, $ARCurrent, $ARBeenHere, $ARnls, $HTTP_POST_VARS, $HTTP_GET_VARS, $ARConfigChecked;
 	
 		debug("pobject::CheckConfig($arCallFunction, $arCallArgs)","object");
 		$MAX_LOOP_COUNT=10;
 
-		if (!isset($ARBeenHere)) {
-			/* this is the first time 'CheckConfig' has been called */
-			$firstCheckConfigCall = true;
-		}
 
 		if ($ARBeenHere[$this->path][$arCallFunction]<$MAX_LOOP_COUNT) { // protect against infinite loops
 			$ARBeenHere[$this->path][$arCallFunction]+=1;
@@ -729,6 +725,7 @@
 				$this->customnlsdata=$this->data->custom[$nls];
 			}
 			if (	(	$config->cache && ( $config->cache>0 )		) &&
+					( 	!$ARConfigChecked							) && 
 					( 	!$nocache 									) && 
 					(	$AR->OS=="UNIX" || 
 						( 	(count($HTTP_POST_VARS)==0) && 
@@ -745,9 +742,6 @@
 					ob_start();
 				}
 			} else {
-				if ($firstCheckConfigCall) {
-					$nocache = true;
-				}
 				debug("CheckConfig: caching disabled","all");
 				debug("             config->cache: ".$config->cache."; nocache: ".$nocache."; user: ".$AR->user->data->login."; os: ".$AR->OS,"all");
 			}
@@ -836,6 +830,15 @@
 			$this->store->close();
 			exit();
 		}
+
+		/*
+			Set ARConfigChecked to true to indicate that we have been here
+			earlier.
+		*/
+		if (!isset($ARConfigChecked)) {
+			$ARConfigChecked = true;
+		}
+
 		debug("pobject: CheckConfig: end","all");
 		return true;
 	}




From ariadne-cvs@muze.nl  Wed Jul 10 09:32:15 2002
From: ariadne-cvs@muze.nl (pascal)
Date: Wed, 10 Jul 2002 08:32:15 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject object.import.ax.phtml
Message-ID: <cvspascal1026289935@cvsserver>

pascal		Wed Jul 10 10:32:15 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	object.import.ax.phtml 
  Log:
  change $this->store->error to $store->error so error messages actually get printed.
  
  
Index: ariadne/lib/templates/pobject/object.import.ax.phtml
diff -u ariadne/lib/templates/pobject/object.import.ax.phtml:1.3 ariadne/lib/templates/pobject/object.import.ax.phtml:1.4
--- ariadne/lib/templates/pobject/object.import.ax.phtml:1.3	Sat Jan  5 14:32:54 2002
+++ ariadne/lib/templates/pobject/object.import.ax.phtml	Wed Jul 10 10:32:15 2002
@@ -64,7 +64,7 @@
 					$store->close();
 
 				} else {
-					$error="import error: ".$this->store->error;
+					$error="import error: ".$store->error;
 				}
 				unlink($source);
 			} else {
@@ -87,4 +87,4 @@
 </html>
 <?php
 	}
-?>
\ No newline at end of file
+?>




From ariadne-cvs@muze.nl  Wed Jul 10 13:48:14 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 10 Jul 2002 12:48:14 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject system.get.folder.phtml  /lib/templates/pshortcut system.get.folder.phtml  /www/widgets/tree root.php
Message-ID: <cvsgijs1026305294@cvsserver>

gijs		Wed Jul 10 14:48:14 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pshortcut	system.get.folder.phtml 
    /ariadne/lib/templates/pobject	system.get.folder.phtml 
    /ariadne/www/widgets/tree	root.php 
  Log:
  Added Giannis Tsagatakis's patch which fixes special characters within
  the tree.
  
  
Index: ariadne/lib/templates/pshortcut/system.get.folder.phtml
diff -u ariadne/lib/templates/pshortcut/system.get.folder.phtml:1.6 ariadne/lib/templates/pshortcut/system.get.folder.phtml:1.7
--- ariadne/lib/templates/pshortcut/system.get.folder.phtml:1.6	Sun Mar 17 14:53:26 2002
+++ ariadne/lib/templates/pshortcut/system.get.folder.phtml	Wed Jul 10 14:48:13 2002
@@ -1,6 +1,6 @@
 <?php
 	require_once($this->store->code."modules/mod_unicode.php");
-	$name=unicode::utf8convert($nlsdata->name);
+	$name=unicode::utf8convert(trim($nlsdata->name));
 	$path=$this->store->make_path($this->parent, $data->path);
 	if ($AR->user && !$this->CheckSilent("read")) {
 		$arResult["pre"]="<font color='#CCCCCC'>$flag";
Index: ariadne/lib/templates/pobject/system.get.folder.phtml
diff -u ariadne/lib/templates/pobject/system.get.folder.phtml:1.4 ariadne/lib/templates/pobject/system.get.folder.phtml:1.5
--- ariadne/lib/templates/pobject/system.get.folder.phtml:1.4	Sun Jan 27 17:14:21 2002
+++ ariadne/lib/templates/pobject/system.get.folder.phtml	Wed Jul 10 14:48:14 2002
@@ -26,7 +26,7 @@
 
 	******************************************************************/
 	require_once($this->store->code."modules/mod_unicode.php");
-	$name=unicode::utf8convert($nlsdata->name);
+	$name=unicode::utf8convert(trim($nlsdata->name));
 	if ($AR->user && !$this->CheckSilent("read")) {
 		$arResult["pre"]="<font color='#CCCCCC'>$flag";
 		$arResult["name"]=$name."</font>";
Index: ariadne/www/widgets/tree/root.php
diff -u ariadne/www/widgets/tree/root.php:1.19 ariadne/www/widgets/tree/root.php:1.20
--- ariadne/www/widgets/tree/root.php:1.19	Wed Mar 20 22:41:07 2002
+++ ariadne/www/widgets/tree/root.php	Wed Jul 10 14:48:14 2002
@@ -91,9 +91,14 @@
     this.prev=prev;
     this.next=next;
     this.name=name;
+	if(this.name.substring(0,1) == '&') {
+		charbytes=6*20;
+	} else {
+		charbytes=1*20;
+	}
     this.fullname=name;
-    if (this.name.length>20) {
-      this.name=this.name.substring(0,20)+"...";
+    if (this.name.length>charbytes) {
+      this.name=this.name.substring(0,charbytes)+"...";
     }
     this.pre=pre;
     this.link=link;




From ariadne-cvs@muze.nl  Wed Jul 10 15:43:08 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 10 Jul 2002 14:43:08 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/includes loader.ftp.php loader.web.php
Message-ID: <cvsgijs1026312188@cvsserver>

gijs		Wed Jul 10 16:43:08 2002 EDT

  Modified files:              
    /ariadne/lib/includes	loader.ftp.php loader.web.php 
  Log:
  Added Giannis's patch which enables debug to log to the syslog daemon.
  
  
Index: ariadne/lib/includes/loader.ftp.php
diff -u ariadne/lib/includes/loader.ftp.php:1.7 ariadne/lib/includes/loader.ftp.php:1.8
--- ariadne/lib/includes/loader.ftp.php:1.7	Wed Apr 24 15:41:46 2002
+++ ariadne/lib/includes/loader.ftp.php	Wed Jul 10 16:43:08 2002
@@ -12,13 +12,18 @@
 	$DB["file"]=$ftp_config["debugfile"];
 
 	function debug($text, $level="pinp", $indent="") {
-	global $DB, $DB_INDENT;
-	 	if ($DB["level"]>=$DB[$level]) {
+	global $DB, $DB_INDENT, $AR;
+		if ($DB["level"]>=$DB[$level]) {
 			if ($indent=="OUT") {
 				$DB_INDENT=substr($DB_INDENT,0,-2);
 			}
-			fwrite($DB["fp"], "$DB_INDENT $level::$text\n");
-			fflush($DB["fp"]);
+			if ( ($AR->DEBUG == 'WEB') || ($AR->DEBUG == 'BOTH') ) {
+				echo "$DB_INDENT<b>$level::$text</b><BR>\n";
+			}
+			if ( ($AR->DEBUG == 'SYSLOG') || ($AR->DEBUG == 'BOTH') ) {
+				syslog(LOG_NOTICE,"(Ariadne) $level::$text");
+			}
+			flush();
 			if ($indent=="IN") {
 				$DB_INDENT.="  ";
 			}
Index: ariadne/lib/includes/loader.web.php
diff -u ariadne/lib/includes/loader.web.php:1.30 ariadne/lib/includes/loader.web.php:1.31
--- ariadne/lib/includes/loader.web.php:1.30	Thu Jul  4 00:05:07 2002
+++ ariadne/lib/includes/loader.web.php	Wed Jul 10 16:43:08 2002
@@ -12,12 +12,17 @@
 	$ERRMODE="htmljs"; // alternative: "text"/"html"/"js"
 
 	function debug($text, $level="pinp", $indent="") {
-		global $DB, $DB_INDENT;
-	 	if ($DB["level"]>=$DB[$level]) {
+	global $DB, $DB_INDENT, $AR;
+		if ($DB["level"]>=$DB[$level]) {
 			if ($indent=="OUT") {
 				$DB_INDENT=substr($DB_INDENT,0,-2);
 			}
-			echo "$DB_INDENT<b>$level::$text</b><BR>\n";
+			if ( ($AR->DEBUG == 'WEB') || ($AR->DEBUG == 'BOTH') ) {
+				echo "$DB_INDENT<b>$level::$text</b><BR>\n";
+			}
+			if ( ($AR->DEBUG == 'SYSLOG') || ($AR->DEBUG == 'BOTH') ) {
+				syslog(LOG_NOTICE,"(Ariadne) $level::$text");
+			}
 			flush();
 			if ($indent=="IN") {
 				$DB_INDENT.="  ";




From hwlab@cs.teiher.gr  Wed Jul 10 15:51:42 2002
From: hwlab@cs.teiher.gr (Giannis Tsagatakis)
Date: Wed, 10 Jul 2002 17:51:42 +0300
Subject: [Ariadne-cvs] Forgot to global $AR in the patch
Message-ID: <3D2C49FE.9080608@cs.teiher.gr>

global $DB, $AR, $DB_INDENT;
             /\
-------------|




From ariadne-cvs@muze.nl  Wed Jul 10 16:11:24 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 10 Jul 2002 15:11:24 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/configs ariadne.phtml-dist ariadne.phtml-dist-win
Message-ID: <cvsgijs1026313884@cvsserver>

gijs		Wed Jul 10 17:11:24 2002 EDT

  Modified files:              
    /ariadne/lib/configs	ariadne.phtml-dist ariadne.phtml-dist-win 
  Log:
  Debug settings
  
  
Index: ariadne/lib/configs/ariadne.phtml-dist
diff -u ariadne/lib/configs/ariadne.phtml-dist:1.43 ariadne/lib/configs/ariadne.phtml-dist:1.44
--- ariadne/lib/configs/ariadne.phtml-dist:1.43	Thu Jun  6 16:08:27 2002
+++ ariadne/lib/configs/ariadne.phtml-dist	Wed Jul 10 17:11:24 2002
@@ -86,6 +86,15 @@
 
   $AR->OS                = 'UNIX';          // All unix/linux variants
 
+
+  /**************************************************************************/
+  /* Debug options: WEB, SYSLOG or BOTH                                     */
+  /**************************************************************************/
+
+  $AR->DEBUG = "WEB";
+
+
+
 /****************************************************************************/
 /* The rest of the configuration is automatic, only change this when it     */
 /* doesn't work for you and you know what you are doing                     */
Index: ariadne/lib/configs/ariadne.phtml-dist-win
diff -u ariadne/lib/configs/ariadne.phtml-dist-win:1.7 ariadne/lib/configs/ariadne.phtml-dist-win:1.8
--- ariadne/lib/configs/ariadne.phtml-dist-win:1.7	Thu Jun  6 16:08:27 2002
+++ ariadne/lib/configs/ariadne.phtml-dist-win	Wed Jul 10 17:11:24 2002
@@ -88,6 +88,15 @@
 
   $AR->OS                = 'WIN32';         // Windows 95/98/ME/NT/2000
 
+
+  /**************************************************************************/
+  /* Debug options: WEB, SYSLOG or BOTH                                     */
+  /**************************************************************************/
+
+  $AR->DEBUG = "WEB";
+
+
+
 /****************************************************************************/
 /* The rest of the configuration is automatic, only change this when it     */
 /* doesn't work for you and you know what you are doing                     */




From gijs@muze.nl  Wed Jul 10 16:15:50 2002
From: gijs@muze.nl (Gijsbert te Riet)
Date: Wed, 10 Jul 2002 17:15:50 +0200
Subject: [Ariadne-cvs] Forgot to global $AR in the patch
In-Reply-To: <mailman.1026313803.19363.ariadne-cvs@lists.muze.nl>
References: <mailman.1026313803.19363.ariadne-cvs@lists.muze.nl>
Message-ID: <Pine.LNX.4.33.0207101714010.19145-100000@helikon.muze.nl>


On Wed, 10 Jul 2002, Giannis Tsagatakis wrote:

> global $DB, $AR, $DB_INDENT;
>              /\
> -------------|

$AR is declared global within the debug functions.

Regards.
Gijsbert te Riet.
Muze.


From ariadne-cvs@muze.nl  Thu Jul 11 10:24:53 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 11 Jul 2002 09:24:53 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/objects pphoto.phtml
Message-ID: <cvsgijs1026379493@cvsserver>

gijs		Thu Jul 11 11:24:53 2002 EDT

  Modified files:              
    /ariadne/lib/objects	pphoto.phtml 
  Log:
  Added a debug statement and an appropriate 'fail' check.
  
  
Index: ariadne/lib/objects/pphoto.phtml
diff -u ariadne/lib/objects/pphoto.phtml:1.18 ariadne/lib/objects/pphoto.phtml:1.19
--- ariadne/lib/objects/pphoto.phtml:1.18	Tue Jun 11 23:22:08 2002
+++ ariadne/lib/objects/pphoto.phtml	Thu Jul 11 11:24:52 2002
@@ -242,9 +242,10 @@
 				if (is_array($ARConfig->photoCommandStack[$this->id])) {
 					$image="";
 					reset($ARConfig->photoCommandStack[$this->id]);
-					while (list($key, $exec_string)=each($ARConfig->photoCommandStack[$this->id])) {
+					while (!$failed && (list($key, $exec_string)=each($ARConfig->photoCommandStack[$this->id]))) {
 						$exec_string .= " ".$tmpsrc;
 						system($exec_string,$failed);
+						debug("executing ($exec_string)");
 						// echo( $exec_string."<br>");
 					}
 				}




From ariadne-cvs@muze.nl  Thu Jul 11 13:44:38 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 11 Jul 2002 12:44:38 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/stores mysqlstore.phtml
Message-ID: <cvsgijs1026391478@cvsserver>

gijs		Thu Jul 11 14:44:38 2002 EDT

  Modified files:              
    /ariadne/lib/stores	mysqlstore.phtml 
  Log:
  set lastchanged to NULL in update statements so that the lastchanged field will
  be set even if the data to be updated is equal to the new data.
  
  Thanks to Hanne Johann for this fix.
  
  
  
Index: ariadne/lib/stores/mysqlstore.phtml
diff -u ariadne/lib/stores/mysqlstore.phtml:1.61 ariadne/lib/stores/mysqlstore.phtml:1.62
--- ariadne/lib/stores/mysqlstore.phtml:1.61	Wed Jun 26 11:02:35 2002
+++ ariadne/lib/stores/mysqlstore.phtml	Thu Jul 11 14:44:38 2002
@@ -432,9 +432,9 @@
 			debug("save: updating","all");
 			if ($vtype) { // only change/save vtype if it is explicitly set
 				$evtype=AddSlashes($vtype);
-				$query_string="update $objects_tbl set object='$edata', vtype='$evtype' where id=$id"; 
+				$query_string="update $objects_tbl set object='$edata', vtype='$evtype', lastchanged=NULL where id=$id"; 
 			} else {
-				$query_string="update $objects_tbl set object='$edata' where id=$id"; 
+				$query_string="update $objects_tbl set object='$edata', lastchanged=NULL where id=$id"; 
 			}
 			debug("save: query=$query_string","all");
 			mysql_db_query($this->database,$query_string, $this->connect_id);
@@ -1036,15 +1036,17 @@
 			$substr_l = intval(substr($matches[2], 0, 1));
 			$mask_post= $matches[3];
 			$query_string = 
-				"select max(substring(path, $substr_s, $substr_l)) as id
+				"select max(substring(path, $substr_s)) as id
 				from ".$this->tbl_prefix."nodes where 
-				path regexp '^".$path.$mask_pre."[0-9]\{".$substr_l."\}".$mask_post."'";
+				path regexp '^".$path.$mask_pre."[0-9]+".$mask_post."'";
 
 			//error($query_string);
 			$result = mysql_db_query($this->database, $query_string, $this->connect_id);
 			if ($result) {
 				$row = mysql_fetch_array($result);
-				$subid  = intval($row["id"]);
+				if (ereg('([0-9]+)', $row["id"], $matches)) {
+					$subid  = intval($matches[1]);
+				}
 			}
 			$subid=$subid+1;
 			$subid = sprintf("%0".$substr_l."d", $subid);




From ariadne-cvs@muze.nl  Thu Jul 11 14:19:28 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 11 Jul 2002 13:19:28 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/objects pobject.phtml
Message-ID: <cvsgijs1026393568@cvsserver>

gijs		Thu Jul 11 15:19:28 2002 EDT

  Modified files:              
    /ariadne/lib/objects	pobject.phtml 
  Log:
  Fixed a security bug.
  
  
Index: ariadne/lib/objects/pobject.phtml
diff -u ariadne/lib/objects/pobject.phtml:1.109 ariadne/lib/objects/pobject.phtml:1.110
--- ariadne/lib/objects/pobject.phtml:1.109	Tue Jul  9 12:29:31 2002
+++ ariadne/lib/objects/pobject.phtml	Thu Jul 11 15:19:28 2002
@@ -492,6 +492,7 @@
 				} else if (!$AR->user->CheckPassword($ARPassword)) {
 					debug("pobject: CheckLogin: wrong password in cookie","object");
 					$arLoginMessage=$ARnls["accessdenied"].": ".$ARnls["passwordincorrect"];
+					unset($AR->user);
 					ldAccessDenied($this->path, $arLoginMessage);
 					$continue=false;
 				} else {




From ariadne-cvs@muze.nl  Thu Jul 11 15:31:01 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 11 Jul 2002 14:31:01 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/configs ariadne.phtml-dist
Message-ID: <cvsgijs1026397861@cvsserver>

gijs		Thu Jul 11 16:31:01 2002 EDT

  Modified files:              
    /ariadne/lib/configs	ariadne.phtml-dist 
  Log:
  disable session respawning
  
  
Index: ariadne/lib/configs/ariadne.phtml-dist
diff -u ariadne/lib/configs/ariadne.phtml-dist:1.44 ariadne/lib/configs/ariadne.phtml-dist:1.45
--- ariadne/lib/configs/ariadne.phtml-dist:1.44	Wed Jul 10 17:11:24 2002
+++ ariadne/lib/configs/ariadne.phtml-dist	Thu Jul 11 16:31:01 2002
@@ -69,14 +69,7 @@
   $AR->host                 = $HTTP_SERVER_VARS['HTTP_HOST'];
 
 
-  /**************************************************************************/
-  /* Set Ariadne's output compression level (0-9)                           */
-  /* (0 will disable output compression)                                    */
-  /**************************************************************************/
 
-  $AR->output_compression = 0;
-
-
   /**************************************************************************/
   /* WIN32 or UNIX                                                          */
   /* =============                                                          */
@@ -94,7 +87,15 @@
   $AR->DEBUG = "WEB";
 
 
+  /**************************************************************************/
+  /* Set Ariadne's output compression level (0-9)                           */
+  /* (0 will disable output compression)                                    */
+  /**************************************************************************/
+
+  $AR->output_compression = 0;
 
+
+
 /****************************************************************************/
 /* The rest of the configuration is automatic, only change this when it     */
 /* doesn't work for you and you know what you are doing                     */
@@ -179,7 +180,6 @@
   $AR->nls->charsets['de']  = 'ISO-8859-1';
 
   $AR->nls->default         = 'en';
-
   /**************************************************************************/
   /* you really don't want to change anything below this line                  */
   /**************************************************************************/
@@ -210,6 +210,9 @@
 
   $ARCurrent=new object;                       // do not change
 
+  /* on Default we do not respawn sessions **********************************/
+
+  $ARCurrent->noSessionRespawn = true;
  
   /* To crypt or not to crypt ***********************************************/
 




From ariadne-cvs@muze.nl  Fri Jul 12 10:58:26 2002
From: ariadne-cvs@muze.nl (pascal)
Date: Fri, 12 Jul 2002 09:58:26 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/widgets/toolbar xptoolbar.phtml
Message-ID: <cvspascal1026467906@cvsserver>

pascal		Fri Jul 12 11:58:26 2002 EDT

  Modified files:              
    /ariadne/lib/widgets/toolbar	xptoolbar.phtml 
  Log:
  Make popDown work properly
  
  
Index: ariadne/lib/widgets/toolbar/xptoolbar.phtml
diff -u ariadne/lib/widgets/toolbar/xptoolbar.phtml:1.2 ariadne/lib/widgets/toolbar/xptoolbar.phtml:1.3
--- ariadne/lib/widgets/toolbar/xptoolbar.phtml:1.2	Wed May 29 18:13:33 2002
+++ ariadne/lib/widgets/toolbar/xptoolbar.phtml	Fri Jul 12 11:58:26 2002
@@ -41,6 +41,15 @@
 	background: #D8D2BD;
 }
 </style>
+<script language="JavaScript1.2"
+	src="<?php echo $AR->dir->www; ?>widgets/menu/config.php?arDirWWW=<?php echo rawurlencode($AR->dir->www); ?>"
+	type='text/javascript'>
+</script>
+<script language="JavaScript1.2" 
+	src="<?php echo $AR->dir->www; ?>widgets/menu/HM_Script<?php echo $browser_string; ?>.js" 
+	type="text/javascript">
+</script>
+
 <script language="JavaScript">
 	function setXpView(type) {
 		top.Set('viewmode',type);




From ariadne-cvs@muze.nl  Mon Jul 15 11:23:39 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 15 Jul 2002 10:23:39 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/ppage system.save.page.phtml
Message-ID: <cvsgijs1026728619@cvsserver>

gijs		Mon Jul 15 12:23:39 2002 EDT

  Modified files:              
    /ariadne/lib/templates/ppage	system.save.page.phtml 
  Log:
  Added fixes for ftp (no sessionid's etc)
  
  
Index: ariadne/lib/templates/ppage/system.save.page.phtml
diff -u ariadne/lib/templates/ppage/system.save.page.phtml:1.13 ariadne/lib/templates/ppage/system.save.page.phtml:1.14
--- ariadne/lib/templates/ppage/system.save.page.phtml:1.13	Tue Jun 11 15:44:50 2002
+++ ariadne/lib/templates/ppage/system.save.page.phtml	Mon Jul 15 12:23:39 2002
@@ -29,14 +29,18 @@
 			// do this last, think about it :)
 			$page=str_replace("&amp;","&",$page);
 		} else {
-			$page=unicode::utf8convert($page);
+//			$page=unicode::utf8convert($page);
 		}
 		// change hardcoded links and images to use a placeholder for the root
-		$page=ereg_replace("(https?://)?".$this->store->root,"{arRoot}",$page);
-        // also change hand pasted sources, which may or may not include session id's
-        $page=ereg_replace("(https?://)?".$AR->host.$AR->dir->www."loader.php(/-".$ARCurrent->session->id."-)?(/".$nls.")?","{arRoot}",$page);
-        // finally check for other session id's:
-        $page=str_replace("/-".$ARCurrent->session->id."-","",$page);
+		if ($this->store->root) {
+			$page=ereg_replace("(http[s]?://)?".$this->store->root,"{arRoot}",$page);
+		}
+		if ($ARCurrent->session->id) {
+	        // also change hand pasted sources, which may or may not include session id's
+			$page=ereg_replace("(https?://)?".$AR->host.$AR->dir->www."loader.php(/-".$ARCurrent->session->id."-)?(/".$nls.")?","{arRoot}",$page);
+			// finally check for other session id's:
+			$page=str_replace("/-".$ARCurrent->session->id."-","",$page);
+		}
 
 		// first make sure that the object is clean (data can only be set via 
 		// the defined interface: $arCallArgs)




From ariadne-cvs@muze.nl  Mon Jul 15 11:24:24 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 15 Jul 2002 10:24:24 -0000
Subject: [Ariadne-cvs] cvs: ariadne /ftp loader.php
Message-ID: <cvsgijs1026728664@cvsserver>

gijs		Mon Jul 15 12:24:24 2002 EDT

  Modified files:              
    /ariadne/ftp	loader.php 
  Log:
  store->root = ""
  
  
Index: ariadne/ftp/loader.php
diff -u ariadne/ftp/loader.php:1.20 ariadne/ftp/loader.php:1.21
--- ariadne/ftp/loader.php:1.20	Tue Jun 11 15:43:29 2002
+++ ariadne/ftp/loader.php	Mon Jul 15 12:24:24 2002
@@ -950,7 +950,7 @@
 
 
 	sleep(1);
-//	debugon("pinp");
+	//debugon("pinp");
 
 	// set PHP error handling
 	error_reporting(1);
@@ -960,7 +960,7 @@
 
 	$FTP = new object;
 	$inst_store = $store_config["dbms"]."store";
-	$store=new $inst_store(".", $store_config);
+	$store=new $inst_store("", $store_config);
 
 	// fill in your own server ip number:
 	$FTP->server_ip = $ftp_config["server_ip"];




From ariadne-cvs@muze.nl  Tue Jul 16 10:12:28 2002
From: ariadne-cvs@muze.nl (pascal)
Date: Tue, 16 Jul 2002 09:12:28 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/puser system.save.data.phtml system.save.grants.phtml
Message-ID: <cvspascal1026810748@cvsserver>

pascal		Tue Jul 16 11:12:28 2002 EDT

  Modified files:              
    /ariadne/lib/templates/puser	system.save.data.phtml 
                                	system.save.grants.phtml 
  Log:
  Msake these templates callable multiple times in a single request.
  
  
Index: ariadne/lib/templates/puser/system.save.data.phtml
diff -u ariadne/lib/templates/puser/system.save.data.phtml:1.15 ariadne/lib/templates/puser/system.save.data.phtml:1.16
--- ariadne/lib/templates/puser/system.save.data.phtml:1.15	Tue Jun 11 15:45:00 2002
+++ ariadne/lib/templates/puser/system.save.data.phtml	Tue Jul 16 11:12:28 2002
@@ -16,12 +16,14 @@
 		}
 
 
-		function GetPassword($pass1, $pass2) {
-			if ($pass1 && ($pass1==$pass2)) {
-				$password=ARCrypt($pass1);
-			}
-			return $password;
-		}	
+		if (!function_exists("GetPassword")) {
+		    function GetPassword($pass1, $pass2) {
+			    if ($pass1 && ($pass1==$pass2)) {
+				    $password=ARCrypt($pass1);
+			    }
+			    return $password;
+		    }	
+		}
 
 		$pass1=$this->getdata("newpass1","none");
 		$pass2=$this->getdata("newpass2","none");
@@ -123,4 +125,4 @@
 			}
 		}
 	}
-?>
\ No newline at end of file
+?>
Index: ariadne/lib/templates/puser/system.save.grants.phtml
diff -u ariadne/lib/templates/puser/system.save.grants.phtml:1.18 ariadne/lib/templates/puser/system.save.grants.phtml:1.19
--- ariadne/lib/templates/puser/system.save.grants.phtml:1.18	Tue Jul  2 15:26:11 2002
+++ ariadne/lib/templates/puser/system.save.grants.phtml	Tue Jul 16 11:12:28 2002
@@ -33,39 +33,42 @@
 			}
 		}
 
-		function arGetGrantType($value) {
-			if (($value & ARMASKLOCAL) && ($value & ARMASKCHILDREN)) {
-				$result="+";
-			} else if ($value & ARMASKLOCAL) {
-				$result="=";
-			} else {
-				$result=">";
-			}
-			return $result;
+		if (!function_exists("arGetGrantType")) {
+		    function arGetGrantType($value) {
+			    if (($value & ARMASKLOCAL) && ($value & ARMASKCHILDREN)) {
+				    $result="+";
+			    } else if ($value & ARMASKLOCAL) {
+				    $result="=";
+			    } else {
+				    $result=">";
+			    }
+			    return $result;
+		    }
 		}
 
-		function arDelGrant(&$grants, $id, $grant='', $modifier='') {
-			if ($grants[$id]) {
-				if (!$grant) {
-					unset($grants[$id]);
-				} else {
-					if (!$modifier) {
-						unset($grants[$id][$grant]);
+		if (!function_exists("arDelGrant")) {
+			function arDelGrant(&$grants, $id, $grant='', $modifier='') {
+				if ($grants[$id]) {
+					if (!$grant) {
+						unset($grants[$id]);
 					} else {
-						unset($grants[$id][$grant][$modifier]);
-						if (!@count($grants[$id][$grant])) {
+						if (!$modifier) {
 							unset($grants[$id][$grant]);
+						} else {
+							unset($grants[$id][$grant][$modifier]);
+							if (!@count($grants[$id][$grant])) {
+								unset($grants[$id][$grant]);
+							}
 						}
-					}
-					if (!@count($grants[$id])) {
-						unset($grants[$id]);
+						if (!@count($grants[$id])) {
+							unset($grants[$id]);
+						}
 					}
 				}
 			}
 		}
 
 
-
 		if (!$this->error) {
 			// first make sure that the object is clean (data can only be set via 
 			// the defined interface: $arCallArgs)
@@ -238,4 +241,4 @@
 			}
 		}
 	}
-?>
\ No newline at end of file
+?>




From ariadne-cvs@muze.nl  Tue Jul 16 13:08:35 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Tue, 16 Jul 2002 12:08:35 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/stores mysqlstore.phtml
Message-ID: <cvsgijs1026821315@cvsserver>

gijs		Tue Jul 16 14:08:35 2002 EDT

  Modified files:              
    /ariadne/lib/stores	mysqlstore.phtml 
  Log:
  Fixed table locking while creating a "nextid".
  Moved the nextid code to the "new" part of the save() function.
  Reverted some code from the former patch (it shouldn't be committed to CVS).
   
  
  
Index: ariadne/lib/stores/mysqlstore.phtml
diff -u ariadne/lib/stores/mysqlstore.phtml:1.62 ariadne/lib/stores/mysqlstore.phtml:1.63
--- ariadne/lib/stores/mysqlstore.phtml:1.62	Thu Jul 11 14:44:38 2002
+++ ariadne/lib/stores/mysqlstore.phtml	Tue Jul 16 14:08:35 2002
@@ -398,29 +398,8 @@
 			$parent="..";
 		}
 		$eparent=AddSlashes($parent);
-		$mask = substr($path, strlen($parent));
-		if (ereg("^(.*)\{([0-9]:)?id\}(.*)",$mask,$matches)) { 
-			// if the last part of a path matches something like {2:id} this
-			// part will automatically create a new number, unique in this directory, and fill it in.
-			// before we proceed, we need to lock the 'nodes' and 'objects' table
-
-			$query_string="lock tables ".$this->tbl_prefix."nodes write, ".$this->tbl_prefix."objects write";
-			if (mysql_db_query($this->database, $query_string, $this->connect_id)) {
-				$needunlocking = true;
-
-				$subid=$this->get_nextid($parent, $mask);
-
-				$path=ereg_replace("\{([0-9]:)?id\}",strval($subid),$path);
-				debug("save: new path: $path ($subid)","all");
-			} else {
-				error("PANIC: could not obtain write lock on nodes table!");
-				$this->close();
-				exit;
-			}
-		}
-
-		$edata=AddSlashes(serialize($data));
 		$epath=AddSlashes($path);
+		$edata=AddSlashes(serialize($data));
 		$etype=AddSlashes($type);
 		$epriority=(int)$priority;
 
@@ -468,6 +447,28 @@
 				$vtype=$type; 
 			}
 			$evtype=AddSlashes($vtype);
+
+			$mask = substr($path, strlen($parent));
+			if (ereg("^(.*)\{([0-9]:)?id\}(.*)",$mask,$matches)) { 
+				// if the last part of a path matches something like {2:id} this
+				// part will automatically create a new number, unique in this directory, and fill it in.
+				// before we proceed, we need to lock the 'nodes' and 'objects' table
+				$query_string="lock tables ".$this->tbl_prefix."nodes write, ".$this->tbl_prefix."objects write";
+				if (mysql_db_query($this->database, $query_string, $this->connect_id)) {
+					$needunlocking = true;
+
+					$subid=$this->get_nextid($parent, $mask);
+					$path=ereg_replace("\{([0-9]:)?id\}",strval($subid),$path);
+					$epath=AddSlashes($path);
+					debug("save: new path: $path ($subid)","all");
+				} else {
+					error("PANIC: could not obtain write lock on nodes table!");
+					$this->close();
+					exit;
+				}
+			}
+
+
 			$query_string="insert into $objects_tbl (id,type,object,vtype) values (0,'$etype','$edata','$evtype')";
 			debug("save: query=$query_string","all");
 			$temp=mysql_db_query($this->database,$query_string, $this->connect_id);
@@ -480,6 +481,11 @@
 				$errno=mysql_errno($this->connect_id);
 				$error=mysql_error($this->connect_id);
 				if (!$errno) {				
+					if ($needunlocking) {
+						$query_string = "unlock tables";
+						mysql_db_query($this->database,$query_string, $this->connect_id);
+						$needunlocking = false;
+					}
 					$this->save_properties($properties, $id, $this);
 					$result=$path;
 				} else {
@@ -494,10 +500,11 @@
 				debug("save: ".$this->error,"store");
 				$result=0;
 			}			
-		}
-		if ($needunlocking) {
-			$query_string = "unlock tables";
-			mysql_db_query($this->database,$query_string, $this->connect_id);
+
+			if ($needunlocking) {
+				$query_string = "unlock tables";
+				mysql_db_query($this->database,$query_string, $this->connect_id);
+			}
 		}
 		debug("save: end","all");
 		return $result;
@@ -1036,17 +1043,15 @@
 			$substr_l = intval(substr($matches[2], 0, 1));
 			$mask_post= $matches[3];
 			$query_string = 
-				"select max(substring(path, $substr_s)) as id
+				"select max(substring(path, $substr_s, $substr_l)) as id
 				from ".$this->tbl_prefix."nodes where 
-				path regexp '^".$path.$mask_pre."[0-9]+".$mask_post."'";
+				path regexp '^".$path.$mask_pre."[0-9]\{".$substr_l."\}".$mask_post."'";
 
 			//error($query_string);
 			$result = mysql_db_query($this->database, $query_string, $this->connect_id);
 			if ($result) {
 				$row = mysql_fetch_array($result);
-				if (ereg('([0-9]+)', $row["id"], $matches)) {
-					$subid  = intval($matches[1]);
-				}
+				$subid  = intval($row["id"]);
 			}
 			$subid=$subid+1;
 			$subid = sprintf("%0".$substr_l."d", $subid);




From ariadne-cvs@muze.nl  Wed Jul 17 11:21:16 2002
From: ariadne-cvs@muze.nl (auke)
Date: Wed, 17 Jul 2002 10:21:16 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/widgets/htmledit/ie edit.php
Message-ID: <cvsauke1026901276@cvsserver>

auke		Wed Jul 17 12:21:16 2002 EDT

  Modified files:              
    /ariadne/lib/widgets/htmledit/ie	edit.php 
  Log:
  fixed problem with saving page data when the edit.object.html.phtml template
  is called directly from the site, and the root is not the same as the
  ariadne store root. (happens with a psite). Page is now saved to the
  tbContentTarget location, which is correctly set in such a case, and
  therefor the cookies are sent with it.
  
  
Index: ariadne/lib/widgets/htmledit/ie/edit.php
diff -u ariadne/lib/widgets/htmledit/ie/edit.php:1.26 ariadne/lib/widgets/htmledit/ie/edit.php:1.27
--- ariadne/lib/widgets/htmledit/ie/edit.php:1.26	Wed Apr 17 16:03:13 2002
+++ ariadne/lib/widgets/htmledit/ie/edit.php	Wed Jul 17 12:21:16 2002
@@ -39,7 +39,16 @@
     if (!$name) {
       $name="page";
     }
+    if (!$target) {
+      global $HTTP_SERVER_VARS;
+      if (substr($HTTP_SERVER_VARS['SCRIPT_NAME'],0,strlen($root))!=$root) {
+        $target=$this->make_url();
+      } else {
+        $target=$root.$path;
+      }
+    }
   ?>
+  tbContentTarget="<?php echo $target; ?>";
   tbContentRoot="<?php echo $root; ?>";
   tbContentPath="<?php echo $path; ?>";
   tbContentFile="<?php echo $file; ?>";
@@ -199,13 +208,18 @@
   for (var i=0;i<arr.length;i++) {
     ParagraphStyle.options[ParagraphStyle.options.length]=new Option(arr[i], arr[i]);
   }
-  loadpage(tbContentRoot, tbContentPath, tbContentFile, tbContentName, tbContentLanguage, tbContentType, tbContentValue, tbContentSave2Form);
+  loadpage(tbContentRoot, tbContentPath, tbContentFile, tbContentName, tbContentLanguage, tbContentType, tbContentValue, tbContentSave2Form, tbContentTarget);
 }
 
 
-function loadpage(root, path, file, name, language, type, value, save2form) {
+function loadpage(root, path, file, name, language, type, value, save2form, target) {
   // FIXME check isDirty and ask for save first.
   // window.document.title='Edit '+path+file+' ( '+name+': '+language+')';
+  if (target) {
+    tbContentTarget=target;
+  } else {
+    tbContentTarget=root+path;
+  }
   tbContentRoot=root;
   tbContentPath=path;
   tbContentFile=file;
@@ -398,7 +412,7 @@
     savewindow=window.open('','savewindow','directories=no,height=100,width=300,location=no,status=no,toolbar=no,resizable=no');
     savewindow.document.open();
     savewindow.document.write("<html><body bgcolor=#CCCCCC><font face='Arial,helvetica,sans-serif'>");
-    savewindow.document.write("<form method='POST' action='"+tbContentRoot+tbContentPath+file+"edit."+tbContentName+".save.phtml'>");
+    savewindow.document.write("<form method='POST' action='"+tbContentTarget+file+"edit."+tbContentName+".save.phtml'>");
     savewindow.document.write("<input type='hidden' name='"+tbContentName+"'>");
     savewindow.document.write("<input type='hidden' name='ContentLanguage'>");
     savewindow.document.write("</form><br>Saving "+tbContentName+"</font></body></html>");




From ariadne-cvs@muze.nl  Wed Jul 17 13:48:29 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 17 Jul 2002 12:48:29 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/includes loader.web.php  /www loader.php
Message-ID: <cvsgijs1026910109@cvsserver>

gijs		Wed Jul 17 14:48:29 2002 EDT

  Modified files:              
    /ariadne/lib/includes	loader.web.php 
    /ariadne/www	loader.php 
  Log:
  moved shutdown functions to ldOnFinish()
  
  
Index: ariadne/lib/includes/loader.web.php
diff -u ariadne/lib/includes/loader.web.php:1.31 ariadne/lib/includes/loader.web.php:1.32
--- ariadne/lib/includes/loader.web.php:1.31	Wed Jul 10 16:43:08 2002
+++ ariadne/lib/includes/loader.web.php	Wed Jul 17 14:48:28 2002
@@ -61,6 +61,16 @@
 		}
 	}
 
+	function ldOnFinish() {
+	global $ARCurrent, $store;
+
+		if ($ARCurrent->session) {
+			$ARCurrent->session->save();
+		}
+		if ($store) {
+			$store->close();
+		}
+	}
 
 	function ldObjectNotFound($requestedpath, $requestedtemplate) {
 	global $store;
Index: ariadne/www/loader.php
diff -u ariadne/www/loader.php:1.37 ariadne/www/loader.php:1.38
--- ariadne/www/loader.php:1.37	Tue Jun 18 20:07:22 2002
+++ ariadne/www/loader.php	Wed Jul 17 14:48:28 2002
@@ -174,20 +174,18 @@
 				$ARCurrent->nolangcheck=1;
 			}
 
+
+			register_shutdown_function("ldOnFinish");
 			
+
 			// finally call the requested object
 			$store->call($function, $args, $store->get($path));
 			if (!$store->total) {
 				ldObjectNotFound($path, $function);
 			}
-			$store->close();
 
 		}
 
-		// save session data
-		if ($ARCurrent->session) {
-			$ARCurrent->session->save();
-		}
 		// now check for outputbuffering (caching)
 		if ($image=ob_get_contents()) {
 			// first set clientside cache headers
@@ -243,4 +241,7 @@
 			}
 		}
 	}
+
+	/* Finish execution */
+	exit;
 ?>




From ariadne-cvs@muze.nl  Wed Jul 17 13:51:03 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Wed, 17 Jul 2002 12:51:03 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/configs ariadne.phtml-dist-win
Message-ID: <cvsgijs1026910263@cvsserver>

gijs		Wed Jul 17 14:51:03 2002 EDT

  Modified files:              
    /ariadne/lib/configs	ariadne.phtml-dist-win 
  Log:
  Updated the windows version
  
  
Index: ariadne/lib/configs/ariadne.phtml-dist-win
diff -u ariadne/lib/configs/ariadne.phtml-dist-win:1.8 ariadne/lib/configs/ariadne.phtml-dist-win:1.9
--- ariadne/lib/configs/ariadne.phtml-dist-win:1.8	Wed Jul 10 17:11:24 2002
+++ ariadne/lib/configs/ariadne.phtml-dist-win	Wed Jul 17 14:51:03 2002
@@ -34,7 +34,6 @@
   $AR->dir->www             = '/ariadne';
 
 
-
   /**************************************************************************/
   /* ImageMagick information                                                */
   /* For the photobook Ariadne needs to know where to find the ImageMagick  */
@@ -48,7 +47,6 @@
   $AR->IM->composite        = '/usr/bin/X11/composite';
   // $AR->IM->composite        = '/usr/bin/X11/combine';
 
-
   /*************************************************************************/
   /* Database Information:                                                 */
   /* Fill in the Hostname, and database name of the database server, and   */
@@ -71,13 +69,6 @@
   $AR->host                 = $HTTP_SERVER_VARS['HTTP_HOST'];
 
 
-  /**************************************************************************/
-  /* Set Ariadne's output compression level (0-9)                           */
-  /* (0 will disable output compression)                                    */
-  /**************************************************************************/
-
-  $AR->output_compression = 0;
-
 
   /**************************************************************************/
   /* WIN32 or UNIX                                                          */
@@ -86,7 +77,7 @@
   /* either 'WIN32' or 'UNIX'.                                              */
   /**************************************************************************/
 
-  $AR->OS                = 'WIN32';         // Windows 95/98/ME/NT/2000
+  $AR->OS                = 'WIN32';          // All unix/linux variants
 
 
   /**************************************************************************/
@@ -96,7 +87,15 @@
   $AR->DEBUG = "WEB";
 
 
+  /**************************************************************************/
+  /* Set Ariadne's output compression level (0-9)                           */
+  /* (0 will disable output compression)                                    */
+  /**************************************************************************/
+
+  $AR->output_compression = 0;
 
+
+
 /****************************************************************************/
 /* The rest of the configuration is automatic, only change this when it     */
 /* doesn't work for you and you know what you are doing                     */
@@ -181,7 +180,6 @@
   $AR->nls->charsets['de']  = 'ISO-8859-1';
 
   $AR->nls->default         = 'en';
-
   /**************************************************************************/
   /* you really don't want to change anything below this line                  */
   /**************************************************************************/
@@ -212,6 +210,9 @@
 
   $ARCurrent=new object;                       // do not change
 
+  /* on Default we do not respawn sessions **********************************/
+
+  $ARCurrent->noSessionRespawn = true;
  
   /* To crypt or not to crypt ***********************************************/
 




From ariadne-cvs@muze.nl  Thu Jul 18 09:49:56 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 18 Jul 2002 08:49:56 -0000
Subject: [Ariadne-cvs] cvs: ariadne /docs install.txt
Message-ID: <cvsgijs1026982196@cvsserver>

gijs		Thu Jul 18 10:49:56 2002 EDT

  Modified files:              
    /ariadne/docs	install.txt 
  Log:
  Mentioned that PHP must be installed as a module.
  
  
Index: ariadne/docs/install.txt
diff -u ariadne/docs/install.txt:1.4 ariadne/docs/install.txt:1.5
--- ariadne/docs/install.txt:1.4	Tue Apr 23 12:51:24 2002
+++ ariadne/docs/install.txt	Thu Jul 18 10:49:56 2002
@@ -18,7 +18,7 @@
 
 Requirements:
   Apache
-  PHP4 (not running in safe mode)
+  PHP4 (not running in safe mode and not installed as CGI but as an Apache module)
   MySQL
 
 Recommended:




From ariadne-cvs@muze.nl  Thu Jul 18 10:02:54 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 18 Jul 2002 09:02:54 -0000
Subject: [Ariadne-cvs] cvs: ariadne / README  /docs install.txt install.win.rtf nls.txt  /lib/templates/paddressbook classic.form.phtml  /lib/templates/particle edit.object.data.phtml edit.page.save.phtml system.save.data.phtml view.details.html  /lib/templates/pcalendar classic.form.phtml  /lib/templates/pcalitem edit.object.data.date.phtml edit.object.data.item.phtml edit.object.data.repeat.day.phtml edit.object.data.repeat.month.phtml edit.object.data.repeat.phtml edit.object.data.repeat.week.phtml edit.object.data.repeat.year.phtml  /lib/templates/pdir classic.save.phtml edit.object.data.save.phtml  /lib/templates/pfile edit.object.data.save.phtml ftp.view.html system.save.data.phtml view.html  /lib/templates/pnewspaper view.details.html  /lib/templates/pobject classic.edit.phtml classic.form.phtml classic.new.phtml classic.toolbar.phtml default.phtml edit.object.data.form.phtml edit.object.data.save.phtml ftp.files.get.phtml ftp.objects.get.phtml ftp.template.exists.phtml ftp.templates.get.phtml system.export.get.grants.phtml system.export.update.phtml system.get.folder.phtml system.get.name.phtml system.get.path.phtml system.get.phtml system.get.type.phtml system.get.value.phtml system.save.data.phtml view.html  /lib/templates/porganization system.save.data.phtml  /lib/templates/ppage edit.page.save.phtml system.save.data.phtml  /lib/templates/pphoto classic.form.phtml view.html  /lib/templates/pphotobook classic.form.phtml edit.object.data.phtml object.new.flow.phtml system.get.config.phtml system.save.data.phtml thumb.html  /lib/templates/pscenario classic.form.phtml edit.object.data.displays.phtml edit.object.data.form.phtml  /lib/templates/pshortcut classic.edit.phtml ftp.template.exists.phtml system.get.phtml  /lib/templates/psite system.get.config.phtml system.save.data.phtml  /lib/templates/puser edit.object.data.save.phtml edit.preferences.phtml system.get.grants.user.phtml  /lib/widgets/wizard classic.html code.php small.html
Message-ID: <cvsgijs1026982974@cvsserver>

This is a MIME encoded message

--gijs1026982974
Content-Type: text/plain

gijs		Thu Jul 18 11:02:54 2002 EDT

  Modified files:              
    /ariadne	README 
    /ariadne/docs	install.txt install.win.rtf nls.txt 
    /ariadne/lib/templates/paddressbook	classic.form.phtml 
    /ariadne/lib/templates/particle	edit.object.data.phtml 
                                   	edit.page.save.phtml 
                                   	system.save.data.phtml 
                                   	view.details.html 
    /ariadne/lib/templates/pcalendar	classic.form.phtml 
    /ariadne/lib/templates/pcalitem	edit.object.data.date.phtml 
                                   	edit.object.data.item.phtml 
                                   	edit.object.data.repeat.day.phtml 
                                   	edit.object.data.repeat.month.phtml 
                                   	edit.object.data.repeat.phtml 
                                   	edit.object.data.repeat.week.phtml 
                                   	edit.object.data.repeat.year.phtml 
    /ariadne/lib/templates/pdir	classic.save.phtml 
                               	edit.object.data.save.phtml 
    /ariadne/lib/templates/pfile	edit.object.data.save.phtml 
                                	ftp.view.html system.save.data.phtml 
                                	view.html 
    /ariadne/lib/templates/pnewspaper	view.details.html 
    /ariadne/lib/templates/pobject	classic.edit.phtml 
                                  	classic.form.phtml classic.new.phtml 
                                  	classic.toolbar.phtml default.phtml 
                                  	edit.object.data.form.phtml 
                                  	edit.object.data.save.phtml 
                                  	ftp.files.get.phtml 
                                  	ftp.objects.get.phtml 
                                  	ftp.template.exists.phtml 
                                  	ftp.templates.get.phtml 
                                  	system.export.get.grants.phtml 
                                  	system.export.update.phtml 
                                  	system.get.folder.phtml 
                                  	system.get.name.phtml 
                                  	system.get.path.phtml 
                                  	system.get.phtml 
                                  	system.get.type.phtml 
                                  	system.get.value.phtml 
                                  	system.save.data.phtml view.html 
    /ariadne/lib/templates/porganization	system.save.data.phtml 
    /ariadne/lib/templates/ppage	edit.page.save.phtml 
                                	system.save.data.phtml 
    /ariadne/lib/templates/pphoto	classic.form.phtml view.html 
    /ariadne/lib/templates/pphotobook	classic.form.phtml 
                                     	edit.object.data.phtml 
                                     	object.new.flow.phtml 
                                     	system.get.config.phtml 
                                     	system.save.data.phtml thumb.html 
    /ariadne/lib/templates/pscenario	classic.form.phtml 
                                    	edit.object.data.displays.phtml 
                                    	edit.object.data.form.phtml 
    /ariadne/lib/templates/pshortcut	classic.edit.phtml 
                                    	ftp.template.exists.phtml 
                                    	system.get.phtml 
    /ariadne/lib/templates/psite	system.get.config.phtml 
                                	system.save.data.phtml 
    /ariadne/lib/templates/puser	edit.object.data.save.phtml 
                                	edit.preferences.phtml 
                                	system.get.grants.user.phtml 
    /ariadne/lib/widgets/wizard	classic.html code.php small.html 
  Log:
  Updated version information.
  
  
--gijs1026982974
Content-Type: text/plain
Content-Disposition: attachment; filename="gijs-20020718110254.txt"

Index: ariadne/README
diff -u ariadne/README:1.6 ariadne/README:1.7
--- ariadne/README:1.6	Fri Apr 26 17:19:05 2002
+++ ariadne/README	Thu Jul 18 11:02:49 2002
@@ -1,4 +1,4 @@
-Readme                                                         Muze Ariadne 2.0
+Readme                                                         Muze Ariadne 2.1
 ===============================================================================
 
 Ariadne is a web application server and a content management system. It is a 
Index: ariadne/docs/install.txt
diff -u ariadne/docs/install.txt:1.5 ariadne/docs/install.txt:1.6
--- ariadne/docs/install.txt:1.5	Thu Jul 18 10:49:56 2002
+++ ariadne/docs/install.txt	Thu Jul 18 11:02:50 2002
@@ -1,4 +1,4 @@
-Installing Ariadne.                                            Muze Ariadne 2.0
+Installing Ariadne.                                            Muze Ariadne 2.1
 ===============================================================================
 
   IMPORTANT: Ariadne needs PHP4.0.6 or higher *
Index: ariadne/docs/install.win.rtf
diff -u ariadne/docs/install.win.rtf:1.3 ariadne/docs/install.win.rtf:1.4
--- ariadne/docs/install.win.rtf:1.3	Tue Apr 23 12:51:24 2002
+++ ariadne/docs/install.win.rtf	Thu Jul 18 11:02:50 2002
@@ -103,7 +103,7 @@
 \par
 \fs32 2. Install Ariadne\par
 \fs24\par
-Start by unzipping the file \b ariadne.2.0.zip\b0  to a suitable directory ( e.g. \b C:\\Program Files\\Ariadne\\\b0  ) . This directory should not be in your webservers document root! (That would allow hackers to read the programs source code via the web, which is a bad thing.)\par
+Start by unzipping the file \b ariadne.2.1.zip\b0  to a suitable directory ( e.g. \b C:\\Program Files\\Ariadne\\\b0  ) . This directory should not be in your webservers document root! (That would allow hackers to read the programs source code via the web, which is a bad thing.)\par
 \par
 Now you can either move the \b www\b0  directory from the ariadne installation directory to a new directory in the document root of the webserver, e.g. \b /ariadne/\b0 , or you can direct the webserver to an alternative directory. \par
 \par
Index: ariadne/docs/nls.txt
diff -u ariadne/docs/nls.txt:1.2 ariadne/docs/nls.txt:1.3
--- ariadne/docs/nls.txt:1.2	Fri Apr 26 17:19:05 2002
+++ ariadne/docs/nls.txt	Thu Jul 18 11:02:50 2002
@@ -1,4 +1,4 @@
-NLS support                                                     Muze Ariadne 2.0
+NLS support                                                     Muze Ariadne 2.1
 ================================================================================
 Ariadne has inbuilt support for multiple languages. For people interested in 
 adding more languages, the files lib/nls/en and lib/nls/menu.en contain all 
Index: ariadne/lib/templates/paddressbook/classic.form.phtml
diff -u ariadne/lib/templates/paddressbook/classic.form.phtml:1.9 ariadne/lib/templates/paddressbook/classic.form.phtml:1.10
--- ariadne/lib/templates/paddressbook/classic.form.phtml:1.9	Tue Jun 11 15:44:36 2002
+++ ariadne/lib/templates/paddressbook/classic.form.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.form.phtml															Muze Ariadne v2.0b
+	 classic.form.phtml								Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arNewType, $arNewFilename, $arReturnPage
 	 Grant needed: read
Index: ariadne/lib/templates/particle/edit.object.data.phtml
diff -u ariadne/lib/templates/particle/edit.object.data.phtml:1.5 ariadne/lib/templates/particle/edit.object.data.phtml:1.6
--- ariadne/lib/templates/particle/edit.object.data.phtml:1.5	Fri Jan  4 00:18:41 2002
+++ ariadne/lib/templates/particle/edit.object.data.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.phtml				 Muze Ariadne v2.0b
+	 edit.object.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 
 	 No result.
Index: ariadne/lib/templates/particle/edit.page.save.phtml
diff -u ariadne/lib/templates/particle/edit.page.save.phtml:1.4 ariadne/lib/templates/particle/edit.page.save.phtml:1.5
--- ariadne/lib/templates/particle/edit.page.save.phtml:1.4	Wed Jun 13 14:46:31 2001
+++ ariadne/lib/templates/particle/edit.page.save.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   edit.page.save.phtml				   Muze Ariadne v2.0b
+   edit.page.save.phtml				   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: $nls[page]
    Grant needed: edit
Index: ariadne/lib/templates/particle/system.save.data.phtml
diff -u ariadne/lib/templates/particle/system.save.data.phtml:1.15 ariadne/lib/templates/particle/system.save.data.phtml:1.16
--- ariadne/lib/templates/particle/system.save.data.phtml:1.15	Wed Jun 26 11:28:14 2002
+++ ariadne/lib/templates/particle/system.save.data.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/particle/view.details.html
diff -u ariadne/lib/templates/particle/view.details.html:1.1 ariadne/lib/templates/particle/view.details.html:1.2
--- ariadne/lib/templates/particle/view.details.html:1.1	Wed Nov 21 21:55:10 2001
+++ ariadne/lib/templates/particle/view.details.html	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   view.html					   Muze Ariadne v2.0b
+   view.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pcalendar/classic.form.phtml
diff -u ariadne/lib/templates/pcalendar/classic.form.phtml:1.12 ariadne/lib/templates/pcalendar/classic.form.phtml:1.13
--- ariadne/lib/templates/pcalendar/classic.form.phtml:1.12	Tue Jun 11 15:44:40 2002
+++ ariadne/lib/templates/pcalendar/classic.form.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.form.phtml															Muze Ariadne v2.0b
+	 classic.form.phtml															Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arNewType, $arNewFilename, $arReturnPage
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.date.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.date.phtml:1.3 ariadne/lib/templates/pcalitem/edit.object.data.date.phtml:1.4
--- ariadne/lib/templates/pcalitem/edit.object.data.date.phtml:1.3	Thu Dec 13 17:45:20 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.date.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.item.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.item.phtml:1.1 ariadne/lib/templates/pcalitem/edit.object.data.item.phtml:1.2
--- ariadne/lib/templates/pcalitem/edit.object.data.item.phtml:1.1	Thu Nov  8 13:27:50 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.item.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.repeat.day.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.repeat.day.phtml:1.2 ariadne/lib/templates/pcalitem/edit.object.data.repeat.day.phtml:1.3
--- ariadne/lib/templates/pcalitem/edit.object.data.repeat.day.phtml:1.2	Thu Dec 13 17:45:20 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.repeat.day.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.repeat.month.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.repeat.month.phtml:1.2 ariadne/lib/templates/pcalitem/edit.object.data.repeat.month.phtml:1.3
--- ariadne/lib/templates/pcalitem/edit.object.data.repeat.month.phtml:1.2	Thu Dec 13 17:45:20 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.repeat.month.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.repeat.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.repeat.phtml:1.1 ariadne/lib/templates/pcalitem/edit.object.data.repeat.phtml:1.2
--- ariadne/lib/templates/pcalitem/edit.object.data.repeat.phtml:1.1	Thu Nov  8 13:27:50 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.repeat.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.repeat.week.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.repeat.week.phtml:1.2 ariadne/lib/templates/pcalitem/edit.object.data.repeat.week.phtml:1.3
--- ariadne/lib/templates/pcalitem/edit.object.data.repeat.week.phtml:1.2	Thu Dec 13 17:45:20 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.repeat.week.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pcalitem/edit.object.data.repeat.year.phtml
diff -u ariadne/lib/templates/pcalitem/edit.object.data.repeat.year.phtml:1.2 ariadne/lib/templates/pcalitem/edit.object.data.repeat.year.phtml:1.3
--- ariadne/lib/templates/pcalitem/edit.object.data.repeat.year.phtml:1.2	Thu Dec 13 17:45:20 2001
+++ ariadne/lib/templates/pcalitem/edit.object.data.repeat.year.phtml	Thu Jul 18 11:02:50 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.item.phtml Muze Ariadne v2.0b
+	 edit.object.data.item.phtml 					Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pdir/classic.save.phtml
diff -u ariadne/lib/templates/pdir/classic.save.phtml:1.4 ariadne/lib/templates/pdir/classic.save.phtml:1.5
--- ariadne/lib/templates/pdir/classic.save.phtml:1.4	Thu Jul 19 12:00:21 2001
+++ ariadne/lib/templates/pdir/classic.save.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.save.phtml                              Muze Ariadne v2.0b
+	 classic.save.phtml                              Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arReturnPage
 	 Grant needed: add or edit
Index: ariadne/lib/templates/pdir/edit.object.data.save.phtml
diff -u ariadne/lib/templates/pdir/edit.object.data.save.phtml:1.12 ariadne/lib/templates/pdir/edit.object.data.save.phtml:1.13
--- ariadne/lib/templates/pdir/edit.object.data.save.phtml:1.12	Fri May 17 14:56:53 2002
+++ ariadne/lib/templates/pdir/edit.object.data.save.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.save.phtml				 Muze Ariadne v2.0b
+	 edit.object.data.save.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 
 	 no result.
Index: ariadne/lib/templates/pfile/edit.object.data.save.phtml
diff -u ariadne/lib/templates/pfile/edit.object.data.save.phtml:1.10 ariadne/lib/templates/pfile/edit.object.data.save.phtml:1.11
--- ariadne/lib/templates/pfile/edit.object.data.save.phtml:1.10	Fri May 17 14:56:57 2002
+++ ariadne/lib/templates/pfile/edit.object.data.save.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.save.phtml				 Muze Ariadne v2.0b
+	 edit.object.data.save.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: see system.save.data.phtml
 	 Grant needed: read
Index: ariadne/lib/templates/pfile/ftp.view.html
diff -u ariadne/lib/templates/pfile/ftp.view.html:1.1 ariadne/lib/templates/pfile/ftp.view.html:1.2
--- ariadne/lib/templates/pfile/ftp.view.html:1.1	Fri Feb  8 16:10:57 2002
+++ ariadne/lib/templates/pfile/ftp.view.html	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pfile/system.save.data.phtml
diff -u ariadne/lib/templates/pfile/system.save.data.phtml:1.13 ariadne/lib/templates/pfile/system.save.data.phtml:1.14
--- ariadne/lib/templates/pfile/system.save.data.phtml:1.13	Tue Jun 11 15:44:44 2002
+++ ariadne/lib/templates/pfile/system.save.data.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/pfile/view.html
diff -u ariadne/lib/templates/pfile/view.html:1.4 ariadne/lib/templates/pfile/view.html:1.5
--- ariadne/lib/templates/pfile/view.html:1.4	Tue Jul  3 13:56:42 2001
+++ ariadne/lib/templates/pfile/view.html	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pnewspaper/view.details.html
diff -u ariadne/lib/templates/pnewspaper/view.details.html:1.1 ariadne/lib/templates/pnewspaper/view.details.html:1.2
--- ariadne/lib/templates/pnewspaper/view.details.html:1.1	Wed Nov 21 21:55:13 2001
+++ ariadne/lib/templates/pnewspaper/view.details.html	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 index.html						 Muze Ariadne v2.0b
+	 index.html						 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: read
Index: ariadne/lib/templates/pobject/classic.edit.phtml
diff -u ariadne/lib/templates/pobject/classic.edit.phtml:1.8 ariadne/lib/templates/pobject/classic.edit.phtml:1.9
--- ariadne/lib/templates/pobject/classic.edit.phtml:1.8	Sun Jul  1 21:01:28 2001
+++ ariadne/lib/templates/pobject/classic.edit.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.edit.phtml								 Muze Ariadne v2.0b
+	 classic.edit.phtml								 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arSubmit
 	 Grant needed: edit
Index: ariadne/lib/templates/pobject/classic.form.phtml
diff -u ariadne/lib/templates/pobject/classic.form.phtml:1.9 ariadne/lib/templates/pobject/classic.form.phtml:1.10
--- ariadne/lib/templates/pobject/classic.form.phtml:1.9	Tue Jun 11 15:44:47 2002
+++ ariadne/lib/templates/pobject/classic.form.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.form.phtml								 Muze Ariadne v2.0b
+	 classic.form.phtml								 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: arNewType, arNewFilename, arReturnPage
 	 Grant needed: read
Index: ariadne/lib/templates/pobject/classic.new.phtml
diff -u ariadne/lib/templates/pobject/classic.new.phtml:1.4 ariadne/lib/templates/pobject/classic.new.phtml:1.5
--- ariadne/lib/templates/pobject/classic.new.phtml:1.4	Sun Nov 25 21:52:04 2001
+++ ariadne/lib/templates/pobject/classic.new.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.new.phtml								 Muze Ariadne v2.0b
+	 classic.new.phtml								 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arNewType, $arNewFilename, $arSubmit
 	 Grant needed: add
Index: ariadne/lib/templates/pobject/classic.toolbar.phtml
diff -u ariadne/lib/templates/pobject/classic.toolbar.phtml:1.11 ariadne/lib/templates/pobject/classic.toolbar.phtml:1.12
--- ariadne/lib/templates/pobject/classic.toolbar.phtml:1.11	Fri Dec 14 16:53:16 2001
+++ ariadne/lib/templates/pobject/classic.toolbar.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.toolbar.phtml							 Muze Ariadne v2.0b
+	 classic.toolbar.phtml							 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: read
Index: ariadne/lib/templates/pobject/default.phtml
diff -u ariadne/lib/templates/pobject/default.phtml:1.6 ariadne/lib/templates/pobject/default.phtml:1.7
--- ariadne/lib/templates/pobject/default.phtml:1.6	Tue Jun 18 20:07:22 2002
+++ ariadne/lib/templates/pobject/default.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 default.phtml					 Muze Ariadne v2.0b
+	 default.phtml					 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: none
Index: ariadne/lib/templates/pobject/edit.object.data.form.phtml
diff -u ariadne/lib/templates/pobject/edit.object.data.form.phtml:1.3 ariadne/lib/templates/pobject/edit.object.data.form.phtml:1.4
--- ariadne/lib/templates/pobject/edit.object.data.form.phtml:1.3	Tue May 28 11:50:36 2002
+++ ariadne/lib/templates/pobject/edit.object.data.form.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.form.phtml Muze Ariadne v2.0b
+	 edit.object.data.form.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pobject/edit.object.data.save.phtml
diff -u ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.8 ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.9
--- ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.8	Fri May 17 14:55:47 2002
+++ ariadne/lib/templates/pobject/edit.object.data.save.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.save.phtml				 Muze Ariadne v2.0b
+	 edit.object.data.save.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: see system.save.data.phtml
 	 Grant needed: read
Index: ariadne/lib/templates/pobject/ftp.files.get.phtml
diff -u ariadne/lib/templates/pobject/ftp.files.get.phtml:1.2 ariadne/lib/templates/pobject/ftp.files.get.phtml:1.3
--- ariadne/lib/templates/pobject/ftp.files.get.phtml:1.2	Fri Feb  8 16:10:57 2002
+++ ariadne/lib/templates/pobject/ftp.files.get.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pobject/ftp.objects.get.phtml
diff -u ariadne/lib/templates/pobject/ftp.objects.get.phtml:1.1 ariadne/lib/templates/pobject/ftp.objects.get.phtml:1.2
--- ariadne/lib/templates/pobject/ftp.objects.get.phtml:1.1	Fri Nov 23 00:10:30 2001
+++ ariadne/lib/templates/pobject/ftp.objects.get.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pobject/ftp.template.exists.phtml
diff -u ariadne/lib/templates/pobject/ftp.template.exists.phtml:1.2 ariadne/lib/templates/pobject/ftp.template.exists.phtml:1.3
--- ariadne/lib/templates/pobject/ftp.template.exists.phtml:1.2	Thu Dec 20 17:22:32 2001
+++ ariadne/lib/templates/pobject/ftp.template.exists.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pobject/ftp.templates.get.phtml
diff -u ariadne/lib/templates/pobject/ftp.templates.get.phtml:1.1 ariadne/lib/templates/pobject/ftp.templates.get.phtml:1.2
--- ariadne/lib/templates/pobject/ftp.templates.get.phtml:1.1	Fri Nov 23 00:10:30 2001
+++ ariadne/lib/templates/pobject/ftp.templates.get.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pobject/system.export.get.grants.phtml
diff -u ariadne/lib/templates/pobject/system.export.get.grants.phtml:1.5 ariadne/lib/templates/pobject/system.export.get.grants.phtml:1.6
--- ariadne/lib/templates/pobject/system.export.get.grants.phtml:1.5	Fri May 31 12:39:47 2002
+++ ariadne/lib/templates/pobject/system.export.get.grants.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /*******************************************************************
-	system.export.get.grants.phtml					Muze Ariadne v2.0b
+	system.export.get.grants.phtml					Muze Ariadne v2.1
 	------------------------------------------------------------------
 	Arguments: none
 	Grant needed: read
Index: ariadne/lib/templates/pobject/system.export.update.phtml
diff -u ariadne/lib/templates/pobject/system.export.update.phtml:1.4 ariadne/lib/templates/pobject/system.export.update.phtml:1.5
--- ariadne/lib/templates/pobject/system.export.update.phtml:1.4	Wed May 22 16:42:18 2002
+++ ariadne/lib/templates/pobject/system.export.update.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-	system.export.update.phtml				Muze Ariadne v2.0b
+	system.export.update.phtml				Muze Ariadne v2.1
 	------------------------------------------------------------------
 	Arguments: $this->import (object to import)
 	Grant needed: edit
Index: ariadne/lib/templates/pobject/system.get.folder.phtml
diff -u ariadne/lib/templates/pobject/system.get.folder.phtml:1.5 ariadne/lib/templates/pobject/system.get.folder.phtml:1.6
--- ariadne/lib/templates/pobject/system.get.folder.phtml:1.5	Wed Jul 10 14:48:14 2002
+++ ariadne/lib/templates/pobject/system.get.folder.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.get.folder.phtml							 Muze Ariadne v2.0b
+	 system.get.folder.phtml							 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: none
Index: ariadne/lib/templates/pobject/system.get.name.phtml
diff -u ariadne/lib/templates/pobject/system.get.name.phtml:1.2 ariadne/lib/templates/pobject/system.get.name.phtml:1.3
--- ariadne/lib/templates/pobject/system.get.name.phtml:1.2	Tue May 15 17:15:19 2001
+++ ariadne/lib/templates/pobject/system.get.name.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.name.phtml				   		   Muze Ariadne v2.0b
+   system.get.name.phtml				   		   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: none
Index: ariadne/lib/templates/pobject/system.get.path.phtml
diff -u ariadne/lib/templates/pobject/system.get.path.phtml:1.1 ariadne/lib/templates/pobject/system.get.path.phtml:1.2
--- ariadne/lib/templates/pobject/system.get.path.phtml:1.1	Sat Sep  1 17:40:20 2001
+++ ariadne/lib/templates/pobject/system.get.path.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.value.phtml						   Muze Ariadne v2.0b
+   system.get.value.phtml						   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: none
Index: ariadne/lib/templates/pobject/system.get.phtml
diff -u ariadne/lib/templates/pobject/system.get.phtml:1.2 ariadne/lib/templates/pobject/system.get.phtml:1.3
--- ariadne/lib/templates/pobject/system.get.phtml:1.2	Tue May 15 17:15:19 2001
+++ ariadne/lib/templates/pobject/system.get.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.phtml								 Muze Ariadne v2.0b10
+   system.get.phtml								 Muze Ariadne v2.110
    ------------------------------------------------------------------
    Called by: multiple
    Arguments: none
Index: ariadne/lib/templates/pobject/system.get.type.phtml
diff -u ariadne/lib/templates/pobject/system.get.type.phtml:1.2 ariadne/lib/templates/pobject/system.get.type.phtml:1.3
--- ariadne/lib/templates/pobject/system.get.type.phtml:1.2	Tue May 15 17:15:19 2001
+++ ariadne/lib/templates/pobject/system.get.type.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.get.type.phtml							 Muze Ariadne v2.0b
+	 system.get.type.phtml							 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: none
Index: ariadne/lib/templates/pobject/system.get.value.phtml
diff -u ariadne/lib/templates/pobject/system.get.value.phtml:1.2 ariadne/lib/templates/pobject/system.get.value.phtml:1.3
--- ariadne/lib/templates/pobject/system.get.value.phtml:1.2	Tue May 15 17:15:19 2001
+++ ariadne/lib/templates/pobject/system.get.value.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.value.phtml						   Muze Ariadne v2.0b
+   system.get.value.phtml						   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: none
Index: ariadne/lib/templates/pobject/system.save.data.phtml
diff -u ariadne/lib/templates/pobject/system.save.data.phtml:1.11 ariadne/lib/templates/pobject/system.save.data.phtml:1.12
--- ariadne/lib/templates/pobject/system.save.data.phtml:1.11	Tue Jun 11 15:44:47 2002
+++ ariadne/lib/templates/pobject/system.save.data.phtml	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/pobject/view.html
diff -u ariadne/lib/templates/pobject/view.html:1.5 ariadne/lib/templates/pobject/view.html:1.6
--- ariadne/lib/templates/pobject/view.html:1.5	Wed Dec 12 14:55:34 2001
+++ ariadne/lib/templates/pobject/view.html	Thu Jul 18 11:02:51 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 index.html						 Muze Ariadne v2.0b
+	 index.html						 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: none
 	 Grant needed: read
Index: ariadne/lib/templates/porganization/system.save.data.phtml
diff -u ariadne/lib/templates/porganization/system.save.data.phtml:1.10 ariadne/lib/templates/porganization/system.save.data.phtml:1.11
--- ariadne/lib/templates/porganization/system.save.data.phtml:1.10	Tue Jun 11 15:44:49 2002
+++ ariadne/lib/templates/porganization/system.save.data.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/ppage/edit.page.save.phtml
diff -u ariadne/lib/templates/ppage/edit.page.save.phtml:1.2 ariadne/lib/templates/ppage/edit.page.save.phtml:1.3
--- ariadne/lib/templates/ppage/edit.page.save.phtml:1.2	Tue Oct 31 13:49:04 2000
+++ ariadne/lib/templates/ppage/edit.page.save.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   edit.page.save.phtml				   Muze Ariadne v2.0b
+   edit.page.save.phtml				   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: $nls[page]
    Grant needed: edit
Index: ariadne/lib/templates/ppage/system.save.data.phtml
diff -u ariadne/lib/templates/ppage/system.save.data.phtml:1.9 ariadne/lib/templates/ppage/system.save.data.phtml:1.10
--- ariadne/lib/templates/ppage/system.save.data.phtml:1.9	Wed Jun 26 11:11:14 2002
+++ ariadne/lib/templates/ppage/system.save.data.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/pphoto/classic.form.phtml
diff -u ariadne/lib/templates/pphoto/classic.form.phtml:1.9 ariadne/lib/templates/pphoto/classic.form.phtml:1.10
--- ariadne/lib/templates/pphoto/classic.form.phtml:1.9	Tue Jun 11 15:44:53 2002
+++ ariadne/lib/templates/pphoto/classic.form.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.form.phtml															Muze Ariadne v2.0b
+	 classic.form.phtml															Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Called by 'classic.edit.phtml' and 'classic.new.phtml'
 	 Arguments: arNewType, arNewFilename
Index: ariadne/lib/templates/pphoto/view.html
diff -u ariadne/lib/templates/pphoto/view.html:1.3 ariadne/lib/templates/pphoto/view.html:1.4
--- ariadne/lib/templates/pphoto/view.html:1.3	Wed Nov 21 21:55:23 2001
+++ ariadne/lib/templates/pphoto/view.html	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pphotobook/classic.form.phtml
diff -u ariadne/lib/templates/pphotobook/classic.form.phtml:1.8 ariadne/lib/templates/pphotobook/classic.form.phtml:1.9
--- ariadne/lib/templates/pphotobook/classic.form.phtml:1.8	Tue Jun 11 15:44:54 2002
+++ ariadne/lib/templates/pphotobook/classic.form.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   classic.form.phtml                              Muze Ariadne v2.0b
+   classic.form.phtml                              Muze Ariadne v2.1
    ------------------------------------------------------------------
    Called by 'classic.edit.phtml' and 'classic.new.phtml'
    Arguments: arNewType, arNewFilename
Index: ariadne/lib/templates/pphotobook/edit.object.data.phtml
diff -u ariadne/lib/templates/pphotobook/edit.object.data.phtml:1.6 ariadne/lib/templates/pphotobook/edit.object.data.phtml:1.7
--- ariadne/lib/templates/pphotobook/edit.object.data.phtml:1.6	Tue Jun 11 15:44:54 2002
+++ ariadne/lib/templates/pphotobook/edit.object.data.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   edit.object.data.phtml			   Muze Ariadne v2.0b
+   edit.object.data.phtml			   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    No result.
Index: ariadne/lib/templates/pphotobook/object.new.flow.phtml
diff -u ariadne/lib/templates/pphotobook/object.new.flow.phtml:1.4 ariadne/lib/templates/pphotobook/object.new.flow.phtml:1.5
--- ariadne/lib/templates/pphotobook/object.new.flow.phtml:1.4	Fri Jan  4 00:18:53 2002
+++ ariadne/lib/templates/pphotobook/object.new.flow.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   object.new.phtml				   Muze Ariadne v2.0b
+   object.new.phtml				   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    No result.
Index: ariadne/lib/templates/pphotobook/system.get.config.phtml
diff -u ariadne/lib/templates/pphotobook/system.get.config.phtml:1.2 ariadne/lib/templates/pphotobook/system.get.config.phtml:1.3
--- ariadne/lib/templates/pphotobook/system.get.config.phtml:1.2	Mon Nov 19 11:09:29 2001
+++ ariadne/lib/templates/pphotobook/system.get.config.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.get.config.phtml							 Muze Ariadne v2.0b
+	 system.get.config.phtml							 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: see pdir::system.get.config.phtml
 	 Grant needed: none
Index: ariadne/lib/templates/pphotobook/system.save.data.phtml
diff -u ariadne/lib/templates/pphotobook/system.save.data.phtml:1.10 ariadne/lib/templates/pphotobook/system.save.data.phtml:1.11
--- ariadne/lib/templates/pphotobook/system.save.data.phtml:1.10	Tue Jun 11 15:44:54 2002
+++ ariadne/lib/templates/pphotobook/system.save.data.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/pphotobook/thumb.html
diff -u ariadne/lib/templates/pphotobook/thumb.html:1.1 ariadne/lib/templates/pphotobook/thumb.html:1.2
--- ariadne/lib/templates/pphotobook/thumb.html:1.1	Tue Apr 10 15:25:23 2001
+++ ariadne/lib/templates/pphotobook/thumb.html	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pscenario/classic.form.phtml
diff -u ariadne/lib/templates/pscenario/classic.form.phtml:1.8 ariadne/lib/templates/pscenario/classic.form.phtml:1.9
--- ariadne/lib/templates/pscenario/classic.form.phtml:1.8	Tue Jun 11 15:44:56 2002
+++ ariadne/lib/templates/pscenario/classic.form.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   classic.form.phtml                                      Muze Ariadne v2.0b
+   classic.form.phtml                                      Muze Ariadne v2.1
    ------------------------------------------------------------------
    Called by 'classic.edit.phtml' and 'classic.new.phtml'
    Arguments: newtype, newfilename
Index: ariadne/lib/templates/pscenario/edit.object.data.displays.phtml
diff -u ariadne/lib/templates/pscenario/edit.object.data.displays.phtml:1.2 ariadne/lib/templates/pscenario/edit.object.data.displays.phtml:1.3
--- ariadne/lib/templates/pscenario/edit.object.data.displays.phtml:1.2	Tue Jun 19 12:00:45 2001
+++ ariadne/lib/templates/pscenario/edit.object.data.displays.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.displays.phtml Muze Ariadne v2.0b
+	 edit.object.data.displays.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pscenario/edit.object.data.form.phtml
diff -u ariadne/lib/templates/pscenario/edit.object.data.form.phtml:1.1 ariadne/lib/templates/pscenario/edit.object.data.form.phtml:1.2
--- ariadne/lib/templates/pscenario/edit.object.data.form.phtml:1.1	Mon Jun 18 15:16:59 2001
+++ ariadne/lib/templates/pscenario/edit.object.data.form.phtml	Thu Jul 18 11:02:52 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.form.phtml Muze Ariadne v2.0b
+	 edit.object.data.form.phtml Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: newtype, newparent, newfilename
 	 Grant needed: read
Index: ariadne/lib/templates/pshortcut/classic.edit.phtml
diff -u ariadne/lib/templates/pshortcut/classic.edit.phtml:1.3 ariadne/lib/templates/pshortcut/classic.edit.phtml:1.4
--- ariadne/lib/templates/pshortcut/classic.edit.phtml:1.3	Sun Jul  1 21:01:35 2001
+++ ariadne/lib/templates/pshortcut/classic.edit.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 classic.edit.phtml								 Muze Ariadne v2.0b
+	 classic.edit.phtml								 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: $arSubmit
 	 Grant needed: edit
Index: ariadne/lib/templates/pshortcut/ftp.template.exists.phtml
diff -u ariadne/lib/templates/pshortcut/ftp.template.exists.phtml:1.1 ariadne/lib/templates/pshortcut/ftp.template.exists.phtml:1.2
--- ariadne/lib/templates/pshortcut/ftp.template.exists.phtml:1.1	Fri Dec 14 18:25:02 2001
+++ ariadne/lib/templates/pshortcut/ftp.template.exists.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   index.html					   Muze Ariadne v2.0b
+   index.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: none
    Grant needed: read
Index: ariadne/lib/templates/pshortcut/system.get.phtml
diff -u ariadne/lib/templates/pshortcut/system.get.phtml:1.1 ariadne/lib/templates/pshortcut/system.get.phtml:1.2
--- ariadne/lib/templates/pshortcut/system.get.phtml:1.1	Tue May 15 17:16:41 2001
+++ ariadne/lib/templates/pshortcut/system.get.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.phtml								 Muze Ariadne v2.0b10
+   system.get.phtml								 Muze Ariadne v2.110
    ------------------------------------------------------------------
    Called by: multiple
    Arguments: none
Index: ariadne/lib/templates/psite/system.get.config.phtml
diff -u ariadne/lib/templates/psite/system.get.config.phtml:1.5 ariadne/lib/templates/psite/system.get.config.phtml:1.6
--- ariadne/lib/templates/psite/system.get.config.phtml:1.5	Mon Jun 25 16:22:57 2001
+++ ariadne/lib/templates/psite/system.get.config.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.get.config.phtml							 Muze Ariadne v2.0b
+	 system.get.config.phtml							 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 	 Arguments: see pdir::system.get.config.phtml
 	 Grant needed: none
Index: ariadne/lib/templates/psite/system.save.data.phtml
diff -u ariadne/lib/templates/psite/system.save.data.phtml:1.8 ariadne/lib/templates/psite/system.save.data.phtml:1.9
--- ariadne/lib/templates/psite/system.save.data.phtml:1.8	Tue Feb  5 15:11:20 2002
+++ ariadne/lib/templates/psite/system.save.data.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 system.save.data.phtml				 Muze Ariadne v2.0b
+	 system.save.data.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
  
 	******************************************************************/
Index: ariadne/lib/templates/puser/edit.object.data.save.phtml
diff -u ariadne/lib/templates/puser/edit.object.data.save.phtml:1.7 ariadne/lib/templates/puser/edit.object.data.save.phtml:1.8
--- ariadne/lib/templates/puser/edit.object.data.save.phtml:1.7	Fri May 17 14:57:09 2002
+++ ariadne/lib/templates/puser/edit.object.data.save.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
 	/******************************************************************
-	 edit.object.data.save.phtml				 Muze Ariadne v2.0b
+	 edit.object.data.save.phtml				 Muze Ariadne v2.1
 	 ------------------------------------------------------------------
 
 	 no result.
Index: ariadne/lib/templates/puser/edit.preferences.phtml
diff -u ariadne/lib/templates/puser/edit.preferences.phtml:1.1 ariadne/lib/templates/puser/edit.preferences.phtml:1.2
--- ariadne/lib/templates/puser/edit.preferences.phtml:1.1	Thu Apr 26 13:42:06 2001
+++ ariadne/lib/templates/puser/edit.preferences.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   edit.object.cache.phtml			   Muze Ariadne v2.0b
+   edit.object.cache.phtml			   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    No result.
Index: ariadne/lib/templates/puser/system.get.grants.user.phtml
diff -u ariadne/lib/templates/puser/system.get.grants.user.phtml:1.1 ariadne/lib/templates/puser/system.get.grants.user.phtml:1.2
--- ariadne/lib/templates/puser/system.get.grants.user.phtml:1.1	Tue May 15 17:17:35 2001
+++ ariadne/lib/templates/puser/system.get.grants.user.phtml	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   system.get.grants.user.phml					   Muze Ariadne v2.0b
+   system.get.grants.user.phml					   Muze Ariadne v2.1
    ------------------------------------------------------------------
    Arguments: $path
    Grant needed: none
Index: ariadne/lib/widgets/wizard/classic.html
diff -u ariadne/lib/widgets/wizard/classic.html:1.16 ariadne/lib/widgets/wizard/classic.html:1.17
--- ariadne/lib/widgets/wizard/classic.html:1.16	Wed Jun 26 11:35:34 2002
+++ ariadne/lib/widgets/wizard/classic.html	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   classic.html					   Muze Ariadne v2.0b
+   classic.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    Classic windows look wizard widget. 
Index: ariadne/lib/widgets/wizard/code.php
diff -u ariadne/lib/widgets/wizard/code.php:1.5 ariadne/lib/widgets/wizard/code.php:1.6
--- ariadne/lib/widgets/wizard/code.php:1.5	Thu Jan  3 18:00:29 2002
+++ ariadne/lib/widgets/wizard/code.php	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   code.php					   Muze Ariadne v2.0b
+   code.php					   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    No result.
Index: ariadne/lib/widgets/wizard/small.html
diff -u ariadne/lib/widgets/wizard/small.html:1.12 ariadne/lib/widgets/wizard/small.html:1.13
--- ariadne/lib/widgets/wizard/small.html:1.12	Wed Jun 26 11:35:34 2002
+++ ariadne/lib/widgets/wizard/small.html	Thu Jul 18 11:02:53 2002
@@ -1,6 +1,6 @@
 <?php
   /******************************************************************
-   classic.html					   Muze Ariadne v2.0b
+   classic.html					   Muze Ariadne v2.1
    ------------------------------------------------------------------
 
    Classic windows look wizard widget. 

--gijs1026982974--



From ariadne-cvs@muze.nl  Thu Jul 18 10:22:47 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 18 Jul 2002 09:22:47 -0000
Subject: [Ariadne-cvs] cvs: ariadne /www/install ariadne.ax stripped.ax
Message-ID: <cvsgijs1026984167@cvsserver>

This is a MIME encoded message

--gijs1026984167
Content-Type: text/plain

gijs		Thu Jul 18 11:22:47 2002 EDT

  Added files:                 
    /ariadne/www/install	stripped.ax 

  Modified files:              
    /ariadne/www/install	ariadne.ax 
  Log:
  Updated ariadne.ax and added a stripped down version of it.
  
  
--gijs1026984167
Content-Type: text/plain
Content-Disposition: attachment; filename="gijs-20020718112247.txt"

Index: ariadne/www/install/ariadne.ax

Index: ariadne/www/install/stripped.ax
+++ ariadne/www/install/stripped.ax
‹¨ˆ6=ì]|SÕ÷goE
ÙT†Ð¼¬&L;ÓÄ6¥+2JF³hÒfüD°ˆì½d/
2dï½²ÊÙ³@Kþ÷¾÷ÒŒ¦éKšäŸø‘¶É½ïÞ{Î÷Œ{ι7]Â+”û‹D¢’#h4ð}a?©ˆýoì½B£�†4ð;B¢FDThI+ÿ©U¨�m0Š³Z¶¬�¥Ó½µ3™L�eb£8s
â«K8X~—Œ¬,]–¡¼Æü$Ñ©Tøþ¥VhI*¯	9¿þßó€R�aèb”[ËmŒRøO¡F îü§�#BüÆ«Åè� ÷¨PùÎÉÁ	Mo|Xýþ£¡wòv}ÀØ^±ò^Æõ
•‡únèÆ9È·3[°[®ï¿x_û¢†·é_ƒÊÛµýû*uÄŸ¦Ì\¹tÁö$.ln8?¶5©JߨÔøµŸD·j7cáMë‰Ú™dÍBC͹0MÊÇÙç½²Üã.7þñ¿K7Ž¥Ô3kE—Šg“É3r¸“6œï!|ïᶋ½,Óf·MâdéÒÚ¶!oè» >*†Ý­Ï©†ûnÝ:t¸uIOëêW—îdªÕc–²<|pZ�Øô~דÂîÈjTžz`¤ñUÒ®K§ßë[ýË'laë9¶Ô¦çÛç[?¾Øjò¡¿„.)hø÷]±m_AÃŒZ¦W¿Íi}^á¼ófüšhù±{“‘q=#ëיߵŽ5qTÍf*c~ÏQ÷Úÿ=cÍ—µ†UDÎÔ-ˆ­tkêæ-Ý?èñî�?#§Õ3ÌïP§o�ÑÖ/(¾h׿cåÝíoî¾ÝªÖ‘¿9³é·ò¾èûñ�\ÅãQ5gÖø³Õ°?ÛoËøH½xû�ßÜ›¸´Z�ÜOç}p«wÝ´Ó¶ó?[ðÍæ'+«ý¬›Ü¨ó‰Q�®:Z´âÙŒŒ[sÞ[Ý!yTun‡Õ5#ÇïÈ®uª½ sµ¡qg2�,ß!lSÅ°·íÑ+›S*õ�7ª+|›³8qô“”Mc¾$e¤ß}±„V­ÕŸ×÷Ž›¼´²ºÁíg5&<ïä©Ló~HH‰|žóOî´©+TUõkë“Þ·�_–:aÔŽ©_.L¤u¬:{_óC‡f-�\¤ Wç,Ú0­~ûzò9ôÆÏÚSµ­nË<çc“'ýÛZÜ·òÆ”Zý7V4½{ÿ£\i›kî»+:KÖk/wûdfò³jS�´fÞé¹hJ�_åÍOÔzQ·f‹É¤þ§x?W¡Ts�Ó°·¹ÇÁEÝ*uü¡ï†zgþürôÜ[”2fRÞêøU…—kÕTnŠ\Þh–1eÉ×ÎïŸüâ“)äêŸlœ¼wÊô6Ý¡íŒ�ÎWþnò7ÍÇÊûuQ�ìÿ‘D°4ê§ìŠóÞ¯š>EUk	gŇé¤ü�y|Ô&Ã0n»fïúÞ�y­v´ŽMl4`ÒÀ—5lÇRœ¸\™Ñþù„6±�ÛªNKªÕØ�2ÿÒ÷¿ÔÊí°¯Ë°ñ-÷ÙÙ6V§Ì«VsêÁ!+Ͷ2~¾nüå'Õ›„ïiÉÏ=W‡³¤þÞzÏ|÷±¶!ÂŽ4.þ㿧ïÏŸÚvmÂvÆ;|ö͈ÙSò8ʃ;Æ6Y°kÀþ÷¶+¦’N_hËYqëA«f?ֽݭQ[銄¯O.^[óë¯[6,#÷¾V»íݲîskî64}žÛp&�É8}ëŸðΖ=ÏžM¸Û|aÌæ¬G…Õ>™8øáf‹Ø¬¹;s.ö\¶’–þQ§È^Ú›;¢ïÛ“s|Ä�é›®Í>?'÷rE­Tph×­	µÿ¸¨;2«ñ²ÞónW¯­µ=Ž™wíIÿ;;~Î�ê•~è\aD³¥?綬³é‹SÂô¹WrŒ¯2qRÒ©•/„okôüJ‹ž–ŒIïtéY~êó‘µ¾ítƒ©ïÐ�”·vmZzôÙü#ç^ž®ôcܤ×=º¯¾ä9ãåªùiѳož>úì°±¿·»®^’þÓÅìY'3w×+þ�ZðÞ=ù;+»¿që´²¹²ƒb}ôÊç”Ô}Úp5EÒºg_ÖÂ[{7¥Æ­Èk8|cÄÞ'…=/Kÿ:½ubËZ£tÃÓª5ºt¥Þþ¨izÿmó«�ÜÛimåŸóã—YÛ~{fç•s'Þ¿¹~Õ5éÆ}y»ënKÈ\/«6^°÷Ú¯>!µé´vï£G]F®»6¤ÓýU“Ö´÷bK£~S¾|œKÿ%ÿëîÝ2>OYÛbK·Œ;;.jžæ5X´ MÓ¹âå­5ß½±iȶ§ö\[·œ\8cºjºtí¹Â¾‚¹‹[wëÙv×½”æ«›r�?ùçÜ™ÍÃó¹ÛûZók&�MÜÒÞðÅÃÇb/pÒn˜6f¹øÃGÌËãm=k6¶ŸÖ°pÓËYµß=±t@ó³_i—žüaöŒ/¯5<A­ñÙocÛÈE­ZTÏØ©öàyãk�>rhcîSuóþ挂©ù¿Ÿ9×ýøÅ­kZ­»Wùã•c:22¸¦”¯j»3¯Ê’èáIÈ:y‹
µs¼žôõ–ãƒ[Ý=ÝnÉíí?ŒîÃÍΛoænÔ@YwÏ„ÕG^ü¼þÀ_+ú½oàÏßìY£Ùñdù4ùÞ‘GÞÙ0`Kþë‹ê—­ùö¯>‰òZ£ªµXÛq¡áxxuëè	GÌÝÛwÖ={|í¯IíïTÛ9µ[~í/nŒýkFÆ—ýþ>Y4éøôì®™kflXý|=¬¿µÓhÛó­óú^é×åXvÆ_M›qŸu³>ýoÒ3ÁáG½5Ýú÷JÍ?Î=¾²yæ©aVÜHõyƒÛOfÄŽOŠ±¾ì³ía£Ï¿òŸ.xíú9}&_?ÏØùéإWéä~ýÆØeÍ/ëzlÍ°1<;z*ÅU÷êå؈6¼eqÝ¿ÛÏoóÇ«uƒQ›Œ�[tLáúÃ6ùU%eÄo1Ú¿n³°W—p}–2GlÌ�Š¥ŠŒòÙbû?’þ?¡�Bû¿`¼Àþ/C£W”ß ÿŸJ¦’ÝùO&“Bþ0^NþßLÝyz£Ã7*¼¬×ìÆß_Ó~+¸øî¬ØMÇÿzçx[ÍéºC#ϯþ5vZöÈYu﵉ÝÒþÀÚ&Ã9ëT™1òÊ‚ø/¾¸}°ùŒð„ÛÖmlSwãÅ¥&Q×ÂÇ;zÍZs¿[¯ÓÊ“¢Î3W/Ë|·hCeÑÃQ�®|²¢òöqÒó7ýýP1¦G߸œo¯ü¹¨^þæ§ËW>Õ夽œž+{Yïý§÷“È©¦
á´+º¬™AS_PïYpÚxnó¯SïôËü3õÎ%eD·nŸn[$ï;ÚfyiB¾cÊŽ½üŠJÈ3Ïοr¸Î³u¯çOª³¬Ù£¼ûU†¯±pvÌ´~S-¨næÈ.tŒËËÏß:/aA�Z維%-Ý£aÒÏÞÒáÜàÏu§E_úTm[:¬AÄ�ï/˜–¼ªªz9²ÊÔ)'«�œò·íßúç'N§Uܼ§`ÛÉ”GÛRZ®¶õGèÍ4ã:wowî;óÒ…núŠM÷Úr�¨~ÛKÖdª
Â+™fS5rðÑèÑ'v¬zµ'ï¢U�.N1Ÿ>òSh6ïœÔ¤¡¾ÿúÊ·ù×?Ý|ï~ý‚Ó*¬˜ýaXÅê?^¶VŸúYÖ£
iËVZbßù_•ñ:é®nXÕtëÝ;³v?±jÞúøCϯkl·wå\¹½ç_¹è^�ðK]\jrVzåRÎâ;ÏžÒP?>õôÙÓ¤�cz>¨lÛeã3}Õ•qoÛ—MzXÍ;ßÚ¾çÁ¦�ËLÒw5æìº^¥ÞÈê]æ¶=t�´{Ñ¡Ÿ¥ý„W¥÷ŸÈÙvI7oD‡î�uÛù#²fÜŽ‚Ç#SkNÛ{fÖGC­ƒ Û™sµ4áwwϬ¯¶w}õÊ�†�Œzqº`w�õÛ¯®'Ž�}}Fµ�ߟ°öÂþÝËÎݱ(RD?allŽ¹÷¶æ×vm•“¦ÈóÏ"çbN.¿Óë¯ÓßÄ�»Þø›{=nùxÄaÚÆô™³ÚŽÛW¿Ç´ÃÚÄô:xÝ\éXóÍ�xñsnÔã4ú>ʈ¹®›ß9f8Û,¼¥ueîйYbNÔ\8OÖëâõ?™uµ]Lx†asîÍ©êq§ëo
Oª³mÿuÆ°› {ÓÁ¯CoÞž›ð¨ÙBÃÙñ¦ŠÇ†©Ç­«¿eêáï,4ýƼýøú¾åõ;κZ9¦…ÌPPí˜îßßÃ£ûON½ÔqÎËoS¯ååo�^^iÏUÛyƒz”­ÛÎõFÛžX]pÅFÞÎ7
òM7Ä4hÙ·†¨]µ|ѧQµöûteóúû+vÿ¨qÕü•-ë.=´W>†R?&WÐ&ïôéU“ß±X#Kتª?ªÚ¦Ë¶¤�Sc7Fn\ûî‹]Ì#&ŒÜª_‘q¦mÓ¥iu%Ç>=Z‡_-¶ÑÐMõë�­;ªÝ˜øù FŸÇ¯=YXõ@ß³Ÿv™:¿ùþÞ�©²!-wZËéœ	�®¥Ô<˜Û·cdÿ	Ÿµ»Y'ëç*Zõú~bŸ
‘Fð†¢x£fèzU©	zuiz}zuz-]_o×ûmkƒ÷³ÀûõIàý®ß‚÷�€Î‹›€Î£Aç�²_;ó/Ç×lVsТù›'Ž°õéwüU½µ¯–?¼øÑWC‡ÅN£öïSŸµ‰¾Rf¯ÝçTÏ.Å¿ó4ñß^c­©ÿôÊh¹Ò¶«ÕÝ©ÿ¬¼P¯úŠ[ׯÎL[)Í[ûËéÝëžÿegõ	ýŽ)ȇǯ®úo»G&p&¬h|íé¦W¬¬{1¦8Ò	ݦ¹—�û—vGclûh¼°£MeRŒ×m×wý-ñü?;þþý~�ó}V<ì~ºgïù‘u4ò„ê©‹£»yœ÷ìźúù]Ùõ®îÐ.*©Ã{‰½úôKZ=¤ÆÒ?—õ}õð1Ì�-ÖïFÂê¯ßÛïñŸ&Zü¡1ÍÌ<·êÛ»W®‰ŽnÚ•­žÜìx¯i™‹å©3W|3™cYÑòŸNW6š9ÍnvuOÛiÌ_©/ÌÓ–ïŒIÏ?\¯éå"æ‡�:èç$×ãýôÎÜ/—ŽÓ$Í"ÓºU£ú­ÚŽ1+®ÜõeØ[„õtv…?ªEþ0dÍÉÇši�½çÏæ©ÏT=÷{tâ¦ùÓŸMøa§3ÆLd÷ÐeèýC›M®ùã…‹ë¾í_9mé¸o¼³ãâYÒ4s«)½//[Ü€~xBÛ�	�'jNŒs/u¡µà዆ßhi¤z9£„½U—Íßö÷«Ä?-Ôéo[·ºO^±˜ñÿÚ¾nv�¡ÚÀqYñï’¶åe^ù«Í5æ7O^õÖmÂÕº­®?ÝÚ²iã˜èù¶�c9—6PF°†~¿hVáö¿ý®Í™±ew3ãPò¶|œUySF�~‚ÍóûNl/HXÖ+ïnËU¼i7^9‰ ×w3�<óWµ…«êÕEúlr¿áB~k­5Q¯.±*Út3Ž_ÝÆ{•¹zª-¼rÆÞÁ-›Vhr�3lHŸaCÆÿ³áØïmNM¿òç$ê«O>¨œûÇ;•Òk˜·ê¿àÁàCÈiÁ¾q©ú}vÇÖ±ê³f¶¯�Ú3ª¼WéâTÊú}�®V§ï’Gúé{•ù ÷åµñÏmó'+’[œýê‰îѽÁ½OÏ{j›ó£ÈÖ©êƒß™÷#Âf˜»ŸÊÚ™=Í|k1­¹¼þgJõY÷7eÎYr¤_³»/¾j3™²¥÷þGÏ;Œ.ˆbO˜ò2î«ý¬½——-º>©í?íß[ЦðXÁÍÊ_ö¾¼{ô’V’ËšÙFq¦u]|-/{jÁwaŸŸÝ0þÃ�1-—MŒÕ¬[XXûŒíÔ õ¢ÂÓÝ”/Jþú7¹~âŒo¸×ûØ–‘®
'j»íê—ñlØá¹í>y:KÖ½óº-'yÛŽÜ4+iÂHú3VMû£_Aý–“ûXV�N{o¹eëþ›‹öL˜¿¡Ö:[ÜËK¢ÂÎým‡ÇšÎm�ž_`³í´-WÛ*=Ý–ÝâümÛùmýRŸö«5Åfa{y7½Vɯg_®°ô�µ_óëö�ÞöW—p­N|ÿòtm½ûÿd*…Bu�ÿS©”�ÿŒWxF‚ÿÕ
7X`/Fv{C,“ee�.3<ŒâåC©.[kÌRfÀCÝŸê¹�\šzÏÑT«M‰�ž'@uoš¥Ë´áa%} Í0Á~´>6ZôèÂè^?×»a–Ò8˨”ªÁœÈ$ï¥bu†V&Î-‹¶XK%ÆÅbdum(S§#¨k#˜­J"ÞJž¥ËÖƒfÞI§‡Ö‹õpÜR¨¨“¨2¤FÐ.¢”vYr±Vi•:-hÍðÞZ/–ÃÕ”Â0A|¥žè:£4+…!h3\vJa‰Aš¡oÁ‡–ƒB—e”f
QJá�
 
´*…5ÙÈŠ7®³2ÀƒoA›huY1�U
Ñ–>ˆL‰ÝòŒÒ%¢ä¾>±ä‡B^ÉÝ	‚Âõ
„4�Ç.D”ƒçŽD$Ç¥'Aõç¹OÙ{P¨%tö‡%~è#ras%íëEÑŽþLÔW˜¡�ˆÚšâ=	™žâÝØ�Ú†â=ý
Ö±t{àÒÉWêñ\:øÅ)G'4˜So¿F÷"þš—~þŠ¬ëC|A×Î�Y‡ïvέ¿¯öÃWáDÛû}¬—ï“ó™x?†ò«ƒ¯
ÊÑ©,–ylT¤§î~=ˆ +ïÚÇŸq|Tçh{	ÖÙã�õôQõ`�|•B¬—_zëê»vÇúùªdð^þ ëê7^|FÑí¡K{Q†uöeXOQ†uòeX/¿P†uõeX?_Q†÷òeXWP†÷$ˆ2ØÚ–êM`]qE)•z¹>‚V*<=…ÍŸ9»yQ4¿V`÷è¥zžz;˜J/Uºìýí~6•ðˆ®�z©Àsï‡{ôReïèÐT¢«ò% —ŠsO�±=;� Ú=Æè¥êGgl8*Qš¢h¥%dñ
�¨Œ¸ÅèDÄ •§è@QLº"ˆÅ%6áÙq•áñ�vQ8º"ˆBÑ).A�hÌ-ˆ 
ŒUT¢ËÁ#	T¢Ëpâ*•è2<Å"ˆBÖs!‚(|í`¢¥Ÿ«Ù �¦—ƒ¨Øx!0ˆJŽ·ƒ¨ y 0ˆÊ”Çø
ƒ(1
¦e¬sô€A½.ÁQüÚ	A#ÊH·Ð
ƒ(öðö4¢LwÒ_4¢<.7`Ÿç°
ƒ0Ç<E˜„iê=hÀ$J3GÌ€F׎QhDÁŒ)zQ\z0‰2Ô=^À$¼,G¸€éÓºp©cú¶:'íÍ$*y®±&Q9r0‰¢»X¤€IØî�„DÔÎ�„D˜G@#JDOqQt¹Ç	Qx9Å	Q|9Ç	Q€‹ $߈cGB"
1ç8
B"Š±bq„Ddîq!
2ç8
R¼dï•Ú¢Þâ¾óÝùáØ^
…š¥4âEIîØòÔÌ^À€«6òÔÚ¨“é`[w¡Þ+Ó�Ûøûb™F	WT¬ÜÈåó¢VîÇ[é³%j¥6(a¼�£�;Oñvx)VÞáìØ–ø‘LiЫÅø€bI8­ðB«bémGS»%D›¹ÃÂS3±V«ËÖJ!ŒŠÅð<µ·O
rqjk÷;Ü�½­ÕÙ´bÍ�kà°Uq'®�ªî4ÁÞ/‘¹Î)ˆƒCº“ߥ.) ™·‡IuZ£U&Å⇞ši²­ð‘Å’7ÎmqBË]amäÙt8wx:\´Äb‘IçVø¤ÐÁÜåÒ®MÜAþºk+ÿ¯.ᘅ)Ï
`¯õ¿dB§»ÿ#‚NÕÿã…„AGûø^t&ƒJB½Ù4«Žœ¤ää5zµ�’¬LRÅš’´Fk’ŠMgkxÙl•±w’J~g*ÅžJͦ'ªôR«Žúeùˆ´
í¥tvfœEÌ�Ë”hÒ•I”D:תSJ)<£„gÉHeÃ>¦$%|†€ö‰à™4ƒÔÂŽ(>6=ï/bñ4B
ÏÆ…ý- �Z¢dÛÇ7ˆ\_aÒ)%:~bZ$˜Mža‘°â²Eñ‰Øû �ˆO-šc
Ÿ¦•°ÔV1c€Á×N3”ßÚÓÁ3’믇4OT	i‰ié¤DU:lé¡•jâ²epÎäXû¸ð}“ˆÂÉ‘	"±÷ÓÐ÷ð>"%ó,�žÂ4�ãa2�­å¨…|@Sr&�«22ÀÜÒÀÜâyV‘€�=#F�¯ð^ÉQÉM%d$S(HQ€ù
~DÚ×lói&ŒÞ‘€Þ°O&#E-D@{5>>ÄŸ/þ<Ð/ƈõ�¼'ss$‘^ôæa€a-"¢†¦�ðÓ‹!†t0Ÿ,ä›Æh`´6YÀÑù)Ù¢T)6 NÊlŦ”jÁïL1dV€ž…27F§”±xTH,°Xƒ2ünÁÖÀ§)$ñ<µ[¡Äà~ÀÏ„tH¦‰3ÈøØ“ÀßR‘”þ,UÉÏ‚ŒáXJ¥™5ð4Sa\xì4³ÑLõ,¶6¥ÔÄÁÖÇ7Úûƒ¿Íè¬.B�Ó|TP‹‡R¦±½D	ç‰0$÷èQ‹L\]gA…3‰
Ĭ”Ì(âC±ð€bHuÐ&�¢¶¤‹f¢å">¢�j31Š
ª`ŸA5¥‘Ó�߇âm…jPEªø¸8ÚÀs5)j‘&‘Ä'=ð,(v8Z-Óƒª_»JJñ�jјMŠƒƒ˜yÂÕ//[D6ë¥d9JÅòR¡@
<«Ð4dze| ’ø‰Îï£æBB¦áê^ˆª\•eK¢½¨?HMœYÐ&-¨;¿T¾1Ý‘	5Mb›œ”‹pc؈�þR–:[í¼føÌ(Ç\ë0£íÉŠ™…ÖHËJÐ(H¾É¹Ä„BçBF%�‰™�f¢ÇójÊ<™¥2©|*T9v�ÂÕ‚C8\Ôí½uœ	UB“KyI$Pà60™ž
	SfëÍ,ù¸^vÙÍ�µóƒpiR
P4|’÷g¡à€B�¢/âoš­EëU9©t+ìŸ�ÑŽ/àýQ]ƒ‹p¹˜
W-UÚ˜­fÉ(æSqóCêQ‹B\ݧ—¦î-žÔ}bZ,ôP3Eñµ”Âí™YÕ‰
Õ›*Jò€¡*ÊñE
ßL*®’áø@ÛÅëS¤îP#	D;MÃË	8!Ÿ–éàT‘wLj“hdÐÃÓÙ�u‘wGpíÉü‹H×Íó¼nWµéj:M0§H1
/Hö>4Öa.¶Â7µa†„ž“cʦ>bͨ÷ã´àÒTêq wˆŒb噉H´)ÀQäYÿ¿à¶Iƒ;–“»òF`õÚ¹92>�$Õ¨�M.»I°/”怛‹…¥Š~–‚<aiÈ+NTû
[�)³ˆøq$v,Ç"΀u@ÏöH#SºÛ�7lê=F‘æ)F!Ç�dŠvÑVâÑÆEÑVŒ	eÚw¢ÄSÊ ˆªQâEØë9?ÃÝø§yœ;	ÎGDf;6B	rcQtÈX
çíÓÃ$�uÛ›¼-ó²å‰õ´å¡¹Ž“ŒK-D¼Ì"„ªJ§ÝsvÛb€÷™eB-fŸ]ûìlx¸ø.ór‹P˜=�“%ÚYßRƒ„Zø·š—D\-ŠŽJ“azD.!åÉ@
c£¦²#Š‰#>–L�è.Æÿ%/ šý«�µºðe™¢Tœ.|ª¬?›/àèÅäØ "Ü
	ÀAM¬lº.H)ãI4jðìdy:%E
6�V6‹©±�!,mA1ƒ­@ÕFц7ÖãØP¥p(<+þf-jyo¸ ÉvD ‹`d•ñ£PÀ¡�™'…Ò ¾AÜ_G÷5†ã¡«@s9ÿZŠêÅãºo¸
ô)æŒ�CÁŸï.°=:y£ôRK˜—xwLÔBm¦¼7+V.ûe‘Š¤ǧ�¤1ºœŠŒ"³ÐŒ2�^�0›`awJðè¢4SŽ0�šÝ›Å±ô–“>ã‘Óå2¸	e%Ë
Ö³À$‰%Š$r!¶D©ež%ƒÏ„cSÄ,†¼4”B-‰�‚¦ŒLšh+;Æå"ÓÂŽOщøjø†„ä¨{ä~&‹¦2„Zv§˜d7:S­aÇ«sd©Q:!XŒ™‘e–�Í°Œ¥Î‘hA_—N–;h`’K(l9ð?ô�A憰Y"¸gcÄzð´	ÑQÀUç)¤`m@‹›$‰ÍR“À|rй¥F2„`Lð™¦w*G'‹O
2ÈÈA¼øÄl	¤S*à�¡ì­A€WncIåøçŒr,˜¿>GªŒ"þëeÑ�^ér	ä%Yf‘Px&À'…,Úeœl‘@fEÇAyîÊ›bï©P>Ùi…ÿÔ§Šø2…ø\	1f¥TE4D��ORVœÖî«
Ñ”ãα'3Ñ““	Û$‰ù<DFI,IoY“bb�õ›\\°�2
ùqY€&™2ÀBŒY
ðv9B&[£ Éâ#é	&@§Ô•ÎØ:PÚ&¨ðµ©e)ÀÇ4¹‹ÒcN/þž)¸’ðyj0žNB6› u³ÀßÚd`¥™�7:´Ø,õ@€SØÇ(!óô2VzöS
fÀ³Ùq@´xV6°¾d‘€í„·(€ežFmBÝ5¸—S’å"Ø�üK”È#ài
ƒ„µç@=``³Œˆ̇d
èµ�¬8dšÀšÔÎ2ãQ~á&�ø¬Aé’lW[ES'ð!M‹axW‚á�›„	æçú<WVø<à³SܱMÓ‹8fÉ<HCWúñ
<‹g
vÒ`§ªKŠvƒ“�/³ûó04Ì�ÆP5lk,91ÆÀH DvÂqè–2Çm3´ÇÚ(T>~Mn9$¸á!>Q\r½�êdh¦¸i.›2¸ï@ðý�£€Có¹§=n_¹:	À# ½Qâyƒ‡?ËIÇ£¹¯t{ÞªxˆÀ1GT‡KY�þ\0‡(4ôí:¾ð¡¤ñQ»å2>êÇ8ÆÇBÚ(…T›<F³ÃăŒx¾H'c!�>þ,ôÄsGžü%i™ÔD+ø/-±hÝB
ÔåL£Ðnq„*àšàA@ûgö<”=¤âoΉŒo$)žwèP�§•KÙ”Êa[»ôä‚£!@¼2”ÄZÑM-‰¸D;Œ0ïgå ˆ.ÙÀ‹ 1G•›uz1å•¢ÊÊ~׊øŠhÐ�Õ]›¥@ RóõЀƒ>sI.´ Õ¨Õ2 ìž6úèÖ„L3)�àªð`„‰ð¼R)%æD+ôSeQ`/®
a´²BE ƒ„‚:;ÊgÇ�g*ÙÙBL%´xpVÌ€žf°…†8UÀ™Q@g:vR-p|4Ð)Säú+€#
xbF�=YMGGͱdúa
çòÍíÅÒ’b ¸ÇZ}Êí!ôòN¬À)óâÕ&‘À³ï’öæ×jøZ
IŸž
mK‰{	ÆCLpX#€Î'ÉžŒ‚©k)ËŒE!Ð÷IeJ¨ üÇQ¦P	d I¡IY¼Ò‚�x`�Ìpt±4²§p4Z¼)çÿhÄÃcR%¥P�V¡†©[üCœçà]Z¹¤�ý'Ç¢ÖÅ�¡E
52)8ÄãjE~­§r¶/´¯’°ÒߺP²ƒ`ŸHÄ�¥áH,_H¹¤îP¦p(ŽÍ‚±HpјLŽ3ˆ"„§p÷¢/m”
L\¬¦w(þ£ÛcîHðõ¡S0Q‹¡€ÄUH€Wv–2¦ð`[›Š3lßË%i�[¥Ì$t€ÇáU’ƒZ:á ;foH% XnG±ÞQWü6Y{ëqFq”}�
,¥ `õ±RŠbL)'F¡æs%©ÎeêA*ƒ€:!…¥¶À6
êá{ò9Ñh›´{û�¥QHƒlíñ±½NŽÅÛÉ2Y|�†ðãLå㣢	f+¤’híR4ê}Rô¼K¤kýQŒmÂ
¬à"��b„€/Z´ˆrñE)Ø
�“%§	¡P‡ÚO½x´ÞBh½�c"Ò·¯Œ2#¬MlŠr'|Ù£B$,uU>úSŽéOÇ\q„ÒƒgåÑtÜ®±Ðrž#KòKo!ZP_òõX|gâ–I¯¢èOE'ž\Nþ)šÇ0Iœ€ã°þAÒ­°Ä¿¨�GÔBKkr<çmóOA›Ì¢6AE,–aÃ	[¶}=ªÿzãL(´¢'Õ(EG�t,ÃW¤ÊýÜϳ!§,"r\¶X W uGÊJqáÞ_•#ÕÈ€®SÓ…0-F¦¾uþ+–Õ°Ó„i¢öuO_”t9kIKTE’c„¤"iÔp)%%G‡կ±
9{Šg
\@(×ìõhZ?ÐÛ�ù¥æ�ý�ÓrqÉð0ž§z‘zT3P8Z`ŒãHb¾Ç«	|É磒´¶P©õx¼$Hy:8Ét¼2®ÄÝh¼Ó‰þ·HšÑ›ÀÚÅ|š"°‘9‚»QŒð
8]�/¢||}ôâ	“´h®8B)ÁÊã¡\âY¤df¶7�Iêhó–yL€
jà^k¹9˜MÞ‘]apWA2i«¤ôgù‰ÔL©Žù¢¾=ÅÏü�§¢* u`•ß>”
pdŠrd,Ž0/—zyìŸQj§MðuiŠ†I’”íX2C»¡||z,Ãl³ìsµëR?stS0Z|2èÃ[gµ“Ðø9¶>ßà'Z3‹Ð*Ô0s[�C8ËÅ�IäâBE1ä2˳²•»
ÄçŒâ`åø ÏJæª%X l×Wë$¬B2/[(àè%îùïGþ`�Dšóú‚�`„«
¿SªQç¢N‰©åZ'!u¿Y'Hù?½Š©6E%${E/Ðã‹‹ÈÞ¾,ŠH'ÓÔ–1G
KìYêlQ°QÌÅîƒÊñÍY`™EØ�¶@\5‘æ`^9Õ«aq«ë8v]ìg®ÐóþŸO‡½užû «Iö؇_±§þAÍdc—Éß%üœ2e±1ð8éÙ å!wxø‘‹’#[ø½Œo²Ñ*(2°�§“‹ò£ÁÝ‘aÄ/Bñ£L-ÔrXû[ÚóʆTNçq"Êý¢³ûyœ‹È)yÿ–ŸÉ�ž+z&n!$žï¼°¾Žs9¸W‹ž§!ÁÕ�ðjQóáf¼ÔºKf-J¹cÍ@k˜€/COßö‹õ¬EkVàc¿xÃÏ|bÌ@|5IBáÀ3²¥=÷ı&õëîè$»ÖrcŸ�-ùž—b÷4аóòѺSŽ4Æûþ�F]­%Ö‰Çõ`‘ñÕY0<žRT•ìÃ=Û0ÿ®2›z+EÙB-×”du¦á\�ÕóÙõXrbšœ–hÍÄM»çû�ËzÝŸÃÆc`)sþÓåЦcDõáL°:#SZܘ×6ÿ"»PjnÞÛùØ^”‡^V«³KÏ?¦'ús³[nzú%æ°±ï��5}ƒÏš¦©=jÑJ¬ŠÃ¾•/ÄÁ7žƒ%V‹–ƒ¡s7e8wƒqÊ‹¶ôÌ©P]_ â%oD]Šz‰U5�•×PUM«j0n•XY`íÊ6g„r�êEÖ韆n¢ÀM˜¼•X'`í:£éÿMŒS%Ö‚xçT¨æ.ˆ5w˜ôbéC·›å>Êv»	&_%V«Þóq-`\+±*#Ðñ”Ð],årÆÅ+B^ÿÀë÷âC6*’Áò“AªÿÒ3ý‹–…âš^㚎R[4*�ÝðÏv|é·çÀKŒ–Åš“bä®*Ýb÷ý=Þ„�iáPnâ?ž› +7òaéÃúœ§e”^OF)"X¹„P´¬ŒÑ²ˆ`åB÷&æÞ$ŒkÁŠF«Bw•éÎ Œ[~F¤C7jñFŒS~Æ6C§¡_ãihŒsAŠo†"cå‹ð3®:3¤3ƒ—|Ž{Ä–PÊÿŽB¤Øù°·Ìc€1
çccþsËý¡�bÿÊ(x8Òœ˜&4'ÅÀïw+¡~^%¤%¦¥“U鎨—ã« àß
Ñã4D‘,¡È²
’¸Ëz2ú•Q4øý‡¡ %Çé92 Jx¦§šýbÕNŽc,®·ûº^�•Ó»DþP�ÄÌÆ£xdôx‰ÀûyRÙî-í< Ëš—rnFXTOì|€_)ïÜ£`‚VÒ9ƒÿÆÚ}þ¾44 ʱ:‘$ÅØ¿ïÊEP¬ö»E€@Y¸ªL37-ÙÂMuþž5ÇA]”žä¸L	_í¸ã‰êÅgh-W(ÖQÆXÕ‹�PN…n1÷ÿsŒS^üÁ€V…¢R�ŒJ)«ªjTUkD3*!9”œQ½ìÃjÇBÑßD©^´b ëEB§«Jª xNW1‚”ÕŒ”WÍ#ˆ™ÒPõAYª>gGC÷-Ô¸ÁʺªBçYË~ž• ÌkèÔV¹ŸÚ
ÒÝ*¡j†²V30‚”E¦Ë™f*ÿÒ~å¬ýhÁ:¹ò*áUøyR#$WA—+?Ï‚‡8tNùyŠ1T#ùºk$~æçB2lcø™—ÉØë–1f�âü¡:äò¨Cf†nUûs�æóÉüз€½Öo
ø¤úÉ�Ì•‹ÌùYS:¹Ì“Ì �U”Wõ
3HÙÌÐ��¼±‚¬»òB5#e¬a†reÿ‘\3Xwà…j–X³Ìô’‰¡„j–ß°še¦—Hq@¹ªñ(c�ÓK¤Ø§B‘â×)FH^BÅ�²Pà£<0¼ÉE>Ê3òA’·úÎç2~ç3.T^U�Ô‰¡@Uyª Ÿ‚fÖB‘ª@Eª’—PU@Ù
U•1T…�¼Äª½;ŪÊ«BH^Ü�@KU(X¨`òí][w¢È>Ïç‡ô˼p‰ÝíÃyÐhP'�Ѩo.PA�Ä+¿þì]"Þzâ´¬Õc ¨Ë¾ï¯vq�hÕE«x“pÏ=âU÷¯âñª{ŽWñ�xÕÄ«øLUÆ•¦®ÒôìZ}÷Že×,À{äñÓ¶ùÒªÉï·f°,æ)b™œÅ`x�Š5E2Þ¬ýe™uU¹ÖÌTy!Õ†§éð7Þ«Mæ›P�¦ž0tA�ÒÖ±d‹šY£Ó¥Ë«Ñiã½áÍ’¦'U4Í,Ì,d·=JÖéìf÷™™.&G&uà05ªuÚLKÈV-^ǃXX#³¿@ˆ¤¿XTâÈ\>ÅæÒÍ®QZú¼ F©OÆþ¯5</ÅEÆ&QSxëÖyeR	k¥&ùŠØŽF
ô>kÁýï¿¥oküAÿË!½<²+€£"ÃûË¡ú²½Ó­˜÷«—›…n�òñ-•_jÑòñ²æ9Á8VóøŒÅH’;÷/�lIYÜ]öÇ	mÎÞƒÖÍ4–"¥s£R¸</]–uqÑùïVw†ZÞÀ.DÞþ„G½Fk1[x†!þcíÏ~¨òŽ9›Ò1À³g¹i— ‘‰|´8.þK×CD¶‘ôŽ3¿·àEñ%!HÇ+ï€ì>38(å±|Ñ¿ÏXö£±;g• eüt2©õNüernŠfÎðÔRËoë`�vY ý¶_¯>qÞ
Q妞yþ%\HfZ*O£:ÉH
Zù“Êæß[Ä
·)uÖ´Ý+H\@ž±ɤ_$ý¨E/õl]*çJÒ3-pžX¡@‘ôü~kËï¡Ò«~ªCe4¸[i™>fŸŽYTãíþãV#‘¤áb\A’ÒÊï=¼á˜$Ek¤ ¸)öÇ|µŽI¥òÌ垎B fµÅ,'üýà“™|èx…'«ÔÚ¾ÒíñJ-S>„–_pº	.PÇ	=y3ý䓸LÁ°Âv­îªyÊiû§Oæ+ïÕ–K”ÍóŸCÁZ�yŒ<ŸVŸ£�àÿœ¥¨gè2A’`/Q€áÉÅ&›ê#Ëm÷MÑZ›^`ŒûÀÏ“éVóà}jóI©iœ2i—Þ¤ÎX®õx¹kMåšãh^¯¤K2¥•<z$ôþ
3Í-Œ|mŠ`н
á=åàКŸ)ýâi,„¬–j‹[V˜ro]m£tA±‡ñâX¼¦Zî¡,2òܼwÎÆD�ÔôAJ  Å·®É½ÕLá­{Œq¼ý©ÁæAÙ"ŽÊÂÝYóråSåJ·€3@�9 „<ã=)W
±FÂBK�ê¹Á#¹‹šU%Dà
q4Z `Ëyt9ÉZŬAßÜ~Ÿƒ(c¢ÏrÔçè¨Àhù•¼Cm
�r¨Ï¿Š\žÔ#zЦ�IŽ¿§D[»Nö{ü[·}“hëÙò¥ž®¤�…¡1‚@Î[BÇ{ÇU¥´Ÿ¨´¶Y>I&±c³cŽ)*"86Ó€å�$|ÙïL©Îi~äPg¬øîTúcÍW\ÅWÆJ·.ê]Ý{{n¦˜ÔD†ü9zöá²E³çÜ£‰¢fh_Í,•æÏv.ël×ôtG˜ÆÓ„-Ž#lÇ2Øe:î
竤³øèd¿x0�Qm
¬ÐÞfÈYvö#ÃØ
uø;e‘Ø<ЃÏÜr|~PTˆÖFYzGÛ<&Ÿé�A¦åqQ½ŠJ	Ìwø^ïY‡l÷Êæmc©àš©rÌ

(G¬Bmɳe>‘�Üb­¿WÛÁ˾¨¼G·ÉÚ#äÛÈz’DÙÄ悺i54ä)�&Úñ™8RRå9©„Ý�rò{ÁÄ
ü<)qÀó?®e““wÍXÂ$
Ó"À™ñ¾í1mÔ>Ûù‘�U?Jäþ™DN&­OVŒ¸Ï±óEzÜá/Ë.Á$ŸD$?nž]:D4þq÷;ñûÛ©‰x&fÎ
g�ŸY"¶|6zQX‹�T0ÈÁ|�»uV‰ ­$×GÙ2ú}2Jhttµ�§5Y™´†àH*³‰�º¦ê["³…¾‹ÇoX^?¯½Àö~Ñn$Œ…Ô³À8‰°û�’b*I±KÀöÒ‹Cc?¿.\OÂìl
.LX ŠÂ¡’Ѐ‡ôœö.
Îè{}ŽÈ–¿¹¼ìÆ+à•› >E(]-
‘ºë–ø•d&%¼¨sæe¹'‚?�·7x¶ŠÊͧo‹Os43>Æóا¼ØE`‘ßi
ÒOKA¢ÛÖªÂÒ…ÒÔPÁuôÌ,’¨p¹fƒÍzSZ:Ãqu¦«­�¥ºÖs•Ät Ÿ¶å•×æ¸:×mÚù ß½¬š C‡Þròz�ž‡.ôW¯ì@vÐ:�ObúàÇ…v�m;¸�÷³	cn6Mp8Íy<®e”Þ5Ê3k˜É¶2©Ø:î‡`}™‚ë�›¦v–®X£¿l6:kh¿wI/œ¥rá¡Ѻ®µœ	‚i«¥ÕPì¯4¡¿„yâ²@0J‹1wæÆ@¶MV°ÓÖœ£–ÛÄÙjÛ¶$ø.j³gëÝż[æœáîahÆDæL¶Ð¬­´±5¯s
4.?üÝ3½òÖƒkJüDX8g%sWZÓ×&Þ/9ð<¨ŒAîC¾ƒqêöæß}oãsœþËIÌ"\Ì^þ0©À&-Ežg
ïì[MAB“|Ì	2³5°
ÿÌÇòsÜÃUöC¶µéN®µ9¹kf¸öõ�â·9Å7ÅÔ�t"/D]|;'äšDku¼ÍSÂi9ÙËP,0Ž¬†^™z@ j•nœÜ­ k[}YB*7íÌN±º£ÕµJ-w	Wð—0Ù¥ãÕûíV‚3³`„ýK2ÒÖC�Â;�Å0IªC¯´a
ãæÝzøLc|‚xŽŠö|q‹.Ã’=ø3NÂL»,HFUzÏ@•HÔ"Çll{§#U�ȱð^ÌRQ!•ÓT}/U­ NÑjÎZ�Xý‚ê†ï–CÆY«2nÔT�ñGÕb‚ƒç^Cˆ	QAÔã=ž&O¸�ûÜô�®PV9Ö'{¥ƒÎV9ÛlB“¤´ÐÇÖ¥ïnÕà`”<†Ôçˆ
�¼®xííªfË®)m
-pg݉Ñ@x*ËTšzl—­�cm¢„ТsÖ«PÛßU™[RËÑpnAjhªª¹gƒº€µ¤jL˜÷2ª}gª±…áÚ T�¾8ð×eªö˜Y„é²1â=—Û÷(Ò¡A))­Í[·¹QjÚÓqè@vÚ)‘!=G™ë"O${º®5È÷@ÓAù{G´#ÆÖ5ˆéx8Ez÷H?Ð[›¼PˆþŸÅ#÷õí­=²,o«ˆ:`¢%c;lªhÙ;ž%Õk ó�1ÄvscÐã¯Få�Íß•Ÿ¯bå�&Ã{ORŽªõ¿âgÌzÙo—䯙m>½KõÊpŽ¥sæ”Xð“í毱¾ÒfÊæÍ߬ÍZ¬{{+œˆ)²Ï:UL%-½c–(Aö´Éžôì¶Ü$ꇉªv~æ:u—ô“ˆ²`…¬ÐÉÙý‰YðòÕæ-2•¾-Î|9ä…—øã
è}n4¨2䪇:Úr_k¡�#ÈŠ.¸k
îwFè`×Lz%fÓ†v�MÜg½®€~Uüc0`ðö8£Ñ_jé0`ª{¶,�FŠ�i›Àa䬌ŽHÖQìÌ¡½q3Fá—@°?QÛ®S"sÙò‡¨zô8$ÚLßôG5Î÷fóse?½Ý+ø!á;XT|Ú»±
f”öR?¼ª�…Û
�öâ¶7‘Œf{ÍÆ×Y›uJflg>x±^ž¢z«iÂ1RömákâØÞ¶£6k�pF‰îi	0SMõ÷Â�øˆ!³…-ÍHæ	[²ÇYˆ˜¯Ègÿ
c•JŠÂ²‘Â*:�Ŕ֕ç1²ï3ÖvöIÉÛ¿^¤Otÿ#ö‰¿ O½)ט'©öI<¿O7‚|”‹û(æ]„¤NJ2NHhha€êèoCèÙQ)ºb[~�dUÒ·ãÊ÷	¸®¼#j¶Žeýúé‰Ýýwí‹`–°&ˆS�l,ªŒ‰l>þ±�“LÄ>†�€Šbæ²AG¼Ý¬þe~ÂŽnEÎ^˜A*X˜²EC7Ø=À&õ¤Ý)€­³Ë×d¢äúqp鿬EäO¼Ìrvhôä]„>3ÃPu1œíñl¼k”I”»è6ñ0fDôc‰ˆŽî’ÿê9ÜPÝÄŸÇu€>LC^%d’‘,)5ÜQ5Íܸ¸fÄSÒñ®˜•Œ!á1JæèRÉ}Ñ$îs¦×‡ÏW‹¨øKÛÅ�À9a¿�Þ3U!ð÷âyÜ&!BŸJûàá<ž~|[˜†;šYÆGìSä•?¥²¿�ÇþéY°HMç+…ñî´²Uj8N Þ–€U`ê9ø$ú¬)E›rìç§å•à™Ê�¿žË›¿BqBîuW&ãÆX6Óöd!×€³bÛÒ75NKoQ²�ᣘI@6Ñ-Ï‘HÏܨ˜Žç/¸
:$¦"Vü1V~£	ý©‰ô~ŽGuqð”ê^!‘ñ€vç[öÅÚçÎÝí6M�ž&~[|:ó�¥¹Z&ЗéÒ/}™]›zÐZhjgU¤\Ì,/»N.ê]Áé²*zL]ïeÖì;‚¢ÌßÝCb"lräÓx
¼Uò>FŸŸÃù|ºÿK
hw὞¢šiU¸ò
œ¢‰ÕȃÇî«ŸýÀñ)€
<½BYƒ•ëhhýåÔ×-Ú x”“ªê­;”®½ƒŸ™§ÛT7
+¹…ºÊö‡hQ
Ô渮Z:
r|ò¸�ᮢ÷·Ì�b¬ê¨rjC¡Äi@ô�:Ìn�¨
+í~ØÆlìËñ|–ø-G$ÔÅ»†A3q•`½:�ívýïú;ÂV•¹õ\Å•A$mà3ô»:Š}Ñ"pÇ
ÊÃó.…ľÀg>[.8x¼5h!¤XŸÉ7žåÉ®µŠ5XÀ=@éœä¥–ºmHÂìhä�«`9–a^Éû°È'�'“ç^ðû5V¯i6”5¼cïÀ‘ü‘Œ¦ Ìu9FHÈë¸Â¬þýD8íCÑ@Ü¡hçõÏ�<ÄU]Mp˜ÿï:BSÔ'Öˇ±¬Eˆ�˜'Gó¶‰yj9Œ_ÞŸ£`þ§})•70Þˆi¡²Õ
ÀµäÌ‹êNW·.¶÷p¼“`Õæ'µâNr⺎/¢1P·äð¡€£¶D�ú8ÿC©�e]ÞëXÏ•-óøSRÖQ.èKñ{;¹_}‰¼Yëž?¥ˆÿ	ƒMÛÄ3ÃõÅ@Ës*ˆ¬ä"�2Æ;�ØÿÔ‰/Å‘ž²_·•®l+5»¤ š•z
^µÞ)ðùø/´Û ]£ÑáÌÚ|ý*Z¢µ+-q_�ßb[ù] —Å0p%%Œ%xîJ÷Ê•!YëÒ**Η™ßÓx4-´Såh^.¬œë‘QÜéüÅÐ`¼—â�àÏWì+xd›íÝ0þ¥^c‘¹‹å�
Hê>5‚¹#x¼¶�jÛÂH)|Fˆ7ÞÛSŸ# Só^v8'H¼ðÇ9Ó� ­A‡€N£­XÎ} ¯šîÏ`‰ÒEð¡£-.9ª«.Ý#•×@_ä}$‰ï–ÈsÎ�Ì7U<ÅèѤYròÜau/…eZ|	„a©
ñî-ué6ú'nñ%eÏÔϲ(ñÀ}õK»ü±¬Ž�P�	ËXÕL„p)
4&û‡>–RÖ6ôˆ\Ü{ž�6Ÿc1Êõ¡ëÌÕ›U�ÂÈZne4@«�[k‘KW&�É×äôß‚ïy3Ô>�x‘]‰G€“©¸Ÿ6±‹µ�²%¨ÛÞÉÝÞVñí�\’�NF±k>¥\~Á– ŒdÃi“ËqÑ'GñÂE/V£Ÿ”žé?ëÇJÏœêF�ROÿÄ1sëN3‰Ñ|?§²a²ªþnñú Ü"p˜“ìˆ`ªF;+Q4€FûïÄÔSÜœK76×bU³6—³„ò.ØZácrÍæônÅWjŠ#×ÚOŠ§{¤¢~¢O¿Âk¾3Ö&툴uVq5–ïK­l(Ò˜ò–ÀÌ<XVû‘š EÙŠTë:»pÛ¹UªDZñ”,Ô—¬NE‚Ë%´V œY*LìíƒéC0>%˜.
çäïtj‰ùX®óä)a–nÚ[}&¶h,/¼z š(äfZ3`©,¬Øwrà�¬²õ�rñ$qlçžÿ¦|¨—zä'lëÊ�ŸÜÜ`ñ ln¾-!vn^ïëÄ¢p¢x~–ã®™òì,G7	>’Õ×bàÆäB}›Ã¬A¿Z®¦¶‹3ð3/_‰é¿LöåËèâÿ<®Çõ¸×ãz\�ëq=®Çõ¸×ãz\�ëq=®Çõ¸×ãz\�ëq=®ÇuúõmÎL¸

--gijs1026984167--



From ariadne-cvs@muze.nl  Thu Jul 18 10:28:07 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Thu, 18 Jul 2002 09:28:07 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject help.about.phtml
Message-ID: <cvsgijs1026984487@cvsserver>

gijs		Thu Jul 18 11:28:07 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	help.about.phtml 
  Log:
  Updated version number
  
  
Index: ariadne/lib/templates/pobject/help.about.phtml
diff -u ariadne/lib/templates/pobject/help.about.phtml:1.9 ariadne/lib/templates/pobject/help.about.phtml:1.10
--- ariadne/lib/templates/pobject/help.about.phtml:1.9	Fri Apr 26 17:27:18 2002
+++ ariadne/lib/templates/pobject/help.about.phtml	Thu Jul 18 11:28:06 2002
@@ -46,8 +46,8 @@
      <table width="250" height="125">
      <tr>
        <td style="border: 2px inset; padding: 5px;" valign="top">
-         version 2.0<br>
-         April 26, 2002<br>
+         version 2.1 RC1<br>
+         July 28, 2002<br>
        </td>
      </tr><tr>
        <td align="right">




From ariadne-cvs@muze.nl  Mon Jul 22 10:54:25 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 22 Jul 2002 09:54:25 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject edit.object.layout.phtml
Message-ID: <cvsgijs1027331665@cvsserver>

gijs		Mon Jul 22 11:54:25 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	edit.object.layout.phtml 
  Log:
  Added type-icons per template (patch supplied by Giannis Tsagatakis).
  
  
Index: ariadne/lib/templates/pobject/edit.object.layout.phtml
diff -u ariadne/lib/templates/pobject/edit.object.layout.phtml:1.9 ariadne/lib/templates/pobject/edit.object.layout.phtml:1.10
--- ariadne/lib/templates/pobject/edit.object.layout.phtml:1.9	Wed Apr 17 14:45:10 2002
+++ ariadne/lib/templates/pobject/edit.object.layout.phtml	Mon Jul 22 11:54:25 2002
@@ -18,7 +18,7 @@
 ?>
 <html>
 <head>
-<title><?php echo $ARnls["templates"]; ?></title>
+<title><?php echo $ARnls["templates"] . ' ' . $this->path; ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo $AR->dir->styles; ?>form.css">
 <style>
 	.required {
@@ -31,6 +31,7 @@
 		width: 100%;
 	}
 	td.type {
+		width: 22px;
 		padding-left: 2px;
 	}
 	a.button {
@@ -63,7 +64,7 @@
 	<div style="height: 100%; overflow: auto; margin: 0px; border: 0px;">
 		<table border="0" bgcolor="white" width="100%" cellspacing="0" cellpadding="0">
 		<tr>
-			<td valign="top" class="required">
+			<td valign="top" class="required" colspan="2">
 				<div><?php echo $ARnls["type"]; ?></div>
 			</td><td valign="top" colspan="2" class="required">
 				<div><?php echo $ARnls["template"]; ?></div>
@@ -75,8 +76,11 @@
 				$currcol=0;
 				while (list($type, $values)=each($data->pinp)) {
 					while (list($function, $templatelist)=each($values)) {	
-						?><tr class="row<?php echo $currcol; ?>">
-							<td class="type"><?php echo $type; ?>&nbsp;</td>
+						?><tr valign="middle" class="row<?php echo $currcol; ?>">
+							<td class="type">
+								<img src="<?php echo $AR->dir->images. "icons/$type.gif"; ?>">
+							</td><td align="left">
+								<?php echo $type; ?>&nbsp;</td>
 							<td align="center"><?php 
 								if (!$data->templates[$type][$function]) {
 									echo "<img src='{$AR->dir->images}local.gif' alt='local' height='12' width='11'>";	
@@ -114,4 +118,4 @@
 </body>
 <?php
 	}
-?>
\ No newline at end of file
+?>




From ariadne-cvs@muze.nl  Mon Jul 22 11:06:32 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 22 Jul 2002 10:06:32 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject system.new.phtml
Message-ID: <cvsgijs1027332392@cvsserver>

gijs		Mon Jul 22 12:06:32 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	system.new.phtml 
  Log:
  generate $parent instead of taking the 'runtime' parent's path.
  
  
Index: ariadne/lib/templates/pobject/system.new.phtml
diff -u ariadne/lib/templates/pobject/system.new.phtml:1.6 ariadne/lib/templates/pobject/system.new.phtml:1.7
--- ariadne/lib/templates/pobject/system.new.phtml:1.6	Mon May 27 09:37:58 2002
+++ ariadne/lib/templates/pobject/system.new.phtml	Mon Jul 22 12:06:32 2002
@@ -15,7 +15,8 @@
 		$arNewFilename=$this->getdata("arNewFilename","none");
 		$arNewData=new object;
 		$arNewPath=$this->make_path($arNewFilename);
-		$arNewCallObject=$this->store->newobject($arNewPath, $this->path, $arNewType, $arNewData);
+		$arNewParent=$this->store->make_path($arNewFilename, "..");
+		$arNewCallObject=$this->store->newobject($arNewPath, $arNewParent, $arNewType, $arNewData);
 		$arNewCallObject->arIsNewObject=true;
 
 		$arNewCallObject->call("system.save.data.phtml", $arCallArgs);




From ariadne-cvs@muze.nl  Mon Jul 22 11:06:51 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 22 Jul 2002 10:06:51 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject browse.nav.list.show.phtml
Message-ID: <cvsgijs1027332411@cvsserver>

gijs		Mon Jul 22 12:06:51 2002 EDT

  Modified files:              
    /ariadne/lib/templates/pobject	browse.nav.list.show.phtml 
  Log:
  Added utf8 fixes by Giannis
  
  
Index: ariadne/lib/templates/pobject/browse.nav.list.show.phtml
diff -u ariadne/lib/templates/pobject/browse.nav.list.show.phtml:1.8 ariadne/lib/templates/pobject/browse.nav.list.show.phtml:1.9
--- ariadne/lib/templates/pobject/browse.nav.list.show.phtml:1.8	Thu Mar  7 10:37:21 2002
+++ ariadne/lib/templates/pobject/browse.nav.list.show.phtml	Mon Jul 22 12:06:51 2002
@@ -14,6 +14,8 @@
 
 	******************************************************************/
 
+	require_once($this->store->code."modules/mod_unicode.php");
+
 	if (!$arLanguage) {
 		$arLanguage=$nls;
 	}
@@ -25,8 +27,14 @@
 	href="javascript:top.View('<?php echo $this->path; ?>');"><img 
 	width="20" height="20" src="<?php echo $AR->dir->images; ?>icons/<?php echo $this->type; ?>.gif" 
 	alt="<?php echo $this->path; ?>" border="0"> <?php
-		if (strlen($nlsdata->name)>32) {
-			$name=substr($nlsdata->name,0, 32)."...";
+		$nlsname = unicode::utf8convert($nlsdata->name); 
+		if(substr($nlsname,0,1) == '&') {
+				$charbytes=6;
+		} else {
+				$charbytes=1;
+		}
+		if (strlen($nlsname)>(32*$charbytes) ) {
+			$name=substr($nlsname,0, 32*$charbytes)."...";
 		} else {
 			$name=$nlsdata->name;
 		}




From ariadne-cvs@muze.nl  Tue Jul 23 11:09:30 2002
From: ariadne-cvs@muze.nl (auke)
Date: Tue, 23 Jul 2002 10:09:30 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/widgets/htmledit/ie edit.php
Message-ID: <cvsauke1027418970@cvsserver>

This is a MIME encoded message

--auke1027418970
Content-Type: text/plain

auke		Tue Jul 23 12:09:30 2002 EDT

  Modified files:              
    /ariadne/lib/widgets/htmledit/ie	edit.php 
  Log:
  fixed selections: toolbar is now unselectable, so the cursor stays put when
  clicking on the toolbar.
  
  
--auke1027418970
Content-Type: text/plain
Content-Disposition: attachment; filename="auke-20020723120930.txt"

Index: ariadne/lib/widgets/htmledit/ie/edit.php
diff -u ariadne/lib/widgets/htmledit/ie/edit.php:1.27 ariadne/lib/widgets/htmledit/ie/edit.php:1.28
--- ariadne/lib/widgets/htmledit/ie/edit.php:1.27	Wed Jul 17 12:21:16 2002
+++ ariadne/lib/widgets/htmledit/ie/edit.php	Tue Jul 23 12:09:30 2002
@@ -989,191 +989,191 @@
 //-->
 </SCRIPT>
 </head>
-<body LANGUAGE="javascript" onload="return window_onload()">
+<body LANGUAGE="javascript" onload="return window_onload()" unselectable='on'>
 
 <!-- Toolbars -->
-<div class="tbToolbar" ID="MenuBar">
-  <div class="tbMenu" ID="FILE">
+<div unselectable='on' class="tbToolbar" ID="MenuBar">
+  <div unselectable='on' class="tbMenu" ID="FILE">
     File
-    <div class="tbMenuItem" ID="FILE_SAVE" LANGUAGE="javascript" onclick="return MENU_FILE_SAVE_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FILE_SAVE" LANGUAGE="javascript" onclick="return MENU_FILE_SAVE_onclick()">
       Save File
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/save.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/save.gif" WIDTH="23" HEIGHT="22">
     </div>
   </div> 
   
-  <div class="tbMenu" ID="EDIT" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusEditMenu, EDIT)">
+  <div unselectable='on' class="tbMenu" ID="EDIT" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusEditMenu, EDIT)">
     Edit
-    <div class="tbMenuItem" ID="EDIT_UNDO" LANGUAGE="javascript" onclick="return DECMD_UNDO_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_UNDO" LANGUAGE="javascript" onclick="return DECMD_UNDO_onclick()">
       Undo
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/undo.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/undo.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="EDIT_REDO" LANGUAGE="javascript" onclick="return DECMD_REDO_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_REDO" LANGUAGE="javascript" onclick="return DECMD_REDO_onclick()">
       Redo
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/redo.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/redo.gif" WIDTH="23" HEIGHT="22">
     </div>
 
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="EDIT_CUT" LANGUAGE="javascript" onclick="return DECMD_CUT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_CUT" LANGUAGE="javascript" onclick="return DECMD_CUT_onclick()">
       Cut
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/cut.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/cut.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="EDIT_COPY" LANGUAGE="javascript" onclick="return DECMD_COPY_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_COPY" LANGUAGE="javascript" onclick="return DECMD_COPY_onclick()">
       Copy
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/copy.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/copy.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="EDIT_PASTE" LANGUAGE="javascript" onclick="return DECMD_PASTE_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_PASTE" LANGUAGE="javascript" onclick="return DECMD_PASTE_onclick()">
       Paste
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/paste.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/paste.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="EDIT_DELETE" LANGUAGE="javascript" onclick="return DECMD_DELETE_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_DELETE" LANGUAGE="javascript" onclick="return DECMD_DELETE_onclick()">
       Delete
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delete.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delete.gif" WIDTH="23" HEIGHT="22">
     </div>
 
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
     
-    <div class="tbMenuItem" ID="EDIT_SELECTALL" LANGUAGE="javascript" onclick="return DECMD_SELECTALL_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_SELECTALL" LANGUAGE="javascript" onclick="return DECMD_SELECTALL_onclick()">
       Select All
     </div>
 
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="EDIT_FINDTEXT" TITLE="Find" LANGUAGE="javascript" onclick="return DECMD_FINDTEXT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="EDIT_FINDTEXT" TITLE="Find" LANGUAGE="javascript" onclick="return DECMD_FINDTEXT_onclick()">
       Find...
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/find.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/find.gif" WIDTH="23" HEIGHT="22">
     </div>
   </div>
   
-  <div class="tbMenu" ID="VIEW">
+  <div unselectable='on' class="tbMenu" ID="VIEW">
     View
-    <div class="tbSubmenu" TBTYPE="toggle" ID="VIEW_TOOLBARS">
+    <div unselectable='on' class="tbSubmenu" TBTYPE="toggle" ID="VIEW_TOOLBARS">
       Toolbars
-      <div class="tbMenuItem" id="ToolbarMenuStd" TBTYPE="toggle" TBSTATE="checked" ID="TOOLBARS_STANDARD" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(StandardToolbar, ToolbarMenuStd)">
+      <div unselectable='on' class="tbMenuItem" id="ToolbarMenuStd" TBTYPE="toggle" TBSTATE="checked" ID="TOOLBARS_STANDARD" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(StandardToolbar, ToolbarMenuStd)">
         Standard
       </div>
-      <div class="tbMenuItem" id="ToolbarMenuFmt" TBTYPE="toggle" TBSTATE="checked" ID="TOOLBARS_FORMAT" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(FormatToolbar, ToolbarMenuFmt)">
+      <div unselectable='on' class="tbMenuItem" id="ToolbarMenuFmt" TBTYPE="toggle" TBSTATE="checked" ID="TOOLBARS_FORMAT" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(FormatToolbar, ToolbarMenuFmt)">
         Formatting
       </div>
-      <div class="tbMenuItem" id="ToolbarMenuAbs" TBTYPE="toggle" TBSTATE="unchecked" ID="TOOLBARS_ZORDER" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(AbsolutePositioningToolbar, ToolbarMenuAbs)">
+      <div unselectable='on' class="tbMenuItem" id="ToolbarMenuAbs" TBTYPE="toggle" TBSTATE="unchecked" ID="TOOLBARS_ZORDER" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(AbsolutePositioningToolbar, ToolbarMenuAbs)">
         Absolute Positioning
       </div>
-      <div class="tbMenuItem" id="ToolbarMenuTable" TBTYPE="toggle" TBSTATE="unchecked" ID="TOOLBARS_TABLE" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(TableToolbar, ToolbarMenuTable)">
+      <div unselectable='on' class="tbMenuItem" id="ToolbarMenuTable" TBTYPE="toggle" TBSTATE="unchecked" ID="TOOLBARS_TABLE" TBTYPE="toggle" LANGUAGE="javascript" onclick="return TOOLBARS_onclick(TableToolbar, ToolbarMenuTable)">
         Table
       </div>
     </div>
 
-     <div class="tbSeparator"></div>
+     <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" id="ViewHTML" TBTYPE="toggle" TBSTATE="checked" ID="VIEW_HTML" TBTYPE="toggle" LANGUAGE="javascript" onclick="return VIEW_HTML_onclick()">
+    <div unselectable='on' class="tbMenuItem" id="ViewHTML" TBTYPE="toggle" TBSTATE="checked" ID="VIEW_HTML" TBTYPE="toggle" LANGUAGE="javascript" onclick="return VIEW_HTML_onclick()">
       WYSIWYG
     </div>
   </div> 
   
 <!--
-  <div class="tbMenu" ID="FORMAT" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusFormatMenu, FORMAT)">
+  <div unselectable='on' class="tbMenu" ID="FORMAT" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusFormatMenu, FORMAT)">
     Format
-    <div class="tbMenuItem" ID="FORMAT_FONT" LANGUAGE="javascript" onclick="return FORMAT_FONT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_FONT" LANGUAGE="javascript" onclick="return FORMAT_FONT_onclick()">
       Font...
     </div>
   
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="FORMAT_BOLD" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_BOLD_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_BOLD" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_BOLD_onclick()">
       Bold 
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bold.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bold.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="FORMAT_ITALIC" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ITALIC_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_ITALIC" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ITALIC_onclick()">
       Italic
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/italic.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/italic.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="FORMAT_UNDERLINE" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNDERLINE_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_UNDERLINE" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNDERLINE_onclick()">
       Underline
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/under.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/under.gif" WIDTH="23" HEIGHT="22">
     </div>
   
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="FORMAT_SETFORECOLOR" LANGUAGE="javascript" onclick="return DECMD_SETFORECOLOR_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_SETFORECOLOR" LANGUAGE="javascript" onclick="return DECMD_SETFORECOLOR_onclick()">
       Set Foreground Color...
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/fgcolor.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/fgcolor.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="FORMAT_SETBACKCOLOR" LANGUAGE="javascript" onclick="return DECMD_SETBACKCOLOR_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_SETBACKCOLOR" LANGUAGE="javascript" onclick="return DECMD_SETBACKCOLOR_onclick()">
       Set Background Color...
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bgcolor.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bgcolor.gif" WIDTH="23" HEIGHT="22">
     </div>
   
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="FORMAT_JUSTIFYLEFT" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYLEFT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_JUSTIFYLEFT" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYLEFT_onclick()">
       Align Left
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/left.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/left.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="FORMAT_JUSTIFYCENTER" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYCENTER_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_JUSTIFYCENTER" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYCENTER_onclick()">
       Center
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/center.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/center.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="FORMAT_JUSTIFYRIGHT" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYRIGHT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="FORMAT_JUSTIFYRIGHT" TBTYPE="radio" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYRIGHT_onclick()">
       Align Right
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/right.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/right.gif" WIDTH="23" HEIGHT="22">
     </div> 
   </div>   
   
-  <div class="tbMenu" ID="HTML" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusHTMLMenu, HTML)">
+  <div unselectable='on' class="tbMenu" ID="HTML" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusHTMLMenu, HTML)">
     HTML
-    <div class="tbMenuItem" ID="HTML_HYPERLINK" LANGUAGE="javascript" onclick="return DECMD_HYPERLINK_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="HTML_HYPERLINK" LANGUAGE="javascript" onclick="return DECMD_HYPERLINK_onclick()">
       Link...
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/link.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/link.gif" WIDTH="23" HEIGHT="22">
     </div>
-    <div class="tbMenuItem" ID="HTML_IMAGE" LANGUAGE="javascript" onclick="return DECMD_IMAGE_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="HTML_IMAGE" LANGUAGE="javascript" onclick="return DECMD_IMAGE_onclick()">
       Image...
-      <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/image.gif" WIDTH="23" HEIGHT="22">
+      <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/image.gif" WIDTH="23" HEIGHT="22">
     </div>
 
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbSubmenu" ID="HTML_INTRINSICS">
+    <div unselectable='on' class="tbSubmenu" ID="HTML_INTRINSICS">
       Intrinsics
-      <div class="tbMenuItem" ID="INTRINSICS_TEXTBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=text&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_TEXTBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=text&gt;')">
         Textbox
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_PASSWRD" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=password&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_PASSWRD" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=password&gt;')">
         Password
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_FILE" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=file&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_FILE" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=file&gt;')">
         File Field
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_TEXTAREA" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;TEXTAREA rows=2 cols=20&gt;&lt;/TEXTAREA&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_TEXTAREA" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;TEXTAREA rows=2 cols=20&gt;&lt;/TEXTAREA&gt;')">
         Text Area
       </div>
 
-      <div class="tbSeparator"></div>
+      <div unselectable='on' class="tbSeparator"></div>
 
-      <div class="tbMenuItem" ID="INTRINSICS_CHECKBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=checkbox&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_CHECKBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=checkbox&gt;')">
         Checkbox
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_RADIO" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=radio&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_RADIO" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=radio&gt;')">
         Radio Button
       </div>
  
-      <div class="tbSeparator"></div>
+      <div unselectable='on' class="tbSeparator"></div>
 
-      <div class="tbMenuItem" ID="INTRINSICS_DROPDOWN" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;SELECT&gt;&lt;/SELECT&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_DROPDOWN" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;SELECT&gt;&lt;/SELECT&gt;')">
         Dropdown
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_LISTBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;SELECT size=2&gt;&lt;/SELECT&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_LISTBOX" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;SELECT size=2&gt;&lt;/SELECT&gt;')">
         Listbox
       </div>
  
-      <div class="tbSeparator"></div>
+      <div unselectable='on' class="tbSeparator"></div>
 
-      <div class="tbMenuItem" ID="INTRINSICS_BUTTON" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=button value=Button&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_BUTTON" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=button value=Button&gt;')">
         Button
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_SUBMIT" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=submit value=Submit&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_SUBMIT" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=submit value=Submit&gt;')">
         Submit Button
       </div>
-      <div class="tbMenuItem" ID="INTRINSICS_RESET" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=reset value=Reset&gt;')">
+      <div unselectable='on' class="tbMenuItem" ID="INTRINSICS_RESET" LANGUAGE="javascript" onclick="return INTRINSICS_onclick('&lt;INPUT type=reset value=Reset&gt;')">
         Reset Button
       </div>
     </div>
@@ -1181,40 +1181,40 @@
 -->
 </div>
 
-<div class="tbToolbar" ID="StandardToolbar">
-  <div class="tbButton" ID="MENU_FILE_SAVE" TITLE="Save File" LANGUAGE="javascript" onclick="return MENU_FILE_SAVE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/save.gif" WIDTH="23" HEIGHT="22">
+<div unselectable='on' class="tbToolbar" ID="StandardToolbar">
+  <div unselectable='on' class="tbButton" ID="MENU_FILE_SAVE" TITLE="Save File" LANGUAGE="javascript" onclick="return MENU_FILE_SAVE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/save.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_CUT" TITLE="Cut" LANGUAGE="javascript" onclick="return DECMD_CUT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/cut.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_CUT" TITLE="Cut" LANGUAGE="javascript" onclick="return DECMD_CUT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/cut.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_COPY" TITLE="Copy" LANGUAGE="javascript" onclick="return DECMD_COPY_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/copy.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_COPY" TITLE="Copy" LANGUAGE="javascript" onclick="return DECMD_COPY_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/copy.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_PASTE" TITLE="Paste" LANGUAGE="javascript" onclick="return DECMD_PASTE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/paste.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_PASTE" TITLE="Paste" LANGUAGE="javascript" onclick="return DECMD_PASTE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/paste.gif" WIDTH="23" HEIGHT="22">
   </div>
 
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_UNDO" TITLE="Undo" LANGUAGE="javascript" onclick="return DECMD_UNDO_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/undo.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_UNDO" TITLE="Undo" LANGUAGE="javascript" onclick="return DECMD_UNDO_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/undo.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_REDO" TITLE="Redo" LANGUAGE="javascript" onclick="return DECMD_REDO_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/redo.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_REDO" TITLE="Redo" LANGUAGE="javascript" onclick="return DECMD_REDO_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/redo.gif" WIDTH="23" HEIGHT="22">
   </div>
 
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_FINDTEXT" TITLE="Find" LANGUAGE="javascript" onclick="return DECMD_FINDTEXT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/find.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_FINDTEXT" TITLE="Find" LANGUAGE="javascript" onclick="return DECMD_FINDTEXT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/find.gif" WIDTH="23" HEIGHT="22">
   </div>
 </div>
 
-<div class="tbToolbar" ID="FormatToolbar">
+<div unselectable='on' class="tbToolbar" ID="FormatToolbar">
   <select ID="ParagraphStyle" class="tbGeneral" style="width:90" TITLE="Paragraph Format" LANGUAGE="javascript" onchange="return ParagraphStyle_onchange()">
   </select>
   <select ID="FontName" class="tbGeneral" style="width:140" TITLE="Font Name" LANGUAGE="javascript" onchange="return FontName_onchange()">
@@ -1234,158 +1234,158 @@
     <option value="7">7
   </select>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_BOLD" TITLE="Bold" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_BOLD_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bold.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_BOLD" TITLE="Bold" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_BOLD_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bold.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_ITALIC" TITLE="Italic" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ITALIC_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/italic.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_ITALIC" TITLE="Italic" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ITALIC_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/italic.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_UNDERLINE" TITLE="Underline" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNDERLINE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/under.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_UNDERLINE" TITLE="Underline" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNDERLINE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/under.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_SETFORECOLOR" TITLE="Foreground Color" LANGUAGE="javascript" onclick="return DECMD_SETFORECOLOR_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/fgcolor.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_SETFORECOLOR" TITLE="Foreground Color" LANGUAGE="javascript" onclick="return DECMD_SETFORECOLOR_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/fgcolor.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_SETBACKCOLOR" TITLE="Background Color" LANGUAGE="javascript" onclick="return DECMD_SETBACKCOLOR_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bgcolor.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_SETBACKCOLOR" TITLE="Background Color" LANGUAGE="javascript" onclick="return DECMD_SETBACKCOLOR_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bgcolor.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_JUSTIFYLEFT" TITLE="Align Left" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYLEFT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/left.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_JUSTIFYLEFT" TITLE="Align Left" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYLEFT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/left.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_JUSTIFYCENTER" TITLE="Center" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYCENTER_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/center.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_JUSTIFYCENTER" TITLE="Center" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYCENTER_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/center.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_JUSTIFYRIGHT" TITLE="Align Right" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYRIGHT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/right.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_JUSTIFYRIGHT" TITLE="Align Right" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYRIGHT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/right.gif" WIDTH="23" HEIGHT="22">
   </div>
 
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_ORDERLIST" TITLE="Numbered List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ORDERLIST_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/numlist.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_ORDERLIST" TITLE="Numbered List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ORDERLIST_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/numlist.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_UNORDERLIST" TITLE="Bulletted List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNORDERLIST_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bullist.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_UNORDERLIST" TITLE="Bulletted List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNORDERLIST_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bullist.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_OUTDENT" TITLE="Decrease Indent" LANGUAGE="javascript" onclick="return DECMD_OUTDENT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/deindent.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_OUTDENT" TITLE="Decrease Indent" LANGUAGE="javascript" onclick="return DECMD_OUTDENT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/deindent.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_INDENT" TITLE="Increase Indent" LANGUAGE="javascript" onclick="return DECMD_INDENT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inindent.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_INDENT" TITLE="Increase Indent" LANGUAGE="javascript" onclick="return DECMD_INDENT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inindent.gif" WIDTH="23" HEIGHT="22">
   </div>
 
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_HYPERLINK" TITLE="Link" LANGUAGE="javascript" onclick="return DECMD_HYPERLINK_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/link.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_HYPERLINK" TITLE="Link" LANGUAGE="javascript" onclick="return DECMD_HYPERLINK_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/link.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_IMAGE" TITLE="Insert Image" LANGUAGE="javascript" onclick="return DECMD_IMAGE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/image.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_IMAGE" TITLE="Insert Image" LANGUAGE="javascript" onclick="return DECMD_IMAGE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/image.gif" WIDTH="23" HEIGHT="22">
   </div>
 </div>
 
 
-<div class="tbToolbar" ID="AbsolutePositioningToolbar" TBSTATE="hidden">
-  <div class="tbButton" ID="DECMD_VISIBLEBORDERS" TITLE="Visible Borders" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_VISIBLEBORDERS_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/borders.gif" WIDTH="23" HEIGHT="22">
+<div unselectable='on' class="tbToolbar" ID="AbsolutePositioningToolbar" TBSTATE="hidden">
+  <div unselectable='on' class="tbButton" ID="DECMD_VISIBLEBORDERS" TITLE="Visible Borders" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_VISIBLEBORDERS_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/borders.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_SHOWDETAILS" TITLE="Show Details" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_SHOWDETAILS_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/details.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_SHOWDETAILS" TITLE="Show Details" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_SHOWDETAILS_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/details.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_MAKE_ABSOLUTE" TBTYPE="toggle" LANGUAGE="javascript" TITLE="Make Absolute" onclick="return DECMD_MAKE_ABSOLUTE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/abspos.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_MAKE_ABSOLUTE" TBTYPE="toggle" LANGUAGE="javascript" TITLE="Make Absolute" onclick="return DECMD_MAKE_ABSOLUTE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/abspos.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_LOCK_ELEMENT" TBTYPE="toggle" LANGUAGE="javascript" TITLE="Lock" onclick="return DECMD_LOCK_ELEMENT_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/lock.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_LOCK_ELEMENT" TBTYPE="toggle" LANGUAGE="javascript" TITLE="Lock" onclick="return DECMD_LOCK_ELEMENT_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/lock.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
   
-  <div class="tbMenu" ID="ZORDER" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusZOrderMenu, ZORDER)">
+  <div unselectable='on' class="tbMenu" ID="ZORDER" LANGUAGE="javascript" tbOnMenuShow="return OnMenuShow(QueryStatusZOrderMenu, ZORDER)">
   Z Order
-    <div class="tbMenuItem" ID="ZORDER_BRINGFRONT" LANGUAGE="javascript" onclick="return ZORDER_BRINGFRONT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_BRINGFRONT" LANGUAGE="javascript" onclick="return ZORDER_BRINGFRONT_onclick()">
       Bring to Front
     </div>
-    <div class="tbMenuItem" ID="ZORDER_SENDBACK" LANGUAGE="javascript" onclick="return ZORDER_SENDBACK_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_SENDBACK" LANGUAGE="javascript" onclick="return ZORDER_SENDBACK_onclick()">
       Send to Back
     </div>
  
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="ZORDER_BRINGFORWARD" LANGUAGE="javascript" onclick="return ZORDER_BRINGFORWARD_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_BRINGFORWARD" LANGUAGE="javascript" onclick="return ZORDER_BRINGFORWARD_onclick()">
       Bring Forward
     </div>
-    <div class="tbMenuItem" ID="ZORDER_SENDBACKWARD" LANGUAGE="javascript" onclick="return ZORDER_SENDBACKWARD_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_SENDBACKWARD" LANGUAGE="javascript" onclick="return ZORDER_SENDBACKWARD_onclick()">
       Send Backward
     </div>
  
-    <div class="tbSeparator"></div>
+    <div unselectable='on' class="tbSeparator"></div>
 
-    <div class="tbMenuItem" ID="ZORDER_BELOWTEXT" LANGUAGE="javascript" onclick="return ZORDER_BELOWTEXT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_BELOWTEXT" LANGUAGE="javascript" onclick="return ZORDER_BELOWTEXT_onclick()">
       Below Text
     </div>
-    <div class="tbMenuItem" ID="ZORDER_ABOVETEXT" LANGUAGE="javascript" onclick="return ZORDER_ABOVETEXT_onclick()">
+    <div unselectable='on' class="tbMenuItem" ID="ZORDER_ABOVETEXT" LANGUAGE="javascript" onclick="return ZORDER_ABOVETEXT_onclick()">
       Above Text
     </div>
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
   
-  <div class="tbButton" ID="DECMD_SNAPTOGRID" TITLE="Snap to Grid" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_SNAPTOGRID_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/snapgrid.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_SNAPTOGRID" TITLE="Snap to Grid" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_SNAPTOGRID_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/snapgrid.gif" WIDTH="23" HEIGHT="22">
   </div>
 </div>
 
-<div class="tbToolbar" ID="TableToolbar" TBSTATE="hidden">
-  <div class="tbButton" ID="DECMD_INSERTTABLE" TITLE="Insert Table" LANGUAGE="javascript" onclick="return TABLE_INSERTTABLE_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/instable.gif" WIDTH="23" HEIGHT="22">
+<div unselectable='on' class="tbToolbar" ID="TableToolbar" TBSTATE="hidden">
+  <div unselectable='on' class="tbButton" ID="DECMD_INSERTTABLE" TITLE="Insert Table" LANGUAGE="javascript" onclick="return TABLE_INSERTTABLE_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/instable.gif" WIDTH="23" HEIGHT="22">
   </div>
 
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_INSERTROW" TITLE="Insert Row" LANGUAGE="javascript" onclick="return TABLE_INSERTROW_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/insrow.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_INSERTROW" TITLE="Insert Row" LANGUAGE="javascript" onclick="return TABLE_INSERTROW_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/insrow.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_DELETEROWS" TITLE="Delete Rows" LANGUAGE="javascript" onclick="return TABLE_DELETEROW_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delrow.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_DELETEROWS" TITLE="Delete Rows" LANGUAGE="javascript" onclick="return TABLE_DELETEROW_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delrow.gif" WIDTH="23" HEIGHT="22">
   </div>
  
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_INSERTCOL" TITLE="Insert Column" LANGUAGE="javascript" onclick="return TABLE_INSERTCOL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inscol.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_INSERTCOL" TITLE="Insert Column" LANGUAGE="javascript" onclick="return TABLE_INSERTCOL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inscol.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_DELETECOLS" TITLE="Delete Columns" LANGUAGE="javascript" onclick="return TABLE_DELETECOL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delcol.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_DELETECOLS" TITLE="Delete Columns" LANGUAGE="javascript" onclick="return TABLE_DELETECOL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delcol.gif" WIDTH="23" HEIGHT="22">
   </div>
   
-  <div class="tbSeparator"></div>
+  <div unselectable='on' class="tbSeparator"></div>
 
-  <div class="tbButton" ID="DECMD_INSERTCELL" TITLE="Insert Cell" LANGUAGE="javascript" onclick="return TABLE_INSERTCELL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inscell.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_INSERTCELL" TITLE="Insert Cell" LANGUAGE="javascript" onclick="return TABLE_INSERTCELL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inscell.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_DELETECELLS" TITLE="Delete Cells" LANGUAGE="javascript" onclick="return TABLE_DELETECELL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delcell.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_DELETECELLS" TITLE="Delete Cells" LANGUAGE="javascript" onclick="return TABLE_DELETECELL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/delcell.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_MERGECELLS" TITLE="Merge Cells" LANGUAGE="javascript" onclick="return TABLE_MERGECELL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/mrgcell.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_MERGECELLS" TITLE="Merge Cells" LANGUAGE="javascript" onclick="return TABLE_MERGECELL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/mrgcell.gif" WIDTH="23" HEIGHT="22">
   </div>
-  <div class="tbButton" ID="DECMD_SPLITCELL" TITLE="Split Cells" LANGUAGE="javascript" onclick="return TABLE_SPLITCELL_onclick()">
-    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/spltcell.gif" WIDTH="23" HEIGHT="22">
+  <div unselectable='on' class="tbButton" ID="DECMD_SPLITCELL" TITLE="Split Cells" LANGUAGE="javascript" onclick="return TABLE_SPLITCELL_onclick()">
+    <img unselectable='on' class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/spltcell.gif" WIDTH="23" HEIGHT="22">
   </div>
 </div>
 

--auke1027418970--



From ariadne-cvs@muze.nl  Wed Jul 24 13:07:44 2002
From: ariadne-cvs@muze.nl (auke)
Date: Wed, 24 Jul 2002 12:07:44 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/widgets/htmledit toolbar.php
Message-ID: <cvsauke1027512464@cvsserver>

This is a MIME encoded message

--auke1027512464
Content-Type: text/plain

auke		Wed Jul 24 14:07:44 2002 EDT

  Added files:                 
    /ariadne/lib/widgets/htmledit	toolbar.php 
  Log:
  new edit widget: displays a toolbar above the user.edit.page.html template.
  This template may contain contentEditable regions, on which the toolbar edit
  commands have effect.
  
  
--auke1027512464
Content-Type: text/plain
Content-Disposition: attachment; filename="auke-20020724140744.txt"


Index: ariadne/lib/widgets/htmledit/toolbar.php
+++ ariadne/lib/widgets/htmledit/toolbar.php
<!-- Copyright 2000 Microsoft Corporation. All rights reserved. -->
<!-- Author: Steve Isaac, Microsoft Corporation -->
<!--This demo shows how to host the DHTML Editing component on a Web page. -->
<!-- 2002, Muze: extensive changes to use the toolbar on contentEditable content --> 
<html>
<head>
<META content="text/html; charset=UTF-8" http-equiv=Content-Type>
<title>Edit <?php echo $path.$file; ?></title>

<!-- Styles -->
<link REL="stylesheet" TYPE="text/css" HREF="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/Toolbars/toolbars.css">

<!-- Script Functions and Event Handlers -->
<script LANGUAGE="JavaScript" SRC="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/Inc/dhtmled.js">
</script>

<script LANGUAGE="JavaScript" SRC="<?php echo $AR->host.$AR->dir->www; ?>widgets/compose/compose.js">
</script>

<script ID="clientEventHandlersJS" LANGUAGE="javascript">
<!--
//
// Constants
//
var MENU_SEPARATOR = ""; // Context menu separator

//
// Globals
//

var docComplete = false;
var initialDocComplete = false;

var QueryStatusToolbarButtons = new Array();
var ContextMenu = new Array();
var GeneralContextMenu = new Array();

//
// Utility functions
//

// Constructor for custom object that represents an item on the context menu
function ContextMenuItem(string, cmdId) {
  this.string = string;
  this.cmdId = cmdId;
}

// Constructor for custom object that represents a QueryStatus command and 
// corresponding toolbar element.
function QueryStatusItem(command, element) {
  this.command = command;
  this.element = element;
}

function setSelection(dir) {
  var tr=document.body.createTextRange();
  tr.collapse(dir);
  tr.select();
  KeepState.SaveSelection();
}

function setFormat(command, value) {
  var sel=KeepState.GetSelection();
  var type=sel.type;
  var target = (type == "None" ? tbContentElement.document : sel)
  target.execCommand(command, false, value);
  KeepState.RestoreSelection();
  return true;
}

function getBlock(el) {
  var BlockElements="|H1|H2|H3|H4|H5|H6|P|PRE|LI|TD|DIV|BLOCKQUOTE|DT|DD|TABLE|HR|IMG|";
  while ((el!=null) && (BlockElements.indexOf("|"+el.tagName+"|")==-1)) {
    el=el.parentElement;
  }
  return el;
}


//
// KeepState object

function StateObject() {
  this.name='KeepState';
  this.selection=null;
  this.GetSelection=state_getSelection;
  this.SaveSelection=state_saveSelection;
  this.RestoreSelection=state_restoreSelection;
}


function state_getSelection() {
  var sel=this.selection;
  if (!sel) {
    sel=tbContentElement.document.selection.createRange();
    sel.type=tbContentElement.document.selection.type;
  }
  return sel;
}

function state_saveSelection() {
  this.selection=tbContentElement.document.selection.createRange();
  if (!this.selection || (this.selection.parentElement && this.selection.parentElement() && 
         !(this.selection.parentElement() == tbContentElement.document.body || tbContentElement.document.body.contains(this.selection.parentElement() ) ) ) ) {
    this.selection=tbContentElement.document.body.createTextRange();
    this.selection.collapse(false);
    this.selection.type="None";
  } else {
    this.selection.type=tbContentElement.document.selection.type;
  }

}

function state_restoreSelection() {
  if (this.selection) {
    this.selection.select();
  }
}

var KeepState
//
// Event handlers
//
function window_onload() {
  // Initialze QueryStatus tables. These tables associate a command id with the
  // corresponding button object. Must be done on window load, 'cause the buttons must exist.
  QueryStatusToolbarButtons[0] = new QueryStatusItem("Bold", document.body.all["DECMD_BOLD"]);
  QueryStatusToolbarButtons[1] = new QueryStatusItem("Copy", document.body.all["DECMD_COPY"]);
  QueryStatusToolbarButtons[2] = new QueryStatusItem("Cut", document.body.all["DECMD_CUT"]);
  QueryStatusToolbarButtons[3] = new QueryStatusItem("CreateLink", document.body.all["DECMD_HYPERLINK"]);
  QueryStatusToolbarButtons[4] = new QueryStatusItem("Indent", document.body.all["DECMD_INDENT"]);
  QueryStatusToolbarButtons[5] = new QueryStatusItem("Italic", document.body.all["DECMD_ITALIC"]);
  QueryStatusToolbarButtons[6] = new QueryStatusItem("JustifyLeft", document.body.all["DECMD_JUSTIFYLEFT"]);
  QueryStatusToolbarButtons[7] = new QueryStatusItem("JustifyCenter", document.body.all["DECMD_JUSTIFYCENTER"]);
  QueryStatusToolbarButtons[8] = new QueryStatusItem("JustifyRight", document.body.all["DECMD_JUSTIFYRIGHT"]);
  QueryStatusToolbarButtons[9] = new QueryStatusItem("InsertOrderedList", document.body.all["DECMD_ORDERLIST"]);
  QueryStatusToolbarButtons[10] = new QueryStatusItem("Outdent", document.body.all["DECMD_OUTDENT"]);
  QueryStatusToolbarButtons[11] = new QueryStatusItem("Paste", document.body.all["DECMD_PASTE"]);
  QueryStatusToolbarButtons[12] = new QueryStatusItem("Redo", document.body.all["DECMD_REDO"]);
  QueryStatusToolbarButtons[13] = new QueryStatusItem("Underline", document.body.all["DECMD_UNDERLINE"]);
  QueryStatusToolbarButtons[14] = new QueryStatusItem("Undo", document.body.all["DECMD_UNDO"]);
  QueryStatusToolbarButtons[15] = new QueryStatusItem("InsertUnorderedList", document.body.all["DECMD_UNORDERLIST"]);
  // Initialize the context menu arrays.
  GeneralContextMenu[0] = new ContextMenuItem("Cut", DECMD_CUT);
  GeneralContextMenu[1] = new ContextMenuItem("Copy", DECMD_COPY);
  GeneralContextMenu[2] = new ContextMenuItem("Paste", DECMD_PASTE);
  docComplete = false;
  KeepState=new StateObject();
  tbContentElement.document.body.onBlur=KeepState.SaveSelection;
  tbContentElement.document.body.onkeyup=tbContentElement_DisplayChanged;
  tbContentElement.document.body.onmouseup=tbContentElement_DisplayChanged;
  tbContentElement.document.body.DocumentComplete=tbContentElement_DocumentComplete;
  tbContentElement.document.body.onkeypress=tbContentElement_Compose_press;
  tbContentElement.document.body.onkeydown=tbContentElement_Compose_down;
}

function tbContentElement_Compose_press() {
  myevent=tbContentElement.event;
  if (!wgCompose_keypress(myevent)) {
    tbContentElement.event.cancelBubble=true; 
    tbContentElement.event.returnValue=false; 
  }
  return true;
}

function tbContentElement_Compose_down() {
  myevent=tbContentElement.event;
  if (!wgCompose_keydown(myevent)) {
    tbContentElement.event.cancelBubble=true; 
    tbContentElement.event.returnValue=false; 
  }
  return true;
}

function tbContentElement_ShowContextMenu() {
  var menuStrings = new Array();
  var menuStates = new Array();
  var state;
  var i
  var idx = 0;

  // Rebuild the context menu. 
  ContextMenu.length = 0;

  // Always show general menu
  for (i=0; i<GeneralContextMenu.length; i++) {
    ContextMenu[idx++] = GeneralContextMenu[i];
  }

  // Set up the actual arrays that get passed to SetContextMenu
  for (i=0; i<ContextMenu.length; i++) {
    menuStrings[i] = ContextMenu[i].string;
    if (menuStrings[i] != MENU_SEPARATOR) {
      state = tbContentElement.document.queryCommandState(ContextMenu[i].cmdId);
    } else {
      state = DECMDF_ENABLED;
    }
    if (state == DECMDF_DISABLED || state == DECMDF_NOTSUPPORTED) {
      menuStates[i] = OLE_TRISTATE_GRAY;
    } else if (state == DECMDF_ENABLED || state == DECMDF_NINCHED) {
      menuStates[i] = OLE_TRISTATE_UNCHECKED;
    } else { // DECMDF_LATCHED
      menuStates[i] = OLE_TRISTATE_CHECKED;
    }
  }
  
  // Set the context menu
  tbContentElement.SetContextMenu(menuStrings, menuStates);
}

function tbContentElement_ContextMenuAction(itemIndex) {
  
  if (ContextMenu[itemIndex].cmdId == DECMD_INSERTTABLE) {
    InsertTable();
  } else {
    setFormat(ContextMenu[itemIndex].cmdId);
  }
}

// DisplayChanged handler. Very time-critical routine; this is called
// every time a character is typed. QueryStatus those toolbar buttons that need
// to be in synch with the current state of the document and update. 
function tbContentElement_DisplayChanged() {
  var i, s;
  for (i=0; i<QueryStatusToolbarButtons.length; i++) {
    if (!tbContentElement.document.queryCommandState(QueryStatusToolbarButtons[i].command)) {
      if (!tbContentElement.document.queryCommandSupported(QueryStatusToolbarButtons[i].command) ||
          !tbContentElement.document.queryCommandEnabled(QueryStatusToolbarButtons[i].command)) {
	    TBSetState(QueryStatusToolbarButtons[i].element, "gray"); 
      } else {
        TBSetState(QueryStatusToolbarButtons[i].element, "unchecked"); 
      } 
    } else { // DECMDF_LATCHED
       TBSetState(QueryStatusToolbarButtons[i].element, "checked");
    }
  }
  return true;
}


function DECMD_UNORDERLIST_onclick() {
  setFormat("InsertUnorderedList");
  
}

function DECMD_UNDO_onclick() {
  setFormat("Undo");
  
}

function DECMD_UNDERLINE_onclick() {
  setFormat("Underline");
  
}

function DECMD_SELECTALL_onclick() {
  setFormat("SelectAll");
  
}

function DECMD_REDO_onclick() {
  setFormat("Redo");
  
}

function DECMD_PASTE_onclick() {
  setFormat("Paste");
  
}

function DECMD_OUTDENT_onclick() {
  setFormat("Outdent");
  
}

function DECMD_ORDERLIST_onclick() {
  setFormat("InsertOrderedList");
  
}

function DECMD_JUSTIFYRIGHT_onclick() {
  setFormat("JustifyRight");
  
}

function DECMD_JUSTIFYLEFT_onclick() {
  setFormat("JustifyLeft");
  
}

function DECMD_JUSTIFYCENTER_onclick() {
  setFormat("JustifyCenter");
  
}

function DECMD_ITALIC_onclick() {
  setFormat("Italic");
  
}

function DECMD_INDENT_onclick() {
  setFormat("Indent");
  
}

function getEl(sTag,start) {
  while ((start!=null) && (start.tagName!=sTag))
    start = start.parentElement
  return start
}


function DECMD_IMAGE_onclick() {
  var sel=KeepState.GetSelection();
  var type=sel.type;
  var args = new Array();

  if ((type=="Control") && (KeepState.IMG=sel.item(0))) {
    var src=new String(KeepState.IMG.src);
    var root=new String('<?php echo $this->store->root; ?>');
    var temp='';
    if (src.substring(0,root.length)==root) {
      src=src.substring(root.length);
    } else { // htmledit component automatically adds http://
      temp=new String('<?php echo $this->store->root; ?>');
      if (src.substring(0,temp.length)==temp) {
        src=src.substring(temp.length);
      } else {
        temp=new String('http:///');
        if (src.substring(0,temp.length)==temp) {
          src=src.substring(temp.length-1);
        }
      }
    }
    args['src']    = src;
    args['border'] = KeepState.IMG.border;
    args['hspace'] = KeepState.IMG.hspace;
    args['vspace'] = KeepState.IMG.vspace;
    args['align']  = KeepState.IMG.align;
    args['alt']    = KeepState.IMG.alt;
  } else {
    sel.collapse(true);
    KeepState.IMG=false;
    args['src']    = '<?php echo $this->path; ?>';
    args['hspace'] = "";
    args['vspace'] = "";
    args['align']  = ""; 
    args['alt']    = "";
    args['border'] = "";
  }

  imgwindow=window.open("edit.object.html.image.phtml?src="+escape(args['src'])+
    "&border="+escape(args['border'])+"&hspace="+escape(args['hspace'])+
    "&vspace="+escape(args['vspace'])+"&align="+escape(args['align'])+
    "&alt="+escape(args['alt']),"imgwindow","directories=no,height=160,width=425,location=no,menubar=no,status=no,toolbar=no,resizable=yes");
  imgwindow.focus();
  KeepState.RestoreSelection();
  return true;

}

function IMAGE_set(arr) {
  var sel=KeepState.GetSelection();
  var type=sel.type;
  var src='';
  var temp='';

  if (arr != null) {
    src=new String(arr['src']);
    temp=new String('http://');
    if (src.substring(0,temp.length)!=temp) {
      src='<?php echo $this->store->root; ?>'+src;
    }
    if (KeepState.IMG) { // insert a new img
      KeepState.IMG.src=src;
      if (arr['border']!='') {
        KeepState.IMG.border=arr['border'];
      }
      if (arr['hspace']!='') {
        KeepState.IMG.hspace=arr['hspace'];
      }
      if (arr['vspace']!='') {
        KeepState.IMG.vspace=arr['vspace'];
      }
      if (arr['align']!='') {
        KeepState.IMG.align=arr['align'];
      }
      if (arr['alt']!='') {
        KeepState.IMG.alt=arr['alt'];
      }
    } else {
      if ((type=="None") || (type=="Text"))  {
        temp='<IMG SRC="'+src+'"';
        if (arr['border']!='') {
          temp+=' BORDER='+arr['border'];
        }
        if (arr['hspace']!='') {
          temp+=' HSPACE='+arr['hspace'];
        }
        if (arr['vspace']!='') {
          temp+=' VSPACE='+arr['vspace'];
        }
        if (arr['align']!='') {
          temp+=' ALIGN='+arr['align'];
        }
        if (arr['alt']!='') {
          temp+=' ALT="'+arr['alt']+'"';
        }
        temp+='>';
        sel.pasteHTML(temp);
        sel.select();
      }
    }
  }
}  

function wgCompose_show(buffer) {
  var sel=KeepState.GetSelection();
  sel.pasteHTML(buffer);
}

function DECMD_HYPERLINK_onclick() {
  setFormat("CreateLink");
}

function DECMD_DELETE_onclick() {
  setFormat("Delete");
  
}

function DECMD_CUT_onclick() {
  setFormat("Cut");
  
}

function DECMD_COPY_onclick() {
  setFormat("Copy");
  
}

function DECMD_BOLD_onclick() {
  setFormat("Bold");
}

function ParagraphStyle_onchange() {
  setFormat("FormatBlock", "<"+ParagraphStyle.value+">"); 
}

function tbContentElement_DocumentComplete() {

    if (initialDocComplete) {
      if (tbContentElement.CurrentDocumentPath == "") {
        URL_VALUE = "http://";
    }
    else {
      URL_VALUE = tbContentElement.CurrentDocumentPath;
    }
  }

  initialDocComplete = true;
  docComplete = true;
}

//-->
</script>

<script LANGUAGE="javascript" FOR="tbContentElement" EVENT="ShowContextMenu">
<!--
return tbContentElement_ShowContextMenu()
//-->
</script>

<script LANGUAGE="javascript" FOR="tbContentElement" EVENT="ContextMenuAction(itemIndex)">
<!--
return tbContentElement_ContextMenuAction(itemIndex)
//-->
</script>

<SCRIPT LANGUAGE=javascript FOR=tbContentElement EVENT=DocumentComplete>
<!--
 tbContentElement_DocumentComplete()
//-->
</SCRIPT>

</head>
<body onload="return window_onload()" unselectable='on'>

<!-- Toolbars -->
<div class="tbToolbar" ID="StandardToolbar" unselectable='on'>
  <div class="tbButton" ID="MENU_FILE_SAVE" unselectable='on' TITLE="Save File" LANGUAGE="javascript" onclick="return MENU_FILE_SAVE_onclick()">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/save.gif" WIDTH="23" HEIGHT="22">
  </div>
  
  <div class="tbSeparator"></div>

  <div class="tbButton" unselectable='on' ID="DECMD_CUT" TITLE="Cut" LANGUAGE="javascript" onclick="return DECMD_CUT_onclick();">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/cut.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_COPY" TITLE="Copy" LANGUAGE="javascript" onclick="return DECMD_COPY_onclick();">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/copy.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_PASTE" TITLE="Paste" LANGUAGE="javascript" onclick="return DECMD_PASTE_onclick();">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/paste.gif" WIDTH="23" HEIGHT="22">
  </div>

  <div class="tbSeparator"></div>

  <div class="tbButton" unselectable='on' ID="DECMD_UNDO" TITLE="Undo" LANGUAGE="javascript" onclick="return DECMD_UNDO_onclick()">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/undo.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_REDO" TITLE="Redo" LANGUAGE="javascript" onclick="return DECMD_REDO_onclick()">
    <img class="tbIcon" src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/redo.gif" WIDTH="23" HEIGHT="22">
  </div>

</div>

<div class="tbToolbar" unselectable='on' ID="FormatToolbar">
  <select ID="ParagraphStyle" class="tbGeneral" style="width:90" TITLE="Paragraph Format" LANGUAGE="javascript" onchange="return ParagraphStyle_onchange()">
    <option value="P">Normal (P)</option>
    <option value="H1">Heading 1 (H1)</option>
    <option value="H2">Heading 1 (H1)</option>
    <option value="H3">Heading 2 (H1)</option>
    <option value="H4">Heading 3 (H1)</option>
    <option value="H5">Heading 4 (H1)</option>
    <option value="H6">Heading 5 (H1)</option>
    <option value="H7">Heading 6 (H1)</option>
    <option value="H1">Heading 7 (H1)</option>
    <option value="PRE">Preformatted (PRE)</option>
  </select>

  <div class="tbSeparator" unselectable='on'></div>

  <div class="tbButton" unselectable='on' ID="DECMD_BOLD" TITLE="Bold" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_BOLD_onclick();">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bold.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_ITALIC" TITLE="Italic" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ITALIC_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/italic.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_UNDERLINE" TITLE="Underline" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNDERLINE_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/under.gif" WIDTH="23" HEIGHT="22">
  </div>
  
  <div class="tbSeparator" unselectable='on'></div>

  <div class="tbButton" unselectable='on' ID="DECMD_JUSTIFYLEFT" TITLE="Align Left" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYLEFT_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/left.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_JUSTIFYCENTER" TITLE="Center" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYCENTER_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/center.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_JUSTIFYRIGHT" TITLE="Align Right" TBTYPE="toggle" NAME="Justify" LANGUAGE="javascript" onclick="return DECMD_JUSTIFYRIGHT_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/right.gif" WIDTH="23" HEIGHT="22">
  </div>

  <div class="tbSeparator" unselectable='on'></div>

  <div class="tbButton" unselectable='on' ID="DECMD_ORDERLIST" TITLE="Numbered List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_ORDERLIST_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/numlist.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_UNORDERLIST" TITLE="Bulletted List" TBTYPE="toggle" LANGUAGE="javascript" onclick="return DECMD_UNORDERLIST_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/bullist.gif" WIDTH="23" HEIGHT="22">
  </div>
  
  <div class="tbSeparator" unselectable='on'></div>

  <div class="tbButton" unselectable='on' ID="DECMD_OUTDENT" TITLE="Decrease Indent" LANGUAGE="javascript" onclick="return DECMD_OUTDENT_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/deindent.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_INDENT" TITLE="Increase Indent" LANGUAGE="javascript" onclick="return DECMD_INDENT_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/inindent.gif" WIDTH="23" HEIGHT="22">
  </div>

  <div class="tbSeparator" unselectable='on'></div>

  <div class="tbButton" unselectable='on' ID="DECMD_HYPERLINK" TITLE="Link" LANGUAGE="javascript" onclick="return DECMD_HYPERLINK_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/link.gif" WIDTH="23" HEIGHT="22">
  </div>
  <div class="tbButton" unselectable='on' ID="DECMD_IMAGE" TITLE="Insert Image" LANGUAGE="javascript" onclick="return DECMD_IMAGE_onclick()">
    <img class="tbIcon" unselectable='on' src="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/images/image.gif" WIDTH="23" HEIGHT="22">
  </div>
</div>

<IFRAME ID="tbContentElement" CLASS="tbContentElement" unselectable='off' oldstyle="border: 1px inset buttonhighlight; background-color: white; padding: 8px; overflow: scroll;" <?php
  if ($wgHTMLEditTemplate) {
    echo "SRC=\"$wgHTMLEditTemplate\"";
  } else {
    echo "SRC=\"user.edit.page.html\"";
  }
?>></IFRAME>

<!-- Toolbar Code File. Note: This must always be the last thing on the page -->
<script LANGUAGE="Javascript" SRC="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/Toolbars/toolbars.js">
</script>
<script LANGUAGE="Javascript">
  tbScriptletDefinitionFile = "<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/Toolbars/menubody.htm";
</script>
<script LANGUAGE="Javascript" SRC="<?php echo $AR->host.$AR->dir->www; ?>widgets/htmledit/ie/Toolbars/tbmenus.js">
</script>

</body>
</html>

--auke1027512464--



From ariadne-cvs@muze.nl  Wed Jul 24 13:11:43 2002
From: ariadne-cvs@muze.nl (auke)
Date: Wed, 24 Jul 2002 12:11:43 -0000
Subject: [Ariadne-cvs] cvs: ariadne /www/widgets/compose compose.js
Message-ID: <cvsauke1027512703@cvsserver>

auke		Wed Jul 24 14:11:43 2002 EDT

  Modified files:              
    /ariadne/www/widgets/compose	compose.js 
  Log:
  added an onkeydown handler which only reacts to escape and the wgComposekey.
  added backspace handling in compose sequences. (you can correct typo's in a
  compose sequence)
  
  
Index: ariadne/www/widgets/compose/compose.js
diff -u ariadne/www/widgets/compose/compose.js:1.3 ariadne/www/widgets/compose/compose.js:1.4
--- ariadne/www/widgets/compose/compose.js:1.3	Wed Mar 20 20:55:12 2002
+++ ariadne/www/widgets/compose/compose.js	Wed Jul 24 14:11:43 2002
@@ -203,6 +203,31 @@
 		}
 	}
 
+	function wgCompose_keydown(e) {
+		var keycode = e.keyCode;
+		var key=String.fromCharCode(keycode);
+
+		if (keycode==wgComposeKey) {
+			if (!wgComposing) {
+				wgComposing=true;
+				wgComposeNumeric=false;
+				window.status='Composing...';
+			}
+			return false;
+		}
+		if (wgComposing) {
+			if (keycode==27) { // esc
+				wgCompose_stop();
+				return false;
+			} else if (keycode==8) { // backspace
+				wgComposeBuffer=wgComposeBuffer.substr(0, wgComposeBuffer.length-1);
+				window.status=window.status.substr(0, window.status.length-1);
+				return false;
+			}
+		}
+		return true;
+	}
+
 	function wgCompose_keypress (e)	{
 		var keycode = e.keyCode;
 		var key=String.fromCharCode(keycode);
@@ -216,7 +241,7 @@
 			return false;
 		}
 		if (wgComposing) {
-			if (keycode==27) {
+			if (keycode==27) { // esc
 				wgCompose_stop();
 				return false;
 			}




From ariadne-cvs@muze.nl  Thu Jul 25 11:00:51 2002
From: ariadne-cvs@muze.nl (auke)
Date: Thu, 25 Jul 2002 10:00:51 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/templates/pobject edit.object.data.save.phtml user.edit.html user.edit.page.html winxp.browse.nav.details.show.phtml winxp.browse.nav.list.show.phtml winxp.browse.nav.phtml  /lib/templates/ppage user.edit.page.html
Message-ID: <cvsauke1027591251@cvsserver>

This is a MIME encoded message

--auke1027591251
Content-Type: text/plain

auke		Thu Jul 25 12:00:51 2002 EDT

  Added files:                 
    /ariadne/lib/templates/pobject	user.edit.html user.edit.page.html 
    /ariadne/lib/templates/ppage	user.edit.page.html 

  Modified files:              
    /ariadne/lib/templates/pobject	edit.object.data.save.phtml 
                                  	winxp.browse.nav.details.show.phtml 
                                  	winxp.browse.nav.list.show.phtml 
                                  	winxp.browse.nav.phtml 
  Log:
  added the user.edit.page.html template needed for the IE5.5 editing widget.
  
  
--auke1027591251
Content-Type: text/plain
Content-Disposition: attachment; filename="auke-20020725120051.txt"

Index: ariadne/lib/templates/pobject/edit.object.data.save.phtml
diff -u ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.9 ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.10
--- ariadne/lib/templates/pobject/edit.object.data.save.phtml:1.9	Thu Jul 18 11:02:51 2002
+++ ariadne/lib/templates/pobject/edit.object.data.save.phtml	Thu Jul 25 12:00:39 2002
@@ -32,7 +32,7 @@
 					<?php
 						if (!$arIsNewObject || $this->getdata("arCloseWindow", "none")) {
 					?>
-								window.close();
+							window.close();
 					<?php
 						} else {
 					?>
Index: ariadne/lib/templates/pobject/winxp.browse.nav.details.show.phtml
diff -u ariadne/lib/templates/pobject/winxp.browse.nav.details.show.phtml:1.1 ariadne/lib/templates/pobject/winxp.browse.nav.details.show.phtml:1.2
--- ariadne/lib/templates/pobject/winxp.browse.nav.details.show.phtml:1.1	Wed May 29 16:33:26 2002
+++ ariadne/lib/templates/pobject/winxp.browse.nav.details.show.phtml	Thu Jul 25 12:00:39 2002
@@ -1,30 +1,30 @@
-<tr>
-<td><?php $this->call("winxp.browse.nav.list.show.phtml"); ?></td>
-<td align="right"><?php
-		 	if ($this->size>1024) {
-				echo round(intval($this->size)/1024)."&nbsp;KB&nbsp;"; 
-			} else {
-				echo intval($this->size)."&nbsp;B&nbsp;";
-			}
-?></td>
-<td align="right"><?php echo $this->data->owner; ?>&nbsp;</td>
-<td><?php
-  $date=getdate($this->lastchanged);
-  $now=getdate(time());
-  if ($now["year"]!=$date["year"]) {
-    echo strftime("&nbsp;%m/%Y", $this->lastchanged);
-  } else if ($this->lastchanged<(time()-86400)) {
-    echo strftime("&nbsp;%d/%m", $this->lastchanged); 
-  } else {
-    echo strftime("&nbsp;%H:%M", $this->lastchanged);
-  }
-?></td><td><?php
-  if (is_array($this->data->nls->list)) {
-	asort($this->data->nls->list);
-    reset($this->data->nls->list);
-    while (list($key, $value)=each($this->data->nls->list)) {
-      echo "<img src=\"".$AR->dir->images."nls/small/".$key.".gif\" alt=\"".htmlentities($value)."\"> ";
-    }
-  }
-?></td>
-</tr>
+<tr>
+<td><?php $this->call("winxp.browse.nav.list.show.phtml"); ?></td>
+<td align="right"><?php
+ 	if ($this->size>1024) {
+		echo round(intval($this->size)/1024)."&nbsp;KB&nbsp;"; 
+	} else {
+		echo intval($this->size)."&nbsp;B&nbsp;";
+	}
+?></td>
+<td align="right"><?php echo $this->data->owner; ?>&nbsp;</td>
+<td><?php
+	$date=getdate($this->lastchanged);
+	$now=getdate(time());
+	if ($now["year"]!=$date["year"]) {
+		echo strftime("&nbsp;%m/%Y", $this->lastchanged);
+	} else if ($this->lastchanged<(time()-86400)) {
+		echo strftime("&nbsp;%d/%m", $this->lastchanged); 
+	} else {
+		echo strftime("&nbsp;%H:%M", $this->lastchanged);
+	}
+?></td><td><?php
+	if (is_array($this->data->nls->list)) {
+		asort($this->data->nls->list);
+		reset($this->data->nls->list);
+		while (list($key, $value)=each($this->data->nls->list)) {
+			echo "<img src=\"".$AR->dir->images."nls/small/".$key.".gif\" alt=\"".htmlentities($value)."\"> ";
+		}
+	}
+?></td>
+</tr>
Index: ariadne/lib/templates/pobject/winxp.browse.nav.list.show.phtml
diff -u ariadne/lib/templates/pobject/winxp.browse.nav.list.show.phtml:1.1 ariadne/lib/templates/pobject/winxp.browse.nav.list.show.phtml:1.2
--- ariadne/lib/templates/pobject/winxp.browse.nav.list.show.phtml:1.1	Wed May 29 16:33:26 2002
+++ ariadne/lib/templates/pobject/winxp.browse.nav.list.show.phtml	Thu Jul 25 12:00:39 2002
@@ -1,55 +1,56 @@
-<?php
-	/******************************************************************
-	 browse.nav.list.show.phtml                            Muze Ariadne
-	 ------------------------------------------------------------------
-	 Arguments: none
-	 Grant needed: none
-	 Global variables: none
-
-	 This template displays the icon and name of an object. If the 
-	 user doesn't have read access to the object, the name is displayed
-	 in grey.
-	 
-	 no result
-
-	******************************************************************/
-
-	if (!$arLanguage) {
-		$arLanguage=$nls;
-	}
-	if ($data->$arLanguage) {
-		$nlsdata=$data->$arLanguage;
-	}
-
-	$permcheck = array();
-	$permcheck[] = "edit";
-	$permcheck[] = "config";
-	$permcheck[] = "delete";
-	$permcheck[] = "layout";
-	
-	$disabledItems="";
-	if(!$this->implements("pshortcut") || !$this->CheckSilent("edit"))
-		$disabledItems.= "normalCMshortcut;";
-	if(!$this->CheckSilent("edit"))
-		$disabledItems.= "normalCMedit;";
-	if(!$this->CheckSilent("delete"))
-		$disabledItems.= "normalCMdelete;normalCMrename;";
-	if(!$this->CheckSilent("read"))
-		$disabledItems.= "normalCMexplore;normalCMviewweb;normalCMcopy;normalCMlink;";
-?>
-
-<div class='object'><nobr><a contextmenu="normalContextMenu" disableditems="<?php echo $disabledItems; ?>"
-	href="#" class="unselectedItem" onClick="selectItem(this);" onDblClick="top.View(this.getAttribute('path'))" path="<?php echo $this->path; ?>" fullPath="<?php echo $this->make_url($this->path); ?>"><img 
-	width="20" height="20" src="<?php echo $AR->dir->images; ?>icons/<?php echo $this->type; ?>.gif" 
-	alt="<?php echo $this->path; ?>" border="0"> <?php
-		if (strlen($nlsdata->name)>32) {
-			$name=substr($nlsdata->name,0, 32)."...";
-		} else {
-			$name=$nlsdata->name;
-		}
-		if (!$this->CheckSilent("read")) {
-			echo "<font color=\"#CCCCCC\">$name</font>";
-		} else {
-			echo "$name";
-		}
-	?></a></nobr></div>
+<?php
+	/******************************************************************
+	 browse.nav.list.show.phtml                            Muze Ariadne
+	 ------------------------------------------------------------------
+	 Arguments: none
+	 Grant needed: none
+	 Global variables: none
+
+	 This template displays the icon and name of an object. If the 
+	 user doesn't have read access to the object, the name is displayed
+	 in grey.
+	 
+	 no result
+
+	******************************************************************/
+
+	if (!$arLanguage) {
+		$arLanguage=$nls;
+	}
+	if ($data->$arLanguage) {
+		$nlsdata=$data->$arLanguage;
+	}
+
+	$permcheck = array();
+	$permcheck[] = "edit";
+	$permcheck[] = "config";
+	$permcheck[] = "delete";
+	$permcheck[] = "layout";
+	
+	$disabledItems="";
+	if(!$this->implements("pshortcut") || !$this->CheckSilent("edit"))
+		$disabledItems.= "normalCMshortcut;";
+	if(!$this->CheckSilent("edit"))
+		$disabledItems.= "normalCMedit;";
+	if(!$this->CheckSilent("delete"))
+		$disabledItems.= "normalCMdelete;normalCMrename;";
+	if(!$this->CheckSilent("read"))
+		$disabledItems.= "normalCMexplore;normalCMviewweb;normalCMcopy;normalCMlink;";
+?>
+
+<div class='object'><nobr>
+<img width="20" height="20" src="<?php echo $AR->dir->images; ?>icons/<?php echo $this->type; ?>.gif"	alt="<?php echo $this->path; ?>" border="0">
+
+<a contextmenu="normalContextMenu" disableditems="<?php echo $disabledItems; ?>"
+	href="#" class="unselectedItem" onClick="selectItem(this);" onDblClick="top.View(this.getAttribute('path'))" path="<?php echo $this->path; ?>" fullPath="<?php echo $this->make_url($this->path); ?>">&nbsp;<?php
+		if (strlen($nlsdata->name)>32) {
+			$name=substr($nlsdata->name,0, 32)."...";
+		} else {
+			$name=$nlsdata->name;
+		}
+		if (!$this->CheckSilent("read")) {
+			echo "<font color=\"#CCCCCC\">$name</font>";
+		} else {
+			echo "$name";
+		}
+	?>&nbsp;</a></nobr></div>
Index: ariadne/lib/templates/pobject/winxp.browse.nav.phtml
diff -u ariadne/lib/templates/pobject/winxp.browse.nav.phtml:1.2 ariadne/lib/templates/pobject/winxp.browse.nav.phtml:1.3
--- ariadne/lib/templates/pobject/winxp.browse.nav.phtml:1.2	Wed May 29 16:57:34 2002
+++ ariadne/lib/templates/pobject/winxp.browse.nav.phtml	Thu Jul 25 12:00:39 2002
@@ -23,6 +23,9 @@
 <head>
 <title><?php echo $nlsdata->name; ?></title>
 <style>
+	* { 
+		font: 11px tahoma,Helvetica,sans-serif ;
+	}
 	.object {
 		background: transparent;
 		width: 150px;
@@ -35,6 +38,8 @@
 			}
 		?>
 	}
+	.dataname { 
+		font: 14px; font-weight:bold;}
 	.selectedItem {
 		background: #316AC5;
 		color: #ffffff;
@@ -48,7 +53,7 @@
 	BODY {
 		margin: 0px;
 		padding: 2px;
-		font: 10pt Arial,Helvetica,sans-serif;
+		font: 11px Tahoma,Helvetica,sans-serif;
 	}
 	A {
 		text-decoration: none;
@@ -56,7 +61,7 @@
 	}
 	<?php if ($viewtype == "details") {?>
 	.heading {
-		font: 10pt Arial,Helvetica,sans-serif;
+		font-weight:normal;
 		<?php
 			$browser=$this->call("browsercheck.phtml");
 			if ($browser["id"]=="ns" && $browser["version"]==4)
@@ -65,14 +70,14 @@
 				echo "background: buttonface;";
 		?>
 		border: 2px outset;
-		text-align: center;
+		
 	}
 	<?php } ?>
 </style>
 <script language="JavaScript">
 	var selectedItem;
  	var BR_NS = (document.layers) ? true : false;
-  	var BR_IE = (document.all) ? true : false;
+		var BR_IE = (document.all) ? true : false;
 	
 	function selectItem(itm){
 		if (itm != selectedItem){
@@ -112,11 +117,11 @@
 </script>
 <script language="JavaScript1.2" 
 		src="<?php echo $AR->dir->www; ?>widgets/menu/functions.js"
-        type='text/javascript'>
+		type='text/javascript'>
 </script>	
 <script language="JavaScript1.2" 
 		src="<?php echo $AR->dir->www; ?>widgets/contextmenu/cm.js"
-        type='text/javascript'>
+		type='text/javascript'>
 </script>
 <script>
 	function test() {
@@ -125,19 +130,61 @@
 </script>
 <script language="JavaScript1.2" 
 		src="winxp.browse.contextmenu.js"
-        type='text/javascript'>
+		type='text/javascript'>
 </script>	
 <link href="<?php echo $AR->dir->www; ?>widgets/contextmenu/cm.css" rel="StyleSheet" type="text/css">
 </head>
+
 <body bgcolor="white" onLoad="initBody();" contextmenu="bodyContextMenu" hiddenItems="normalCMexplore;">
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+<tr height="20">
+	<td width="50%" valign="top">
+
+<!--dataname and datasummary for this object-->
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+<tr height="20">
+	<td><span class="dataname"><?php echo $nlsdata->name; ?></span></td>
+</tr>
+<tr height="2">
+	<td><img src="<?php echo $AR->dir->images; ?>winxp/bluedot.gif" width="100%" height="2"></td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+<tr>
+	<td><?php
+		if (strlen($nlsdata->summary)>128) {
+			$shortsummary=substr($nlsdata->summary,0, 128)."...";
+		} else {
+			$shortsummary=$nlsdata->summary;
+		} 
+		echo $shortsummary; ?>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+	</td>
+	<td align="right" valign="top"><img src="<?php echo $AR->dir->images; ?>winxp/system.gif"><img src="<?php echo $AR->dir->images; ?>winxp/ariadnexplogo.gif"</td>
+</tr>
+<tr>
+	<td colspan="2"><img src="<?php echo $AR->dir->images; ?>winxp/bluedot.gif" width="100%" height="1"></td>
+</tr>
+</table>
+<BR>
 <?php if ($viewtype == "details") {?>
+
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 <tr>
-  <td><div class="heading"><?php echo $ARnls["name"]; ?></div></td>
-  <td><div class="heading"><?php echo $ARnls["size"]; ?></div></td>
-  <td><div class="heading"><?php echo $ARnls["user"]; ?></div></td>
-  <td><div class="heading"><?php echo $ARnls["time"]; ?></div></td>
-  <td><div class="heading">&nbsp;</div></td>
+	<td align="left"><div class="heading">&nbsp;<?php echo $ARnls["name"]; ?></div></td>
+	<td align="right"><div class="heading"><?php echo $ARnls["size"]; ?>&nbsp;</div></td>
+	<td align="right"><div class="heading"><?php echo $ARnls["user"]; ?>&nbsp;</div></td>
+	<td align="left"><div class="heading">&nbsp;<?php echo $ARnls["time"]; ?></div></td>
+	<td><div class="heading">&nbsp;Lan</div></td>
 </tr>
 <?php } ?>
 <?php

Index: ariadne/lib/templates/pobject/user.edit.html
+++ ariadne/lib/templates/pobject/user.edit.html
<?php
	if ( ( 	($this->arIsNewObject && $this->CheckLogin("add")) ||
			(!$this->arIsNewObject && $this->CheckLogin("edit")) )
        && $this->CheckConfig()) {
		include($this->store->code."widgets/htmledit/toolbar.php");
	}
?>
Index: ariadne/lib/templates/pobject/user.edit.page.html
+++ ariadne/lib/templates/pobject/user.edit.page.html
<html>
<body>
<h1>No page date</h1>
</body>
</html>
Index: ariadne/lib/templates/ppage/user.edit.page.html
+++ ariadne/lib/templates/ppage/user.edit.page.html
<?php
	if ($this->CheckLogin('read') && $this->CheckConfig($arCallFunction, $arCallArgs)) {
?>
<body contentEditable='true'>
<?php
		$this->ShowPage();
?>
</body>
<?php
	}
?>
--auke1027591251--



From ariadne-cvs@muze.nl  Thu Jul 25 11:01:54 2002
From: ariadne-cvs@muze.nl (auke)
Date: Thu, 25 Jul 2002 10:01:54 -0000
Subject: [Ariadne-cvs] cvs: ariadne /www/images/winxp ariadnexplogo.gif
Message-ID: <cvsauke1027591314@cvsserver>

auke		Thu Jul 25 12:01:54 2002 EDT

  Added files:                 
    /ariadne/www/images/winxp	ariadnexplogo.gif 
  Log:
  new logo for the winxp browse view.
  
  




From ariadne-cvs@muze.nl  Fri Jul 26 11:28:48 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Fri, 26 Jul 2002 10:28:48 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/modules mod_pinp.phtml
Message-ID: <cvsgijs1027679328@cvsserver>

gijs		Fri Jul 26 12:28:48 2002 EDT

  Modified files:              
    /ariadne/lib/modules	mod_pinp.phtml 
  Log:
  Fixed cursor positioning (<= became <==)
  Fixed call by reference warning.
  
  
Index: ariadne/lib/modules/mod_pinp.phtml
diff -u ariadne/lib/modules/mod_pinp.phtml:1.36 ariadne/lib/modules/mod_pinp.phtml:1.37
--- ariadne/lib/modules/mod_pinp.phtml:1.36	Tue Jun 25 12:22:39 2002
+++ ariadne/lib/modules/mod_pinp.phtml	Fri Jul 26 12:28:47 2002
@@ -59,7 +59,7 @@
 		$YYCURSOR = 0;
 	}
 
-	function scan($result) {
+	function scan(&$result) {
 		$YYCURSOR = &$this->YYCURSOR;
 		$YYBUFFER = &$this->YYBUFFER;
 		$YYCLASSES = &$this->YYCLASSES;
@@ -166,6 +166,7 @@
 								}
 							break;
 							default:
+								++$YYCURSOR;
 								$result = "<$yych";
 							break;
 						}
@@ -457,7 +458,7 @@
 	function next_token() {
 		$value="";
 		if (count($this->tokens) == 0) {
-			$token = $this->scanner->scan(&$value);
+			$token = $this->scanner->scan($value);
 			if (is_array($value)) {
 				$this->tokens = $value;
 				$this->token = T_MULTIPART_STRING_START;




From ariadne-cvs@muze.nl  Sat Jul 27 16:06:27 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Sat, 27 Jul 2002 15:06:27 -0000
Subject: [Ariadne-cvs] cvs: ariadne /docs CHANGES
Message-ID: <cvsgijs1027782387@cvsserver>

gijs		Sat Jul 27 17:06:27 2002 EDT

  Modified files:              
    /ariadne/docs	CHANGES 
  Log:
  Updated (and fixed Chris' name :))
  
  
Index: ariadne/docs/CHANGES
diff -u ariadne/docs/CHANGES:1.3 ariadne/docs/CHANGES:1.4
--- ariadne/docs/CHANGES:1.3	Fri Apr 26 17:21:47 2002
+++ ariadne/docs/CHANGES	Sat Jul 27 17:06:27 2002
@@ -1,4 +1,30 @@
-Ariadne 2.0
+Ariadne 2.1
+Changes in ariadne since version 2.0
+
+New features:
+	- Added a new 'WinXP' interface, by Chris van de Steeg
+	- Added a new, rewritten PINP compiler, which should be much more secure
+	- Added profiles for users (pprofile)
+	- Added the combine method to pphoto class, which allows multiple images to be
+	  combined into a single image.
+	- Improved session functionality:
+	  - Ariadne is now able to respawn a session on a cookie only.
+	  - When a session expires, available POST and GET information will be 
+	    saved and restored after a succesful re-authentication.
+	- Added zlib output compression support to the www loader
+	- Added support for PEAR's TAR to the axstore
+
+Bugs fixed:
+	- Many bugfixes in the MSSQL store by Pascal Hofstee
+	- Updated NLS files and replaced static error messages with their
+	  NLS equivalents.
+	- Property deletion: properties weren't deleted upon object removal because of a typo.
+	- Fixed MySQL session updates (Thanks to Hanne Johann)
+	- Changed AddSlashes to AddCSlashes so we do not depend on PHP's
+	  default escaping mechanism (it clashed with the MSSQL settings)
+	- It's now possible to run PHP with 'register_globals' set to off.
+	- Fixed a security bug.
+	- and numerous other bugs.
 
 Changes in ariadne since version 2.0RC3
 




From ariadne-cvs@muze.nl  Mon Jul 29 10:36:46 2002
From: ariadne-cvs@muze.nl (gijs)
Date: Mon, 29 Jul 2002 09:36:46 -0000
Subject: [Ariadne-cvs] cvs: ariadne /lib/objects pobject.phtml
Message-ID: <cvsgijs1027935406@cvsserver>

gijs		Mon Jul 29 11:36:46 2002 EDT

  Modified files:              
    /ariadne/lib/objects	pobject.phtml 
  Log:
  Moved ARConfigChecked = true a little higher so it _always_ runs.
  
  
Index: ariadne/lib/objects/pobject.phtml
diff -u ariadne/lib/objects/pobject.phtml:1.110 ariadne/lib/objects/pobject.phtml:1.111
--- ariadne/lib/objects/pobject.phtml:1.110	Thu Jul 11 15:19:28 2002
+++ ariadne/lib/objects/pobject.phtml	Mon Jul 29 11:36:45 2002
@@ -674,7 +674,6 @@
 	// browser.
 	// All these templates must exist under a fixed directory, $AR->dir->templates
 	global $nocache, $AR, $ARConfig, $ARCurrent, $ARBeenHere, $ARnls, $HTTP_POST_VARS, $HTTP_GET_VARS, $ARConfigChecked;
-	
 		debug("pobject::CheckConfig($arCallFunction, $arCallArgs)","object");
 		$MAX_LOOP_COUNT=10;
 
@@ -747,6 +746,12 @@
 				debug("             config->cache: ".$config->cache."; nocache: ".$nocache."; user: ".$AR->user->data->login."; os: ".$AR->OS,"all");
 			}
 
+			/*
+				Set ARConfigChecked to true to indicate that we have been here
+				earlier.
+			*/
+			$ARConfigChecked = true;
+
 			/* first check current templates */
 			$curr_templates=$this->data->pinp;
 
@@ -832,13 +837,6 @@
 			exit();
 		}
 
-		/*
-			Set ARConfigChecked to true to indicate that we have been here
-			earlier.
-		*/
-		if (!isset($ARConfigChecked)) {
-			$ARConfigChecked = true;
-		}
 
 		debug("pobject: CheckConfig: end","all");
 		return true;