diff --git a/private/bin/regenerateAutoUrlsForIndexing.php b/private/bin/regenerateAutoUrlsForIndexing.php index 7dbf99e..893b8fc 100644 --- a/private/bin/regenerateAutoUrlsForIndexing.php +++ b/private/bin/regenerateAutoUrlsForIndexing.php @@ -18,6 +18,7 @@ while (sizeof($notizie)>0 ){ GlobalVariables::get("dao")->save($notizia); } $options['skip']+=$options['limit']; + $notizie = GlobalVariables::get("dao")->query("NotiziaModel", [], $options); } ?> \ No newline at end of file diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php index 19f8a93..303b8c7 100644 --- a/private/lib/dao/models/NotiziaModel.php +++ b/private/lib/dao/models/NotiziaModel.php @@ -86,6 +86,23 @@ class NotiziaModel extends HasMediaModel{ $eles = array_slice($eles, 0, 15); $this->shortenedUrl = implode("_", $eles); } + + public function getAbsoluteUrl(){ + $link = "articolo_".strval($this->id); + if ($this->hasProperty("shortenedUrl")){ + $link = "art_".$this->shortenedUrl.".html"; + } + + GUIHandler::getBaseUrl().$link; + } + public function getAbsoluteMobileUrl(){ + $link = "articolo_".strval($this->id); + if ($this->hasProperty("shortenedUrl")){ + $link = "art_".$this->shortenedUrl; + } + + GUIHandlerMobile::getBaseUrl().$link; + } } ?> diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php index c8fdb93..1636480 100644 --- a/private/lib/gui/GUIHandler.php +++ b/private/lib/gui/GUIHandler.php @@ -252,11 +252,11 @@ class GUIHandler { foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){ if(!$data["mainMenu"] && !$data["hidden"] && is_null($data["isSubmenu"])){ if(strcasecmp($data["label"],NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_ANIMALI]["label"])==0){?> -
  • -
  • >
  • -
  • >
  • +
  • +
  • >
  • +
  • >
  • -
  • +
  • about->data->sec)." ".$mesi[date("n",$articolo->about->data->sec)]." ".date("Y",$articolo->about->data->sec)." ".date("H:i",$articolo->about->data->sec); $config = GlobalVariables::get("config"); - $directLink = $config->pages->remoteLocationPath."articolo_".$articolo->id; - $mobileLink = GUIHandlerMobile::getBaseUrl()."articolo_".$articolo->id; +// $directLink = $config->pages->remoteLocationPath."articolo_".$articolo->id; +// $mobileLink = GUIHandlerMobile::getBaseUrl()."articolo_".$articolo->id; + $directLink = $articolo->getAbsoluteUrl(); + $mobileLink = $articolo->getAbsoluteMobileUrl(); $additionalHeaders = array(); $additionalHeaders[] = ''; diff --git a/public/index.php b/public/index.php index f838c96..1f7b8ca 100644 --- a/public/index.php +++ b/public/index.php @@ -183,7 +183,7 @@ catch (Exception $ex){ renderMedia();?> - +