[Astlinux-commits] SF.net SVN: astlinux:[6144] branches/1.0/package/webinterface/altweb

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6144
          http://sourceforge.net/p/astlinux/code/6144
Author:   abelbeck
Date:     2013-07-21 17:41:55 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
web interface, FOP2 support

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/admin/setup.php
    branches/1.0/package/webinterface/altweb/admin/system.php
    branches/1.0/package/webinterface/altweb/common/functions.php
    branches/1.0/package/webinterface/altweb/common/header.php
    branches/1.0/package/webinterface/altweb/common/license-packages.txt
    branches/1.0/package/webinterface/altweb/common/version.php

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================

--- branches/1.0/package/webinterface/altweb/admin/edit.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -35,9 +35,13 @@
   'apcupsd' => 'Restart UPS Daemon',
   'prosody' => 'Restart XMPP Server',
   'zabbix' => 'Restart Zabbix Monitor',
-  'asterisk' => 'Restart Asterisk',
-  'cron' => 'Reload Cron for root'
+  'asterisk' => 'Restart Asterisk'
 );
+if (is_addon_package('fop2')) {
+  $select_reload['fop2'] = 'Restart Asterisk FOP2';
+  $select_reload['FOP2'] = 'Reload Asterisk FOP2';
+}
+$select_reload['cron'] = 'Reload Cron for root';
 
 $sys_label = array (
   'dnsmasq.conf' => 'DNSmasq Configuration',
@@ -224,6 +228,10 @@
         $result = restartPROCESS($process, 39, $result, 'init');
       } elseif ($process === 'ldap') {
         $result = restartPROCESS($process, 40, $result, 'init');
+      } elseif ($process === 'fop2') {
+        $result = restartPROCESS($process, 41, $result, 'init');
+      } elseif ($process === 'FOP2') {
+        $result = restartPROCESS('fop2', 42, $result, 'reload');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -264,6 +272,7 @@
       $dir === '/mnt/kd/rc.conf.d' ||
       $dir === '/mnt/kd/crontabs' ||
       $dir === '/mnt/kd/snmp' ||
+      $dir === '/mnt/kd/fop2' ||
       $dir === '/mnt/kd/apcupsd' ||
       $dir === '/mnt/kd/prosody' ||
       $dir === '/mnt/kd/docs' ||
@@ -342,6 +351,10 @@
       putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
+    } elseif ($result == 41) {
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has Restarted.</p>');
+    } elseif ($result == 42) {
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {
@@ -516,6 +529,16 @@
     }
     putHtml('</optgroup>');
   }
+  if (is_dir('/mnt/kd/fop2') && count($globfiles = glob('/mnt/kd/fop2/*.cfg')) > 0) {
+    putHtml('<optgroup label="&mdash;&mdash;&mdash;&mdash; Flash Operating Panel2 Configs &mdash;&mdash;&mdash;&mdash;">');
+    foreach ($globfiles as $globfile) {
+      if (is_file($globfile) && is_writable($globfile)) {
+        $sel = ($globfile === $openfile) ? ' selected="selected"' : '';
+        putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Asterisk FOP2 Config</option>');
+      }
+    }
+    putHtml('</optgroup>');
+  }
   $optgroup = FALSE;
   foreach (glob('/etc/asterisk/*.conf') as $globfile) {
     if (is_writable($globfile)) {

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -945,6 +945,10 @@
         $result = restartPROCESS($process, 39, $result, 'init');
       } elseif ($process === 'ldap') {
         $result = restartPROCESS($process, 40, $result, 'init');
+      } elseif ($process === 'fop2') {
+        $result = restartPROCESS($process, 41, $result, 'init');
+      } elseif ($process === 'FOP2') {
+        $result = restartPROCESS('fop2', 42, $result, 'reload');
       }
     } else {
       $result = 2;
@@ -1023,6 +1027,10 @@
       putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
+    } elseif ($result == 41) {
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has Restarted.</p>');
+    } elseif ($result == 42) {
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 100) {
@@ -1116,6 +1124,12 @@
   putHtml('<option value="zabbix"'.$sel.'>Restart Zabbix Monitor</option>');
   $sel = ($reboot_restart === 'asterisk') ? ' selected="selected"' : '';
   putHtml('<option value="asterisk"'.$sel.'>Restart Asterisk</option>');
+  if (is_addon_package('fop2')) {
+    $sel = ($reboot_restart === 'fop2') ? ' selected="selected"' : '';
+    putHtml('<option value="fop2"'.$sel.'>Restart Asterisk FOP2</option>');
+    $sel = ($reboot_restart === 'FOP2') ? ' selected="selected"' : '';
+    putHtml('<option value="FOP2"'.$sel.'>Reload Asterisk FOP2</option>');
+  }
   putHtml('</select>');
   putHtml('&ndash;');
 ?>

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -369,7 +369,12 @@
       $value = 'external_cli_link_cmdstr = "'.$value.'"';
       fwrite($fp, $value."\n");
     }
