Merge branch 'master' into new-save-plot-request

Benjamin Renard
2 parents 8b9cb61d 3280a991
Showing 10 changed files with 366 additions and 53 deletions Show diff stats
help/ncTimeFormat
index.html
js/app/views/IntervalUI.js
js/resources/css/AccueilAmda.css
js/resources/images/boutonLogin_off.png
js/resources/images/boutonLogin_over.png
js/resources/images/trou.jpg
php/classes/FilesMgr.php
php/classes/Guest.php
php/classes/UserMgr.php
  
-<h2>netCDF Time Format</h2><br/>
-   
- AMDA accepts the following time formats in netCDF files: <br/>
-  
+<h3>netCDF File Format</h3>
+
+netCDF3<br/>
+
+<h3>netCDF Time Format</h3>
+ AMDA accepts the following time formats in netCDF files:
   <ul>  
     <li> double     (seconds from 01/01/1970)
     <li> string ISO (YYYY-MM-DDTHH:MM:SS.MSK)
@@ -11,22 +11,6 @@
 </head>
  
 <body>
-<div id="centrage">
-
-
-<div id="trou">
-
-<div id="couvercle"></div>
-
-<div id="TousLesBoutons">
-<div id="Btn_FirstVisit" onclick="location.href='help.html';"></div>
-<div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
-<form id="Form_Login" method="POST" action="desktop.php" onsubmit="return checkForm(this);">  
-            <div id="loader" class="loader"></div>
-	    <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />   
-	    <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
-     <div><input id="Btn_Login" name="login" type="submit" value=""/></div>
-</form>
 <script type="text/javascript">
   function setLoginLoader(value) {
     var form = document.getElementById('Form_Login');
@@ -35,10 +19,8 @@
     form.elements['login'].disabled = value;
     document.getElementById("loader").style.display = value ? 'block' : 'none';
   }
-
  
