From 041a4b0f09b0f4fce723fe13790395f96a6c5937 Mon Sep 17 00:00:00 2001
From: jerome <jerome>
Date: Fri, 9 Jan 2009 02:10:56 +0000
Subject: [PATCH] admin MDL-17155 cURL functions called in adminlib.php: add
 checking for disable_functions php configuration option, merged from 19

---
 lib/adminlib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 4bde5306f0..5ae04cb578 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1611,8 +1611,10 @@ function is_dataroot_insecure($fetchtest=false) {
     }
 
     $testurl = $datarooturl.'/diag/public.txt';
-
-    if (extension_loaded('curl') and ($ch = @curl_init($testurl)) !== false) {
+    if (extension_loaded('curl') and
+        !(stripos(ini_get('disable_functions'), 'curl_init') !== FALSE) and
+        !(stripos(ini_get('disable_functions'), 'curl_setop') !== FALSE) and
+        ($ch = @curl_init($testurl)) !== false) {
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HEADER, false);
         $data = curl_exec($ch);
@@ -6162,7 +6164,6 @@ class admin_setting_managerepository extends admin_setting {
         }
         $output .= print_table($table, true);
         $instancehtml = '<div><h3>';
-        $addable = 0;
         $instancehtml .= get_string('addplugin', 'repository');
         $instancehtml .= '</h3><ul>';
         $addable = 0;
-- 
2.39.5