-    
+
+    if (isset($_POST['external_fop2_https'])) {
+      $value = 'external_fop2_https = yes';
+      fwrite($fp, $value."\n");
+    }
+
     if (isset($_POST['tab_directory'])) {
       $value = 'tab_directory_show = yes';
       fwrite($fp, $value."\n");
@@ -1005,6 +1010,10 @@
   $value = getPREFdef($global_prefs, 'external_cli_link_cmdstr');
   putHtml('<input type="text" size="48" maxlength="128" value="'.$value.'" name="external_cli_link" /></td></tr>');
   
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">External FOP2 Link:</td><td colspan="4">');
+  $sel = (getPREFdef($global_prefs, 'external_fop2_https') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="external_fop2_https" name="external_fop2_https"'.$sel.' />&nbsp;Use HTTPS</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'tab_directory_show') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="tab_directory" name="tab_directory"'.$sel.' /></td><td colspan="5">Show Directory Tab</td></tr>');

Modified: branches/1.0/package/webinterface/altweb/admin/setup.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/setup.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/admin/setup.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -175,7 +175,7 @@
     putHtml('<tr class="dtrow1"><td style="text-align: right;">&nbsp;');
     putHtml('</td><td style="text-align: left;" colspan="5">');
     putHtml('Unionfs Partition Size:');
-    putHtml('<input type="text" size="5" maxlength="4" value="128" name="unionfs_size" />');
+    putHtml('<input type="text" size="5" maxlength="4" value="256" name="unionfs_size" />');
     putHtml('MBytes');
     putHtml('</td></tr>');
     putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">&nbsp;</td></tr>');

Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/admin/system.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2012 Lonnie Abelbeck
+// Copyright (C) 2008-2013 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -17,6 +17,7 @@
 // 12-12-2009, Added System Shutdown/Halt
 // 02-01-2010, Added Asterisk Sounds upgrade, remove, show
 // 01-16-2011, Added runnix check, upgrade, show, revert
+// 07-21-2013, Added Add-On Packages
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -63,6 +64,11 @@
   'g722' => 'g722'
 );
 
+$addon_package_type_menu = array (
+  '' => 'none',
+  'fop2' => 'fop2'
+);
+
 // Function: putACTIONresult
 //
 function putACTIONresult($result_str, $status) {
@@ -174,7 +180,7 @@
       $srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
       $srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
       $srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
-      $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p"';
+      $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p"';
       $srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^apcupsd$/&/p")';
       $srcfile .= $firewall;
     } elseif ($backup_type === 'cdr') {
@@ -328,6 +334,35 @@
       header('Location: '.$myself.'?sounds_action='.$action.'&result='.$result);
       exit;
     }
+  } elseif (isset($_POST['addon_package_submit'])) {
+    $result = 99;
+    $action = $_POST['addon_package_action'];
+    if (isset($_POST['addon_package_type']) && ($_POST['addon_package_type'] !== '' || $action === 'show')) {
+      $type = $_POST['addon_package_type'];
+      $file = '/usr/sbin/upgrade-package';
+      $std_err = ' 2>/dev/null';
+      if ($action === 'upgrade') {
+        $result_str = shell($file.' '.$type.' '.$action.$std_err, $status);
+        putACTIONresult($result_str, $status);
+        exit;
+      } elseif ($action === 'remove') {
+        $result_str = shell($file.' '.$type.' '.$action.$std_err, $status);
+        putACTIONresult($result_str, $status);
+        exit;
+      } elseif ($action === 'show') {
+        $result_str = shell($file.' '.$action.$std_err, $status);
+        putACTIONresult($result_str, $status);
+        exit;
+      } elseif ($action === 'revert') {
+        $result_str = shell($file.' '.$type.' '.$action.$std_err, $status);
+        putACTIONresult($result_str, $status);
+        exit;
+      }
+    } else {
+      $result = 19;
+      header('Location: '.$myself.'?addon_package_action='.$action.'&result='.$result);
+      exit;
+    }
   } elseif (isset($_POST['runnix_submit'])) {
     $result = 99;
     $action = $_POST['runnix_action'];
@@ -426,6 +461,12 @@
     $sounds_action = 'upgrade';
   }
   
+  if (isset($_GET['addon_package_action'])) {
+    $addon_package_action = $_GET['addon_package_action'];
+  } else {
+    $addon_package_action = 'upgrade';
+  }
+  
   if (isset($_GET['runnix_action'])) {
     $runnix_action = $_GET['runnix_action'];
   } else {
@@ -465,6 +506,8 @@
       putHtml('<p style="color: red;">Backup Failed, error archiving unionfs partition.</p>');
     } elseif ($result == 16) {
       putHtml('<p style="color: red;">Backup Failed, click <a href="/admin/prefs.php" class="headerText">Prefs</a>then check "Backup temporary file uses /mnt/kd/ instead of /tmp/"</p>');
+    } elseif ($result == 19) {
+      putHtml('<p style="color: red;">No Action, select an add-on package type for this action.</p>');
     } elseif ($result == 20) {
       putHtml('<p style="color: red;">File size must be less then 8 MBytes.</p>');
     } elseif ($result == 21) {
@@ -706,6 +749,32 @@
   putHtml('</td></tr>');
 }
 
+if (is_file('/usr/sbin/upgrade-package')) {
+  putHtml('<tr><td style="text-align: center;" colspan="2">');
+  putHtml('<h2>Add-On Packages:</h2>');
+  putHtml('</td></tr><tr><td class="dialogText" style="text-align: center;" colspan="2">');
+  putHtml('Package:');
+  putHtml('<select name="addon_package_type">');
+  foreach ($addon_package_type_menu as $key => $value) {
+    putHtml('<option value="'.$key.'">'.$value.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('&ndash;');
+  putHtml('<select name="addon_package_action">');
+  $sel = ($addon_package_action === 'upgrade') ? ' selected="selected"' : '';
+  putHtml('<option value="upgrade"'.$sel.'>Upgrade/Install</option>');
+  $sel = ($addon_package_action === 'remove') ? ' selected="selected"' : '';
+  putHtml('<option value="remove"'.$sel.'>Remove</option>');
+  $sel = ($addon_package_action === 'show') ? ' selected="selected"' : '';
+  putHtml('<option value="show"'.$sel.'>Show Installed</option>');
+  $sel = ($addon_package_action === 'revert') ? ' selected="selected"' : '';
+  putHtml('<option value="revert"'.$sel.'>Revert to Previous</option>');
+  putHtml('</select>');
+  putHtml('&ndash;');
+  putHtml('<input type="submit" value="Add-On Package" name="addon_package_submit" />');
+  putHtml('</td></tr>');
+}
+
 if (is_file('/usr/sbin/upgrade-RUNNIX-image')) {
   putHtml('<tr><td style="text-align: center;" colspan="2">');
   putHtml('<h2>RUNNIX Bootloader Upgrade:</h2>');

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -67,6 +67,8 @@
   } elseif ($process === 'iptables') {
     $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';service iptables restart >/dev/null 2>/dev/null';
+  } elseif ($start === 'reload') {
+    $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
   } else {
     $cmd .= ';service '.$process.' stop >/dev/null 2>/dev/null';
     $cmd .= ';sleep '.$wait;
@@ -703,6 +705,14 @@
   return($addr);
 }
 
+// Function: is_addon_package
+//
+function is_addon_package($pkg) {
+
+  $pkg_dir = '/stat/var/packages/'.$pkg;
+  return(is_dir($pkg_dir));
+}
+
 // Function: is_mac2vendor
 //
 function is_mac2vendor() {

Modified: branches/1.0/package/webinterface/altweb/common/header.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/header.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/common/header.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -98,6 +98,21 @@
   return(htmlspecialchars($cmd));
 }
 
+// Function: getFOP2link
+//
+function getFOP2link($g_prefs) {
+  $cmd = '';
+  if (is_addon_package('fop2')) {
+    if (getPREFdef($g_prefs, 'external_fop2_https') === 'yes') {
+      $cmd = 'https://localhost/fop2/';
+    } else {
+      $cmd = 'http://localhost/fop2/';
+    }
+    $cmd = url_localhost_handler($cmd);
+  }
+  return(htmlspecialchars($cmd));
+}
+
 // Function: putUSERerror
 //
 function putUSERerror($user, $tab) {
@@ -155,7 +170,8 @@
     putHtml('<td><h1>'.getTITLEname($global_prefs).'</h1></td>');
     $URLlink = getURLlink($global_prefs);
     $CLIlink = getCLIlink($global_prefs);
-    if ($URLlink !== '' || ($global_admin && $CLIlink !== '')) {
+    $FOP2link = getFOP2link($global_prefs);
+    if ($URLlink !== '' || ($global_admin && $CLIlink !== '') || $FOP2link !== '') {
       putHtml('<td style="text-align: right;">');
       if ($URLlink !== '') {
         putHtml('<a href="'.$URLlink.'" class="headerText" target="_blank">'.getURLname($global_prefs).'</a>');
@@ -167,6 +183,9 @@
           putHtml('<a href="'.$CLIlink.'" class="headerText" target="_blank">CLI</a>');
         }
       }
+      if ($FOP2link !== '') {
+        putHtml('<a href="'.$FOP2link.'" class="headerText" target="_blank">FOP2</a>');
+      }
       putHtml('</td>');
     }
     putHtml('</tr></table>');

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-07-21 17:41:55 UTC (rev 6144)
@@ -42,3 +42,4 @@
 Lua~Copyright (c) 1994-2012 Lua.org, PUC-Rio.  All rights reserved.
 perl~Copyright (c) 1987-2012 by Larry Wall, et al.
 phpliteadmin~Copyright (c) 2011-2013 phpLiteAdmin (http://phpliteadmin.googlecode.com)
+FOP2~Copyright (c) 2009-2013 House Internet S.R.L. (http://www.fop2.com)

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2013-07-21 12:36:51 UTC (rev 6143)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2013-07-21 17:41:55 UTC (rev 6144)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.24';
+$GUI_VERSION = '1.8.25';
 
 ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



