diff --git a/.docker/images/php/cron/Dockerfile b/.docker/images/php/cron/Dockerfile index bf8be24b3..a8b565f0c 100644 --- a/.docker/images/php/cron/Dockerfile +++ b/.docker/images/php/cron/Dockerfile @@ -6,6 +6,7 @@ COPY ./images/php/cron/bin/ /usr/bin/ COPY ./images/php/fpm/conf.d/policy.xml /etc/ImageMagick-6/policy.xml RUN chmod +x /usr/bin/start-cron.sh RUN chmod +x /usr/bin/set-env.sh +RUN chmod +x /usr/bin/psc-cron-run.sh RUN chmod 0600 /etc/cron.d/psc RUN apt-get update && apt-get install -y cron rsyslog diff --git a/.docker/images/php/cron/bin/psc-cron-run.sh b/.docker/images/php/cron/bin/psc-cron-run.sh new file mode 100644 index 000000000..e00490f81 --- /dev/null +++ b/.docker/images/php/cron/bin/psc-cron-run.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Check if a cache clear was requested via flag file +if [ -f /tmp/psc_clear_cache ]; then + rm -f /tmp/psc_clear_cache + /usr/local/bin/php /data/www/new/bin/clear-cache.php 2>&1 +fi + +/usr/local/bin/php /data/www/new/bin/console application:queue:doEveryMinute diff --git a/.docker/images/php/cron/conf.d/psc b/.docker/images/php/cron/conf.d/psc index e7644acd6..0440c80b0 100644 --- a/.docker/images/php/cron/conf.d/psc +++ b/.docker/images/php/cron/conf.d/psc @@ -5,7 +5,7 @@ BASH_ENV=/container.env * * * * * root chmod -R 0777 /data/www/old/market/steplayouter >> /var/log/cron.log 2>&1 * * * * * root chmod -R 0777 /data/www/new/web/uploads/media >> /var/log/cron.log 2>&1 * * * * * root chmod -R 0777 /data/www/new/web/media >> /var/log/cron.log 2>&1 -* * * * * www-data cd /data/www/new/web && /usr/local/bin/php /data/www/new/bin/console application:queue:doEveryMinute >> /var/log/cron.log 2>&1 +* * * * * www-data cd /data/www/new/web && /usr/bin/psc-cron-run.sh >> /var/log/cron.log 2>&1 @daily www-data cd /data/www/new/web && /usr/local/bin/php /data/www/new/bin/console application:queue:doEveryDay >> /var/log/cronD.log 2>&1 @hourly www-data cd /data/www/new/web && /usr/local/bin/php /data/www/new/bin/console application:queue:doEveryHour >> /var/log/cronH.log 2>&1 # diff --git a/src/new/bin/clear-cache.php b/src/new/bin/clear-cache.php new file mode 100644 index 000000000..740e826ed --- /dev/null +++ b/src/new/bin/clear-cache.php @@ -0,0 +1,64 @@ +#!/usr/bin/env php +&1', + PHP_BINARY, + escapeshellarg($consolePath), + escapeshellarg($env) +); + +echo "Running cache:warmup...\n"; +$output = []; +$returnCode = 0; +exec($command, $output, $returnCode); + +if ($returnCode !== 0) { + echo "cache:warmup failed (exit code $returnCode):\n"; + echo implode("\n", $output) . "\n"; + + // Rollback: alten Cache wiederherstellen + if (!is_dir($cacheDir)) { + @rename($oldCacheDir, $cacheDir); + echo "Rolled back to old cache.\n"; + } + exit(1); +} + +echo "cache:warmup completed.\n"; + +// 3. Altes Cache-Verzeichnis im Hintergrund löschen +$rmCommand = sprintf('rm -rf %s &', escapeshellarg($oldCacheDir)); +exec($rmCommand); + +echo "Old cache cleanup started in background.\n"; +echo "Cache clear completed successfully.\n"; diff --git a/src/new/config/reference.php b/src/new/config/reference.php index a52f4b18b..848c5bec1 100644 --- a/src/new/config/reference.php +++ b/src/new/config/reference.php @@ -476,7 +476,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param; * datetime?: array{ * default_format?: scalar|Param|null, // Default: "Y-m-d\\TH:i:sP" * default_deserialization_formats?: list, - * default_timezone?: scalar|Param|null, // Default: "Europe/Berlin" + * default_timezone?: scalar|Param|null, // Default: "UTC" * cdata?: scalar|Param|null, // Default: true * }, * array_collection?: array{ @@ -576,7 +576,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param; * datetime?: array{ * default_format?: scalar|Param|null, // Default: "Y-m-d\\TH:i:sP" * default_deserialization_formats?: list, - * default_timezone?: scalar|Param|null, // Default: "Europe/Berlin" + * default_timezone?: scalar|Param|null, // Default: "UTC" * cdata?: scalar|Param|null, // Default: true * }, * array_collection?: array{ diff --git a/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php b/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php index ddea433d2..290894131 100755 --- a/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php +++ b/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php @@ -1,16 +1,5 @@ - * @copyright 2012-2013 PrintshopCreator GmbH - * @license Private - * @link http://www.printshopcreator.de - */ - namespace PSC\Shop\CmsBundle\Controller\Backend; use Doctrine\ODM\MongoDB\DocumentManager; @@ -155,7 +144,6 @@ class EditController extends AbstractController ) { $customFields = $fieldService->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Cms); $customGroups = $fieldService->getGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Cms); - dump($customGroups); $selectedShop = $shopService->getSelectedShop(); /** @var Cms $cms */ @@ -210,6 +198,8 @@ class EditController extends AbstractController $cms->getTitle(), 'CMS Site saved', ); + } else { + dump($form->getErrors()); } return array( diff --git a/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php b/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php index af03a470c..ebbf7b9f9 100755 --- a/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php +++ b/src/new/src/PSC/Shop/CmsBundle/Form/Backend/CmsType.php @@ -23,6 +23,7 @@ use PSC\Shop\ThemeBundle\Core\ThemeHolderInterface; use PSC\Shop\ThemeBundle\Core\ThemeSource; use PSC\Shop\ThemeBundle\Core\ThemeSourceInterface; use PSC\System\PluginBundle\Form\Chain\Field; +use PSC\System\PluginBundle\Form\Interfaces\CustomFormGroup; use PSC\System\SettingsBundle\Service\Language; use PSC\System\SettingsBundle\Service\Shop; use Spiriit\Bundle\FormFilterBundle\Filter\Query\QueryInterface; @@ -161,9 +162,14 @@ class CmsType extends AbstractType ]); /** @var \PSC\System\PluginBundle\Form\Interfaces\Field $field */ foreach ($this->fields->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Cms) as $field) { - $var = $field->buildForm($this->formFactory->createNamedBuilder($field->getGroup(), FormType::class, null, [ - 'mapped' => false, - ]), $options); + $var = $field->buildForm($this->formFactory->createNamedBuilder( + $field instanceof CustomFormGroup ? $field->getCustomFormGroup() : $field->getGroup(), + FormType::class, + null, + [ + 'mapped' => false, + ], + ), $options); if ($var->count() > 0) { $builder->add($var); } @@ -210,6 +216,7 @@ class CmsType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ + 'allow_extra_fields' => true, 'data_class' => 'PSC\Shop\EntityBundle\Entity\Cms', ]); } diff --git a/src/new/src/PSC/Shop/CmsBundle/Form/Field/HtmlTextContent.php b/src/new/src/PSC/Shop/CmsBundle/Form/Field/HtmlTextContent.php index ee898f97f..ea1579d19 100644 --- a/src/new/src/PSC/Shop/CmsBundle/Form/Field/HtmlTextContent.php +++ b/src/new/src/PSC/Shop/CmsBundle/Form/Field/HtmlTextContent.php @@ -3,13 +3,14 @@ namespace PSC\Shop\CmsBundle\Form\Field; use PSC\Libraries\AceEditorBundle\Form\Extension\AceEditorType; +use PSC\System\PluginBundle\Form\Interfaces\CustomFormGroup; use PSC\System\PluginBundle\Form\Interfaces\Field; use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; #[AutoconfigureTag('psc.backend.custom.fields')] -class HtmlTextContent implements Field +class HtmlTextContent implements Field, CustomFormGroup { public function getModule(): int { @@ -21,6 +22,11 @@ class HtmlTextContent implements Field return 'html'; } + public function getCustomFormGroup(): string + { + return 'text'; + } + public function getTemplate(): string { return '@PSCShopCms/backend/edit/fields/html_content.html.twig'; @@ -55,7 +61,7 @@ class HtmlTextContent implements Field { $data = $event->getData(); if ($data->getEditorMode() == 'html') { - $event->getForm()->get('html')->get('text')->setData($data->getText()); + $event->getForm()->get('text')->get('text')->setData($data->getText()); } } @@ -67,7 +73,7 @@ class HtmlTextContent implements Field { $data = $event->getData(); if ($data->getEditorMode() == 'html') { - $data->setText($event->getForm()->get('html')->get('text')->getData()); + $data->setText($event->getForm()->get('text')->get('text')->getData()); } } } diff --git a/src/new/src/PSC/Shop/CmsBundle/Form/Field/WysiwygTextContent.php b/src/new/src/PSC/Shop/CmsBundle/Form/Field/WysiwygTextContent.php index 2bc5b016a..3d5ab6ff2 100644 --- a/src/new/src/PSC/Shop/CmsBundle/Form/Field/WysiwygTextContent.php +++ b/src/new/src/PSC/Shop/CmsBundle/Form/Field/WysiwygTextContent.php @@ -2,6 +2,7 @@ namespace PSC\Shop\CmsBundle\Form\Field; +use PSC\System\PluginBundle\Form\Interfaces\CustomFormGroup; use PSC\System\PluginBundle\Form\Interfaces\Field; use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag; use Symfony\Component\Form\Extension\Core\Type\TextareaType; @@ -9,7 +10,7 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; #[AutoconfigureTag('psc.backend.custom.fields')] -class WysiwygTextContent implements Field +class WysiwygTextContent implements Field, CustomFormGroup { public function getModule(): int { @@ -21,6 +22,11 @@ class WysiwygTextContent implements Field return 'wysiwyg'; } + public function getCustomFormGroup(): string + { + return 'text'; + } + public function getTemplate(): string { return '@PSCShopCms/backend/edit/fields/text_content.html.twig'; @@ -43,7 +49,7 @@ class WysiwygTextContent implements Field { $data = $event->getData(); if ($data->getEditorMode() == 'wysiwyg') { - $event->getForm()->get('wysiwyg')->get('text')->setData($data->getText()); + $event->getForm()->get('text')->get('text')->setData($data->getText()); } } @@ -53,9 +59,10 @@ class WysiwygTextContent implements Field public function formSubmit(FormEvent $event): void { + dump($event); $data = $event->getData(); if ($data->getEditorMode() == 'wysiwyg') { - $data->setText($event->getForm()->get('wysiwyg')->get('text')->getData()); + $data->setText($event->getForm()->get('text')->get('text')->getData()); } } } diff --git a/src/new/src/PSC/Shop/CmsBundle/Resources/views/backend/edit/create.html.twig b/src/new/src/PSC/Shop/CmsBundle/Resources/views/backend/edit/create.html.twig index 015c19b3b..f121e3754 100755 --- a/src/new/src/PSC/Shop/CmsBundle/Resources/views/backend/edit/create.html.twig +++ b/src/new/src/PSC/Shop/CmsBundle/Resources/views/backend/edit/create.html.twig @@ -166,24 +166,31 @@ {% for customGroup in customGroups %} - + {% if customGroup.editorMode is defined and customGroup.editorMode %} + {% if cms.editorMode in customGroup.editorMode|split(',') %} + + {% endif %} + {% else %} + + {% endif %} {% endfor %} - {% for customField in customFields %} - {% if customField.getTemplate %} - {{ include(customField.getTemplate, { 'form': form }) }} - {% endif %} - {% endfor %} -
+ {# Löschen - ROT #} + + + + + Uploads Löschen +
diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig index 08df74fd3..d299f4f3b 100755 --- a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig +++ b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/list/index.html.twig @@ -135,14 +135,7 @@
- {# Löschen - ROT #} - - - - - Löschen - - {# Download - GRÜN #} + {# Download - GRÜN #} diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/upload/delete_all.html.twig b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/upload/deleteall.html.twig old mode 100755 new mode 100644 similarity index 100% rename from src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/upload/delete_all.html.twig rename to src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/upload/deleteall.html.twig diff --git a/src/new/src/PSC/Shop/QueueBundle/Command/DoEveryMinuteCommand.php b/src/new/src/PSC/Shop/QueueBundle/Command/DoEveryMinuteCommand.php index f899fad45..92a053429 100644 --- a/src/new/src/PSC/Shop/QueueBundle/Command/DoEveryMinuteCommand.php +++ b/src/new/src/PSC/Shop/QueueBundle/Command/DoEveryMinuteCommand.php @@ -136,8 +136,7 @@ class DoEveryMinuteCommand extends Command if ($event instanceof ClearCache) { $fs = new Filesystem(); - - //$fs->remove($this->kernel->getCacheDir()); + $fs->dumpFile('/tmp/psc_clear_cache', '1'); } elseif ($event instanceof InstallPlugin) { $event->setData($job->getData()); $event->setShop($job->getShop()); diff --git a/src/new/src/PSC/Shop/QueueBundle/Type/Mail.php b/src/new/src/PSC/Shop/QueueBundle/Type/Mail.php index 0691c6d18..872ba1952 100755 --- a/src/new/src/PSC/Shop/QueueBundle/Type/Mail.php +++ b/src/new/src/PSC/Shop/QueueBundle/Type/Mail.php @@ -55,6 +55,7 @@ use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mailer\MailerInterface; +use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; use Symfony\Component\Mime\Message; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; @@ -365,7 +366,9 @@ class Mail implements QueueInterface, ConfigurableElementInterface $subject = $this->_template->createTemplate($mailDoc->getSubject()); $from = $this->_template->createTemplate($mailDoc->getFrom()); + $fromName = $this->_template->createTemplate($mailDoc->getFromName()); $to = $this->_template->createTemplate($mailDoc->getTo()); + $toName = $this->_template->createTemplate($mailDoc->getToName()); $text = null; $html = null; $bcc = null; @@ -397,8 +400,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -479,8 +492,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -554,8 +577,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -631,8 +664,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -705,8 +748,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to($to->render($params)); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -749,8 +802,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($templateVars->getPosTwigVars($position->getUuid()))) - ->from($from->render($templateVars->getPosTwigVars($position->getUuid()))) - ->to($to->render($templateVars->getPosTwigVars($position->getUuid()))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($templateVars->getPosTwigVars($position->getUuid()))); } @@ -919,8 +982,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new TemplatedEmail() ->subject($subject->render($templateVars->getTwigVars())) - ->from($from->render($templateVars->getTwigVars())) - ->to(trim($to->render($templateVars->getTwigVars()))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($templateVars->getTwigVars())); } @@ -1052,8 +1125,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -1120,8 +1203,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($params)) - ->from($from->render($params)) - ->to(trim($to->render($params))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($params)); } @@ -1177,8 +1270,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($vars)) - ->from($from->render($vars)) - ->to(trim($to->render($vars))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($vars)); } @@ -1296,8 +1399,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($vars)) - ->from($from->render($vars)) - ->to(trim($to->render($vars))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($vars)); } @@ -1411,8 +1524,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($vars)) - ->from($from->render($vars)) - ->to(trim($to->render($vars))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($vars)); } @@ -1531,8 +1654,18 @@ class Mail implements QueueInterface, ConfigurableElementInterface try { $message = new Email() ->subject($subject->render($vars)) - ->from($from->render($vars)) - ->to(trim($to->render($vars))); + ->from( + new Address( + $from->render($templateVars->getTwigVars()), + $fromName->render($templateVars->getTwigVars()), + ), + ) + ->to( + new Address( + $to->render($templateVars->getTwigVars()), + $toName->render($templateVars->getTwigVars()), + ), + ); if ($text) { $message->text($text->render($vars)); } diff --git a/src/new/src/PSC/System/PluginBundle/Controller/Backend/ListController.php b/src/new/src/PSC/System/PluginBundle/Controller/Backend/ListController.php index 817e258b2..186a53502 100755 --- a/src/new/src/PSC/System/PluginBundle/Controller/Backend/ListController.php +++ b/src/new/src/PSC/System/PluginBundle/Controller/Backend/ListController.php @@ -53,12 +53,21 @@ class ListController extends AbstractController */ #[Route(path: '/cache/clear', name: 'psc_system_plugin_backend_clear_cache')] #[Template('@PSCSystemPlugin/backend/list/clearcache.html.twig')] - public function clearcacheAction(Assets $assetsService) + public function clearcacheAction(Assets $assetsService, \PSC\Shop\QueueBundle\Service\Event\Manager $eventManager, KernelInterface $kernel) { $assetsService->install(); - $fs = new Filesystem(); - $fs->remove($this->getParameter('kernel.cache_dir')); + + // Cache atomar über externes Script leeren (ohne laufende Prozesse zu stören) + $script = $kernel->getProjectDir() . '/bin/clear-cache.php'; + $command = sprintf('%s %s 2>&1 &', PHP_BINARY, escapeshellarg($script)); + exec($command); + + // Cron-Container benachrichtigen + $notify = new ClearCache(); + $notify->setShop(null); + $eventManager->addJob($notify); + header('location: /apps/backend/plugin/list'); die(); } diff --git a/src/new/src/PSC/System/PluginBundle/Form/Interfaces/CustomFormGroup.php b/src/new/src/PSC/System/PluginBundle/Form/Interfaces/CustomFormGroup.php new file mode 100644 index 000000000..f8624ee75 --- /dev/null +++ b/src/new/src/PSC/System/PluginBundle/Form/Interfaces/CustomFormGroup.php @@ -0,0 +1,8 @@ +enable = false; $contact->Install = $this->shop->Install; $contact->account_id = $this->shop->default_account; + if (isset($formData['rech']['account'])) { + $contact->account_id = $formData['rech']['account']; + } if ($this->_getParam('hn', false)) { $account = Doctrine_Query::create() @@ -5004,9 +5007,7 @@ class UserController extends TP_Controller_Action $basket->clear(); } - public function cregisterAction() - { - } + public function cregisterAction() {} /** * LayouterLoginaktion