From 5df4a02e19a768636d90e71110b045a185d4a7ce Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Wed, 16 Nov 2016 13:31:30 +1300 Subject: [PATCH] Fix up some coding guideline stuff. --- classes/sessions_page_params.php | 1 + classes/structure.php | 1 + classes/summary.php | 6 +++--- classes/take_page_params.php | 1 + classes/view_page_params.php | 1 + db/access.php | 1 + db/install.php | 1 + db/services.php | 1 + db/upgrade.php | 1 + db/upgradelib.php | 2 ++ duration_form.php | 1 + export_form.php | 1 + mod_form.php | 5 +---- student_attendance_form.php | 1 + styles.css | 20 ++++++++++---------- update_form.php | 2 +- version.php | 1 + 17 files changed, 29 insertions(+), 18 deletions(-) diff --git a/classes/sessions_page_params.php b/classes/sessions_page_params.php index cba5c88..aa5da8c 100644 --- a/classes/sessions_page_params.php +++ b/classes/sessions_page_params.php @@ -22,6 +22,7 @@ * @copyright 2016 Dan Marsden http://danmarsden.com * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); /** * stores constants/data used by sessions page params. diff --git a/classes/structure.php b/classes/structure.php index 772a021..9871ae6 100644 --- a/classes/structure.php +++ b/classes/structure.php @@ -21,6 +21,7 @@ * @copyright 2016 Dan Marsden http://danmarsden.com * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); require_once(dirname(__FILE__) . '/calendar_helpers.php'); diff --git a/classes/summary.php b/classes/summary.php index 9b5cf2b..2dc6460 100644 --- a/classes/summary.php +++ b/classes/summary.php @@ -14,6 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); +require_once($CFG->dirroot . '/mod/attendance/locallib.php'); + /** * Class that computes summary of users points * @@ -21,9 +24,6 @@ * @copyright 2016 Antonio Carlos Mariani http://antonio.c.mariani@gmail.com * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once($CFG->dirroot . '/mod/attendance/locallib.php'); - class mod_attendance_summary { /** @var int attendance instance identifier */ diff --git a/classes/take_page_params.php b/classes/take_page_params.php index 563aaa3..3857d7e 100644 --- a/classes/take_page_params.php +++ b/classes/take_page_params.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); /** * Class definition for mod_attendance_take_page_params diff --git a/classes/view_page_params.php b/classes/view_page_params.php index 7c37c8f..93843ea 100644 --- a/classes/view_page_params.php +++ b/classes/view_page_params.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); /** * Class definition for mod_attendance_view_page_params diff --git a/db/access.php b/db/access.php index b7580a7..ecbb0eb 100644 --- a/db/access.php +++ b/db/access.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); /** * Capability definitions for this module. diff --git a/db/install.php b/db/install.php index 8c119b0..5a5ae48 100644 --- a/db/install.php +++ b/db/install.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); /** * post installation hook for adding data. diff --git a/db/services.php b/db/services.php index ef9ce5f..27036ac 100644 --- a/db/services.php +++ b/db/services.php @@ -13,6 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); /** * Web service local plugin attendance external functions and service definitions. diff --git a/db/upgrade.php b/db/upgrade.php index 3485f7f..4f32399 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); require_once(dirname(__FILE__) . '/upgradelib.php'); /** diff --git a/db/upgradelib.php b/db/upgradelib.php index d024ae6..1b12984 100644 --- a/db/upgradelib.php +++ b/db/upgradelib.php @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); + /** * Helper functions to keep upgrade.php clean. * diff --git a/duration_form.php b/duration_form.php index 9d6388a..53bb563 100644 --- a/duration_form.php +++ b/duration_form.php @@ -22,6 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); require_once($CFG->libdir.'/formslib.php'); /** diff --git a/export_form.php b/export_form.php index 2f8ef6f..053ae44 100644 --- a/export_form.php +++ b/export_form.php @@ -22,6 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); require_once($CFG->libdir.'/formslib.php'); /** diff --git a/mod_form.php b/mod_form.php index 6cd15f7..133bc87 100644 --- a/mod_form.php +++ b/mod_form.php @@ -22,10 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -if (!defined('MOODLE_INTERNAL')) { - die('Direct access to this script is forbidden.'); -} - +defined('MOODLE_INTERNAL') || die(); require_once($CFG->dirroot.'/course/moodleform_mod.php'); /** diff --git a/student_attendance_form.php b/student_attendance_form.php index 5f7d7d7..03fd77f 100644 --- a/student_attendance_form.php +++ b/student_attendance_form.php @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +defined('MOODLE_INTERNAL') || die(); require_once($CFG->libdir.'/formslib.php'); class mod_attendance_student_attendance_form extends moodleform { diff --git a/styles.css b/styles.css index 52a860a..689624f 100644 --- a/styles.css +++ b/styles.css @@ -1,5 +1,6 @@ .path-mod-attendance .attbtn { border:1px solid #AAAAAA; + border-radius: 5px; margin-left: 2px; margin-right: 2px; padding: 5px; @@ -7,7 +8,6 @@ -webkit-border-radius: 5px; -opera-border-radius: 5px; -khtml-border-radius: 5px; - border-radius: 5px; } .path-mod-attendance .attcurbtn { @@ -18,8 +18,8 @@ .path-mod-attendance .attfiltercontrols { margin-bottom: 10px !important; - margin-right:auto; margin-left:auto; + margin-right:auto; } .path-mod-attendance .attfiltercontrols #currentdate{ @@ -27,8 +27,8 @@ } .path-mod-attendance .attwidth { - width:90%; margin: auto; + width:90%; } .path-mod-attendance .userwithoutenrol, @@ -59,8 +59,8 @@ } .path-mod-attendance table.controls { - width: 100%; text-align: center; + width: 100%; } .path-mod-attendance table.controls tr { @@ -81,15 +81,15 @@ } .path-mod-attendance .takecontrols { - width: 800px; margin: 0 auto 20px auto; + width: 800px; } .path-mod-attendance .takecontrols table{ margin: 0 auto; } .path-mod-attendance .takecontrols .c0 { - width: 500px; text-align: left; + width: 500px; } .path-mod-attendance .takecontrols .c1 { text-align: right; @@ -133,15 +133,15 @@ } .path-mod-attendance .remarkholder .remarkcontent { - display: none; - position: absolute; + background-color: white; border: 1px solid #ccc; border-radius: 3px; box-shadow: 3px 3px 5px #ccc; - background-color: white; + display: none; left: 20px; - top: 0; padding: 5px; + position: absolute; + top: 0; width: 150px; z-index: 5000; } diff --git a/update_form.php b/update_form.php index a5d567e..cd452c0 100644 --- a/update_form.php +++ b/update_form.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - +defined('MOODLE_INTERNAL') || die(); require_once($CFG->libdir.'/formslib.php'); /** diff --git a/version.php b/version.php index 39e624d..c726334 100644 --- a/version.php +++ b/version.php @@ -21,6 +21,7 @@ * @copyright 2011 Artem Andreev * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); $plugin->version = 2016082900; $plugin->requires = 2016052300;