-  function checkForm(form)
-  {
+  function checkForm(form){
     if (form.elements['username'].value == "" || form.elements['password'].value == "") {
        alert('Please type your username and password');
        return false;
@@ -46,7 +28,7 @@
     setLoginLoader(true);
     return true;
   }
-
+  
   window.onpageshow = function(event) {
     var qs = (function(a) {
       if (a == "") return {};
@@ -70,29 +52,63 @@
  
      setLoginLoader(false);
   };
+  
+  function checkGuest() {
+    var random = Math.floor(Math.random()*10);
+    if ( random == 0 ) random = 1;
+    var answer = Math.floor(random * 2);
+    var input = prompt("Please enter " + random + " * 2  = ?", "");
+      
+    if (input == answer) {
+        document.getElementById('Btn_GuestLogin').value = 'guest'; 
+        setLoginLoader(true);
+        return true;
+    }
+    else {
+        alert("Sorry " + input); 
+        return false;
+    }
+ };
 </script>
+<div id="centrage">
+
+<div id="trou">
+<div id="couvercle"></div>
+
+<div id="TousLesBoutons">
+<div id="Btn_FirstVisit" onclick="location.href='help.html';"></div>
+<div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
+<form id="Form_Login" method="POST" action="desktop.php" onsubmit="return checkForm(this);"> 
+        <div id="loader" class="loader"></div>
+	    <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />   
+	    <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
+	    <div id="userLogin">
+            <div><input id="Btn_Login" name="login" type="submit" value=""/></div>
+            <div id="textLogin">Login / Registered Users</div>
+        </div>
+</form>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA contact" id="Btn_Contact"></a>
-<div id="Btn_About" onclick="location.href='help/info.html';"></div><div id="textAbout">AMDA Info</div>
+<div id="Btn_About" onclick="location.href='help/info.html';"></div>
+<div id="textAbout">AMDA Info</div>
+
 <a href="http://www.cdpp.eu/" id="Logo_CDPP"></a>
 <div id="PaveGuest">
-<div id="TitrePaveGuest">Try AMDA as a guest</div>
-<div id="TextePaveGuest">login: guest</div>
-<div id="TextePaveGuest">password : your e-mail address</div>
+    <form action="desktop.php" method="POST" onsubmit="return checkGuest();">
+        <input id="Btn_GuestLogin" name="username" type="submit" value=""/>
+        <div id="TitrePaveGuest">Public Access</div>
+    </form>
 </div>
+
 <div id="Logos_partenaires"></div>
  
 <div id="PaveAnnoucements">
-<div id="TitrePaveAnnoucement">Announcements </div>
-<div id="DateAnnoucement">20/01/2020</div>
-<div id="TexteAnnoucement">New data: PHOBOS 2,</BR>Solar Wind at BepiColombo in cruise phase (Tao model)</div>
-<div id="DateAnnoucement">01/10/2019</div>
-<div id="TexteAnnoucement">New data: </BR>Rosetta/LAP,</BR> MESSENGER/FIPS,</BR> MESSENGER/EPS,</BR>Earth Moon/Ephemeris,</BR> Cassini/MAG cruise</div>
-<div id="TexteAnnoucement">Access to <a href="http://amda-old.cdpp.eu" target="_blank">old version</a></div>
+<div id="TitrePaveAnnoucement">Announcements</div>
+<div id="DateAnnoucement">03/06/2020</div>
+<div id="TexteAnnoucement">New data : Parker Solar Probe : SWEAP SPANe</div>
+<div id="DateAnnoucement">01/06/2020</div>
+<div id="TexteAnnoucement">JUNO FGM : perijove data is added</div>
+<div id="DateAnnoucement">14/05/2020</div>
+<div id="TexteAnnoucement">Solar wind ballistic delays for all planets, BepiColombo, Solar Orbiter</div>
+<div id="TexteAnnoucement"><b>New data:</b> <BR/>Stereo HET, SIT</BR>Solar Wind Propagation (TAO) : PSP, SolO</div>
 </div>
-
-</div><!--TousLesBoutons-->
-</div><!--trou-->
-</div><!--centrage-->
-</body>
-</html>
@@ -123,6 +123,9 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		var stop = this.getStopTime();
 		// if duration computable
 		if (stop != null && start != null) {
+            if ( stop <= start ) {
+                form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
+            }
 			// compute offset
 			var zoneOffset = stop.getTimezoneOffset() - start.getTimezoneOffset();
 			// compute duration
-@charset "UTF-8";
@import url("../fonts/stylesheet.css");
/* CSS Document */
body{
		text-align: left;
		background-color: #FFF;
}
/*•••••••••••••• couvercle et trou ••••••••••••*/

#trou{
		position: relative;
		margin-right: 50%;
		margin-left: 50%;
		left: -1050px;
		top: -10px;
		width: 1920px;
		height: 1170px;
		z-index: 1;
		background-attachment: scroll;
		background-image: url(../images/trou.jpg);
		background-repeat: no-repeat;
}


#couvercle{
		position: relative;
		margin-right: auto;
		margin-left: auto;
		left: -276px;
		top: -130px;
		width: 676px;
		height: 676px;
		z-index: 1;
		background: url(../images/Couvercle_complet.png) 0 0 no-repeat scroll;
		background-repeat: no-repeat;
		background-image: url(../images/Couvercle_complet.png);
		-webkit-transition: all 0.5s ease-in-out;
		-moz-transition: all 0.5s ease-in-out;
		
		
	}
#couvercle:hover{
		left: -400px;
		top: -100px;
/*		-webkit-transform: rotate(-5deg)*/
		
		 }
		

		 
/*•••••••••••••• boutons ••••••••••••*/

#TousLesBoutons{
	left: 937px;
	top: -608px;
	z-index: 6;
	position: relative;
	width: 350px;
	height: 500px;
	}	 

#Btn_About, #Btn_FirstVisit, #Btn_Rules, #Btn_Login, #Btn_Register, #Btn_Contact{
		background: url(../images/bouton_off.png) 0 0 no-repeat scroll;
		z-index: 6;
		position: relative;
		width: 40px;
		height: 40px;
	}
		
#Btn_About:hover, #Btn_FirstVisit:hover, #Btn_Rules:hover, #Btn_Login:hover, #Btn_Register:hover, #Btn_Contact:hover{
		background: url(../images/bouton_over.png) 0 0 no-repeat scroll;
	}
	
#Btn_EnterLogin, #Btn_EnterPassword{
	left: 90px;
	z-index: 6;
	position: relative;
	width: 230px;
	height: 25px;
	background-color: rgba(0, 0, 0, 1);
	border-radius:5px 0px 10px 5px;
	padding: 1px 0px 0px 15px;
	border:none;

	}
	#Btn_EnterLogin:hover, #Btn_EnterPassword:hover{
	background-color: rgba(66, 66, 66, 1);

	
	}




#Btn_EnterLogin, #Btn_EnterPassword{
		font-family: orbitronbold;
		font-size: 10px;
		text-align: left;
	}
	
.PlaceHolder {
	  color: #0CF; 
	}

/*••••••••••••••••••••••••••• positionnement des boutons ••••••••••••••••••*/

#Btn_FirstVisit{
		left: 83px;
		top: 0px;	
	}

