diff -ur lms-cvs/lib/LMS.class.php lms-cvs.orig/lib/LMS.class.php
--- lms-cvs/lib/LMS.class.php	Sun Oct 24 21:20:26 2004
+++ lms-cvs.orig/lib/LMS.class.php	Sat Oct 23 20:39:22 2004
@@ -1126,12 +1126,6 @@
 		return $this->DB->GetOne('SELECT ownerid FROM nodes WHERE id=?', array($id));
 	}
 
-	function NodeAssignmentUpdate($nodedata)
-	{
-		$this->SetTS('nodesassignments');
-		return $this->DB->Execute('UPDATE nodesassignments SET assignmentid=? WHERE nodeid=?',array($nodedata['assignment'],$nodedata['id']));
-	}
-
 	function NodeUpdate($nodedata)
 	{
 		$this->SetTS('nodes');
@@ -1183,17 +1177,7 @@
 	{
 		return $this->DB->GetOne('SELECT name FROM nodes WHERE ipaddr=inet_aton(?)', array($ipaddr));
 	}
- 	
-	function GetNodeAssignment($id)
-	{
-		return $this->DB->GetOne('SELECT assignmentid FROM nodesassignments WHERE nodeid=?',array($id));
-	}
 
-	function GetNodeTariff($id)
-	{
-		return $this->DB->GetOne('SELECT name FROM tariffs LEFT JOIN assignments ON (tariffs.id=assignments.tariffid) WHERE assignments.id=?',array($id));
-	}
-	
 	function GetNode($id)
 	{
 		if($result = $this->DB->GetRow('SELECT id, name, ownerid, ipaddr, inet_ntoa(ipaddr) AS ip, mac, access, warning, creationdate, moddate, creatorid, modid, netdev, lastonline FROM nodes WHERE id=?', array($id)))
@@ -1212,8 +1196,6 @@
 			$result['netname'] = $this->GetNetworkName($result['netid']);
 			$result['producer'] = get_producer($result['mac']);
 			$result['devicename'] = $this->GetNetDevName($result['netdevid']);
-			$result['assignment'] = $this->GetNodeAssignment($id);
-			$result['tariff'] = $this->GetNodeTariff($result['assignment']);
 			return $result;
 		}else
 			return FALSE;
@@ -1406,12 +1388,6 @@
 			return $this->DB->Execute('UPDATE nodes SET access=?, modid=? WHERE netdev=? AND ownerid=0', array(0,$this->SESSION->id,$netdev));
 	}
 	
