Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completato sistema di registrazione e di login (Senza grafica);

Browse Source 
Completato sistema di banner e rotazioni
Inserito sistema per ricerca full text
This commit is contained in:
Riccardo Di Dato
2016-03-11 20:15:14 +01:00
parent 6d19bf6efe
commit 2761b9e69a
17 changed files with 290 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/lib/AnalyticsHelper.php
+11 -6
View File
@@ -190,9 +190,13 @@ class AnalyticsHelper {
if (array_key_exists("HTTP_REFERER",$_SERVER)){
$source = $_SERVER['HTTP_REFERER'];
}
$function = '$.ajax({url: "stats/bannerImpression.php", method: "POST", data: { "ip": "'.$ip.'", "banner": "'.$id.'", "source": "'.$source.'" }, dataType: "html" });';
GUIHandler::addOnLoadJsEvent($function);
echo '<script type="text/javascript">'.$function.'</script>';
// OLD VERSION
// $function = '$.ajax({url: "stats/bannerImpression.php", method: "POST", data: { "ip": "'.$ip.'", "banner": "'.$id.'", "source": "'.$source.'" }, dataType: "html" });';
// GUIHandler::addOnLoadJsEvent($function);
}
/**
@@ -285,17 +289,18 @@ class AnalyticsHelper {
$rval = null;
if (ASDSessionHandler::sessionValueExists("bannerActive")){
$shown = ASDSessionHandler::getSessionValue("bannerActive");
if (!is_null($replaced) && in_array($replaced, $shown)){
$key = array_search($needle, $shown);
$key = array_search($replaced, $shown);
unset($shown[$key]);
ASDSessionHandler::setSessionValue("bannerActive",$shown);
}
}
// idlist contiene gli id dei banner in ordine di visualizzazione crescente (esclusi quelli non visualizzati)
$pipeline = PipelineHelper::getTodaysBannerVisualizationPipeline($position);
$stats = GlobalVariables::get("dao")->aggregate("StatisticModel",$pipeline);
var_dump($stats);
// var_dump($stats);
$idList = array();
if (sizeof($stats)>0){
foreach ($stats as $stat){
@@ -316,7 +321,7 @@ class AnalyticsHelper {
}
if (is_null($rval)){
$todayLessShown = array_diff($idList, $shown);
$todayLessShown = array_values(array_diff($idList, $shown));
if (sizeof($todayLessShown)>0){
$i = 0;
while (is_null($rval) && $i<sizeof($todayLessShown)){
private/lib/BannerHelper.php
+23
View File
@@ -0,0 +1,23 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 11/mar/2016
*/
class BannerHelper{
private static $INTERNAL_COUNT = 1;
public static function printBanner($position = BannerModel::POSITION_HEAD){
$cur = self::getPlaceholderId();
?>
<div id="<?php echo $cur;?>"><script type="text/javascript">$(document).ready(function () {bannerRoll('<?php echo $cur;?>',<?php echo $position;?>);});</script></div>
<?php
}
private static function getPlaceholderId(){
return 'banPlaceholder_'.(self::$INTERNAL_COUNT++);
}
}
?>
private/lib/dao/GenericDao.php
+4 -2
View File
@@ -285,10 +285,12 @@ class GenericDao{
$cursor = $collection->find($useFilter,array('score' => array('$meta' => 'textScore')));
$sortArray = array('score' => array('$meta' => 'textScore'));
$sortArray = array();
if (array_key_exists("sort",$options)){
$sortArray = array_merge($sortArray,$options["sort"]);
$sortArray = $options["sort"];
}
$sortArray = array_merge($sortArray,array('score' => array('$meta' => 'textScore')) );
$cursor->sort($sortArray);
if (array_key_exists("skip",$options)){
$cursor->skip($options["skip"]);
private/lib/dao/models/UserModel.php
+8
View File
@@ -24,6 +24,14 @@ class UserModel extends Model{
if(!$this->hasProperty("password")){
new CoreException("Impossible to create a user without a password");
}
if(!$this->hasProperty("active")){
$this->active = false;
}
if(!$this->hasProperty("activationSent")){
$this->activationSent = false;
}
}
public static function getCollectionName(){
private/lib/gui/DatatablesHelper.php
+1 -1
View File
@@ -147,7 +147,7 @@ class DatatablesHelper {
{"className":"lastVisible","targets":[<?php echo sizeof($columns)-2;?>]},
{"className":"hidden","targets":[<?php echo sizeof($columns)-1;?>]}
],
"searchDelay":800,
"searchDelay":600,
});
$('#<?php echo $tabId;?> tbody').on( 'click', 'tr', function () {
if ( $(this).hasClass('selected') ) {
private/lib/gui/GUIHandler.php
+13 -7
View File
@@ -153,12 +153,13 @@ class GUIHandler {
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
ASDSessionHandler::setSessionValue("bannerActive",array());
?>
<div id="floating" style="display:none;"></div>
<div class="headContainer">
<div class="upperBar">
<div class="dateBar"><?php echo $day." ".$mesi[date("n")]." ".date("Y"); ?> - Aggiornato alle <span style="color:#f68235;"><?php echo date("H:i");?></span></div>
<div class="loginReg"><a href="#">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a></div>
<div class="loginReg"><?php echo UserLoginManager::isLogged()?UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome:'<a href="javascript:openLoginModal();">LOGIN</a>';?> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a></div>
<div class="socialBar">
<a class="socialLink" href="https://www.facebook.com/ifattidinapoli" target="_blank"><div style="background-image:url(images/fb.png);"></div></a>
<a class="socialLink" href="https://twitter.com/fattidinapoli" target="_blank"><div style="background-image:url(images/twitter.png);"></div></a>
@@ -168,9 +169,14 @@ class GUIHandler {
</div>
</div>
<div class="middleBar">
<div class="leftBanner topBanner"><img src="images/ads.png" alt=""><span style="color:red;">BANNER</span></div><?php //TODO: Bannerizzare?>
<div class="leftBanner topBanner mediaContent">
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
<!-- <div id="topLeftBan"><script type="text/javascript">$(document).ready(function () {bannerRoll('topLeftBan');});</script></div> -->
</div>
<div class="logo"><img src="images/logo_uff.png"></div>
<div class="rightBanner topBanner"><img src="images/ads.png" alt=""><span style="color:red;">BANNER</span></div><?php //TODO: Bannerizzare?>
<div class="rightBanner topBanner mediaContent">
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
</div>
</div>
<div class="bottomBar" style="height:40px;width:1000px;"></div>
</div>
@@ -314,8 +320,8 @@ class GUIHandler {
<div id="rightBarContainer" class="">
<div class="rotoBanner">
<div>Guarda anche</div>
<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
</div>
<div class="reader">
<div class="lastNews">
@@ -338,8 +344,8 @@ class GUIHandler {
</div>
<div class="rotoBanner not">
<div>Guarda anche</div>
<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
</div>
</div>
<?php
private/lib/gui/html.inclusion.php
+1 -1
View File
@@ -25,7 +25,7 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery-ui.min.js");
// GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery.dataTables.min.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery.form.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL, "jquery.form.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "chosen.jquery.min.js");
private/lib/lib.inclusions.php
+3
View File
@@ -44,4 +44,7 @@ require_once(dirname(__FILE__)."/FDN_MailHelper.php");
require_once(dirname(__FILE__)."/AnalyticsHelper.php");
require_once(dirname(__FILE__)."/PipelineHelper.php");
require_once(dirname(__FILE__)."/BannerHelper.php");
?>
private/lib/media/mediaRenderers/MediaHtml5.php
+2 -1
View File
@@ -17,7 +17,8 @@ class MediaHtml5 extends MediaRenderer{
$height = 'width:'.self::$SIZES[$size]["height"].'px;';
}
return '<div style="'.$height.$width.'overflow:hidden;">'.$this->code.'</div>';
return $this->code;
// return '<div style="'.$height.$width.'overflow:hidden;height:100%;width:100%;">'.$this->code.'</div>';
}
public function render(array $opt = array()){