diff -Naur freepbx/amp_conf/htdocs/admin/panel.php freepbx.oden/amp_conf/htdocs/admin/panel.php
--- freepbx/amp_conf/htdocs/admin/panel.php 2006-04-02 20:38:49.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs/admin/panel.php 2006-04-03 18:57:06.000000000 +0200
@@ -72,7 +72,7 @@
include 'header.php';
?>
</div>
-<iframe width="97%" height="600" frameborder="0" align="top" src="../panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
+<iframe width="97%" height="600" frameborder="0" align="top" src="/panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
</body>
</html>
diff -Naur freepbx/amp_conf/htdocs/index.html freepbx.oden/amp_conf/htdocs/index.html
--- freepbx/amp_conf/htdocs/index.html 2006-04-02 20:38:49.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs/index.html 2006-04-03 19:06:43.000000000 +0200
@@ -11,7 +11,7 @@
<div class="header">
- <a href="index.php"><img src="admin/images/freepbx.png"/></a>
+ <a href="index.php"><img src="freepbx.png"/></a>
</div>
@@ -24,6 +24,7 @@
<h4><a href="recordings/">Voicemail & Recordings (ARI)</a></h4>
<h4><a href="panel/">Flash Operator Panel (FOP)</a></h4>
<h4><a href="admin/">FreePBX Administration</a></h4>
+<h4><a href="meetme/meetme_control.php">Asterisk MeetMe control</a></h4>
<br><br><br><br><br><br>
</div>
diff -Naur freepbx/amp_conf/htdocs/recordings/includes/bootstrap.php freepbx.oden/amp_conf/htdocs/recordings/includes/bootstrap.php
--- freepbx/amp_conf/htdocs/recordings/includes/bootstrap.php 2006-04-02 20:38:31.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs/recordings/includes/bootstrap.php 2006-04-03 18:57:06.000000000 +0200
@@ -332,7 +332,7 @@
versionCleanup();
startARISession();
-include_once("./includes/main.conf.php");
+include_once("/etc/freepbx/ari.php");
include_once("./version.php");
include_once("./includes/crypt.php");
include_once("./includes/login.php");
diff -Naur freepbx/amp_conf/htdocs/recordings/includes/common.php freepbx.oden/amp_conf/htdocs/recordings/includes/common.php
--- freepbx/amp_conf/htdocs/recordings/includes/common.php 2006-04-02 20:38:31.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs/recordings/includes/common.php 2006-04-03 18:57:06.000000000 +0200
@@ -145,7 +145,7 @@
if (!$success) {
$_SESSION['ari_error'] =
_("ARI does not appear to have access to the Asterisk Manager.") . " ($errno)<br>" .
- _("Check the ARI 'main.conf' configuration file to set the Asterisk Manager Account.") . "<br>" .
+ _("Check the ARI '/etc/freepbx/ari.php' configuration file to set the Asterisk Manager Account.") . "<br>" .
_("Check /etc/asterisk/manager.conf for a proper Asterisk Manager Account") . "<br>" .
_("make sure [general] enabled = yes and a 'permit=' line for localhost or the webserver.");
return FALSE;
@@ -164,7 +164,7 @@
$_SESSION['dbh_asterisk']);
if (!$success) {
$_SESSION['ari_error'] .= _("Cannot connect to the $ASTERISK_DBNAME database") . "<br>" .
- _("Check AMP installation, asterisk, and ARI main.conf");
+ _("Check AMP installation, asterisk, and ARI /etc/freepbx/ari.php");
return FALSE;
}
}
@@ -179,7 +179,7 @@
$_SESSION['dbh_cdr']);
if (!$success) {
$_SESSION['ari_error'] .= sprintf(_("Cannot connect to the $ASTERISKCDR_DBNAME database"),$ASTERISKCDR_DBNAME) . "<br>" .
- _("Check AMP installation, asterisk, and ARI main.conf");
+ _("Check AMP installation, asterisk, and ARI /etc/freepbx/ari.php");
return FALSE;
}
}
diff -Naur freepbx/amp_conf/htdocs/recordings/includes/main.conf.php freepbx.oden/amp_conf/htdocs/recordings/includes/main.conf.php
--- freepbx/amp_conf/htdocs/recordings/includes/main.conf.php 2006-04-02 20:38:31.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs/recordings/includes/main.conf.php 2006-04-03 18:57:06.000000000 +0200
@@ -11,7 +11,7 @@
#
# From AMP. Used for logon to database.
#
-$AMP_FUNCTIONS_FILES = "../admin/functions.php;../admin/functions.inc.php";
+$AMP_FUNCTIONS_FILES = "/var/www/freepbx/admin/functions.php;/var/www/freepbx/admin/functions.inc.php";
$AMPORTAL_CONF_FILE = "/etc/amportal.conf";
#
diff -Naur freepbx/amp_conf/htdocs_panel/index_amp.php freepbx.oden/amp_conf/htdocs_panel/index_amp.php
--- freepbx/amp_conf/htdocs_panel/index_amp.php 2006-04-02 20:38:21.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs_panel/index_amp.php 2006-04-03 18:59:13.000000000 +0200
@@ -42,11 +42,11 @@
<body bgcolor="#ffffff">
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" width="100%" height="100%" id="operator_panel" align="left">
<param name="allowScriptAccess" value="sameDomain" />
-<param name="movie" value="operator_panel.swf?context=<?php echo $_REQUEST['context'] ?>" />
+<param name="movie" value="/op_panel/operator_panel.swf?context=<?php echo $_REQUEST['context'] ?>" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
<param name="scale" value="exactfit" />
-<embed src="operator_panel.swf?context=<?php echo $_REQUEST['context'] ?>" quality="high" scale="exactfit" bgcolor="#ffffff" width="100%" height="100%" name="operator_panel" align="left" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<embed src="/op_panel/operator_panel.swf?context=<?php echo $_REQUEST['context'] ?>" quality="high" scale="exactfit" bgcolor="#ffffff" width="100%" height="100%" name="operator_panel" align="left" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object>
</body>
</html>
diff -Naur freepbx/amp_conf/htdocs_panel/index.php freepbx.oden/amp_conf/htdocs_panel/index.php
--- freepbx/amp_conf/htdocs_panel/index.php 2006-04-02 20:38:21.000000000 +0200
+++ freepbx.oden/amp_conf/htdocs_panel/index.php 2006-04-03 19:00:12.000000000 +0200
@@ -41,11 +41,11 @@
<body bgcolor="#ffffff">
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" width="100%" height="100%" id="operator_panel" align="left">
<param name="allowScriptAccess" value="sameDomain" />
-<param name="movie" value="operator_panel.swf" />
+<param name="movie" value="/op_panel/operator_panel.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
<param name="scale" value="exactfit" />
-<embed src="operator_panel.swf" quality="high" scale="exactfit" bgcolor="#ffffff" width="100%" height="100%" name="operator_panel" align="left" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<embed src="/op_panel/operator_panel.swf" quality="high" scale="exactfit" bgcolor="#ffffff" width="100%" height="100%" name="operator_panel" align="left" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object>
</body>
</html>
diff -Naur freepbx/amportal.conf freepbx.oden/amportal.conf
--- freepbx/amportal.conf 2006-04-02 20:39:02.000000000 +0200
+++ freepbx.oden/amportal.conf 2006-04-03 18:57:06.000000000 +0200
@@ -1,12 +1,12 @@
# This file contains settings for components of the Asterisk Management Portal
# Spaces are not allowed!
-# Run /usr/src/AMP/apply_conf.sh after making changes to this file
+# Run /usr/share/freepbx/apply_conf.sh after making changes to this file
# AMPDBHOST: the host to connect to the database named 'asterisk'
AMPDBHOST=localhost
# AMPDBUSER: the user to connect to the database named 'asterisk'
-AMPDBUSER=asteriskuser
+AMPDBUSER=asterisk
# AMPDBENGINE: the type of database to use
AMPDBENGINE=mysql
@@ -21,22 +21,22 @@
AMPMGRPASS=amp111
# AMPBIN: where command line scripts live
-AMPBIN=/var/lib/asterisk/bin
+AMPBIN=/usr/share/freepbx
#AMPSBIN: where (root) command line scripts live
AMPSBIN=/usr/sbin
# AMPWEBROOT: the path to Apache's webroot (leave off trailing slash)
-AMPWEBROOT=/var/www/html
+AMPWEBROOT=/var/www/freepbx
# AMPCGIBIN: the path to Apache's cgi-bin dir (leave off trailing slash)
AMPCGIBIN=/var/www/cgi-bin
# AMPWEBADDRESS: the IP address or host name used to access the AMP web admin
-AMPWEBADDRESS=192.168.1.101
+AMPWEBADDRESS=localhost
# FOPWEBROOT:web root for the Flash Operator Panel
-FOPWEBROOT=/var/www/html/panel
+FOPWEBROOT=/var/www/op_panel
# FOPPASSWORD: the secret code for performing transfers and hangups in the Flash Operator Panel
FOPPASSWORD=passw0rd
@@ -63,7 +63,7 @@
# AMPADMINHREF: Defines the where a user is taken if they click on the footer logo
# This enables you to customize the look of the administration screen.
-AMPADMINHREF=amp.coalescentsystems.ca
+AMPADMINHREF=www.mandriva.com
# AMPEXTENSIONS: the type of view for extensions admin
# If set to 'deviceanduser' Devices and Users will be administered seperately, and Users will be able to "login" to devices.
diff -Naur freepbx/apply_conf.sh freepbx.oden/apply_conf.sh
--- freepbx/apply_conf.sh 2006-04-02 20:39:02.000000000 +0200
+++ freepbx.oden/apply_conf.sh 2006-04-03 18:57:06.000000000 +0200
@@ -38,15 +38,15 @@
sed -r -i "s/secret = [a-zA-Z0-9]*/secret = $AMPMGRPASS/" /etc/asterisk/manager.conf
sed -r -i "/\[general\]/!s/\[[a-zA-Z0-9]+\]/[$AMPMGRUSER]/" /etc/asterisk/manager.conf
-if [ -e $AMPWEBROOT"/panel/op_server.cfg" ]; then
- echo $AMPWEBROOT"/panel/op_server.cfg"
- sed -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/" $FOPWEBROOT/op_server.cfg
- sed -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/" $FOPWEBROOT/op_server.cfg
- sed -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/" $FOPWEBROOT/op_server.cfg
- sed -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/" $FOPWEBROOT/op_server.cfg
- sed -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=$FOPWEBROOT!" $FOPWEBROOT/op_server.cfg
- sed -r -i "s!web_hostname=[a-zA-Z0-9.-]*!web_hostname=$AMPWEBADDRESS!" $FOPWEBROOT/op_server.cfg
- sed -r -i "s!web_hostname=[a-zA-Z0-9.-]*!web_hostname=$AMPWEBADDRESS!" $FOPWEBROOT/op_server.cfg
+if [ -e /etc/op_panel/op_server.cfg ]; then
+ echo /etc/op_panel/op_server.cfg
+ sed -r -i "s/manager_user=[a-zA-Z0-9]*/manager_user=$AMPMGRUSER/" /etc/op_panel/op_server.cfg
+ sed -r -i "s/manager_secret=[a-zA-Z0-9]*/manager_secret=$AMPMGRPASS/" /etc/op_panel/op_server.cfg
+ sed -r -i "s/web_hostname=[a-zA-Z0-9_.-]*/web_hostname=$AMPWEBADDRESS/" /etc/op_panel/op_server.cfg
+ sed -r -i "s/security_code=[a-zA-Z0-9]*/security_code=$FOPPASSWORD/" /etc/op_panel/op_server.cfg
+ sed -r -i "s!flash_dir=[a-zA-Z0-9_./\-]*!flash_dir=$FOPWEBROOT!" /etc/op_panel/op_server.cfg
+ sed -r -i "s!web_hostname=[a-zA-Z0-9.-]*!web_hostname=$AMPWEBADDRESS!" /etc/op_panel/op_server.cfg
+ sed -r -i "s!web_hostname=[a-zA-Z0-9.-]*!web_hostname=$AMPWEBADDRESS!" /etc/op_panel/op_server.cfg
fi
echo "/etc/asterisk/vm_email.inc"
@@ -56,10 +56,4 @@
sed -r -i "s!http://.*/recordings!http://$AMPWEBADDRESS/recordings!" /etc/asterisk/vm_email.inc
fi
-
-if [ -x /usr/sbin/amportal ]; then
- echo "Adjusting File Permissions.."
- /usr/sbin/amportal chown
-fi
-
echo "Done"
