Changeset 8271

Show
Ignore:
Timestamp:
09/04/09 09:33:13 (4 years ago)
Author:
mbrevda
Message:

closes #3856, #3857. Nicer messages, includes when using module_admin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/astetc/cdr_mysql.conf

    r5723 r8271  
    22; Note - if the database server is hosted on the same machine as the  
    33; asterisk server, you can achieve a local Unix socket connection by  
    4 ; setting hostname=localhost  
     4; setting hostname = localhost 
    55;  
    66; port and sock are both optional parameters.  If hostname is specified  
    …… 
    1212;  
    1313[global]  
    14 hostname=localhost  
     14hostname = localhost 
    1515dbname=asteriskcdrdb  
    16 password=AMPDBPASS 
    17 user=AMPDBUSER 
     16password = fpbx 
     17user = freepbx 
    1818userfield=1 
    1919;port=3306  

  • freepbx/trunk/amp_conf/astetc/manager.conf

    r7529 r8271  
    1515bindaddr = 0.0.0.0 
    1616 
    17 [AMPMGRUSER] 
    18 secret = AMPMGRPASS 
     17[admin] 
     18secret = amp111 
    1919deny=0.0.0.0/0.0.0.0 
    2020permit=127.0.0.1/255.255.255.0 

  • freepbx/trunk/amp_conf/bin/module_admin

    r8076 r8271  
    105105 
    106106function doDisable($modulename, $force) { 
     107  getIncludes(); 
    107108  if (is_array($errors = module_disable($modulename, $force))) { 
    108109    out("The following error(s) occured:"); 
    …… 
    110111    exit(2); 
    111112  } else { 
    112     out("Module successfully disabled"); 
     113    out("Module ".$modulename." successfully disabled"); 
    113114  } 
    114115} 
    115116 
    116117function doEnable($modulename, $force) { 
     118  getIncludes(); 
    117119  if (is_array($errors = module_enable($modulename, $force))) { 
    118120    out("The following error(s) occured:"); 
    …… 
    120122    exit(2); 
    121123  } else { 
    122     out("Module successfully enabled"); 
     124    out("Module ".$modulename." successfully enabled"); 
    123125  } 
    124126} 
    125127 
    126128function doInstall($modulename, $force) { 
     129  getIncludes(); 
    127130  if (is_array($errors = module_install($modulename, $force))) { 
    128131    out("The following error(s) occured:"); 
    …… 
    130133    exit(2); 
    131134  } else { 
    132     out("Module successfully installed"); 
     135    out("Module ".$modulename." successfully installed"); 
    133136  } 
    134137} 
    135138 
    136139function doDelete($modulename, $force) { 
     140  getIncludes(); 
    137141  if (is_array($errors = module_delete($modulename, $force))) { 
    138142    out("The following error(s) occured:"); 
    …… 
    177181    exit(2); 
    178182  } else { 
    179     out("Module successfully downloaded"); 
     183    out("Module ".$modulename." successfully downloaded"); 
    180184  } 
    181185} 
    …… 
    200204 
    201205function doUninstall($modulename, $force) { 
     206  getIncludes(); 
    202207  if (is_array($errors = module_uninstall($modulename, $force))) { 
    203208    out("The following error(s) occured:"); 
    …… 
    205210    exit(2); 
    206211  } else { 
    207     out("Module successfully uninstalled"); 
     212    out("Module ".$modulename." successfully uninstalled"); 
    208213  } 
    209214} 
    …… 
    303308      doUpgrade($modulename, $force); 
    304309    } 
    305     out("Done all upgrades."); 
     310    out("All upgrades done!"); 
    306311  } else { 
    307312    out("Up to date."); 
    …… 
    353358    exit(1); 
    354359  } else { 
    355     out("All dependencies met for this module."); 
     360    out("All dependencies met for module ".$modulename); 
    356361  } 
    357362} 

  • freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

    r8075 r8271  
    27902790   
    27912791  if ($modules[$modulename]['status'] == MODULE_STATUS_ENABLED) { 
    2792     return array(_("Module is already enabled")); 
     2792    return array(_("Module ".$modulename." is already enabled")); 
    27932793  } 
    27942794   
    27952795  // doesn't make sense to skip this on $force - eg, we can't enable a non-installed or broken module 
    27962796  if ($modules[$modulename]['status'] != MODULE_STATUS_DISABLED) { 
    2797     return array(_("Module cannot be enabled")); 
     2797    return array(_("Module ".$modulename." cannot be enabled")); 
    27982798  } 
    27992799   
    …… 
    31063106  // don't force this bit - we can't install a broken module (missing files)  
    31073107  if ($modules[$modulename]['status'] == MODULE_STATUS_BROKEN) { 
    3108     return array(_("This module is broken and cannot be installed. You should try to download it again.")); 
     3108    return array(_("Module ".$modules[$modulename]['rawname']." is broken and cannot be installed. You should try to download it again.")); 
    31093109  } 
    31103110