[lms-commits] CVS update of lms/modules (nodeadd.php, nodeedit.php)

[LMS CVS]

Date: Thursday, September 16, 2010 @ 14:04:55
Author: alec
Path: /cvsroot/lms/modules

Modified: nodeadd.php nodeedit.php

- Make sure to show at least one MAC input


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeadd.php.diff?&r1=1.94&r2=1.95
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeedit.php.diff?&r1=1.114&r2=1.115


Index: lms/modules/nodeadd.php
diff -u lms/modules/nodeadd.php:1.94 lms/modules/nodeadd.php:1.95
--- lms/modules/nodeadd.php:1.94	Mon Jul  5 09:28:55 2010
+++ lms/modules/nodeadd.php	Thu Sep 16 14:04:55 2010
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodeadd.php,v 1.94 2010/07/05 07:28:55 alec Exp $
+ *  $Id: nodeadd.php,v 1.95 2010/09/16 12:04:55 alec Exp $
  */
 
 $nodedata['access'] = 1;
@@ -200,10 +200,11 @@
 		$nodedata['ipaddr_pub'] = $_POST['nodedataipaddr_pub'];
 		$nodedata['macs'][] = '';
 	}
-	elseif(empty($nodedata['macs']))
-		$nodedata['macs'][] = '';
 }
 
+if(empty($nodedata['macs']))
+    $nodedata['macs'][] = '';
+
 $layout['pagetitle'] = trans('New Node');
 
 if($customerid = $nodedata['ownerid'])
Index: lms/modules/nodeedit.php
diff -u lms/modules/nodeedit.php:1.114 lms/modules/nodeedit.php:1.115
--- lms/modules/nodeedit.php:1.114	Mon Jul  5 14:54:41 2010
+++ lms/modules/nodeedit.php	Thu Sep 16 14:04:55 2010
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodeedit.php,v 1.114 2010/07/05 12:54:41 alec Exp $
+ *  $Id: nodeedit.php,v 1.115 2010/09/16 12:04:55 alec Exp $
  */
 
 $action = isset($_GET['action']) ? $_GET['action'] : '';
@@ -224,17 +224,17 @@
 }
 else
 {
-//	print_r($nodeinfo['macs']);die;
 	if(isset($_POST['nodeedit']) && isset($_GET['newmac']))
 	{
 		$nodeedit = $_POST['nodeedit'];
 		$nodeedit['macs'][] = '';
 		$nodeinfo = array_merge($nodeinfo, $nodeedit);
 	}
-	elseif(empty($nodeinfo['macs']))
-		$nodeinfo['macs'][] = '';
 }
 
+if(empty($nodeinfo['macs']))
+	$nodeinfo['macs'][] = '';
+
 include(MODULES_DIR.'/customer.inc.php');
 
 if(!isset($CONFIG['phpui']['big_networks']) || !chkconfig($CONFIG['phpui']['big_networks']))