Passed
Push — 1.10.x ( cede17...88b3ac )
by Angel Fernando Quiroz
56:04
created
custompages/language.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -9,30 +9,30 @@  discard block
 block discarded – undo
9 9
  * Get the preferred language base on the browser headers
10 10
  */
11 11
 function get_preferred_language($available_langs) {
12
-	$langs = array();
13
-	foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
14
-		$rawlang = explode(';q=', $httplang);
15
-		if (strpos($rawlang[0], '-') !== FALSE) {
16
-			$rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
17
-		}
18
-		if (count($rawlang) == 1) {
19
-			$rawlang[1] = 1.0;
20
-		}
21
-		$langs[$rawlang[1]] = $rawlang[0];
22
-	}
23
-	krsort($langs, SORT_NUMERIC);
24
-	foreach($langs as $weight => $code) {
25
-		if (in_array($code, $available_langs)) {
26
-			return $code;
27
-		}
28
-	}
29
-	return null;
12
+    $langs = array();
13
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
14
+        $rawlang = explode(';q=', $httplang);
15
+        if (strpos($rawlang[0], '-') !== FALSE) {
16
+            $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
17
+        }
18
+        if (count($rawlang) == 1) {
19
+            $rawlang[1] = 1.0;
20
+        }
21
+        $langs[$rawlang[1]] = $rawlang[0];
22
+    }
23
+    krsort($langs, SORT_NUMERIC);
24
+    foreach($langs as $weight => $code) {
25
+        if (in_array($code, $available_langs)) {
26
+            return $code;
27
+        }
28
+    }
29
+    return null;
30 30
 }
31 31
 /**
32
- * Get a language variable in a specific language
33
- */
32
+     * Get a language variable in a specific language
33
+     */
34 34
 function custompages_get_lang($variable) {
35
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
35
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
36 36
 }
37 37
 
38 38
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');
@@ -49,15 +49,15 @@  discard block
 block discarded – undo
49 49
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
50 50
 // recover previous value ...
51 51
 if (isset($_SESSION['user_language_choice']))
52
-	$lang_match = $_SESSION['user_language_choice'];
52
+    $lang_match = $_SESSION['user_language_choice'];
53 53
 
54 54
 // Chamilo parameter, on logout
55 55
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
56
-	$lang_match = $_REQUEST['language'];
56
+    $lang_match = $_REQUEST['language'];
57 57
 }
58 58
 // Incoming link parameter
59 59
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
60
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
60
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
61 61
 }
62 62
 
63 63
 $detect = api_get_setting('auto_detect_language_custom_pages');
Please login to merge, or discard this patch.
app/Migrations/Schema/V110/Version20150528103216.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
      */
17 17
     public function up(Schema $schema)
18 18
     {
19
-  	    $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
19
+            $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime');
20 20
         $this->addSql('ALTER TABLE session ADD COLUMN access_end_date datetime');
21 21
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_start_date datetime');
22 22
         $this->addSql('ALTER TABLE session ADD COLUMN coach_access_end_date datetime');
Please login to merge, or discard this patch.
app/config/profile.conf.dist.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
 
20 20
 // Replacing user photos
21 21
 define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
22
-	// true  -> the new image have the name of previous.
23
-	// false -> a new name is build for each upladed image.
22
+    // true  -> the new image have the name of previous.
23
+    // false -> a new name is build for each upladed image.
24 24
 define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
25
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
-	// false -> only the last image still on server.
25
+    // true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
+    // false -> only the last image still on server.
27 27
 
28 28
 // Official code
29 29
 // Don't forget to change name of offical code in your organization
Please login to merge, or discard this patch.
app/config/auth.conf.dist.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -39,29 +39,29 @@
 block discarded – undo
39 39
  * Array of connection parameters
40 40
  **/
41 41
 $extldap_config = array(
42
-  //base dommain string
43
-  'base_dn' => 'DC=cblue,DC=be',
44
-  //admin distinguished name
45
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
-  //admin password
47
-  'admin_password' => 'pass',
48
-  //ldap host
49
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
-  // filter
42
+    //base dommain string
43
+    'base_dn' => 'DC=cblue,DC=be',
44
+    //admin distinguished name
45
+    'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
+    //admin password
47
+    'admin_password' => 'pass',
48
+    //ldap host
49
+    'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
+    // filter
51 51
 //  'filter' => '', // no () arround the string
52
-  //'port' => , default on 389
53
-  //protocl version (2 or 3)
54
-  'protocol_version' => 3,
55
-  // set this to 0 to connect to AD server
56
-  'referrals' => 0,
57
-  //String used to search the user in ldap. %username will ber replaced by the username.
58
-  //See extldap_get_user_search_string() function below
52
+    //'port' => , default on 389
53
+    //protocl version (2 or 3)
54
+    'protocol_version' => 3,
55
+    // set this to 0 to connect to AD server
56
+    'referrals' => 0,
57
+    //String used to search the user in ldap. %username will ber replaced by the username.
58
+    //See extldap_get_user_search_string() function below
59 59
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60
-  'user_search' => 'uid=%username%',  // no () arround the string
61
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
-  'encoding' => 'UTF-8',
63
-  //Set to true if user info have to be update at each login
64
-  'update_userinfo' => true
60
+    'user_search' => 'uid=%username%',  // no () arround the string
61
+    //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
+    'encoding' => 'UTF-8',
63
+    //Set to true if user info have to be update at each login
64
+    'update_userinfo' => true
65 65
 );
66 66
 
67 67
 
Please login to merge, or discard this patch.
user_portal.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 
189 189
 //Show the chamilo mascot
190 190
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
191
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
191
+    $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
192 192
 }
