* rel="nofollow" und target="_blank" für verschiedene externe Links

* Mindestpreis im Slider oben im Reiseprogramm nicht anzeigen, wenn keine Termine vorhanden sind * Tripodo-Export git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3315 f459cee4-fb09-11de-96c3-f9c5f16c3c76
2017-03-14 08:01:57 +00:00 · 2017-03-14 08:01:57 +00:00 · b8ec81329a
commit b8ec81329a
parent 42c55d44a1
17 changed files with 380 additions and 18 deletions
--- a/trunk/src/AppBundle/Command/TripodoExportCommand.php
+++ b/trunk/src/AppBundle/Command/TripodoExportCommand.php
@ -0,0 +1,78 @@
+<?php
+/**
+ * @author Ulrich Hecht <ulrich.hecht@hecht-software.de>
+ * @date 03/10/2017
+ */
+
+namespace AppBundle\Command;
+
+
+use AppBundle\Util;
+use Doctrine\ORM\EntityManager;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TripodoExportCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this->setName('sterntours:export-tripodo');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        /** @var EntityManager $em */
+        $em = $this->getContainer()->get('doctrine')->getManager();
+        $regex = '/(\(\s*)?(((https?:\/\/)?www\.stern-?tours\.de[^\s\)]*)|([^\s]+@stern-?tours\.de)|(030\s*(-\s*)?700\s*94\s*100))(\s*\))?/';
+        $baseUrl = 'https://www.sterntours.de';
+        $xml = '<?xml version="1.0" encoding="UTF-8"?>' ."\n<travels>\n";
+
+        $travelPrograms = $em->getRepository('AppBundle:TravelProgram')->getProgramsToExport();
+        foreach ($travelPrograms as $travelProgram)
+        {
+            $em->getRepository('AppBundle:TravelPeriod')->getTrueTravelPeriods($travelProgram);
+            $vars = [
+                'travel_program' => $travelProgram,
+                'base_url' => $this->getContainer()->getParameter('base_url'),
+            ];
+
+            // Link / E-Mail / Tel. zu Stern Tours entfernen
+            $vars['html_description'] = preg_replace($regex, '', $travelProgram->getHtmlDescription());
+            $vars['included'] = preg_replace($regex, '', $travelProgram->getIncluded());
+            $vars['advices'] = preg_replace($regex, '', $travelProgram->getAdvices());
+
+            $vars['included'] = Util::convertUrisInHtmlToAbsolute($vars['included'], $baseUrl);
+            $vars['advices'] =  Util::convertUrisInHtmlToAbsolute($vars['advices'], $baseUrl);
+            $vars['subtitle'] = Util::convertUrisInHtmlToAbsolute($travelProgram->getSubtitle(), $baseUrl);
+
+            // Video-Link entfernen
+            $vars['html_description'] = preg_replace('/<p>\s*<a.*?href\s*="#".*?<\/a>\s*<\/p>/', '', $vars['html_description']);
+
+            // Überschriften hervorheben
+            $vars['html_description'] = preg_replace('/<h2>(.*?)<\/h2>/', '<p><b>\1</b></p>', $vars['html_description']);
+            $vars['html_description'] = preg_replace('/<h3>(.*?)<\/h3>/', '<p><b>\1</b></p>', $vars['html_description']);
+
+            $vars['html_description'] = Util::convertUrisInHtmlToAbsolute(
+                html_entity_decode($vars['html_description'], ENT_COMPAT, 'UTF-8'), $baseUrl);
+            
+
+            $xml .= $this->getContainer()->get('templating')->render('default/tripodo.xml.twig', $vars);
+        }
+        $xml .= '</travels>';
+
+        file_put_contents('travels.xml', $xml);
+        return;
+        $conn = ftp_connect($this->getContainer()->getParameter('tripodo_host'));
+        if(ftp_login($conn, $this->getContainer()->getParameter('tripodo_user'),
+            $this->getContainer()->getParameter('tripodo_pass')))
+        {
+            $stream = fopen('travels.xml', 'r');
+            ftp_fput($conn, 'travels.xml', $stream, FTP_BINARY);
+            fclose($stream);
+        }
+        ftp_close($conn);
+    }
+
+
+}
--- a/trunk/src/AppBundle/Entity/TravelCountry.php
+++ b/trunk/src/AppBundle/Entity/TravelCountry.php
@ -50,6 +50,11 @@ class TravelCountry
     */
    private $programs;

