[Digir-cvs] DiGIRprov/admin setup.php,1.5,1.6

[<rd...@us...>]

Update of /cvsroot/digir/DiGIRprov/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv28012/admin

Modified Files:
	setup.php 
Log Message:
- Discovered that Xpath lib does not return xml special chars converted back to their original values (as it happens if you use the xml parser functions directly). So needed to "str_replace" some escaped special chars before using the connection string with ADODB.
- Removed funny "license" from front page


Index: setup.php
===================================================================
RCS file: /cvsroot/digir/DiGIRprov/admin/setup.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** setup.php	16 May 2003 14:54:41 -0000	1.5
--- setup.php	16 May 2003 19:47:10 -0000	1.6
***************
*** 395,400 ****
  		  break;
  		}
  	      
! 	      $retVal = $cn->PConnect($constr, $uid, $pwd, $database);
  	      if (!$retVal)
  		{
--- 395,405 ----
  		  break;
  		}
+ 
+ 	      # Xpath does not convert special chars back to their original form, so:
+ 	      $cleanConstr = str_replace(array('"', '&'), 
+ 					 array('"'     , '&'), 
+ 					 $constr);
  	      
! 	      $retVal = $cn->PConnect($cleanConstr, $uid, $pwd, $database);
  	      if (!$retVal)
  		{
***************
*** 507,511 ****
  
        $type     = $datasourceSettings['type'];
!       $constr   = $datasourceSettings['constr'];
        $uid      = $datasourceSettings['uid'];
        $pwd      = $datasourceSettings['pwd'];
--- 512,518 ----
  
        $type     = $datasourceSettings['type'];
!       $constr   = str_replace(array('"', '&'), 
! 			      array('"'     , '&'), 
! 			      $datasourceSettings['constr']);
        $uid      = $datasourceSettings['uid'];
        $pwd      = $datasourceSettings['pwd'];
***************
*** 815,819 ****
  
        $type     = $datasourceSettings['type'];
!       $constr   = $datasourceSettings['constr'];
        $uid      = $datasourceSettings['uid'];
        $pwd      = $datasourceSettings['pwd'];
--- 822,828 ----
  
        $type     = $datasourceSettings['type'];
!       $constr   = str_replace(array('"', '&'), 
! 			      array('"'     , '&'), 
! 			      $datasourceSettings['constr']);
        $uid      = $datasourceSettings['uid'];
        $pwd      = $datasourceSettings['pwd'];
***************
*** 1398,1411 ****
            <span class="label">Attention: </span><span class="menu">This is a pre-alpha version! Remember to backup your config files before playing around!</span>
            </div>
- 
-           <div class="box2">
-           <span class="label">This software is released under TPL <span class="tip">(Thau Public License)</span> v1.1:</span><br>
-           <br><span class="menu">
-           I promise not to distribute this!<br>
-           I promise to eat leafy greens!<br>
-           I promise not to distribute this!<br>
-           I promise to think good thoughts about the folks who provided this software.<br>
-           Thinking good thoughts? Ok, go ahead!
-           </span>
            </center>
        <?php else: ?>
--- 1407,1410 ----