L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-37171 fix multiple spreadsheet related PHP4isms

Browse Source
This commit is contained in:
Petr Škoda
2012-12-18 00:15:34 +01:00
committed by Eloy Lafuente (stronk7)
parent 933cf2e115
commit e1263ce41d
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/user/user_bulk_download.php
+2 -2
View File
@@ -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);
course/lib.php
+2 -2
View File
@@ -653,7 +653,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));
@@ -766,7 +766,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));
grade/export/ods/grade_export_ods.php
+1 -1
View File
@@ -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
$myxls->write_string(0,0,get_string("firstname"));
grade/export/xls/grade_export_xls.php
+1 -1
View File
@@ -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
$myxls->write_string(0,0,get_string("firstname"));
lib/odslib.class.php
+1 -1
View File
@@ -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;
mod/choice/report.php
+2 -2
View File
@@ -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"));
mod/data/lib.php
+2 -2
View File
@@ -2764,7 +2764,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;
@@ -2798,7 +2798,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;
mod/feedback/analysis_to_excel.php
+2 -2
View File
@@ -125,8 +125,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);
mod/scorm/report/basic/report.php
+16 -16
View File
@@ -192,24 +192,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');
@@ -231,24 +231,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');
mod/scorm/report/interactions/report.php
+16 -16
View File
@@ -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');
mod/survey/download.php
+2 -2
View File
@@ -159,7 +159,7 @@ if ($type == "ods") {
/// Sending HTTP headers
$workbook->send($downloadfilename);
/// Creating the first worksheet
$myxls =& $workbook->add_worksheet(textlib::substr(strip_tags(format_string($survey->name,true)), 0, 31));
$myxls = $workbook->add_worksheet(textlib::substr(strip_tags(format_string($survey->name,true)), 0, 31));
$header = array("surveyid","surveyname","userid","firstname","lastname","email","idnumber","time", "notes");
$col=0;
@@ -234,7 +234,7 @@ if ($type == "xls") {
/// Sending HTTP headers
$workbook->send($downloadfilename);
/// Creating the first worksheet
$myxls =& $workbook->add_worksheet(textlib::substr(strip_tags(format_string($survey->name,true)), 0, 31));
$myxls = $workbook->add_worksheet(textlib::substr(strip_tags(format_string($survey->name,true)), 0, 31));
$header = array("surveyid","surveyname","userid","firstname","lastname","email","idnumber","time", "notes");
$col=0;