[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/src/srvprxy toc.html.wasm,1.4,1.5
From:       svaidhya () helixcommunity ! org
Date:       2010-07-15 22:13:11
Message-ID: 201007152212.o6FMCrw5032599 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10475

Modified Files:
	toc.html.wasm 
Log Message:
Synopsis 
======
SSPL is not shown in Admin GUI     

Branches:  14.0 , HEAD
Suggested Reviewer: Dean

Description 
=========
The Admin System is case-sensitive in terms of license checks whereas the server is \
not. The 14.0 license had the License variable as "ServerSidePlaylist" whereas the \
earlier releases had it as "ServersidePlaylist". Since the server is \
case-insensitive, the sspl functionality works fine on server but, the admin system \
does not show the sspl page, also does not display it as licensed in the about box.

The correct solution for this is to make the admin system in-sync with theserver, i.e \
to make admin system case-insensitive.

This involves changes to a lot of places in the admin system, because of the numerous \
"hard-coding" of values. Also we would require the server to send the registry values \
as lowercase case, i.e converting to lowercase before sending. This would not only be \
restricted to license variables but also to config variables (becasue there is no way \
we can differentialte license values from config vaules while sending). This requires \
changes with config values too in the admin system, which in essence means a LOT of \
changes and almost re-test of the whole admin system.

Hence for 14.0.1, I was asked to just add a workaround for making \
"ServersidePlaylist" and "ServerSidePlaylist" as valid license variables for SSPL. \
This CR addresses this workaround.


Files Affected 
==========
./server/admin/web/src/srvprxy/toc.html
./server/admin/web/src/srvprxy/license.html

Testing Performed 
=============
Unit Tests: 
None. 

Integration Tests: 
Verified that SSPL page is displayed and also appears as licensed in abuot box for \
"ServersidePlaylist" and "ServersidePlaylist" licensed.
Verified that when removed from license, the page is not displayed and About box \
shows as "not licensed"

Leak Tests: 
None. 

Performance Tests: 
- None 

Platforms Tested: linux-rhel5-i686
Build verified: linux-rhel5-i686



Index: toc.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/toc.html.wasm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- toc.html.wasm	18 Mar 2010 22:58:14 -0000	1.4
+++ toc.html.wasm	15 Jul 2010 22:13:08 -0000	1.5
@@ -361,16 +361,27 @@
 	
 	key = l;
 	a = keyPath.split( '.' );
-	for ( var i = 0; i < a.length; i++ )
-	{
-		if ( ! (key && key[ a[ i ] ]) )
-		{
-			key = null;
-			break;
-		}
-
-		key = key[ a[ i ] ];
-	}
+        for ( var i = 0; i < a.length; i++ )
+        {
+                if ( ! (key && key[ a[ i ] ]) )
+                {
+                        if (a[i] == "ServersidePlaylist")
+                        {
+                                 a[i] = "ServerSidePlaylist";
+                                 if (! (key[ a[i] ] ) )
+                                 {
+                                         key = null;
+                                         break;
+                                 }
+                        }
+                        else
+                        {
+                                key = null;
+                                break;
+                        }
+                }
+                key = key[ a[ i ] ];
+        }
 
 	return ( key == null ? bDefault : (key != "0") );
 }


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]