Changeset 6601

Timestamp:

09/07/08 15:39:51 (3 months ago)

Author:

ethans

Message:

Adds FOPDISABLE option to amportal.conf. This will disable FOP on the web interfaces as well as server operations in retrieve_conf and freepbx_engine

References: 3170

Files:

• freepbx/branches/2.5/amp_conf/bin/freepbx_engine (modified) (3 diffs)
• freepbx/branches/2.5/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php (modified) (2 diffs)
• freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx.php (modified) (1 diff)
• freepbx/branches/2.5/amportal.conf (modified) (1 diff)
• freepbx/branches/2.5/install_amp (modified) (6 diffs)

freepbx/branches/2.5/amp_conf/bin/freepbx_engine

@@ -216 +216 @@
-                if [ -z "$FOPRUN" -o "$FOPRUN" == "true" -o "$FOPRUN" == "TRUE" -o "$FOPRUN" == "True" -o "$FOPRUN" == "yes" -o "$FOPRUN" == "YES" -o "$FOPRUN" == "Yes" ]
-                then
-
+
+
+
+
-                fi
-        ;;
@@ -231 +234 @@
-                if [ -z "$FOPRUN" -o "$FOPRUN" == "true" -o "$FOPRUN" == "TRUE" -o "$FOPRUN" == "True" -o "$FOPRUN" == "yes" -o "$FOPRUN" == "YES" -o "$FOPRUN" == "Yes" ]
-                then
-
+
+
+
+
-                fi
-        ;;
@@ -253 +259 @@
-        ;;
-        *)
+                if [ -z "$FOPRUN" -o "$FOPRUN" == "true" -o "$FOPRUN" == "TRUE" -o "$FOPRUN" == "True" -o "$FOPRUN" == "yes" -o "$FOPRUN" == "YES" -o "$FOPRUN" == "Yes" ]
+                then
+                        if [ -z "$FOPDISABLE" -o "$FOPDISABLE" == "false" -o "$FOPDISABLE" == "FALSE" -o "$FOPDISABLE" == "False" -o "$FOPDISABLE" == "no" -o "$FOPDISABLE" == "NO" -o "$FOPDISABLE" == "No" ]
+                        then
+                                FOPUSAGE="start_fop|stop_fop|restart_fop|"
+                        fi
+                fi
+
-                echo "-------------FreePBX Control Script-----------------------------------------------"
-                echo
-start_fop|stop_fop|restart_fop|
+${FOPUSAGE}
-                echo
-                echo "start:       Starts Asterisk and Flash Operator Panel server if enabled"
-                echo "stop:        Gracefully stops Asterisk and the FOP server"
-                echo "restart:     Stop and Starts"
-
-
-
+
+
+
+
+
+
+
+
+
+
-                echo "kill:        Kills Asterisk and the FOP server"
-                echo "chown:       Sets appropriate permissions on files"

freepbx/branches/2.5/amp_conf/bin/retrieve_conf

@@ -717 +717 @@
-// script to write op_server.cfg file from mysql 
-//
-
-
-
-
-
-
+
+
+
+
+
+
+
-// generate configuration files
-//

freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php

@@ -729 +729 @@
-        'AMPENABLEDEVELDEBUG'=> array('bool' , false),
-        'AMPMPG123'      => array('bool' , true),
+        'FOPDISABLE'      => array('bool' , false),
-        'ZAP2DAHDICOMPAT' => array('bool' , false),
-);
@@ -1494 +1495 @@
-        
-        
-
+ && !$amp_conf['FOPDISABLE']
-                //bounce op_server.pl
-                $wOpBounce = $amp_conf['AMPBIN'].'/bounce_op.sh';

freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx.php

@@ -165 +165 @@
-        print_sub_tool( _("Admin")   , "config.php", $currentFile=='config.php' );
-        print_sub_tool( _("Reports")   , "reports.php", $currentFile=='reports.php' );
-
+
+
+
-        print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, "ari" );
-        print_sub_tool( _("Help"), "http://www.freepbx.org/freepbx-help-system$help_args"  ,0, NULL, "help" );

freepbx/branches/2.5/amportal.conf

@@ -200 +200 @@
-# less frequently (such as Astersisk Uptime) based on the INFO value
-
+# FOPDISABLE=true|false # DEFAULT VALUE false
+# Disables FOP in interface and retrieve_conf.  Usefull for sqlite3 or if you don't want FOP.
+
-# ZAP2DAHDICOMPAT=true|false
-# DEFAULT VALUE: false

freepbx/branches/2.5/install_amp

@@ -125 +125 @@
-        out("  --install-moh            Install default music-on-hold files (normally doesn't, unless ");
-        out("                           it's a new installation)");
+        out("  --install-fop=false      Don't install FOP and don't display it anywhere on the interface");
-        //out("  --make-links-devel       Make links to files in the source directory instead of copying");
-        //out("                           (intended for developers only)");
@@ -569 +570 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+install-fop","
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -584 +585 @@
-
-$install_moh = false;
+$install_fop = true;
-$make_links = false;
-$module_install = true;
@@ -642 +644 @@
-                case "--install-moh":
-                        $install_moh = true;
+                break;
+                case "--install-fop":
+                        if($arg[1] != "false")  {
+                                $install_fop = true;
+                                out("FOP will be installed and activated.");
+                        }
+                        else  {
+                                out("FOP will be deactivated in the interface.  Set FOPDISABLE=false in amportal.conf to change later.");
+
+                        }
+
-                break;
-                case "--make-links-devel":
@@ -785 +798 @@
-        $amp_conf["AMPDBNAME"] = $dbname;
-}
-
+
+
+
+
+
+
+
+
-// write amportal.conf
-write_amportal_conf(AMP_CONF, $amp_conf);
@@ -1094 +1114 @@
-$version = install_getversion();
-
-
-
-
-
-
+
+
+
+
+
+
-
-// Now force an install for all modules that are packaged with the tarball