chamilo / chamilo-lms

main/inc/lib/pear/excelreader/reader.php

Braces +37 added lines, -27 removed lines

@@ -505,7 +505,7 @@ 
                                                 if ($spos + $len < $limitpos) {
                                                                 $retstr = substr($this->data, $spos, $len);
                                                                 $spos += $len;
-                                                }else{
+                                                } else{
                                                         // found countinue
                                                         $retstr = substr($this->data, $spos, $limitpos - $spos);
                                                         $bytesRead = $limitpos - $spos;
@@ -527,12 +527,12 @@ 
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len;
                                                                     $asciiEncoding = true;
-                                                                  }elseif (!$asciiEncoding && ($option != 0)){
+                                                                  } elseif (!$asciiEncoding && ($option != 0)){
                                                                                 $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len/2;
                                                                     $asciiEncoding = false;
-                                                                  }elseif (!$asciiEncoding && ($option == 0)) {
+                                                                  } elseif (!$asciiEncoding && ($option == 0)) {
                                                                 // Bummer - the string starts off as Unicode, but after the
                                                                 // continuation it is in straightforward ASCII encoding
                                                                                 $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
@@ -541,7 +541,7 @@ 
                                                                 }
                                                             $charsLeft -= $len;
                                                                 $asciiEncoding = false;
-                                                                  }else{
+                                                                  } else{
                                                             $newstr = '';
                                                                     for ($j = 0; $j < strlen($retstr); $j++) {
                                                                       $newstr = $retstr[$j].chr(0);
@@ -619,22 +619,24 @@ 
                                     'type' => 'date',
                                     'format' => $this->dateFormats[$indexCode]
                                     );
-                        }elseif (array_key_exists($indexCode, $this->numberFormats)) {
+                        } elseif (array_key_exists($indexCode, $this->numberFormats)) {
                         //echo "isnumber ".$this->numberFormats[$indexCode];
                             $this->formatRecords['xfrecords'][] = array(
                                     'type' => 'number',
                                     'format' => $this->numberFormats[$indexCode]
                                     );
-                        }else{
+                        } else{
                             $isdate = FALSE;
                             if ($indexCode > 0){
-                                if (isset($this->formatRecords[$indexCode]))
-                                    $formatstr = $this->formatRecords[$indexCode];
+                                if (isset($this->formatRecords[$indexCode])) {
+                                                                    $formatstr = $this->formatRecords[$indexCode];
+                                }
                                 //echo '.other.';
                                 //echo "\ndate-time=$formatstr=\n";
-                                if ($formatstr)
-                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
+                                if ($formatstr) {
+                                                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
                                     $isdate = TRUE;
+                                }
                                     $formatstr = str_replace('mm', 'i', $formatstr);
                                     $formatstr = str_replace('h', 'H', $formatstr);
                                     //echo "\ndate-time $formatstr \n";
@@ -646,7 +648,7 @@ 
                                         'type' => 'date',
                                         'format' => $formatstr,
                                         );
-                            }else{
+                            } else{
                                 $this->formatRecords['xfrecords'][] = array(
                                         'type' => 'other',
                                         'format' => '',
@@ -674,7 +676,7 @@ 
                             } else {
                                 $rec_name    = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2));
                             }
-                        }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
+                        } elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
                                 $rec_name    = substr($this->data, $pos+11, $rec_length);
                         }
                     $this->boundsheets[] = array('name'=>$rec_name,
@@ -733,7 +735,9 @@ 
             //echo "mem= ".memory_get_usage()."\n";
 //            $r = &$this->file->nextRecord();
             $lowcode = ord($this->data[$spos]);
-            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break;
+            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) {
+                break;
+            }
             $code = $lowcode | ord($this->data[$spos+1])<<8;
             $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
             $spos += 4;