#Btn_Rules{
		left: 92px;
		top: 13px;		
	}

#Btn_EnterLogin{
		top: 35px;
		
	}

#Btn_EnterPassword{
		
		top: 45px;
	}

#Btn_Login{
		left: 83px;
		top: 75px;
		border: none;
	}

#Btn_Register{
		left: 62px;
		top: 95px;
		display: block;
	}

#Btn_Contact{
		left: 30px;
		top: 112px;
		display: block;
	}
	
#Btn_About{
		left: -10px;
		top: 125px;
	}

	
#Logo_CDPP{
	width: 209px;
	height: 144px;
	display: block;
	top: -70px;
	left:400px;
	z-index: 50;
	position: absolute;
	background: url(../images/Logo_CDPP_off.png) 0 0 no-repeat scroll;
	}
#Logo_CDPP:hover{
	background: url(../images/Logo_CDPP_over.png) 0 0 no-repeat scroll;
	z-index: 100;
}	

#Logos_partenaires{
	margin-right: auto;
	margin-left: auto;
	left:15%;
	right:10%;
	width: 1500px;
	height: 42px;
	bottom: 50px;
	z-index: 50;
	position: fixed;
	background: url(../images/LogosPartenaires.png) 0px 0px no-repeat scroll;				
}
#PaveGuest{
		font-family: orbitronbold;
		font-size: 15px;
		color: rgba(0, 0, 42, 0.3);
		left: 350px;
		top: -178px;
		width: 300px;
		height: 30px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;	
}
#TitrePaveGuest{
		font-family: orbitronlight;
		font-size: 17px;
		color: rgba(0, 0, 0, 0.3);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#TextePaveGuest{
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 2px 5px;
		border-radius:0px 0px 20px 0px;
}

/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/
#textAbout {
		z-index: 6;
		position: relative;
		left: 40px;
		top: 100px;
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(255, 255, 255, 0.5);
		font-weight: bold;
}

/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/

#PaveAnnoucements{
		font-family: orbitronbold;
		font-size: 30px;
		color: rgba(0, 0, 42, 0.3);
		left: 300px;
		top: -100px;
		width: 300px;
		height: 300px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;
}
#TitrePaveAnnoucement{
		font-family: orbitronlight;
		font-size: 35px;
		color: rgba(0, 0, 0, 0.2);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#DateAnnoucement{
		font-family: orbitronbold;
		font-size: 12px;
		color: rgba(163, 224, 255, 1);
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 100px;
}
#DateAnnoucementRed{
		font-family: orbitronbold;
		font-size: 12px;
		color: #F00;
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 100px;
}
#TexteAnnoucement{
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
#TexteAnnoucementRed{
		font-family: orbitronbold;
		font-size: 14px;
		color: #F00;
		text-decoration: blink;
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
 \ No newline at end of file
+@charset "UTF-8";
+@import url("../fonts/stylesheet.css");
+/* CSS Document */
+body{
+		text-align: left;
+		background-color: #FFF;
+}
+/*•••••••••••••• couvercle et trou ••••••••••••*/
+
+#trou{
+		position: relative;
+		margin-right: 50%;
+		margin-left: 50%;
+		left: -1050px;
+		top: -10px;
+		width: 1920px;
+		height: 1170px;
+		z-index: 1;
+		background-attachment: scroll;
+		background-image: url(../images/trou.jpg);
+		background-repeat: no-repeat;
+}
+
+
+#couvercle{
+		position: relative;
+		margin-right: auto;
+		margin-left: auto;
+		left: -276px;
+		top: -130px;
+		width: 676px;
+		height: 676px;
+		z-index: 1;
+		background: url(../images/Couvercle_complet.png) 0 0 no-repeat scroll;
+		background-repeat: no-repeat;
+		background-image: url(../images/Couvercle_complet.png);
+		-webkit-transition: all 0.5s ease-in-out;
+		-moz-transition: all 0.5s ease-in-out;
+	}
+	
+#couvercle:hover{
+		left: -400px;
+		top: -100px;
+		 }
+/*•••••••••••••• boutons ••••••••••••*/
+
+#TousLesBoutons{
+	left: 937px;
+	top: -608px;
+	z-index: 6;
+	position: relative;
+	width: 350px;
+	height: 500px;
+	}	
+	
+#Btn_GuestLogin, #Btn_Login{
+		background: url(../images/boutonLogin_off.png) 0 0 no-repeat scroll;
+		z-index: 6;
+		position: relative;
+		width: 50px;
+		height: 50px;
+	}
+	
+#Btn_GuestLogin:hover, #Btn_Login:hover {
+        background: url(../images/boutonLogin_over.png) 0 0 no-repeat scroll;
+    }
+    
+#Btn_About, #Btn_FirstVisit, #Btn_Rules, #Btn_Register, #Btn_Contact{
+		background: url(../images/bouton_off.png) 0 0 no-repeat scroll;
+		z-index: 6;
+		position: relative;
+		width: 40px;
+		height: 40px;
+	}
+		
+#Btn_About:hover, #Btn_FirstVisit:hover, #Btn_Rules:hover, #Btn_Register:hover, #Btn_Contact:hover{
+		background: url(../images/bouton_over.png) 0 0 no-repeat scroll;
+	}
+	
+#Btn_EnterLogin, #Btn_EnterPassword{
+	left: 90px;
+	z-index: 6;
+	position: relative;
+	width: 230px;
+	height: 25px;
+	background-color: rgba(0, 0, 0, 1);
+	border-radius:5px 0px 10px 5px;
+	padding: 1px 0px 0px 15px;
+	border:none;
+	}
+
+#Btn_EnterLogin:hover, #Btn_EnterPassword:hover{
+	background-color: rgba(66, 66, 66, 1);
+	}
+
+#Btn_EnterLogin, #Btn_EnterPassword{
+		font-family: orbitronbold;
+		font-size: 10px;
+		text-align: left;
+	}
+	
+.PlaceHolder {
+	  color: #0CF; 
+	}
+
+/*••••••••••••••••••••••••••• positionnement des boutons ••••••••••••••••••*/
+
+#Btn_FirstVisit{
+		left: 83px;
+		top: 0px;	
+	}
+
+#Btn_Rules{
+		left: 92px;
+		top: 13px;		
+	}
+
+#Btn_EnterLogin{
+		top: 35px;
+	}
+
+#Btn_EnterPassword{
+		top: 45px;
+	}
+
+#Btn_Register{
+		left: 65px;
+		top: 80px;
+		display: block;
+	}
+
+#Btn_Contact{
+		left: 35px;
+		top: 93px;
+		display: block;
+	}
+	
+#Btn_About{
+		left: 0px;
+		top: 100px;
+	}
+	
+#Logo_CDPP{
+	width: 209px;
+	height: 144px;
+	display: block;
+	top: -70px;
+	left:400px;
+	z-index: 50;
+	position: absolute;
+	background: url(../images/Logo_CDPP_off.png) 0 0 no-repeat scroll;
+	}
+#Logo_CDPP:hover{
+	background: url(../images/Logo_CDPP_over.png) 0 0 no-repeat scroll;
+	z-index: 100;
+}	
+
+#Logos_partenaires{
+	margin-right: auto;
+	margin-left: auto;
+	left:15%;
+	right:10%;
+	width: 1500px;
+	height: 42px;
+	bottom: 50px;
+	z-index: 50;
+	position: fixed;
+	background: url(../images/LogosPartenaires.png) 0px 0px no-repeat scroll;				
+}
+/*------------------ Logins -----------------*/
+#PaveGuest{
+		left: 450px;
+		top: -118px;
+        position: relative;
+        width: 180px;
+        height: 50px;
+        background-color: rgba(255, 255, 255, 0.2);	
+        border-radius:10px 10px 10px 10px;
+      /*  border: 3px solid rgba(255, 255, 255, 0.7); */
+}
+#Btn_GuestLogin{
+		left: 0px;
+		top:  0px;
+		border: none;
+        color: rgba(255, 255, 255, 0);
+	}
+	
+#TitrePaveGuest{
+        position: relative;
+        left: 50px;
+        top: -30px;
+		font-family: orbitronbold;
+		font-size: 16px;
+		color: rgba(0, 107, 179, 0.7);
+		font-weight: bold;
+}
+#userLogin { 
+		position: relative;
+		left: 80px;
+        top: 68px; 
+        width:300px;
+        height: 50px;
+        color: rgba(0, 107, 179, 0.9);  
+        background-color: rgba(255, 255, 255, 0.2);	
+        border-radius:10px 10px 10px 10px;        
+}
+#Btn_Login{
+        position: relative;
+		left: 0px;
+		top: 0px;
+		border: none;
+	}
+#textLogin { 
+		position: relative;
+		left: 50px;
+        top: -30px; 
+		font-family: orbitronbold;
+		font-size: 16px;
+        color: rgba(0, 107, 179, 0.9);       
+		font-weight: bold;
+}
+/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/
+#textAbout {
+		z-index: 6;
+		position: relative;
+		left: 45px;
+		top: 90px;
+		font-family: orbitronlight;
+		font-size: 14px;
+		color: rgba(255, 255, 255, 0.5);
+		font-weight: bold;
+}
+/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/
+
+#PaveAnnoucements{
+		font-family: orbitronbold;
+		font-size: 30px;
+		color: rgba(0, 0, 42, 0.3);
+		left: 300px;
+		top: -100px;
+		width: 300px;
+		height: 300px;
+		z-index: 100;
+		padding:20px 20px 20px 20px;
+		position: relative;
+		background-color: rgba(255, 255, 255, 0);
+		border-radius:0px 30px 0px 30px;
+}
+#TitrePaveAnnoucement{
+		font-family: orbitronlight;
+		font-size: 35px;
+		color: rgba(0, 0, 0, 0.2);
+		background-color: rgba(255, 100, 255, 0);
+		margin-top:20px;
+}
+#DateAnnoucement{
+		font-family: orbitronbold;
+		font-size: 12px;
+		color: rgba(163, 224, 255, 1);
+		background-color: rgba(0, 0, 0, 1);
+		padding:4px 5px 2px 5px;
+		border-radius:3px 3px 3px 3px;
+		width: 100px;
+}
+#DateAnnoucementRed{
+		font-family: orbitronbold;
+		font-size: 12px;
+		color: #F00;
+		background-color: rgba(0, 0, 0, 1);
+		padding:4px 5px 2px 5px;
+		border-radius:3px 3px 3px 3px;
+		width: 100px;
+}
+#TexteAnnoucement{
+		font-family: orbitronlight;
+		font-size: 14px;
+		color: rgba(0, 0, 0, 0.5);
+		background-color: rgba(255, 255, 255, 0.2);
+		padding:5px 10px 5px 10px;
+		border-top:1px solid rgba(255, 255, 255, 1);
+		border-radius:0px 0px 20px 0px;
+}
+#TexteAnnoucementRed{
+		font-family: orbitronbold;
+		font-size: 14px;
+		color: #F00;
+		text-decoration: blink;
+		background-color: rgba(255, 255, 255, 0.2);
+		padding:5px 10px 5px 10px;
+		border-top:1px solid rgba(255, 255, 255, 1);
+		border-radius:0px 0px 20px 0px;
+}
@@ -209,7 +209,7 @@ class FilesMgr extends AmdaObjectMgr
 		if ($result[0] < 0)
 			return $result[0];
 		$varsArr = explode("#",$result[0]);
