Inspection of "Re-introduce the code condition to show SVG icons..." - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.10.x ( fe0e5a...3a6f9c )

by Yannick

created 2016-05-19 18:13 UTC

Status

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -9,10 +9,10 @@  discard block
 block discarded – undo
  * Code
  */
 // Diffie-Hellman Key Exchange Default Value.
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
         '349783925984760375594985848253359305585439638443');
 
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
 function openid_redirect_http($url, $message) {
     $query = array();
     foreach ($message as $key => $val) {
-        $query[] = $key . '=' . urlencode($val);
+        $query[] = $key.'='.urlencode($val);
     }
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
     //exit;
 }
 
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
  * This function should be deprecated for 1.8.6.2 needs documentation
  */
 function openid_redirect($url, $message) {
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
     foreach ($message as $key => $value) {
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
     $output .= '</form>';
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
     $output .= "</body></html>";
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
             if ($encoded_message != '') {
                 $encoded_message .= '&';
             }
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
         }
     }
 
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
  */
 function _openid_nonce() {
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
             chr(mt_rand(0, 25) + 65);
 }
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[3])) {
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
         return trim($href[1]);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
  * Pull the http-equiv attribute out of an html meta element
  */
 function _openid_meta_httpequiv($equiv, $html) {
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[1])) {
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
         return $content[1];
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
     $sign_data = array();
 
     foreach ($keys_to_sign as $key) {
-        if (isset($message_array['openid.' . $key])) {
-            $sign_data[$key] = $message_array['openid.' . $key];
+        if (isset($message_array['openid.'.$key])) {
+            $sign_data[$key] = $message_array['openid.'.$key];
         }
     }
 
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
 
     return $hmac;
 }
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
     }
 
     do {
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
+        $bytes = "\x00"._openid_get_bytes($nbytes);
         $n = _openid_dh_binary_to_long($bytes);
         // Keep looping if this value is in the low duplicated range.
     } while (bccomp($n, $duplicate) < 0);

Please login to merge, or discard this patch.

main/auth/set_temp_password.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@
 block discarded – undo
 $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();
 

Please login to merge, or discard this patch.

main/auth/inscription.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -90,7 +90,7 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
             '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 @@  discard block
 block discarded – undo
         }
     }
 
-    $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 @@  discard block
 block discarded – undo
     }
 
     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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
                 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 @@  discard block
 block discarded – undo
         '<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 @@  discard block
 block discarded – undo
     } 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 @@  discard block
 block discarded – undo
         } 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';
             }

Please login to merge, or discard this patch.

main/auth/profile.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -31,8 +31,8 @@  discard block
 block discarded – undo
 }
 
 $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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 
             if (!check_user_email($user_data['email']) &&
                 empty($user_data['password0'])
-            ){
+            ) {
                 Display::addFlash(
                     Display:: return_message(
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 
         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>';
     }

Please login to merge, or discard this patch.

main/auth/cas/logout.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -9,5 +9,5 @@
 block discarded – undo
 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();

Please login to merge, or discard this patch.

main/auth/cas/logincas.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

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

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -131,17 +131,17 @@  discard block
 block discarded – undo
    *
    * @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 @@  discard block
 block discarded – undo
       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 @@  discard block
 block discarded – undo
     {
       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 @@  discard block
 block discarded – undo
    *
    * @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 @@  discard block
 block discarded – undo
       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);

Please login to merge, or discard this patch.

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

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -57,7 +57,7 @@  discard block
 block discarded – undo
    * @hideinitializer
    * @private
    */
-  var $_url='';
+  var $_url = '';
 
   /**
    * This method returns the PEAR DB URL to use to connect to the database.
@@ -159,18 +159,18 @@  discard block
 block discarded – undo
    *
    * @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 @@  discard block
 block discarded – undo
     {
       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 @@  discard block
 block discarded – undo
 
       // 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);

Please login to merge, or discard this patch.

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

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
   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 @@  discard block
 block discarded – undo
    * @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 @@  discard block
 block discarded – undo
    *
    * @protected
    */
-  function write($pgt,$pgt_iou)
+  function write($pgt, $pgt_iou)
     {
       phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); 
     }

Please login to merge, or discard this patch.

		@@ -9,10 +9,10 @@ discard block
		block discarded – undo
9	9	* Code
10	10	*/
11	11	// Diffie-Hellman Key Exchange Default Value.
12		-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
13		- '966915404479707795314057629378541917580651227423698188993727816152646631' .
14		- '438561595825688188889951272158842675419950341258706556549803580104870537' .
15		- '681476726513255747040765857479291291572334510643245094715007229621094194' .
	12	+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
	13	+ '966915404479707795314057629378541917580651227423698188993727816152646631'.
	14	+ '438561595825688188889951272158842675419950341258706556549803580104870537'.
	15	+ '681476726513255747040765857479291291572334510643245094715007229621094194'.
16	16	'349783925984760375594985848253359305585439638443');
17	17
18	18	// Constants for Diffie-Hellman key exchange computations.
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	function openid_redirect_http($url, $message) {
33	33	$query = array();
34	34	foreach ($message as $key => $val) {
35		- $query[] = $key . '=' . urlencode($val);
	35	+ $query[] = $key.'='.urlencode($val);
36	36	}
37	37	$sep = (strpos($url, '?') === FALSE) ? '?' : '&';
38		- header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
	38	+ header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
39	39	//exit;
40	40	}
41	41
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	* This function should be deprecated for 1.8.6.2 needs documentation
45	45	*/
46	46	function openid_redirect($url, $message) {
47		- $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
48		- $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
	47	+ $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
	48	+ $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
49	49	foreach ($message as $key => $value) {
50		- $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
	50	+ $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
51	51	}
52		- $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
	52	+ $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
53	53	$output .= '</form>';
54	54	$output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
55	55	$output .= "</body></html>";
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$normalized_url = $url;
95	95
96	96	if (stristr($url, '://') === FALSE) {
97		- $normalized_url = 'http://' . $url;
	97	+ $normalized_url = 'http://'.$url;
98	98	}
99	99
100	100	if (substr_count($normalized_url, '/') < 3) {
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	if ($encoded_message != '') {
134	134	$encoded_message .= '&';
135	135	}
136		- $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
	136	+ $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
137	137	}
138	138	}
139	139
		@@ -164,10 +164,10 @@ discard block
		block discarded – undo