+    /**
+     * @ORM\OneToMany(targetEntity="AppBundle\Entity\TravelDestination", mappedBy="country")
+     */
+    private $destinations;
+


    /**
@ -181,4 +186,38 @@ class TravelCountry
    }


+
+    /**
+     * Add destination
+     *
+     * @param \AppBundle\Entity\TravelDestination $destination
+     *
+     * @return TravelCountry
+     */
+    public function addDestination(\AppBundle\Entity\TravelDestination $destination)
+    {
+        $this->destinations[] = $destination;
+
+        return $this;
+    }
+
+    /**
+     * Remove destination
+     *
+     * @param \AppBundle\Entity\TravelDestination $destination
+     */
+    public function removeDestination(\AppBundle\Entity\TravelDestination $destination)
+    {
+        $this->destinations->removeElement($destination);
+    }
+
+    /**
+     * Get destinations
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getDestinations()
+    {
+        return $this->destinations;
+    }
 }
--- a/trunk/src/AppBundle/Entity/TravelDate.php
+++ b/trunk/src/AppBundle/Entity/TravelDate.php
@ -6,6 +6,7 @@

 namespace AppBundle\Entity;
 use AppBundle\Util\DepartureUtil;
+use Doctrine\Common\Collections\ArrayCollection;

 /**
 * TravelDate is a wrapper for TravelPeriod + start date and end date. This entity doesn't represent a database
@ -89,10 +90,16 @@ final class TravelDate
            }
            $this->start = $start;
            $this->index = $index;
+            $this->prices = [];
+            foreach ($travelPeriod->getPrices() as $price)
+            {
+                $this->prices[$price->getPriceTypeId()] = clone $price;
+            }
        }
        else
        {
            $this->start = $travelPeriod->getStartDate();
+            $this->prices = $travelPeriod->getPrices();
        }
        $this->flightPeriod = $flightPeriod;
        $this->travelProgram = $travelPeriod->getProgram();
@ -223,14 +230,14 @@ final class TravelDate
                $profitMargin = $this->travelProgram->getProfitMargin() / 100 + 1;
            }
            $currencyFactor = $this->travelProgram->getNettoPricesInEuro() ? 1 : $this->currencyFactor;
-            foreach ($this->travelPeriod->getPrices() as $price)
+            foreach ($this->prices as &$price)
            {
                $price->setEffectivePrice(round(($flightPrice + $price->getPrice() * $currencyFactor) * $profitMargin));
                $price->setEffectiveComfortPrice(round($price->getPriceComfort() * $currencyFactor * $profitMargin));
                $price->setEffectiveChildPrice(round($price->getPriceChildren() * $currencyFactor * $profitMargin));
            }
        }
-        return $this->travelPeriod->getPrices();
+        return $this->prices;
    }

    public function getLowestPrice()
--- a/trunk/src/AppBundle/Entity/TravelDestination.php
+++ b/trunk/src/AppBundle/Entity/TravelDestination.php
@ -31,7 +31,7 @@ class TravelDestination
    /**
     * @var \AppBundle\Entity\TravelCountry
     *
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\TravelCountry")
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\TravelCountry", inversedBy="destinations")
     * @ORM\JoinColumns({
     *   @ORM\JoinColumn(name="country_id", referencedColumnName="id")
     * })
@ -39,7 +39,6 @@ class TravelDestination
    private $country;


-
    /**
     * Set name
     *
--- a/trunk/src/AppBundle/Entity/TravelProgram.php
+++ b/trunk/src/AppBundle/Entity/TravelProgram.php
@ -317,6 +317,15 @@ class TravelProgram
     */
    private $countries;

+    /**
+     * @ORM\ManyToMany(targetEntity="AppBundle\Entity\TravelDestination")
+     * @ORM\JoinTable(name="travel_program_destination",
+     *     joinColumns={@ORM\JoinColumn(name="program_id", referencedColumnName="id")},
+     *     inverseJoinColumns={@ORM\JoinColumn(name="destination_id", referencedColumnName="id")}
+     * )
+     */
+    private $destinations;
+
    /**
     * @ORM\OneToMany(targetEntity="AppBundle\Entity\TravelProgramImage", mappedBy="program")
     */
