Changeset 12547

Show
Ignore:
Timestamp:
09/20/11 16:47:32 (2 years ago)
Author:
p_lindheimer
Message:

don't default to GPLv2+ since a module may have a different licensing but not have listed it in the xml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/modulelist.class.php

    r12540 r12547  
    4141        unset($this->module_array[$mod_key]['publisher']); 
    4242      } 
    43       if (!isset($mod['license']) || $mod['license'] == '') { 
    44         $this->module_array[$mod_key]['license'] = 'GPLv2+'; 
     43      if (!isset($mod['license'])) { 
     44        $this->module_array[$mod_key]['license'] = ''; 
    4545      } 
    4646      if (isset($mod['candisable'])) { 

  • freepbx/trunk/amp_conf/htdocs/admin/views/footer.php

    r12544 r12547  
    3737     '<a href="http://www.freepbx.org" target="_blank">' . _('FreePBX') . ' ' . $version . '</a>', 
    3838     '<a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">GPL</a>'); 
    39 $html .= br() . sprintf(_('Current module licensed under %s'), 
    40         trim($active_modules[$module_name]['license'])); 
     39if (!empty($active_modules[$module_name]['license'])) { 
     40  $html .= br() . sprintf(_('Current module licensed under %s'), 
     41  trim($active_modules[$module_name]['license'])); 
     42} 
    4143//echo benchmarking 
    4244if (isset($amp_conf['DEVEL']) && $amp_conf['DEVEL']) {