diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php
index f72c862..b5f5169 100644
--- a/private/bin/importOldData.php
+++ b/private/bin/importOldData.php
@@ -7,7 +7,7 @@ Creation Date: 04/mar/2016
require_once(dirname(__FILE__)."/../load.php");
-$pdo = new PDO("mysql:host=localhost;dbname=fdn_old","root","root");
+$pdo = new PDO("mysql:host=localhost;dbname=fdn_old","root","root",array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8") );
$pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );
$admin = GlobalVariables::get("dao")->getFirst("AdminModel",array("username"=>"antonio.pianelli"));
@@ -31,8 +31,8 @@ else {
GlobalVariables::get("dao")->save($admin);
}
-
-$statement = $pdo->query("select * from notizia limit 0,10");
+$imgDir = "/home/rik/Scrivania/FDN_BAK/mediaimg/notizie";
+$statement = $pdo->query("select * from notizia order by id desc limit 0,100");
$dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
// while (is_array($dati) && sizeof($dati)==0){
foreach ($dati as $ele){
@@ -63,7 +63,7 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
$notizia->category = NotiziaModel::CATEGORY_CULTURA;
break;
case 5://SPETTACOLO
- $notizia->category = NotiziaModel::CATEGORY_SPETTACOLO;
+ $notizia->category = NotiziaModel::CATEGORY_CULTURA;
break;
case 4://FISCO E LAVORO
$notizia->category = NotiziaModel::CATEGORY_FISCOELAVORO;
@@ -72,6 +72,30 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
$notizia = new NotiziaModel($notizia);
GlobalVariables::get("dao")->save($notizia);
+
+ if (preg_match("/^http/",$ele->img)){
+ $media = new stdClass();
+ $media->mediaType = MediaModel::TYPE_YOUTUBE;
+ $media->link = $ele->img;
+ $media = new MediaModel($media);
+ GlobalVariables::get("dao")->save($media);
+ DaoMediaHandler::addMedia($notizia, $media);
+ }
+
+ $curDir = $imgDir."/".$ele->id;
+ if (is_dir($curDir) && is_dir($curDir."/big")){
+ $i=0;
+ $continue = true;
+ $curFile = $curDir."/big/".$i++.".jpg";
+ while(file_exists($curFile)){
+ $media = new stdClass();
+ $media->mediaType = MediaModel::TYPE_IMAGE;
+ $media = DaoMediaHandler::createNewFileBasedMedia($media, $curFile, "jpg");
+
+ DaoMediaHandler::addMedia($notizia, $media);
+ $curFile = $curDir."/big/".$i++.".jpg";
+ }
+ }
}
// }
diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/private/lib/dao/mediaModels/DaoMediaHandler.php
index fabc6d9..711d5c6 100644
--- a/private/lib/dao/mediaModels/DaoMediaHandler.php
+++ b/private/lib/dao/mediaModels/DaoMediaHandler.php
@@ -209,6 +209,7 @@ class DaoMediaHandler implements MediaHandlerInterface{
*/
public static function createNewTextBasedMedia($saveable){
$media = new MediaModel($saveable);
+ GlobalVariables::get("dao")->save($media);
return $media;
}
diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php
index 9bc8d1e..9420c65 100644
--- a/private/lib/dao/models/NotiziaModel.php
+++ b/private/lib/dao/models/NotiziaModel.php
@@ -40,7 +40,6 @@ class NotiziaModel extends HasMediaModel{
const CATEGORY_SALUTE = 11;
const CATEGORY_ANNUNCI = 12;
const CATEGORY_FISCOELAVORO = 13;
- const CATEGORY_SPETTACOLO = 14;
public static $NOTIZIE_CATEGORY = array(
self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php")),
@@ -55,8 +54,7 @@ class NotiziaModel extends HasMediaModel{
self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"casa.php")),
self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"salute.php")),
self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"annunci.php")),
- self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php")),
- self::CATEGORY_SPETTACOLO=>array("label"=>"Spettacolo","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"spettacolo.php"))
+ self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php"))
);
public static function getCollectionName(){
diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index ea556d9..18d4b20 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -149,16 +149,17 @@ class GUIHandler {
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
- $head = '
+ ?>
+
-
'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle '.date("H:i").'
-
+
- Aggiornato alle
+
@@ -167,8 +168,8 @@ class GUIHandler {
-
';
- echo $head;
+
+
id;
+ return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
+ }
+
+ public static function getTwitterShareFunction(NotiziaModel $notizia){
+ $url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
+ return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
+ }
+
+ public static function getGooglePlusShareFunction(NotiziaModel $notizia){
+ $url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
+ return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
+ }
+
+ public static function getLinkedinShareFunction(NotiziaModel $notizia){
+ $url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
+ return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
+ }
}
?>
\ No newline at end of file
diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php
index 18fdb08..5d3a735 100644
--- a/public/admin/addMultimedia.php
+++ b/public/admin/addMultimedia.php
@@ -48,7 +48,7 @@ try{
}
if(!is_null($media)){
- GlobalVariables::get("dao")->save($media);
+// GlobalVariables::get("dao")->save($media);
DaoMediaHandler::addMedia($notizia, $media);
GlobalVariables::get("dao")->save($notizia);
}
diff --git a/public/admin/editBannerImage.php b/public/admin/editBannerImage.php
index 99a4cd9..4fa2a7e 100644
--- a/public/admin/editBannerImage.php
+++ b/public/admin/editBannerImage.php
@@ -56,7 +56,7 @@ try{
}
if (!is_null($media)){
- GlobalVariables::get("dao")->save($media);
+// GlobalVariables::get("dao")->save($media);
DaoMediaHandler::deleteAllMedias($banner);
DaoMediaHandler::setMainMediaToModel($banner, $media);
diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php
index 0009d49..7226993 100644
--- a/public/admin/editNotizie.php
+++ b/public/admin/editNotizie.php
@@ -86,7 +86,12 @@ try{
GlobalVariables::get("dao")->save($notizia);
- GUIHandler::redirect("admin/myNotizie.php");
+ if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
+ GUIHandler::redirectPost("admin/homeNotizie.php",array("id"=>$notizia->id));
+ }
+ else {
+ GUIHandler::redirect("admin/myNotizie.php");
+ }
}
}
else{
diff --git a/public/admin/newBanner.php b/public/admin/newBanner.php
index dac0a34..d8c5693 100644
--- a/public/admin/newBanner.php
+++ b/public/admin/newBanner.php
@@ -70,7 +70,7 @@ try{
if (!is_null($media)){
GlobalVariables::get("dao")->save($banner);
- GlobalVariables::get("dao")->save($media);
+// GlobalVariables::get("dao")->save($media);
DaoMediaHandler::addMedia($banner, $media);
// GlobalVariables::get("dao")->save($banner);
GUIHandler::redirectPost("admin/homeBanner.php",array("id"=>$banner->id));
diff --git a/public/index.php b/public/index.php
index 904628d..93d9845 100644
--- a/public/index.php
+++ b/public/index.php
@@ -23,51 +23,81 @@ try {
array('$and'=>array(array("isAnsa"=>true),array("status"=>NotiziaModel::STATUS_ACCEPTED))),
array("sort"=>array("about.data"=>-1),"limit"=>2)
);
+
$ansaIds = array();
if (sizeof($ansaNews)>0){
$ansaIds = array_map(function($ele){return new MongoId($ele->id);}, $ansaNews);
+
+ $ansaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ansaNews);
}
+
$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_POLITICA),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>3)
);
+ if (sizeof($politicaNews)>0){
+ $politicaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $politicaNews);
+ }
$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_CRONACA),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>3)
);
+ if (sizeof($cronacaNews)>0){
+ $cronacaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $cronacaNews);
+ }
$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_SPORT),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>2)
);
+ if (sizeof($sportNews)>0){
+ $sportNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $sportNews);
+ }
$culturaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_CULTURA),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>4)
);
+ if (sizeof($culturaNews)>0){
+ $culturaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $culturaNews);
+ }
$ristorantiNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_RISTORANTI),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>4)
);
+ if (sizeof($ristorantiNews)>0){
+ $ristorantiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ristorantiNews);
+ }
$lastsNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED),
array("sort"=>array("about.data"=>-1),"limit"=>5)
);
+ if (sizeof($lastsNews)>0){
+ $lastsNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $lastsNews);
+ }
+
$gossipNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_GOSSIP),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>2)
);
+ if (sizeof($gossipNews)>0){
+ $gossipNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $gossipNews);
+ }
$lastViaggi = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_VIAGGI),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1))
);
+ if (!is_null($lastViaggi)){
+ $lastViaggi->testo = strip_tags($lastViaggi->testo);
+ $lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
+ }
// var_dump($politicaNews);
// if(sizeof($politicaNews)<=0){
// echo "non trovateee!!!!";
@@ -200,14 +230,14 @@ catch (Exception $ex){
0){
foreach ($culturaNews as $cultura){
- $string = (strlen($cultura->titolo) > 103) ? substr($cultura->titolo,0,100).'...' : $cultura->titolo;?>
+ $string = (strlen($cultura->titolo) > 53) ? substr($cultura->titolo,0,50).'...' : $cultura->titolo;?>
renderMedia();?>
-
-
Leggi
+
+
@@ -221,14 +251,14 @@ catch (Exception $ex){
0){
foreach ($ristorantiNews as $ristoranti){
- $string = (strlen($ristoranti->titolo) > 103) ? substr($ristoranti->titolo,0,100).'...' : $ristoranti->titolo;?>
- titolo) > 53) ? substr($ristoranti->titolo,0,50).'...' : $ristoranti->titolo;?>
+
renderMedia();?>
-
-
Leggi
+
+
titolo) > 103) ? substr($last->titolo,0,100).'...' : $last->titolo;?>
diff --git a/public/js/functions.js b/public/js/functions.js
index 309c53e..665e1bf 100644
--- a/public/js/functions.js
+++ b/public/js/functions.js
@@ -10,4 +10,20 @@ function openPagePost(page, request, blank){
function bannerClick(banner, link){
$.ajax({url: "stats/bannerClick.php", method: "POST", data: { "banner": banner, "source": window.location.href }, dataType: "html" });
window.open(link);
+}
+
+function shareOnFacebook(id){
+
+// var link="http://www.ifattidinapoli.it/Giornale/all/"+sezione+".php?id="+id;
+ var link="http://www.ifattidinapoli.it/Giornale/all/fbMetadata.php?id="+id;
+ var url="http://www.facebook.com/sharer.php?u="+encodeURIComponent(link);
+ window.open(url);
+}
+
+
+//http://twitter.com/home?source=ichc&status=%22Lucky+Fail%22 - http%3A%2F%2Ftwlol.com%2Ftw%2F%3Fv7-35104 %23lol+%23fail
+function twitterPost(sezione,id,titolo){
+ var link=titolo+" - http://www.ifattidinapoli.it/Giornale/all/"+sezione+".php?id="+id;
+ var url="http://twitter.com/home?source=ifdn&status="+encodeURIComponent(link);
+ window.open(url);
}
\ No newline at end of file
diff --git a/public/style/public.css b/public/style/public.css
index 48ff1fe..bbc29bb 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -156,7 +156,7 @@ body{font-family:lato, arial;}
.titleContainer > .categoryTitle{font-weight:bold; font-size:15px;}
.titleContainer > .culturaLine{height: 3px;background-color: #339cd5;}
-.culturaNews{
+.ristorantiBlock, .culturaNews{
text-align:center;
margin-top: 5px;
margin-bottom:10px;
@@ -166,6 +166,7 @@ body{font-family:lato, arial;}
border-left:0px;
max-height:165px;
}
+.ristorantiBlock:last-child{border-bottom:none;}
.culturaMainMedia{
overflow: hidden;
text-align: center;
@@ -174,7 +175,8 @@ body{font-family:lato, arial;}
}
.culturaMainMedia > img{max-height: 100px;}
-.culturaNews > .newsTitle{margin-bottom:5px;}
+.ristorantiTitle, .culturaTitle{font-weight: bold;text-align: left;font-size: 12px;}
+.ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;}
.middleBanner{max-height:165px;}
.middleBanner > img{max-height:100px;max-width:220px;}
@@ -187,11 +189,14 @@ body{font-family:lato, arial;}
.middleRightBanner > img{max-width:220px; max-heigth:200px;}
.lastContainer{max-height:120px;margin-top:5px;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;}
+.lastContainer:last-child {border-bottom: none;}
.lastData{font-size:12px;}
-.lastTitle{font-size:12px;font-weight:bold;margin-bottom:5px;}
-.lastTitle > a{color:#64bff0;}
+.lastTitle{font-size:12px;font-weight:bold;}
+.lastContinua{text-align:right; font-size:12px;font-weight:bold;padding-bottom:5px;}
+.lastContinua a{color:#64bff0;}
.gossipContainer{max-height:120px;margin-top:5px;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;}
+.gossipContainer#gossip_2{border-bottom:none;}
.gossipTitle{margin-bottom:5px;font-weight:bold;font-size:20px;}
.gossipSubtitle{margin-bottom:5px;color:#64bff0;font-weight:bold;font-size:15px;}