164	164	*/
165	165	function _openid_nonce() {
166	166	// YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
167		- return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
168		- chr(mt_rand(0, 25) + 65) .
169		- chr(mt_rand(0, 25) + 65) .
170		- chr(mt_rand(0, 25) + 65) .
	167	+ return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
	168	+ chr(mt_rand(0, 25) + 65).
	169	+ chr(mt_rand(0, 25) + 65).
	170	+ chr(mt_rand(0, 25) + 65).
171	171	chr(mt_rand(0, 25) + 65);
172	172	}
173	173
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	*/
177	177	function _openid_link_href($rel, $html) {
178	178	$rel = preg_quote($rel);
179		- preg_match('\|<link\s+rel=["\'](.)' . $rel . '(.)["\'](.*)/?>\|iU', $html, $matches);
	179	+ preg_match('\|<link\s+rel=["\'](.)'.$rel.'(.)["\'](.*)/?>\|iU', $html, $matches);
180	180	if (isset($matches[3])) {
181	181	preg_match('\|href=["\']([^"]+)["\']\|iU', $matches[0], $href);
182	182	return trim($href[1]);
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	* Pull the http-equiv attribute out of an html meta element
189	189	*/
190	190	function _openid_meta_httpequiv($equiv, $html) {
191		- preg_match('\|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>\|iU', $html, $matches);
	191	+ preg_match('\|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>\|iU', $html, $matches);
192	192	if (isset($matches[1])) {
193	193	preg_match('\|content=["\']([^"]+)["\']\|iU', $matches[1], $content);
194	194	return $content[1];
		@@ -209,8 +209,8 @@ discard block
		block discarded – undo
209	209	$sign_data = array();
210	210
211	211	foreach ($keys_to_sign as $key) {
212		- if (isset($message_array['openid.' . $key])) {
213		- $sign_data[$key] = $message_array['openid.' . $key];
	212	+ if (isset($message_array['openid.'.$key])) {
	213	+ $sign_data[$key] = $message_array['openid.'.$key];
214	214	}
215	215	}
216	216
		@@ -229,8 +229,8 @@ discard block
		block discarded – undo
229	229	$key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
230	230	$ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
231	231	$opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
232		- $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
233		- $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
	232	+ $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
	233	+ $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
234	234
235	235	return $hmac;
236	236	}
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337	}
338	338
339	339	do {
340		- $bytes = "\x00" . _openid_get_bytes($nbytes);
	340	+ $bytes = "\x00"._openid_get_bytes($nbytes);
341	341	$n = _openid_dh_binary_to_long($bytes);
342	342	// Keep looping if this value is in the low duplicated range.
343	343	} while (bccomp($n, $duplicate) < 0);

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	$cidReset = true;
12	12	require_once '../inc/global.inc.php';
13	13	$this_section = SECTION_COURSES;
14		-$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
	14	+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15	15	$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16	16	$user_id = api_get_user_id();
17	17

		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	if (api_get_setting('registration', 'email') != 'true') {
91	91	$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
92	92	}
93		- $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
	93	+ $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
94	94	$form->addRule('email', get_lang('UserTaken'), 'username_available');
95	95	}
96	96
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
124	124	$form->applyFilter('username', 'trim');
125	125	$form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
126		- $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
	126	+ $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
127	127	$form->addRule('username', get_lang('UsernameWrong'), 'username');
128	128	$form->addRule('username', get_lang('UserTaken'), 'username_available');
129	129	}
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	if (CHECK_PASS_EASY_TO_FIND) {
145	145	$form->addRule(
146	146	'password1',
147		- get_lang('PassTooEasy') . ': ' . api_generate_password(),
	147	+ get_lang('PassTooEasy').': '.api_generate_password(),
148	148	'callback',
149	149	'api_check_password'
150	150	);
		@@ -209,13 +209,13 @@ discard block
		block discarded – undo
209	209	'sessionVar' => basename(__FILE__, '.php'),
210	210	'imageOptions' => array(
211	211	'font_size' => 20,
212		- 'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
	212	+ 'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
213	213	'font_file' => 'OpenSans-Regular.ttf',
214	214	//'output' => 'gif'
215	215	)
216	216	);
217	217
218		- $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
	218	+ $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
219	219	$form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
220	220
221	221	$form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
		@@ -333,7 +333,7 @@ discard block
		block discarded – undo
333	333	}
334	334	}
335	335
336		- $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
	336	+ $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
