MDL-12794 admin setting for file location; merged from MOODLE_19_STABLE

diff --git a/lib/adminlib.php b/lib/adminlib.php
index a36a4f3663a94a6b9bd180ea2a3a3411c5094666..0db89340d46374c1cf92ed5b78b6b35a31850377 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1788,25 +1788,25 @@ document.write(\'<span class="unmask"><input id="'.$id.'unmask" value="1" type="
 }
 
 /**
- * Path to executable file
+ * Path to directory
  */
-class admin_setting_configexecutable extends admin_setting_configtext {
+class admin_setting_configfile extends admin_setting_configtext {
     /**
      * Constructor
      * @param string $name of setting
      * @param string $visiblename localised
      * @param string $description long localised info
-     * @param string $defautpath default path
+     * @param string $defaultdirectory default directory location
      */
-    function admin_setting_configexecutable($name, $visiblename, $description, $defaultpath) {
-        parent::admin_setting_configtext($name, $visiblename, $description, $defaultpath, PARAM_RAW);
+    function admin_setting_configfile($name, $visiblename, $description, $defaultdirectory) {
+        parent::admin_setting_configtext($name, $visiblename, $description, $defaultdirectory, PARAM_RAW);
     }
 
     function output_html($data, $query='') {
         $default = $this->get_defaultsetting();
 
         if ($data) {
-            if (file_exists($data) and is_executable($data)) {
+            if (file_exists($data)) {
                 $executable = '<span class="pathok">&#x2714;</span>';
             } else {
                 $executable = '<span class="patherror">&#x2718;</span>';
@@ -1816,26 +1816,39 @@ class admin_setting_configexecutable extends admin_setting_configtext {
         }
 
         return format_admin_setting($this, $this->visiblename,
-                '<div class="form-executable defaultsnext"><input type="text" id="'.$this->get_id().'" name="'.$this->get_full_name().'" value="'.s($data).'" />'.$executable.'</div>',
+                '<div class="form-file defaultsnext"><input type="text" id="'.$this->get_id().'" name="'.$this->get_full_name().'" value="'.s($data).'" />'.$executable.'</div>',
                 $this->description, true, '', $default, $query);
     }
 }
 
 /**
- * Path to directory
+ * Path to executable file
  */
-class admin_setting_configdirectory extends admin_setting_configtext {
-    /**
-     * Constructor
-     * @param string $name of setting
-     * @param string $visiblename localised
-     * @param string $description long localised info
-     * @param string $defaultdirectory default directory location
-     */
-    function admin_setting_configdirectory($name, $visiblename, $description, $defaultdirectory) {
-        parent::admin_setting_configtext($name, $visiblename, $description, $defaultdirectory, PARAM_RAW);
+class admin_setting_configexecutable extends admin_setting_configfile {
+
+    function output_html($data, $query='') {
+        $default = $this->get_defaultsetting();
+
+        if ($data) {
+            if (file_exists($data) and is_executable($data)) {
+                $executable = '<span class="pathok">&#x2714;</span>';
+            } else {
+                $executable = '<span class="patherror">&#x2718;</span>';
+            }
+        } else {
+            $executable = '';
+        }
+
+        return format_admin_setting($this, $this->visiblename,
+                '<div class="form-file defaultsnext"><input type="text" id="'.$this->get_id().'" name="'.$this->get_full_name().'" value="'.s($data).'" />'.$executable.'</div>',
+                $this->description, true, '', $default, $query);
     }
+}
 
+/**
+ * Path to directory
+ */
+class admin_setting_configdirectory extends admin_setting_configfile {
     function output_html($data, $query='') {
         $default = $this->get_defaultsetting();
 
@@ -1850,7 +1863,7 @@ class admin_setting_configdirectory extends admin_setting_configtext {
         }
 
         return format_admin_setting($this, $this->visiblename,
-                '<div class="form-directory defaultsnext"><input type="text" id="'.$this->get_id().'" name="'.$this->get_full_name().'" value="'.s($data).'" />'.$executable.'</div>',
+                '<div class="form-file defaultsnext"><input type="text" id="'.$this->get_id().'" name="'.$this->get_full_name().'" value="'.s($data).'" />'.$executable.'</div>',
                 $this->description, true, '', $default, $query);
     }
 }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 42c2a033c1524b5b6d23d60cefb062ea723b84f0..3bab97fc114e9c9e5f83b0da2062472ed192d528 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1062,8 +1062,7 @@ body#admin-modules table.generaltable td.c0
   width: 5em;
 }
 
-#adminsettings .form-executable input,
-#adminsettings .form-directory  input {
+#adminsettings .form-file input {
     width: 30em;
 }