From: moodler <moodler>
Date: Sat, 11 Aug 2007 12:58:08 +0000 (+0000)
Subject: I merged all changes over from 1.8 to HEAD.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0c5e6027d28dac9b7e80035601fb40c0925a1eff;p=moodle.git

I merged all changes over from 1.8 to HEAD.

None of it looked too serious but I'VE NOT TESTED THIS AT ALL.

MDL-10366
---

diff --git a/auth/cas/CAS/CAS.php b/auth/cas/CAS/CAS.php
index 4a357ab0d1..f74730f49e 100644
--- a/auth/cas/CAS/CAS.php
+++ b/auth/cas/CAS/CAS.php
@@ -1281,4 +1281,4 @@ class phpCAS
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/auth/cas/CAS/PGTStorage/pgt-db.php b/auth/cas/CAS/PGTStorage/pgt-db.php
index 2e1528c613..31b64df8c9 100644
--- a/auth/cas/CAS/PGTStorage/pgt-db.php
+++ b/auth/cas/CAS/PGTStorage/pgt-db.php
@@ -1,190 +1,568 @@
-<?php
-
-/**
- * @file CAS/PGTStorage/pgt-db.php
- * Basic class for PGT database storage
- */
-
-// include phpDB library (the test was introduced in release 0.4.8 for 
-// the integration into Tikiwiki).
-if (!class_exists('DB')) {
-  @include_once('DB.php');
-}
-
-/**
- * @class PGTStorageDB
- * The PGTStorageDB class is a class for PGT database storage. An instance of 
- * this class is returned by CASClient::SetPGTStorageDB().
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorageDB
- */
-
-class PGTStorageDB extends PGTStorage
-{
-  /** 
-   * @addtogroup internalPGTStorageDB
-   * @{ 
-   */
-
-  /**
-   * a string representing a PEAR DB URL to connect to the database. Written by
-   * PGTStorageDB::PGTStorageDB(), read by getURL().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_url='';
-
-  /**
-   * This method returns the PEAR DB URL to use to connect to the database.
-   *
-   * @return a PEAR DB URL
-   *
-   * @private
-   */
-  function getURL()
-    {
-      return $this->_url;
-    }
-
-  /**
-   * The handle of the connection to the database where PGT's are stored. Written by
-   * PGTStorageDB::init(), read by getLink().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_link = null;
-
-  /**
-   * This method returns the handle of the connection to the database where PGT's are 
-   * stored.
-   *
-   * @return a handle of connection.
-   *
-   * @private
-   */
-  function getLink()
-    {
-      return $this->_link;
-    }
-
-  /**
-   * The name of the table where PGT's are stored. Written by 
-   * PGTStorageDB::PGTStorageDB(), read by getTable().
-   *
-   * @hideinitializer
-   * @private
-   */
-  var $_table = '';
-
-  /**
-   * This method returns the name of the table where PGT's are stored.
-   *
-   * @return the name of a table.
-   *
-   * @private
-   */
-  function getTable()
-    {
-      return $this->_table;
-    }
-
-  // ########################################################################
-  //  DEBUGGING
-  // ########################################################################
-  
-  /**
-   * This method returns an informational string giving the type of storage
-   * used by the object (used for debugging purposes).
-   *
-   * @return an informational string.
-   * @public
-   */
-  function getStorageType()
-    {
-      return "database";
-    }
-
-  /**
-   * This method returns an informational string giving informations on the
-   * parameters of the storage.(used for debugging purposes).
-   *
-   * @public
-   */
-  function getStorageInfo()
-    {
-      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
-    }
-
-  // ########################################################################
-  //  CONSTRUCTOR
-  // ########################################################################
-  
-  /**
-   * The class constructor, called by CASClient::SetPGTStorageDB().
-   *
-   * @param $cas_parent the CASClient instance that creates the object.
-   * @param $user the user to access the data with
-   * @param $password the user's password
-   * @param $database_type the type of the database hosting the data
-   * @param $hostname the server hosting the database
-   * @param $port the port the server is listening on
-   * @param $database the name of the database
-   * @param $table the name of the table storing the data
-   *
-   * @public
-   */
-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
-    {
-      phpCAS::traceBegin();
-
-      // call the ancestor's constructor
-      $this->PGTStorage($cas_parent);
-
-      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
-      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
-      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
-      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
-      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
-
-      // build and store the PEAR DB URL
-      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
-
-      // XXX should use setURL and setTable
-      phpCAS::traceEnd();
-    }
-  
-  // ########################################################################
-  //  INITIALIZATION
-  // ########################################################################
-  
-  /**
-   * This method is used to initialize the storage. Halts on error.
-   *
-   * @public
-   */
-  function init()
-    {
-      phpCAS::traceBegin();
-      // if the storage has already been initialized, return immediatly
-      if ( $this->isInitialized() )
-	return;
-      // call the ancestor's method (mark as initialized)
-      parent::init();
-      
-      // try to connect to the database
-      $this->_link = DB::connect($this->getURL());
-      if ( DB::isError($this->_link) ) {
-	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
-      }
-      var_dump($this->_link);
-      phpCAS::traceBEnd();
-    }
-
-  /** @} */
-}
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file CAS/PGTStorage/pgt-db.php
+
+
+ * Basic class for PGT database storage
+
+
+ */
+
+
+
+
+
+// include phpDB library (the test was introduced in release 0.4.8 for 
+
+
+// the integration into Tikiwiki).
+
+
+if (!class_exists('DB')) {
+
+
+  @include_once('DB.php');
+
+
+}
+
+
+
+
+
+/**
+
+
+ * @class PGTStorageDB
+
+
+ * The PGTStorageDB class is a class for PGT database storage. An instance of 
+
+
+ * this class is returned by CASClient::SetPGTStorageDB().
+
+
+ *
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ *
+
+
+ * @ingroup internalPGTStorageDB
+
+
+ */
+
+
+
+
+
+class PGTStorageDB extends PGTStorage
+
+
+{
+
+
+  /** 
+
+
+   * @addtogroup internalPGTStorageDB
+
+
+   * @{ 
+
+
+   */
+
+
+
+
+
+  /**
+
+
+   * a string representing a PEAR DB URL to connect to the database. Written by
+
+
+   * PGTStorageDB::PGTStorageDB(), read by getURL().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_url='';
+
+
+
+
+
+  /**
+
+
+   * This method returns the PEAR DB URL to use to connect to the database.
+
+
+   *
+
+
+   * @return a PEAR DB URL
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getURL()
+
+
+    {
+
+
+      return $this->_url;
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * The handle of the connection to the database where PGT's are stored. Written by
+
+
+   * PGTStorageDB::init(), read by getLink().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_link = null;
+
+
+
+
+
+  /**
+
+
+   * This method returns the handle of the connection to the database where PGT's are 
+
+
+   * stored.
+
+
+   *
+
+
+   * @return a handle of connection.
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getLink()
+
+
+    {
+
+
+      return $this->_link;
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * The name of the table where PGT's are stored. Written by 
+
+
+   * PGTStorageDB::PGTStorageDB(), read by getTable().
+
+
+   *
+
+
+   * @hideinitializer
+
+
+   * @private
+
+
+   */
+
+
+  var $_table = '';
+
+
+
+
+
+  /**
+
+
+   * This method returns the name of the table where PGT's are stored.
+
+
+   *
+
+
+   * @return the name of a table.
+
+
+   *
+
+
+   * @private
+
+
+   */
+
+
+  function getTable()
+
+
+    {
+
+
+      return $this->_table;
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  DEBUGGING
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method returns an informational string giving the type of storage
+
+
+   * used by the object (used for debugging purposes).
+
+
+   *
+
+
+   * @return an informational string.
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageType()
+
+
+    {
+
+
+      return "database";
+
+
+    }
+
+
+
+
+
+  /**
+
+
+   * This method returns an informational string giving informations on the
+
+
+   * parameters of the storage.(used for debugging purposes).
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function getStorageInfo()
+
+
+    {
+
+
+      return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
+
+
+    }
+
+
+
+
+
+  // ########################################################################
+
+
+  //  CONSTRUCTOR
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * The class constructor, called by CASClient::SetPGTStorageDB().
+
+
+   *
+
+
+   * @param $cas_parent the CASClient instance that creates the object.
+
+
+   * @param $user the user to access the data with
+
+
+   * @param $password the user's password
+
+
+   * @param $database_type the type of the database hosting the data
+
+
+   * @param $hostname the server hosting the database
+
+
+   * @param $port the port the server is listening on
+
+
+   * @param $database the name of the database
+
+
+   * @param $table the name of the table storing the data
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+
+
+
+      // call the ancestor's constructor
+
+
+      $this->PGTStorage($cas_parent);
+
+
+
+
+
+      if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
+
+
+      if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
+
+
+      if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
+
+
+      if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
+
+
+      if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
+
+
+
+
+
+      // build and store the PEAR DB URL
+
+
+      $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
+
+
+
+
+
+      // XXX should use setURL and setTable
+
+
+      phpCAS::traceEnd();
+
+
+    }
+
+
+  
+
+
+  // ########################################################################
+
+
+  //  INITIALIZATION
+
+
+  // ########################################################################
+
+
+  
+
+
+  /**
+
+
+   * This method is used to initialize the storage. Halts on error.
+
+
+   *
+
+
+   * @public
+
+
+   */
+
+
+  function init()
+
+
+    {
+
+
+      phpCAS::traceBegin();
+
+
+      // if the storage has already been initialized, return immediatly
+
+
+      if ( $this->isInitialized() )
+
+
+	return;
+
+
+      // call the ancestor's method (mark as initialized)
+
+
+      parent::init();
+
+
+      
+
+
+      // try to connect to the database
+
+
+      $this->_link = DB::connect($this->getURL());
+
+
+      if ( DB::isError($this->_link) ) {
+
+
+	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
+
+
+      }
+
+
+      var_dump($this->_link);
+
+
+      phpCAS::traceBEnd();
+
+
+    }
+
+
+
+
+
+  /** @} */
+
+
+}
+
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/PGTStorage/pgt-file.php b/auth/cas/CAS/PGTStorage/pgt-file.php
index 0c5a0a4dee..54563f344c 100644
--- a/auth/cas/CAS/PGTStorage/pgt-file.php
+++ b/auth/cas/CAS/PGTStorage/pgt-file.php
@@ -237,4 +237,4 @@ class PGTStorageFile extends PGTStorage
 }
 
   
