### Eclipse Workspace Patch 1.0 #P contrib Index: plugins/blocks/birthday/config_global.html =================================================================== RCS file: /cvsroot/moodle/contrib/plugins/blocks/birthday/config_global.html,v retrieving revision 1.3 diff -u -r1.3 config_global.html --- plugins/blocks/birthday/config_global.html 31 Aug 2007 03:42:28 -0000 1.3 +++ plugins/blocks/birthday/config_global.html 16 Apr 2008 22:32:30 -0000 @@ -3,9 +3,10 @@ block_birthday_fieldname: - @@ -14,26 +15,43 @@ + + + block_birthday_days: + + + + + + + + block_birthday_dateformat: - - Index: plugins/blocks/birthday/block_birthday.php =================================================================== RCS file: /cvsroot/moodle/contrib/plugins/blocks/birthday/block_birthday.php,v retrieving revision 1.10 diff -u -r1.10 block_birthday.php --- plugins/blocks/birthday/block_birthday.php 15 Apr 2008 09:07:10 -0000 1.10 +++ plugins/blocks/birthday/block_birthday.php 16 Apr 2008 22:32:30 -0000 @@ -1,21 +1,57 @@ -title = get_string('birthday','block_birthday'); //can be used for multiple languages as it gets developed further - $this->version = 2007071300; + $this->version = 2008041601; } - + // $date a string value of the user profile field data + // $format is a string of the $dateformat - either ISO, USA, or EUR + function has_config() {return true;} + + function config_save($data) { + foreach ($data as $name => $value) { + set_config($name, $value,'block/birthday'); + } + return true; + } function get_content() { global $USER, $CFG, $COURSE; - + $cfg_birthday = get_config('block/birthday'); + if ($this->content !== NULL) { return $this->content; } @@ -29,21 +65,27 @@ } // make sure config variables are defined - if not, set them to default values - if (!isset($CFG->block_birthday_fieldname)) { - $fieldname = 'DOB'; + + if (!isset($cfg_birthday->block_birthday_fieldname)) { + $fieldname = 'DOB'; //this is the default } - //this is the default else { - $fieldname = $CFG->block_birthday_fieldname ; + $fieldname = $cfg_birthday->block_birthday_fieldname ; } - if (!isset($CFG->block_birthday_dateformat)) { - $dateformat = 'ISO'; + if (!isset($cfg_birthday->block_birthday_dateformat)) { + $dateformat = 'ISO'; //this is the default } - //this is the default else { - $dateformat = $CFG->block_birthday_dateformat ; + $dateformat = $cfg_birthday->block_birthday_dateformat ; } + + if (!isset($cfg_birthday->block_birthday_days)) { + $days = 0; //this is the default + } + else { + $days = $cfg_birthday->block_birthday_days ; + } // get the field id for the given fieldname if (isset($fieldname)) { @@ -64,9 +106,22 @@ && $COURSE->groupmodeforce && !has_capability('moodle/site:accessallgroups', $context)); + //Get the user current group + $currentgroup = $isseparategroups ? groups_get_course_group($COURSE) : NULL; + + $groupmembers = ""; + $groupselect = ""; + + //Add this to the SQL to show only group users + if ($currentgroup !== NULL) { + $groupmembers = ", {$CFG->prefix}groups_members gm "; + $groupselect = " AND u.id = gm.userid AND gm.groupid = '$currentgroup'"; + } + $users = array(); // there are probably more eloquent ways of getting the current user's time/date information - $userdate = usergetdate(time(),$USER->timezone); + for ($i=0; $i <= $days; $i++) { + $userdate = usergetdate((time()+($i*86400)),$USER->timezone); $usermonth = $userdate['mon']; $userday = $userdate['mday']; $SQL = "SELECT u.id, u.username, u.firstname, u.lastname, u.picture, u.lastaccess, ud.data @@ -78,8 +133,8 @@ AND day(STR_TO_DATE(ud.data,GET_FORMAT(DATE,'{$dateformat}'))) = $userday AND ud.fieldid={$fieldid} AND u.deleted = 0 - ORDER BY u.lastname, u.firstname ASC"; - + ORDER BY ud.data, u.lastname, u.firstname ASC"; + $pcontext = get_related_contexts_string($context); if ($pusers = get_records_sql($SQL, 0, 50)) { // We'll just take the most recent 50 maximum @@ -99,58 +154,89 @@ // and this user has a hidden assignment at this context or higher continue; } + + if ($COURSE->id == SITEID) { + ; // Site-level + } else { // Course-level + if ((!has_capability('moodle/course:viewparticipants', $context, $USER->id)) or (!has_capability('moodle/course:view',$context, $puser->id))) { + continue; + } + } $puser->fullname = fullname($puser); $users[$puser->id] = $puser; } - } + } + } //end of for i loop //Calculate minutes // $minutes = floor($timetoshowusers/60); - + $curday = date('M j', time()); //initialize current day + //Accessibility: Don't want 'Alt' text for the user picture; DO want it for the envelope/message link (existing lang string). + //Accessibility: Converted
to