193 193
 
194 194
 $controller->tpl->assign('content', $courseAndSessions['html']);
Please login to merge, or discard this patch.
news_list.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 
8 8
 $actions = '';
9 9
 if (api_is_platform_admin()) {
10
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
10
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
11 11
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
12 12
 }
13 13
 
Please login to merge, or discard this patch.
main/auth/profile.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -684,7 +684,7 @@
 block discarded – undo
684 684
 
685 685
     foreach ($user_data as $key => $value) {
686 686
         if (substr($key, 0, 6) == 'extra_') { //an extra field
687
-           continue;
687
+            continue;
688 688
         } elseif (strpos($key, 'remove_extra_') !== false) {
689 689
         } else {
690 690
             if (in_array($key, $available_values_to_modify)) {
Please login to merge, or discard this patch.
main/auth/cas/authcas.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 *
15 15
 **/
16 16
 function cas_configured() {
17
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
17
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
18 18
     $res = false;
19 19
     if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) {
20 20
         $res = true;
@@ -32,23 +32,23 @@  discard block
 block discarded – undo
32 32
 
33 33
 function cas_is_authenticated()
34 34
 {
35
-	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
36
-	global $PHPCAS_CLIENT;
37
-	global $logout;
35
+    global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
36
+    global $PHPCAS_CLIENT;
37
+    global $logout;
38 38
 
39 39
     if (!cas_configured()) {
40 40
         return;
41 41
     }
42 42
 
43
-	if (!is_object($PHPCAS_CLIENT)) {
44
-		phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
45
-		phpCAS::setNoCasServerValidation();
46
-	}
47
-	$auth = phpCAS::checkAuthentication();
43
+    if (!is_object($PHPCAS_CLIENT)) {
44
+        phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
45
+        phpCAS::setNoCasServerValidation();
46
+    }
47
+    $auth = phpCAS::checkAuthentication();
48 48
 
49
-	if ($auth) {
50
-		$login= trim(phpCAS::getUser());
51
-		/*
49
+    if ($auth) {
50
+        $login= trim(phpCAS::getUser());
51
+        /*
52 52
 		   Get user  attributes. Here are the attributes for crdp platform
53 53
 		   sn => name
54 54
 		   ENTPersonMailInterne => mail
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		   ENTPersonProfils => profil
57 57
 		   givenName => first name
58 58
 		 */
59
-		/*$user=phpCAS::getAttributes();
59
+        /*$user=phpCAS::getAttributes();
60 60
 		$firstName = trim($user['givenName']);
61 61
 		$lastName = trim($user['sn']);
62 62
 		$login = trim($user['ENTPersonAlias']);
@@ -79,54 +79,54 @@  discard block
 block discarded – undo
79 79
 			default:
80 80
 				$status=5; // Student
81 81
 		}*/
82
-		if (!$logout){
83
-		    // get user info from username
84
-		    $tab_user_info = api_get_user_info($login);
85
-
86
-		    // user found in the chamilo database
87
-		    if (is_array($tab_user_info)) {
88
-		        // if option is on we update user automatically from ldap server
89
-		        if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
82
+        if (!$logout){
83
+            // get user info from username
84
+            $tab_user_info = api_get_user_info($login);
85
+
86
+            // user found in the chamilo database
87
+            if (is_array($tab_user_info)) {
88
+                // if option is on we update user automatically from ldap server
89
+                if (api_get_setting("update_user_info_cas_with_ldap") == "true") {
90 90
                     $ldapuser = extldap_authenticate($login, 'nopass', true);
91 91
                     if ($ldapuser !== false) {
92 92
                         $chamilo_user = extldap_get_chamilo_user($ldapuser);
93 93
                         $chamilo_user['user_id'] = $tab_user_info['user_id'];
94 94
                         $chamilo_user['status'] = $tab_user_info['status'];
95
-        				UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
96
-		            }
97
-		        }
98
-		        return $login;
99
-		    }
100
-		    // user not found
101
-		    else {
102
-		        // if option is on we can ADD user automatically from ldap server or by modify own profil
103
-		        $user_added = false;
104
-		        switch (api_get_setting("cas_add_user_activate")) {
105
-		            case PLATFORM_AUTH_SOURCE :
106
-		                // user will have to modify firstname, lastname, email in chamilo profil edit
107
-		                $userdata = get_lang("EditInProfil");
108
-          				UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
109
-          				$user_added = $login;
110
-		                break;
111
-		            case LDAP_AUTH_SOURCE :
112
-		                // user info are read from ldap connexion
113
-	                    // get user info from ldap server
114
-	                    // user has already been authenticated by CAS
115
-	                    // If user not found in LDAP, user not created
116
-	                    $ldapuser = extldap_authenticate($login, 'nopass', true);
117
-	                    if ($ldapuser !== false) {
118
-	                        $chamilo_user = extldap_get_chamilo_user($ldapuser);
95
+                        UserManager::update_user ($chamilo_user["user_id"], $chamilo_user["firstname"], $chamilo_user["lastname"], $login, null, null, $chamilo_user["email"], $chamilo_user["status"], '', '', '', '', 1, null, 0, null,'') ;
96
+                    }
97
+                }
98
+                return $login;
99
+            }
100
+            // user not found
101
+            else {
102
+                // if option is on we can ADD user automatically from ldap server or by modify own profil
103
+                $user_added = false;
104
+                switch (api_get_setting("cas_add_user_activate")) {
105
+                    case PLATFORM_AUTH_SOURCE :
106
+                        // user will have to modify firstname, lastname, email in chamilo profil edit
107
+                        $userdata = get_lang("EditInProfil");
108
+                            UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
109
+                            $user_added = $login;
110
+                        break;
111
+                    case LDAP_AUTH_SOURCE :
112
+                        // user info are read from ldap connexion
113
+                        // get user info from ldap server
114
+                        // user has already been authenticated by CAS
115
+                        // If user not found in LDAP, user not created
116
+                        $ldapuser = extldap_authenticate($login, 'nopass', true);
117
+                        if ($ldapuser !== false) {
118
+                            $chamilo_user = extldap_get_chamilo_user($ldapuser);
119 119
                             $chamilo_user['username'] = $login;
120 120
                             $chamilo_user['auth_source'] = CAS_AUTH_SOURCE;
121 121
                             $chamilo_uid = external_add_user($chamilo_user);
122
-          				    $user_added = $login;
123
-          				}
124
-		                break;
125
-		            default : break;
126
-		        }
127
-		        return $user_added;
128
-		    }
129
-		}
122
+                                $user_added = $login;
123
+                            }
124
+                        break;
125
+                    default : break;
126
+                }
127
+                return $user_added;
128
+            }
129
+        }
130 130
 //		//If the user is in the dokeos database and we are ,not in a logout request, we upgrade his infomration by ldap
131 131
 //		if (! $logout){
132 132
 //			$user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
148 148
 //
149 149
 //			}
150 150
 //		}
151
-		return $login;
151
+        return $login;
152 152
     } else {
153
-		return false;
154
-	}
153
+        return false;
154
+    }
155 155
 }
156 156
 
157 157
 /**
Please login to merge, or discard this patch.
main/auth/cas/lib/CAS/PGTStorage/pgt-file.php 1 patch
Indentation   +184 added lines, -184 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
  */
30 30
 /**
31
- * @file CAS/PGTStorage/pgt-file.php
32
- * Basic class for PGT file storage
33
- */
31
+     * @file CAS/PGTStorage/pgt-file.php
32
+     * Basic class for PGT file storage
33
+     */
34 34
 
35 35
 /**
36 36
  * @class PGTStorageFile
@@ -44,231 +44,231 @@  discard block
 block discarded – undo
44 44
 
45 45
 class PGTStorageFile extends PGTStorage
46 46
 {
47
-  /** 
48
-   * @addtogroup internalPGTStorageFile 
49
-   * @{ 
50
-   */
47
+    /** 
48
+     * @addtogroup internalPGTStorageFile 
49
+     * @{ 
50
+     */
51 51
 
52
-  /**
53
-   * a string telling where PGT's should be stored on the filesystem. Written by
54
-   * PGTStorageFile::PGTStorageFile(), read by getPath().
55
-   *
56
-   * @private
57
-   */
58
-  var $_path;
52
+    /**
53
+     * a string telling where PGT's should be stored on the filesystem. Written by
54
+     * PGTStorageFile::PGTStorageFile(), read by getPath().
55
+     *
56
+     * @private
57
+     */
58
+    var $_path;
59 59
 
60
-  /**
61
-   * This method returns the name of the directory where PGT's should be stored 
62
-   * on the filesystem.
63
-   *
64
-   * @return the name of a directory (with leading and trailing '/')
65
-   *
66
-   * @private
67
-   */
68
-  function getPath()
60
+    /**
61
+     * This method returns the name of the directory where PGT's should be stored 
62
+     * on the filesystem.
63
+     *
64
+     * @return the name of a directory (with leading and trailing '/')
65
+     *
66
+     * @private
67
+     */
68
+    function getPath()
69 69
     {
70
-      return $this->_path;
70
+        return $this->_path;
71 71
     }
72 72
 
73
-  /**
74
-   * a string telling the format to use to store PGT's (plain or xml). Written by
75
-   * PGTStorageFile::PGTStorageFile(), read by getFormat().
76
-   *
77
-   * @private
78
-   */
79
-  var $_format;
73
+    /**
74
+     * a string telling the format to use to store PGT's (plain or xml). Written by
75
+     * PGTStorageFile::PGTStorageFile(), read by getFormat().
76
+     *
77
+     * @private
78
+     */
79
+    var $_format;
80 80
 
81
-  /**
82
-   * This method returns the format to use when storing PGT's on the filesystem.
83
-   *
84
-   * @return a string corresponding to the format used (plain or xml).
85
-   *
86
-   * @private
87
-   */
88
-  function getFormat()
81
+    /**
82
+     * This method returns the format to use when storing PGT's on the filesystem.
83
+     *
84
+     * @return a string corresponding to the format used (plain or xml).
85
+     *
86
+     * @private
87
+     */
88
+    function getFormat()
89 89
     {
90
-      return $this->_format;
90
+        return $this->_format;
91 91
     }
92 92
 
93
-  // ########################################################################
94
-  //  DEBUGGING
95
-  // ########################################################################
93
+    // ########################################################################
94
+    //  DEBUGGING
95
+    // ########################################################################
96 96
   
97
-  /**
98
-   * This method returns an informational string giving the type of storage
99
-   * used by the object (used for debugging purposes).
100
-   *
101
-   * @return an informational string.
102
-   * @public
103
-   */
104
-  function getStorageType()
97
+    /**
98
+     * This method returns an informational string giving the type of storage
99
+     * used by the object (used for debugging purposes).
100
+     *
101
+     * @return an informational string.
102
+     * @public
103
+     */
104
+    function getStorageType()
105 105
     {
106
-      return "file";
106
+        return "file";
107 107
     }
108 108
 
109
-  /**
110
-   * This method returns an informational string giving informations on the
111
-   * parameters of the storage.(used for debugging purposes).
112
-   *
113
-   * @return an informational string.
114
-   * @public
115
-   */
116
-  function getStorageInfo()
109
+    /**
110
+     * This method returns an informational string giving informations on the
111
+     * parameters of the storage.(used for debugging purposes).
112
+     *
113
+     * @return an informational string.
114
+     * @public
115
+     */
116
+    function getStorageInfo()
117 117
     {
118
-      return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
118
+        return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
119 119
     }
120 120
 
121
-  // ########################################################################
122
-  //  CONSTRUCTOR
123
-  // ########################################################################
121
+    // ########################################################################
122
+    //  CONSTRUCTOR
123
+    // ########################################################################
124 124
   
125
-  /**
126
-   * The class constructor, called by CASClient::SetPGTStorageFile().
127
-   *
128
-   * @param $cas_parent the CASClient instance that creates the object.
129
-   * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
130
-   * @param $path the path where the PGT's should be stored
131
-   *
132
-   * @public
133
-   */
134
-  function PGTStorageFile($cas_parent,$format,$path)
125
+    /**
126
+     * The class constructor, called by CASClient::SetPGTStorageFile().
127
+     *
128
+     * @param $cas_parent the CASClient instance that creates the object.
129
+     * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
130
+     * @param $path the path where the PGT's should be stored
131
+     *
132
+     * @public
133
+     */
134
+    function PGTStorageFile($cas_parent,$format,$path)
135 135
     {
136
-      phpCAS::traceBegin();
137
-      // call the ancestor's constructor
138
-      $this->PGTStorage($cas_parent);
136
+        phpCAS::traceBegin();
137
+        // call the ancestor's constructor
138
+        $this->PGTStorage($cas_parent);
139 139
 
140
-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141
-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
140
+        if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141
+        if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
142 142
 
143
-      // check that the path is an absolute path
144
-      if (getenv("OS")=="Windows_NT"){
143
+        // check that the path is an absolute path
144
+        if (getenv("OS")=="Windows_NT"){
145 145
       	
146
-      	 if (!preg_match('`^[a-zA-Z]:`', $path)) {
147
-	     	phpCAS::error('an absolute path is needed for PGT storage to file');
148
-      	}
146
+            if (!preg_match('`^[a-zA-Z]:`', $path)) {
147
+                phpCAS::error('an absolute path is needed for PGT storage to file');
148
+            }
149 149
       	
150
-      }
151
-      else
152
-      {
150
+        }
151
+        else
152
+        {
153 153
       
154
-      	if ( $path[0] != '/' ) {
155
-			phpCAS::error('an absolute path is needed for PGT storage to file');
156
-      	}
154
+            if ( $path[0] != '/' ) {
155
+            phpCAS::error('an absolute path is needed for PGT storage to file');
156
+            }
157 157
 
158
-      	// store the path (with a leading and trailing '/')      
159
-      	$path = preg_replace('|[/]*$|','/',$path);
160
-      	$path = preg_replace('|^[/]*|','/',$path);
161
-      }
158
+            // store the path (with a leading and trailing '/')      
159
+            $path = preg_replace('|[/]*$|','/',$path);
160
+            $path = preg_replace('|^[/]*|','/',$path);
161
+        }
162 162
       
163
-      $this->_path = $path;
164
-      // check the format and store it
165
-      switch ($format) {
166
-      case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
163
+        $this->_path = $path;
164
+        // check the format and store it
165
+        switch ($format) {
166
+        case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
167 167
       case CAS_PGT_STORAGE_FILE_FORMAT_XML:
168
-	$this->_format = $format;
169
-	break;
170
-      default:
171
-	phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
172
-      }
173
-      phpCAS::traceEnd();      
168
+    $this->_format = $format;
169
+    break;
170
+        default:
171
+    phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
172
+        }
173
+        phpCAS::traceEnd();      
174 174
     }
175 175
 
176
-  // ########################################################################
177
-  //  INITIALIZATION
178
-  // ########################################################################
176
+    // ########################################################################
177
+    //  INITIALIZATION
178
+    // ########################################################################
179 179
   
180
-  /**
181
-   * This method is used to initialize the storage. Halts on error.
182
-   *
183
-   * @public
184
-   */
185
-  function init()
180
+    /**
181
+     * This method is used to initialize the storage. Halts on error.
182
+     *
183
+     * @public
184
+     */
185
+    function init()
186 186
     {
187
-      phpCAS::traceBegin();
188
-      // if the storage has already been initialized, return immediatly
189
-      if ( $this->isInitialized() )
190
-	return;
191
-      // call the ancestor's method (mark as initialized)
192
-      parent::init();
193
-      phpCAS::traceEnd();      
187
+        phpCAS::traceBegin();
188
+        // if the storage has already been initialized, return immediatly
189
+        if ( $this->isInitialized() )
190
+    return;
191
+        // call the ancestor's method (mark as initialized)
192
+        parent::init();
193
+        phpCAS::traceEnd();      
194 194
     }
195 195
 
196
-  // ########################################################################
197
-  //  PGT I/O
198
-  // ########################################################################
196
+    // ########################################################################
197
+    //  PGT I/O
198
+    // ########################################################################
199 199
 
200
-  /**
201
-   * This method returns the filename corresponding to a PGT Iou.
202
-   *
203
-   * @param $pgt_iou the PGT iou.
204
-   *
205
-   * @return a filename
206
-   * @private
207
-   */
208
-  function getPGTIouFilename($pgt_iou)
200
+    /**
201
+     * This method returns the filename corresponding to a PGT Iou.
202
+     *
203
+     * @param $pgt_iou the PGT iou.
204
+     *
205
+     * @return a filename
206
+     * @private
207
+     */
208
+    function getPGTIouFilename($pgt_iou)
209 209
     {
210
-      phpCAS::traceBegin();
211
-      $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
212
-      phpCAS::traceEnd($filename);
213
-      return $filename;
210
+        phpCAS::traceBegin();
211
+        $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
212
+        phpCAS::traceEnd($filename);
213
+        return $filename;
214 214
     }
215 215
   
216
-  /**
217
-   * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
218
-   * warning on error.
219
-   *
220
-   * @param $pgt the PGT
221
-   * @param $pgt_iou the PGT iou
222
-   *
223
-   * @public
224
-   */
225
-  function write($pgt,$pgt_iou)
216
+    /**
217
+     * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
218
+     * warning on error.
219
+     *
220
+     * @param $pgt the PGT
221
+     * @param $pgt_iou the PGT iou
222
+     *
223
+     * @public
224
+     */
225
+    function write($pgt,$pgt_iou)
226 226
     {
227
-      phpCAS::traceBegin();
228
-      $fname = $this->getPGTIouFilename($pgt_iou);
229
-      if ( $f=fopen($fname,"w") ) {
230
-	if ( fputs($f,$pgt) === FALSE ) {
231
-	  phpCAS::error('could not write PGT to `'.$fname.'\'');
232
-	}
233
-	fclose($f);
234
-      } else {
235
-	phpCAS::error('could not open `'.$fname.'\'');
236
-      }
237
-      phpCAS::traceEnd();      
227
+        phpCAS::traceBegin();
228
+        $fname = $this->getPGTIouFilename($pgt_iou);
229
+        if ( $f=fopen($fname,"w") ) {
230
+    if ( fputs($f,$pgt) === FALSE ) {
231
+        phpCAS::error('could not write PGT to `'.$fname.'\'');
232
+    }
233
+    fclose($f);
234
+        } else {
235
+    phpCAS::error('could not open `'.$fname.'\'');
236
+        }
237
+        phpCAS::traceEnd();      
238 238
     }
239 239
 
240
-  /**
241
-   * This method reads a PGT corresponding to a PGT Iou and deletes the 
242
-   * corresponding file.
243
-   *
244
-   * @param $pgt_iou the PGT iou
245
-   *
246
-   * @return the corresponding PGT, or FALSE on error
247
-   *
248
-   * @public
249
-   */
250
-  function read($pgt_iou)
240
+    /**
241
+     * This method reads a PGT corresponding to a PGT Iou and deletes the 
242
+     * corresponding file.
243
+     *
244
+     * @param $pgt_iou the PGT iou
245
+     *
246
+     * @return the corresponding PGT, or FALSE on error
247
+     *
248
+     * @public
249
+     */
250
+    function read($pgt_iou)
251 251
     {
252
-      phpCAS::traceBegin();
253
-      $pgt = FALSE;
254
-      $fname = $this->getPGTIouFilename($pgt_iou);
255
-      if ( !($f=fopen($fname,"r")) ) {
256
-	phpCAS::trace('could not open `'.$fname.'\'');
257
-      } else {
258
-	if ( ($pgt=fgets($f)) === FALSE ) {
259
-	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
260
-	} 
261
-	fclose($f);
262
-      }
252
+        phpCAS::traceBegin();
253
+        $pgt = FALSE;
254
+        $fname = $this->getPGTIouFilename($pgt_iou);
255
+        if ( !($f=fopen($fname,"r")) ) {
256
+    phpCAS::trace('could not open `'.$fname.'\'');
257
+        } else {
258
+    if ( ($pgt=fgets($f)) === FALSE ) {
259
+        phpCAS::trace('could not read PGT from `'.$fname.'\'');
260
+    } 
261
+    fclose($f);
262
+        }
263 263
 
264
-      // delete the PGT file
265
-      @unlink($fname);
264
+        // delete the PGT file
265
+        @unlink($fname);
266 266
 
267
-      phpCAS::traceEnd($pgt);
268
-      return $pgt;
267
+        phpCAS::traceEnd($pgt);
268
+        return $pgt;
269 269
     }
270 270
   
271
-  /** @} */
271
+    /** @} */
272 272
   
273 273
 }
274 274
 
Please login to merge, or discard this patch.