-?>
\ No newline at end of file
+?>
diff --git a/auth/cas/CAS/PGTStorage/pgt-main.php b/auth/cas/CAS/PGTStorage/pgt-main.php
index f24235b72c..37f94e6952 100644
--- a/auth/cas/CAS/PGTStorage/pgt-main.php
+++ b/auth/cas/CAS/PGTStorage/pgt-main.php
@@ -186,4 +186,4 @@ include_once(dirname(__FILE__).'/pgt-file.php');
 // incompatibility with Moodle
 //include_once(dirname(__FILE__).'/pgt-db.php');
   
-?>
\ No newline at end of file
+?>
diff --git a/auth/cas/CAS/client.php b/auth/cas/CAS/client.php
index 161bb046e2..a793e12780 100644
--- a/auth/cas/CAS/client.php
+++ b/auth/cas/CAS/client.php
@@ -2075,4 +2075,4 @@ class CASClient
   /** @} */
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/auth/cas/CAS/domxml-php4-php5.php b/auth/cas/CAS/domxml-php4-php5.php
index d64747514c..71e8f34bf2 100644
--- a/auth/cas/CAS/domxml-php4-php5.php
+++ b/auth/cas/CAS/domxml-php4-php5.php
@@ -1,277 +1,829 @@
-<?php
-/**
- * @file domxml-php4-php5.php
- * Require PHP5, uses built-in DOM extension.
- * To be used in PHP4 scripts using DOMXML extension.
- * Allows PHP4/DOMXML scripts to run on PHP5/DOM.
- * (Requires PHP5/XSL extension for domxml_xslt functions)
- *
- * Typical use:
- * <pre>
- * {
- *  if (version_compare(PHP_VERSION,'5','>='))
- *   require_once('domxml-php4-to-php5.php');
- * }
- * </pre>
- *
- * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- *
- * ------------------------------------------------------------------<br>
- * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
- *
- * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
- * http://creativecommons.org/licenses/by-sa/2.0/fr/
- * http://alexandre.alapetite.net/divers/apropos/#by-sa
- * - Attribution. You must give the original author credit
- * - Share Alike. If you alter, transform, or build upon this work,
- *   you may distribute the resulting work only under a license identical to this one
- * - The French law is authoritative
- * - Any of these conditions can be waived if you get permission from Alexandre Alapetite
- * - Please send to Alexandre Alapetite the modifications you make,
- *   in order to improve this file for the benefit of everybody
- *
- * If you want to distribute this code, please do it as a link to:
- * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- */
-
-function domxml_new_doc($version) {return new php4DOMDocument('');}
-function domxml_open_file($filename) {return new php4DOMDocument($filename);}
-function domxml_open_mem($str)
-{
- $dom=new php4DOMDocument('');
- $dom->myDOMNode->loadXML($str);
- return $dom;
-}
-function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);}
-function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
-
-class php4DOMAttr extends php4DOMNode
-{
- function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;}
- function Name() {return $this->myDOMNode->name;}
- function Specified() {return $this->myDOMNode->specified;}
- function Value() {return $this->myDOMNode->value;}
-}
-
-class php4DOMDocument extends php4DOMNode
-{
- function php4DOMDocument($filename='')
- {
-  $this->myDOMNode=new DOMDocument();
-  if ($filename!='') $this->myDOMNode->load($filename);
- }
- function create_attribute($name,$value)
- {
-  $myAttr=$this->myDOMNode->createAttribute($name);
-  $myAttr->value=$value;
-  return new php4DOMAttr($myAttr,$this);
- }
- function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
- function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
- function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
- function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);}
- function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
- function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);}
- function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();}
- function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);}
- function get_elements_by_tagname($name)
- {
-  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this);
-    $i++;
-   }
-  return $nodeSet;
- }
- function html_dump_mem() {return $this->myDOMNode->saveHTML();}
- function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
-}
-
-class php4DOMElement extends php4DOMNode
-{
- function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
- function get_elements_by_tagname($name)
- {
-  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
- function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
- function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);}
- function tagname() {return $this->myDOMNode->tagName;}
-}
-
-class php4DOMNode
-{
- var $myDOMNode;
- var $myOwnerDocument;
- function php4DOMNode($aDomNode,$aOwnerDocument)
- {
-  $this->myDOMNode=$aDomNode;
-  $this->myOwnerDocument=$aOwnerDocument;
- }
- function __get($name)
- {
-  if ($name=='type') return $this->myDOMNode->nodeType;
-  elseif ($name=='tagname') return $this->myDOMNode->tagName;
-  elseif ($name=='content') return $this->myDOMNode->textContent;
-  else
-  {
-   $myErrors=debug_backtrace();
-   trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
-   return false;
-  }
- }
- function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function attributes()
- {
-  $myDOMNodeList=$this->myDOMNode->attributes;
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function child_nodes()
- {
-  $myDOMNodeList=$this->myDOMNode->childNodes;
-  $nodeSet=array();
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
-    $i++;
-   }
-  return $nodeSet;
- }
- function children() {return $this->child_nodes();}
- function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
- function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
- function get_content() {return $this->myDOMNode->textContent;}
- function has_attributes() {return $this->myDOMNode->hasAttributes();}
- function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
- function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);}
- function is_blank_node()
- {
-  $myDOMNodeList=$this->myDOMNode->childNodes;
-  $i=0;
-  if (isset($myDOMNodeList))
-   while ($node=$myDOMNodeList->item($i))
-   {
-    if (($node->nodeType==XML_ELEMENT_NODE)||
-        (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue)))
-     return false;
-    $i++;
-   }
-  return true;
- }
- function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
- function new_child($name,$content)
- {
-  $mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
-  $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content));
-  $this->myDOMNode->appendChild($mySubNode);
-  return new php4DOMElement($mySubNode,$this->myOwnerDocument);
- }
- function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
- function node_name() {return $this->myDOMNode->localName;}
- function node_type() {return $this->myDOMNode->nodeType;}
- function node_value() {return $this->myDOMNode->nodeValue;}
- function owner_document() {return $this->myOwnerDocument;}
- function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
- function prefix() {return $this->myDOMNode->prefix;}
- function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
- function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
- function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);}
- function set_content($text)
- {
-  if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE))
-   $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
-  return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text));
- }
-}
-
-class php4DOMNodelist
-{
- var $myDOMNodelist;
- var $nodeset;
- function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
- {
-  $this->myDOMNodelist=$aDOMNodelist;
-  $this->nodeset=array();
-  $i=0;
-  if (isset($this->myDOMNodelist))
-   while ($node=$this->myDOMNodelist->item($i))
-   {
-    $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument);
-    $i++;
-   }
- }
-}
-
-class php4DOMXPath
-{
- var $myDOMXPath;
- var $myOwnerDocument;
- function php4DOMXPath($dom_document)
- {
-  $this->myOwnerDocument=$dom_document;
-  $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode);
- }
- function query($eval_str,$contextnode)
- {
-  if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument);
-  else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument);
- }
- function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
-}
-
-if (extension_loaded('xsl'))
-{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
- function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
- function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
- function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
- class php4DomXsltStylesheet
- {
-  var $myxsltProcessor;
-  function php4DomXsltStylesheet($dom_document)
-  {
-   $this->myxsltProcessor=new xsltProcessor();
-   $this->myxsltProcessor->importStyleSheet($dom_document);
-  }
-  function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
-  {
-   foreach ($xslt_parameters as $param=>$value)
-    $this->myxsltProcessor->setParameter('',$param,$value);
-   $myphp4DOMDocument=new php4DOMDocument();
-   $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
-   return $myphp4DOMDocument;
-  }
-  function result_dump_file($dom_document,$filename)
-  {
-   $html=$dom_document->myDOMNode->saveHTML();
-   file_put_contents($filename,$html);
-   return $html;
-  }
-  function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
- }
-}
+<?php
+
+
+/**
+
+
+ * @file domxml-php4-php5.php
+
+
+ * Require PHP5, uses built-in DOM extension.
+
+
+ * To be used in PHP4 scripts using DOMXML extension.
+
+
+ * Allows PHP4/DOMXML scripts to run on PHP5/DOM.
+
+
+ * (Requires PHP5/XSL extension for domxml_xslt functions)
+
+
+ *
+
+
+ * Typical use:
+
+
+ * <pre>
+
+
+ * {
+
+
+ *  if (version_compare(PHP_VERSION,'5','>='))
+
+
+ *   require_once('domxml-php4-to-php5.php');
+
+
+ * }
+
+
+ * </pre>
+
+
+ *
+
+
+ * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
+
+
+ *
+
+
+ * ------------------------------------------------------------------<br>
+
+
+ * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
+
+
+ *
+
+
+ * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
+
+
+ * http://creativecommons.org/licenses/by-sa/2.0/fr/
+
+
+ * http://alexandre.alapetite.net/divers/apropos/#by-sa
+
+
+ * - Attribution. You must give the original author credit
+
+
+ * - Share Alike. If you alter, transform, or build upon this work,
+
+
+ *   you may distribute the resulting work only under a license identical to this one
+
+
+ * - The French law is authoritative
+
+
+ * - Any of these conditions can be waived if you get permission from Alexandre Alapetite
+
+
+ * - Please send to Alexandre Alapetite the modifications you make,
+
+
+ *   in order to improve this file for the benefit of everybody
+
+
+ *
+
+
+ * If you want to distribute this code, please do it as a link to:
+
+
+ * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
+
+
+ */
+
+
+
+
+
+function domxml_new_doc($version) {return new php4DOMDocument('');}
+
+
+function domxml_open_file($filename) {return new php4DOMDocument($filename);}
+
+
+function domxml_open_mem($str)
+
+
+{
+
+
+ $dom=new php4DOMDocument('');
+
+
+ $dom->myDOMNode->loadXML($str);
+
+
+ return $dom;
+
+
+}
+
+
+function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);}
+
+
+function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
+
+
+
+
+
+class php4DOMAttr extends php4DOMNode
+
+
+{
+
+
+ function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;}
+
+
+ function Name() {return $this->myDOMNode->name;}
+
+
+ function Specified() {return $this->myDOMNode->specified;}
+
+
+ function Value() {return $this->myDOMNode->value;}
+
+
+}
+
+
+
+
+
+class php4DOMDocument extends php4DOMNode
+
+
+{
+
+
+ function php4DOMDocument($filename='')
+
+
+ {
+
+
+  $this->myDOMNode=new DOMDocument();
+
+
+  if ($filename!='') $this->myDOMNode->load($filename);
+
+
+ }
+
+
+ function create_attribute($name,$value)
+
+
+ {
+
+
+  $myAttr=$this->myDOMNode->createAttribute($name);
+
+
+  $myAttr->value=$value;
+
+
+  return new php4DOMAttr($myAttr,$this);
+
+
+ }
+
+
+ function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
+
+
+ function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
+
+
+ function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
+
+
+ function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);}
+
+
+ function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
+
+
+ function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);}
+
+
+ function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();}
+
+
+ function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);}
+
+
+ function get_elements_by_tagname($name)
+
+
+ {
+
+
+  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
+
+
+  $nodeSet=array();
+
+
+  $i=0;
+
+
+  if (isset($myDOMNodeList))
+
+
+   while ($node=$myDOMNodeList->item($i))
+
+
+   {
+
+
+    $nodeSet[]=new php4DOMElement($node,$this);
+
+
+    $i++;
+
+
+   }
+
+
+  return $nodeSet;
+
+
+ }
+
+
+ function html_dump_mem() {return $this->myDOMNode->saveHTML();}
+
+
+ function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
+
+
+}
+
+
+
+
+
+class php4DOMElement extends php4DOMNode
+
+
+{
+
+
+ function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
+
+
+ function get_elements_by_tagname($name)
+
+
+ {
+
+
+  $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
+
+
+  $nodeSet=array();
+
+
+  $i=0;
+
+
+  if (isset($myDOMNodeList))
+
+
+   while ($node=$myDOMNodeList->item($i))
+
+
+   {
+
+
+    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+
+
+    $i++;
+
+
+   }
+
+
+  return $nodeSet;
+
+
+ }
+
+
+ function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
+
+
+ function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
+
+
+ function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);}
+
+
+ function tagname() {return $this->myDOMNode->tagName;}
+
+
+}
+
+
+
+
+
+class php4DOMNode
+
+
+{
+
+
+ var $myDOMNode;
+
+
+ var $myOwnerDocument;
+
+
+ function php4DOMNode($aDomNode,$aOwnerDocument)
+
+
+ {
+
+
+  $this->myDOMNode=$aDomNode;
+
+
+  $this->myOwnerDocument=$aOwnerDocument;
+
+
+ }
+
+
+ function __get($name)
+
+
+ {
+
+
+  if ($name=='type') return $this->myDOMNode->nodeType;
+
+
+  elseif ($name=='tagname') return $this->myDOMNode->tagName;
+
+
+  elseif ($name=='content') return $this->myDOMNode->textContent;
+
+
+  else
+
+
+  {
+
+
+   $myErrors=debug_backtrace();
+
+
+   trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
+
+
+   return false;
+
+
+  }
+
+
+ }
+
+
+ function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
+
+
+ function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
+
+
+ function attributes()
+
+
+ {
+
+
+  $myDOMNodeList=$this->myDOMNode->attributes;
+
+
+  $nodeSet=array();
+
+
+  $i=0;
+
+
+  if (isset($myDOMNodeList))
+
+
+   while ($node=$myDOMNodeList->item($i))
+
+
+   {
+
+
+    $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
+
+
+    $i++;
+
+
+   }
+
+
+  return $nodeSet;
+
+
+ }
+
+
+ function child_nodes()
+
+
+ {
+
+
+  $myDOMNodeList=$this->myDOMNode->childNodes;
+
+
+  $nodeSet=array();
+
+
+  $i=0;
+
+
+  if (isset($myDOMNodeList))
+
+
+   while ($node=$myDOMNodeList->item($i))
+
+
+   {
+
+
+    $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
+
+
+    $i++;
+
+
+   }
+
+
+  return $nodeSet;
+
+
+ }
+
+
+ function children() {return $this->child_nodes();}
+
+
+ function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
+
+
+ function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
+
+
+ function get_content() {return $this->myDOMNode->textContent;}
+
+
+ function has_attributes() {return $this->myDOMNode->hasAttributes();}
+
+
+ function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
+
+
+ function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);}
+
+
+ function is_blank_node()
+
+
+ {
+
+
+  $myDOMNodeList=$this->myDOMNode->childNodes;
+
+
+  $i=0;
+
+
+  if (isset($myDOMNodeList))
+
+
+   while ($node=$myDOMNodeList->item($i))
+
+
+   {
+
+
+    if (($node->nodeType==XML_ELEMENT_NODE)||
+
+
+        (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue)))
+
+
+     return false;
+
+
+    $i++;
+
+
+   }
+
+
+  return true;
+
+
+ }
+
+
+ function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
+
+
+ function new_child($name,$content)
+
+
+ {
+
+
+  $mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
+
+
+  $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content));
+
+
+  $this->myDOMNode->appendChild($mySubNode);
+
+
+  return new php4DOMElement($mySubNode,$this->myOwnerDocument);
+
+
+ }
+
+
+ function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
+
+
+ function node_name() {return $this->myDOMNode->localName;}
+
+
+ function node_type() {return $this->myDOMNode->nodeType;}
+
+
+ function node_value() {return $this->myDOMNode->nodeValue;}
+
+
+ function owner_document() {return $this->myOwnerDocument;}
+
+
+ function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
+
+
+ function prefix() {return $this->myDOMNode->prefix;}
+
+
+ function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
+
+
+ function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
+
+
+ function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);}
+
+
+ function set_content($text)
+
+
+ {
+
+
+  if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE))
+
+
+   $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
+
+
+  return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text));
+
+
+ }
+
+
+}
+
+
+
+
+
+class php4DOMNodelist
+
+
+{
+
+
+ var $myDOMNodelist;
+
+
+ var $nodeset;
+
+
+ function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
+
+
+ {
+
+
+  $this->myDOMNodelist=$aDOMNodelist;
+
+
+  $this->nodeset=array();
+
+
+  $i=0;
+
+
+  if (isset($this->myDOMNodelist))
+
+
+   while ($node=$this->myDOMNodelist->item($i))
+
+
+   {
+
+
+    $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument);
+
+
+    $i++;
+
+
+   }
+
+
+ }
+
+
+}
+
+
+
+
+
+class php4DOMXPath
+
+
+{
+
+
+ var $myDOMXPath;
+
+
+ var $myOwnerDocument;
+
+
+ function php4DOMXPath($dom_document)
+
+
+ {
+
+
+  $this->myOwnerDocument=$dom_document;
+
+
+  $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode);
+
+
+ }
+
+
+ function query($eval_str,$contextnode)
+
+
+ {
+
+
+  if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument);
+
+
+  else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument);
+
+
+ }
+
+
+ function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
+
+
+}
+
+
+
+
+
+if (extension_loaded('xsl'))
+
+
+{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
+
+
+ function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
+
+
+ function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
+
+
+ function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
+
+
+ class php4DomXsltStylesheet
+
+
+ {
+
+
+  var $myxsltProcessor;
+
+
+  function php4DomXsltStylesheet($dom_document)
+
+
+  {
+
+
+   $this->myxsltProcessor=new xsltProcessor();
+
+
+   $this->myxsltProcessor->importStyleSheet($dom_document);
+
+
+  }
+
+
+  function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
+
+
+  {
+
+
+   foreach ($xslt_parameters as $param=>$value)
+
+
+    $this->myxsltProcessor->setParameter('',$param,$value);
+
+
+   $myphp4DOMDocument=new php4DOMDocument();
+
+
+   $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
+
+
+   return $myphp4DOMDocument;
+
+
+  }
+
+
+  function result_dump_file($dom_document,$filename)
+
+
+  {
+
+
+   $html=$dom_document->myDOMNode->saveHTML();
+
+
+   file_put_contents($filename,$html);
+
+
+   return $html;
+
+
+  }
+
+
+  function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
+
+
+ }
+
+
+}
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/english.php b/auth/cas/CAS/languages/english.php
index c143450314..56987447e2 100644
--- a/auth/cas/CAS/languages/english.php
+++ b/auth/cas/CAS/languages/english.php
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentication wanted!',
- CAS_STR_LOGOUT 
- => 'CAS logout wanted!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Authentication failed!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/english.php
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'using server',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'CAS Authentication wanted!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'CAS logout wanted!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'CAS Authentication failed!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/french.php b/auth/cas/CAS/languages/french.php
index 675a7fc04e..43ec8955ca 100644
--- a/auth/cas/CAS/languages/french.php
+++ b/auth/cas/CAS/languages/french.php
@@ -1,28 +1,82 @@
-<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'utilisant le serveur',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Authentication CAS nécessaire&nbsp;!',
- CAS_STR_LOGOUT 
- => 'Déconnexion demandée&nbsp;!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Authentification CAS infructueuse&nbsp;!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Vous n\'avez pas été authentifié(e).</p><p>Vous pouvez soumettre votre requete à nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problème persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
-
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/english.php
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'utilisant le serveur',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'Authentication CAS nécessaire&nbsp;!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'Déconnexion demandée&nbsp;!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'Authentification CAS infructueuse&nbsp;!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Vous n\'avez pas été authentifié(e).</p><p>Vous pouvez soumettre votre requete à nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problème persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
+
+
+
+
+
+);
+
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/german.php b/auth/cas/CAS/languages/german.php
index 29daeb35dd..c847a2ee49 100644
--- a/auth/cas/CAS/languages/german.php
+++ b/auth/cas/CAS/languages/german.php
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/german.php
- * @author Henrik Genssen <hg at mediafactory.de>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'via Server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS Authentifizierung erforderlich!',
- CAS_STR_LOGOUT 
- => 'CAS Abmeldung!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'CAS Anmeldung fehlgeschlagen!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/german.php
+
+
+ * @author Henrik Genssen <hg at mediafactory.de>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => 'via Server',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'CAS Authentifizierung erforderlich!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'CAS Abmeldung!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'eigentlich h&auml;ten Sie zum CAS Server weitergeleitet werden sollen. Dr&uuml;cken Sie <a href="%s">hier</a> um fortzufahren.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'CAS Anmeldung fehlgeschlagen!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Der Dienst `<b>%s</b>\' ist nicht verf&uuml;gbar (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/greek.php b/auth/cas/CAS/languages/greek.php
index c17b1d6637..c545d64da7 100644
--- a/auth/cas/CAS/languages/greek.php
+++ b/auth/cas/CAS/languages/greek.php
@@ -1,27 +1,79 @@
-<?php
-
-/**
- * @file languages/greek.php
- * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER 
- => '÷ñçóéìïðïéåßôáé ï åîõðçñåôçôÞò',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'Áðáéôåßôáé ç ôáõôïðïßçóç CAS!',
- CAS_STR_LOGOUT 
- => 'Áðáéôåßôáé ç áðïóýíäåóç áðü CAS!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'Èá Ýðñåðå íá åß÷áôå áíáêáôåõèõíèåß óôïí åîõðçñåôçôÞ CAS. ÊÜíôå êëßê <a href="%s">åäþ</a> ãéá íá óõíå÷ßóåôå.',
- CAS_STR_AUTHENTICATION_FAILED 
- => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
- => '<p>Äåí ôáõôïðïéçèÞêáôå.</p><p>Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê <a href="%s">åäþ</a>.</p><p>Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí <a href="mailto:%s">äéá÷åéñéóôÞ</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Ç õðçñåóßá `<b>%s</b>\' äåí åßíáé äéáèÝóéìç (<b>%s</b>).'
-);
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/greek.php
+
+
+ * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+$this->_strings = array(
+
+
+ CAS_STR_USING_SERVER 
+
+
+ => '÷ñçóéìïðïéåßôáé ï åîõðçñåôçôÞò',
+
+
+ CAS_STR_AUTHENTICATION_WANTED 
+
+
+ => 'Áðáéôåßôáé ç ôáõôïðïßçóç CAS!',
+
+
+ CAS_STR_LOGOUT 
+
+
+ => 'Áðáéôåßôáé ç áðïóýíäåóç áðü CAS!',
+
+
+ CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
+
+ => 'Èá Ýðñåðå íá åß÷áôå áíáêáôåõèõíèåß óôïí åîõðçñåôçôÞ CAS. ÊÜíôå êëßê <a href="%s">åäþ</a> ãéá íá óõíå÷ßóåôå.',
+
+
+ CAS_STR_AUTHENTICATION_FAILED 
+
+
+ => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!',
+
+
+ CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
+
+ => '<p>Äåí ôáõôïðïéçèÞêáôå.</p><p>Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê <a href="%s">åäþ</a>.</p><p>Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí <a href="mailto:%s">äéá÷åéñéóôÞ</a>.</p>',
+
+
+ CAS_STR_SERVICE_UNAVAILABLE
+
+
+ => 'Ç õðçñåóßá `<b>%s</b>\' äåí åßíáé äéáèÝóéìç (<b>%s</b>).'
+
+
+);
+
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/japanese.php b/auth/cas/CAS/languages/japanese.php
index 333bb17b6a..48ccd63627 100644
--- a/auth/cas/CAS/languages/japanese.php
+++ b/auth/cas/CAS/languages/japanese.php
@@ -1,27 +1,53 @@
 <?php
 
+
+
 /**
+
  * @file languages/japanese.php
+
  * @author fnorif (fnorif@yahoo.co.jp)
+
  * 
+
  * Now Encoding is EUC-JP and LF
+
  **/
 
+
+
 $this->_strings = array(
+
  CAS_STR_USING_SERVER 
+
  => 'using server',
+
  CAS_STR_AUTHENTICATION_WANTED 
+
  => 'CAS¤Ë¤è¤ëǧ¾Ú¤ò¹Ô¤¤¤Þ¤¹',
+
  CAS_STR_LOGOUT 
+
  => 'CAS¤«¤é¥í¥°¥¢¥¦¥È¤·¤Þ¤¹!',
+
  CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
+
  => 'CAS¥µ¡¼¥Ð¤Ë¹Ô¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¼«Æ°Åª¤ËžÁ÷¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï <a href="%s">¤³¤Á¤é</a> ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ³¹Ô¤·¤Þ¤¹¡£',
+
  CAS_STR_AUTHENTICATION_FAILED 
+
  => 'CAS¤Ë¤è¤ëǧ¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿',
+
  CAS_STR_YOU_WERE_NOT_AUTHENTICATED 
+
  => '<p>ǧ¾Ú¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿.</p><p>¤â¤¦°ìÅ٥ꥯ¥¨¥¹¥È¤òÁ÷¿®¤¹¤ë¾ì¹ç¤Ï<a href="%s">¤³¤Á¤é</a>¤ò¥¯¥ê¥Ã¥¯.</p><p>ÌäÂ꤬²ò·è¤·¤Ê¤¤¾ì¹ç¤Ï <a href="mailto:%s">¤³¤Î¥µ¥¤¥È¤Î´ÉÍý¼Ô</a>¤ËÌ䤤¹ç¤ï¤»¤Æ¤¯¤À¤µ¤¤.</p>',
+
  CAS_STR_SERVICE_UNAVAILABLE
+
  => '¥µ¡¼¥Ó¥¹ `<b>%s</b>\' ¤ÏÍøÍѤǤ­¤Þ¤»¤ó (<b>%s</b>).'
+
 );
 
