From 80c128977317ccf2e7b9f730808026b1b4b56445 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Mon, 24 Jan 2011 16:20:30 +0800 Subject: [PATCH] MDL-25637 Fixed whitespace --- auth/shibboleth/logout.php | 6 ++--- backup/lib.php | 4 +-- backup/restorelib.php | 2 +- mod/feedback/item/info/lib.php | 8 +++--- mod/feedback/item/multichoice/lib.php | 38 ++++++++++++++------------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/auth/shibboleth/logout.php b/auth/shibboleth/logout.php index 763bf4b4ea3..c5c541069c8 100644 --- a/auth/shibboleth/logout.php +++ b/auth/shibboleth/logout.php @@ -12,7 +12,7 @@ require_once($CFG->dirroot."/auth/shibboleth/auth.php"); // Find out whether host supports https $protocol = 'http://'; if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){ - $protocol = 'https://'; + $protocol = 'https://'; } // Front channel logout @@ -201,8 +201,8 @@ function unserializesession($serialized_string) { $variables = array(); $a = preg_split("/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); $counta = count($a); - for($i = 0; $i < $counta; $i=$i+2) { + for ($i = 0; $i < $counta; $i = $i+2) { $variables[$a[$i]] = unserialize($a[$i+1]); } - return($variables); + return $variables; } diff --git a/backup/lib.php b/backup/lib.php index c1013e43b7d..3a4e5da9778 100644 --- a/backup/lib.php +++ b/backup/lib.php @@ -119,7 +119,7 @@ } // Loop through all directory entries, and construct two temporary arrays containing files and sub directories - while(false !== ($entry = readdir($handle))) { + while (false !== ($entry = readdir($handle))) { if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) { $dir_subdirs[] = $dir. $slash .$entry; } @@ -130,7 +130,7 @@ // Delete all files in the curent directory return false and halt if a file cannot be removed $countdirfiles = count($dir_files); - for($i=0; $i<$countdirfiles; $i++) { + for ($i=0; $i<$countdirfiles; $i++) { chmod($dir_files[$i], $CFG->directorypermissions); if (((unlink($dir_files[$i]))) == FALSE) { return false; diff --git a/backup/restorelib.php b/backup/restorelib.php index d4191617951..654a87fffa7 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -378,7 +378,7 @@ //Iterate over tags $tags = array(); $sizetagsarr = sizeof($tagsarr); - for($i = 0; $i < $sizetagsarr; $i++) { + for ($i = 0; $i < $sizetagsarr; $i++) { $tag_info = $tagsarr[$i]; ///traverse_xmlize($tag_info); //Debug ///print_object ($GLOBALS['traverse_array']); //Debug diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php index 5cc92286223..b6311a84eb3 100644 --- a/mod/feedback/item/info/lib.php +++ b/mod/feedback/item/info/lib.php @@ -128,10 +128,10 @@ class feedback_item_info extends feedback_item_base { function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { $analysed_item = $this->get_analysed($item, $groupid, $courseid); $data = $analysed_item->data; - if(is_array($data)) { + if (is_array($data)) { echo ''. $itemnr . ' ('. $item->label .') ' . $item->name .''; $sizeofdata = sizeof($data); - for($i = 0; $i < $sizeofdata; $i++) { + for ($i = 0; $i < $sizeofdata; $i++) { echo '-  ' . str_replace("\n", '
', $data[$i]->show) . ''; } } @@ -145,12 +145,12 @@ class feedback_item_info extends feedback_item_base { $worksheet->write_string($rowOffset, 0, $item->label, $xlsFormats->head2); $worksheet->write_string($rowOffset, 1, $item->name, $xlsFormats->head2); $data = $analysed_item->data; - if(is_array($data)) { + if (is_array($data)) { // $worksheet->setFormat(""); $worksheet->write_string($rowOffset, 2, $data[0]->show, $xlsFormats->value_bold); $rowOffset++; $sizeofdata = sizeof($data); - for($i = 1; $i < $sizeofdata; $i++) { + for ($i = 1; $i < $sizeofdata; $i++) { // $worksheet->setFormat(""); $worksheet->write_string($rowOffset, 2, $data[$i]->show, $xlsFormats->default); $rowOffset++; diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 729c72d6c02..ec7102d64e6 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -120,14 +120,14 @@ class feedback_item_multichoice extends feedback_item_base { $analysedAnswer = array(); if($info->subtype == 'c') { $sizeofanswers = sizeof($answers); - for($i = 1; $i <= $sizeofanswers; $i++) { + for ($i = 1; $i <= $sizeofanswers; $i++) { $ans = null; $ans->answertext = $answers[$i-1]; $ans->answercount = 0; - foreach($values as $value) { + foreach ($values as $value) { //ist die Antwort gleich dem index der Antworten + 1? $vallist = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value->value); - foreach($vallist as $val) { + foreach ($vallist as $val) { if ($val == $i) { $ans->answercount++; } @@ -138,11 +138,11 @@ class feedback_item_multichoice extends feedback_item_base { } }else { $sizeofanswers = sizeof($answers); - for($i = 1; $i <= $sizeofanswers; $i++) { + for ($i = 1; $i <= $sizeofanswers; $i++) { $ans = null; $ans->answertext = $answers[$i-1]; $ans->answercount = 0; - foreach($values as $value) { + foreach ($values as $value) { //ist die Antwort gleich dem index der Antworten + 1? if ($value->value == $i) { $ans->answercount++; @@ -161,28 +161,30 @@ class feedback_item_multichoice extends feedback_item_base { $printval = ''; - if(!isset($value->value)) return $printval; + if (!isset($value->value)) { + return $printval; + } // @list($presentation) = explode(FEEDBACK_RADIO_ADJUST_SEP, $item->presentation); //remove the adjustment-info $presentation = explode (FEEDBACK_MULTICHOICE_LINE_SEP, $info->presentation); - if($info->subtype == 'c') { + if ($info->subtype == 'c') { $vallist = array_values(explode (FEEDBACK_MULTICHOICE_LINE_SEP, $value->value)); $sizeofvallist = sizeof($vallist); - for($i = 0; $i < $sizeofvallist; $i++) { - $sizeofpresentation = sizeof($presentation); - for($k = 0; $k < $sizeofpresentation; $k++) { - if($vallist[$i] == ($k + 1)) {//Die Werte beginnen bei 1, das Array aber mit 0 + $sizeofpresentation = sizeof($presentation); + for ($i = 0; $i < $sizeofvallist; $i++) { + for ($k = 0; $k < $sizeofpresentation; $k++) { + if ($vallist[$i] == ($k + 1)) {//Die Werte beginnen bei 1, das Array aber mit 0 $printval .= trim($presentation[$k]) . chr(10); break; } } } - }else { + } else { $index = 1; foreach($presentation as $pres){ - if($value->value == $index){ + if ($value->value == $index){ $printval = $pres; break; } @@ -235,9 +237,9 @@ class feedback_item_multichoice extends feedback_item_base { //frage schreiben $worksheet->write_string($rowOffset, 0, $item->label, $xlsFormats->head2_green); $worksheet->write_string($rowOffset, 1, $analysed_item[1], $xlsFormats->head2_green); - if(is_array($data)) { + if (is_array($data)) { $sizeofdata = sizeof($data); - for($i = 0; $i < $sizeofdata; $i++) { + for ($i = 0; $i < $sizeofdata; $i++) { $aData = $data[$i]; // $worksheet->setFormat(""); @@ -249,7 +251,7 @@ class feedback_item_multichoice extends feedback_item_base { $worksheet->write_number($rowOffset + 2, $i + 2, $aData->quotient, $xlsFormats->procent); } } - $rowOffset +=3 ; + $rowOffset += 3; return $rowOffset; } @@ -565,7 +567,7 @@ class feedback_item_multichoice extends feedback_item_base { } function item_arrayToString($value) { - if(!is_array($value)) { + if (!is_array($value)) { return $value; } $retval = ''; @@ -573,7 +575,7 @@ class feedback_item_multichoice extends feedback_item_base { $arrvals = clean_param($arrvals, PARAM_INT); //prevent sql-injection $retval = $arrvals[0]; $sizeofarrvals = sizeof($arrvals); - for($i = 1; $i < $sizeofarrvals; $i++) { + for ($i = 1; $i < $sizeofarrvals; $i++) { $retval .= FEEDBACK_MULTICHOICE_LINE_SEP.$arrvals[$i]; } return $retval; -- 2.36.1