Changeset 11102

Show
Ignore:
Timestamp:
01/24/11 19:20:06 (2 years ago)
Author:
p_lindheimer
Message:

allow internal variable name to be shown on Advanced Settings page, useful during development

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk/libfreepbx.install.php

    r11050 r11102  
    453453  $set['level'] = 0; 
    454454 
     455  // AS_DISPLAY_FRIENDLY_NAME 
     456  $set['value'] = true; 
     457  $set['options'] = ''; 
     458  $set['name'] = 'Display Friendly Name'; 
     459  $set['description'] = 'Normally the friendly names will be displayed on this page and the internal freepbx_conf configuration names are shown in the tooltip. If you prefer to view the configuration variables, and the friendly name in the tooltip, set this to false..'; 
     460  $set['emptyok'] = 0; 
     461  $set['level'] = 0; 
     462  $set['readonly'] = 0; 
     463  $set['type'] = CONF_TYPE_BOOL; 
     464  $freepbx_conf->define_conf_setting('AS_DISPLAY_FRIENDLY_NAME',$set); 
     465  $set['readonly'] = 0; 
     466  $set['level'] = 0; 
     467 
    455468  // 
    456469  // CATEGORY: System Setup 
  • modules/branches/2.9/core/advancedsettings.js

    r11025 r11102  
    5050          case 'AS_DISPLAY_HIDDEN_SETTINGS': 
    5151          case 'AS_DISPLAY_READONLY_SETTINGS': 
     52          case 'AS_DISPLAY_FRIENDLY_NAME': 
    5253            if (page_reload_check()) { 
    5354              location.href=location.href; 
  • modules/branches/2.9/core/page.advancedsettings.php

    r11066 r11102  
    4545  $display_hidden = $conf['AS_DISPLAY_HIDDEN_SETTINGS']['value']; 
    4646  $display_readonly = $conf['AS_DISPLAY_READONLY_SETTINGS']['value']; 
     47  $display_friendly_name = $conf['AS_DISPLAY_FRIENDLY_NAME']['value']; 
     48 
    4749  $current_category = ''; 
    4850  $row = 0; 
     
    8183    } 
    8284 
    83     $name_label_raw = $c['name']; 
    84     if ($c['module'] && extension_loaded('gettext') && is_dir("modules/".$c['module']."/i18n")) { 
    85       bindtextdomain($c['module'],"modules/".$c['module']."/i18n"); 
    86       bind_textdomain_codeset($c['module'], 'utf8'); 
    87       $name_label = dgettext($c['module'],$name_label_raw); 
    88       if ($name_label == $name_label_raw) { 
     85    if ($display_friendly_name) { 
     86      $name_label_raw = $c['name']; 
     87      if ($c['module'] && extension_loaded('gettext') && is_dir("modules/".$c['module']."/i18n")) { 
     88        bindtextdomain($c['module'],"modules/".$c['module']."/i18n"); 
     89        bind_textdomain_codeset($c['module'], 'utf8'); 
     90        $name_label = dgettext($c['module'],$name_label_raw); 
     91        if ($name_label == $name_label_raw) { 
     92          $name_label = _($name_label_raw); 
     93        } 
     94      } else { 
    8995        $name_label = _($name_label_raw); 
    9096      } 
    9197    } else { 
    92       $name_label = _($name_label_raw)
     98      $name_label = $c['keyword']
    9399    } 
    94100 
     
    103109      $default_val .= '<br />'.sprintf(_("Acceptable Values: %s - %s"),$range[0],$range[1]); 
    104110    } 
    105     $default_val .= '<br />'.sprintf(_("Internal Name: %s"),$c['keyword']); 
     111    if ($display_friendly_name) { 
     112      $default_val .= '<br />'.sprintf(_("Internal Name: %s"),$c['keyword']); 
     113    } else { 
     114      $default_val .= '<br />'.sprintf(_("Friendly Name: %s"),$c['name']); 
     115    } 
    106116    echo '<tr><td><a href="javascript:void(null)" class="info">'.$name_label.'<span>'.$c['description'].'<br /><br >'.$default_val.'</span></a></td>'; 
    107117    echo '<td>';