@@ -783,7 +787,7 @@ 
                     //echo $numValue." ";
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($numValue);
-                    }else{
+                    } else{
                         $raw = $numValue;
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -813,7 +817,7 @@ 
                         $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2));
                         if ($this->isDate($tmppos-4)) {
                             list($string, $raw) = $this->createDate($numValue);
-                        }else{
+                        } else{
                             $raw = $numValue;
                             if (isset($this->_columnsFormat[$colFirst + $i + 1])){
                                         $this->curformat = $this->_columnsFormat[$colFirst + $i + 1];
@@ -837,7 +841,7 @@ 
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($tmp['double']);
                      //   $this->addcell(DateRecord($r, 1));
-                    }else{
+                    } else{
                         //$raw = $tmp[''];
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -869,7 +873,7 @@ 
                         if ($this->isDate($spos)) {
                             list($string, $raw) = $this->createDate($tmp['double']);
                          //   $this->addcell(DateRecord($r, 1));
-                        }else{
+                        } else{
                             //$raw = $tmp[''];
                             if (isset($this->_columnsFormat[$column + 1])){
                                     $this->curformat = $this->_columnsFormat[$column + 1];
@@ -913,10 +917,12 @@ 
             $spos += $length;
         }
 
-        if (!isset($this->sheets[$this->sn]['numRows']))
-             $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
-        if (!isset($this->sheets[$this->sn]['numCols']))
-             $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        if (!isset($this->sheets[$this->sn]['numRows'])) {
+                     $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
+        }
+        if (!isset($this->sheets[$this->sn]['numCols'])) {
+                     $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        }
 
     }
 
@@ -943,7 +949,7 @@ 
                 if (($xfindex == 0x9) || ($xfindex == 0xa)){
                     $this->multiplier = 100;
                 }
-            }else{
+            } else{
                 $this->curformat = $this->_defaultFormat;
                 $this->rectype = 'unknown';
             }
@@ -993,7 +999,9 @@ 
         $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
         $mantissalow2 = ($rknumlow & 0x7fffffff);
         $value = $mantissa / pow( 2 , (20- ($exp - 1023)));
-        if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        if ($mantissalow1 != 0) {
+            $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        }
         $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023)));
         //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n";
         if ($sign) {$value = -1 * $value;}
@@ -1006,10 +1014,12 @@ 
         $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset);
         $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset);
         $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string;
-        if ($raw)
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
-        if (isset($this->rectype))
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        if ($raw) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
+        }
+        if (isset($this->rectype)) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        }
 
     }
 

main/inc/lib/pear/Exception.php

Braces +14 added lines, -7 removed lines

@@ -347,15 +347,22 @@
             $args = array();
             if (!empty($v['args'])) {
                 foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
+                    if (is_null($arg)) {
+                        $args[] = 'null';
+                    } elseif (is_array($arg)) {
+                        $args[] = 'Array';
+                    } elseif (is_object($arg)) {
+                        $args[] = 'Object('.get_class($arg).')';
+                    } elseif (is_bool($arg)) {
+                        $args[] = $arg ? 'true' : 'false';
+                    } elseif (is_int($arg) || is_double($arg)) {
+                        $args[] = $arg;
+                    } else {
                         $arg = (string)$arg;
                         $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '…';
+                        if (strlen($arg) > 16) {
+                            $str .= '…';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

main/inc/lib/dashboard.lib.php

Braces +3 added lines, -1 removed lines

@@ -380,7 +380,9 @@
 					// check if user is allowed to see the block
 					if (method_exists($obj_block, 'is_block_visible_for_user')) {
 						$is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
-						if (!$is_block_visible_for_user) continue;
+						if (!$is_block_visible_for_user) {
+						    continue;
+						}
 					}
 
 					echo '<tr>';

main/inc/lib/myspace.lib.php

Braces +3 added lines, -1 removed lines

@@ -2097,7 +2097,9 @@
                 FROM $tbl_course course
                 WHERE course.code IN (".implode(',',$courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
         $column = intval($column);
         $from = intval($from);

main/inc/lib/nusoap/class.soapclient.php

Braces +6 added lines, -4 removed lines

@@ -173,8 +173,9 @@ 
 		}

 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

 		// serialize parameters

 		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){

@@ -388,8 +389,9 @@ 
 	function getOperationData($operation){

 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

 		if(isset($this->operations[$operation])){

 			return $this->operations[$operation];

main/inc/lib/nusoap/class.soap_transport_http.php

Braces +39 added lines, -29 removed lines

@@ -159,10 +159,12 @@ 
 	* @access	private

 	*/

 	function io_method() {

-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

-			return 'curl';

-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

-			return 'socket';

+		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+					return 'curl';
+		}
+		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+					return 'socket';
+		}
 		return 'unknown';

 	}

 

@@ -246,30 +248,36 @@ 
 			return false;

 		}

 		// Avoid warnings when PHP does not have these options

-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))

-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

-		else

-			$CURLOPT_CONNECTIONTIMEOUT = 78;

-		if (defined('CURLOPT_HTTPAUTH'))

-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

-		else

-			$CURLOPT_HTTPAUTH = 107;

-		if (defined('CURLOPT_PROXYAUTH'))

-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

-		else

-			$CURLOPT_PROXYAUTH = 111;

-		if (defined('CURLAUTH_BASIC'))

-			$CURLAUTH_BASIC = CURLAUTH_BASIC;

-		else

