report errors only if they are present

increase memory_limit for bootcd generation

diff --git a/application/controllers/download.php b/application/controllers/download.php
index fa64938..5b71081 100644 (file)
--- a/application/controllers/download.php
+++ b/application/controllers/download.php
@@ -260,7 +260,7 @@ class Download extends Controller {
        function deliver_bootmedium($node_id, $action, $filename)
        {
                global $api;
-               ini_set("memory_limit","300M");
+               ini_set("memory_limit","450M");
                $options = array();
                switch ($action) {
                        case "node-usb-partition":

diff --git a/application/views/stage3_node_choose.php b/application/views/stage3_node_choose.php
index 5a17ef3..ae443f3 100644 (file)
--- a/application/views/stage3_node_choose.php
+++ b/application/views/stage3_node_choose.php
@@ -20,7 +20,13 @@ function updateStaticFields()
 <?= form_open("register/stage4_confirmnode/$pcu_id/$site_id") ?>
                <table border=0 cellpadding=3>
                        <tbody>
-               <?php if ( !empty($node_list)  && !isset($error) ): ?>
+
+               <?php if ( isset($error) ): ?>
+              <p><strong>The following errors occured:</strong>
+              <font color='red' size='-1'><ul>
+                       <li><?php echo $error ?></li>
+              </ul></font>
+        <?php else: ?>
                                <tr><td colspan='2'><h3>Choose a Node to Associate with PCU</h3></td></tr>
 
                                        <tr><th>Node Name: </th><td>
@@ -41,11 +47,6 @@ function updateStaticFields()
                                        </td>
                                </tr>
                                        </tr>
-               <?php else: ?>
-                                 <p><strong>The following errors occured:</strong>
-                                 <font color='red' size='-1'><ul>
-                                         <li><?= $error ?></li>
-                                       </ul></font>
                <?php endif; ?>
                        </tbody>
                        </table>