-	
+
 		return  $varsArr;
 	}
  
@@ -757,8 +757,8 @@ class FilesMgr extends AmdaObjectMgr
 			return "vot";
 		}
  
-		// check binary at different machines - if it works.....
-		if (strpos($file_info[0],"octet-stream") !== false) 
+		// netcdf4 - application/x-hdf
+		if (strpos($file_info[0],"octet-stream") !== false || strpos($file_info[0],"x-hdf") !== false) 
 		{
 			if (strpos($ext,"cdf") !== false) return "cdf"; 
 			if (strpos($ext,"nc") !== false) return "nc";		
@@ -10,12 +10,12 @@ class Guest {
     private $guestXml, $guestXmlFile, $xp, $root;
     public  $Id, $Start, $Ip, $email;
  
-    function __construct($Ip_, $email_){
+    function __construct($Ip_, $email_ = null){
  
-        if($email_ != null) {
+        if($email_) {
            $this->Start = getdate();
            $this->Ip = $Ip_;
-           $this->email = $email_;
+           $this->email = $email_;  
           }
          else {
              $this->Id = substr($Ip_,strlen("guest"));
@@ -31,7 +31,7 @@ class Guest {
             $this->guestXml->load($this->guestXmlFile);
             $this->root = $this->guestXml->getElementsByTagName("guests")->item(0);
         }
-        $this->xp = new domxpath($this->guestXml);                     
+        $this->xp = new domxpath($this->guestXml);  
     }
  
     private function generateXML() {
@@ -436,12 +436,13 @@ class UserMgr
  
 	protected function processGuestLogin() 
 	{
-		if (!$this->check_email_address($_POST['password'])) 
-		{
-			die('<a href="index.html"><h3>Invalid e-mail address. Please, try once more.</h3></a>');
-		}
+// 		if (!$this->check_email_address($_POST['password'])) 
+// 		{
+// 			die('<a href="index.html"><h3>Invalid e-mail address. Please, try once more.</h3></a>');
+// 		}
  
-		$passwd = $_POST['password'];
+//		$passwd = $_POST['password'];
+        $passwd = "public";
 		$IP = $this->getIPclient();
 		$Guest = new Guest($IP,$passwd);
 		// email and IP in guests.login