From 4acbac65419a07be5a79f497485588d409df1d68 Mon Sep 17 00:00:00 2001 From: phamt Date: Fri, 15 Apr 2011 20:46:23 +0000 Subject: [PATCH] Cleaned up code. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9328 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/js/monitor/monitor.js | 2 +- xCAT-UI/lib/cmd.php | 6 +++--- xCAT-UI/lib/functions.php | 8 ++++---- xCAT-UI/lib/rcons.php | 3 +-- xCAT-UI/lib/systemcmd.php | 4 ++-- xCAT-UI/lib/tabRestore.php | 2 +- xCAT-UI/lib/zCmd.php | 4 ++-- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js index 4e2405701..dc308a87b 100644 --- a/xCAT-UI/js/monitor/monitor.js +++ b/xCAT-UI/js/monitor/monitor.js @@ -120,7 +120,7 @@ function loadMonitorPage() { } var monTable = $('
'); - monTable.append($('Monitor ToolStatusDescription')); + monTable.append($('Monitor ToolStatusDescription')); var monTableBody = $(''); monTable.append(monTableBody); diff --git a/xCAT-UI/lib/cmd.php b/xCAT-UI/lib/cmd.php index 3b5f26686..260477280 100644 --- a/xCAT-UI/lib/cmd.php +++ b/xCAT-UI/lib/cmd.php @@ -10,9 +10,9 @@ require_once "$TOPDIR/lib/jsonwrapper.php"; * own .php. Look at zCmd.php for an example. * * @param $cmd The xCAT command - * $tgt The target node or group - * $args The xCAT command arguments, separated by semicolons - * $opts The xCAT command options, separated by semicolons + * @param $tgt The target node or group + * @param $args The xCAT command arguments, separated by semicolons + * @param $opts The xCAT command options, separated by semicolons * @return The xCAT response. Replies are in the form of JSON */ if (isset($_GET["cmd"])) { diff --git a/xCAT-UI/lib/functions.php b/xCAT-UI/lib/functions.php index daebaef54..8aa88130f 100644 --- a/xCAT-UI/lib/functions.php +++ b/xCAT-UI/lib/functions.php @@ -15,9 +15,9 @@ ini_set('display_errors', true); * Run a command using the xCAT client/server protocol * * @param $cmd The xCAT command - * $nr Node range or group - * $args_array Command arguments - * $opts_array Command options + * @param $nr Node range or group + * @param $args_array Command arguments + * @param $opts_array Command options * @return A tree of SimpleXML objects. * See perl-xCAT/xCAT/Client.pm for the format */ @@ -165,7 +165,7 @@ function submit_request($req, $skipVerify, $opts_array){ * Enable password storage to split between cookie and session variable * * @param $data - * $key + * @param $key * @return */ function xorcrypt($data, $key) { diff --git a/xCAT-UI/lib/rcons.php b/xCAT-UI/lib/rcons.php index f51c8d4f3..59b82e370 100644 --- a/xCAT-UI/lib/rcons.php +++ b/xCAT-UI/lib/rcons.php @@ -1,5 +1,4 @@ $output)); diff --git a/xCAT-UI/lib/systemcmd.php b/xCAT-UI/lib/systemcmd.php index dfbdd641f..824aad522 100644 --- a/xCAT-UI/lib/systemcmd.php +++ b/xCAT-UI/lib/systemcmd.php @@ -20,10 +20,10 @@ if (isset($_GET["cmd"])) { // HTTP GET requests $cmd = $_GET["cmd"]; $msg = NULL; - + if (isset($_GET["msg"])){ $msg = $_GET["msg"]; - } + } $ret = ""; if ("ostype" == $cmd) { diff --git a/xCAT-UI/lib/tabRestore.php b/xCAT-UI/lib/tabRestore.php index b20a80ccd..52206a827 100644 --- a/xCAT-UI/lib/tabRestore.php +++ b/xCAT-UI/lib/tabRestore.php @@ -8,7 +8,7 @@ require_once "$TOPDIR/lib/jsonwrapper.php"; * Replace the contents of an xCAT table * * @param $tab The xCAT table - * $cont The xCAT table contents + * @param $cont The xCAT table contents * @return The xCAT response. Replies are in the form of JSON */ if (isset($_POST["table"])) { diff --git a/xCAT-UI/lib/zCmd.php b/xCAT-UI/lib/zCmd.php index c6a6f5f39..24c6dcf32 100644 --- a/xCAT-UI/lib/zCmd.php +++ b/xCAT-UI/lib/zCmd.php @@ -8,8 +8,8 @@ require_once "$TOPDIR/lib/jsonwrapper.php"; * Issue an xCAT command (only for z) * * @param $cmd The xCAT command - * $tgt The target node or group - * $args The xCAT command arguments, separated by semicolons + * @param $tgt The target node or group + * @param $args The xCAT command arguments, separated by semicolons * @return The xCAT response. Replies are in the form of JSON */ if (isset($_GET["cmd"])) {