作業中
trunk/fs_moodle3.2/course/publish/forms.php (diff) trunk/lib/fs_moodle/version.php (diff)| @@ -216,7 +216,14 @@ | ||
| 216 | 216 | $mform->addElement('text', 'demourl', get_string('demourl', 'hub'), |
| 217 | 217 | array('class' => 'metadatatext')); |
| 218 | 218 | $mform->setType('demourl', PARAM_URL); |
| 219 | - $mform->setDefault('demourl', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 219 | +// (Shirai018): プロキシを利用しているコース（wwwrootと実際のURLが異なる）で発生する諸問題への対処 (2017/03/08) | |
| 220 | +// (Shirai018): ここから修正 | |
| 221 | +// $mform->setDefault('demourl', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 222 | + if (fs_function_enable('FS_ENABLE_USEPUBLICWWWROOT')) { | |
| 223 | + global $fsCFG; | |
| 224 | + $mform->setDefault('demourl', $fsCFG->publicwwwroot."/course/view.php?id=" . $course->id); | |
| 225 | + } else $mform->setDefault('demourl', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 226 | +// (Shirai018): ここまで修正 | |
| 220 | 227 | $mform->addHelpButton('demourl', 'demourl', 'hub'); |
| 221 | 228 | } |
| 222 | 229 |
| @@ -228,10 +235,22 @@ | ||
| 228 | 235 | } |
| 229 | 236 | $mform->addElement('hidden', 'advertise', $advertise); |
| 230 | 237 | $mform->setType('advertise', PARAM_BOOL); |
| 231 | - $mform->addElement('hidden', 'courseurl', $CFG->wwwroot . "/course/view.php?id=" . $course->id); | |
| 238 | +// (Shirai018): ここから修正 | |
| 239 | +// $mform->addElement('hidden', 'courseurl', $CFG->wwwroot . "/course/view.php?id=" . $course->id); | |
| 240 | + if (fs_function_enable('FS_ENABLE_USEPUBLICWWWROOT')) { | |
| 241 | + global $fsCFG; | |
| 242 | + $mform->addElement('hidden', 'courseurl', $fsCFG->publicwwwroot . "/course/view.php?id=" . $course->id); | |
| 243 | + } else $mform->addElement('hidden', 'courseurl', $CFG->wwwroot . "/course/view.php?id=" . $course->id); | |
| 244 | +// (Shirai018): ここまで修正 | |
| 232 | 245 | $mform->setType('courseurl', PARAM_URL); |
| 233 | 246 | $mform->addElement('static', 'courseurlstring', get_string('courseurl', 'hub')); |
| 234 | - $mform->setDefault('courseurlstring', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 247 | +// (Shirai018): ここから修正 | |
| 248 | +// $mform->setDefault('courseurlstring', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 249 | + if (fs_function_enable('FS_ENABLE_USEPUBLICWWWROOT')) { | |
| 250 | + global $fsCFG; | |
| 251 | + $mform->setDefault('courseurlstring', $fsCFG->publicwwwroot."/course/view.php?id=" . $course->id); | |
| 252 | + } else $mform->setDefault('courseurlstring', new moodle_url("/course/view.php?id=" . $course->id)); | |
| 253 | +// (Shirai018): ここまで修正 | |
| 235 | 254 | $mform->addHelpButton('courseurlstring', 'courseurl', 'hub'); |
| 236 | 255 | } |
| 237 | 256 |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | // FS_MOODLE VERSION INFORMATION |
| 4 | 4 | |
| 5 | - $fsCFG->version = '20170308'; | |
| 6 | - $fsCFG->release = 'fs_moodle5.00.10'; | |
| 5 | + $fsCFG->version = '20170314'; | |
| 6 | + $fsCFG->release = 'fs_moodle5.00.11'; | |
| 7 | 7 | |
| 8 | 8 | ?> |
tatsuva