mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00
Code Issues Projects Releases Wiki Activity

MDL-22054 fixed missing strings and some really annoying redirects

Browse Source
This commit is contained in:
Petr Skoda 2010-04-11 09:41:25 +00:00
parent 5fd8ea0e9d
commit fe9d7318b5
5 changed files with 8 additions and 13 deletions

10
admin/repository.php

@ -30,7 +30,7 @@ admin_externalpage_setup($pagename);
$sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
$baseurl = $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=managerepositories';
$configstr = get_string('managerepositories', 'repository');
$configstr = get_string('manage', 'repository');
$return = true;
@ -98,15 +98,14 @@ if (!empty($edit) || !empty($new)) {
$data = data_submitted();
}
if ($success) {
$savedstr = get_string('configsaved', 'repository');
$has_instance = repository::static_function($plugin, 'get_instance_option_names');
if (!empty($has_instance)) {
// no common setting for this type, so go to setup instances
redirect($sesskeyurl.'&edit='.$plugin, $savedstr, 1);
redirect($sesskeyurl.'&edit='.$plugin);
} else {
// configs saved
redirect($baseurl, $savedstr, 1);
redirect($baseurl);
}
} else {
print_error('instancenotsaved', 'repository', $baseurl);
@ -157,8 +156,7 @@ if (!empty($edit) || !empty($new)) {
print_error('confirmsesskeybad', '', $baseurl);
}
if ($repositorytype->delete()) {
$deletedstr = get_string('removed', 'repository');
redirect($baseurl, $deletedstr, 3);
redirect($baseurl);
} else {
print_error('instancenotdeleted', 'repository', $baseurl);
}

5
admin/repositoryinstance.php

@ -78,10 +78,7 @@ if (!empty($edit) || !empty($new)) {
$data = data_submitted();
}
if ($success) {
$savedstr = get_string('configsaved', 'repository');
echo $OUTPUT->header();
echo $OUTPUT->heading($savedstr);
redirect($baseurl, $savedstr, 3);
redirect($baseurl);
} else {
print_error('instancenotsaved', 'repository', $baseurl);
}

2
admin/settings/plugins.php

@ -244,7 +244,7 @@ if ($hassiteconfig) {
get_string('deleterepository', 'repository'), $url, 'moodle/site:config', true),
'', $url);
$ADMIN->add('repositorysettings', new admin_externalpage('repositorycontroller',
get_string('managerepositories', 'repository'), $url, 'moodle/site:config', true),
get_string('manage', 'repository'), $url, 'moodle/site:config', true),
'', $url);
$ADMIN->add('repositorysettings', new admin_externalpage('repositoryinstancenew',
get_string('createrepository', 'repository'), $url, 'moodle/site:config', true),

2
lib/adminlib.php

@ -6006,7 +6006,7 @@ class admin_setting_managerepository extends admin_setting {
*/
public function __construct() {
global $CFG;
parent::__construct('managerepository', get_string('managerepository', 'repository'), '', '');
parent::__construct('managerepository', get_string('manage', 'repository'), '', '');
$this->baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/repository.php?sesskey=' . sesskey();
}

2
repository/lib.php

@ -478,7 +478,7 @@ abstract class repository {
* Return a type for a given type name.
* @global object $DB
* @param string $typename the type name
* @return object
* @return repository_type
*/
public static function get_type_by_typename($typename) {
global $DB;