Changeset 8428

Show
Ignore:
Timestamp:
11/29/09 05:43:22 (3 years ago)
Author:
mickecarlsson
Message:

Fixed some spelling errors in install_amp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.6/install_amp

    r8339 r8428  
    106106 
    107107if (!function_exists('version_compare_freepbx')) { 
    108   /* verison_compare that works with freePBX version numbers 
     108  /* version_compare that works with freePBX version numbers 
    109109  */ 
    110110  function version_compare_freepbx($version1, $version2, $op = null) { 
    …… 
    127127  out("  --password <pass>        Use <pass> to connect to db and write config"); 
    128128  out("  --fopwebroot <path>      Web path where fop will be installed"); 
    129   out("  --webroot <path>         Web root where freepbx will be installed"); 
     129  out("  --webroot <path>         Web root where FreePBX will be installed"); 
    130130  out("  --cgibin <path>          Path where cgi-bin's lives"); 
    131131  out("  --bin <path>             Path of asterisk binaries"); 
    …… 
    281281   
    282282  out("Generating Configurations.conf, (if Asterisk is not running, you will get an error"); 
    283   out("In case of error, start Asterisk and hit the red bar in the GUI to generate the Configuraions.conf files"); 
     283  out("In case of error, start Asterisk and hit the red bar in the GUI to generate the Configurations.conf files"); 
    284284  if (!$dryrun) 
    285285    // added --run-install to make it work like it has been working since retrieve_conf changed to not run module install scripts by default 
    …… 
    495495/** Set the module version number to the packaged version and enable 
    496496 *  module must require not install.php or install.sql script 
    497  *  this is primarily to package core and framework with freepbx tarballs 
     497 *  this is primarily to package core and framework with FreePBX tarballs 
    498498 * 
    499499 */ 
    …… 
    512512      $version = $matches[1]; 
    513513    } else { 
    514       fatal("ERROR: $file_path found but no verison information"); 
     514      fatal("ERROR: $file_path found but no version information"); 
    515515    } 
    516516  } else { 
    …… 
    520520  // If we didn't return above, then we found the package as part of the install 
    521521  // tarball and want to update the version info since this might be overwriting 
    522   // an existing install that has a newever version. 
     522  // an existing install that has a newer version. 
    523523  // 
    524524  $sql = "SELECT version FROM modules WHERE modulename = '$module'"; 
    …… 
    533533  } else if ($result[0] != $version) { 
    534534    if (version_compare_freepbx($version, $result[0], "gt")) { 
    535       // if new verison is greater than old, then we disable the module and it will get enabled next when installed 
     535      // if new version is greater than old, then we disable the module and it will get enabled next when installed 
    536536      // 
    537537      $sql = "UPDATE modules SET version = '$version', enabled = 0 WHERE modulename = '$module'"; 
    …… 
    848848out("OK"); 
    849849 
    850 /* deprecated on freepbx 2.2, from now pages need to read this information  
     850/* deprecated on FreePBX 2.2, from now pages need to read this information  
    851851   from $asterik_conf and not $amp_conf. 
    852852    
    …… 
    888888$verinfo = $tmpout; 
    889889 
    890 // **** Check asterisk verison 
     890// **** Check asterisk version 
    891891//  Set the 'engine' to be 'asterisk14' if using asterisk 1.4, otherwise 
    892892//  'asterisk' 
    …… 
    933933$tmpout = exec("getenforce", $tmpoutput, $sereturn); 
    934934if (strtolower($tmpoutput[0]) === "enabled") { 
    935         // this method seems better because disabled and premissive are the same 
     935        // this method seems better because disabled and permissive are the same 
    936936        // if a user installs and realizes selinux is running the other method  
    937937        // requires a reboot to get selinuxenabled to work after editing the  selinux config 
    938         // this will allow you to use setenforce 0 which turns selinux into premissive mode which 
     938        // this will allow you to use setenforce 0 which turns selinux into permissive mode which 
    939939        // doesnt enforce, it just warns. 
    940940  fatal("selinux is ENABLED. This is not supported. Please disable selinux before using FreePBX");