← Back to branch summary

~ubuntu-branches/ubuntu/utopic/moodle/utopic

« back to all changes in this revision

Viewing changes to admin/settings/server.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2014-05-12 16:10:38 UTC
  • mfrom: (36.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140512161038-puyqf65k4e0s8ytz
Tags: 2.6.3-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
admin/settings/server.php
35
35
 
36
36
// "sessionhandling" settingpage
37
37
$temp = new admin_settingpage('sessionhandling', new lang_string('sessionhandling', 'admin'));
38
 
$temp->add(new admin_setting_configcheckbox('dbsessions', new lang_string('dbsessions', 'admin'), new lang_string('configdbsessions', 'admin'), 1));
 
38
if (empty($CFG->session_handler_class) and $DB->session_lock_supported()) {
 
39
    $temp->add(new admin_setting_configcheckbox('dbsessions', new lang_string('dbsessions', 'admin'), new lang_string('configdbsessions', 'admin'), 0));
 
40
}
39
41
$temp->add(new admin_setting_configselect('sessiontimeout', new lang_string('sessiontimeout', 'admin'), new lang_string('configsessiontimeout', 'admin'), 7200, array(14400 => new lang_string('numhours', '', 4),
40
42
                                                                                                                                                      10800 => new lang_string('numhours', '', 3),
41
43
                                                                                                                                                      7200 => new lang_string('numhours', '', 2),
175
177
// "performance" settingpage
176
178
$temp = new admin_settingpage('performance', new lang_string('performance', 'admin'));
177
179
 
 
180
// Memory limit options for large administration tasks.
 
181
$memoryoptions = array(
 
182
    '64M' => '64M',
 
183
    '128M' => '128M',
 
184
    '256M' => '256M',
 
185
    '512M' => '512M',
 
186
    '1024M' => '1024M',
 
187
    '2048M' => '2048M');
 
188
 
 
189
// Allow larger memory usage for 64-bit sites only.
 
190
if (PHP_INT_SIZE === 8) {
 
191
    $memoryoptions['3072M'] = '3072M';
 
192
    $memoryoptions['4096M'] = '4096M';
 
193
}
 
194
 
178
195
$temp->add(new admin_setting_configselect('extramemorylimit', new lang_string('extramemorylimit', 'admin'),
179
196
                                          new lang_string('configextramemorylimit', 'admin'), '512M',
180
 
                                          // if this option is set to 0, default 128M will be used
181
 
                                          array( '64M' => '64M',
182
 
                                                 '128M' => '128M',
183
 
                                                 '256M' => '256M',
184
 
                                                 '512M' => '512M',
185
 
                                                 '1024M' => '1024M'
186
 
                                             )));
 
197
                                          $memoryoptions));
 
198
 
187
199
$temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache', 'admin'),
188
200
                                        new lang_string('configcurlcache', 'admin'), 120, PARAM_INT));
189
201