OF-35 two small bug fixes to logging and table row numbers

* Fixed Row numbers on node summary table OF-1386
* improved logging of affiliation changes
* updated affiliation update version to use global update string

src/i18n/openfire_i18n_en.properties

@@ -2734,7 +2734,6 @@ pubsub.node.affiliates.edit.title=Edit Affiliate
 pubsub.node.affiliates.edit.info=Current Affiliation details:
 pubsub.node.affiliates.edit.info2=Current subscriptions for this affiliation:
 pubsub.node.affiliates.edit.info3=Enter new affiliation:
-pubsub.node.affiliates.edit.update=Update
 
 
 # PubSub Node Subscribers

src/web/pubsub-node-affiliates-edit.jsp

@@ -78,6 +78,8 @@
         if (affiliate != null) {
             JID jid = new JID(affiliateJID);
 
+            String oldAffiliation = affiliate.getAffiliation().name();
+
             switch(NodeAffiliate.Affiliation.valueOf(affiliation)) {
 	            case outcast:
 	                node.addOutcast(jid);
@@ -105,7 +107,7 @@
             }
 
             // Log the event
-            webManager.logEvent("changed affiliation between Node: " + nodeID + ", and JID: " + affiliate, "Changed to " + affiliation);
+            webManager.logEvent("Changed affiliation between Node: " + nodeID + ", and JID: " + affiliateJID, "Changed from " + oldAffiliation +" to " + affiliation);
         }
         // Done, so redirect
         response.sendRedirect("pubsub-node-affiliates.jsp?nodeID="+nodeID+"&updateSuccess=true&affiliateJID="+affiliateJID);
@@ -235,7 +237,7 @@
 		<br>
 		<br>
 
-	    <input type="submit" name="update" value="<fmt:message key="pubsub.node.affiliates.edit.update" />">
+	    <input type="submit" name="update" value="<fmt:message key="global.update" />">
 	    <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 	</form>
 

src/web/pubsub-node-summary.jsp

@@ -194,7 +194,7 @@
 
     <tr class="${ (loop.index%2)==0 ? 'jive-even' : 'jive-odd'}">
         <td width="1%">
-            <c:out value="${loop.index}"/>
+            <c:out value="${start + 1 + loop.index}"/>
         </td>
         <td width="1%" valign="middle">
             <c:out value="${node.getNodeID()}"/>