From d0f17393a886e8c251ae6cd5fa04b2a68cc661e2 Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Tue, 13 May 2014 10:18:35 +0200 Subject: [PATCH 1/5] removed unknown/undefined properties --- edit.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/edit.php b/edit.php index 2f0b7ee..a07ab9f 100644 --- a/edit.php +++ b/edit.php @@ -52,16 +52,8 @@ if ($mform->is_cancelled()) { if ($instance->id) { $instance->status = $data->status; $instance->name = $data->name; - $instance->password = $data->password; - $instance->customint1 = $data->customint1; - $instance->customint2 = $data->customint2; - $instance->customint3 = $data->customint3; - $instance->customint4 = $data->customint4; $instance->customtext1 = $data->customtext1; $instance->roleid = $data->roleid; - $instance->enrolperiod = $data->enrolperiod; - $instance->enrolstartdate = $data->enrolstartdate; - $instance->enrolenddate = $data->enrolenddate; $instance->timemodified = time(); $DB->update_record('enrol', $instance); From 02c47e28eee8da4de6cbf9cf22cf06488ec58901 Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Wed, 11 Jun 2014 23:36:06 +0200 Subject: [PATCH 2/5] removed comment, formatted fields array --- edit.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edit.php b/edit.php index a07ab9f..ff85b30 100644 --- a/edit.php +++ b/edit.php @@ -58,10 +58,10 @@ if ($mform->is_cancelled()) { $DB->update_record('enrol', $instance); } else { -// $fields = array('status'=>$data->status, 'name'=>$data->name, 'password'=>$data->password, 'customint1'=>$data->customint1, 'customint2'=>$data->customint2, -// 'customint3'=>$data->customint3, 'customint4'=>$data->customint4, 'customtext1'=>$data->customtext1, -// 'roleid'=>$data->roleid, 'enrolperiod'=>$data->enrolperiod, 'enrolstartdate'=>$data->enrolstartdate, 'enrolenddate'=>$data->enrolenddate); - $fields = array('status'=>$data->status, 'name'=>$data->name, 'customtext1'=>$data->customtext1); + $fields = array( + 'status'=>$data->status, + 'name'=>$data->name, + 'customtext1'=>$data->customtext1); $plugin->add_instance($course, $fields); } From cc2cb50d6c99e26715ff468dd0b6a05f33f109be Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Wed, 11 Jun 2014 23:45:51 +0200 Subject: [PATCH 3/5] removed unused strings --- lang/en/enrol_apply.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lang/en/enrol_apply.php b/lang/en/enrol_apply.php index 7c73d45..00490e6 100644 --- a/lang/en/enrol_apply.php +++ b/lang/en/enrol_apply.php @@ -17,9 +17,6 @@ $string['confirmmailsubject'] = 'Confirm mail subject'; $string['confirmmailcontent'] = 'Confirm mail content'; $string['cancelmailsubject'] = 'Cancel mail subject'; $string['cancelmailcontent'] = 'Cancel mail sontent'; -$string['mailaddress'] = 'Send mail address'; -$string['mailusername'] = 'Send mail username'; -$string['mailpassword'] = 'Send mail password'; $string['confirmmailcontent_desc'] = 'Please use special marks designated email content replaced.
{firstname}:Registration name; {content}:Course name'; $string['cancelmailcontent_desc'] = 'Please use special marks designated email content replaced.
{firstname}:Registration name; {content}:Course name'; @@ -41,13 +38,10 @@ $string['apply:manage'] = 'Manage apply enrolment'; $string['apply:unenrol'] = 'Cancel users from course'; $string['apply:unenrolapply'] = 'Cancel self from the course'; -// Description of your plugin. Shown on the plugin's configuration screen. -$string['description'] = ''; $string['notification'] = 'Enrollment Application successfully sent.

You will be informed by email as soon as your enrollment has been confirmed. If you want to enroll to other courses, please click "course catalogue" in the top menu.'; $string['sendmailtoteacher'] = 'Send email notification to teachers'; $string['mailtoteacher_suject'] = 'New Enrollment request!'; -$string['setting_edit'] = 'Edit'; $string['editdescription'] = 'Textarea description'; $string['applymanage'] = 'Manage enrolment applications'; ?> \ No newline at end of file From 1e16f3c488065c4a2337bd73d285b1567f9c47ff Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Wed, 11 Jun 2014 23:48:29 +0200 Subject: [PATCH 4/5] unused cron call removed --- version.php | 1 - 1 file changed, 1 deletion(-) diff --git a/version.php b/version.php index 64d7def..322220c 100644 --- a/version.php +++ b/version.php @@ -22,4 +22,3 @@ $plugin->version = 2014061000; $plugin->requires = 2011080100; $plugin->maturity = MATURITY_STABLE; $plugin->release = 'Course Enrol Apply Plugin Version 1.2.2 (build 2014061000)'; -$plugin->cron = 180; From 78ab24a5c4e84413ff641e0085bc8aedf31419b2 Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Mon, 12 May 2014 14:59:33 +0200 Subject: [PATCH 5/5] removed all devloper individual stuff from gitignore (nothing remaining), deleted .gitattributes couse of also just individual stuff in there closes #6 --- .gitattributes | 22 ----- .gitignore | 215 ------------------------------------------------- 2 files changed, 237 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda..0000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index b9d6bd9..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,215 +0,0 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml -*.pubxml - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -############# -## Windows detritus -############# - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist/ -build/ -eggs/ -parts/ -var/ -sdist/ -develop-eggs/ -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg