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

[<abe...@us...>]

Revision: 6782
          http://sourceforge.net/p/astlinux/code/6782
Author:   abelbeck
Date:     2014-10-25 14:17:10 +0000 (Sat, 25 Oct 2014)
Log Message:
-----------
web interface, System -> Add-On Packages: add action 'Check for New' and 'Show Installed' now works for the selected package

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/system.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/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php	2014-10-25 00:21:31 UTC (rev 6781)
+++ branches/1.0/package/webinterface/altweb/admin/system.php	2014-10-25 14:17:10 UTC (rev 6782)
@@ -368,13 +368,21 @@
         putACTIONresult($result_str, $status);
         exit;
       } elseif ($action === 'show') {
-        $result_str = shell($file.' '.$action.$std_err, $status);
+        if ($type !== '') {
+          $result_str = shell($file.' '.$type.' '.$action.$std_err, $status);
+        } else {
+          $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;
+      } elseif ($action === 'check') {
+        $result_str = shell($file.' '.$type.' '.$action.$std_err, $status);
+        putACTIONresult($result_str, $status);
+        exit;
       }
     } else {
       $result = 19;
@@ -784,6 +792,8 @@
   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 === 'check') ? ' selected="selected"' : '';
+  putHtml('<option value="check"'.$sel.'>Check for New</option>');
   $sel = ($addon_package_action === 'remove') ? ' selected="selected"' : '';
   putHtml('<option value="remove"'.$sel.'>Remove</option>');
   $sel = ($addon_package_action === 'show') ? ' selected="selected"' : '';

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2014-10-25 00:21:31 UTC (rev 6781)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2014-10-25 14:17:10 UTC (rev 6782)
@@ -7,7 +7,7 @@
 ##
 ex-vi~Copyright (c) 2001-2002 Caldera International Inc. All rights reserved.
 RUNNIX~Copyright (c) 2006-2014 by Kristian Kielhofner.
-libSRTP~Copyright (c) 2001-2005 Cisco Systems, Inc. All rights reserved.
+libSRTP~Copyright (c) 2001-2014 Cisco Systems, Inc. All rights reserved.
 iLBC CODEC~Copyright (c) 2011 The WebRTC project authors. All rights reserved.
 Web Interface~Copyright (c) 2008-2014 Lonnie Abelbeck.
 shellinabox~Copyright (c) 2008-2010 Markus Gutschke.

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2014-10-25 00:21:31 UTC (rev 6781)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2014-10-25 14:17:10 UTC (rev 6782)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.30';
+$GUI_VERSION = '1.8.31';
 
 ?>

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