337	337
338	338	if (api_get_setting('allow_terms_conditions') == 'true' && $user_already_registered_show_terms) {
339	339	$tool_name = get_lang('TermsAndConditions');
		@@ -354,11 +354,11 @@ discard block
		block discarded – undo
354	354	}
355	355
356	356	if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
357		- $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
	357	+ $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
358	358	$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
359	359	$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
360	360	if (!empty($open)) {
361		- $content = '<div class="well_border">'.$open.'</div>';
	361	+ $content = '<div class="well_border">'.$open.'</div>';
362	362	}
363	363	}
364	364
		@@ -407,7 +407,7 @@ discard block
		block discarded – undo
407	407	null,
408	408	get_lang('IHaveReadAndAgree').' <a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'
409	409	);
410		- $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
	410	+ $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
411	411	} else {
412	412	$preview = LegalManager::show_last_condition($term_preview);
413	413	$form->addElement('label', null, $preview);
		@@ -580,7 +580,7 @@ discard block
		block discarded – undo
580	580	Database::query($sql);
581	581
582	582	// 2. Send mail to all platform admin
583		- $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
	583	+ $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
584	584	$emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
585	585	$emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
586	586
		@@ -667,7 +667,7 @@ discard block
		block discarded – undo
667	667	'<p>'.
668	668	get_lang('Dear', null, $_user['language']).' '.
669	669	stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
670		- get_lang('PersonalSettings',null,$_user['language']).".</p>";
	670	+ get_lang('PersonalSettings', null, $_user['language']).".</p>";
671	671
672	672	$form_data = array(
673	673	'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
		@@ -680,14 +680,14 @@ discard block
		block discarded – undo
680	680	} else {
681	681
682	682	if (!empty($values['email'])) {
683		- $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
	683	+ $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
684	684	}
685	685
686	686	if ($is_allowedCreateCourse) {
687	687	if ($usersCanCreateCourse) {
688		- $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
	688	+ $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
689	689	}
690		- $form_data['action'] = '../create_course/add_course.php';
	690	+ $form_data['action'] = '../create_course/add_course.php';
691	691
692	692	if (api_get_setting('course_validation') == 'true') {
693	693	$form_data['button'] = Display::button(
		@@ -707,7 +707,7 @@ discard block
		block discarded – undo
707	707	} else {
708	708	if (api_get_setting('allow_students_to_browse_courses') == 'true') {
709	709	$form_data['action'] = 'courses.php?action=subscribe';
710		- $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
	710	+ $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
711	711	} else {
712	712	$form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
713	713	}

		@@ -31,8 +31,8 @@ discard block
		block discarded – undo
31	31	}
32	32
33	33	$htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
34		-$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
35		-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
	34	+$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
	35	+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
36	36	$htmlHeadXtra[] = '<script>
37	37	$(document).ready(function() {
38	38	var $image = $("#previewImage");
		@@ -168,10 +168,10 @@ discard block
		block discarded – undo
168	168	if (api_is_western_name_order()) {
169	169	// FIRST NAME and LAST NAME
170	170	$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
171		- $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
	171	+ $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
172	172	} else {
173	173	// LAST NAME and FIRST NAME
174		- $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
	174	+ $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
175	175	$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
176	176	}
177	177	if (api_get_setting('profile', 'name') !== 'true') {
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	$form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
181	181	$form->applyFilter(array('lastname', 'firstname'), 'trim');
182	182	$form->applyFilter(array('lastname', 'firstname'), 'html_filter');
183		-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
	183	+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
184	184	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
185	185
186	186	// USERNAME
		@@ -223,7 +223,7 @@ discard block
		block discarded – undo
223	223	$form->freeze('email');
224	224	}
225	225
226		-if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
	226	+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
227	227	$form->applyFilter('email', 'stripslashes');
228	228	$form->applyFilter('email', 'trim');
229	229	$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
		@@ -389,7 +389,7 @@ discard block
		block discarded – undo
389	389
390	390	// the $jquery_ready_content variable collects all functions that
391	391	// will be load in the $(document).ready javascript function
392		-$htmlHeadXtra[] ='<script>
	392	+$htmlHeadXtra[] = '<script>
393	393	$(document).ready(function(){
394	394	'.$jquery_ready_content.'
395	395	});
		@@ -545,7 +545,7 @@ discard block
		block discarded – undo
545	545
546	546	if (!check_user_email($user_data['email']) &&
547	547	empty($user_data['password0'])
548		- ){
	548	+ ) {
549	549	Display::addFlash(
550	550	Display:: return_message(
551	551	get_lang('ToChangeYourEmailMustTypeYourPassword'),
		@@ -654,7 +654,7 @@ discard block
		block discarded – undo
654	654	$available_values_to_modify = array();
655	655	foreach ($profile_list as $key => $status) {
656	656	if ($status == 'true') {
657		- switch($key) {
	657	+ switch ($key) {
658	658	case 'login':
659	659	$available_values_to_modify[] = 'username';
660	660	break;
		@@ -787,10 +787,10 @@ discard block
		block discarded – undo
787	787
788	788	if (isset($_GET['type']) && $_GET['type'] == 'extended') {
789	789	$actions .= '<a href="profile.php?type=reduced'.$show.'">'.
790		- Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
	790	+ Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
791	791	} else {
792	792	$actions .= '<a href="profile.php?type=extended'.$show.'">'.
793		- Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
	793	+ Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
794	794	}
795	795	$actions .= '</div>';
796	796	}

		@@ -9,5 +9,5 @@
		block discarded – undo
9	9	require_once('authcas.php');
10	10	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11	11
12		-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
	12	+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13	13	phpCAS::logout();

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39	$firstpage = $_GET['firstpage'];
40	40	setcookie("GotoCourse", $firstpage);
41	41	}
42		- if (!is_object($PHPCAS_CLIENT) ) {
	42	+ if (!is_object($PHPCAS_CLIENT)) {
43	43	phpCAS::client(
44	44	$cas_auth_ver,
45	45	$cas_auth_server,

		@@ -131,17 +131,17 @@ discard block
		block discarded – undo
131	131	*
132	132	* @public
133	133	*/
134		- function PGTStorageFile($cas_parent,$format,$path)
	134	+ function PGTStorageFile($cas_parent, $format, $path)
135	135	{
136	136	phpCAS::traceBegin();
137	137	// call the ancestor's constructor
138	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	143	// check that the path is an absolute path
144		- if (getenv("OS")=="Windows_NT"){
	144	+ if (getenv("OS") == "Windows_NT") {
145	145
146	146	if (!preg_match('`^[a-zA-Z]:`', $path)) {
147	147	phpCAS::error('an absolute path is needed for PGT storage to file');
		@@ -151,13 +151,13 @@ discard block
		block discarded – undo
151	151	else
152	152	{
153	153
154		- if ( $path[0] != '/' ) {
	154	+ if ($path[0] != '/') {
155	155	phpCAS::error('an absolute path is needed for PGT storage to file');
156	156	}
157	157
158	158	// store the path (with a leading and trailing '/')
159		- $path = preg_replace('\|[/]*$\|','/',$path);
160		- $path = preg_replace('\|^[/]*\|','/',$path);
	159	+ $path = preg_replace('\|[/]*$\|', '/', $path);
	160	+ $path = preg_replace('\|^[/]*\|', '/', $path);
161	161	}
162	162
163	163	$this->_path = $path;
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	{
187	187	phpCAS::traceBegin();
188	188	// if the storage has already been initialized, return immediatly
189		- if ( $this->isInitialized() )
	189	+ if ($this->isInitialized())
190	190	return;
191	191	// call the ancestor's method (mark as initialized)
192	192	parent::init();
		@@ -222,12 +222,12 @@ discard block
		block discarded – undo
222	222	*
223	223	* @public
224	224	*/
225		- function write($pgt,$pgt_iou)
	225	+ function write($pgt, $pgt_iou)
226	226	{
227	227	phpCAS::traceBegin();
228	228	$fname = $this->getPGTIouFilename($pgt_iou);
229		- if ( $f=fopen($fname,"w") ) {
230		- if ( fputs($f,$pgt) === FALSE ) {
	229	+ if ($f = fopen($fname, "w")) {
	230	+ if (fputs($f, $pgt) === FALSE) {
231	231	phpCAS::error('could not write PGT to `'.$fname.'\'');
232	232	}
233	233	fclose($f);
		@@ -252,10 +252,10 @@ discard block
		block discarded – undo
252	252	phpCAS::traceBegin();
253	253	$pgt = FALSE;
254	254	$fname = $this->getPGTIouFilename($pgt_iou);
255		- if ( !($f=fopen($fname,"r")) ) {
	255	+ if (!($f = fopen($fname, "r"))) {
256	256	phpCAS::trace('could not open `'.$fname.'\'');
257	257	} else {
258		- if ( ($pgt=fgets($f)) === FALSE ) {
	258	+ if (($pgt = fgets($f)) === FALSE) {
259	259	phpCAS::trace('could not read PGT from `'.$fname.'\'');
260	260	}
261	261	fclose($f);

		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	* @hideinitializer
58	58	* @private
59	59	*/
60		- var $_url='';
	60	+ var $_url = '';
61	61
62	62	/**
63	63	* This method returns the PEAR DB URL to use to connect to the database.
		@@ -159,18 +159,18 @@ discard block
		block discarded – undo
159	159	*
160	160	* @public
161	161	*/
162		- function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
	162	+ function PGTStorageDB($cas_parent, $user, $password, $database_type, $hostname, $port, $database, $table)
163	163	{
164	164	phpCAS::traceBegin();
165	165
166	166	// call the ancestor's constructor
167	167	$this->PGTStorage($cas_parent);
168	168
169		- if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
170		- if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
171		- if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
172		- if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
173		- if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
	169	+ if (empty($database_type)) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
	170	+ if (empty($hostname)) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
	171	+ if ($port == 0) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
	172	+ if (empty($database)) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
	173	+ if (empty($table)) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
174	174
175	175	// build and store the PEAR DB URL
176	176	$this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	{
193	193	phpCAS::traceBegin();
194	194	// if the storage has already been initialized, return immediatly
195		- if ( $this->isInitialized() )
	195	+ if ($this->isInitialized())
196	196	return;
197	197	// call the ancestor's method (mark as initialized)
198	198	parent::init();
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205
206	206	// try to connect to the database
207	207	$this->_link = DB::connect($this->getURL());
208		- if ( DB::isError($this->_link) ) {
	208	+ if (DB::isError($this->_link)) {
209	209	phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
210	210	}
211	211	var_dump($this->_link);

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	function PGTStorage($cas_parent)
64	64	{
65	65	phpCAS::traceBegin();
66		- if ( !$cas_parent->isProxy() ) {
	66	+ if (!$cas_parent->isProxy()) {
67	67	phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
68	68	}
69	69	phpCAS::traceEnd();
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	* @private
108	108	* @deprecated not used.
109	109	*/
110		- var $_error_message=FALSE;
	110	+ var $_error_message = FALSE;
111	111
112	112	/**
113	113	* This method sets en error message, which can be read later by
		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	*
186	186	* @protected
187	187	*/
188		- function write($pgt,$pgt_iou)
	188	+ function write($pgt, $pgt_iou)
189	189	{
190	190	phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
191	191	}

chamilo / chamilo-lms

Push — 1.10.x ( fe0e5a...3a6f9c )

Status

Category

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch