From 48f70939b4b63154bfeabd77c406add74a867f09 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Mar 2016 11:20:58 +0100 Subject: [PATCH 1/5] inseriti dati di produzione su importOldData inserito supporto importazione video youtube LEGACY --- private/bin/importOldData.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php index 639b1e4..8ad795e 100644 --- a/private/bin/importOldData.php +++ b/private/bin/importOldData.php @@ -31,7 +31,7 @@ else { GlobalVariables::get("dao")->save($admin); } -$imgDir = "/home/rik/Scrivania/FDN_BAK/mediaimg/notizie"; +$imgDir = "/home/r.didato/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){ @@ -91,6 +91,9 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){ $media->link = $matches[1]; } + else if (preg_match("~http[s]?[:]//www\.youtube\.com/v/(.+)[&]amp.*$~", trim($ele->img), $matches)){ + $media->link = $matches[1]; + } // $media->link = $ele->img; $media = new MediaModel($media); GlobalVariables::get("dao")->save($media); From 261523f539b74c5ab01dd243c5d3099f7d8b3a27 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Mar 2016 11:42:16 +0100 Subject: [PATCH 2/5] Commentata query di test in searchResult --- private/bin/importOldData.php | 3 ++- public/searchResults.php | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php index 8ad795e..b14dd74 100644 --- a/private/bin/importOldData.php +++ b/private/bin/importOldData.php @@ -91,7 +91,8 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){ $media->link = $matches[1]; } - else if (preg_match("~http[s]?[:]//www\.youtube\.com/v/(.+)[&]amp.*$~", trim($ele->img), $matches)){ + // LEGACY FORMAT http://www.youtube.com/v/c0B1snrcoPk&hl=it_IT&fs=1& + else if (preg_match("~http[:]//www\.youtube\.com/v/(.+)[&]amp[;]hl[=]it_IT[&]amp[;]fs[=]1[&]amp[;]$~", trim($ele->img), $matches)){ $media->link = $matches[1]; } // $media->link = $ele->img; diff --git a/public/searchResults.php b/public/searchResults.php index 804ea19..bf39988 100644 --- a/public/searchResults.php +++ b/public/searchResults.php @@ -11,13 +11,13 @@ try { $searchParameters = ""; if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){ - var_dump($_POST["search"]); +// var_dump($_POST["search"]); $searchParameters = strip_tags(PostHandler::get("search")); -// $notizie = GlobalVariables::get("dao")->query("NotiziaModel", -// array("status"=>NotiziaModel::STATUS_ACCEPTED), -// array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) -// ); + $notizie = GlobalVariables::get("dao")->query("NotiziaModel", + array("status"=>NotiziaModel::STATUS_ACCEPTED), + array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) + ); $found = false; $limit=12; $page = 1; @@ -28,7 +28,7 @@ try { } $skip =($page - 1) * $limit; - $notizieAll = GlobalVariables::get("dao")->query("NotiziaModel", + $notizieAll = GlobalVariables::get("dao")->count("NotiziaModel", array("status"=>NotiziaModel::STATUS_ACCEPTED) ); @@ -40,10 +40,10 @@ try { $found = false; } - $notizie = GlobalVariables::get("dao")->query("NotiziaModel", - array("status"=>NotiziaModel::STATUS_ACCEPTED), - array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit) - ); +// $notizie = GlobalVariables::get("dao")->query("NotiziaModel", +// array("status"=>NotiziaModel::STATUS_ACCEPTED), +// array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit) +// ); if (sizeof($notizie)>0){ $found=true; From 5a926adf742ca49b8715fc55e3027eee9419bcbc Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Mar 2016 12:13:07 +0100 Subject: [PATCH 3/5] Correzioni importOldData per video youtube --- private/bin/importOldData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/private/bin/importOldData.php b/private/bin/importOldData.php index b14dd74..2f6d260 100644 --- a/private/bin/importOldData.php +++ b/private/bin/importOldData.php @@ -85,14 +85,14 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass"); if ( preg_match("~^http[s]?[:]//youtu\.be/(.+)$~", trim($ele->img), $matches) ){ $media->link = $matches[1]; } - else if (preg_match("~http[s]?[:]//www\.youtube\.com/embed/([^\"]+)[\"]~", trim($ele->img), $matches)){ + else if (preg_match("~http[s]?[:]//www\.youtube\.com/embed/([^\"]++)~", trim($ele->img), $matches)){ $media->link = $matches[1]; } else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){ $media->link = $matches[1]; } // LEGACY FORMAT http://www.youtube.com/v/c0B1snrcoPk&hl=it_IT&fs=1& - else if (preg_match("~http[:]//www\.youtube\.com/v/(.+)[&]amp[;]hl[=]it_IT[&]amp[;]fs[=]1[&]amp[;]$~", trim($ele->img), $matches)){ + else if (preg_match("~http[:]//www\.youtube\.com/v/([^&]++)~", trim($ele->img), $matches)){ $media->link = $matches[1]; } // $media->link = $ele->img; From 72f9fbeeaa3430b046635b07ea4e35c7f26205d6 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Mar 2016 12:33:45 +0100 Subject: [PATCH 4/5] Fix immagini notizia e video youtube; Fix limit ai risultati di ricerca; Corretto bug che faceva generare mail di attivazioni admin all'infinito; --- private/lib/task/GenerateAdminActivationMailTask.php | 2 ++ public/searchResults.php | 9 +++++---- public/style/public.css | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/private/lib/task/GenerateAdminActivationMailTask.php b/private/lib/task/GenerateAdminActivationMailTask.php index 3553b74..44acc63 100644 --- a/private/lib/task/GenerateAdminActivationMailTask.php +++ b/private/lib/task/GenerateAdminActivationMailTask.php @@ -20,6 +20,8 @@ class GenerateAdminActivationMailTask extends Task { foreach ($admins as $admin){ $mail = FDN_MailHelper::getAdminConfirmMail($admin); GlobalVariables::get("dao")->save($mail); + $admin->activationSent = true; + GlobalVariables::get("dao")->save($admin); } } } diff --git a/public/searchResults.php b/public/searchResults.php index bf39988..33502f2 100644 --- a/public/searchResults.php +++ b/public/searchResults.php @@ -14,10 +14,7 @@ try { // var_dump($_POST["search"]); $searchParameters = strip_tags(PostHandler::get("search")); - $notizie = GlobalVariables::get("dao")->query("NotiziaModel", - array("status"=>NotiziaModel::STATUS_ACCEPTED), - array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) - ); + $found = false; $limit=12; $page = 1; @@ -40,6 +37,10 @@ try { $found = false; } + $notizie = GlobalVariables::get("dao")->query("NotiziaModel", + array("status"=>NotiziaModel::STATUS_ACCEPTED), + array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) + ); // $notizie = GlobalVariables::get("dao")->query("NotiziaModel", // array("status"=>NotiziaModel::STATUS_ACCEPTED), // array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit) diff --git a/public/style/public.css b/public/style/public.css index e063f23..29d68a2 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -310,7 +310,9 @@ display: inline-block; .headArticolo{margin-bottom:25px;} -.articoloMainMedia{display:inline-block;vertical-align:top;width:400px;text-align:center;} +.articoloMainMedia{display:inline-block;vertical-align:top;width:400px;text-align:center; max-height:225px;} +.articoloMainMedia iframe{min-height:180px;} +.articoloMainMedia.mediaContent img{max-height:225px;} .articoloTitle{display:inline-block;width:550px;padding:0px 20px;vertical-align:top;} .articoloTitle > .title{font-size:20px;font-weight:bold;text-transform:uppercase;font-family:"Arial Bold";} From d2e71a36751f84ac0f503eba73795fd40eacaa2d Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Mar 2016 12:38:48 +0100 Subject: [PATCH 5/5] reinserita funzione di search --- public/searchResults.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/searchResults.php b/public/searchResults.php index 33502f2..ce5f71b 100644 --- a/public/searchResults.php +++ b/public/searchResults.php @@ -37,10 +37,11 @@ try { $found = false; } - $notizie = GlobalVariables::get("dao")->query("NotiziaModel", + $notizie = GlobalVariables::get("dao")->search("NotiziaModel",$searchParameters, array("status"=>NotiziaModel::STATUS_ACCEPTED), array("sort"=>array("about.data"=>-1),"limit"=>$limit,"skip"=>$page*$limit) ); + // $notizie = GlobalVariables::get("dao")->query("NotiziaModel", // array("status"=>NotiziaModel::STATUS_ACCEPTED), // array("sort"=>array("about.data"=>-1),"skip"=>$skip,"limit"=>$limit)