lms-tariff_per_node.patch

   1 diff -ur lms-cvs.orig/lib/LMS.class.php lms-cvs/lib/LMS.class.php
   2 --- lms-cvs.orig/lib/LMS.class.php      2005-02-02 21:09:04.226695078 +0100
   3 +++ lms-cvs/lib/LMS.class.php   2005-02-02 21:08:30.677015322 +0100
   4 @@ -1221,6 +1221,12 @@
   5                 return $this->DB->GetOne('SELECT ownerid FROM nodes WHERE id=?', array($id));
   6         }
   7
   8 +       function NodeAssignmentUpdate($nodedata)
   9 +       {
  10 +               $this->SetTS('nodesassignments');
  11 +               return $this->DB->Execute('UPDATE nodesassignments SET assignmentid=? WHERE nodeid=?',array($nodedata['assignment'],$nodedata['id']));
  12 +       }
  13 +
  14         function NodeUpdate($nodedata)
  15         {
  16                 $this->SetTS('nodes');
  17 @@ -1272,7 +1278,17 @@
  18         {
  19                 return $this->DB->GetOne('SELECT name FROM nodes WHERE ipaddr=inet_aton(?)', array($ipaddr));
  20         }
  21 +
  22 +       function GetNodeAssignment($id)
  23 +       {
  24 +               return $this->DB->GetOne('SELECT assignmentid FROM nodesassignments WHERE nodeid=?',array($id));
  25 +       }
  26
  27 +       function GetNodeTariff($id)
  28 +       {
  29 +               return $this->DB->GetOne('SELECT name FROM tariffs LEFT JOIN assignments ON (tariffs.id=assignments.tariffid) WHERE assignments.id=?',array($id));
  30 +       }
  31 +
  32         function GetNode($id)
  33         {
  34                 if($result = $this->DB->GetRow('SELECT id, name, ownerid, ipaddr, inet_ntoa(ipaddr) AS ip, mac, access, warning, creationdate, moddate, creatorid, modid, netdev, lastonline, info FROM nodes WHERE id=?', array($id)))
  35 @@ -1296,6 +1312,8 @@
  36                         $result['netname'] = $this->GetNetworkName($result['netid']);
  37                         $result['producer'] = get_producer($result['mac']);
  38                         $result['devicename'] = $this->GetNetDevName($result['netdevid']);
  39 +                       $result['assignment'] = $this->GetNodeAssignment($id);
  40 +                       $result['tariff'] = $this->GetNodeTariff($result['assignment']);
  41                         return $result;
  42                 }else
  43                         return FALSE;
  44 @@ -1488,6 +1506,12 @@
  45                         return $this->DB->Execute('UPDATE nodes SET access=0 WHERE netdev=? AND ownerid=0', array($netdev));
  46         }
  47
  48 +       function NodeAssignmentAdd($nodedata)
  49 +       {
  50 +               $this->SetTS('nodesassignments');
  51 +               return $this->DB->Execute('INSERT INTO nodesassignments (nodeid,assignmentid) VALUES (?,?)',array($nodedata['id'], $nodedata['assignment']));
  52 +       }
  53 +
  54         function NodeAdd($nodedata)
  55         {
  56                 $this->SetTS('nodes');
  57 diff -ur lms-cvs.orig/modules/nodeadd.php lms-cvs/modules/nodeadd.php
  58 --- lms-cvs.orig/modules/nodeadd.php    2005-02-02 21:11:40.954932764 +0100
  59 +++ lms-cvs/modules/nodeadd.php 2005-02-01 20:51:45.000000000 +0100
  60 @@ -81,7 +81,8 @@
  61
  62         if(!$error)
  63         {
  64 -               $nodeid = $LMS->NodeAdd($nodedata);
  65 +               $nodeid=$LMS->NodeAdd($nodedata);
  66 +               $LMS->NodeAssignmentAdd($nodedata);
  67                 if($nodedata['reuse']=='')
  68                 {
  69                         header('Location: ?m=nodeinfo&id='.$nodeid);
  70 diff -ur lms-cvs.orig/modules/nodeedit.php lms-cvs/modules/nodeedit.php
  71 --- lms-cvs.orig/modules/nodeedit.php   2005-02-02 21:11:41.036919912 +0100
  72 +++ lms-cvs/modules/nodeedit.php        2005-02-01 20:51:45.000000000 +0100
  73 @@ -130,6 +130,8 @@
  74
  75         if(!$error)
  76         {
  77 +               if ($nodeinfo['assignment']) $LMS->NodeAssignmentUpdate($nodeedit);
  78 +               else $LMS->NodeAssignmentAdd($nodeedit);
  79                 $LMS->NodeUpdate($nodeedit);
  80                 header('Location: ?m=nodeinfo&id='.$nodeedit['id']);
  81         }
  82 diff -ur lms-cvs.orig/templates/nodeaddbox.html lms-cvs/templates/nodeaddbox.html
  83 --- lms-cvs.orig/templates/nodeaddbox.html      2005-01-31 22:09:20.000000000 +0100
  84 +++ lms-cvs/templates/nodeaddbox.html   2005-02-01 20:52:10.000000000 +0100
  85 @@ -35,6 +35,22 @@
  86         </TR>
  87         <TR CLASS="LIGHT">
  88                 <TD WIDTH="1%" CLASS="FLEFT">
  89 +               <IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
  90 +               </TD>
  91 +               <TD WIDTH="1%" NOWRAP>
  92 +                       <B>Taryfa:</B>
  93 +               </TD>
  94 +               <TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
  95 +                       <SELECT SIZE="1" NAME="nodeedit[assignment]" {tip text="Wybierz taryfê z listy" trigger="assigment"}>
  96 +                               <OPTION VALUE="0" {if ! $nodeinfo.assignment}SELECTED{/if}>--- Brak ---</OPTION>
  97 +                               {section name="assignment" loop=$assignments}
  98 +                               <OPTION VALUE="{$assignments[assignment].id}" {if $nodeinfo.assignment == $assignments[assignment].id} SELECTED {/if}>{$assignments[assignment].name} ({$assignments[assignment].id})</OPTION>
  99 +                               {/section}
 100 +                       </SELECT>
 101 +               </TD>
 102 +       </TR>
 103 +       <TR CLASS="LIGHT">
 104 +               <TD WIDTH="1%" CLASS="FLEFT">
 105                         <IMG SRC="img/{if ! $nodedata.access}no{/if}access.gif" BORDER="0" ALT="">
 106                 </TD>
 107                 <TD WIDTH="1%" NOWRAP>
 108 diff -ur lms-cvs.orig/templates/nodeeditbox.html lms-cvs/templates/nodeeditbox.html
 109 --- lms-cvs.orig/templates/nodeeditbox.html     2005-01-07 21:26:18.000000000 +0100
 110 +++ lms-cvs/templates/nodeeditbox.html  2005-01-14 22:10:19.000000000 +0100
 111 @@ -49,6 +49,20 @@
 112         </TR>
 113         <TR CLASS="LIGHT">
 114                 <TD WIDTH="1%" CLASS="FLEFT">
 115 +                       <IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
 116 +               </TD>
 117 +               <TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
 118 +                       <SELECT SIZE="1" NAME="nodeedit[assignment]" {tip text="Wybierz taryfê z listy" trigger="assigment"}>
 119 +                               <OPTION VALUE="0" {if ! $nodeinfo.assignment}SELECTED{/if}>--- Brak ---</OPTION>
 120 +                               {section name="assignment" loop=$assignments}
 121 +                               <OPTION VALUE="{$assignments[assignment].id}" {if $nodeinfo.assignment == $assignments[assignment].id} SELECTED {/if}>{$assignments[assignment].name} ({$assignments[assignment].id})</OPTION>
 122 +                               {/section}
 123 +
 124 +                       </SELECT>
 125 +               </TD>
 126 +       </TR>
 127 +       <TR CLASS="LIGHT">
 128 +               <TD WIDTH="1%" CLASS="FLEFT">
 129                         <IMG SRC="img/{if ! $nodeinfo.access}no{/if}access.gif" BORDER="0" ALT="">
 130                 </TD>
 131                 <TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
 132 diff -ur lms-cvs.orig/templates/nodeinfobox.html lms-cvs/templates/nodeinfobox.html
 133 --- lms-cvs.orig/templates/nodeinfobox.html     2005-01-20 18:53:16.000000000 +0100
 134 +++ lms-cvs/templates/nodeinfobox.html  2005-02-02 21:18:44.702467494 +0100
 135 @@ -57,6 +57,14 @@
 136         </TR>
 137         <TR CLASS="LIGHT">
 138                 <TD WIDTH="1%" CLASS="FLEFT">
 139 +                       <IMG SRC="img/money.gif" BORDER="0" ALT=""></A>
 140 +               </TD>
 141 +               <TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
 142 +                       <B>{if $nodeinfo.assignment}{$nodeinfo.tariff} ({$nodeinfo.assignment|string_format:"%04d"}){else}BRAK{/if}</B>
 143 +               </TD>
 144 +       </TR>
 145 +       <TR CLASS="LIGHT">
 146 +               <TD WIDTH="1%" CLASS="FLEFT">
 147                         <A HREF="?m=nodeset&id={$nodeinfo.id}"><IMG SRC="img/{if ! $nodeinfo.access}no{/if}access.gif" BORDER="0" ALT=""></A>
 148                 </TD>
 149                 <TD WIDTH="99%" CLASS="FRIGHT" COLSPAN="2">
 150 @@ -108,8 +116,8 @@
 151         <TR CLASS="LIGHT">
 152                 <TD WIDTH="100%" CLASS="FBOTTOMU" COLSPAN="3" ALIGN="RIGHT">
 153                         <A HREF="?m=userinfo&id={$nodeinfo.ownerid}">{t}All nodes{/t} <IMG SRC="img/cancel.gif" BORDER="0" ALT="" ALIGN="absmiddle"></A>
 154 -                       <A HREF="?m=nodedel&id={$nodeinfo.id}" onClick="return confirmLink(this, '{t 0=$nodeinfo.name|upper}Are you sure, you want to remove node \'$0\' from database?{/t}')">{t}Delete{/t} <IMG SRC="img/delete.gif" BORDER="0" ALT="" ALIGN="absmiddle"></A>
 155 -                       <A HREF="?m=nodeedit&id={$nodeinfo.id}" ACCESSKEY="E">{t}Edit{/t} <IMG SRC="img/edit.gif" BORDER="0" ALT="" ALIGN="absmiddle"></A>
 156 -               </TD>
 157 -       </TR>
 158 +                       <A HREF="?m=nodedel&id={$nodeinfo.id}" onClick="return confirmLink(this, '{t}{$nodeinfo.name|upper}Are you sure, you want to remove node \'$0\' from database?{/t}')">{t}Delete{/t} <IMG SRC="img/delete.gif" BORDER="0" ALT="" ALIGN="absmiddle"></A>
 159 +               <A HREF="?m=nodeedit&id={$nodeinfo.id}" ACCESSKEY="E">{t}Edit{/t} <IMG SRC="img/edit.gif" BORDER="0" ALT="" ALIGN="absmiddle"></A>
 160 +       </TD>
 161 +</TR>
 162  </TABLE>
 163 diff -ur lms-cvs.orig/templates/userassignments.html lms-cvs/templates/userassignments.html
 164 --- lms-cvs.orig/templates/userassignments.html 2005-01-31 22:09:24.000000000 +0100
 165 +++ lms-cvs/templates/userassignments.html      2005-02-01 20:52:11.000000000 +0100
 166 @@ -27,7 +27,7 @@
 167                                         {if !$a.tariffid}
 168                                         <TD WIDTH="8%" COLSPAN="8"><B>{t}Suspending of all liabilities{/t}</B></TD>
 169                                         {else}
 170 -                                       <TD WIDTH="1%" NOWRAP OnClick="return self.location.href='?m=userassignmentsedit&id={$a.id}'"><B><A HREF="?m=tariffinfo&id={$a.tariffid}">{$a.name}</A></B></TD>
 171 +                                       <TD WIDTH="1%" NOWRAP OnClick="return self.location.href='?m=userassignmentsedit&id={$a.id}'"><B><A HREF="?m=tariffinfo&id={$a.tariffid}">{$a.name} ({$a.id|string_format:"%04d"})</A></B></TD>
 172                                         <TD WIDTH="1%" NOWRAP ALIGN="RIGHT" OnClick="return self.location.href='?m=userassignmentsedit&id={$a.id}'">{$a.value|money_format}</TD>
 173                                         <TD WIDTH="1%" NOWRAP OnClick="return self.location.href='?m=userassignmentsedit&id={$a.id}'">{$a.period} ({$a.at})</TD>
 174                                         <TD WIDTH="1%" NOWRAP ALIGN="RIGHT" OnClick="return self.location.href='?m=userassignmentsedit&id={$a.id}'">{$a.downrate|default:"-"} kbps</TD>