Skip to content

GitLab

Commit 98f980c8 authored by Felix's avatar Felix
Browse files
Options

removed fqn

parent d3e1297e
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 231 deletions
includes/bestellvorgang_inc.deprecated.php
View file @ 98f980c8
......@@ -749,7 +749,7 @@ function kuponAnnehmen($coupon)
*/
function getKundenattributeNichtEditierbar(): array
{
\trigger_error(__FUNCTION__ . ' is deprecated.', E_USER_DEPRECATED);
trigger_error(__FUNCTION__ . ' is deprecated.', E_USER_DEPRECATED);
return (new CustomerFields())->getNonEditableFields();
}
......@@ -759,7 +759,7 @@ function getKundenattributeNichtEditierbar(): array
*/
function getNonEditableCustomerFields(): array
{
\trigger_error(__FUNCTION__ . ' is deprecated.', E_USER_DEPRECATED);
trigger_error(__FUNCTION__ . ' is deprecated.', E_USER_DEPRECATED);
return (new CustomerFields())->getNonEditableFields();
}
......
includes/bestellvorgang_inc.php
View file @ 98f980c8
......@@ -749,7 +749,7 @@ function gibStepZahlung()
'kVersandart' => $shippingMethod,
];
}
$selectablePayments = \array_filter(
$selectablePayments = array_filter(
$paymentMethods,
static function ($method) {
$paymentMethod = LegacyMethod::create($method->cModulId);
......@@ -2164,7 +2164,7 @@ function checkKundenFormularArray($data, int $kundenaccount, $checkpass = 1)
}
}
if (isset($data['geburtstag'])) {
$enDate = \DateTime::createFromFormat('Y-m-d', $data['geburtstag']);
$enDate = DateTime::createFromFormat('Y-m-d', $data['geburtstag']);
if (($errCode = Text::checkDate(
$enDate === false ? $data['geburtstag'] : $enDate->format('d.m.Y'),
$conf['kunden']['kundenregistrierung_abfragen_geburtstag'] === 'Y'
......
includes/hooks_inc.php
View file @ 98f980c8
......@@ -1960,7 +1960,7 @@ define('HOOK_CALCULATESHIPPINGFEES', 307);
* @since 5.0.0
* @file includes/src/Cart/Cart.php
* @param int productID
* @param \JTL\Cart\CartItem[] positionItems
* @param CartItem[] positionItems
* @param float qty
*/
define('HOOK_WARENKORB_ERSTELLE_SPEZIAL_POS', 310);
......
includes/letzterInclude.php
View file @ 98f980c8
......@@ -94,7 +94,7 @@ $filters = $NaviFilter->getAvailableContentFilters();
foreach ($filters as $key => $filter) {
if ($filter->getClassName() === 'JTL\Filter\Items\Availability') {
unset($filters[$key]);
\array_unshift($filters, $filter);
array_unshift($filters, $filter);
break;
}
}
......@@ -238,15 +238,15 @@ $debugbar->getTimer()->stopMeasure('init');
$alertHelper = Shop::Container()->getAlertService();
if (isset($cFehler)) {
$alertHelper->addAlert(Alert::TYPE_ERROR, $cFehler, 'miscFehler');
trigger_error('global $cFehler is deprecated.', \E_USER_DEPRECATED);
trigger_error('global $cFehler is deprecated.', E_USER_DEPRECATED);
}
if (isset($cHinweis)) {
$alertHelper->addAlert(Alert::TYPE_NOTE, $cHinweis, 'miscCHinweis');
trigger_error('global $cHinweis is deprecated.', \E_USER_DEPRECATED);
trigger_error('global $cHinweis is deprecated.', E_USER_DEPRECATED);
}
if (isset($hinweis)) {
$alertHelper->addAlert(Alert::TYPE_NOTE, $hinweis, 'miscHinweis');
trigger_error('global $hinweis is deprecated.', \E_USER_DEPRECATED);
trigger_error('global $hinweis is deprecated.', E_USER_DEPRECATED);
}
$tplService->save();
$smarty->assign('bCookieErlaubt', isset($_COOKIE[Frontend::getSessionName()]))
......
newsletter.php
View file @ 98f980c8
......@@ -24,7 +24,7 @@ $alertHelper = Shop::Container()->getAlertService();
$linkHelper = Shop::Container()->getLinkService();
$kLink = $linkHelper->getSpecialPageID(LINKTYP_NEWSLETTER, false);
$valid = Form::validateToken();
$controller = new Controller($db, Shop::getSettings([\CONF_NEWSLETTER]));
$controller = new Controller($db, Shop::getSettings([CONF_NEWSLETTER]));
if ($kLink === false) {
$bFileNotFound = true;
Shop::$kLink = $linkHelper->getSpecialPageID(LINKTYP_404);
......
seite.php
View file @ 98f980c8
......@@ -54,7 +54,7 @@ if ($link->getLinkType() === LINKTYP_STARTSEITE) {
Shop::getLanguageID(),
Frontend::getCustomerGroup()->getID()
));
} elseif (\in_array($link->getLinkType(), [LINKTYP_WRB, LINKTYP_WRB_FORMULAR, LINKTYP_DATENSCHUTZ], true)) {
} elseif (in_array($link->getLinkType(), [LINKTYP_WRB, LINKTYP_WRB_FORMULAR, LINKTYP_DATENSCHUTZ], true)) {
$smarty->assign('WRB', Shop::Container()->getLinkService()->getAGBWRB(
Shop::getLanguageID(),
Frontend::getCustomerGroup()->getID()
......
templates/NOVA/themes/base/fontawesome/metadata/gen_metadata.php
View file @ 98f980c8
<?php
$yamlPath = __DIR__ . '/icons.yml';
$yamlTxt = \file_get_contents($yamlPath);
$yamlTxt = file_get_contents($yamlPath);
$yaml = \Symfony\Component\Yaml\Yaml::parse($yamlTxt);
$faMap = [];
......@@ -21,4 +21,4 @@ foreach ($yaml as $faName => $info) {
}
$faMapTxt = "<?php\n\n\$faTable = " . var_export($faMap, true) . ";\n";
echo $faMapTxt;
\ No newline at end of file
echo $faMapTxt;
update/migrations/20160614152525_add_option_for_xselling_show_parent.php
View file @ 98f980c8
......@@ -24,7 +24,7 @@ class Migration_20160614152525 extends Migration implements IMigration
$this->setConfig(
'artikeldetails_xselling_kauf_parent',
'N',
\CONF_ARTIKELDETAILS,
CONF_ARTIKELDETAILS,
'Immer Vaterartikel anzeigen',
'selectbox',
230,
......
update/migrations/20160713110643_configuration_for_vcard_upload.php
View file @ 98f980c8
......@@ -24,7 +24,7 @@ class Migration_20160713110643 extends Migration implements IMigration
$this->setConfig(
'kundenregistrierung_vcardupload',
'Y',
\CONF_KUNDEN,
CONF_KUNDEN,
'vCard Upload erlauben',
'selectbox',
240,
......
update/migrations/20160921103217_sitemap_ping_conf.php
View file @ 98f980c8
......@@ -25,7 +25,7 @@ class Migration_20160921103217 extends Migration implements IMigration
$this->setConfig(
'sitemap_google_ping',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Sitemap an Google und Bing &uuml;bermitteln nach Export',
'selectbox',
180,
......
update/migrations/20161007143100_adds_options_for_short_description.php
View file @ 98f980c8
......@@ -24,7 +24,7 @@ class Migration_20161007143100 extends Migration implements IMigration
$this->setConfig(
'artikeldetails_kurzbeschreibung_anzeigen',
'Y',
\CONF_ARTIKELDETAILS,
CONF_ARTIKELDETAILS,
'Kurzbeschreibung anzeigen',
'selectbox',
365,
......@@ -39,7 +39,7 @@ class Migration_20161007143100 extends Migration implements IMigration
$this->setConfig(
'artikeluebersicht_kurzbeschreibung_anzeigen',
'N',
\CONF_ARTIKELUEBERSICHT,
CONF_ARTIKELUEBERSICHT,
'Kurzbeschreibung anzeigen',
'selectbox',
315,
......
update/migrations/20170109114728_enable_article_fulltext_search.php
View file @ 98f980c8
......@@ -25,7 +25,7 @@ class Migration_20170109114728 extends Migration implements IMigration
$this->setConfig(
'suche_fulltext',
'N',
\CONF_ARTIKELUEBERSICHT,
CONF_ARTIKELUEBERSICHT,
'Volltextsuche verwenden',
'selectbox',
105,
......@@ -41,7 +41,7 @@ class Migration_20170109114728 extends Migration implements IMigration
$this->setConfig(
'suche_min_zeichen',
'4',
\CONF_ARTIKELUEBERSICHT,
CONF_ARTIKELUEBERSICHT,
'Mindestzeichenanzahl des Suchausdrucks',
'number',
180,
......@@ -60,7 +60,7 @@ class Migration_20170109114728 extends Migration implements IMigration
$this->setConfig(
'suche_min_zeichen',
'4',
\CONF_ARTIKELUEBERSICHT,
CONF_ARTIKELUEBERSICHT,
'Mindestzeichenanzahl des Suchausdrucks',
'number',
180,
......
update/migrations/20170613144859_defaults_for_new_template_settings_in_productlist.php
View file @ 98f980c8
......@@ -27,7 +27,7 @@ class Migration_20170613144859 extends Migration implements IMigration
{
$template = Shop::Container()->getTemplateService()->getActiveTemplate(false);
$config = new Config($template->getDir(), $this->getDB());
$settings = Shop::getSettings([\CONF_TEMPLATE])['template'];
$settings = Shop::getSettings([CONF_TEMPLATE])['template'];
if ($template->getName() === 'Evo' || $template->getParent() === 'Evo') {
if (!isset($settings['productlist']['variation_select_productlist'])) {
$config->updateConfigInDB('productlist', 'variation_select_productlist', 'N');
......
update/migrations/20170928095400_remove_ssl_domain.php
View file @ 98f980c8
......@@ -24,7 +24,7 @@ class Migration_20170928095400 extends Migration implements IMigration
$this->setConfig(
'global_ssl_www',
'',
\CONF_GLOBAL,
CONF_GLOBAL,
'Zertifikat ausgestellt auf',
'selectbox',
541,
......
update/migrations/20171110102354_add_config_ustid_force.php
View file @ 98f980c8
......@@ -26,7 +26,7 @@ class Migration_20171110102354 extends Migration implements IMigration
$this->setConfig(
'shop_ustid_force_remote_check',
'Y',
\CONF_KUNDEN,
CONF_KUNDEN,
'Kundenregistrierung nur mit MIAS-Best&auml;tigung',
'selectbox',
430,
......@@ -45,7 +45,7 @@ class Migration_20171110102354 extends Migration implements IMigration
$this->setConfig(
'shop_ustid_bzstpruefung',
'N',
\CONF_KUNDEN,
CONF_KUNDEN,
'UStID-Nummer Pr&uuml;fung durch MIAS-System aktivieren',
'selectbox',
420,
......@@ -116,7 +116,7 @@ class Migration_20171110102354 extends Migration implements IMigration
$this->setConfig(
'shop_ustid_bzstpruefung',
'N',
\CONF_KUNDEN,
CONF_KUNDEN,
'USt-ID Pr&uuml;fung des Bundeszentralamts f&uuml;r Steuern aktivieren',
'selectbox',
430,
......
update/migrations/20180109100600_add_product_filter_config.php
View file @ 98f980c8
......@@ -22,7 +22,7 @@ class Migration_20180109100600 extends Migration implements IMigration
$this->setConfig(
'tag_filter_type',
'A',
\CONF_NAVIGATIONSFILTER,
CONF_NAVIGATIONSFILTER,
'Typ des Tagfilters',
'selectbox',
176,
......@@ -37,7 +37,7 @@ class Migration_20180109100600 extends Migration implements IMigration
$this->setConfig(
'category_filter_type',
'A',
\CONF_NAVIGATIONSFILTER,
CONF_NAVIGATIONSFILTER,
'Typ des Kategoriefilters',
'selectbox',
148,
......@@ -52,7 +52,7 @@ class Migration_20180109100600 extends Migration implements IMigration
$this->setConfig(
'manufacturer_filter_type',
'A',
\CONF_NAVIGATIONSFILTER,
CONF_NAVIGATIONSFILTER,
'Typ des Herstellerfilters',
'selectbox',
121,
......@@ -67,7 +67,7 @@ class Migration_20180109100600 extends Migration implements IMigration
$this->setConfig(
'search_special_filter_type',
'A',
\CONF_NAVIGATIONSFILTER,
CONF_NAVIGATIONSFILTER,
'Typ des Suchspezialfilters',
'selectbox',
141,
......
update/migrations/20180313133000_add_isbn_and_adr_hazard_config.php
View file @ 98f980c8
......@@ -22,7 +22,7 @@ class Migration_20180313133000 extends Migration implements IMigration
$this->setConfig(
'isbn_display',
'N',
\CONF_ARTIKELDETAILS,
CONF_ARTIKELDETAILS,
'Artikel ISBN anzeigen',
'selectbox',
499,
......@@ -39,7 +39,7 @@ class Migration_20180313133000 extends Migration implements IMigration
$this->setConfig(
'adr_hazard_display',
'N',
\CONF_ARTIKELDETAILS,
CONF_ARTIKELDETAILS,
'Gefahrentafel im Artikel anzeigen',
'selectbox',
499,
......
update/migrations/20180316183500_add_redis_cluster.php
View file @ 98f980c8
......@@ -25,7 +25,7 @@ class Migration_20180316183500 extends Migration implements IMigration
$this->setConfig(
'caching_rediscluster_hosts',
'',
\CONF_CACHING,
CONF_CACHING,
'Cluster-Hosts',
'text',
110,
......@@ -37,7 +37,7 @@ class Migration_20180316183500 extends Migration implements IMigration
$this->setConfig(
'caching_rediscluster_strategy',
'N',
\CONF_CACHING,
CONF_CACHING,
'Strategie',
'selectbox',
111,
......
update/migrations/20180319103900_add_backend_logging_option.php
View file @ 98f980c8
......@@ -47,7 +47,7 @@ class Migration_20180319103900 extends Migration implements IMigration
$this->setConfig(
'admin_login_logger_mode',
'1',
\CONF_GLOBAL,
CONF_GLOBAL,
'Adminloginversuche loggen?',
'listbox',
1503,
......
update/migrations/20180405090000_removes_maintenance_hint_setting.php
View file @ 98f980c8
......@@ -33,7 +33,7 @@ class Migration_20180405090000 extends Migration implements IMigration
$this->setConfig(
'wartungsmodus_hinweis',
'Dieser Shop befindet sich im Wartungsmodus.',
\CONF_GLOBAL,
CONF_GLOBAL,
'Wartungsmodus Hinweis',
'text',
1020,
......
update/migrations/20180416103817_configuration_for_price_range.php
View file @ 98f980c8
......@@ -26,7 +26,7 @@ class Migration_20180416103817 extends Migration implements IMigration
$this->setConfig(
'articleoverview_pricerange_width',
'150',
\CONF_ARTIKELUEBERSICHT,
CONF_ARTIKELUEBERSICHT,
'Max. Abweichung (%) für Preis-Range Anzeige',
'number',
372,
......
update/migrations/20180523092732_hook_interface_for_captcha.php
View file @ 98f980c8
......@@ -48,7 +48,7 @@ class Migration_20180523092732 extends Migration implements IMigration
$this->setConfig(
'anti_spam_method',
'N',
\CONF_GLOBAL,
CONF_GLOBAL,
'Spamschutz-Methode',
'selectbox',
520,
......@@ -69,7 +69,7 @@ class Migration_20180523092732 extends Migration implements IMigration
$this->setConfig(
'global_google_recaptcha_public',
'',
\CONF_GLOBAL,
CONF_GLOBAL,
'Google reCAPTCHA Websiteschlüssel',
'text',
522,
......@@ -81,7 +81,7 @@ class Migration_20180523092732 extends Migration implements IMigration
$this->setConfig(
'global_google_recaptcha_private',
'',
\CONF_GLOBAL,
CONF_GLOBAL,
'Google reCAPTCHA Geheimer Schlüssel',
'text',
523,
......@@ -93,6 +93,6 @@ class Migration_20180523092732 extends Migration implements IMigration
$this->removeLocalization('captcha_code_active');
Shop::Container()->getCache()->flushTags(\CACHING_GROUP_OPTION);
Shop::Container()->getCache()->flushTags(CACHING_GROUP_OPTION);
}
}
update/migrations/20180907143536_setting_for_seo_handling_of_articles_which_are_sold_out.php
View file @ 98f980c8
......@@ -26,7 +26,7 @@ class Migration_20180907143536 extends Migration implements IMigration
$this->setConfig(
'artikel_artikelanzeigefilter_seo',
'seo',
\CONF_GLOBAL,
CONF_GLOBAL,
'Direktaufruf ausverkaufter Artikel',
'selectbox',
215,
......
update/migrations/20180912115000_sitemap_settings.php
View file @ 98f980c8
......@@ -26,7 +26,7 @@ class Migration_20180912115000 extends Migration implements IMigration
$this->setConfig(
'sitemap_images_categories',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Kategoriebilder anzeigen',
'selectbox',
121,
......@@ -42,7 +42,7 @@ class Migration_20180912115000 extends Migration implements IMigration
$this->setConfig(
'sitemap_images_manufacturers',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Herstellerbilder anzeigen',
'selectbox',
122,
......@@ -58,7 +58,7 @@ class Migration_20180912115000 extends Migration implements IMigration
$this->setConfig(
'sitemap_images_newscategory_items',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Newskategoriebilder anzeigen',
'selectbox',
123,
......@@ -74,7 +74,7 @@ class Migration_20180912115000 extends Migration implements IMigration
$this->setConfig(
'sitemap_images_news_items',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Newsbeitragsbilder anzeigen',
'selectbox',
124,
......@@ -90,7 +90,7 @@ class Migration_20180912115000 extends Migration implements IMigration
$this->setConfig(
'sitemap_images_attributes',
'N',
\CONF_SITEMAP,
CONF_SITEMAP,
'Merkmalbilder anzeigen',
'selectbox',
125,
......
update/migrations/20180924092813_add_lang_var_wrong_bic.php
View file @ 98f980c8
......@@ -28,7 +28,7 @@ class Migration_20180924092813 extends Migration implements IMigration
$this->setConfig(
'zahlungsart_lastschrift_kreditinstitut_abfrage',
'O',
\CONF_ZAHLUNGSARTEN,
CONF_ZAHLUNGSARTEN,
'Kreditinstitut abfragen',
'selectbox',
590,
......@@ -58,7 +58,7 @@ class Migration_20180924092813 extends Migration implements IMigration
$this->setConfig(
'zahlungsart_lastschrift_iban_abfrage',
'O',
\CONF_ZAHLUNGSARTEN,
CONF_ZAHLUNGSARTEN,
'IBAN abfragen',
'selectbox',
550,
......@@ -75,7 +75,7 @@ class Migration_20180924092813 extends Migration implements IMigration
$this->setConfig(
'zahlungsart_lastschrift_kontonummer_abfrage',
'Y',
\CONF_ZAHLUNGSARTEN,
CONF_ZAHLUNGSARTEN,
'Kontonummer abfragen',
'selectbox',
570,
......@@ -93,7 +93,7 @@ class Migration_20180924092813 extends Migration implements IMigration
$this->setConfig(
'zahlungsart_lastschrift_blz_abfrage',
'Y',
\CONF_ZAHLUNGSARTEN,
CONF_ZAHLUNGSARTEN,
'BLZ abfragen',
'selectbox',
580,
......
update/migrations/20181117133301_ftp_settings.php
View file @ 98f980c8
......@@ -25,21 +25,21 @@ class Migration_20181117133301 extends Migration implements IMigration
$this->setConfig(
'ftp_header',
'FTP Verbindung',
\CONF_FS,
CONF_FS,
'FTP Verbindung',
null,
100,
(object)[ 'cConf' => 'N' ],
true
);
$this->setConfig('ftp_hostname', 'localhost', \CONF_FS, 'FTP Hostname', 'text', 101, null, true);
$this->setConfig('ftp_port', '21', \CONF_FS, 'FTP Port', 'number', 102, null, true);
$this->setConfig('ftp_user', '', \CONF_FS, 'FTP Benutzer', 'text', 103, null, true);
$this->setConfig('ftp_pass', '', \CONF_FS, 'FTP Passwort', 'pass', 104, null, true);
$this->setConfig('ftp_hostname', 'localhost', CONF_FS, 'FTP Hostname', 'text', 101, null, true);
$this->setConfig('ftp_port', '21', CONF_FS, 'FTP Port', 'number', 102, null, true);
$this->setConfig('ftp_user', '', CONF_FS, 'FTP Benutzer', 'text', 103, null, true);
$this->setConfig('ftp_pass', '', CONF_FS, 'FTP Passwort', 'pass', 104, null, true);
$this->setConfig(
'ftp_ssl',
'N',
\CONF_FS,
CONF_FS,
'FTP SSL',
'selectbox',
105,
......@@ -55,7 +55,7 @@ class Migration_20181117133301 extends Migration implements IMigration
$this->setConfig(
'ftp_path',
'/',
\CONF_FS,
CONF_FS,
'FTP Pfad',
'text',
106,
......
update/migrations/20181121155840_refactor_tanonjournaldata.php
View file @ 98f980c8
......@@ -65,7 +65,7 @@ class Migration_20181121155840 extends Migration implements IMigration
$this->setConfig(
'global_cancellation_time',
14,
\CONF_GLOBAL,
CONF_GLOBAL,
'Retourenfrist',
'number',
650,
......
update/migrations/20181220104200_remove_google_analytics.php
View file @ 98f980c8
......@@ -34,7 +34,7 @@ class Migration_20181220104200 extends Migration implements IMigration
$this->setConfig(
'global_google_analytics_id',
'',
\CONF_GLOBAL,
CONF_GLOBAL,
'Google Analytics ID',
'text',
520,
......@@ -46,7 +46,7 @@ class Migration_20181220104200 extends Migration implements IMigration
$this->setConfig(
'global_google_ecommerce',
0,
\CONF_GLOBAL,
CONF_GLOBAL,
'Google Analytics eCommerce Erweiterung nutzen',
'selectbox',
520,
......
update/migrations/20190311122800_remove_html_entitiy_config.php
View file @ 98f980c8
......@@ -33,7 +33,7 @@ class Migration_20190311122800 extends Migration implements IMigration
$this->setConfig(
'global_artikelname_htmlentities',
'N',
\CONF_GLOBAL,
CONF_GLOBAL,
'HTML-Code Umwandlung bei Artikelnamen',
'selectbox',
280,
......
update/migrations/20190312160200_add_cron_config.php
View file @ 98f980c8
......@@ -25,7 +25,7 @@ class Migration_20190312160200 extends Migration implements IMigration
$this->setConfig(
'cron_type',
'N',
\CONF_CRON,
CONF_CRON,
'Pseudo-Cron Methode',
'selectbox',
1,
......@@ -42,7 +42,7 @@ class Migration_20190312160200 extends Migration implements IMigration
$this->setConfig(
'cron_freq',
'10',
\CONF_CRON,
CONF_CRON,
'Server-to-Server jeden X-ten Aufruf starten',
'number',
2,
......
update/migrations/20190507095430_remove_product_tags.php
View file @ 98f980c8
......@@ -73,7 +73,7 @@ class Migration_20190507095430 extends Migration implements IMigration
$this->setConfig(
'configgroup_110_tag_filter',
'Tagfilter',
\CONF_NAVIGATIONSFILTER,
CONF_NAVIGATIONSFILTER,
'Tagfilter',
null,
170,
......@@ -82,7 +82,7 @@ class Migration_20190507095430 extends Migration implements IMigration
$this->setConfig(
'configgroup_5_product_tagging',
'Produkttagging',
\CONF_ARTIKELDETAILS,
CONF_ARTIKELDETAILS,
'Produkttagging',
null,
1000,
......@@ -91,7 +91,7 @@ class Migration_20190507095430 extends Migration implements IMigration
$this->setConfig(
'configgroup_8_box_tagcloud',
'Tagwolke',