diff --git a/oth/docs/install.memo b/oth/docs/install.memo
index 5ddfd3e..72e70e1 100644
--- a/oth/docs/install.memo
+++ b/oth/docs/install.memo
@@ -23,7 +23,7 @@ db.banner.ensureIndex({customer:"text",link:"text"},{default_language: "italian"
db.commenti.ensureIndex({titolo:"text",testo:"text"},{default_language: "italian"})
db.notizia.createIndex({"shortenedUrl": 1})
-db.notizia.createIndex({"about.data": 1, "status":1, "isAnsa":1})
+db.notizia.createIndex({"about.data": 1, "status":1, "isAnsa":1,"about.lastEdit": 1})
db.statistics.createIndex({statType:1,deleted:1,date:1})
db.statistics.createIndex({"user.id":1})
db.statistics.createIndex({"stat.type":1,"content.position":1})
diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index 21e718a..1a3b379 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -398,8 +398,8 @@ class GUIHandler {
// array("sort"=>array("about.data"=>-1))
// );
$lastsNews = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime( strtotime('-2 months') * 1000 ) )),
- array("sort"=>array("about.data"=>-1))
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime( strtotime('-2 months') * 1000 ) )),
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (sizeof($lastsNews)<5){
$missing = 5-sizeof($lastsNews);
@@ -408,8 +408,8 @@ class GUIHandler {
// array("sort"=>array("about.data"=>-1),"limit"=>$missing)
// );
$add = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.data"=>array( '$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) ) ),
- array("sort"=>array("about.data"=>-1),"limit"=>$missing)
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.lastEdit"=>array( '$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) ) ),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>$missing)
);
$lastsNews = array_merge($lastsNews,$add);
}
diff --git a/private/lib/gui/GUIHandlerMobile.php b/private/lib/gui/GUIHandlerMobile.php
index 265a34c..7261f52 100644
--- a/private/lib/gui/GUIHandlerMobile.php
+++ b/private/lib/gui/GUIHandlerMobile.php
@@ -406,14 +406,14 @@ class GUIHandlerMobile {
$lastsNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray)),
- array("sort"=>array("about.data"=>-1))
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (sizeof($lastsNews)<5){
$missing = 5-sizeof($lastsNews);
$add = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray)),
- array("sort"=>array("about.data"=>-1),"limit"=>$missing)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>$missing)
);
$lastsNews = array_merge($lastsNews,$add);
}
diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php
index aeae877..80f8814 100644
--- a/public/admin/addMultimedia.php
+++ b/public/admin/addMultimedia.php
@@ -55,8 +55,11 @@ try{
$media = DaoMediaHandler::createNewTextBasedMedia($saveable);
}
else {
+
$file = $_FILES['data']['tmp_name'];
+// var_dump($_FILES);
$info = pathinfo($_FILES['data']['name']);
+// var_dump($info);
$media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]);
// var_dump($media);
}
diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php
index d107c0c..4b0b82b 100644
--- a/public/admin/editNotizie.php
+++ b/public/admin/editNotizie.php
@@ -68,6 +68,19 @@ try{
$mongoDate = new MongoDB\BSON\UTCDateTime( strtotime($dateString) * 1000);
$notizia->about->data = $mongoDate;
+ $lastEdit = PostHandler::get("lastEdit");
+// var_dump($lastEdit);
+ if(is_null($lastEdit) || strcmp($lastEdit, "")==0){
+ $notizia->about->lastEdit = $notizia->about->data;
+ }
+ else{
+ $dateString = $lastEdit;
+ if(!preg_match("/^[0-9]{2}[-][0-9]{2}[-][0-9]{4} [0-9]{2}[:][0-9]{2}$/", $dateString)){
+ throw new GUIException("Il formato della data inserita non รจ corretto. Per favore segui il seguente formato Date: dd-mm-yyyy hh:ii");
+ }
+ $notizia->about->lastEdit = new MongoDB\BSON\UTCDateTime( strtotime($dateString) * 1000);
+ }
+
if(!$edit){
$notizia->status = NotiziaModel::STATUS_PENDING;
if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){
@@ -142,6 +155,7 @@ try{
about->data->toDateTime()->getTimestamp())." - Ultimo aggiornamento: ".date("d-m-Y H:i",$articolo->about->lastEdit->toDateTime()->getTimestamp());?>
0){?>
style="display:none;">
diff --git a/public/categorySummary.php b/public/categorySummary.php
index ce67037..5f5c34b 100644
--- a/public/categorySummary.php
+++ b/public/categorySummary.php
@@ -34,8 +34,8 @@ try{
$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
// array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.data"=>array('$lte'=>new MongoDate())),
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>10)
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>10)
);
if (sizeof($notizie)>0){
diff --git a/public/index.php b/public/index.php
index 34dea37..1dbd840 100644
--- a/public/index.php
+++ b/public/index.php
@@ -28,8 +28,8 @@ try {
$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
// array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())),
- array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>5));
+ array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>5));
$ansaIds = array();
if (sizeof($ansaNews)>0){
@@ -42,8 +42,8 @@ try {
$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_POLITICA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-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);
@@ -51,8 +51,8 @@ try {
$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-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);
@@ -60,8 +60,8 @@ try {
$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SPORT,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>2)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-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);
@@ -69,8 +69,8 @@ try {
$culturaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CULTURA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-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);
@@ -78,8 +78,8 @@ try {
$ristorantiNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
);
if (sizeof($ristorantiNews)>0){
$ristorantiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ristorantiNews);
@@ -89,14 +89,14 @@ try {
$idArray = array_map(function ($ele){ return new MongoDB\BSON\ObjectID( $ele["_id"]["notizia"] ); }, $stats);
$lastsNews = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime(strtotime('-2 months') * 1000 ))),
- array("sort"=>array("about.data"=>-1))
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime(strtotime('-2 months') * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (sizeof($lastsNews)<4){
$missing = 5-sizeof($lastsNews);
$add = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>$missing)
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>$missing)
);
$lastsNews = array_merge($lastsNews,$add);
}
@@ -107,8 +107,8 @@ try {
$gossipNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_GOSSIP,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>1)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1)
);
if (sizeof($gossipNews)>0){
$gossipNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $gossipNews);
@@ -116,8 +116,8 @@ try {
$professioniNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MESTIERI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>1)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1)
);
if (sizeof($professioniNews)>0){
$professioniNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $professioniNews);
@@ -138,8 +138,8 @@ try {
$lastViaggi = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_VIAGGI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (!is_null($lastViaggi)){
$lastViaggi->testo = strip_tags($lastViaggi->testo);
@@ -149,8 +149,8 @@ try {
$animalNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_ANIMALI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (!is_null($animalNews)){
$animalNews->testo = strip_tags($animalNews->testo);
@@ -159,8 +159,8 @@ try {
$saluteNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SALUTE,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1))
);
if (!is_null($saluteNews)){
$saluteNews->testo = strip_tags($saluteNews->testo);
diff --git a/public/mobile/archivio.php b/public/mobile/archivio.php
index 8840143..71483c2 100644
--- a/public/mobile/archivio.php
+++ b/public/mobile/archivio.php
@@ -52,7 +52,7 @@ try {
// );
$notizieDateAll = GlobalVariables::get("dao")->count("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$gt'=>new MongoDB\BSON\UTCDateTime(strtotime($dateString) * 1000),
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$gt'=>new MongoDB\BSON\UTCDateTime(strtotime($dateString) * 1000),
'$lt'=>new MongoDB\BSON\UTCDateTime(strtotime($dateString." +1 day") * 1000 ) ) )
);
@@ -72,7 +72,7 @@ try {
// array("limit"=>$limit,"skip"=>$skip)
// );
$notizieDate = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED, "about.data"=>array('$gt'=>new MongoDB\BSON\UTCDateTime(strtotime($dateString) * 1000),
+ array("status"=>NotiziaModel::STATUS_ACCEPTED, "about.lastEdit"=>array('$gt'=>new MongoDB\BSON\UTCDateTime(strtotime($dateString) * 1000),
'$lt'=>new MongoDB\BSON\UTCDateTime( strtotime($dateString." +1 day") * 1000 ) ) ),
array("limit"=>$limit,"skip"=>$skip)
);
diff --git a/public/mobile/articolo.php b/public/mobile/articolo.php
index 46ff09d..12ff817 100644
--- a/public/mobile/articolo.php
+++ b/public/mobile/articolo.php
@@ -12,7 +12,7 @@ try {
$articolo = null;
if (array_key_exists("id", $_GET)){
- $articolo = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("id"=>$_GET["id"],"status"=>NotiziaModel::STATUS_ACCEPTED));
+ $articolo = GlobalVariables::get("dao")->getFirst("NotiziaModel",array("id"=>strval($_GET["id"]),"status"=>NotiziaModel::STATUS_ACCEPTED));
}
else if (array_key_exists("short", $_GET) ) {
$short = strval($_GET["short"]);
@@ -195,6 +195,7 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
testo;?>
+
about->data->toDateTime()->getTimestamp())." - Ultimo aggiornamento: ".date("d-m-Y",$articolo->about->lastEdit->toDateTime()->getTimestamp());?>
titolo));
diff --git a/public/mobile/categorySummary.php b/public/mobile/categorySummary.php
index 665ed6b..b5d427c 100644
--- a/public/mobile/categorySummary.php
+++ b/public/mobile/categorySummary.php
@@ -35,8 +35,8 @@ try{
// array("sort"=>array("about.data"=>-1),"limit"=>10)
// );
$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>10)
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>10)
);
diff --git a/public/mobile/index.php b/public/mobile/index.php
index 4483b20..cf4d687 100644
--- a/public/mobile/index.php
+++ b/public/mobile/index.php
@@ -30,8 +30,8 @@ try {
// array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())),
// array("sort"=>array("about.data"=>-1),"limit"=>4));
$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
- array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4));
+ array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4));
$ansaIds = array();
if (sizeof($ansaNews)>0){
$ansaIds = array_map(function($ele){return new MongoDB\BSON\ObjectID($ele->id);}, $ansaNews);
@@ -48,8 +48,8 @@ try {
// );
$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_POLITICA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($politicaNews)>0){
$politicaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $politicaNews);
@@ -62,8 +62,8 @@ try {
// );
$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($cronacaNews)>0){
$cronacaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $cronacaNews);
@@ -76,8 +76,8 @@ try {
// );
$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SPORT,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($sportNews)>0){
$sportNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $sportNews);
@@ -90,8 +90,8 @@ try {
// );
$culturaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CULTURA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-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);
@@ -104,8 +104,8 @@ try {
// );
$foodNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($foodNews)>0){
$foodNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $foodNews);
@@ -118,8 +118,8 @@ try {
// );
$professioniNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_MESTIERI,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($professioniNews)>0){
$professioniNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $professioniNews);
diff --git a/public/mobile/style/public.css b/public/mobile/style/public.css
index 7686c79..657e2ac 100644
--- a/public/mobile/style/public.css
+++ b/public/mobile/style/public.css
@@ -164,6 +164,8 @@ body{font-family:lato, arial;}
text-align:center;
}
+.articoloBody .articoloDataModifica{padding:5px; text-align:left;font-size:9pt;color:#626161;}
+
.socialBarArticolo > a{margin-right:3px;display:inline-block;}
.socialBarArticolo > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;}
diff --git a/public/rss/index.php b/public/rss/index.php
index 435e26e..eb008cb 100644
--- a/public/rss/index.php
+++ b/public/rss/index.php
@@ -11,8 +11,8 @@ try {
$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
- array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.data"=>-1),"limit"=>5));
+ array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>5));
$ansaIds = array();
if (sizeof($notizie)>0){
@@ -24,9 +24,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_POLITICA,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
) );
@@ -35,9 +35,9 @@ try {
array(
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -45,18 +45,18 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_SPORT,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>2)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
array(
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_CULTURA,'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>4)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -64,9 +64,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_RISTORANTI,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>3)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -74,9 +74,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_GOSSIP,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>2)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -84,9 +84,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_VIAGGI,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>1)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -94,9 +94,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_ANIMALI,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>1)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1)
) );
$notizie = array_merge( $notizie, GlobalVariables::get("dao")->query("NotiziaModel",
@@ -104,9 +104,9 @@ try {
"status"=>NotiziaModel::STATUS_ACCEPTED,
"category"=>NotiziaModel::CATEGORY_SALUTE,
'_id'=>array('$nin'=>$ansaIds),
- "about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
+ "about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))
),
- array("sort"=>array("about.data"=>-1),"limit"=>1)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1)
) );
RSSHelper::generateByNotiziaList($notizie);
diff --git a/public/searchResults.php b/public/searchResults.php
index 56115a2..9ed6473 100644
--- a/public/searchResults.php
+++ b/public/searchResults.php
@@ -52,7 +52,7 @@ try {
$notizie = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters,
array("status"=>NotiziaModel::STATUS_ACCEPTED),
- array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$skip)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>$limit,"skip"=>$skip)
);
// $notizie = GlobalVariables::get("dao")->query("NotiziaModel",
diff --git a/public/sitemap.php b/public/sitemap.php
index f686f1f..a83df26 100644
--- a/public/sitemap.php
+++ b/public/sitemap.php
@@ -45,8 +45,8 @@ foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
}
$latestArticles = GlobalVariables::get("dao")->query("NotiziaModel",
- array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) )),
- array("sort"=>array("about.data"=>-1),"limit"=>1000)
+ array("status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ) )),
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>1000)
);
if (sizeof($latestArticles)>0){
diff --git a/public/style/public.css b/public/style/public.css
index 90c8af7..4773ba4 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -391,6 +391,8 @@ display: inline-block;
.articoloTesto{text-align:justify;padding:5px 10px;}
+.articoloDataModifica{padding:5px 10px; text-align:left;font-size:9pt;color:#626161;}
+
.mediasConatiner{border:solid #d6d6d6 1px;}
.headMedias{height:25px;overflow:hidden;border-bottom:solid #d6d6d6 1px;}
.moreMedia{background-color:#94d3f6;padding:3px 30px;float:left;}