Changeset 11012

Timestamp:

01/18/11 16:35:40 (2 years ago)

Author:

p_lindheimer

Message:

adds range and emptyok info to tooltip re #4740

Files:

• freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (1 diff)
• modules/branches/2.9/core/page.advancedsettings.php (modified) (1 diff)

freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php

@@ -569 +569 @@
-
-    case CONF_TYPE_INT:
-$value 
-
-$ret !
+(string) $value =
+
+(string) $ret !=
-        $range = is_array($options) ? $options : explode(',',$options);
-        switch ($ret) {

modules/branches/2.9/core/page.advancedsettings.php

@@ -74 +74 @@
-    $dv = $c['type'] == CONF_TYPE_BOOL ? ($c['defaultval'] ? _("True") : _("False")) : $c['defaultval'];
-    $default_val = $dv == '' ? _("No Default Provided") : sprintf(_("Default Value: %s"),$dv);
+    if ($c['emptyok'] && $c['type'] != CONF_TYPE_BOOL && $c['type'] != CONF_TYPE_SELECT) {
+      $default_val.= ', '._("field can be left blank");
+    }
+    if ($c['type'] == CONF_TYPE_INT && $c['options']) {
+      $range = explode(',',$c['options']);
+      $default_val .= '<br />'.sprintf(_("Acceptable Values: %s - %s"),$range[0],$range[1]);
+    }
-    echo '<tr><td><a href="javascript:void(null)" class="info">'.$c['keyword'].'<span>'.$c['description'].'<br /><br >'.$default_val.'</span></a></td>';
-    echo '<td>';