File manager

File manager - Edit - /home/wwwroot/camplus.hk/elearning.acehub.hk/public_html/rm_users_m29.patch

Back
diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/admin/settings/users.php moodle/admin/settings/users.php --- moodle2/admin/settings/users.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/admin/settings/users.php 2015-07-06 22:28:04.000000000 +0800 @@ -158,12 +158,6 @@ 'city' => new lang_string('city'), 'country' => new lang_string('country'), 'timezone' => new lang_string('timezone'), - 'webpage' => new lang_string('webpage'), - 'icqnumber' => new lang_string('icqnumber'), - 'skypeid' => new lang_string('skypeid'), - 'yahooid' => new lang_string('yahooid'), - 'aimid' => new lang_string('aimid'), - 'msnid' => new lang_string('msnid'), 'firstaccess' => new lang_string('firstaccess'), 'lastaccess' => new lang_string('lastaccess'), 'lastip' => new lang_string('lastip'), diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/admin/tool/uploaduser/index.php moodle/admin/tool/uploaduser/index.php --- moodle2/admin/tool/uploaduser/index.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/admin/tool/uploaduser/index.php 2015-07-06 22:34:20.000000000 +0800 @@ -88,9 +88,8 @@ $STD_FIELDS = array('id', 'username', 'email', 'city', 'country', 'lang', 'timezone', 'mailformat', 'maildisplay', 'maildigest', 'htmleditor', 'autosubscribe', - 'institution', 'department', 'idnumber', 'skype', - 'msn', 'aim', 'yahoo', 'icq', 'phone1', 'phone2', 'address', - 'url', 'description', 'descriptionformat', 'password', + 'institution', 'department', 'idnumber', 'phone1', 'phone2', 'address', + 'description', 'descriptionformat', 'password', 'auth', // watch out when changing auth type or using external auth plugins! 'oldusername', // use when renaming users - this is the original username 'suspended', // 1 means suspend user account, 0 means activate user account, nothing means keep as is for existing users diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/admin/user/user_bulk_download.php moodle/admin/user/user_bulk_download.php --- moodle2/admin/user/user_bulk_download.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/admin/user/user_bulk_download.php 2015-07-06 22:34:38.000000000 +0800 @@ -30,12 +30,6 @@ 'phone1' => 'phone1', 'phone2' => 'phone2', 'city' => 'city', - 'url' => 'url', - 'icq' => 'icq', - 'skype' => 'skype', - 'aim' => 'aim', - 'yahoo' => 'yahoo', - 'msn' => 'msn', 'country' => 'country'); if ($extrafields = $DB->get_records('user_info_field')) { diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/availability/condition/profile/classes/frontend.php moodle/availability/condition/profile/classes/frontend.php --- moodle2/availability/condition/profile/classes/frontend.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/availability/condition/profile/classes/frontend.php 2015-07-06 22:34:55.000000000 +0800 @@ -49,12 +49,6 @@ 'email' => get_user_field_name('email'), 'city' => get_user_field_name('city'), 'country' => get_user_field_name('country'), - 'url' => get_user_field_name('url'), - 'icq' => get_user_field_name('icq'), - 'skype' => get_user_field_name('skype'), - 'aim' => get_user_field_name('aim'), - 'yahoo' => get_user_field_name('yahoo'), - 'msn' => get_user_field_name('msn'), 'idnumber' => get_user_field_name('idnumber'), 'institution' => get_user_field_name('institution'), 'department' => get_user_field_name('department'), diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/backup/converter/moodle1/tests/fixtures/moodle.xml moodle/backup/converter/moodle1/tests/fixtures/moodle.xml --- moodle2/backup/converter/moodle1/tests/fixtures/moodle.xml 2015-07-02 21:26:11.000000000 +0800 +++ moodle/backup/converter/moodle1/tests/fixtures/moodle.xml 2015-07-06 22:35:55.000000000 +0800 @@ -301,11 +301,6 @@ <LASTNAME>User</LASTNAME> <EMAIL>adamzap@example.com</EMAIL> <EMAILSTOP>0</EMAILSTOP> - <ICQ></ICQ> - <SKYPE></SKYPE> - <YAHOO></YAHOO> - <AIM></AIM> - <MSN></MSN> <PHONE1></PHONE1> <PHONE2></PHONE2> <INSTITUTION></INSTITUTION> @@ -323,7 +318,6 @@ <LASTIP>130.39.194.172</LASTIP> <SECRET>lknsJoSw0S6myJA</SECRET> <PICTURE>1</PICTURE> - <URL></URL> <DESCRIPTION></DESCRIPTION> <MAILFORMAT>1</MAILFORMAT> <MAILDIGEST>0</MAILDIGEST> @@ -370,11 +364,6 @@ <LASTNAME>Zapletal</LASTNAME> <EMAIL>azaple1@example.com</EMAIL> <EMAILSTOP>0</EMAILSTOP> - <ICQ></ICQ> - <SKYPE></SKYPE> - <YAHOO></YAHOO> - <AIM></AIM> - <MSN></MSN> <PHONE1></PHONE1> <PHONE2></PHONE2> <INSTITUTION></INSTITUTION> @@ -392,7 +381,6 @@ <LASTIP>173.253.129.223</LASTIP> <SECRET></SECRET> <PICTURE>1</PICTURE> - <URL></URL> <DESCRIPTION></DESCRIPTION> <MAILFORMAT>1</MAILFORMAT> <MAILDIGEST>0</MAILDIGEST> @@ -483,11 +471,6 @@ <LASTNAME>Cali</LASTNAME> <EMAIL>pcali1@example.com</EMAIL> <EMAILSTOP>0</EMAILSTOP> - <ICQ></ICQ> - <SKYPE></SKYPE> - <YAHOO></YAHOO> - <AIM></AIM> - <MSN></MSN> <PHONE1></PHONE1> <PHONE2></PHONE2> <INSTITUTION></INSTITUTION> @@ -505,7 +488,6 @@ <LASTIP>68.105.37.237</LASTIP> <SECRET></SECRET> <PICTURE>1</PICTURE> - <URL></URL> <DESCRIPTION>$@NULL@$</DESCRIPTION> <MAILFORMAT>1</MAILFORMAT> <MAILDIGEST>0</MAILDIGEST> diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/backup/moodle2/backup_stepslib.php moodle/backup/moodle2/backup_stepslib.php --- moodle2/backup/moodle2/backup_stepslib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/backup/moodle2/backup_stepslib.php 2015-07-06 22:36:21.000000000 +0800 @@ -1282,11 +1282,10 @@ // Then, the fields potentially needing anonymization $anonfields = array( - 'username', 'idnumber', 'email', 'icq', 'skype', - 'yahoo', 'aim', 'msn', 'phone1', + 'username', 'idnumber', 'email', 'phone1', 'phone2', 'institution', 'department', 'address', 'city', 'country', 'lastip', 'picture', - 'url', 'description', 'descriptionformat', 'imagealt', 'auth'); + 'description', 'descriptionformat', 'imagealt', 'auth'); $anonfields = array_merge($anonfields, get_all_user_name_fields()); // Add anonymized fields to $userfields with custom final element diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/backup/util/helper/backup_anonymizer_helper.class.php moodle/backup/util/helper/backup_anonymizer_helper.class.php --- moodle2/backup/util/helper/backup_anonymizer_helper.class.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/backup/util/helper/backup_anonymizer_helper.class.php 2015-07-06 22:37:05.000000000 +0800 @@ -96,26 +96,6 @@ return 'anon' . $counter . '@doesntexist.com'; // Just a counter } - public static function process_user_icq($value) { - return ''; // Clean icq - } - - public static function process_user_skype($value) { - return ''; // Clean skype - } - - public static function process_user_yahoo($value) { - return ''; // Clean yahoo - } - - public static function process_user_aim($value) { - return ''; // Clean aim - } - - public static function process_user_msn($value) { - return ''; // Clean msn - } - public static function process_user_phone1($value) { return ''; // Clean phone1 } @@ -152,10 +132,6 @@ return 0; // No picture } - public static function process_user_url($value) { - return ''; // No url - } - public static function process_user_description($value) { return ''; // No user description } diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/badges/criteria/award_criteria_profile.php moodle/badges/criteria/award_criteria_profile.php --- moodle2/badges/criteria/award_criteria_profile.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/badges/criteria/award_criteria_profile.php 2015-07-06 22:40:06.000000000 +0800 @@ -51,8 +51,7 @@ $missing = array(); // Note: cannot use user_get_default_fields() here because it is not possible to decide which fields user can modify. - $dfields = array('firstname', 'lastname', 'email', 'address', 'phone1', 'phone2', 'icq', 'skype', 'yahoo', - 'aim', 'msn', 'department', 'institution', 'description', 'city', 'url', 'country'); + $dfields = array('firstname', 'lastname', 'email', 'address', 'phone1', 'phone2', 'department', 'institution', 'description', 'city', 'country'); $sql = "SELECT uf.id as fieldid, uf.name as name, ic.id as categoryid, ic.name as categoryname, uf.datatype FROM {user_info_field} uf diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/blocks/myprofile/block_myprofile.php moodle/blocks/myprofile/block_myprofile.php --- moodle2/blocks/myprofile/block_myprofile.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/blocks/myprofile/block_myprofile.php 2015-07-06 22:41:35.000000000 +0800 @@ -94,36 +94,7 @@ $this->content->text .= obfuscate_mailto($USER->email, ''); $this->content->text .= '</div>'; } - - if(!empty($this->config->display_icq) && !empty($USER->icq)) { - $this->content->text .= '<div class="myprofileitem icq">'; - $this->content->text .= 'ICQ: ' . s($USER->icq); - $this->content->text .= '</div>'; - } - - if(!empty($this->config->display_skype) && !empty($USER->skype)) { - $this->content->text .= '<div class="myprofileitem skype">'; - $this->content->text .= 'Skype: ' . s($USER->skype); - $this->content->text .= '</div>'; - } - - if(!empty($this->config->display_yahoo) && !empty($USER->yahoo)) { - $this->content->text .= '<div class="myprofileitem yahoo">'; - $this->content->text .= 'Yahoo: ' . s($USER->yahoo); - $this->content->text .= '</div>'; - } - - if(!empty($this->config->display_aim) && !empty($USER->aim)) { - $this->content->text .= '<div class="myprofileitem aim">'; - $this->content->text .= 'AIM: ' . s($USER->aim); - $this->content->text .= '</div>'; - } - - if(!empty($this->config->display_msn) && !empty($USER->msn)) { - $this->content->text .= '<div class="myprofileitem msn">'; - $this->content->text .= 'MSN: ' . s($USER->msn); - $this->content->text .= '</div>'; - } + if(!empty($this->config->display_phone1) && !empty($USER->phone1)) { $this->content->text .= '<div class="myprofileitem phone1">'; diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/blocks/myprofile/edit_form.php moodle/blocks/myprofile/edit_form.php --- moodle2/blocks/myprofile/edit_form.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/blocks/myprofile/edit_form.php 2015-07-06 23:05:54.000000000 +0800 @@ -64,40 +64,6 @@ $mform->setDefault('config_display_un', '0'); } - $mform->addElement('selectyesno', 'config_display_icq', get_string('display_icq', 'block_myprofile')); - if (isset($this->block->config->display_icq)) { - $mform->setDefault('config_display_icq', $this->block->config->display_icq); - } else { - $mform->setDefault('config_display_icq', '0'); - } - - $mform->addElement('selectyesno', 'config_display_skype', get_string('display_skype', 'block_myprofile')); - if (isset($this->block->config->display_skype)) { - $mform->setDefault('config_display_skype', $this->block->config->display_skype); - } else { - $mform->setDefault('config_display_skype', '0'); - } - - $mform->addElement('selectyesno', 'config_display_yahoo', get_string('display_yahoo', 'block_myprofile')); - if (isset($this->block->config->display_yahoo)) { - $mform->setDefault('config_display_yahoo', $this->block->config->display_yahoo); - } else { - $mform->setDefault('config_display_yahoo', '0'); - } - - $mform->addElement('selectyesno', 'config_display_aim', get_string('display_aim', 'block_myprofile')); - if (isset($this->block->config->display_aim)) { - $mform->setDefault('config_display_aim', $this->block->config->display_aim); - } else { - $mform->setDefault('config_display_aim', '0'); - } - - $mform->addElement('selectyesno', 'config_display_msn', get_string('display_msn', 'block_myprofile')); - if (isset($this->block->config->display_msn)) { - $mform->setDefault('config_display_msn', $this->block->config->display_msn); - } else { - $mform->setDefault('config_display_msn', '0'); - } $mform->addElement('selectyesno', 'config_display_phone1', get_string('display_phone1', 'block_myprofile')); if (isset($this->block->config->display_phone1)) { diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/blocks/myprofile/lang/en/block_myprofile.php moodle/blocks/myprofile/lang/en/block_myprofile.php --- moodle2/blocks/myprofile/lang/en/block_myprofile.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/blocks/myprofile/lang/en/block_myprofile.php 2015-07-06 23:06:15.000000000 +0800 @@ -29,11 +29,6 @@ $string['display_city'] = 'Display city'; $string['display_email'] = 'Display email'; $string['display_un'] = 'Display name'; -$string['display_icq'] = 'Display ICQ'; -$string['display_skype'] = 'Display Skype'; -$string['display_yahoo'] = 'Display Yahoo'; -$string['display_aim'] = 'Display AIM'; -$string['display_msn'] = 'Display MSN'; $string['display_phone1'] = 'Display phone number 1'; $string['display_phone2'] = 'Display phone number 2'; $string['display_institution'] = 'Display institution'; diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/enrol/externallib.php moodle/enrol/externallib.php --- moodle2/enrol/externallib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/enrol/externallib.php 2015-07-06 23:07:07.000000000 +0800 @@ -207,11 +207,6 @@ 'address' => new external_value(PARAM_MULTILANG, 'Postal address', VALUE_OPTIONAL), 'phone1' => new external_value(PARAM_NOTAGS, 'Phone 1', VALUE_OPTIONAL), 'phone2' => new external_value(PARAM_NOTAGS, 'Phone 2', VALUE_OPTIONAL), - 'icq' => new external_value(PARAM_NOTAGS, 'icq number', VALUE_OPTIONAL), - 'skype' => new external_value(PARAM_NOTAGS, 'skype id', VALUE_OPTIONAL), - 'yahoo' => new external_value(PARAM_NOTAGS, 'yahoo id', VALUE_OPTIONAL), - 'aim' => new external_value(PARAM_NOTAGS, 'aim id', VALUE_OPTIONAL), - 'msn' => new external_value(PARAM_NOTAGS, 'msn number', VALUE_OPTIONAL), 'department' => new external_value(PARAM_TEXT, 'department', VALUE_OPTIONAL), 'institution' => new external_value(PARAM_TEXT, 'institution', VALUE_OPTIONAL), 'interests' => new external_value(PARAM_TEXT, 'user interests (separated by commas)', VALUE_OPTIONAL), @@ -220,7 +215,6 @@ 'description' => new external_value(PARAM_RAW, 'User profile description', VALUE_OPTIONAL), 'descriptionformat' => new external_value(PARAM_INT, 'User profile description format', VALUE_OPTIONAL), 'city' => new external_value(PARAM_NOTAGS, 'Home city of the user', VALUE_OPTIONAL), - 'url' => new external_value(PARAM_URL, 'URL of the user', VALUE_OPTIONAL), 'country' => new external_value(PARAM_ALPHA, 'Country code of the user, such as AU or CZ', VALUE_OPTIONAL), 'profileimageurlsmall' => new external_value(PARAM_URL, 'User image profile URL - small', VALUE_OPTIONAL), 'profileimageurl' => new external_value(PARAM_URL, 'User image profile URL - big', VALUE_OPTIONAL), @@ -513,11 +507,6 @@ 'address' => new external_value(PARAM_TEXT, 'Postal address', VALUE_OPTIONAL), 'phone1' => new external_value(PARAM_NOTAGS, 'Phone 1', VALUE_OPTIONAL), 'phone2' => new external_value(PARAM_NOTAGS, 'Phone 2', VALUE_OPTIONAL), - 'icq' => new external_value(PARAM_NOTAGS, 'icq number', VALUE_OPTIONAL), - 'skype' => new external_value(PARAM_NOTAGS, 'skype id', VALUE_OPTIONAL), - 'yahoo' => new external_value(PARAM_NOTAGS, 'yahoo id', VALUE_OPTIONAL), - 'aim' => new external_value(PARAM_NOTAGS, 'aim id', VALUE_OPTIONAL), - 'msn' => new external_value(PARAM_NOTAGS, 'msn number', VALUE_OPTIONAL), 'department' => new external_value(PARAM_TEXT, 'department', VALUE_OPTIONAL), 'institution' => new external_value(PARAM_TEXT, 'institution', VALUE_OPTIONAL), 'idnumber' => new external_value(PARAM_RAW, 'An arbitrary ID code number perhaps from the institution', VALUE_OPTIONAL), @@ -527,7 +516,6 @@ 'description' => new external_value(PARAM_RAW, 'User profile description', VALUE_OPTIONAL), 'descriptionformat' => new external_format_value('description', VALUE_OPTIONAL), 'city' => new external_value(PARAM_NOTAGS, 'Home city of the user', VALUE_OPTIONAL), - 'url' => new external_value(PARAM_URL, 'URL of the user', VALUE_OPTIONAL), 'country' => new external_value(PARAM_ALPHA, 'Home country code of the user, such as AU or CZ', VALUE_OPTIONAL), 'profileimageurlsmall' => new external_value(PARAM_URL, 'User image profile URL - small version', VALUE_OPTIONAL), 'profileimageurl' => new external_value(PARAM_URL, 'User image profile URL - big version', VALUE_OPTIONAL), diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/lang/en/moodle.php moodle/lang/en/moodle.php --- moodle2/lang/en/moodle.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/lang/en/moodle.php 2015-07-06 23:39:33.000000000 +0800 @@ -961,7 +961,6 @@ $string['choosetheme'] = 'Choose theme'; $string['chooseuser'] = 'Choose a user'; $string['eventcontentviewed'] = 'Content viewed'; -$string['icqnumber'] = 'ICQ number'; $string['icon'] = 'Icon'; $string['idnumber'] = 'ID number'; $string['idnumbercourse'] = 'Course ID number'; @@ -1212,7 +1211,6 @@ $string['moveselectedcoursesto'] = 'Move selected courses to...'; $string['movetoanotherfolder'] = 'Move to another folder'; $string['moveup'] = 'Move up'; -$string['msnid'] = 'MSN ID'; $string['mustconfirm'] = 'You need to confirm your login'; $string['mustchangepassword'] = 'The new password must be different than the current one'; $string['mycourses'] = 'My courses'; @@ -1733,7 +1731,6 @@ $string['skiptocategorylisting'] = 'Skip to the category listings'; $string['skiptocourselisting'] = 'Skip to the course listings'; $string['skiptocoursedetails'] = 'Skip to the detailed course information'; -$string['skypeid'] = 'Skype ID'; $string['socialheadline'] = 'Social forum - latest topics'; $string['someallowguest'] = 'Some courses may allow guest access'; $string['someerrorswerefound'] = 'Some information was missing or incorrect. Look below for details.'; @@ -1980,7 +1977,6 @@ $string['visibletostudents'] = 'Visible to {$a}'; $string['warning'] = 'Warning'; $string['warningdeleteresource'] = 'Warning: {$a} is referred in a resource. Would you like to update the resource?'; -$string['webpage'] = 'Web page'; $string['week'] = 'Week'; $string['weeks'] = 'weeks'; $string['weekhide'] = 'Hide this week from {$a}'; @@ -2029,7 +2025,6 @@ $string['writingscalesinfo'] = 'Writing scales info'; $string['writinguserinfo'] = 'Writing users info'; $string['wrongpassword'] = 'Incorrect password for this username'; -$string['yahooid'] = 'Yahoo ID'; $string['year'] = 'year'; $string['years'] = 'years'; $string['yes'] = 'Yes'; diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/lib/db/install.xml moodle/lib/db/install.xml --- moodle2/lib/db/install.xml 2015-07-02 21:26:11.000000000 +0800 +++ moodle/lib/db/install.xml 2015-07-06 23:08:00.000000000 +0800 @@ -651,11 +651,6 @@ <FIELD NAME="lastname" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="email" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="emailstop" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/> - <FIELD NAME="icq" TYPE="char" LENGTH="15" NOTNULL="true" SEQUENCE="false"/> - <FIELD NAME="skype" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false"/> - <FIELD NAME="yahoo" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false"/> - <FIELD NAME="aim" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false"/> - <FIELD NAME="msn" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="phone1" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="phone2" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="institution" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/> @@ -674,7 +669,6 @@ <FIELD NAME="lastip" TYPE="char" LENGTH="45" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="secret" TYPE="char" LENGTH="15" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="picture" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="0 means no image uploaded, positive values are revisions thta prevent caching problems, negative values are reserved for future use"/> - <FIELD NAME="url" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="description" TYPE="text" NOTNULL="false" SEQUENCE="false"/> <FIELD NAME="descriptionformat" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/> <FIELD NAME="mailformat" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1" SEQUENCE="false"/> diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/lib/moodlelib.php moodle/lib/moodlelib.php --- moodle2/lib/moodlelib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/lib/moodlelib.php 2015-07-06 23:08:23.000000000 +0800 @@ -3543,24 +3543,6 @@ case 'phone1' : { return get_string('phone'); } - case 'url' : { - return get_string('webpage'); - } - case 'icq' : { - return get_string('icqnumber'); - } - case 'skype' : { - return get_string('skypeid'); - } - case 'aim' : { - return get_string('aimid'); - } - case 'yahoo' : { - return get_string('yahooid'); - } - case 'msn' : { - return get_string('msnid'); - } } // Otherwise just use the same lang string. return get_string($field); diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/lib/myprofilelib.php moodle/lib/myprofilelib.php --- moodle2/lib/myprofilelib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/lib/myprofilelib.php 2015-07-06 23:20:14.000000000 +0800 @@ -320,52 +320,6 @@ echo html_writer::end_tag('dl'); } - if ($user->icq && !isset($hiddenfields['icqnumber'])) { - $imurl = new moodle_url('http://web.icq.com/wwp', array('uin' => $user->icq) ); - $iconurl = new moodle_url('http://web.icq.com/whitepages/online', array('icq' => $user->icq, 'img' => '5')); - $statusicon = html_writer::tag('img', '', - array('src' => $iconurl, 'class' => 'icon icon-post', 'alt' => get_string('status'))); - $node = new core_user\output\myprofile\node('contact', 'icqnumber', get_string('icqnumber'), null, null, - html_writer::link($imurl, s($user->icq) . $statusicon)); - $tree->add_node($node); - } - - if ($user->skype && !isset($hiddenfields['skypeid'])) { - $imurl = 'skype:'.urlencode($user->skype).'?call'; - $iconurl = new moodle_url('http://mystatus.skype.com/smallicon/'.urlencode($user->skype)); - if (is_https()) { - // Bad luck, skype devs are lazy to set up SSL on their servers - see MDL-37233. - $statusicon = ''; - } else { - $statusicon = html_writer::empty_tag('img', - array('src' => $iconurl, 'class' => 'icon icon-post', 'alt' => get_string('status'))); - } - - $node = new core_user\output\myprofile\node('contact', 'skypeid', get_string('skypeid'), null, null, - html_writer::link($imurl, s($user->skype) . $statusicon)); - $tree->add_node($node); - } - if ($user->yahoo && !isset($hiddenfields['yahooid'])) { - $imurl = new moodle_url('http://edit.yahoo.com/config/send_webmesg', array('.target' => $user->yahoo, '.src' => 'pg')); - $iconurl = new moodle_url('http://opi.yahoo.com/online', array('u' => $user->yahoo, 'm' => 'g', 't' => '0')); - $statusicon = html_writer::tag('img', '', - array('src' => $iconurl, 'class' => 'iconsmall icon-post', 'alt' => get_string('status'))); - - $node = new core_user\output\myprofile\node('contact', 'yahooid', get_string('yahooid'), null, null, - html_writer::link($imurl, s($user->yahoo) . $statusicon)); - $tree->add_node($node); - } - if ($user->aim && !isset($hiddenfields['aimid'])) { - $imurl = 'aim:goim?screenname='.urlencode($user->aim); - $node = new core_user\output\myprofile\node('contact', 'aimid', get_string('aimid'), null, null, - html_writer::link($imurl, s($user->aim))); - $tree->add_node($node); - } - if ($user->msn && !isset($hiddenfields['msnid'])) { - $node = new core_user\output\myprofile\node('contact', 'msnid', get_string('msnid'), null, null, - s($user->msn)); - $tree->add_node($node); - } if ($categories = $DB->get_records('user_info_category', null, 'sortorder ASC')) { foreach ($categories as $category) { diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/lib/tests/datalib_test.php moodle/lib/tests/datalib_test.php --- moodle2/lib/tests/datalib_test.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/lib/tests/datalib_test.php 2015-07-06 23:20:50.000000000 +0800 @@ -60,11 +60,6 @@ 'address' => '2 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 1', 'institution' => 'Institution of user 1', 'description' => 'This is a description for user 1', @@ -83,11 +77,6 @@ 'address' => '222 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 2', 'institution' => 'Institution of user 2', 'description' => 'This is a description for user 2', diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/mod/url/locallib.php moodle/mod/url/locallib.php --- moodle2/mod/url/locallib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/mod/url/locallib.php 2015-07-06 23:36:45.000000000 +0800 @@ -420,7 +420,6 @@ 'userlastname' => get_string('lastname'), 'userfullname' => get_string('fullnameuser'), 'useremail' => get_string('email'), - 'usericq' => get_string('icqnumber'), 'userphone1' => get_string('phone').' 1', 'userphone2' => get_string('phone2').' 2', 'userinstitution' => get_string('institution'), @@ -428,7 +427,6 @@ 'useraddress' => get_string('address'), 'usercity' => get_string('city'), 'usertimezone' => get_string('timezone'), - 'userurl' => get_string('webpage'), ); if ($config->rolesinparams) { diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/user/editlib.php moodle/user/editlib.php --- moodle2/user/editlib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/user/editlib.php 2015-07-06 23:21:13.000000000 +0800 @@ -403,24 +403,6 @@ // Moodle optional fields. $mform->addElement('header', 'moodle_optional', get_string('optional', 'form')); - $mform->addElement('text', 'url', get_string('webpage'), 'maxlength="255" size="50"'); - $mform->setType('url', PARAM_URL); - - $mform->addElement('text', 'icq', get_string('icqnumber'), 'maxlength="15" size="25"'); - $mform->setType('icq', PARAM_NOTAGS); - - $mform->addElement('text', 'skype', get_string('skypeid'), 'maxlength="50" size="25"'); - $mform->setType('skype', PARAM_NOTAGS); - - $mform->addElement('text', 'aim', get_string('aimid'), 'maxlength="50" size="25"'); - $mform->setType('aim', PARAM_NOTAGS); - - $mform->addElement('text', 'yahoo', get_string('yahooid'), 'maxlength="50" size="25"'); - $mform->setType('yahoo', PARAM_NOTAGS); - - $mform->addElement('text', 'msn', get_string('msnid'), 'maxlength="50" size="25"'); - $mform->setType('msn', PARAM_NOTAGS); - $mform->addElement('text', 'idnumber', get_string('idnumber'), 'maxlength="255" size="25"'); $mform->setType('idnumber', PARAM_NOTAGS); diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/user/externallib.php moodle/user/externallib.php --- moodle2/user/externallib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/user/externallib.php 2015-07-06 23:21:45.000000000 +0800 @@ -957,11 +957,6 @@ 'address' => new external_value(PARAM_TEXT, 'Postal address', VALUE_OPTIONAL), 'phone1' => new external_value(PARAM_NOTAGS, 'Phone 1', VALUE_OPTIONAL), 'phone2' => new external_value(PARAM_NOTAGS, 'Phone 2', VALUE_OPTIONAL), - 'icq' => new external_value(PARAM_NOTAGS, 'icq number', VALUE_OPTIONAL), - 'skype' => new external_value(PARAM_NOTAGS, 'skype id', VALUE_OPTIONAL), - 'yahoo' => new external_value(PARAM_NOTAGS, 'yahoo id', VALUE_OPTIONAL), - 'aim' => new external_value(PARAM_NOTAGS, 'aim id', VALUE_OPTIONAL), - 'msn' => new external_value(PARAM_NOTAGS, 'msn number', VALUE_OPTIONAL), 'department' => new external_value(PARAM_TEXT, 'department', VALUE_OPTIONAL), 'institution' => new external_value(PARAM_TEXT, 'institution', VALUE_OPTIONAL), 'idnumber' => new external_value(PARAM_RAW, 'An arbitrary ID code number perhaps from the institution', VALUE_OPTIONAL), @@ -978,7 +973,6 @@ 'description' => new external_value(PARAM_RAW, 'User profile description', VALUE_OPTIONAL), 'descriptionformat' => new external_format_value('description', VALUE_OPTIONAL), 'city' => new external_value(PARAM_NOTAGS, 'Home city of the user', VALUE_OPTIONAL), - 'url' => new external_value(PARAM_URL, 'URL of the user', VALUE_OPTIONAL), 'country' => new external_value(PARAM_ALPHA, 'Home country code of the user, such as AU or CZ', VALUE_OPTIONAL), 'profileimageurlsmall' => new external_value(PARAM_URL, 'User image profile URL - small version'), 'profileimageurl' => new external_value(PARAM_URL, 'User image profile URL - big version'), diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/user/lib.php moodle/user/lib.php --- moodle2/user/lib.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/user/lib.php 2015-07-06 23:22:39.000000000 +0800 @@ -222,10 +222,10 @@ */ function user_get_default_fields() { return array( 'id', 'username', 'fullname', 'firstname', 'lastname', 'email', - 'address', 'phone1', 'phone2', 'icq', 'skype', 'yahoo', 'aim', 'msn', 'department', + 'address', 'phone1', 'phone2', 'department', 'institution', 'interests', 'firstaccess', 'lastaccess', 'auth', 'confirmed', 'idnumber', 'lang', 'theme', 'timezone', 'mailformat', 'description', 'descriptionformat', - 'city', 'url', 'country', 'profileimageurlsmall', 'profileimageurl', 'customfields', + 'city', 'country', 'profileimageurlsmall', 'profileimageurl', 'customfields', 'groups', 'roles', 'preferences', 'enrolledcourses' ); } @@ -405,31 +405,6 @@ $userdetails['city'] = $user->city; } - if (in_array('url', $userfields) && $user->url && (!isset($hiddenfields['webpage']) or $isadmin)) { - $url = $user->url; - if (strpos($user->url, '://') === false) { - $url = 'http://'. $url; - } - $user->url = clean_param($user->url, PARAM_URL); - $userdetails['url'] = $user->url; - } - - if (in_array('icq', $userfields) && $user->icq && (!isset($hiddenfields['icqnumber']) or $isadmin)) { - $userdetails['icq'] = $user->icq; - } - - if (in_array('skype', $userfields) && $user->skype && (!isset($hiddenfields['skypeid']) or $isadmin)) { - $userdetails['skype'] = $user->skype; - } - if (in_array('yahoo', $userfields) && $user->yahoo && (!isset($hiddenfields['yahooid']) or $isadmin)) { - $userdetails['yahoo'] = $user->yahoo; - } - if (in_array('aim', $userfields) && $user->aim && (!isset($hiddenfields['aimid']) or $isadmin)) { - $userdetails['aim'] = $user->aim; - } - if (in_array('msn', $userfields) && $user->msn && (!isset($hiddenfields['msnid']) or $isadmin)) { - $userdetails['msn'] = $user->msn; - } if (in_array('firstaccess', $userfields) && (!isset($hiddenfields['firstaccess']) or $isadmin)) { if ($user->firstaccess) { diff -Naur --ignore-matching-lines=: --exclude=.svn --exclude=.DS_Store moodle2/user/tests/externallib_test.php moodle/user/tests/externallib_test.php --- moodle2/user/tests/externallib_test.php 2015-07-02 21:26:11.000000000 +0800 +++ moodle/user/tests/externallib_test.php 2015-07-06 23:34:59.000000000 +0800 @@ -53,11 +53,6 @@ 'address' => '2 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 1', 'institution' => 'Institution of user 1', 'description' => 'This is a description for user 1', @@ -129,21 +123,7 @@ if (!empty($generateduser->phone2)) { $this->assertEquals($generateduser->phone2, $returneduser['phone2']); } - if (!empty($generateduser->icq)) { - $this->assertEquals($generateduser->icq, $returneduser['icq']); - } - if (!empty($generateduser->skype)) { - $this->assertEquals($generateduser->skype, $returneduser['skype']); - } - if (!empty($generateduser->yahoo)) { - $this->assertEquals($generateduser->yahoo, $returneduser['yahoo']); - } - if (!empty($generateduser->aim)) { - $this->assertEquals($generateduser->aim, $returneduser['aim']); - } - if (!empty($generateduser->msn)) { - $this->assertEquals($generateduser->msn, $returneduser['msn']); - } + if (!empty($generateduser->department)) { $this->assertEquals($generateduser->department, $returneduser['department']); } @@ -162,9 +142,6 @@ if (!empty($generateduser->country)) { $this->assertEquals($generateduser->country, $returneduser['country']); } - if (!empty($generateduser->url)) { - $this->assertEquals($generateduser->url, $returneduser['url']); - } if (!empty($CFG->usetags) and !empty($generateduser->interests)) { $this->assertEquals(implode(', ', $generateduser->interests), $returneduser['interests']); } @@ -212,11 +189,6 @@ 'address' => '2 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 1', 'institution' => 'Institution of user 1', 'description' => 'This is a description for user 1', @@ -291,21 +262,7 @@ if (!empty($generateduser->phone2)) { $this->assertEquals($generateduser->phone2, $returneduser['phone2']); } - if (!empty($generateduser->icq)) { - $this->assertEquals($generateduser->icq, $returneduser['icq']); - } - if (!empty($generateduser->skype)) { - $this->assertEquals($generateduser->skype, $returneduser['skype']); - } - if (!empty($generateduser->yahoo)) { - $this->assertEquals($generateduser->yahoo, $returneduser['yahoo']); - } - if (!empty($generateduser->aim)) { - $this->assertEquals($generateduser->aim, $returneduser['aim']); - } - if (!empty($generateduser->msn)) { - $this->assertEquals($generateduser->msn, $returneduser['msn']); - } + if (!empty($generateduser->department)) { $this->assertEquals($generateduser->department, $returneduser['department']); } @@ -324,9 +281,7 @@ if (!empty($generateduser->country)) { $this->assertEquals($generateduser->country, $returneduser['country']); } - if (!empty($generateduser->url)) { - $this->assertEquals($generateduser->url, $returneduser['url']); - } + if (!empty($CFG->usetags) and !empty($generateduser->interests)) { $this->assertEquals(implode(', ', $generateduser->interests), $returneduser['interests']); } @@ -374,11 +329,6 @@ 'address' => '2 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 1', 'institution' => 'Institution of user 1', 'description' => 'This is a description for user 1', @@ -438,18 +387,12 @@ $this->assertEquals($user1->address, $enrolleduser['address']); $this->assertEquals($user1->phone1, $enrolleduser['phone1']); $this->assertEquals($user1->phone2, $enrolleduser['phone2']); - $this->assertEquals($user1->icq, $enrolleduser['icq']); - $this->assertEquals($user1->skype, $enrolleduser['skype']); - $this->assertEquals($user1->yahoo, $enrolleduser['yahoo']); - $this->assertEquals($user1->aim, $enrolleduser['aim']); - $this->assertEquals($user1->msn, $enrolleduser['msn']); $this->assertEquals($user1->department, $enrolleduser['department']); $this->assertEquals($user1->institution, $enrolleduser['institution']); $this->assertEquals($user1->description, $enrolleduser['description']); $this->assertEquals(FORMAT_HTML, $enrolleduser['descriptionformat']); $this->assertEquals($user1->city, $enrolleduser['city']); $this->assertEquals($user1->country, $enrolleduser['country']); - $this->assertEquals($user1->url, $enrolleduser['url']); if (!empty($CFG->usetags)) { $this->assertEquals(implode(', ', $user1->interests), $enrolleduser['interests']); } @@ -559,11 +502,6 @@ 'address' => '2 Test Street Perth 6000 WA', 'phone1' => '01010101010', 'phone2' => '02020203', - 'icq' => 'testuser1', - 'skype' => 'testuser1', - 'yahoo' => 'testuser1', - 'aim' => 'testuser1', - 'msn' => 'testuser1', 'department' => 'Department of user 1', 'institution' => 'Institution of user 1', 'description' => 'This is a description for user 1', @@ -614,18 +551,12 @@ $this->assertEquals($user1->address, $enrolleduser['address']); $this->assertEquals($user1->phone1, $enrolleduser['phone1']); $this->assertEquals($user1->phone2, $enrolleduser['phone2']); - $this->assertEquals($user1->icq, $enrolleduser['icq']); - $this->assertEquals($user1->skype, $enrolleduser['skype']); - $this->assertEquals($user1->yahoo, $enrolleduser['yahoo']); - $this->assertEquals($user1->aim, $enrolleduser['aim']); - $this->assertEquals($user1->msn, $enrolleduser['msn']); $this->assertEquals($user1->department, $enrolleduser['department']); $this->assertEquals($user1->institution, $enrolleduser['institution']); $this->assertEquals($user1->description, $enrolleduser['description']); $this->assertEquals(FORMAT_HTML, $enrolleduser['descriptionformat']); $this->assertEquals($user1->city, $enrolleduser['city']); $this->assertEquals($user1->country, $enrolleduser['country']); - $this->assertEquals($user1->url, $enrolleduser['url']); if (!empty($CFG->usetags)) { $this->assertEquals(implode(', ', $user1->interests), $enrolleduser['interests']); }

| ver. 1.4 | Github | . | PHP 7.2.34 | Generation time: 0.13 | proxy | phpinfo | Settings