-			$CURLAUTH_BASIC = 1;

-		if (defined('CURLAUTH_DIGEST'))

-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;

-		else

-			$CURLAUTH_DIGEST = 2;

-		if (defined('CURLAUTH_NTLM'))

-			$CURLAUTH_NTLM = CURLAUTH_NTLM;

-		else

-			$CURLAUTH_NTLM = 8;

+		if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+					$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+		} else {
+					$CURLOPT_CONNECTIONTIMEOUT = 78;
+		}
+		if (defined('CURLOPT_HTTPAUTH')) {
+					$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+		} else {
+					$CURLOPT_HTTPAUTH = 107;
+		}
+		if (defined('CURLOPT_PROXYAUTH')) {
+					$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+		} else {
+					$CURLOPT_PROXYAUTH = 111;
+		}
+		if (defined('CURLAUTH_BASIC')) {
+					$CURLAUTH_BASIC = CURLAUTH_BASIC;
+		} else {
+					$CURLAUTH_BASIC = 1;
+		}
+		if (defined('CURLAUTH_DIGEST')) {
+					$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+		} else {
+					$CURLAUTH_DIGEST = 2;
+		}
+		if (defined('CURLAUTH_NTLM')) {
+					$CURLAUTH_NTLM = CURLAUTH_NTLM;
+		} else {
+					$CURLAUTH_NTLM = 8;
+		}
 

 		$this->debug('connect using cURL');

 		// init CURL

@@ -612,7 +620,9 @@ 
 								'HTTP/1.0 200 Connection established');

 		foreach ($skipHeaders as $hd) {

 			$prefix = substr($data, 0, strlen($hd));

-			if ($prefix == $hd) return true;

+			if ($prefix == $hd) {
+			    return true;
+			}
 		}

 

 		return false;

main/inc/lib/nusoap/class.wsdl.php

Braces +3 added lines, -2 removed lines

@@ -78,8 +78,9 @@
 		$this->proxypassword = $proxypassword;

 		$this->timeout = $timeout;

 		$this->response_timeout = $response_timeout;

-		if (is_array($curl_options))

-			$this->curl_options = $curl_options;

+		if (is_array($curl_options)) {
+					$this->curl_options = $curl_options;
+		}
 		$this->use_curl = $use_curl;

 		$this->fetchWSDL($wsdl);

     }

main/inc/lib/events_dispatcher.class.php

Braces +3 added lines, -1 removed lines

@@ -18,9 +18,11 @@
 
         foreach ($event_config[$event_name]["actions"] as $func) {
             $execute = true;
-            if (!function_exists($func)) // if the function doesn't exist, we log
+            if (!function_exists($func)) {
+                // if the function doesn't exist, we log
             {
                 error_log("EventsDispatcher warning : ".$func." does not exist.");
+            }
                 $execute = false;
             }
 

main/inc/lib/glossary.lib.php

Braces +15 added lines, -10 removed lines

@@ -108,8 +108,9 @@ 
         // check if the glossary term already exists
         if (GlossaryManager::glossary_exists($values['glossary_title'])) {
             // display the feedback message
-            if ($message)
-                Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
+            if ($message) {
+                            Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
+            }
             return false;
         } else {
 
@@ -165,8 +166,9 @@ 
         // check if the glossary term already exists
         if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) {
             // display the feedback message
-            if ($message)
-                Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
+            if ($message) {
+                            Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
+            }
             return false;
         } else {
             $sql = "UPDATE $t_glossary SET
@@ -188,8 +190,9 @@ 
                 api_get_user_id()
             );
             // display the feedback message
-            if ($message)
-                Display::display_confirmation_message(get_lang('TermUpdated'));
+            if ($message) {
+                            Display::display_confirmation_message(get_lang('TermUpdated'));
+            }
         }
 
         return true;
@@ -323,8 +326,9 @@ 
         // reorder the remaining terms
         GlossaryManager::reorder_glossary();
         $_SESSION['max_glossary_display'] = GlossaryManager::get_max_glossary_item();
-        if ($message)
-            Display::display_confirmation_message(get_lang('TermDeleted'));
+        if ($message) {
+                    Display::display_confirmation_message(get_lang('TermDeleted'));
+        }
         return true;
     }
 
@@ -633,8 +637,9 @@ 
                  WHERE c_id = $course_id  AND glossary_id = '".Database::escape_string($next_id)."'";
         Database::query($sql1);
         Database::query($sql2);
-        if ($message)
-            Display::display_confirmation_message(get_lang('TermMoved'));
+        if ($message) {
+                    Display::display_confirmation_message(get_lang('TermMoved'));
+        }
     }
 
     /**