chamilo / chamilo-lms

main/auth/set_temp_password.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 $user_id = api_get_user_id();
 

main/auth/inscription.php

Spacing +15 added lines, -15 removed lines

@@ -90,7 +90,7 @@ 
         if (api_get_setting('registration', 'email') != 'true') {
             $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
         }
-        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('email', get_lang('UserTaken'), 'username_available');
     }
 
@@ -123,7 +123,7 @@ 
         $form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
         $form->applyFilter('username', 'trim');
         $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
         $form->addRule('username', get_lang('UsernameWrong'), 'username');
         $form->addRule('username', get_lang('UserTaken'), 'username_available');
     }
@@ -144,7 +144,7 @@ 
     if (CHECK_PASS_EASY_TO_FIND) {
         $form->addRule(
             'password1',
-            get_lang('PassTooEasy') . ': ' . api_generate_password(),
+            get_lang('PassTooEasy').': '.api_generate_password(),
             'callback',
             'api_check_password'
         );
@@ -209,13 +209,13 @@ 
             'sessionVar'   => basename(__FILE__, '.php'),
             'imageOptions' => array(
                 'font_size' => 20,
-                'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
                 'font_file' => 'OpenSans-Regular.ttf',
                     //'output' => 'gif'
             )
         );
 
-        $captcha_question =  $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
+        $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
         $form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
 
         $form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
@@ -333,7 +333,7 @@ 
         }
     }
 
-    $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
+    $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
 
     if (api_get_setting('allow_terms_conditions') == 'true' && $user_already_registered_show_terms) {
         $tool_name = get_lang('TermsAndConditions');
@@ -354,11 +354,11 @@ 
     }
 
     if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
-        $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
+        $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
         $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         if (!empty($open)) {
-            $content =  '<div class="well_border">'.$open.'</div>';
+            $content = '<div class="well_border">'.$open.'</div>';
         }
     }
 
@@ -407,7 +407,7 @@ 
             null,
             get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'
         );
-        $form->addRule('legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
     } else {
         $preview = LegalManager::show_last_condition($term_preview);
         $form->addElement('label', null, $preview);
@@ -580,7 +580,7 @@ 
                 Database::query($sql);
 
                 // 2. Send mail to all platform admin
-                $emailsubject  = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
+                $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
                 $emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
                 $emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
 
@@ -667,7 +667,7 @@ 
         '<p>'.
         get_lang('Dear', null, $_user['language']).' '.
         stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
+        get_lang('PersonalSettings', null, $_user['language']).".</p>";
 
     $form_data = array(
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -680,14 +680,14 @@ 
     } else {
 
         if (!empty($values['email'])) {
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
+            $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
         }
 
         if ($is_allowedCreateCourse) {
             if ($usersCanCreateCourse) {
-                $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
             }
-            $form_data['action']  = '../create_course/add_course.php';
+            $form_data['action'] = '../create_course/add_course.php';
 
             if (api_get_setting('course_validation') == 'true') {
                 $form_data['button'] = Display::button(
@@ -707,7 +707,7 @@ 
         } else {
             if (api_get_setting('allow_students_to_browse_courses') == 'true') {
                 $form_data['action'] = 'courses.php?action=subscribe';
-                $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
+                $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
             } else {
                 $form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
             }

main/auth/profile.php

Indentation +1 added lines, -1 removed lines

@@ -684,7 +684,7 @@
 
     foreach ($user_data as $key => $value) {
         if (substr($key, 0, 6) == 'extra_') { //an extra field
-           continue;
+            continue;
         } elseif (strpos($key, 'remove_extra_') !== false) {
         } else {
             if (in_array($key, $available_values_to_modify)) {

Spacing +11 added lines, -11 removed lines

@@ -31,8 +31,8 @@ 
 }
 
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     var $image = $("#previewImage");
@@ -168,10 +168,10 @@ 
 if (api_is_western_name_order()) {
     //    FIRST NAME and LAST NAME
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
 } else {
     //    LAST NAME and FIRST NAME
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
 }
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -180,7 +180,7 @@ 
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 
 //    USERNAME
@@ -223,7 +223,7 @@ 
     $form->freeze('email');
 }
 
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
     $form->applyFilter('email', 'stripslashes');
     $form->applyFilter('email', 'trim');
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -389,7 +389,7 @@ 
 
 // the $jquery_ready_content variable collects all functions that
 // will be load in the $(document).ready javascript function
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 $(document).ready(function(){
     '.$jquery_ready_content.'
 });
@@ -545,7 +545,7 @@ 
 
             if (!check_user_email($user_data['email']) &&
                 empty($user_data['password0'])
-            ){
+            ) {
                 Display::addFlash(
                     Display:: return_message(
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -654,7 +654,7 @@ 
     $available_values_to_modify = array();
     foreach ($profile_list as $key => $status) {
         if ($status == 'true') {
-            switch($key) {
+            switch ($key) {
                 case 'login':
                     $available_values_to_modify[] = 'username';
                     break;
@@ -787,10 +787,10 @@ 
 
         if (isset($_GET['type']) && $_GET['type'] == 'extended') {
             $actions .= '<a href="profile.php?type=reduced'.$show.'">'.
-                Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
+                Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
         } else {
             $actions .= '<a href="profile.php?type=extended'.$show.'">'.
-                Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
+                Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
         }
         $actions .= '</div>';
     }

main/auth/cas/logout.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 require_once('authcas.php');
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
 
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
 phpCAS::logout();

main/auth/cas/logincas.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $firstpage = $_GET['firstpage'];
         setcookie("GotoCourse", $firstpage);
     }
-    if (!is_object($PHPCAS_CLIENT) ) {
+    if (!is_object($PHPCAS_CLIENT)) {
         phpCAS::client(
             $cas_auth_ver,
             $cas_auth_server,

main/auth/cas/lib/CAS/PGTStorage/pgt-file.php

Switch Indentation +6 added lines, -6 removed lines

@@ -163,12 +163,12 @@
       $this->_path = $path;

       // check the format and store it

       switch ($format) {

-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

-      case CAS_PGT_STORAGE_FILE_FORMAT_XML:

-	$this->_format = $format;

-	break;

-      default:

-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

+          case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

+          case CAS_PGT_STORAGE_FILE_FORMAT_XML:

+	    $this->_format = $format;

+	    break;

+          default:

+	    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

       }

       phpCAS::traceEnd();      

     }

Spacing +13 added lines, -13 removed lines

@@ -131,17 +131,17 @@ 
    *

    * @public

    */

-  function PGTStorageFile($cas_parent,$format,$path)

+  function PGTStorageFile($cas_parent, $format, $path)

     {

       phpCAS::traceBegin();

       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

+      if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

 

       // check that the path is an absolute path

-      if (getenv("OS")=="Windows_NT"){

+      if (getenv("OS") == "Windows_NT") {

       	

       	 if (!preg_match('`^[a-zA-Z]:`', $path)) {

 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

@@ -151,13 +151,13 @@ 
       else

       {

       

-      	if ( $path[0] != '/' ) {

+      	if ($path[0] != '/') {

 			phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

 

       	// store the path (with a leading and trailing '/')      

-      	$path = preg_replace('|[/]*$|','/',$path);

-      	$path = preg_replace('|^[/]*|','/',$path);

+      	$path = preg_replace('|[/]*$|', '/', $path);

+      	$path = preg_replace('|^[/]*|', '/', $path);

       }

       

       $this->_path = $path;

@@ -186,7 +186,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 	return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -222,12 +222,12 @@ 
    *

    * @public

    */

-  function write($pgt,$pgt_iou)

+  function write($pgt, $pgt_iou)

     {

       phpCAS::traceBegin();

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( $f=fopen($fname,"w") ) {

-	if ( fputs($f,$pgt) === FALSE ) {

+      if ($f = fopen($fname, "w")) {

+	if (fputs($f, $pgt) === FALSE) {

 	  phpCAS::error('could not write PGT to `'.$fname.'\'');

 	}

 	fclose($f);

@@ -252,10 +252,10 @@ 
       phpCAS::traceBegin();

       $pgt = FALSE;

       $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( !($f=fopen($fname,"r")) ) {

+      if (!($f = fopen($fname, "r"))) {

 	phpCAS::trace('could not open `'.$fname.'\'');

       } else {

-	if ( ($pgt=fgets($f)) === FALSE ) {

+	if (($pgt = fgets($f)) === FALSE) {

 	  phpCAS::trace('could not read PGT from `'.$fname.'\'');

 	} 

 	fclose($f);

Braces +10 added lines, -6 removed lines

@@ -137,8 +137,12 @@ 
       // call the ancestor's constructor

       $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+      if (empty($format) ) {
+          $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
+      }
+      if (empty($path) ) {
+          $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
+      }
 

       // check that the path is an absolute path

       if (getenv("OS")=="Windows_NT"){

@@ -147,8 +151,7 @@ 
 	     	phpCAS::error('an absolute path is needed for PGT storage to file');

       	}

       	

-      }

-      else

+      } else

       {

       

       	if ( $path[0] != '/' ) {

@@ -186,8 +189,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-	return;

+      if ( $this->isInitialized() ) {
+      	return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       phpCAS::traceEnd();      

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
    * This method returns the name of the directory where PGT's should be stored 

    * on the filesystem.

    *

-   * @return the name of a directory (with leading and trailing '/')

+   * @return string name of a directory (with leading and trailing '/')

    *

    * @private

    */

@@ -81,7 +81,7 @@ 
   /**

    * This method returns the format to use when storing PGT's on the filesystem.

    *

-   * @return a string corresponding to the format used (plain or xml).

+   * @return string string corresponding to the format used (plain or xml).

    *

    * @private

    */

Indentation +181 added lines, -181 removed lines

@@ -44,231 +44,231 @@
 

 class PGTStorageFile extends PGTStorage

 {

-  /** 

-   * @addtogroup internalPGTStorageFile 

-   * @{ 

-   */

+    /** 

+     * @addtogroup internalPGTStorageFile 

+     * @{ 

+     */

 

-  /**

-   * a string telling where PGT's should be stored on the filesystem. Written by

-   * PGTStorageFile::PGTStorageFile(), read by getPath().

-   *

-   * @private

-   */

-  var $_path;

+    /**

+     * a string telling where PGT's should be stored on the filesystem. Written by

+     * PGTStorageFile::PGTStorageFile(), read by getPath().

+     *

+     * @private

+     */

+    var $_path;

 

-  /**

-   * This method returns the name of the directory where PGT's should be stored 

-   * on the filesystem.

-   *

-   * @return the name of a directory (with leading and trailing '/')

-   *

-   * @private

-   */

-  function getPath()

+    /**

+     * This method returns the name of the directory where PGT's should be stored 

+     * on the filesystem.

+     *

+     * @return the name of a directory (with leading and trailing '/')

+     *

+     * @private

+     */

+    function getPath()

     {

-      return $this->_path;

+        return $this->_path;

     }

 

-  /**

-   * a string telling the format to use to store PGT's (plain or xml). Written by

-   * PGTStorageFile::PGTStorageFile(), read by getFormat().

-   *

-   * @private

-   */

-  var $_format;

+    /**

+     * a string telling the format to use to store PGT's (plain or xml). Written by

+     * PGTStorageFile::PGTStorageFile(), read by getFormat().

+     *

+     * @private

+     */

+    var $_format;

 

-  /**

-   * This method returns the format to use when storing PGT's on the filesystem.

-   *

-   * @return a string corresponding to the format used (plain or xml).

-   *

-   * @private

-   */

-  function getFormat()

+    /**

+     * This method returns the format to use when storing PGT's on the filesystem.

+     *

+     * @return a string corresponding to the format used (plain or xml).

+     *

+     * @private

+     */

+    function getFormat()

     {

-      return $this->_format;

+        return $this->_format;

     }

 

-  // ########################################################################

-  //  DEBUGGING

-  // ########################################################################

+    // ########################################################################

+    //  DEBUGGING

+    // ########################################################################

   

-  /**

-   * This method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @return string informational string.

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @return string informational string.

+     * @public

+     */

+    function getStorageType()

     {

-      return "file";

+        return "file";

     }

 

-  /**

-   * This method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @return string informational string.

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * This method returns an informational string giving informations on the

+     * parameters of the storage.(used for debugging purposes).

+     *

+     * @return string informational string.

+     * @public

+     */

+    function getStorageInfo()

     {

-      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';

+        return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';

     }

 

-  // ########################################################################

-  //  CONSTRUCTOR

-  // ########################################################################

+    // ########################################################################

+    //  CONSTRUCTOR

+    // ########################################################################

   

-  /**

-   * The class constructor, called by CASClient::SetPGTStorageFile().

-   *

-   * @param CASClient $cas_parent the CASClient instance that creates the object.

-   * @param string $format the format used to store the PGT's (`plain' and `xml' allowed).

-   * @param string $path the path where the PGT's should be stored

-   *

-   * @public

-   */

-  function PGTStorageFile($cas_parent,$format,$path)

+    /**

+     * The class constructor, called by CASClient::SetPGTStorageFile().

+     *

+     * @param CASClient $cas_parent the CASClient instance that creates the object.

+     * @param string $format the format used to store the PGT's (`plain' and `xml' allowed).

+     * @param string $path the path where the PGT's should be stored

+     *

+     * @public

+     */

+    function PGTStorageFile($cas_parent,$format,$path)

     {

-      phpCAS::traceBegin();

-      // call the ancestor's constructor

-      $this->PGTStorage($cas_parent);

+        phpCAS::traceBegin();

+        // call the ancestor's constructor

+        $this->PGTStorage($cas_parent);

 

-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

+        if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;

+        if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;

 

-      // check that the path is an absolute path

-      if (getenv("OS")=="Windows_NT"){

+        // check that the path is an absolute path

+        if (getenv("OS")=="Windows_NT"){

       	

-      	 if (!preg_match('`^[a-zA-Z]:`', $path)) {

-	     	phpCAS::error('an absolute path is needed for PGT storage to file');

-      	}

+            if (!preg_match('`^[a-zA-Z]:`', $path)) {

+                phpCAS::error('an absolute path is needed for PGT storage to file');

+            }

       	

-      }

-      else

-      {

+        }

+        else

+        {

       

-      	if ( $path[0] != '/' ) {

-			phpCAS::error('an absolute path is needed for PGT storage to file');

-      	}

+            if ( $path[0] != '/' ) {

+            phpCAS::error('an absolute path is needed for PGT storage to file');

+            }

 

-      	// store the path (with a leading and trailing '/')      

-      	$path = preg_replace('|[/]*$|','/',$path);

-      	$path = preg_replace('|^[/]*|','/',$path);

-      }

+            // store the path (with a leading and trailing '/')      

+            $path = preg_replace('|[/]*$|','/',$path);

+            $path = preg_replace('|^[/]*|','/',$path);

+        }

       

-      $this->_path = $path;

-      // check the format and store it

-      switch ($format) {

-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

+        $this->_path = $path;

+        // check the format and store it

+        switch ($format) {

+        case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:

       case CAS_PGT_STORAGE_FILE_FORMAT_XML:

-	$this->_format = $format;

-	break;

-      default:

-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

-      }

-      phpCAS::traceEnd();      

+    $this->_format = $format;

+    break;

+        default:

+    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');

+        }

+        phpCAS::traceEnd();      

     }

 

-  // ########################################################################

-  //  INITIALIZATION

-  // ########################################################################

+    // ########################################################################

+    //  INITIALIZATION

+    // ########################################################################

   

-  /**

-   * This method is used to initialize the storage. Halts on error.

-   *

-   * @public

-   */

-  function init()

+    /**

+     * 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();

-      phpCAS::traceEnd();      

+        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();

+        phpCAS::traceEnd();      

     }

 

-  // ########################################################################

-  //  PGT I/O

-  // ########################################################################

+    // ########################################################################

+    //  PGT I/O

+    // ########################################################################

 

-  /**

-   * This method returns the filename corresponding to a PGT Iou.

-   *

-   * @param $pgt_iou the PGT iou.

-   *

-   * @return string filename

-   * @private

-   */

-  function getPGTIouFilename($pgt_iou)

+    /**

+     * This method returns the filename corresponding to a PGT Iou.

+     *

+     * @param $pgt_iou the PGT iou.

+     *

+     * @return string filename

+     * @private

+     */

+    function getPGTIouFilename($pgt_iou)

     {

-      phpCAS::traceBegin();

-      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();

-      phpCAS::traceEnd($filename);

-      return $filename;

+        phpCAS::traceBegin();

+        $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();

+        phpCAS::traceEnd($filename);

+        return $filename;

     }

   

-  /**

-   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a

-   * warning on error.

-   *

-   * @param $pgt the PGT

-   * @param $pgt_iou the PGT iou

-   *

-   * @public

-   */

-  function write($pgt,$pgt_iou)

+    /**

+     * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a

+     * warning on error.

+     *

+     * @param $pgt the PGT

+     * @param $pgt_iou the PGT iou

+     *

+     * @public

+     */

+    function write($pgt,$pgt_iou)

     {

-      phpCAS::traceBegin();

-      $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( $f=fopen($fname,"w") ) {

-	if ( fputs($f,$pgt) === FALSE ) {

-	  phpCAS::error('could not write PGT to `'.$fname.'\'');

-	}

-	fclose($f);

-      } else {

-	phpCAS::error('could not open `'.$fname.'\'');

-      }

-      phpCAS::traceEnd();      

+        phpCAS::traceBegin();

+        $fname = $this->getPGTIouFilename($pgt_iou);

+        if ( $f=fopen($fname,"w") ) {

+    if ( fputs($f,$pgt) === FALSE ) {

+        phpCAS::error('could not write PGT to `'.$fname.'\'');

+    }

+    fclose($f);

+        } else {

+    phpCAS::error('could not open `'.$fname.'\'');

+        }

+        phpCAS::traceEnd();      

     }

 

-  /**

-   * This method reads a PGT corresponding to a PGT Iou and deletes the 

-   * corresponding file.

-   *

-   * @param $pgt_iou the PGT iou

-   *

-   * @return false|string corresponding PGT, or FALSE on error

-   *

-   * @public

-   */

-  function read($pgt_iou)

+    /**

+     * This method reads a PGT corresponding to a PGT Iou and deletes the 

+     * corresponding file.

+     *

+     * @param $pgt_iou the PGT iou

+     *

+     * @return false|string corresponding PGT, or FALSE on error

+     *

+     * @public

+     */

+    function read($pgt_iou)

     {

-      phpCAS::traceBegin();

-      $pgt = FALSE;

-      $fname = $this->getPGTIouFilename($pgt_iou);

-      if ( !($f=fopen($fname,"r")) ) {

-	phpCAS::trace('could not open `'.$fname.'\'');

-      } else {

-	if ( ($pgt=fgets($f)) === FALSE ) {

-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');

-	} 

-	fclose($f);

-      }

+        phpCAS::traceBegin();

+        $pgt = FALSE;

+        $fname = $this->getPGTIouFilename($pgt_iou);

+        if ( !($f=fopen($fname,"r")) ) {

+    phpCAS::trace('could not open `'.$fname.'\'');

+        } else {

+    if ( ($pgt=fgets($f)) === FALSE ) {

+        phpCAS::trace('could not read PGT from `'.$fname.'\'');

+    } 

+    fclose($f);

+        }

 

-      // delete the PGT file

-      @unlink($fname);

+        // delete the PGT file

+        @unlink($fname);

 

-      phpCAS::traceEnd($pgt);

-      return $pgt;

+        phpCAS::traceEnd($pgt);

+        return $pgt;

     }

   

-  /** @} */

+    /** @} */

   

 }

 

main/auth/cas/lib/CAS/PGTStorage/pgt-db.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
    * @hideinitializer

    * @private

    */

-  var $_url='';

+  var $_url = '';

 

   /**

    * This method returns the PEAR DB URL to use to connect to the database.

@@ -159,18 +159,18 @@ 
    *

    * @public

    */

-  function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)

+  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;

+      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;

@@ -192,7 +192,7 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

+      if ($this->isInitialized())

 		return;

       // call the ancestor's method (mark as initialized)

       parent::init();

@@ -205,7 +205,7 @@ 
 

       // try to connect to the database

       $this->_link = DB::connect($this->getURL());

-      if ( DB::isError($this->_link) ) {

+      if (DB::isError($this->_link)) {

 	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');

       }

       var_dump($this->_link);

Braces +18 added lines, -7 removed lines

@@ -166,11 +166,21 @@ 
       // 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;

+      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;

@@ -192,8 +202,9 @@ 
     {

       phpCAS::traceBegin();

       // if the storage has already been initialized, return immediatly

-      if ( $this->isInitialized() )

-		return;

+      if ( $this->isInitialized() ) {
+      		return;
+      }
       // call the ancestor's method (mark as initialized)

       parent::init();

       

Indentation +140 added lines, -140 removed lines

@@ -45,175 +45,175 @@
 

 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 string PEAR DB URL

-   *

-   * @private

-   */

-  function getURL()

+    /** 

+     * @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 string PEAR DB URL

+     *

+     * @private

+     */

+    function getURL()

     {

-      return $this->_url;

+        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()

+    /**

+     * 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;

+        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 string name of a table.

-   *

-   * @private

-   */

-  function getTable()

+    /**

+     * 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 string name of a table.

+     *

+     * @private

+     */

+    function getTable()

     {

-      return $this->_table;

+        return $this->_table;

     }

 

-  // ########################################################################

-  //  DEBUGGING

-  // ########################################################################

+    // ########################################################################

+    //  DEBUGGING

+    // ########################################################################

   

-  /**

-   * This method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @return string informational string.

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @return string informational string.

+     * @public

+     */

+    function getStorageType()

     {

-      return "database";

+        return "database";

     }

 

-  /**

-   * This method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * 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().'\'';

+        return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';

     }

 

-  // ########################################################################

-  //  CONSTRUCTOR

-  // ########################################################################

+    // ########################################################################

+    //  CONSTRUCTOR

+    // ########################################################################

   

-  /**

-   * The class constructor, called by CASClient::SetPGTStorageDB().

-   *

-   * @param CASClient $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)

+    /**

+     * The class constructor, called by CASClient::SetPGTStorageDB().

+     *

+     * @param CASClient $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();

+        phpCAS::traceBegin();

 

-      // call the ancestor's constructor

-      $this->PGTStorage($cas_parent);

+        // 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;

+        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;

+        // build and store the PEAR DB URL

+        $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;

 

-      // XXX should use setURL and setTable

-      phpCAS::traceEnd();

+        // XXX should use setURL and setTable

+        phpCAS::traceEnd();

     }

   

-  // ########################################################################

-  //  INITIALIZATION

-  // ########################################################################

+    // ########################################################################

+    //  INITIALIZATION

+    // ########################################################################

   

-  /**

-   * This method is used to initialize the storage. Halts on error.

-   *

-   * @public

-   */

-  function init()

+    /**

+     * 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();

+        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();

       

-	  //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');

-	  }

-

-      // 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).')');

-      }

-      // Dump into trace

-      var_dump($this->_link);

-      phpCAS::traceBEnd();

+        //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');

+        }

+

+        // 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).')');

+        }

+        // Dump into trace

+        var_dump($this->_link);

+        phpCAS::traceBEnd();

     }

 

-  /** @} */

+    /** @} */

 }

 

 ?>
\ No newline at end of file

main/auth/cas/lib/CAS/PGTStorage/pgt-main.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
   function PGTStorage($cas_parent)

     {

       phpCAS::traceBegin();

-      if ( !$cas_parent->isProxy() ) {

+      if (!$cas_parent->isProxy()) {

 	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

       }

       phpCAS::traceEnd();

@@ -107,7 +107,7 @@ 
    * @private

    * @deprecated not used.

    */

-  var $_error_message=FALSE;

+  var $_error_message = FALSE;

 

   /**

    * This method sets en error message, which can be read later by 

@@ -185,7 +185,7 @@ 
    *

    * @protected

    */

-  function write($pgt,$pgt_iou)

+  function write($pgt, $pgt_iou)

     {

       phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
   /**

    * The constructor of the class, should be called only by inherited classes.

    *

-   * @param $cas_parent the CASclient instance that creates the current object.

+   * @param CASClient $cas_parent the CASclient instance that creates the current object.

    *

    * @protected

    */

Indentation +131 added lines, -131 removed lines

@@ -44,167 +44,167 @@
 

 class PGTStorage

 {

-  /** 

-   * @addtogroup internalPGTStorage

-   * @{ 

-   */

-

-  // ########################################################################

-  //  CONSTRUCTOR

-  // ########################################################################

+    /** 

+     * @addtogroup internalPGTStorage

+     * @{ 

+     */

+

+    // ########################################################################

+    //  CONSTRUCTOR

+    // ########################################################################

   

-  /**

-   * The constructor of the class, should be called only by inherited classes.

-   *

-   * @param $cas_parent the CASclient instance that creates the current object.

-   *

-   * @protected

-   */

-  function PGTStorage($cas_parent)

+    /**

+     * The constructor of the class, should be called only by inherited classes.

+     *

+     * @param $cas_parent the CASclient instance that creates the current object.

+     *

+     * @protected

+     */

+    function PGTStorage($cas_parent)

     {

-      phpCAS::traceBegin();

-      if ( !$cas_parent->isProxy() ) {

-	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

-      }

-      phpCAS::traceEnd();

+        phpCAS::traceBegin();

+        if ( !$cas_parent->isProxy() ) {

+    phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); 

+        }

+        phpCAS::traceEnd();

     }

 

-  // ########################################################################

-  //  DEBUGGING

-  // ########################################################################

+    // ########################################################################

+    //  DEBUGGING

+    // ########################################################################

   

-  /**

-   * This virtual method returns an informational string giving the type of storage

-   * used by the object (used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageType()

+    /**

+     * This virtual method returns an informational string giving the type of storage

+     * used by the object (used for debugging purposes).

+     *

+     * @public

+     */

+    function getStorageType()

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /**

-   * This virtual method returns an informational string giving informations on the

-   * parameters of the storage.(used for debugging purposes).

-   *

-   * @public

-   */

-  function getStorageInfo()

+    /**

+     * This virtual method returns an informational string giving informations on the

+     * parameters of the storage.(used for debugging purposes).

+     *

+     * @public

+     */

+    function getStorageInfo()

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  // ########################################################################

-  //  ERROR HANDLING

-  // ########################################################################

+    // ########################################################################

+    //  ERROR HANDLING

+    // ########################################################################

   

-  /**

-   * string used to store an error message. Written by PGTStorage::setErrorMessage(),

-   * read by PGTStorage::getErrorMessage().

-   *

-   * @hideinitializer

-   * @private

-   * @deprecated not used.

-   */

-  var $_error_message=FALSE;

-

-  /**

-   * This method sets en error message, which can be read later by 

-   * PGTStorage::getErrorMessage().

-   *

-   * @param $error_message an error message

-   *

-   * @protected

-   * @deprecated not used.

-   */

-  function setErrorMessage($error_message)

+    /**

+     * string used to store an error message. Written by PGTStorage::setErrorMessage(),

+     * read by PGTStorage::getErrorMessage().

+     *

+     * @hideinitializer

+     * @private

+     * @deprecated not used.

+     */

+    var $_error_message=FALSE;

+

+    /**

+     * This method sets en error message, which can be read later by 

+     * PGTStorage::getErrorMessage().

+     *

+     * @param $error_message an error message

+     *

+     * @protected

+     * @deprecated not used.

+     */

+    function setErrorMessage($error_message)

     {

-      $this->_error_message = $error_message;

+        $this->_error_message = $error_message;

     }

 

-  /**

-   * This method returns an error message set by PGTStorage::setErrorMessage().

-   *

-   * @return boolean error message when set by PGTStorage::setErrorMessage(), FALSE

-   * otherwise.

-   *

-   * @public

-   * @deprecated not used.

-   */

-  function getErrorMessage()

+    /**

+     * This method returns an error message set by PGTStorage::setErrorMessage().

+     *

+     * @return boolean error message when set by PGTStorage::setErrorMessage(), FALSE

+     * otherwise.

+     *

+     * @public

+     * @deprecated not used.

+     */

+    function getErrorMessage()

     {

-      return $this->_error_message;

+        return $this->_error_message;

     }

 

-  // ########################################################################

-  //  INITIALIZATION

-  // ########################################################################

-

-  /**

-   * a boolean telling if the storage has already been initialized. Written by 

-   * PGTStorage::init(), read by PGTStorage::isInitialized().

-   *

-   * @hideinitializer

-   * @private

-   */

-  var $_initialized = FALSE;

-

-  /**

-   * This method tells if the storage has already been intialized.

-   *

-   * @return boolean boolean

-   *

-   * @protected

-   */

-  function isInitialized()

+    // ########################################################################

+    //  INITIALIZATION

+    // ########################################################################

+

+    /**

+     * a boolean telling if the storage has already been initialized. Written by 

+     * PGTStorage::init(), read by PGTStorage::isInitialized().

+     *

+     * @hideinitializer

+     * @private

+     */

+    var $_initialized = FALSE;

+

+    /**

+     * This method tells if the storage has already been intialized.

+     *

+     * @return boolean boolean

+     *

+     * @protected

+     */

+    function isInitialized()

     {

-      return $this->_initialized;

+        return $this->_initialized;

     }

 

-  /**

-   * This virtual method initializes the object.

-   *

-   * @protected

-   */

-  function init()

+    /**

+     * This virtual method initializes the object.

+     *

+     * @protected

+     */

+    function init()

     {

-      $this->_initialized = TRUE;

+        $this->_initialized = TRUE;

     }

 

-  // ########################################################################

-  //  PGT I/O

-  // ########################################################################

-

-  /**

-   * This virtual method stores a PGT and its corresponding PGT Iuo.

-   * @note Should never be called.

-   *

-   * @param $pgt the PGT

-   * @param $pgt_iou the PGT iou

-   *

-   * @protected

-   */

-  function write($pgt,$pgt_iou)

+    // ########################################################################

+    //  PGT I/O

+    // ########################################################################

+

+    /**

+     * This virtual method stores a PGT and its corresponding PGT Iuo.

+     * @note Should never be called.

+     *

+     * @param $pgt the PGT

+     * @param $pgt_iou the PGT iou

+     *

+     * @protected

+     */

+    function write($pgt,$pgt_iou)

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /**

-   * This virtual method reads a PGT corresponding to a PGT Iou and deletes

-   * the corresponding storage entry.

-   * @note Should never be called.

-   *

-   * @param $pgt_iou the PGT iou

-   *

-   * @protected

-   */

-  function read($pgt_iou)

+    /**

+     * This virtual method reads a PGT corresponding to a PGT Iou and deletes

+     * the corresponding storage entry.

+     * @note Should never be called.

+     *

+     * @param $pgt_iou the PGT iou

+     *

+     * @protected

+     */

+    function read($pgt_iou)

     {

-      phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

+        phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 

     }

 

-  /** @} */

+    /** @} */

   

 } 

 

main/auth/cas/lib/CAS/languages/german.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $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>).'

+    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