From 75427a824cdac8b34597b55fbbec8ea55d717285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 15 Dec 2012 12:36:40 +0100 Subject: [PATCH] MDL-37171 fix multiple spreadsheet related PHP4isms --- admin/user/user_bulk_download.php | 4 +-- course/lib.php | 4 +-- grade/export/ods/grade_export_ods.php | 2 +- grade/export/xls/grade_export_xls.php | 2 +- lib/odslib.class.php | 2 +- mod/choice/report.php | 4 +-- mod/data/lib.php | 4 +-- mod/feedback/analysis_to_excel.php | 4 +-- mod/scorm/report/basic/report.php | 32 ++++++++++----------- mod/scorm/report/interactions/report.php | 36 ++++++++++++------------ 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php index 21ceba0a773..5d6ea51d194 100644 --- a/admin/user/user_bulk_download.php +++ b/admin/user/user_bulk_download.php @@ -81,7 +81,7 @@ function user_download_ods($fields) { $worksheet = array(); - $worksheet[0] =& $workbook->add_worksheet(''); + $worksheet[0] = $workbook->add_worksheet(''); $col = 0; foreach ($fields as $fieldname) { $worksheet[0]->write(0, $col, $fieldname); @@ -119,7 +119,7 @@ function user_download_xls($fields) { $worksheet = array(); - $worksheet[0] =& $workbook->add_worksheet(''); + $worksheet[0] = $workbook->add_worksheet(''); $col = 0; foreach ($fields as $fieldname) { $worksheet[0]->write(0, $col, $fieldname); diff --git a/course/lib.php b/course/lib.php index 1e81de9d079..65af7de2446 100644 --- a/course/lib.php +++ b/course/lib.php @@ -665,7 +665,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname, // Creating worksheets for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) { $sheettitle = get_string('logs').' '.$wsnumber.'-'.$nroPages; - $worksheet[$wsnumber] =& $workbook->add_worksheet($sheettitle); + $worksheet[$wsnumber] = $workbook->add_worksheet($sheettitle); $worksheet[$wsnumber]->set_column(1, 1, 30); $worksheet[$wsnumber]->write_string(0, 0, get_string('savedat'). userdate(time(), $strftimedatetime)); @@ -779,7 +779,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname, // Creating worksheets for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) { $sheettitle = get_string('logs').' '.$wsnumber.'-'.$nroPages; - $worksheet[$wsnumber] =& $workbook->add_worksheet($sheettitle); + $worksheet[$wsnumber] = $workbook->add_worksheet($sheettitle); $worksheet[$wsnumber]->set_column(1, 1, 30); $worksheet[$wsnumber]->write_string(0, 0, get_string('savedat'). userdate(time(), $strftimedatetime)); diff --git a/grade/export/ods/grade_export_ods.php b/grade/export/ods/grade_export_ods.php index d5b66d11700..d281e6f3b12 100644 --- a/grade/export/ods/grade_export_ods.php +++ b/grade/export/ods/grade_export_ods.php @@ -41,7 +41,7 @@ class grade_export_ods extends grade_export { // Sending HTTP headers $workbook->send($downloadfilename); // Adding the worksheet - $myxls =& $workbook->add_worksheet($strgrades); + $myxls = $workbook->add_worksheet($strgrades); // Print names of all the fields. diff --git a/grade/export/xls/grade_export_xls.php b/grade/export/xls/grade_export_xls.php index c85dbcbd362..5b2c0e95f1c 100644 --- a/grade/export/xls/grade_export_xls.php +++ b/grade/export/xls/grade_export_xls.php @@ -40,7 +40,7 @@ class grade_export_xls extends grade_export { // Sending HTTP headers $workbook->send($downloadfilename); // Adding the worksheet - $myxls =& $workbook->add_worksheet($strgrades); + $myxls = $workbook->add_worksheet($strgrades); // Print names of all the fields $profilefields = grade_helper::get_user_profile_fields($this->course->id, $this->usercustomfields); diff --git a/lib/odslib.class.php b/lib/odslib.class.php index be1a5d9d6e2..8192a37f426 100644 --- a/lib/odslib.class.php +++ b/lib/odslib.class.php @@ -50,7 +50,7 @@ class MoodleODSWorkbook { /* Create one Moodle Worksheet * @param string $name Name of the sheet */ - function &add_worksheet($name = '') { + function add_worksheet($name = '') { /// Create the Moodle Worksheet. Returns one pointer to it $ws = new MoodleODSWorksheet($name); $this->worksheets[] =& $ws; diff --git a/mod/choice/report.php b/mod/choice/report.php index 4d6a5b9b3ee..bd9ac973782 100644 --- a/mod/choice/report.php +++ b/mod/choice/report.php @@ -76,7 +76,7 @@ /// Send HTTP headers $workbook->send($filename); /// Creating the first worksheet - $myxls =& $workbook->add_worksheet($strresponses); + $myxls = $workbook->add_worksheet($strresponses); /// Print names of all the fields $myxls->write_string(0,0,get_string("lastname")); @@ -129,7 +129,7 @@ /// Send HTTP headers $workbook->send($filename); /// Creating the first worksheet - $myxls =& $workbook->add_worksheet($strresponses); + $myxls = $workbook->add_worksheet($strresponses); /// Print names of all the fields $myxls->write_string(0,0,get_string("lastname")); diff --git a/mod/data/lib.php b/mod/data/lib.php index b26d77ddccf..653f251fd5d 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -2686,7 +2686,7 @@ function data_export_xls($export, $dataname, $count) { $workbook = new MoodleExcelWorkbook($filearg); $workbook->send($filename); $worksheet = array(); - $worksheet[0] =& $workbook->add_worksheet(''); + $worksheet[0] = $workbook->add_worksheet(''); $rowno = 0; foreach ($export as $row) { $colno = 0; @@ -2720,7 +2720,7 @@ function data_export_ods($export, $dataname, $count) { $workbook = new MoodleODSWorkbook($filearg); $workbook->send($filename); $worksheet = array(); - $worksheet[0] =& $workbook->add_worksheet(''); + $worksheet[0] = $workbook->add_worksheet(''); $rowno = 0; foreach ($export as $row) { $colno = 0; diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php index 0096c48875d..d42b9a97508 100644 --- a/mod/feedback/analysis_to_excel.php +++ b/mod/feedback/analysis_to_excel.php @@ -123,8 +123,8 @@ $xls_formats->procent = $workbook->add_format(array( // Creating the worksheets $sheetname = clean_param($feedback->name, PARAM_ALPHANUM); error_reporting(0); -$worksheet1 =& $workbook->add_worksheet(substr($sheetname, 0, 31)); -$worksheet2 =& $workbook->add_worksheet('detailed'); +$worksheet1 = $workbook->add_worksheet(substr($sheetname, 0, 31)); +$worksheet2 = $workbook->add_worksheet('detailed'); error_reporting($CFG->debug); $worksheet1->hide_gridlines(); $worksheet1->set_column(0, 0, 10); diff --git a/mod/scorm/report/basic/report.php b/mod/scorm/report/basic/report.php index 5850039e38d..86dbbff5abd 100644 --- a/mod/scorm/report/basic/report.php +++ b/mod/scorm/report/basic/report.php @@ -193,24 +193,24 @@ class scorm_basic_report extends scorm_default_report { $workbook->send($filename); // Creating the first worksheet $sheettitle = get_string('report', 'scorm'); - $myxls =& $workbook->add_worksheet($sheettitle); + $myxls = $workbook->add_worksheet($sheettitle); // format types - $format =& $workbook->add_format(); + $format = $workbook->add_format(); $format->set_bold(0); - $formatbc =& $workbook->add_format(); + $formatbc = $workbook->add_format(); $formatbc->set_bold(1); $formatbc->set_align('center'); - $formatb =& $workbook->add_format(); + $formatb = $workbook->add_format(); $formatb->set_bold(1); - $formaty =& $workbook->add_format(); + $formaty = $workbook->add_format(); $formaty->set_bg_color('yellow'); - $formatc =& $workbook->add_format(); + $formatc = $workbook->add_format(); $formatc->set_align('center'); - $formatr =& $workbook->add_format(); + $formatr = $workbook->add_format(); $formatr->set_bold(1); $formatr->set_color('red'); $formatr->set_align('center'); - $formatg =& $workbook->add_format(); + $formatg = $workbook->add_format(); $formatg->set_bold(1); $formatg->set_color('green'); $formatg->set_align('center'); @@ -232,24 +232,24 @@ class scorm_basic_report extends scorm_default_report { $workbook->send($filename); // Creating the first worksheet $sheettitle = get_string('report', 'scorm'); - $myxls =& $workbook->add_worksheet($sheettitle); + $myxls = $workbook->add_worksheet($sheettitle); // format types - $format =& $workbook->add_format(); + $format = $workbook->add_format(); $format->set_bold(0); - $formatbc =& $workbook->add_format(); + $formatbc = $workbook->add_format(); $formatbc->set_bold(1); $formatbc->set_align('center'); - $formatb =& $workbook->add_format(); + $formatb = $workbook->add_format(); $formatb->set_bold(1); - $formaty =& $workbook->add_format(); + $formaty = $workbook->add_format(); $formaty->set_bg_color('yellow'); - $formatc =& $workbook->add_format(); + $formatc = $workbook->add_format(); $formatc->set_align('center'); - $formatr =& $workbook->add_format(); + $formatr = $workbook->add_format(); $formatr->set_bold(1); $formatr->set_color('red'); $formatr->set_align('center'); - $formatg =& $workbook->add_format(); + $formatg = $workbook->add_format(); $formatg->set_bold(1); $formatg->set_color('green'); $formatg->set_align('center'); diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php index e30e0a9232c..167be51bc3a 100644 --- a/mod/scorm/report/interactions/report.php +++ b/mod/scorm/report/interactions/report.php @@ -259,24 +259,24 @@ class scorm_interactions_report extends scorm_default_report { $workbook->send($filename); // Creating the first worksheet $sheettitle = get_string('report', 'scorm'); - $myxls =& $workbook->add_worksheet($sheettitle); + $myxls = $workbook->add_worksheet($sheettitle); // format types - $format =& $workbook->add_format(); + $format = $workbook->add_format(); $format->set_bold(0); - $formatbc =& $workbook->add_format(); + $formatbc = $workbook->add_format(); $formatbc->set_bold(1); $formatbc->set_align('center'); - $formatb =& $workbook->add_format(); + $formatb = $workbook->add_format(); $formatb->set_bold(1); - $formaty =& $workbook->add_format(); + $formaty = $workbook->add_format(); $formaty->set_bg_color('yellow'); - $formatc =& $workbook->add_format(); + $formatc = $workbook->add_format(); $formatc->set_align('center'); - $formatr =& $workbook->add_format(); + $formatr = $workbook->add_format(); $formatr->set_bold(1); $formatr->set_color('red'); $formatr->set_align('center'); - $formatg =& $workbook->add_format(); + $formatg = $workbook->add_format(); $formatg->set_bold(1); $formatg->set_color('green'); $formatg->set_align('center'); @@ -298,24 +298,24 @@ class scorm_interactions_report extends scorm_default_report { $workbook->send($filename); // Creating the first worksheet $sheettitle = get_string('report', 'scorm'); - $myxls =& $workbook->add_worksheet($sheettitle); + $myxls = $workbook->add_worksheet($sheettitle); // format types - $format =& $workbook->add_format(); + $format = $workbook->add_format(); $format->set_bold(0); - $formatbc =& $workbook->add_format(); + $formatbc = $workbook->add_format(); $formatbc->set_bold(1); $formatbc->set_align('center'); - $formatb =& $workbook->add_format(); + $formatb = $workbook->add_format(); $formatb->set_bold(1); - $formaty =& $workbook->add_format(); + $formaty = $workbook->add_format(); $formaty->set_bg_color('yellow'); - $formatc =& $workbook->add_format(); + $formatc = $workbook->add_format(); $formatc->set_align('center'); - $formatr =& $workbook->add_format(); + $formatr = $workbook->add_format(); $formatr->set_bold(1); $formatr->set_color('red'); $formatr->set_align('center'); - $formatg =& $workbook->add_format(); + $formatg = $workbook->add_format(); $formatg->set_bold(1); $formatg->set_color('green'); $formatg->set_align('center'); @@ -327,8 +327,8 @@ class scorm_interactions_report extends scorm_default_report { } $rownum = 1; } else if ($download == 'CSV') { - $csvexport = new csv_export_writer("tab"); - $csvexport->set_filename($filename, ".txt"); + $csvexport = new csv_export_writer("tab"); + $csvexport->set_filename($filename, ".txt"); $csvexport->add_data($headers); }