From fe6786b8b9deb2e471e1a15b4de3d672074a61f3 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Tue, 25 Mar 2008 02:23:37 +0000
Subject: [PATCH] MDL-10660, check whether memcache has been installed.

---
 admin/settings/server.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 67e0c5380a..bd57ef267c 100644
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -221,12 +221,28 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "
 
 // "performance" settingpage
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
-$temp->add(new admin_setting_special_selectsetup('cachetype', get_string('cachetype', 'admin'),
-                                          get_string('configcachetype', 'admin'), '',
-                                          array( '' => get_string('none'),
-                                                 'internal' => 'internal',
-                                                 'memcached' => 'memcached',
-                                                 'eaccelerator' => 'eaccelerator')));
+if (function_exists('memcache_connect')) {
+    $temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
+                                              get_string('configcachetype', 'admin'), false, 
+                                              array( '' => 'none', 
+                                                     'internal' => 'internal', 
+                                                     'memcached' => 'memcached', 
+                                                     'eaccelerator' => 'eaccelerator')));
+    $temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
+                                            get_string('configmemcachedhosts', 'admin'), ''));
+    $temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
+                                              get_string('configmemcachedpconn', 'admin'), false, 
+                                              array( '0' => 'false', 
+                                                     '1' => 'true')));
+}else{
+    $temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
+                                              get_string('configcachetype', 'admin'), false, 
+                                              array( '' => 'none', 
+                                                     'internal' => 'internal', 
+                                                     'eaccelerator' => 'eaccelerator')));
+
+}
+
 // NOTE: $CFG->rcache is forced to bool in lib/setup.php
 $temp->add(new admin_setting_special_selectsetup('rcache', get_string('rcache', 'admin'),
                                           get_string('configrcache', 'admin'), 0,
@@ -236,12 +252,6 @@ $temp->add(new admin_setting_configtext('rcachettl', get_string('rcachettl', 'ad
                                         get_string('configrcachettl', 'admin'), 10));
 $temp->add(new admin_setting_configtext('intcachemax', get_string('intcachemax', 'admin'),
                                         get_string('configintcachemax', 'admin'), 10));
-$temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
-                                        get_string('configmemcachedhosts', 'admin'), ''));
-$temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
-                                          get_string('configmemcachedpconn', 'admin'), 0,
-                                          array( '0' => get_string('no'),
-                                                 '1' => get_string('yes'))));
 $ADMIN->add('server', $temp);
 
 if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {
-- 
2.39.5