From 869d989627fcbbc9f7e268168e1bd78fbcde36b1 Mon Sep 17 00:00:00 2001
From: franzz <francois@lutran.fr>
Date: Wed, 9 Oct 2013 17:59:21 +0200
Subject: [PATCH] add default timezone + delete parser file

---
 .gitignore             |  2 ++
 config.php             | 14 ++++++++++----
 sap_website_parser.php |  3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100755 sap_website_parser.php

diff --git a/.gitignore b/.gitignore
index e845e07..935a825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /.project
 /.buildpath
+/sap_website_parser.sh
+/settings.php
diff --git a/config.php b/config.php
index 337d36c..081f7bd 100755
--- a/config.php
+++ b/config.php
@@ -331,6 +331,7 @@ class Databap extends PhpObject
 	function __construct($oClassManagement)
 	{
 		parent::__construct();
+		date_default_timezone_set(Settings::TIMEZONE);
 		$this->oMySql = new MySqlManager();
 		if($this->oMySql->sDbState == MySqlManager::DB_NO_DATA) $this->install();
 		$this->oProcedure = new Procedure($this->oMySql);
@@ -361,8 +362,11 @@ class Databap extends PhpObject
 		$this->oMySql->insertRow(MySqlManager::CHAN_TABLE, array('safe_name'=>self::getChanSafeName(self::DEFAULT_CHAN), MySqlManager::getText(MySqlManager::CHAN_TABLE)=>self::DEFAULT_CHAN));
 		
 		//Install default users : admin and test
-		$this->addUser('francois', 'lutran', 'cgi', 'francois@lutran.fr', self::CLEARANCE_ADMIN);
+		$iAdminId = $this->addUser('francois', 'lutran', 'cgi', 'francois@lutran.fr', self::CLEARANCE_ADMIN);
 		$this->addUser('test', 'test', 'test', 'test@test.com');
+		
+		//Write the SAP blog parser bash script to main folder
+		@file_put_contents('sap_website_parser.sh', "#!/bin/bash\n\n/usr/bin/php -f index.php a=external_access p=sap_blog auth_token=".$iAdminId.'_'.$this->generateToken($iAdminId)); 
 	}
 
 	private function setUserId($iUserId)
@@ -630,6 +634,8 @@ class Databap extends PhpObject
 		//$this->oMySql->insertRow($sOptionTable, array($sUserIdCol=>$iUserId, $sOptNameIdCol=>self::OPT_HOVER, $sOptionTextCol=>'#EFAB00'));
 		$this->oMySql->insertRow($sOptionTable, array($sUserIdCol=>$iUserId, $sOptNameIdCol=>self::OPT_TOKEN, $sOptionTextCol=>$this->generateRssLink($iUserId)));
 		//$this->oMySql->insertRow($sOptionTable, array($sUserIdCol=>$iUserId, $sOptNameIdCol=>self::OPT_IMAGE_CHAT, $sOptionTextCol=>'images/sap_gold_332.jpg'));
+		
+		return $iUserId;
 	}
 	
 	public function resetToken()
@@ -2104,7 +2110,7 @@ class Databap extends PhpObject
 	{
 		$iUserId = strstr($sKey, '_', true);
 		$sToken = substr($sKey, strlen($iUserId)+1);
-		return (strlen($sToken)==self::TOKEN_LENGTH && $this->generateToken($iUserId)==$sToken)?$iUserId:0;
+		return (strlen($sToken)==self::TOKEN_LENGTH && $this->generateToken($iUserId)==$sToken && $this->checkValue(MySqlManager::USER_TABLE, $iUserId))?$iUserId:0;
 	}
 	
 	public function resetNecessary($iUserId)
@@ -2800,9 +2806,9 @@ class SearchEngine extends PhpObject
 						//$sWords = self::KEYWORDS_SEPARATOR.$asItem['keywords'].self::KEYWORDS_SEPARATOR;
 						
 						//Calculate hit value
-						//$iCount = 
+						//$iCount = 0;
 						
-						$this->incItemRank($iSearchId, $iLevel);
+						$this->incItemRank($iSearchId, $iLevel/**10+$iCount*/);
 						
 						$this->setItemInfo($iSearchId, $iItemType, $iItemId);
 						$this->setUserInfo($this->getItemInfo($iSearchId, MySqlManager::getId(MySqlManager::USER_TABLE)));
diff --git a/sap_website_parser.php b/sap_website_parser.php
deleted file mode 100755
index 45075df..0000000
--- a/sap_website_parser.php
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/bin/php -f index.php a=external_access p=sap_blog auth_token=4_dacc5c7342dfbca6a882d9c94ced58bf