@ -1509,7 +1518,7 @@ class TravelProgram
    /**
     * Get options
     *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return TravelOption[]|\Doctrine\Common\Collections\Collection
     */
    public function getOptions()
    {
@ -1556,4 +1565,38 @@ class TravelProgram
    {
        return ($this->showMap ?? 0) > 0 && ($this->mapHtml or $this->mapHtml);
    }
+
+    /**
+     * Add destination
+     *
+     * @param \AppBundle\Entity\TravelDestination $destination
+     *
+     * @return TravelProgram
+     */
+    public function addDestination(\AppBundle\Entity\TravelDestination $destination)
+    {
+        $this->destinations[] = $destination;
+
+        return $this;
+    }
+
+    /**
+     * Remove destination
+     *
+     * @param \AppBundle\Entity\TravelDestination $destination
+     */
+    public function removeDestination(\AppBundle\Entity\TravelDestination $destination)
+    {
+        $this->destinations->removeElement($destination);
+    }
+
+    /**
+     * Get destinations
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getDestinations()
+    {
+        return $this->destinations;
+    }
 }
--- a/trunk/src/AppBundle/Entity/TravelProgramRepository.php
+++ b/trunk/src/AppBundle/Entity/TravelProgramRepository.php
@ -2,6 +2,8 @@

 namespace AppBundle\Entity;

+use Doctrine\ORM\Query\Expr;
+
 /**
 * TravelProgramRepository
 *
@ -10,4 +12,26 @@ namespace AppBundle\Entity;
 */
 class TravelProgramRepository extends \Doctrine\ORM\EntityRepository
 {
+    /**
+     * @return TravelProgram[]
+     */
+    public function getProgramsToExport()
+    {
+        return $this->createQueryBuilder('tp')
+            ->innerJoin('tp.page', 'page')
+            ->addSelect('page')
+            ->leftJoin('tp.countries', 'country')
+            ->addSelect('country')
+            ->leftJoin('country.destinations', 'destination')
+            ->addSelect('destination')
+            ->leftJoin('tp.options', 'option')
+            ->addSelect('option')
+            ->leftJoin('tp.images', 'image', Expr\Join::WITH, 'image.type = 1')
+            ->addSelect('image')
+            ->where('tp.status = 1')
+            ->andWhere('tp.programType = '. TravelProgram::ORGANIZED_PROGRAM_TYPE)
+            ->getQuery()
+            ->execute()
+            ;
+    }
 }
--- a/trunk/src/AppBundle/Listener/KernelControllerListener.php
+++ b/trunk/src/AppBundle/Listener/KernelControllerListener.php
@ -117,6 +117,11 @@ class KernelControllerListener

            if ($node)
            {
+                if ($node->getStatus() == 0)
+                {
+                    throw new NotFoundHttpException('Inactive page');
+                }
+
                $request->attributes->set('page', $node);

                if ($restOfPath && $node->getTravelProgram() != null && (
@ -129,6 +134,10 @@ class KernelControllerListener
                }
                elseif ($node->getTravelProgram() != null)
                {
+                    if ($node->getTravelProgram()->getStatus() == 0)
+                    {
+                        throw new NotFoundHttpException('Inactive travel program');
+                    }
                    $request->attributes->set('_controller', 'AppBundle:Cms:travelProgram');
                }
                else
--- a/trunk/src/AppBundle/Util.php
+++ b/trunk/src/AppBundle/Util.php
@ -40,6 +40,19 @@ class Util
        return 'http' . (($_SERVER['SERVER_PORT'] == 443) ? 's://' : '://') .$_SERVER['HTTP_HOST'];
    }

+    public static function convertUrisInHtmlToAbsolute($html, $baseUrl = null)
+    {
+        if ($baseUrl === null)
+        {
+            $baseUrl = self::getBaseUrl();
+        }
+        $phpUri = \phpUri::parse($baseUrl);
+
+        return preg_replace_callback('/(href|src)="((\\\\.|[^"\\\\])*)"/', function($matches) use ($phpUri) {
+            return $matches[1] .'="'. $phpUri->join($matches[2]) .'"';
+        }, $html);
+    }
+
    public static function formatPrice($value)
    {
        return number_format($value, 2, ',', '.') .' €';