MDL-15402: add repository_cache_expire common option

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 4bfb0a8150caf13faaeddddd79058761cbb9ed04..ae43b07bf8702c5f04d13a22dc661fd9c86a8825 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -183,7 +183,10 @@ if ($hassiteconfig) {
     $url = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
     $ADMIN->add('modules', new admin_category('repositorysettings', $catname));
     $temp = new admin_settingpage('managerepositories', $managerepo);
+    $temp->add(new admin_setting_heading('managerepositories', get_string('activerepository', 'repository'), ''));
     $temp->add(new admin_setting_managerepository());
+    $temp->add(new admin_setting_heading('managerepositoriescommonheading', get_string('commonsettings', 'admin'), ''));
+    $temp->add(new admin_setting_configtext('repository_cache_expire', get_string('cacheexpire', 'repository'), get_string('configcacheexpire', 'repository'), 0));
     $ADMIN->add('repositorysettings', $temp);
     $ADMIN->add('repositorysettings', new admin_externalpage('repositorynew', 
         get_string('createrepository', 'repository'), $url, 'moodle/site:config', true), 

diff --git a/lang/en_utf8/repository.php b/lang/en_utf8/repository.php
index d56adc940345eb10c5327151717e312c7fc51ff8..e80b1e04b69963d2bdb9c85f1756a4ffc15548b4 100644 (file)
--- a/lang/en_utf8/repository.php
+++ b/lang/en_utf8/repository.php
@@ -1,11 +1,14 @@
 <?php //$Id$
+$string['activerepository'] = 'Active repository plugins';
 $string['add'] = 'Add';
 $string['addplugin'] = 'Add a repository plugin';
 $string['activaterep'] = 'Active repositories';
 $string['attachment'] = 'Attachment';
 $string['back'] = '&lt; Back';
+$string['cacheexpire'] = 'Cache expire';
 $string['close'] = 'Close';
 $string['copying'] = 'Copying';
+$string['configcacheexpire'] = 'Configurate the cache expired time.';
 $string['configsaved'] = 'Configuration saved!';
 $string['confirmdelete'] = 'Are you sure you want to delete this repository - $a?';
 $string['confirmremove'] = 'Are you sure you want to remove this repository plugin - $a?';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 026736cfbf3af9450a7fa7f2bd908ca333776a68..10bfdbeade0270049548262c3e34055d1f2a2012 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5578,7 +5578,7 @@ class admin_setting_managerepository extends admin_setting {
 
     function output_html($data, $query='') {
         global $CFG, $USER;
-        $output = print_box_start('','',true);
+        $output = print_box_start('generalbox','',true);
         $namestr = get_string('name');
         $stropt = get_string('operation', 'repository');
         $updown = get_string('updown', 'repository');
@@ -5601,10 +5601,10 @@ class admin_setting_managerepository extends admin_setting {
             }
             $row .= '<a href="' . $this->baseurl . '&amp;delete=' .  $i->get_typename() . '"><img src="' . $CFG->pixpath . '/t/delete.gif" alt="' . get_string('delete') . '" /></a>' . "\n";
             $row .= ' <a href="' . $this->baseurl . '&amp;hide=' . $i->get_typename() . '"><img src="' . $CFG->pixpath . '/t/' . ($i->get_visible() ? 'hide' : 'show') . '.gif" alt="' . get_string($i->get_visible() ? 'hide' : 'show') . '" /></a>' . "\n";
-            
+
              // display up/down link
             $updown = '';
-            
+
                 if ($updowncount > 1) {
                     $updown .= "<a href=\"$this->baseurl&amp;move=up&amp;type=".$i->get_typename()."\">";
                     $updown .= "<img src=\"{$CFG->pixpath}/t/up.gif\" alt=\"up\" /></a>&nbsp;";
@@ -5619,9 +5619,9 @@ class admin_setting_managerepository extends admin_setting {
                 else {
                     $updown .= "<img src=\"{$CFG->pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />";
                 }
-               
+
                 $updowncount++;
-               
+
             $table->data[] = array($i->get_readablename(), $updown,$row);
             if (!in_array($i->get_typename(), $alreadyplugins)) {
                 $alreadyplugins[] = $i->get_typename();
@@ -5644,7 +5644,7 @@ class admin_setting_managerepository extends admin_setting {
         }
         $instancehtml .= '</ul>';
         $instancehtml .= '</div>';
-        if ($addable) {    
+        if ($addable) {
             $output .= $instancehtml;
         }