fixing old urls (/<type>-<id>) and redirect on home page on logon page

(until 1.0.0)

inc/databap.php

@@ -335,7 +335,7 @@ class Databap extends PhpObject
 		return $this->iUserId;
 	}
 
-	public function getPage($sPage, $asVars=array())
+	public function getPage($sPage, $oItemId, $asVars=array())
 	{
 		$oPage = new Mask('index');
 		$oPage->setTag('version', self::VERSION);
@@ -346,6 +346,7 @@ class Databap extends PhpObject
 		//Constants
 		$asConstants = array(	'version'=>self::VERSION,
 								'default_page'=>$sPage,
+								'default_id'=>$oItemId,
 								'disconnected'=>self::DISCONNECTED,
 								'success'=>self::SUCCESS,
 								'error'=>self::ERROR,

index.php

@@ -206,7 +206,7 @@ if($bUserOk && $sAction!=Databap::EXT_ACCESS)
 	//Loading a page
 	else
 	{
-		$sResult = $oDatabap->getPage($sPage, $_GET);
+		$sResult = $oDatabap->getPage($sPage, $oItemId, $_GET);
 	}
 }
 //External Access with token
@@ -241,6 +241,9 @@ else
 {
 	//$oDatabap->setExpectedPage($_SERVER['REQUEST_URI']);
 	$sResult = $oDatabap->getLogonPage($sToken=='');
+	
+	//TODO delete in v1.0.0
+	if($_SERVER['QUERY_STRING']!='') header('Location:'.$_GET['serv_name']);
 }
 
 //clean unwanted error log

jquery/databap.js

@@ -64,7 +64,7 @@ function Databap()
 		$(window).bind('hashchange', self.onHashChange);
 		
 		//Init first page
-		if(self.hash()=='') self.goToInternalLink(self.consts.default_hash);
+		if(self.hash()=='') self.goToInternalLink(self.consts.default_hash, self.consts.default_id); //Fix for old links
 		else self.onHashChange();
 		
 		//Load cache
@@ -866,11 +866,14 @@ function Databap()
 	
 	this.setScrollBarSize = function(iBoxSize)
 	{
-		var $Box = self.tmp('scrollbar').find('.scrollbar_box');
-		if(iBoxSize=='optimize') self.maximizeElem($Box, true);
-		else if(iBoxSize=='maximize') self.maximizeElem($Box, false);
-		else $Box.height(iBoxSize);
-		self.updateScrollBar();
+		if(self.tmp('scrollbar'))
+		{
+			var $Box = self.tmp('scrollbar').find('.scrollbar_box');
+			if(iBoxSize=='optimize') self.maximizeElem($Box, true);
+			else if(iBoxSize=='maximize') self.maximizeElem($Box, false);
+			else $Box.height(iBoxSize);
+			self.updateScrollBar();
+		}
 	};
 	
 	this.updateScrollBar = function(sPos)

masks/logon.html

@@ -41,7 +41,10 @@
 					</tr>
 				</table>
 			</div>
-			<p class="logon_msg"><i class="fa fa-inline fa-c-warning"></i>L'authentification a changé !<br />Nom et prénom : pas de changement sauf qu'il faut bien mettre les accents<br />Mot de passe : initialisé avec le nom de votre entreprise en minuscule</p>
+			<p class="logon_msg round">
+				<span class="msg_title"><i class="fa fa-inline fa-c-warning"></i><!-- TODO delete in v1.0.0 -->L'authentification a changé !</span>
+				<span class="msg_body">Nom et prénom : pas de changement, bien mettre les accents<br />Mot de passe : initialisé avec le nom de votre entreprise en minuscule</span>
+			</p>
 		</div>
 		<div id="footer">
 			<p>v[#]version[#] - Designed and powered by <a href="mailto:francois@lutran.fr" title="Envoyer un mail">Fran&ccedil;ois Lutran</a> - Databap Project under <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GPLv3 License</a>.</p>

style/screen.css

@@ -1163,9 +1163,21 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 
 #logon .logon_msg {
 	margin-top:10px;
+	padding:5px;
 	color:white;
 	text-align:center;
-	font-size: 0.7em;
+	font-size: 0.75em;
+	border:1px solid white;
+}
+
+#logon .logon_msg span {
+	display:block;
+	margin-top:5px;
+}
+
+#logon .logon_msg span.msg_title {
+	margin-top:0;
+	text-decoration:underline;
 }
 
 /* Header */