Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php (revision 7217)
+++ /controller/wpsg_AdminController.class.php (revision 7218)
@@ -6,9 +6,9 @@
class wpsg_AdminController extends wpsg_SystemController
{
-
+
const SHOPDATA_EU_GERMANY = '0';
const SHOPDATA_EU_EU = '1';
const SHOPDATA_EU_WORLD = '2';
-
+
/**
* Ãbernimmt das Routing
@@ -58,23 +58,23 @@
}
else if (wpsg_isSizedString($_REQUEST['action'], 'resetMessages'))
- {
-
- $this->update_option('wpsg_msgHidden', array());
-
- $this->addBackendMessage(__('Systemmeldungen wurden zurÃŒckgesetzt.', 'wpsg'));
- $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemcheck');
-
- }
+ {
+
+ $this->update_option('wpsg_msgHidden', array());
+
+ $this->addBackendMessage(__('Systemmeldungen wurden zurÃŒckgesetzt.', 'wpsg'));
+ $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemcheck');
+
+ }
else if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'clearMessage')
{
- $arMsgHidden = $this->get_option('wpsg_msgHidden');
- if (!wpsg_isSizedArray($arMsgHidden)) $arMsgHidden = array();
-
- $arMsgHidden[] = $_REQUEST['msg_key'];
-
- $this->update_option('wpsg_msgHidden', $arMsgHidden);
-
- die("1");
+ $arMsgHidden = $this->get_option('wpsg_msgHidden');
+ if (!wpsg_isSizedArray($arMsgHidden)) $arMsgHidden = array();
+
+ $arMsgHidden[] = $_REQUEST['msg_key'];
+
+ $this->update_option('wpsg_msgHidden', $arMsgHidden);
+
+ die("1");
}
@@ -87,15 +87,15 @@
} // public function dispatch()
-
+
public function init()
{
-
+
// Option gab es frÃŒher nicht und wird hier auf den Default Wert korrigiert.
if ($this->shop->get_option('wpsg_shopdata_eu') === false) $this->shop->update_option('wpsg_shopdata_eu', self::EXPIRE_GERMANY);
if ($this->shop->get_option('wpsg_shopdata_eu') === false) $this->shop->update_option('wpsg_shopdata_eu', self::EXPIRE_EU);
if ($this->shop->get_option('wpsg_shopdata_eu') === false) $this->shop->update_option('wpsg_shopdata_eu', self::EXPIRE_WORLD);
-
+
} // public function init()
-
+
/**
* Index des Backends
@@ -158,6 +158,6 @@
}
$this->shop->view['arSubAction']['dataprotection'] = array(
- 'Menutext' => __('Datenschutz', 'wpsg'),
- 'subTemplate' => WPSG_PATH_VIEW.'/admin/dataprotection.phtml'
+ 'Menutext' => __('Datenschutz', 'wpsg'),
+ 'subTemplate' => WPSG_PATH_VIEW.'/admin/dataprotection.phtml'
);
$this->shop->view['arSubAction']['kalkulation'] = array(
@@ -263,5 +263,5 @@
} // public function indexAction()
-
+
/**
* Beim Speichern und Anzeigen der Shopdaten
@@ -293,7 +293,7 @@
$this->shop->update_option('wpsg_shopdata_eu_street', $_REQUEST['wpsg_shopdata_eu_street'], false, true);
$this->shop->update_option('wpsg_shopdata_eu_zip', $_REQUEST['wpsg_shopdata_eu_zip'], false, true);
- $this->shop->update_option('wpsg_shopdata_eu_city', $_REQUEST['wpsg_shopdata_eu_city'], false, true);
+ $this->shop->update_option('wpsg_shopdata_eu_city', $_REQUEST['wpsg_shopdata_eu_city'], false, true);
$this->shop->update_option('wpsg_shopdata_eu_country', $_REQUEST['wpsg_shopdata_eu_country'], false, true);
-
+
$this->shop->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner'], false, true);
$this->shop->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name'], false, true);
@@ -301,7 +301,7 @@
$this->shop->update_option('dataprotectioncommissioner_email', $_REQUEST['dataprotectioncommissioner_email'], false, true);
$this->shop->update_option('dataprotectioncommissioner_baskettext', $_REQUEST['dataprotectioncommissioner_baskettext'], false, true);
- $this->shop->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, true);
+ $this->shop->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, true);
$this->shop->update_option('dataprotectioncommissioner_texts', $_REQUEST['dataprotectioncommissioner_texts'], false, true);
-
+
$this->shop->update_option('wpsg_shopdata_bank_name', $_REQUEST['wpsg_shopdata_bank_name'], false, true);
$this->shop->update_option('wpsg_shopdata_bank_owner', $_REQUEST['wpsg_shopdata_bank_owner'], false, true);
@@ -317,7 +317,7 @@
$this->shop->addBackendError('nohspc_'.wpsg_translate(
- __('Die allgemeinen Daten des Shops haben sich verÀndert, sie sollten das Widerrufsformular ÌberprÌfen bzw. neu generieren.', 'wpsg'),
- WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung'
- ), 'wpsg_message_shopdata_change');
+ __('Die allgemeinen Daten des Shops haben sich verÀndert, sie sollten das Widerrufsformular ÌberprÌfen bzw. neu generieren.', 'wpsg'),
+ WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung'
+ ), 'wpsg_message_shopdata_change');
}
@@ -335,33 +335,33 @@
{
- $wpsg_update_data = wpsg_get_update_data($_REQUEST['wpsg_licence_file'], true);
-
- if (!wpsg_isSizedArray($wpsg_update_data))
- {
-
- $this->addBackendError(__('Keine Verbindung zum Registrierungsserver', 'wpsg'));
-
- }
- else
- {
-
- if ($wpsg_update_data['returnCode'] === '0')
- {
-
- $this->addBackendError(__('UngÃŒltiger Lizenzcode', 'wpsg'));
-
- }
- else
- {
+ $wpsg_update_data = wpsg_get_update_data($_REQUEST['wpsg_licence_file'], true);
+
+ if (!wpsg_isSizedArray($wpsg_update_data))
+ {
+
+ $this->addBackendError(__('Keine Verbindung zum Registrierungsserver', 'wpsg'));
+
+ }
+ else
+ {
+
+ if ($wpsg_update_data['returnCode'] === '0')
+ {
+
+ $this->addBackendError(__('UngÃŒltiger Lizenzcode', 'wpsg'));
+
+ }
+ else
+ {
$this->addBackendMessage(__('wpShopGermany wurde aktiviert.', 'wpsg'));
- $this->update_option('wpsg_key', $_REQUEST['wpsg_licence_file']);
-
- }
-
- }
-
- if ($this->shop->isMultiBlog()) die($this->redirect(WPSG_URL_WP.'wp-admin/network/plugins.php'));
- else die($this->redirect(WPSG_URL_WP.'wp-admin/plugins.php'));
+ $this->update_option('wpsg_key', $_REQUEST['wpsg_licence_file'], true);
+
+ }
+
+ }
+
+ if ($this->shop->isMultiBlog()) die($this->redirect(WPSG_URL_WP.'wp-admin/network/plugins.php'));
+ else die($this->redirect(WPSG_URL_WP.'wp-admin/plugins.php'));
} // public function loadLicenceAction()
@@ -375,318 +375,318 @@
if (wpsg_isSizedString($_REQUEST['do'], 'activatemodul'))
{
-
+
try
{
-
+
if (!wpsg_isSizedString($_REQUEST['modulcode']))
{
-
+
throw new \Exception(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-
+
}
else
{
-
+
$api_return = wpsg_api_call('registerModule', array($_REQUEST['modulcode']));
-
+
if (!wpsg_isSizedArray($api_return) || !isset($api_return['returnCode']))
{
-
+
// API Fehler
throw new \Exception(__('Registrierungsserver antwortet nicht.', 'wpsg'));
-
+
}
else
{
-
+
if ($api_return['returnCode'] === 0)
{
-
+
throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === 1)
{
-
+
throw new \Exception(__('Modulcode wurde nicht akzeptiert.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === 2)
{
-
+
throw new \Exception(__('Modulcode wurde bereits verbraucht.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === 3)
{
-
+
throw new \Exception(__('Modulcode wurde bereits fÃŒr diesen SchlÃŒssel verbraucht.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === 4)
{
-
+
$this->addBackendMessage(__('Modul wurde fÃŒr diesen LizenzschlÃŒssel aktiviert.', 'wpsg'));
-
+
if (wpsg_isSizedString($_REQUEST['source'], 'licence')) $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation');
else $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-
+
}
else
{
-
+
throw new \Exception(__('Nicht definierte API Antwort.'));
-
+
}
-
- }
-
- }
-
+
+ }
+
+ }
+
}
catch (Exception $e)
{
-
+
$this->addBackendError($e->getMessage());
-
+
if (wpsg_isSizedString($_REQUEST['source'], 'licence')) $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation');
else $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-
- }
-
+
+ }
+
}
else if (wpsg_isSizedString($_REQUEST['do'], 'saveRegister'))
{
-
+
$api_return = wpsg_api_call('updateRegisterData', array($_REQUEST['register']));
-
+
try
{
-
+
if ($api_return['returnCode'] === 0)
{
-
+
throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === 1)
{
-
+
$this->addBackendMessage(__('Daten erfolgreich aktualisiert.', 'wpsg'));
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung');
-
+
}
else
{
-
+
throw new \Exception(__('Nicht definierte API Antwort.'));
-
- }
-
+
+ }
+
}
catch (Exception $e)
{
-
+
$this->addBackendError($e->getMessage());
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung');
-
- }
-
+
+ }
+
}
else if (wpsg_isSizedString($_REQUEST['do'], 'domainRegister'))
{
-
+
$api_return = wpsg_api_call('domainRegister', array($_SERVER['HTTP_HOST']));
-
+
try
{
-
+
if ($api_return['returnCode'] === 1)
{
-
+
$this->addBackendMessage(__('Domain erfolgreich registriert.', 'wpsg'));
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata');
-
+
}
else if ($api_return['returnCode'] === -1)
{
-
+
throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === -2)
{
-
+
throw new \Exception(__('Diese Domain ist schon auf Ihren SchlÃŒssel registriert.', 'wpsg'));
-
- }
+
+ }
else
{
-
+
throw new \Exception(__('Nicht definierte API Antwort.'));
-
- }
-
+
+ }
+
}
catch (Exception $e)
{
-
+
$this->addBackendError($e->getMessage());
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata');
-
- }
-
+
+ }
+
}
else if (wpsg_isSizedString($_REQUEST['do'], 'domainDeRegister'))
{
-
+
$api_return = wpsg_api_call('domainDeRegister', array($_SERVER['HTTP_HOST']));
-
+
try
{
-
+
if ($api_return['returnCode'] === 1)
{
-
+
$this->addBackendMessage(__('Domain erfolgreich unregistriert.', 'wpsg'));
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata');
-
+
}
else if ($api_return['returnCode'] === -1)
{
-
+
throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
-
+
}
else if ($api_return['returnCode'] === -2)
{
-
+
throw new \Exception(__('Diese Domain ist nicht auf Ihren SchlÃŒssel registriert.', 'wpsg'));
-
- }
+
+ }
else
{
-
+
throw new \Exception(__('Nicht definierte API Antwort.'));
-
- }
-
+
+ }
+
}
catch (Exception $e)
{
-
+
$this->addBackendError($e->getMessage());
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata');
-
- }
-
+
+ }
+
}
else if (wpsg_isSizedString($_REQUEST['do'], 'startDemo'))
{
-
+
$api_return = wpsg_api_call('startDemo', array($_REQUEST['modul']));
-
+
try
{
-
+
if ($api_return['returnCode'] === 1)
{
-
+
$this->addBackendMessage(__('Demo Modus erfolgreich gestartet.', 'wpsg'));
-
+
}
else if (isset($api_return['returnCode']) && isset($api_return['returnMessage']))
{
-
+
throw new \Exception($api_return['returnMessage']);
-
- }
+
+ }
else
{
-
+
throw new \Exception(__('Nicht definierte API Antwort.'));
-
- }
-
+
+ }
+
}
catch (Exception $e)
{
-
+
$this->addBackendError($e->getMessage());
-
- }
-
+
+ }
+
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul='.$_REQUEST['modul']);
-
- }
- else if (wpsg_isSizedString($_REQUEST['do'], 'installModul'))
- {
-
- global $wp_filesystem;
-
- // Kann die Moduldatei geschrieben werden?
- if (!is_writable(WPSG_PATH_MOD))
- {
-
- ob_start();
- $request_creds = request_filesystem_credentials(
- WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key.'&source='.$_REQUEST['source'],
- '',
- false,
- false,
- null
- );
- ob_end_clean();
-
- // 1 gibt es bei Windows Rechnern zurÃŒck, da es hier egal ist
- // Ein Array ist es wenn das Formular bereits abgeschickt wurde und die Anfrage vom Formular kommt
- // false ist es wenn kein Zugriff ist dann muss das Formular angezeigt werden
-
- if (false === $request_creds)
- {
-
- // Berechtigungen anfragen
- $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&do=getCredentials&modul='.$_REQUEST['modul'].'&source='.$_REQUEST['source']);
-
- }
- else if (is_array($request_creds))
- {
-
- if (!WP_Filesystem($request_creds))
- {
-
- // Eingegebene Daten waren falsch
- $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&do=getCredentials&modul='.$_REQUEST['modul'].'&sourcce='.$_REQUEST['source']);
-
- }
-
- }
-
- }
+
+ }
+ else if (wpsg_isSizedString($_REQUEST['do'], 'installModul'))
+ {
+
+ global $wp_filesystem;
+
+ // Kann die Moduldatei geschrieben werden?
+ if (!is_writable(WPSG_PATH_MOD))
+ {
+
+ ob_start();
+ $request_creds = request_filesystem_credentials(
+ WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key.'&source='.$_REQUEST['source'],
+ '',
+ false,
+ false,
+ null
+ );
+ ob_end_clean();
+
+ // 1 gibt es bei Windows Rechnern zurÃŒck, da es hier egal ist
+ // Ein Array ist es wenn das Formular bereits abgeschickt wurde und die Anfrage vom Formular kommt
+ // false ist es wenn kein Zugriff ist dann muss das Formular angezeigt werden
+
+ if (false === $request_creds)
+ {
+
+ // Berechtigungen anfragen
+ $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&do=getCredentials&modul='.$_REQUEST['modul'].'&source='.$_REQUEST['source']);
+
+ }
+ else if (is_array($request_creds))
+ {
+
+ if (!WP_Filesystem($request_creds))
+ {
+
+ // Eingegebene Daten waren falsch
+ $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&do=getCredentials&modul='.$_REQUEST['modul'].'&sourcce='.$_REQUEST['source']);
+
+ }
+
+ }
+
+ }
$bOK = $this->installModul($_REQUEST['modul']);
-
+
if ($bOK === true) $this->addBackendMessage(__('Modul erfolgreich installiert.', 'wpsg'));
-
+
if (wpsg_isSizedString($_REQUEST['source'], 'licence')) $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation');
else $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-
+
}
else if (wpsg_isSizedString($_REQUEST['do'], 'getCredentials'))
{
- //https://dev4-wpshopgermany.maennchen1.de/wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul=wpsg_mod_paypalapi&source=module
-
- echo request_filesystem_credentials(
- WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul'].'&source='.$_REQUEST['source'],
- '',
- false,
- false,
- null
- );
-
- return;
-
- }
+ //https://dev4-wpshopgermany.maennchen1.de/wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul=wpsg_mod_paypalapi&source=module
+
+ echo request_filesystem_credentials(
+ WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul'].'&source='.$_REQUEST['source'],
+ '',
+ false,
+ false,
+ null
+ );
+
+ return;
+
+ }
$this->view['actionName'] = 'licence';
@@ -694,7 +694,7 @@
if (wpsg_isSizedString($_REQUEST['subaction'])) $this->view['subaction'] = $_REQUEST['subaction'];
else $this->view['subaction'] = 'registerdata';
-
- $this->render(WPSG_PATH_VIEW.'/admin/licence.phtml');
-
+
+ $this->render(WPSG_PATH_VIEW.'/admin/licence.phtml');
+
} // public function registrierungAction()
@@ -883,7 +883,7 @@
if ( !wpsg_isSizedArray($this->shop->view['distinctProductTax']) &&
- !wpsg_isSizedArray($this->shop->view['arPaymentMethods']) &&
- !wpsg_isSizedArray($this->shop->view['arShippingMethods']) &&
- !wpsg_isSizedArray($this->shop->view['arConf']) )
+ !wpsg_isSizedArray($this->shop->view['arPaymentMethods']) &&
+ !wpsg_isSizedArray($this->shop->view['arShippingMethods']) &&
+ !wpsg_isSizedArray($this->shop->view['arConf']) )
{
@@ -1029,20 +1029,20 @@
if ($_REQUEST['wpsg_deinstall_sites'] == '1')
{
-
+
// Seiten löschen
- wp_delete_post($this->get_option('wpsg_page_basket'), true);
- wp_delete_post($this->get_option('wpsg_page_versand'), true);
- wp_delete_post($this->get_option('wpsg_page_product'), true);
- wp_delete_post($this->get_option('wpsg_page_agb'), true);
- wp_delete_post($this->get_option('wpsg_page_datenschutz'), true);
- wp_delete_post($this->get_option('wpsg_page_widerrufsbelehrung'), true);
- wp_delete_post($this->get_option('wpsg_page_impressum'), true);
-
- // Module
- $this->shop->callMods('wpsg_deinstall_sites');
+ wp_delete_post($this->get_option('wpsg_page_basket'), true);
+ wp_delete_post($this->get_option('wpsg_page_versand'), true);
+ wp_delete_post($this->get_option('wpsg_page_product'), true);
+ wp_delete_post($this->get_option('wpsg_page_agb'), true);
+ wp_delete_post($this->get_option('wpsg_page_datenschutz'), true);
+ wp_delete_post($this->get_option('wpsg_page_widerrufsbelehrung'), true);
+ wp_delete_post($this->get_option('wpsg_page_impressum'), true);
+
+ // Module
+ $this->shop->callMods('wpsg_deinstall_sites');
$this->shop->addBackendMessage(__('Seiten erfolgreich gelöscht.', 'wpsg'));
-
+
}
@@ -1279,13 +1279,13 @@
{
- // DoppeleintrÀge verhindern
- $exist = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_WPML_ICL_STRINGS."` WHERE `value` = '".wpsg_q($t)."' AND `context` = 'wpsg' ");
-
- if (!wpsg_isSizedInt($exist))
- {
-
- icl_register_string('wpsg', 'wpsg_auto_'.$k, $t, false, $this->get_option('wpsg_backend_language'));
-
- }
+ // DoppeleintrÀge verhindern
+ $exist = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_WPML_ICL_STRINGS."` WHERE `value` = '".wpsg_q($t)."' AND `context` = 'wpsg' ");
+
+ if (!wpsg_isSizedInt($exist))
+ {
+
+ icl_register_string('wpsg', 'wpsg_auto_'.$k, $t, false, $this->get_option('wpsg_backend_language'));
+
+ }
}
@@ -1468,4 +1468,7 @@
foreach ($this->shop->arPayment as $p_id => $p) $this->shop->view['arPayment'][$p['id']] = $p['name'];
+ $this->shop->view['customerdatadelete'] = array();
+ foreach ($this->shop->customerdatadelete as $d_id => $d) $this->shop->view['customerdatadelete'][$d['id']] = $d['name'];
+
$this->shop->view['arLander'] = $this->db->fetchAssocField("SELECT L.`id`, L.`name` FROM `".WPSG_TBL_LAND."` AS L ORDER BY `name` ASC ", "id", "name");
@@ -1600,5 +1603,5 @@
} // public function kundendatenAction()
-
+
/**
* Konfiguration der E-Mail Einstellungen
@@ -1607,97 +1610,8 @@
{
- if (isset($_REQUEST['migrateAttachmentToMediathek'])) {
-
- switch ($_REQUEST['migrateAttachmentToMediathek']) {
-
- case '1': $file = wpsg_getUploadDir('wpsg_mailconf').$this->shop->get_option('wpsg_kundenmail_attachfile'); break;
-
- default: throw new \Exception(__('Nicht definiert.', 'wpsg'));
-
- }
-
- if (file_exists($file) && is_file($file)) {
-
- $filetype = wp_check_filetype(basename($file), null);
- $wp_upload_dir = wp_upload_dir();
-
- $attachment = array(
- 'guid' => $wp_upload_dir['url'].'/'.basename($file),
- 'post_mime_type' => $filetype['type'],
- 'post_title' => preg_replace('/\.[^.]+$/', '', basename($file)),
- 'post_content' => '',
- 'post_status' => 'inherit'
- );
-
- $attach_id = wp_insert_attachment($attachment, $file, $parent_post_id);
-
- switch ($_REQUEST['migrateAttachmentToMediathek']) {
-
- case '1':
-
- $arAttachment = explode(',', $this->shop->get_option('wpsg_kundenmail_mediaattachment'));
- $arAttachment[] = $attach_id;
-
- $this->shop->update_option('wpsg_kundenmail_mediaattachment', implode(',', wpsg_trim($arAttachment)));
- $this->shop->update_option('wpsg_kundenmail_attachfile', false);
-
- break;
-
- }
-
- $this->shop->addBackendMessage(__('Anhang erfolgreich konvertiert.', 'wpsg'));
-
- @unlink($file);
-
- } else $this->addBackendError(__('Anhang konnte nicht gefunden werden.', 'wpsg'));
-
- $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemcheck');
-
- }
-
- if (isset($_REQUEST['getEmailLogo'])) {
-
- $logo_path = wpsg_getUploadDir('wpsg_mailconf').'wpsg_email_logo.jpg';
-
- if (!file_exists($logo_path)) throw new \Exception(_('E-Mail Logo existiert nicht.'));
-
- wpsg_header::IMG($logo_path);
-
- } else if (isset($_REQUEST['submit'])) {
+ if (isset($_REQUEST['submit']))
+ {
$this->update_option('wpsg_htmlmail', $_REQUEST['wpsg_htmlmail']);
- $this->update_option('wpsg_email_logo_activated', $_REQUEST['wpsg_email_logo_activated']);
-
- $this->update_option('wpsg_email_logo_watermark', $_REQUEST['wpsg_email_logo_watermark']);
- $this->update_option('wpsg_email_logo_alignment', $_REQUEST['wpsg_email_logo_alignment']);
- $this->update_option('wpsg_email_logo_transparency', $_REQUEST['wpsg_email_logo_transparency']);
-
- if(file_exists($_FILES['wpsg_email_logo']['tmp_name']))
- {
-
- $ending = strtolower(preg_replace("/(.*)\./", "", $_FILES['wpsg_email_logo']['name']));
-
- if ($ending != "jpg" && $ending != "jpeg") {
-
- $this->shop->addBackendError(__("UngÃŒltiger Dateityp (Logo) ! Es sind nur JPG/JPEG Dateien erlaubt!", "wpsg"));
-
- } else if ($ending == "jpg" || $ending == "jpeg") {
-
- $destination_path = wpsg_getUploadDir('wpsg_mailconf').'wpsg_email_logo.jpg';
-
- move_uploaded_file($_FILES['wpsg_email_logo']['tmp_name'], $destination_path);
-
- }
-
- }
-
- if((array_key_exists('wpsg_email_logo_del', $_REQUEST)) && ($_REQUEST['wpsg_email_logo_del'] == "1"))
- {
-
- @unlink(WPSG_PATH_CONTENT . 'uploads/wpsg/wpsg_mailconf/wpsg_email_logo.jpg');
- $this->shop->addBackendMessage(__('Logo wurde erfolgreich gelöscht.', 'wpsg'));
-
- }
-
wpsg_saveEMailConfig("global"); // Global
@@ -1751,5 +1665,5 @@
if (isset($_REQUEST['noheader']) && $_REQUEST['noheader'] == '1' && !isset($_REQUEST['submit']))
{
-
+
// Ajax Anfrage eines Moduls
$this->shop->callMod($_REQUEST['modul'], 'be_ajax');
@@ -1821,6 +1735,6 @@
{
- \check_admin_referer('wpsg-save-revocation');
-
+ \check_admin_referer('wpsg-save-revocation');
+
$this->shop->update_option('wpsg_ps_mailwiderruf', $_REQUEST['wpsg_ps_mailwiderruf']);
$this->shop->addTranslationString('wpsg_ps_mailwiderruf', $_REQUEST['wpsg_ps_mailwiderruf']);
@@ -1828,28 +1742,28 @@
if (file_exists($_FILES['wpsg_widerrufsformular']['tmp_name']))
{
-
- if (mime_content_type($_FILES['wpsg_widerrufsformular']['tmp_name']) === 'application/pdf') {
-
- if (!file_exists(WPSG_PATH_UPLOADS.'wpsg_revocation/')) mkdir(WPSG_PATH_UPLOADS.'wpsg_revocation/', 0775, true);
-
- $this->clearRevocationForm();
-
- move_uploaded_file($_FILES['wpsg_widerrufsformular']['tmp_name'], WPSG_PATH_UPLOADS.'wpsg_revocation/'.$_FILES['wpsg_widerrufsformular']['name']);
- $this->addBackendMessage(__('Widerrufsformular erfolgreich hochgeladen.', 'wpsg'));
-
- $this->shop->update_option('wpsg_revocationform', $_FILES['wpsg_widerrufsformular']['name']);
-
- } else {
-
- $this->shop->addBackendError(__('Dateiformat muss vom Type PDF sein.', 'wpsg'));
-
- }
+
+ if (mime_content_type($_FILES['wpsg_widerrufsformular']['tmp_name']) === 'application/pdf') {
+
+ if (!file_exists(WPSG_PATH_UPLOADS.'wpsg_revocation/')) mkdir(WPSG_PATH_UPLOADS.'wpsg_revocation/', 0775, true);
+
+ $this->clearRevocationForm();
+
+ move_uploaded_file($_FILES['wpsg_widerrufsformular']['tmp_name'], WPSG_PATH_UPLOADS.'wpsg_revocation/'.$_FILES['wpsg_widerrufsformular']['name']);
+ $this->addBackendMessage(__('Widerrufsformular erfolgreich hochgeladen.', 'wpsg'));
+
+ $this->shop->update_option('wpsg_revocationform', $_FILES['wpsg_widerrufsformular']['name']);
+
+ } else {
+
+ $this->shop->addBackendError(__('Dateiformat muss vom Type PDF sein.', 'wpsg'));
+
+ }
} else if ($_FILES['wpsg_widerrufsformular']['error']) {
-
- $this->shop->addBackendError(__('Mit dem Upload gab es ein Problem, möglicherweise ist die Datei zu groÃ.', 'wpsg'));
-
- }
-
+
+ $this->shop->addBackendError(__('Mit dem Upload gab es ein Problem, möglicherweise ist die Datei zu groÃ.', 'wpsg'));
+
+ }
+
$this->shop->update_option('wpsg_widerrufsformular_kundenmail', $_REQUEST['wpsg_widerrufsformular_kundenmail']);
@@ -1869,5 +1783,5 @@
if (!$this->shop->hasBackendError()) $this->shop->addBackendMessage(__('Widerruf erfolgreich gespeichert.', 'wpsg'));
-
+
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung');
@@ -1986,14 +1900,14 @@
{
- if (wpsg_isSizedString($_REQUEST['subaction'], 'clearSysLog'))
- {
-
- @unlink($GLOBALS['wpsg_sc']->getStorageRoot().'exception.log');
-
- $this->addBackendMessage(__('Fehlerprotokoll gelöscht.', 'wpsg'));
-
- $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemlog');
-
- }
+ if (wpsg_isSizedString($_REQUEST['subaction'], 'clearSysLog'))
+ {
+
+ @unlink($GLOBALS['wpsg_sc']->getStorageRoot().'exception.log');
+
+ $this->addBackendMessage(__('Fehlerprotokoll gelöscht.', 'wpsg'));
+
+ $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemlog');
+
+ }
$this->shop->view = array(
@@ -2033,6 +1947,6 @@
{
- \check_admin_referer('wpsg-save-config');
-
+ \check_admin_referer('wpsg-save-config');
+
$this->update_option('wpsg_currency', $_REQUEST['wpsg_currency']);
$this->update_option('wpsg_showincompleteorder', $_REQUEST['wpsg_showincompleteorder']);
@@ -2059,6 +1973,7 @@
}
- else if (@$_REQUEST['subaction'] == "dataprotection") {
-
+ else if (@$_REQUEST['subaction'] == "dataprotection")
+ {
+
$this->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner']);
$this->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name']);
@@ -2069,14 +1984,11 @@
$this->update_option('dataprotectioncommissioner_cookie', $_REQUEST['dataprotectioncommissioner_cookie']);
$this->update_option('dataprotectioncommissioner_cookietext', $_REQUEST['dataprotectioncommissioner_cookietext']);
-
- $this->shop->update_option('wpsg_customerdatadelete', $_REQUEST['wpsg_customerdatadelete']);
- $this->shop->update_option('wpsg_customerdatadelete_unit', $_REQUEST['wpsg_customerdatadelete_unit']);
$this->addBackendMessage(__('Einstellungen gespeichert.', 'wpsg'));
-
+
$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=dataprotection');
-
- }
-
+
+ }
+
else if (@$_REQUEST['subaction'] == 'extended')
{
@@ -2085,6 +1997,6 @@
$this->update_option('wpsg_options_nl2br', $_REQUEST['wpsg_options_nl2br']);
$this->update_option('wpsg_debugModus', $_REQUEST['wpsg_debugModus']);
- $this->update_option('wpsg_displayTemplates', $_REQUEST['wpsg_displayTemplates']);
- $this->update_option('wpsg_displayTemplatesLog', $_REQUEST['wpsg_displayTemplatesLog']);
+ $this->update_option('wpsg_displayTemplates', $_REQUEST['wpsg_displayTemplates']);
+ $this->update_option('wpsg_displayTemplatesLog', $_REQUEST['wpsg_displayTemplatesLog']);
$this->update_option('wpsg_referer_requesturi', $_REQUEST['wpsg_referer_requesturi']);
@@ -2117,6 +2029,4 @@
$this->update_option('wpsg_showArticelnumber', $_REQUEST['wpsg_showArticelnumber']);
$this->update_option('wpsg_hideBasketCountrySelect', $_REQUEST['wpsg_hideBasketCountrySelect']);
- $this->update_option('wpsg_alternativeProductDetailDesign', $_REQUEST['wpsg_alternativeProductDetailDesign']);
- $this->update_option('wpsg_alternativeOrderDesign', $_REQUEST['wpsg_alternativeOrderDesign']);
$this->shop->callMods('admin_presentation_submit');
@@ -2210,39 +2120,36 @@
$path ="/wpsg/settings/option";
- $res = $xml->xpath($path);
-
- foreach ($res as $k => $v)
- {
-
- $a = $v->attributes();
-
- $bExists = $this->db->fetchOne("SELECT `option_id` FROM `".$wpdb->prefix."options` WHERE `option_name` = '".wpsg_q(strval($a->option_name))."' ");
-
- if ($bExists > 0)
- {
-
- $this->db->UpdateQuery($wpdb->prefix."options", array(
- "option_value" => wpsg_q(strval($a->option_value))
- ), "`option_name` = '".wpsg_q(strval($a->option_name))."'");
-
- }
- else
- {
-
- $this->db->ImportQuery($wpdb->prefix."options", array(
- "blog_id" => wpsg_q(strval($a->blog_id)),
- "option_name" => wpsg_q(strval($a->option_name)),
- "option_value" => wpsg_q(strval($a->option_value)),
- "autoload" => wpsg_q(strval($a->autoload))
- ), true);
-
- }
-
- }
-
- // Datenbank aktualisieren
- wpsg_install();
-
- $this->shop->addBackendMessage(__('Einstellungen wurden erfolgreich importiert.', 'wpsg'));
+ $res = $xml->xpath($path);
+
+ foreach ($res as $k => $v)
+ {
+
+ $a = $v->attributes();
+
+ $bExists = $this->db->fetchOne("SELECT `option_id` FROM `".$wpdb->prefix."options` WHERE `option_name` = '".wpsg_q(strval($a->option_name))."' ");
+
+ if ($bExists > 0)
+ {
+
+ $this->db->UpdateQuery($wpdb->prefix."options", array(
+ "option_value" => wpsg_q(strval($a->option_value))
+ ), "`option_name` = '".wpsg_q(strval($a->option_name))."'");
+
+ }
+ else
+ {
+
+ $this->db->ImportQuery($wpdb->prefix."options", array(
+ "blog_id" => wpsg_q(strval($a->blog_id)),
+ "option_name" => wpsg_q(strval($a->option_name)),
+ "option_value" => wpsg_q(strval($a->option_value)),
+ "autoload" => wpsg_q(strval($a->autoload))
+ ), true);
+
+ }
+
+ }
+
+ $this->shop->addBackendMessage(__('Einstellungen wurden erfolgreich importiert.', 'wpsg'));
}
@@ -2561,20 +2468,20 @@
$temp_name = $this->shop->getTempName($modul_key.'.zip');
@unlink($temp_name);
-
+
$wpsg_update_data = wpsg_get_update_data();
$url = $wpsg_update_data['modulinfo'][$modul_key]['download_url'];
-
+
if (!wpsg_isSizedString($url)) throw new \Exception("UngÃŒltige Download URL.");
-
+
$bOK = @copy($url, $temp_name);
-
+
if (!$bOK)
{
-
+
$bOK = @file_put_contents($temp_name, $this->shop->get_url_content($url));
-
+
if (!$bOK)
{
-
+
// Pfad finden fÃŒr das Wordpress Filesystem
if ($GLOBALS['wpsg_sc']->isMultiBlog())
@@ -2582,89 +2489,89 @@
else
$ftp_path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_temp/';
-
- $ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name);
-
- $bOK = $wp_filesystem->put_contents($ftp_path, $this->shop->get_url_content($url), FS_CHMOD_FILE);
-
- if (!$bOK)
- {
-
- $this->shop->addBackendError(wpsg_translate(__('Modul (#1#) konnte nicht kopiert werden!', 'wpsg'), $modul_key));
- return false;
-
- }
-
- }
-
- }
-
+
+ $ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name);
+
+ $bOK = $wp_filesystem->put_contents($ftp_path, $this->shop->get_url_content($url), FS_CHMOD_FILE);
+
+ if (!$bOK)
+ {
+
+ $this->shop->addBackendError(wpsg_translate(__('Modul (#1#) konnte nicht kopiert werden!', 'wpsg'), $modul_key));
+ return false;
+
+ }
+
+ }
+
+ }
+
$zip = new ZipArchive();
-
+
if ($zip->open($temp_name) === true)
{
-
+
try
{
-
+
$bOK = @$zip->extractTo(realpath(WPSG_PATH.'/../'));
$zip->close();
-
+
if ($bOK === false)
{
-
+
throw new Exception();
-
+
}
else
{
-
+
return true;
-
- }
-
+
+ }
+
}
catch (Exception $e)
{
-
+
// Es ist ein Fehler aufgetreten, jetzt versuche ich die Datei mit dem Wordpress Filesystem zu entpacken
-
+
// Pfad finden fÃŒr das Wordpress Filesystem
$ftp_path = trailingslashit($wp_filesystem->find_folder(realpath(WPSG_PATH.'/../')));
-
+
$bOK = unzip_file($temp_name, $ftp_path);
-
+
if ($bOK !== true)
{
-
+
$strError = '';
-
+
// Hier ist immer noch ein Fehler aufgetreten
foreach ((array)$bOK->errors as $e)
{
-
+
$strError .= $e[0].' ';
-
+
}
-
+
$this->shop->addBackendError(wpsg_translate(__('Fehler beim Entpacken: #1#', 'wpsg'), $strError)); return false;
-
+
}
else
{
-
+
return true;
-
- }
-
- }
-
+
+ }
+
+ }
+
}
else
{
-
+
$this->shop->addBackendError(__('Datei konnte nicht ÃŒbertragen werden.', 'wpsg')); return false;
-
- }
-
+
+ }
+
$this->shop->addBackendError(__('Datei konnte nicht entpackt werden.', 'wpsg')); return false;
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php (revision 7217)
+++ /lib/filter_functions.inc.php (revision 7218)
@@ -375,5 +375,5 @@
$plugin_data = get_plugin_data(dirname(__FILE__).'/../wpshopgermany.php');
- if ($key === false) $key = $GLOBALS['wpsg_sc']->get_option('wpsg_key');
+ if ($key === false) $key = $GLOBALS['wpsg_sc']->get_option('wpsg_key', true);
$api_return = $GLOBALS['wpsg_sc']->get_url_post_content('https://api.maennchen1.de/', array(
@@ -424,5 +424,5 @@
{
- if ($key === false) $key = $GLOBALS['wpsg_sc']->get_option('wpsg_key');
+ if ($key === false) $key = $GLOBALS['wpsg_sc']->get_option('wpsg_key', true);
$wpsg_lastupdate = $GLOBALS['wpsg_sc']->get_option('wpsg_lastupdate', true);
@@ -528,5 +528,5 @@
if (!current_user_can('edit_plugins')) die();
- $GLOBALS['wpsg_sc']->update_option('wpsg_key', false);
+ $GLOBALS['wpsg_sc']->update_option('wpsg_key', false, true);
$GLOBALS['wpsg_sc']->update_option('wpsg_lastupdate', false, true);
$GLOBALS['wpsg_sc']->update_option('wpsg_updatedata', false, true);
Index: /views/mods/mod_sms/templates/emptysms.phtml
===================================================================
--- /views/mods/mod_sms/templates/emptysms.phtml (revision 7218)
+++ /views/mods/mod_sms/templates/emptysms.phtml (revision 7218)
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+get_option('wpsg_shopdata_name'), 'wpsg'); ?> -
Index: /views/mods/mod_sms/templates/zahlungsaufforderung.phtml
===================================================================
--- /views/mods/mod_sms/templates/zahlungsaufforderung.phtml (revision 7218)
+++ /views/mods/mod_sms/templates/zahlungsaufforderung.phtml (revision 7218)
@@ -0,0 +1,23 @@
+ view['kunde']['vname']; ?> view['kunde']['name']; ?>,
+
+ view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>.
+
+
+
+%basket_html%
+
+
+
+
+ :
+
+
+
+
+
+get_option('wpsg_shopdata_name'), 'wpsg'); ?> -
Index: /views/mods/mod_sms/templates/zahlungserinnerung.phtml
===================================================================
--- /views/mods/mod_sms/templates/zahlungserinnerung.phtml (revision 7218)
+++ /views/mods/mod_sms/templates/zahlungserinnerung.phtml (revision 7218)
@@ -0,0 +1,23 @@
+ view['kunde']['vname']; ?> view['kunde']['name']; ?>,
+
+ view['data']['cdate'])); ?> view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+
+
+
+%basket_html%
+
+
+
+
+ :
+
+
+
+
+
+get_option('wpsg_shopdata_name'), 'wpsg'); ?> -