-	function NodeAssignmentAdd($nodedata)
-	{
-		$this->SetTS('nodesassignments');
-		return $this->DB->Execute('INSERT INTO nodesassignments (nodeid,assignmentid) VALUES (?,?)',array($nodedata['id'], $nodedata['assignment']));
-	}
-
 	function NodeAdd($nodedata)
 	{
 		$this->SetTS('nodes');
Only in lms-cvs: lms.ini
diff -ur lms-cvs/modules/nodeadd.php lms-cvs.orig/modules/nodeadd.php
--- lms-cvs/modules/nodeadd.php	Sun Oct 24 21:18:18 2004
+++ lms-cvs.orig/modules/nodeadd.php	Sat Sep 18 21:21:27 2004
@@ -81,7 +81,6 @@
 	if(!$error)
 	{
 		$nodeid=$LMS->NodeAdd($nodedata);
-		$LMS->NodeAssignmentAdd($nodedata);
 		if($nodedata['reuse']=='')
 		{
 			header('Location: ?m=nodeinfo&id='.$nodeid);
diff -ur lms-cvs/modules/nodeedit.php lms-cvs.orig/modules/nodeedit.php
--- lms-cvs/modules/nodeedit.php	Sun Oct 24 21:19:11 2004
+++ lms-cvs.orig/modules/nodeedit.php	Fri Oct 22 07:43:57 2004
@@ -128,8 +128,6 @@
 
 	if(!$error)
 	{
-		if ($nodeinfo['assignment']) $LMS->NodeAssignmentUpdate($nodeedit);
-		else $LMS->NodeAssignmentAdd($nodeedit);
 		$LMS->NodeUpdate($nodeedit);
 		header('Location: ?m=nodeinfo&id='.$nodeedit['id']);
 	}
Only in lms-cvs: new
Only in lms-cvs: pkg
diff -ur lms-cvs/templates/nodeaddbox.html lms-cvs.orig/templates/nodeaddbox.html
--- lms-cvs/templates/nodeaddbox.html	Sun Oct 24 21:17:14 2004
+++ lms-cvs.orig/templates/nodeaddbox.html	Sat Oct 23 21:11:29 2004
@@ -35,22 +35,6 @@
 	</TR>
 	<TR CLASS="LIGHT">
 		<TD WIDTH="1%" CLASS="FLEFT">
-		<IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
-		</TD>
-		<TD WIDTH="1%" NOWRAP>
-			<B>Taryfa:</B>
-		</TD>
-		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
-			<SELECT SIZE="1" NAME="nodeedit[assignment]" {tip text="Wybierz taryfę z listy" trigger="assigment"}>
-				<OPTION VALUE="0" {if ! $nodeinfo.assignment}SELECTED{/if}>--- Brak ---</OPTION>
-				{section name="assignment" loop=$assignments}
-				<OPTION VALUE="{$assignments[assignment].id}" {if $nodeinfo.assignment == $assignments[assignment].id} SELECTED {/if}>{$assignments[assignment].name} ({$assignments[assignment].id})</OPTION>
-				{/section}
-			</SELECT>
-		</TD>
-	</TR>
-	<TR CLASS="LIGHT">
-		<TD WIDTH="1%" CLASS="FLEFT">
 			<IMG SRC="img/{if ! $nodedata.access}no{/if}access.gif" BORDER="0" ALT="">
 		</TD>
 		<TD WIDTH="1%" NOWRAP>
diff -ur lms-cvs/templates/nodeeditbox.html lms-cvs.orig/templates/nodeeditbox.html
--- lms-cvs/templates/nodeeditbox.html	Sun Oct 24 21:17:44 2004
+++ lms-cvs.orig/templates/nodeeditbox.html	Fri Oct 22 07:43:57 2004
@@ -15,7 +15,7 @@
 			<IMG SRC="img/ip.gif" BORDER="0" ALT="Adres IP:">
 		</TD>
 		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
-		       <INPUT TYPE="TEXT" NAME="nodeeditipaddr" VALUE="{$nodeinfo.ip}" {tip text="Wpisz lub wybierz z listy adres IP" trigger="ipaddr"}> <a href="javascript: void(0);" onClick="return ipchoosewin(document.editnode.nodeeditipaddr,{$nodeinfo.netid});" {tip text="Wybierz adres IP z listy"}>&raquo;&raquo;&raquo;</A>
+                       <INPUT TYPE="TEXT" NAME="nodeeditipaddr" VALUE="{$nodeinfo.ip}" {tip text="Wpisz lub wybierz z listy adres IP" trigger="ipaddr"}> <a href="javascript: void(0);" onClick="return ipchoosewin(document.editnode.nodeeditipaddr,{$nodeinfo.netid});" {tip text="Wybierz adres IP z listy"}>&raquo;&raquo;&raquo;</A>
 		</TD>
 	</TR>
 	<TR CLASS="LIGHT">
@@ -49,20 +49,6 @@
 	</TR>
 	<TR CLASS="LIGHT">
 		<TD WIDTH="1%" CLASS="FLEFT">
-			<IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
-		</TD>
-		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
-			<SELECT SIZE="1" NAME="nodeedit[assignment]" {tip text="Wybierz taryfę z listy" trigger="assigment"}>
-				<OPTION VALUE="0" {if ! $nodeinfo.assignment}SELECTED{/if}>--- Brak ---</OPTION>
-				{section name="assignment" loop=$assignments}
-				<OPTION VALUE="{$assignments[assignment].id}" {if $nodeinfo.assignment == $assignments[assignment].id} SELECTED {/if}>{$assignments[assignment].name} ({$assignments[assignment].id})</OPTION>
-				{/section}
-
-			</SELECT>
-		</TD>
-	</TR>
-	<TR CLASS="LIGHT">
-		<TD WIDTH="1%" CLASS="FLEFT">
 			<IMG SRC="img/{if ! $nodeinfo.access}no{/if}access.gif" BORDER="0" ALT="">
 		</TD>
 		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
@@ -115,4 +101,4 @@
 		</TD>
 	</TR>	
 </TABLE>
-</FORM></P>
+</FORM></P>
\ No newline at end of file
diff -ur lms-cvs/templates/nodeinfobox.html lms-cvs.orig/templates/nodeinfobox.html
--- lms-cvs/templates/nodeinfobox.html	Sun Oct 24 21:17:29 2004
+++ lms-cvs.orig/templates/nodeinfobox.html	Sat Aug 14 18:14:33 2004
@@ -57,14 +57,6 @@
 	</TR>
 	<TR CLASS="LIGHT">
 		<TD WIDTH="1%" CLASS="FLEFT">
-			<IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
-		</TD>
-		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
-			<B>{if $nodeinfo.assignment}{$nodeinfo.tariff} ({$nodeinfo.assignment|string_format:"%04d"}){else}BRAK{/if}</B>
-		</TD>
-	</TR>	
-	<TR CLASS="LIGHT">
-		<TD WIDTH="1%" CLASS="FLEFT">
 			<A HREF="?m=nodeset&id={$nodeinfo.id}"><IMG SRC="img/{if ! $nodeinfo.access}no{/if}access.gif" BORDER="0" ALT=""></A>
 		</TD>
 		<TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
diff -ur lms-cvs/templates/userassignments.html lms-cvs.orig/templates/userassignments.html
--- lms-cvs/templates/userassignments.html	Sun Oct 24 21:17:54 2004
+++ lms-cvs.orig/templates/userassignments.html	Wed Aug 18 23:17:24 2004
@@ -27,7 +27,7 @@
 					{if !$a.tariffid}
 					<TD WIDTH="8%" COLSPAN="8"><B>Zawieszenie naliczania wszystkich płatności</B></TD>
 					{else}
-					<TD WIDTH="1%" NOWRAP><B><A HREF="?m=tariffinfo&id={$a.tariffid}">{$a.name} ({$a.id|string_format:"%04d"})</A></B></TD>
+					<TD WIDTH="1%" NOWRAP><B><A HREF="?m=tariffinfo&id={$a.tariffid}">{$a.name}</A></B></TD>
 					<TD WIDTH="1%" NOWRAP ALIGN="RIGHT">{$a.value|string_format:"%01.2f"} zł</TD>
 					<TD WIDTH="1%" NOWRAP>{$a.period} ({$a.at})</TD>
 					<TD WIDTH="1%" NOWRAP ALIGN="RIGHT">{$a.downrate|default:"-"} kbps</TD>