+
+
 ?>
\ No newline at end of file
diff --git a/auth/cas/CAS/languages/languages.php b/auth/cas/CAS/languages/languages.php
index 2c6f8bb3b3..0e234c4df7 100644
--- a/auth/cas/CAS/languages/languages.php
+++ b/auth/cas/CAS/languages/languages.php
@@ -1,24 +1,70 @@
-<?php
-
-/**
- * @file languages/languages.php
- * Internationalization constants
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-//@{
-/**
- * a phpCAS string index
- */
-define("CAS_STR_USING_SERVER",                1);
-define("CAS_STR_AUTHENTICATION_WANTED",       2);
-define("CAS_STR_LOGOUT",                      3);
-define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
-define("CAS_STR_AUTHENTICATION_FAILED",       5);
-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);
-define("CAS_STR_SERVICE_UNAVAILABLE",         7);
-//@}
-
+<?php
+
+
+
+
+
+/**
+
+
+ * @file languages/languages.php
+
+
+ * Internationalization constants
+
+
+ * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
+
+
+ * @sa @link internalLang Internationalization @endlink
+
+
+ * @ingroup internalLang
+
+
+ */
+
+
+
+
+
+//@{
+
+
+/**
+
+
+ * a phpCAS string index
+
+
+ */
+
+
+define("CAS_STR_USING_SERVER",                1);
+
+
+define("CAS_STR_AUTHENTICATION_WANTED",       2);
+
+
+define("CAS_STR_LOGOUT",                      3);
+
+
+define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
+
+
+define("CAS_STR_AUTHENTICATION_FAILED",       5);
+
+
+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);
+
+
+define("CAS_STR_SERVICE_UNAVAILABLE",         7);
+
+
+//@}
+
+
+
+
+
 ?>
\ No newline at end of file