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

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

Revision: 5272
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5272&view=rev
Author:   abelbeck
Date:     2011-11-26 17:44:20 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
web interface, Prefs tab, new option General Options -> External CLI Link

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/header.php
    branches/1.0/package/webinterface/altweb/common/status.inc
    branches/1.0/package/webinterface/altweb/common/version.php

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2011-11-26 04:52:22 UTC (rev 5271)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2011-11-26 17:44:20 UTC (rev 5272)
@@ -307,6 +307,10 @@
       $value = 'external_url_name_cmdstr = "'.$value.'"';
       fwrite($fp, $value."\n");
     }
+    if (($value = trim($_POST['external_cli_link'])) !== '') {
+      $value = 'external_cli_link_cmdstr = "'.$value.'"';
+      fwrite($fp, $value."\n");
+    }
     
     if (isset($_POST['tab_directory'])) {
       $value = 'tab_directory_show = yes';
@@ -847,6 +851,9 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">External URL Name:</td><td colspan="4">');
   $value = getPREFdef($global_prefs, 'external_url_name_cmdstr');
   putHtml('<input type="text" size="48" maxlength="64" value="'.$value.'" name="external_url_name" /></td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">External CLI Link:</td><td colspan="4">');
+  $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;">');
   $sel = (getPREFdef($global_prefs, 'tab_directory_show') === 'yes') ? ' checked="checked"' : '';

Modified: branches/1.0/package/webinterface/altweb/common/header.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/header.php	2011-11-26 04:52:22 UTC (rev 5271)
+++ branches/1.0/package/webinterface/altweb/common/header.php	2011-11-26 17:44:20 UTC (rev 5272)
@@ -65,6 +65,21 @@
   return(htmlspecialchars($cmd));
 }
 
+// Function: getCLIlink
+//
+function getCLIlink($g_prefs) {
+  if (($cmd = getPREFdef($g_prefs, 'external_cli_link_cmdstr')) !== '') {
+    if (strpos($cmd, '@localhost') !== FALSE) {
+      $host = $_SERVER['HTTP_HOST'];
+      if (($pos = strpos($host, ':')) !== FALSE) {
+        $host = substr($host, 0, $pos);
+      }
+      $cmd = str_replace('@localhost', '@'.$host, $cmd);
+    }
+  }
+  return(htmlspecialchars($cmd));
+}
+
 // Function: putUSERerror
 //
 function putUSERerror($user, $tab) {
@@ -120,8 +135,17 @@
     putHtml('<table class="headerTable"><tr>');
     putHtml('<td width="140"><img src="/common/logo-small.gif" width="113" height="23" alt="AstLinux" /></td>');
     putHtml('<td><h1>'.getTITLEname($global_prefs).'</h1></td>');
-    if (($URLlink = getURLlink($global_prefs)) !== '') {
-      putHtml('<td style="text-align: right;"><a href="'.$URLlink.'" class="headerText" target="_blank">'.getURLname($global_prefs).'</a></td>');
+    $URLlink = getURLlink($global_prefs);
+    $CLIlink = getCLIlink($global_prefs);
+    if ($URLlink !== '' || ($global_admin && $CLIlink !== '')) {
+      putHtml('<td style="text-align: right;">');
+      if ($URLlink !== '') {
+        putHtml('<a href="'.$URLlink.'" class="headerText" target="_blank">'.getURLname($global_prefs).'</a>');
+      }
+      if ($global_admin && $CLIlink !== '') {
+        putHtml('<a href="'.$CLIlink.'" class="headerText">CLI</a>');
+      }
+      putHtml('</td>');
     }
     putHtml('</tr></table>');
     putHtml('<div id="tabs">');

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2011-11-26 04:52:22 UTC (rev 5271)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2011-11-26 17:44:20 UTC (rev 5272)
@@ -992,7 +992,7 @@
   
     $ph = @fopen($tmpfile, "r");
     while (! feof($ph)) {
-      if ($line = trim(fgets($ph, 1024))) {
+      if ($line = rtrim(fgets($ph, 1024))) {
         putText($line);
       }
     }

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2011-11-26 04:52:22 UTC (rev 5271)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2011-11-26 17:44:20 UTC (rev 5272)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.01';
+$GUI_VERSION = '1.8.02';
 
 ?>

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