Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5918) +++ /controller/wpsg_AdminController.class.php (revision 5921) @@ -61,11 +61,5 @@ $this->shop->redirect(rawurldecode($_REQUEST['wpsg_redirect'])); - } - else if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'importV2') - { - - $this->importV2(); - - } + } else { @@ -1969,1069 +1963,5 @@ } // private function installModul($modul_key) - - /** - * Import Funktion fÃŒr die Daten aus Version 2 - */ - private function importV2() - { - - global $wpdb; - - error_reporting(E_ERROR); ini_set("display_errors", "1"); - - // Zur Sicherheit ein paar VorabprÃŒfungen - //$ProductCount = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_PRODUCTS."`"); - //if ($ProductCount > 0) { $this->addBackendError(__('Bitte löschen sie vor dem Import alle Produkte!', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); } - - $nOrderCount = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` "); - if ($nOrderCount > 0) { $this->addBackendError(__('Bitte löschen sie vor dem Import alle Bestelldaten!', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); } - - $nCustomerCount = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_KU."` "); - if ($nCustomerCount > 0) { $this->addBackendError(__('Bitte löschen sie vor dem Import alle Kundendaten!', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); } - if (isset($_REQUEST['submit_import'])) - { - - $_FILES['datei']['tmp_name'] = WPSG_PATH_CONTENT.'uploads/wpsg_upgrade.zip'; - - } - else if (!isset($_REQUEST['submit_import_db'])) - { - - if (!file_exists($_FILES['datei']['tmp_name'])) { $this->addBackendError(__('Kein Paket hochgeladen!', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); } - - } - - // Alte Optionen löschen - //$this->db->Query("DELETE FROM `wp_options` WHERE `option_name` LIKE 'wpsg_%' AND `option_name` != 'wpsg_key' AND `option_name` != 'wpsg_installed' "); - - $arTables = $this->db->fetchAssocField("SHOW TABLES"); - - if (in_array(WPSG_TBL_PRODUCTS, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS."`"); - if (in_array(WPSG_TBL_PRODUCTS_GROUP, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS_GROUP."`"); - if (in_array(WPSG_TBL_ORDER, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_ORDER."`"); - if (in_array(WPSG_TBL_KU, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_KU."`"); - if (in_array(WPSG_TBL_VZ, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_VZ."`"); - if (in_array(WPSG_TBL_LAND, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_LAND."`"); - if (in_array(WPSG_TBL_AT, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_AT."`"); - if (in_array(WPSG_TBL_PRODUCTS_AT, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS_AT."`"); - if (in_array(WPSG_TBL_OL, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_OL."`"); - if (in_array(WPSG_TBL_VA, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_VA."`"); - if (in_array(WPSG_TBL_RECHNUNGEN, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_RECHNUNGEN."`"); - if (in_array(WPSG_TBL_GUTSCHEIN, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_GUTSCHEIN."`"); - if (in_array(WPSG_TBL_PRODUCTS_REL, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS_REL."`"); - if (in_array(WPSG_TBL_EXPORTPROFILE, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_EXPORTPROFILE."`"); - if (in_array(WPSG_TBL_PRODUCTS_VARS, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS_VARS."`"); - if (in_array(WPSG_TBL_PRODUCTS_STICKY, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PRODUCTS_STICKY."`"); - if (in_array(WPSG_TBL_ZV, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_ZV."`"); - if (in_array(WPSG_TBL_VIDEOINDIV, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_VIDEOINDIV."`"); - if (in_array(WPSG_TBL_PDFINDIV, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PDFINDIV."`"); - if (in_array(WPSG_TBL_ORDERVARS, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERVARS."`"); - if (in_array(WPSG_TBL_ORDERCOND, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERCOND."`"); - if (in_array(WPSG_TBL_CABLOG, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_CABLOG."`"); - if (in_array(WPSG_TBL_PAP, $arTables)) $this->db->Query("DELETE FROM `".WPSG_TBL_PAP."`"); - - if (!isset($_REQUEST['submit_import_db'])) - { - - // Import aus Datei - - $mb = new wpsg_mod_basic(); - $path = $mb->getTmpFilePath().'/importV2/'; - - if (file_exists($path)) wpsg_rrmdir($path); - mkdir($path, 0777, true); - - $zip = new ZipArchive(); - - if ($zip->open($_FILES['datei']['tmp_name']) === true) - { - - $zip->extractTo($path); - $zip->close(); - - } - - // Verarbeitung der XML Datei - $doc = new DOMDocument; - $doc->Load($path.'/data.xml'); - - $xpath = new DOMXPath($doc); - - // Versionsnummer prÃŒfen - $query = "//wpsg/settings/option[@option_name=\"wpshopgermany_version_installed\"]"; - $version = $xpath->query($query); - - $version_node = $version->item(0); - $version = $version_node->getAttribute("option_value"); - - if ($version != "2.5.8") - { - - $this->shop->addBackendError(__('Version des Exportes ist nicht kompatibel, bitte importieren Sie nur aus einem wpShopGermany aus der Version 2.5.8.', 'wpsg')); - $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); - return false; - - } - - $query = "//wpsg/settings/option"; - $settings = $xpath->query($query); - - } - else - { - - if ($this->shop->isMultiBlog()) - { - - $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/'; - - } - else - { - - $path = WP_CONTENT_DIR.'/uploads/'; - - } - - } - - $arSettingsMap = array( - - /* Allgemein */ - 'wpsg_mwst_anteilig' => false, - 'wpsg_options_nl2br' => 'wpsg_options_nl2br', - 'wpsg_options_rte_apply_filter' => 'wpsg_options_no_rte_apply_filter', - 'wpsg_order_format' => 'wpsg_format_onr', - 'wpsg_order_start' => 'wpsg_order_start', - 'wpsg_upload_classic' => 'wpsg_classicupload', - - /* Installierte Module */ - 'mod_auftragbest' => 'wpsg_mod_auftragsbestaetigung', - 'mod_bankeinzug' => 'wpsg_mod_autodebit', - 'mod_billsafe' => 'wpsg_mod_billsafe', - 'mod_cab' => 'wpsg_mod_cab', - 'mod_customerbudget' => 'wpsg_mod_customerbudget', - 'mod_nachnahme' => 'wpsg_mod_debitpayment', - 'mod_rabatt' => 'wpsg_mod_discount', - 'mod_downloadplus' => 'wpsg_mod_downloadplus', - 'mod_downloadprodukt' => 'wpsg_mod_downloadprodukt', - 'mod_exportplus' => 'wpsg_mod_export', - 'mod_freeshipping' => 'wpsg_mod_freeshipping', - 'mod_fuellmenge' => 'wpsg_mod_fuellmenge', - 'mod_gutschein' => 'wpsg_mod_gutschein', - 'mod_rechnung' => 'wpsg_mod_invoice_type', - 'mod_kundenkontakt' => 'wpsg_mod_kundenkontakt', - 'mod_kundenlogin' => 'wpsg_mod_kundenverwaltung', - 'mod_newsletter' => 'wpsg_mod_nlsatolo', - 'mod_orderupload' => 'wpsg_mod_orderupload', - 'mod_bestellvars' => 'wpsg_mod_ordervars', - 'mod_pap' => 'wpsg_mod_pap', - 'mod_paypal' => 'wpsg_mod_paypal', - 'mod_prepayment' => 'wpsg_mod_prepayment', - 'mod_produktgruppen' => 'wpsg_mod_productgroups', - 'mod_produktvars' => 'wpsg_mod_productvars', - 'mod_produktartikel' => 'wpsg_mod_produktartikel', - 'mod_produktbilder' => 'wpsg_mod_produktbilder', - 'mod_protectedshops' => 'wpsg_mod_protectedshops', - 'mod_rechnungen' => 'wpsg_mod_rechnungen', - 'mod_attribute' => 'wpsg_mod_produktattribute', - 'mod_shippingadress' => 'wpsg_mod_shippingadress', - 'mod_skrill' => 'wpsg_mod_skrill', - 'mod_stock' => 'wpsg_mod_stock', - 'mod_sb' => 'wpsg_mod_su', - 'mod_userpayment' => 'wpsg_mod_userpayment', - 'mod_variantenplus' => 'wpsg_mod_varianten', - 'mod_lieferanten' => 'wpsg_mod_versandarten', - 'mod_weight' => 'wpsg_mod_weight', - 'mod_selbstabholer' => 'wpsg_mod_willcollect', - - /* wpsg_mod_produktbilder */ - 'wpshopgermany_produktbilder_tnwidth' => 'wpsg_mod_produktbilder_width', - 'wpshopgermany_produktbilder_tnheight' => 'wpsg_mod_produktbilder_height', - 'wpshopgermany_produktbilder_quality' => 'wpsg_mod_produktbilder_quality', - 'wpshopgermany_produktbilder_mode' => 'wpsg_mod_produktbilder_mode', - - /* wpsg_mod_kundenverwaltung */ - 'wpsg_kundenlogin_salt' => 'wpsg_salt', - 'wpsg_kundenlogin_anfrage_betreff' => 'wpsg_kundenpwdrequest_betreff', - 'wpsg_kundenlogin_newpasswort_betreff' => 'wpsg_kundenpwd_betreff', - 'wpsg_kl_page' => 'wpsg_mod_kundenverwaltung_perpage', - 'wpsg_kl_weber' => 'wpsg_mod_kundenverwaltung_aweber', - 'wpsg_kl_weber_meta_web_form_id' => 'wpsg_mod_kundenverwaltung_aweber_formid', - 'wpsg_kl_listname' => 'wpsg_mod_kundenverwaltung_aweber_listname', - 'wpsg_kl_meta_adtracking' => 'wpsg_mod_kundenverwaltung_aweber_metaAdtracking', - 'wpsg_kundenlogin_profil' => 'wpsg_page_mod_kundenverwaltung_profil', - 'wpsg_kundenlogin_register' => 'wpsg_page_mod_kundenverwaltung_registrierung', - 'wpsg_mod_kundenverwaltung_onlylogin' => 'wpsg_mod_kundenverwaltung_onlylogin', - - /* wpsg_mod_gutschein */ - 'wpshopgermany_gutschein_size' => 'wpsg_mod_gutschein_size', - - /* wpsg_mod_pap */ - 'wpsg_paplogin_pap_url' => 'wpsg_paplogin_pap_url', - 'wpsg_paplogin_admin' => 'wpsg_paplogin_admin', - 'wpsg_paplogin_passwort' => 'wpsg_paplogin_passwort', - 'wpsg_paplogin_register' => 'wpsg_paplogin_register', - 'wpsg_pap_registrierung' => 'wpsg_pap_registrierung', - 'wpsg_pap_include_profil' => false, - 'wpsg_pap_order_tracking' => 'wpsg_pap_order_tracking', - - /* wpsg_mod_export */ - - /* Nicht kompatibel */ - - /* wpsg_mod_customerbudget */ - - /* Keine Einstellungen */ - - /* wpsg_mod_versandarten */ - - /* Keine Einstellungen */ - - /* wpsg_mod_willcollect */ - 'wpshopgermany_selbstabholer_rabgb' => 'wpsg_mod_willcollect_gebuehr', - 'wpshopgermany_shipping_selbstabholer_name' => 'wpsg_mod_willcollect_adress', - 'wpshopgermany_shipping_selbstabholer_strnr' => 'wpsg_mod_willcollect_street', - 'wpshopgermany_shipping_selbstabholer_plzort' => 'wpsg_mod_willcollect_plzort', - - /* wpsg_mod_shippingadress */ - /* Keine Einstellungen */ - - /* wpsg_mod_freeshipping */ - 'wpshopgermany_freeshipping_value' => 'wpsg_mod_freeshipping_minvalue', - 'wpsg_mod_freeshipping_gutschein' => '', // TODO - - /* wpsg_mod_skrill */ - 'wpsg_mod_skrill_bezeichnung' => 'wpsg_mod_skrill_bezeichnung', - 'wpsg_mod_skrill_recipient_description' => 'wpsg_mod_skrill_recipient_description', - 'wpsg_mod_skrill_email' => 'wpsg_mod_skrill_email', - 'wpsg_mod_skrill_id' => 'wpsg_mod_skrill_id', - 'wpsg_mod_skrill_gebuehr' => 'wpsg_mod_skrill_gebuehr', - 'wpsg_mod_skrill_currency' => 'wpsg_mod_skrill_currency', - 'wpsg_mod_skrill_autostart' => 'wpsg_mod_skrill_autostart', - 'wpsg_mod_skrill_code' => 'wpsg_mod_skrill_code', - 'wpsg_page_mod_skrill_success' => 'wpsg_page_mod_skrill_success', - 'wpsg_page_mod_skrill_success_url' => 'wpsg_page_mod_skrill_success_url', - 'wpsg_page_mod_skrill_error' => 'wpsg_page_mod_skrill_error', - 'wpsg_page_mod_skrill_error_url' => 'wpsg_page_mod_skrill_error_url', - - /* wpsg_mod_prepayment */ - 'wpshopgermany_prepayment_rabgb' => 'wpsg_mod_prepayment_gebuehr', - 'wpshopgermany_prepayment_inhaber' => 'wpsg_mod_prepayment_kinhaber', - 'wpshopgermany_prepayment_knr' => 'wpsg_mod_prepayment_knummer', - 'wpshopgermany_prepayment_bank' => 'wpsg_mod_prepayment_bank', - 'wpshopgermany_prepayment_blz' => 'wpsg_mod_prepayment_blz', - 'wpshopgermany_prepayment_ibanbic' => 'wpsg_mod_prepayment_iban', - 'wpshopgermany_prepayment_swift' => 'wpsg_mod_prepayment_swift', - 'wpshopgermany_prepayment_betreff' => 'wpsg_mod_prepayment_subject', - - /* wpsg_mod_paypal */ - 'wpshopgermany_paypal_mail' => 'wpsg_mod_paypal_email', - 'wpshopgermany_paypal_sandbox' => 'wpsg_mod_paypal_sandbox', - 'wpshopgermany_paypal_rabgb' => 'wpsg_mod_paypal_gebuehr', - 'wpshopgermany_paypal_go' => 'wpsg_mod_paypal_autostart', - 'wpshopgermany_pp_pageconfirm' => 'wpsg_page_mod_paypal_success', - 'wpshopgermany_pp_pageconfirm_url' => false, - 'wpshopgermany_pp_pageerror' => 'wpsg_page_mod_paypal_error', - 'wpshopgermany_pp_pageerror_url' => false, - 'wpsg_paypal_currency' => 'wpsg_mod_paypal_currency', - 'wpsg_paypal_currency' => 'wpsg_mod_paypal_currency', - - /* wpsg_mod_debitpayment */ - 'wpshopgermany_shipping_nachnahme' => 'wpsg_mod_debitpayment_rabgeb', - - /* wpsg_mod_invoice_type */ - 'wpshopgermany_rechnung_nachnahme' => 'wpsg_mod_invoice_type_gebuehr', - - /* wpsg_mod_su */ - 'wpshopgermany_sb_rabgb' => 'wpsg_mod_su_gebuehr', - 'wpshopgermany_sb_user_id' => 'wpsg_mod_su_userid', - 'wpshopgermany_sb_project_id' => 'wpsg_mod_su_projectid', - 'wpshopgermany_sb_projekt_password' => 'wpsg_mod_su_projectpassword', - 'wpshopgermany_sb_confirm_password' => 'wpsg_mod_su_noticepassword', - 'wpshopgermany_sb_hash' => 'wpsg_mod_su_hash', - 'wpshopgermany_sb_language_id' => 'wpsg_mod_su_language', - 'wpshopgermany_sb_currency_id' => 'wpsg_mod_su_currency', - 'wpshopgermany_sb_pageerror' => 'wpsg_page_mod_su_error', - 'wpshopgermany_sb_pageconfirm' => 'wpsg_page_mod_su_success', - 'wpsg_sb_go' => 'wpsg_mod_su_autostart', - - /* wpsg_mod_skrill */ - /* Modulkeys komplett gleich */ - - /* wpsg_mod_userpayment */ - /* keine Optionen */ - - /* wpsg_mod_debitpayment */ - 'wpshopgermany_payment_bankeinzug' => 'wpsg_mod_autodebit_gebuehr', - - /* wpsg_mod_cap */ - 'wpsg_cab_merchantid' => 'wpsg_mod_cab_merchantID', - 'wpsg_cab_mmskey' => 'wpsg_mod_cab_mmskryptkey', - 'wpsg_cab_projekttid' => 'wpsg_mod_cab_projectID', - 'wpsg_cab_mmsemail' => 'wpsg_mod_cab_mmsstatusmail', - 'wpsg_cab_secretKey' => 'wpsg_mod_cab_kryptkey', - 'wpsg_cab_rabgeb' => 'wpsg_mod_cab_gebuehr', - 'wpsg_cab_currency' => 'wpsg_mod_cab_currency', - 'wpsg_cab_auftragstext' => 'wpsg_mod_cab_auftragsbezeichnung', - 'wpsg_cab_sandbox' => 'wpsg_mod_cab_sandbox', - 'wpsg_cab_redirekt' => 'wpsg_mod_cab_currency', - 'wpshopgermany_cab_pageconfirm' => 'wpsg_mod_cab_success', - 'wpshopgermany_cab_pageerror' => 'wpsg_mod_cab_error', - 'wpshopgermany_cab_pageconfirm_url' => '', - 'wpshopgermany_cab_pageerror_url' => '', - - /* wpsg_mod_billsafe */ - 'wpsg_billsafe_merchantid' => false, - 'wpsg_billsafe_lizenz' => 'wpsg_mod_billsafe_licence', - 'wpsg_billsafe_appkey' => false, - 'wpsg_billsafe_sandbox' => 'wpsg_mod_billsafe_sandbox', - 'wpsg_billsafe_lizenz_sandbox' => 'wpsg_mod_billsafe_licencesandbox', - 'wpsg_billsafe_rabgb' => 'wpsg_mod_billsafe_gebuehr', - 'wpsg_billsafe_go' => 'wpsg_mod_billsafe_autorun', - 'wpsg_billsafe_error' => 'wpsg_mod_billsafe_error', - 'wpsg_billsafe_erfolg' => 'wpsg_mod_billsafe_success', - 'wpsg_billsafe_logo' => 'wpsg_mod_billsafe_logo', - 'wpsg_billsafe_vorab' => 'wpsg_mod_billsafe_precheck', - - /* Rabatt */ - 'wpsg_rabatt_produktrabatt' => 'wpsg_mod_discount_productdiscount', - 'wpsg_rabatt_produktgruppen' => 'wpsg_mod_discount_universal', - 'wpsg_rabatt_generell_von' => 'wpsg_mod_discount_universal_from', - 'wpsg_rabatt_generell_bis' => 'wpsg_mod_discount_universal_to', - 'wpsg_rabatt_generell_value' => 'wpsg_mod_discount_universal_value', - 'wpsg_rabatt_data' => 'wpsg_mod_discount_data', - - /* Rechnungen */ - 'wpsg_rechnungen_adresszeile' => 'wpsg_rechnungen_adresszeile', - 'wpsg_rechnungen_url' => 'wpsg_rechnungen_url', - 'wpsg_rechnungen_auto' => 'wpsg_mod_rechnungen_auto', - 'wpsg_rechnungen_faelligkeit' => 'wpsg_rechnungen_faelligkeit', - 'wpsg_rechnungen_pbeschreibung' => 'wpsg_rechnungen_pbeschreibung', - 'wpsg_mod_rechnungen_showgutschriftrechnung' => 'wpsg_mod_rechnungen_showgutschriftrechnung', - 'wpsg_mod_rechnungen_showpv' => 'wpsg_mod_rechnungen_showpv', - 'wpsg_mod_rechnungen_showov' => 'wpsg_mod_rechnungen_showov', - 'wpsg_rechnungen_start' => 'wpsg_rechnungen_start', - 'wpsg_gutschrift_start' => 'wpsg_gutschrift_start', - 'wpsg_rechnungen_format' => 'wpsg_rechnungen_format', - 'wpsg_gutschrift_format' => 'wpsg_gutschrift_format', - - /* Bestellupload */ - - /* Zubehörprodukte */ - - /* Produktgruppen */ - 'wpshopgermany_produktgruppen_page' => 'wpsg_productgroups_page', - 'wpsg_produktgruppen_sort' => 'wpsg_productgroups_order', - - /* Produktartikel */ - - /* Fuellmengen */ - 'wpshopgermany_fuellmenge_einheiten' => 'wpsg_mod_fuellmenge_einheit', - 'wpshopgermany_fuellmenge_bezug' => 'wpsg_mod_fuellmenge_bezug', - - /* Produktattribute */ - - /* Lagerbestand */ - 'wpshopgermany_stock_template' => 'wpsg_mod_stock_template', - 'wpshopgermany_stock_allow' => 'wpsg_mod_stock_allow', - - /* Downloadplus */ - 'wpsg_dlplus_anpassung' => 'wpsg_mod_pdfdownload_range', - 'wpsg_dlplus_anpassung_bis' => 'wpsg_mod_pdfdownload_range_von', - 'wpsg_dlplus_anpassung_von' => 'wpsg_mod_pdfdownload_range_bis', - 'wpsg_dlplus_cronclear' => 'wpsg_mod_pdfdownload_cleanraiddownloads', - 'wpsg_dlplus_cronmail' => 'wpsg_pdfdownloadcronmail_empfaenger', - 'wpsg_dlplus_cronsend' => 'wpsg_mod_pdfdownload_autosend', - 'wpsg_dlplus_dokaforms' => 'wpsg_mod_pdfdownload_securitynote', - 'wpsg_dlplus_dokmodify' => 'wpsg_mod_pdfdownload_securitymod', - 'wpsg_dlplus_dokopenpwd' => 'wpsg_mod_pdfdownload_openpass', - 'wpsg_dlplus_dokprint' => 'wpsg_mod_pdfdownload_securityprint', - 'wpsg_dlplus_dokpwd' => 'wpsg_mod_pdfdownload_masterpass', - 'wpsg_dlplus_doksave' => 'wpsg_mod_pdfdownload_securitysave', - 'wpsg_dlplus_filename' => 'wpsg_mod_pdfdownload_filename', - - /* Seitenkonfiguration */ - 'wpshopgermany_basketpage' => 'wpsg_page_basket', - 'wpshopgermany_agbpage' => 'wpsg_page_agb', - 'wpshopgermany_wrpage' => 'wpsg_page_widerrufsbelehrung', - 'wpshopgermany_dspage' => 'wpsg_page_datenschutz', - 'wpshopgermany_vkpage' => 'wpsg_page_versand', - 'wpshopgermany_imppage' => 'wpsg_page_impressum', - - ); - - $arSettingOld = array(); - - // Ich bieg das hier etwas zusammen, da die Einstellungen einmal aus der Datenbank und einmal aus der XML Datei kommen können - if (!isset($_REQUEST['submit_import_db'])) - { - - - // Import aus Datei - foreach ($settings as $entry) - { - - $blog_id = $entry->getAttribute("blog_id"); - $option_name = $entry->getAttribute("option_name"); - $option_value = $entry->getAttribute("option_value"); - $autoload = $entry->getAttribute("autoload"); - - $arSettings[] = array( - 'blog_id' => $blog_id, - 'option_name' => $option_name, - 'option_value' => $option_value, - 'autoload' => $autoload - ); - - } - - } - else - { - - // Import direkt in der Datenbank - $arSettings = $this->db->fetchAssoc(" - SELECT - * - FROM - `".$wpdb->prefix."options` - WHERE - ( - `option_name` LIKE 'wpsg_%' OR - `option_name` LIKE 'wpshopgermany_%' OR - `option_name` LIKE 'mod_%' - ) - AND - ( - `option_name` != 'wpshopgermany_installed' AND - `option_name` != 'wpsg_mods_installed_mod_rechnungen' - ) - "); - - } - - // Damit Fehler angezeigt werden aktivier ich den DEBUG Modus - $this->shop->update_option('wpsg_debugModus', '1'); - - foreach ($arSettings as $entry) - { - - $blog_id = $entry["blog_id"]; - $option_name = $entry["option_name"]; - $option_value = $entry["option_value"]; - $autoload = $entry["autoload"]; - - if (!array_key_exists($option_name, $arSettingsMap)) - { - - $this->db->Query("DELETE FROM `".$wpdb->prefix."options` WHERE `option_name` = '".wpsg_q($option_name)."'"); - - $this->db->ImportQuery($wpdb->prefix."options", array( - 'blog_id' => $blog_id, - 'option_name' => $option_name, - 'option_value' => $option_value, - 'autoload' => $autoload - ), true); - //$this->shop->update_option($option_name, $option_value); - - } - else if ($arSettingsMap[$option_name] !== false) - { - - $this->db->Query("DELETE FROM `".$wpdb->prefix."options` WHERE `option_name` = '".wpsg_q($arSettingsMap[$option_name])."'"); - - $this->db->ImportQuery($wpdb->prefix."options", array( - 'blog_id' => $blog_id, - 'option_name' => $arSettingsMap[$option_name], - 'option_value' => $option_value, - 'autoload' => $autoload - ), true); - //$this->shop->update_option($arSettingsMap[$option_name], $option_value); - - } - - } - - // Spezielle Felder - $wpsg_mod_downloadplus_text = array( - 0 => array( - 'aktiv' => $arSettings['wpsg_dlplus_watermark'], - 'text' => $arSettings['wpsg_dlplus_watermark_text'], - 'x' => $arSettings['wpsg_dlplus_watermark_x'], - 'y' => $arSettings['wpsg_dlplus_watermark_y'], - 'align' => $arSettings['wpsg_dlplus_watermark_center'], - 'bg' => $arSettings['wpsg_dlplus_watermark_bg'], - 'color' => $arSettings['wpsg_dlplus_watermark_color'], - 'alpha' => $arSettings['wpsg_dlplus_watermark_alpha'], - 'angle' => $arSettings['wpsg_dlplus_watermark_winkel'], - 'fontsize' => $arSettings['wpsg_dlplus_watermark_fontsize'] - ), - 1 => array( - 'aktiv' => $arSettings['wpsg_dlplus_text1'], - 'text' => $arSettings['wpsg_dlplus_text1_text'], - 'x' => $arSettings['wpsg_dlplus_text1_x'], - 'y' => $arSettings['wpsg_dlplus_text1_y'], - 'align' => $arSettings['wpsg_dlplus_text1_center'], - 'bg' => $arSettings['wpsg_dlplus_text1_bg'], - 'color' => $arSettings['wpsg_dlplus_text1_color'], - 'alpha' => $arSettings['wpsg_dlplus_text1_alpha'], - 'angle' => $arSettings['wpsg_dlplus_text1_winkel'], - 'fontsize' => $arSettings['wpsg_dlplus_text1_fontsize'] - ), - 2 => array( - 'aktiv' => $arSettings['wpsg_dlplus_text2'], - 'text' => $arSettings['wpsg_dlplus_text2_text'], - 'x' => $arSettings['wpsg_dlplus_text2_x'], - 'y' => $arSettings['wpsg_dlplus_text2_y'], - 'align' => $arSettings['wpsg_dlplus_text2_center'], - 'bg' => $arSettings['wpsg_dlplus_text2_bg'], - 'color' => $arSettings['wpsg_dlplus_text2_color'], - 'alpha' => $arSettings['wpsg_dlplus_text2_alpha'], - 'angle' => $arSettings['wpsg_dlplus_text2_winkel'], - 'fontsize' => $arSettings['wpsg_dlplus_text2_fontsize'] - ) - ); - - $this->shop->update_option('wpsg_mod_downloadplus_text', serialize($wpsg_mod_downloadplus_text)); - $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand', $arSettings['wpsg_kl_register'] % 1); - - $this->shop->update_option('wpsg_installed', time(), true); - - // Module aktivieren, damit die Tabellen vorbereitet sind - $this->shop->loadModule(true); - foreach ($this->shop->arAllModule as $m_key => $m) - { - - if ($this->shop->get_option($m_key) > 0) - { - - $init = base64_decode('aW5zdGFsbEZpcnN0'); //'installFirst'; - - $this->shop->arAllModule[$m_key]->$init(); - $this->shop->arAllModule[$m_key]->install(); - - } - - } - - // Welche Tabellen sind da? - $arTables = $this->db->fetchAssocField("SHOW TABLES"); - - if ($this->shop->isMultiBlog()) - { - $target_path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/'; - } - else - { - $target_path = WP_CONTENT_DIR.'/uploads/'; - } - - if (!isset($_REQUEST['submit_import_db'])) - { - - // Verzeichnisse aus XML - if (file_exists($path.'/wpsg_rechnungen/')) wpsg_copy( - $path.'/wpsg_rechnungen/', - $target_path.'/wpsg_rechnungen' - ); - - if (file_exists($path.'/wpsg_produktbilder/')) wpsg_copy( - $path.'/wpsg_produktbilder/', - $target_path.'/wpsg_produktbilder' - ); - - if (file_exists($path.'/produktfiles/')) wpsg_copy( - $path.'/produktfiles/', - $target_path.'/wpsg_produktfiles' - ); - - } - else - { - - // Verzeichnisse aus XML - if (file_exists($path.'/produktbilder/')) wpsg_copy( - $path.'/produktbilder/', - $target_path.'/wpsg_produktbilder' - ); - - if (file_exists($path.'/produktfiles/')) wpsg_copy( - $path.'/produktfiles/', - $target_path.'/wpsg_produktfiles' - ); - - } - - // Tabellen - $arTables_Import = array(); - - if (!isset($_REQUEST['submit_import_db'])) - { - - // Import aus XML Datei - - $query = "//wpsg/*[@table_name]"; - $tables = $xpath->query($query); - - foreach ($tables as $t) - { - - // Rows hinzufÃŒgen - $rows = $t->getElementsByTagName("row"); - - $arRows = array(); - - foreach ($rows as $row_entry) - { - - $row = array(); - - foreach ($row_entry->attributes as $attribute) - { - - $row[$attribute->name] = $attribute->value; - - } - - $arRows[] = $row; - - } - - $arTables_Import[] = array( - 'name' => $t->getAttribute("table_name"), - 'rows' => $arRows - ); - - } - - } - else - { - - foreach ($arTables as $t) - { - - if (preg_match('/\wpshopgermany\_/', $t)) - { - - $arTables_Import[] = array( - 'name' => $t, - 'rows' => $this->db->fetchAssoc("SELECT * FROM `".$t."`") - ); - - } - - } - - } - - foreach ($arTables_Import as $entry) - { - - //$table_name = $entry->getAttribute("table_name"); - //$rows = $entry->getElementsByTagName("row"); - - $table_name = $entry['name']; - $rows = $entry['rows']; - - foreach ($rows as $row_entry) - { - - if (preg_match('/wpshopgermany_products$/', $table_name)) // Produkte - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'name' => wpsg_q($row_entry['name']), - 'detailname' => wpsg_q($row_entry['detailname']), - 'anr' => wpsg_q($row_entry['anr']), - 'typ' => wpsg_q($row_entry['typ']), - 'preis' => wpsg_q($row_entry['preis']), - 'mwst_key' => 'c', - 'beschreibung' => wpsg_q($row_entry['beschreibung']), - 'pgruppe' => wpsg_q($row_entry['pgruppe']), - 'ptemplate_file' => wpsg_q($row_entry['ptemplate_file']), - 'deleted' => wpsg_q($row_entry['deleted']), - 'lang_parent' => wpsg_q($row_entry['lang_parent']), - 'lang_locale' => wpsg_q($row_entry['lang_locale']), - 'rabatt' => wpsg_q($row_entry['rabatt']), - 'posturl' => wpsg_q($row_entry['mod_impexp_posturl']), - 'posturl_verkauf' => wpsg_q($row_entry['mod_impexp_verkauf']), - 'posturl_bezahlung' => wpsg_q($row_entry['mod_impexp_bezahlung']), - 'produktvars' => wpsg_q($row_entry['produktvars']), - 'feinheit' => wpsg_q($row_entry['feinheit']), - 'fmenge' => wpsg_q($row_entry['fmenge']), - 'stock' => wpsg_q($row_entry['stock']), - 'stock_count' => wpsg_q($row_entry['stock_count']), - 'mod_varianten' => wpsg_q($row_entry['variantenplus']), - 'weight' => wpsg_q($row_entry['weight']), - 'partikel' => wpsg_q($row_entry['partikel']), - 'downloadplus' => wpsg_q($row_entry['downloadplus']) - ); - - $this->db->ImportQuery(WPSG_TBL_PRODUCTS, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_order$/', $table_name)) // Bestellungen - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'onr' => wpsg_q($row_entry['onr']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'k_id' => wpsg_q($row_entry['k_id']), - 'ip' => wpsg_q($row_entry['ip']), - 'useragent' => wpsg_q($row_entry['useragent']), - 'comment' => wpsg_q($row_entry['comment']), - 'price_gesamt' => wpsg_q($row_entry['price_gesamt']), - 'price_shipping' => wpsg_q($row_entry['price_shipping']), - 'price_payment' => wpsg_q($row_entry['price_payment']), - 'price_rabatt' => wpsg_q($row_entry['price_rabatt']), - 'price_gs' => wpsg_q($row_entry['price_gs']), - 'mwst_payment' => wpsg_q($row_entry['mwst_payment']), - 'mwst_shipping' => wpsg_q($row_entry['mwst_shipping']), - 'type_shipping' => wpsg_q($row_entry['type_shipping']), - 'type_payment' => wpsg_q($row_entry['type_payment']), - 'shipping_vname' => wpsg_q($row_entry['shipping_vname']), - 'shipping_name' => wpsg_q($row_entry['shipping_name']), - 'shipping_strasse' => wpsg_q($row_entry['shipping_strasse']), - 'shipping_hausnr' => wpsg_q($row_entry['shipping_hausnr']), - 'shipping_plz' => wpsg_q($row_entry['shipping_plz']), - 'shipping_ort' => wpsg_q($row_entry['shipping_ort']), - 'shipping_land' => wpsg_q($row_entry['shipping_land']), - 'shipping_firma' => wpsg_q($row_entry['shipping_firma']), - 'payed_date' => wpsg_q($row_entry['payed_date']), - 'bvars' => wpsg_q($row_entry['bvars']), - 'pvars' => wpsg_q($row_entry['pvars']), - 'status' => wpsg_q($row_entry['status']), - 'transaction' => wpsg_q($row_entry['transaction']), - 'dp_cron_planed' => wpsg_q($row_entry['dp_cron_planed']), - 'dp_cron_done' => wpsg_q($row_entry['dp_cron_done']), - 'gs_id' => wpsg_q($row_entry['gs_id']), - 'kleinunternehmer' => wpsg_q($row_entry['kleinunternehmer']), - 'custom_data' => wpsg_q($row_entry['']), - 'admincomment' => wpsg_q($row_entry['admincomment']), - 'language' => '', // Gab es frÃŒher nicht - 'mod_autodebit_name' => wpsg_q($row_entry['bname']), - 'mod_autodebit_blz' => wpsg_q($row_entry['bblz']), - 'mod_autodebit_inhaber' => wpsg_q($row_entry['binhaber']), - 'mod_autodebit_knr' => wpsg_q($row_entry['bnr']), - 'weight' => '', // Gab es frÃŒher nicht - 'mod_billsafe_token' => wpsg_q($row_entry['mod_billsafe_token']), - 'mod_billsafe_transaction_id' => wpsg_q($row_entry['mod_billsafe_transaction_id']), - 'cab_externalid' => wpsg_q($row_entry['cab_externalid']), - 'cab_requestTrackingID' => wpsg_q($row_entry['cab_requestTrackingID']), - 'cab_transactionID' => wpsg_q($row_entry['cab_transactionID']), - 'cab_transactionStatus' => wpsg_q($row_entry['cab_transactionStatus']), - 'cab_started' => wpsg_q($row_entry['cab_started']), - 'cab_lastupdate' => wpsg_q($row_entry['cab_lastupdate']), - 'cab_paylink' => wpsg_q($row_entry['cab_paylink']), - 'cab_repayed' => wpsg_q($row_entry['cab_repayed']), - ); - - $this->db->ImportQuery(WPSG_TBL_ORDER, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_attribute$/', $table_name) && in_array(WPSG_TBL_AT, $arTables)) // Produktattribute - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['name']), - 'typ' => wpsg_q($row_entry['typ']), - 'auswahl' => '' // Gab es frÃŒher nicht - ); - - $this->db->ImportQuery(WPSG_TBL_AT, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_cab$/', $table_name) && in_array(WPSG_TBL_CABLOG, $arTables)) // Click & Buy Log - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'extID' => wpsg_q($row_entry['extID']), - 'transID' => wpsg_q($row_entry['transID']), - 'eventID' => wpsg_q($row_entry['eventID']), - 'oldState' => wpsg_q($row_entry['oldState']), - 'newState' => wpsg_q($row_entry['newState']) - ); - - $this->db->ImportQuery(WPSG_TBL_CABLOG, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_downloadplus$/', $table_name)) // Downloadplus - { - - // - - } - else if (preg_match('/wpshopgermany_exportprofile$/', $table_name)) // Exportprofile - { - - } - else if (preg_match('/wpshopgermany_gutscheine$/', $table_name) && in_array(WPSG_TBL_GUTSCHEIN, $arTables)) // Gutscheine - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'code' => wpsg_q($row_entry['code']), - 'value' => wpsg_q($row_entry['value']), - 'o_id' => wpsg_q($row_entry['o_id']), - 'calc_typ' => wpsg_q($row_entry['calc_typ']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'start_date' => wpsg_q($row_entry['start_date']), - 'end_date' => wpsg_q($row_entry['end_date']), - 'multi' => wpsg_q($row_entry['multi']) - ); - - $this->db->ImportQuery(WPSG_TBL_GUTSCHEIN, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_kunden$/', $table_name)) // Kunden - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'knr' => '', // Neu - 'paypal_payer_id' => wpsg_q($row_entry['paypal_payer_id']), - 'title' => wpsg_q($row_entry['title']), - 'name' => wpsg_q($row_entry['name']), - 'vname' => wpsg_q($row_entry['vname']), - 'email' => wpsg_q($row_entry['email']), - 'firma' => wpsg_q($row_entry['firma']), - 'fax' => wpsg_q($row_entry['fax']), - 'strasse' => wpsg_q($row_entry['strasse']), - 'plz' => wpsg_q($row_entry['plz']), - 'ort' => wpsg_q($row_entry['ort']), - 'land' => wpsg_q($row_entry['land']), - 'tel' => wpsg_q($row_entry['tel']), - 'geb' => wpsg_q($row_entry['geb']), - 'ustidnr' => wpsg_q($row_entry['ustidnr']), - 'custom' => wpsg_q($row_entry['custom']), - 'passwort_saltmd5' => wpsg_q($row_entry['passwort_saltmd5']), - 'comment' => wpsg_q($row_entry['comment']), - 'budget' => wpsg_q($row_entry['budget']), - ); - - $this->db->ImportQuery(WPSG_TBL_KU, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_land$/', $table_name) && in_array(WPSG_TBL_LAND, $arTables)) // LÀnder - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['bezeichnung']), - 'kuerzel' => wpsg_q($row_entry['kuerzel']), - 'vz' => wpsg_q($row_entry['vz']), - 'mwst' => wpsg_q($row_entry['mwst']) - ); - - $this->db->ImportQuery(WPSG_TBL_LAND, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_lieferanten$/', $table_name) && in_array(WPSG_TBL_VA, $arTables)) // Lieferanten/Versandarten - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['name']), - 'vz' => wpsg_q($row_entry['vz']), - 'hint' => '', // Neu - 'mwst' => '', // War frÃŒher Wert sollte ÃŒberprÃŒft werden ! - 'mwst_laender' => '', // Gab es nicht - 'typ' => wpsg_q($row_entry['typ']), - 'kosten' => wpsg_q($row_entry['kosten']), - 'deleted' => wpsg_q($row_entry['deleted']), - 'aktiv' => '1' - ); - - $this->db->ImportQuery(WPSG_TBL_VA, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_mwst$/', $table_name)) // Mehrwertsteuer - { - - // Nix machen mit den DatensÀtzen - - } - else if (preg_match('/wpshopgermany_orderlog$/', $table_name)) // Bestellprotokoll - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'o_id' => wpsg_q($row_entry['o_id']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'title' => wpsg_q($row_entry['title']), - 'mailtext' => wpsg_q($row_entry['mailtext']) - ); - - $this->db->ImportQuery(WPSG_TBL_OL, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_ordervars$/', $table_name) && in_array(WPSG_TBL_ORDERVARS, $arTables)) // Bestellvariablen - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['name']), - 'typ' => wpsg_q($row_entry['typ']), - 'auswahl' => wpsg_q($row_entry['auswahl']), - 'pflicht' => wpsg_q($row_entry['pflicht']), - 'deleted' => '0' // Gab es frÃŒher nicht - ); - - $this->db->ImportQuery(WPSG_TBL_ORDERVARS, $data_ins, true); - - // Übersetzte Bestellvariablen mÃŒssen manuell nachgetragen werden - - } - else if (preg_match('/wpshopgermany_order_products$/', $table_name)) // PRodukt <-> Bestellung - { - - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'o_id' => wpsg_q($row_entry['o_id']), - 'p_id' => wpsg_q($row_entry['p_id']), - 'menge' => wpsg_q($row_entry['menge']), - 'price' => wpsg_q($row_entry['price']), - 'mwst' => '', // Die Zuordnung der ID gibt es im alten nicht - 'mwst_value' => wpsg_q($row_entry['mwst']), - 'mod_downloadprodukt_counter' => wpsg_q($row_entry['mod_downloadprodukt_counter']), - 'mod_vp_varkey' => wpsg_q($row_entry['mod_vp_varkey']), - 'weight' => '' // Gewicht wurde frÃŒher nicht erfasst - ); - - $this->db->ImportQuery(WPSG_TBL_ORDERPRODUCT, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_products_attribute$/', $table_name) && in_array(WPSG_TBL_PRODUCTS_AT, $arTables)) - { - - $data_ins = array( - 'p_id' => wpsg_q($row_entry['p_id']), - 'a_id' => wpsg_q($row_entry['a_id']), - 'value' => wpsg_q($row_entry['value']) - ); - - $this->db->ImportQuery(WPSG_TBL_PRODUCTS_AT, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_products_vari$/', $table_name)) - { - - // EntfÀllt - - } - else if (preg_match('/wpshopgermany_produktgruppen$/', $table_name) && in_array(WPSG_TBL_PRODUCTS_GROUP, $arTables)) - { - - // Produktgruppen - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'cdate' => wpsg_q($row_entry['cdate']), - 'name' => wpsg_q($row_entry['name']), - 'template_file' => wpsg_q($row_entry['template_file']), - 'infopage' => wpsg_q($row_entry['infopage']), - 'deleted' => wpsg_q($row_entry['deleted']), - 'rabatt' => wpsg_q($row_entry['rabatt']) - ); - - $this->db->ImportQuery(WPSG_TBL_PRODUCTS_GROUP, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_produktsticky$/', $table_name) && in_array(WPSG_TBL_PRODUCTS_STICKY, $arTables)) - { - - // Produkt Sticky - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'produkt_id' => wpsg_q($row_entry['produkt_id']), - 'von' => wpsg_q($row_entry['von']), - 'bis' => wpsg_q($row_entry['bis']) - ); - - $this->db->ImportQuery(WPSG_TBL_PRODUCTS_STICKY, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_produktvars$/', $table_name) && in_array(WPSG_TBL_PRODUCTS_VARS, $arTables)) - { - - // Produktvariablen - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['name']), - 'typ' => wpsg_q($row_entry['typ']), - 'auswahl' => wpsg_q($row_entry['auswahl']), - 'pflicht' => wpsg_q($row_entry['pflicht']) - ); - - $this->db->ImportQuery(WPSG_TBL_PRODUCTS_VARS, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_rechnungen$/', $table_name) && in_array(WPSG_TBL_RECHNUNGEN, $arTables)) - { - - // Rechnungen - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'o_id' => wpsg_q($row_entry['o_id']), - 'datum' => wpsg_q($row_entry['datum']), - 'storno' => wpsg_q($row_entry['storno']), - 'rnr' => wpsg_q($row_entry['rnr']), - 'gnr' => wpsg_q($row_entry['gnr']) - ); - - $this->db->ImportQuery(WPSG_TBL_RECHNUNGEN, $data_ins, true); - - } - else if (preg_match('/wpshopgermany_zahlvarianten$/', $table_name) && in_array(WPSG_TBL_ZV, $arTables)) - { - - // Zahlvarianten - $data_ins = array( - 'id' => wpsg_q($row_entry['id']), - 'name' => wpsg_q($row_entry['name']), - 'rabgeb' => wpsg_q($row_entry['rabgeb']), - 'hint' => '', - 'mwst' => '0', - 'mwst_laender' => '0', - 'aktiv' => '1' - ); - - $this->db->ImportQuery(WPSG_TBL_ZV, $data_ins, true); - - } - - } - - } - - // Alte Tabellen löschen - if ($_REQUEST['tabledel'] == '1') - { - - foreach ($arTables_Import as $t) - { - - $this->db->Query("DROP TABLE IF EXISTS `".$t['name']."`"); - - } - - //if (file_exists($path.'/produktbilder/')) wpsg_rrmdir($path.'/produktbilder/'); - //if (file_exists($path.'/produktfiles/')) wpsg_rrmdir($path.'/produktfiles/'); - - } - - $this->addBackendMessage(__('Import war erfolgreich, bitte prÃŒfen Sie die Daten.', 'wpsg')); - $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=hilfe'); - - } // private function importV2() - /** * Nach dem Update auf Version3 ist es durch den Export in die XML Datei zu einer serialisierung des schon serialisierten Strings gekommen Index: /controller/wpsg_BasketController.class.php =================================================================== --- /controller/wpsg_BasketController.class.php (revision 5918) +++ /controller/wpsg_BasketController.class.php (revision 5921) @@ -9,6 +9,6 @@ public function content_filter(&$content) { - - if (get_the_id() == $this->get_option('wpsg_page_basket')) + + if (get_the_id() == $this->shop->getPagePID(wpsg_ShopController::PAGE_BASKET)) { Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5918) +++ /controller/wpsg_ProduktController.class.php (revision 5921) @@ -310,5 +310,5 @@ { - $product_translated_id = $this->db->fetchRow(" + $product_translated_id = $this->db->fetchOne(" SELECT P.`id` @@ -317,5 +317,5 @@ WHERE P.`lang_parent` = '".wpsg_q($_REQUEST['edit_id'])."' AND - P.`lang_locale` = '".wpsg_q($_REQUEST['wpsg_lang'])."' + P.`lang_code` = '".wpsg_q($_REQUEST['wpsg_lang'])."' "); @@ -324,5 +324,5 @@ $arLang = $this->shop->getStoreLanguages(); - + // Übersetzung anlegen $product_data_original = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($_REQUEST['edit_id'])."'"); @@ -330,8 +330,8 @@ unset($product_data_original['id']); $product_data_original['lang_parent'] = wpsg_q($_REQUEST['edit_id']); - $product_data_original['lang_locale'] = wpsg_q($_REQUEST['wpsg_lang']); - $product_data_original['name'] .= ' ['.$arLang[$_REQUEST['wpsg_lang']]['name'].']'; - $product_data_original['beschreibung'] .= ' ['.$arLang[$_REQUEST['wpsg_lang']]['name'].']'; - if (trim($product_data_original['detailname']) != '') $product_data_original['detailname'] .= ' ['.$arLang[$_REQUEST['wpsg_lang']]['name'].']'; + $product_data_original['lang_code'] = wpsg_q($_REQUEST['wpsg_lang']); + $product_data_original['name'] .= ' ['.$arLang[$this->shop->getLocaleToLanguageCode($_REQUEST['wpsg_lang'])]['name'].']'; + $product_data_original['beschreibung'] .= ' ['.$arLang[$this->shop->getLocaleToLanguageCode($_REQUEST['wpsg_lang'])]['name'].']'; + if (trim($product_data_original['detailname']) != '') $product_data_original['detailname'] .= ' ['.$arLang[$this->shop->getLocaleToLanguageCode($_REQUEST['wpsg_lang'])]['name'].']'; $product_translated_id = $this->db->ImportQuery(WPSG_TBL_PRODUCTS, $product_data_original); @@ -348,5 +348,5 @@ WHERE P.`lang_parent` = '".wpsg_q($_REQUEST['edit_id'])."' AND - P.`lang_locale` = '".wpsg_q($_REQUEST['wpsg_lang'])."' + P.`lang_code` = '".wpsg_q($_REQUEST['wpsg_lang'])."' "); @@ -515,7 +515,7 @@ // Übersetzung speichern - $trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($_REQUEST['edit_id'])."' AND `lang_locale` = '".wpsg_q($_REQUEST['wpsg_lang'])."'"); - - if ($trans_id <= 0) die(__('ERROR: Übersetzung existiert noch nicht, das dÃŒrfte nicht passieren!', 'wpsg')); + $trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($_REQUEST['edit_id'])."' AND `lang_code` = '".wpsg_q($_REQUEST['wpsg_lang'])."'"); + + if ($trans_id <= 0) throw new \Exception(__('ERROR: Übersetzung existiert noch nicht, das dÃŒrfte nicht passieren!', 'wpsg')); $data = array( @@ -523,5 +523,6 @@ 'detailname' => wpsg_q($_REQUEST['detailname']), 'shortdesc' => wpsg_q($_REQUEST['shortdesc']), - 'beschreibung' => wpsg_q($_REQUEST['beschreibung']) + 'beschreibung' => wpsg_q($_REQUEST['beschreibung']), + 'partikel' => wpsg_q(wpsg_getStr($_REQUEST['partikel'])) ); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5918) +++ /controller/wpsg_ShopController.class.php (revision 5921) @@ -83,4 +83,7 @@ const STATUS_ZURUECKGEZAHLT = 400; const STATUS_STORNIERT = 500; + + /** Seitenkonstanten */ + const PAGE_BASKET = 1; /** @@ -1193,5 +1196,5 @@ /** - * Shortcode fï¿œr Warenkorbbutton, um Produkte aus Kategorieï¿œbersicht in Warenkorb zu legen (muss in jedem Beitrag eingefï¿œgt werden) + * Shortcode fÃŒr Warenkorbbutton, um Produkte aus Kategorieï¿œbersicht in Warenkorb zu legen (muss in jedem Beitrag eingefï¿œgt werden) */ public function shortcode_basket($atts, $content = '') @@ -1471,5 +1474,5 @@ { - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->getCurrentLanguage())."'"); + $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); if ($produkt_trans['id'] > 0) @@ -1815,5 +1818,5 @@ { - $product_trans_name = $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_locale` = '".wpsg_q($this->getCurrentLanguage())."'"); + $product_trans_name = $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguage())."'"); if (wpsg_isSizedString($product_trans_name)) @@ -2155,30 +2158,94 @@ /** + * Gibt die ID einer Seite aus den Einstellungen zurÃŒck, + * beachtet dabei die aktuelle Sprache + */ + public function getPagePID($page_const) + { + + switch ($page_const) + { + + case self::PAGE_BASKET: return $this->getPageId($this->get_option('wpsg_page_basket')); + + } + + throw new \Exception(__('UngÃŒltige Seite')); + + } + + /** + * Wie get_the_id() gibt aber bei WPML und ÃŒbersetzten Seiten die ID der Originalseite zurÃŒck + */ + public function getPageId($page_id) + { + + if (function_exists('icl_object_id')) //is_plugin_active('sitepress-multilingual-cms/sitepress.php')) + { + + return icl_object_id($page_id, 'page', true); + + } else return $page_id; + + } // public function get_the_id() + + /** * Gibt die Locale der Standard Backend Sprache zurÃŒck + * de / en etc. + */ + public function getDefaultLanguageCode() + { + + return $this->get_option('wpsg_backend_language'); + + } // public function getDefaultLanguageCode() + + /** + * Gibt die Locale fÃŒr die aktuelle Sprache zurÃŒck */ public function getDefaultLanguageLocale() { - - $arLanguage = $this->getStoreLanguages(); - - foreach ((array)$arLanguage as $locale => $lang) - { - - if ($lang['lang'] == $this->get_option('wpsg_backend_language')) return $locale; - - } - + + if (!$this->force_locale) + { + + $arStoreLanguages = $this->getStoreLanguages(); + + foreach ($arStoreLanguages as $lang) + { + + if ($lang['lang'] == $this->getDefaultLanguageCode()) return $lang['locale']; + + } + + return false; + + } + else return $this->force_locale; + } // public function getDefaultLanguageLocale() - /** - * Gibt die Locale fÃŒr die aktuelle Sprache zurÃŒck - */ - public function getCurrentLanguage() - { - - if (!$this->force_locale) return get_locale(); - else return $this->force_locale; - - } // public function getCurrentLanguage() + public function getCurrentLanguageCode() + { + + $arStoreLanguages = $this->getStoreLanguages(); + + foreach ($arStoreLanguages as $lang) + { + + if ($lang['locale'] == $this->getCurrentLanguageLocale()) return $lang['lang']; + + } + + return ''; + + } + + public function getCurrentLanguageLocale() + { + + return get_locale(); + + } /** @@ -2241,5 +2308,5 @@ { - $trans_id = $this->_db->fetchOne("SELECT P.`id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_locale` = '".wpsg_q($lang)."'"); + $trans_id = $this->_db->fetchOne("SELECT P.`id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_id)."' AND `lang_code` = '".wpsg_q($lang)."'"); if ($trans_id <= 0) return false; @@ -2252,40 +2319,37 @@ } // public function getTranslationID($product_id, $lang) - - /** - * Gibt die Locale der eingestellten Standardsprache zurÃŒck - */ - public function getDefaultLanguage() + + /** + * Gibt true zurÃŒck, sollte die aktive Sprache nicht die Aktuelle Sprache sein + */ + public function isOtherLang() { global $q_config; - - $arLocales = $q_config['locale']; - - if (!wpsg_isSizedArray($arLocales)) return false; - if (!array_key_exists($q_config['default_language'], $arLocales)) return false; - - return $arLocales[$q_config['default_language']]; - - } // public function getDefaultLanguage() - - /** - * Gibt true zurÃŒck, sollte qTranslate nicht in der Main Sprache sein - */ - public function isOtherLang() - { - - global $q_config; - + if ($this->force_locale !== false && $this->getCurrentLanguage() != get_locale()) return true; - - $arLocales = $q_config['locale']; - $qtDefault = $q_config['default_language']; - - if (isset($arLocales[$qtDefault]) && $arLocales[$qtDefault] != "" && get_locale() != $arLocales[$qtDefault]) - { - - return true; - + + if (function_exists('icl_object_id')) //if (is_plugin_active('sitepress-multilingual-cms/sitepress.php')) + { + + // WPML + if (get_locale() != $this->getDefaultLanguageLocale()) return true; + + } + else + { + + // qTranslate + + $arLocales = $q_config['locale']; + $qtDefault = $q_config['default_language']; + + if (isset($arLocales[$qtDefault]) && $arLocales[$qtDefault] != "" && get_locale() != $arLocales[$qtDefault]) + { + + return true; + + } + } @@ -2294,4 +2358,20 @@ } // public function isOtherLang() + public function getLocaleToLanguageCode($code) + { + + $arLang = $this->getStoreLanguages(); + + foreach ($arLang as $lang) + { + + if ($lang['lang'] == $code) return $lang['locale']; + + } + + return false; + + } + /** * Gibt true zurÃŒck wenn mehrere Sprachen im System verwendet werden @@ -2315,26 +2395,53 @@ $arLang = array(); - - if ($q_config['enabled_languages'] != "") - { - - $qt_arLang = $q_config['enabled_languages']; - - $arLocales = $q_config['locale']; - $arFlags = $q_config['flag']; - $arNames = $q_config['language_name']; - - foreach ($qt_arLang as $lang) - { - - $arLang[$arLocales[$lang]] = array( - "name" => $arNames[$lang], - "flag" => $arFlags[$lang], - "locale" => $arLocales[$lang], - "lang" => $lang - ); - - } - + + if (function_exists('icl_object_id')) // if (is_plugin_active('sitepress-multilingual-cms/sitepress.php')) + { + + // WPML + + $languages = apply_filters('wpml_active_languages', NULL, 'orderby=id&order=desc&skip_missing=0'); + + foreach ($languages as $l) + { + + $arLang[$l['default_locale']] = array( + 'name' => $l['translated_name'], + 'flag' => $l['country_flag_url'], + 'locale' => $l['default_locale'], + 'lang' => $l['code'] + ); + + } + + } + else + { + + // qTranslate Fallback + + if (wpsg_isSizedArray($q_config) && $q_config['enabled_languages'] != "") + { + + $qt_arLang = $q_config['enabled_languages']; + + $arLocales = $q_config['locale']; + $arFlags = $q_config['flag']; + $arNames = $q_config['language_name']; + + foreach ($qt_arLang as $lang) + { + + $arLang[$arLocales[$lang]] = array( + "name" => $arNames[$lang], + "flag" => $arFlags[$lang], + "locale" => $arLocales[$lang], + "lang" => $lang + ); + + } + + } + } Index: /controller/wpsg_SystemController.class.php =================================================================== --- /controller/wpsg_SystemController.class.php (revision 5918) +++ /controller/wpsg_SystemController.class.php (revision 5921) @@ -561,6 +561,7 @@ public function getFlagURL() { - - return WPSG_URL_CONTENT.'plugins/qtranslate-x/flags/'; + + if (is_plugin_active('sitepress-multilingual-cms/sitepress.php')) return ''; + else return WPSG_URL_CONTENT.'plugins/qtranslate-x/flags/'; } // public function getFlagURL() Index: /lib/install.php =================================================================== --- /lib/install.php (revision 5918) +++ /lib/install.php (revision 5921) @@ -42,5 +42,5 @@ deleted INT(1) NOT NULL, lang_parent INT(11) NOT NULL, - lang_locale VARCHAR(11) NOT NULL, + lang_code VARCHAR(11) NOT NULL COMMENT 'Der Language Code der Übersetzung', rabatt VARCHAR(255) NOT NULL, posturl VARCHAR(500) NOT NULL, Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 5918) +++ /lib/wpsg_basket.class.php (revision 5921) @@ -776,5 +776,5 @@ { - $data['language'] = wpsg_q($this->shop->getCurrentLanguage()); + $data['language'] = wpsg_q($this->shop->getCurrentLanguageCode()); } Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5918) +++ /model/wpsg_product.class.php (revision 5921) @@ -35,5 +35,5 @@ `".WPSG_TBL_PRODUCTS."` AS P WHERE - P.`lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."' AND + P.`lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."' AND P.`lang_parent` = '".wpsg_q($product_id)."' "); @@ -49,5 +49,5 @@ } - + $this->loadedData = $this->shop->loadProduktArray($product_id); @@ -550,5 +550,5 @@ $strQuerySELECT = ""; - $strQueryWHERE = ""; + $strQueryWHERE = " AND P.`lang_parent` <= 0 "; $strQueryJOIN = ""; $strQueryHAVING = ""; Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 5918) +++ /mods/wpsg_mod_billsafe.class.php (revision 5921) @@ -750,5 +750,5 @@ { - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if ($produkt_trans['id'] > 0) Index: /mods/wpsg_mod_cab.class.php =================================================================== --- /mods/wpsg_mod_cab.class.php (revision 5918) +++ /mods/wpsg_mod_cab.class.php (revision 5921) @@ -581,5 +581,5 @@ { - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if ($produkt_trans['id'] > 0) Index: /mods/wpsg_mod_deliverynote.class.php =================================================================== --- /mods/wpsg_mod_deliverynote.class.php (revision 5918) +++ /mods/wpsg_mod_deliverynote.class.php (revision 5921) @@ -626,5 +626,5 @@ { - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_data['p_id'])."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($product_data['p_id'])."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if ($produkt_trans['id'] > 0) Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 5918) +++ /mods/wpsg_mod_deliverytime.class.php (revision 5921) @@ -59,4 +59,6 @@ { + if (isset($_REQUEST['wpsg_lang'])) return; + if ($this->shop->get_option('wpsg_mod_deliverytime_mode') == self::MODE_SELECT) { @@ -239,9 +241,10 @@ $arPossibleDelivery = wpsg_trim(explode(',', $this->shop->get_option('wpsg_mod_deliverytime_mode_select_values'))); - - if (wpsg_isSizedString($oProduct->wpsg_mod_deliverytime_deliverytime) && in_array($oProduct->wpsg_mod_deliverytime_deliverytime, $arPossibleDelivery)) + $strDeliveryTime = @$oProduct->wpsg_mod_deliverytime_deliverytime; + + if (wpsg_isSizedString($strDeliveryTime) && in_array($strDeliveryTime, $arPossibleDelivery)) { - $strValue = __($oProduct->wpsg_mod_deliverytime_deliverytime, 'wpsg'); + $strValue = __($strDeliveryTime, 'wpsg'); } Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 5918) +++ /mods/wpsg_mod_produktartikel.class.php (revision 5921) @@ -417,9 +417,63 @@ } // public function product_addedit_content(&$product_content, &$product_data) - public function produkt_save_translation(&$produkt_id, &$trans_id) - { - - // Da sich die Übersetzung geÀndert hat muss das Produkt erneut gespeichert werden - $this->produkt_save($produkt_id); + public function produkt_save_translation(&$product_id, &$trans_id) + { + + if (function_exists('icl_object_id')) //if (is_plugin_active('sitepress-multilingual-cms/sitepress.php')) + { + + // WPML + $post_id = $this->getPostIdFromProductId($product_id); + + if (wpsg_isSizedInt($post_id)) + { + + $trans_product = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($trans_id)."' "); + $post = $this->db->fetchRow("SELECT * FROM `".$this->shop->prefix."posts` WHERE `ID` = '".$post_id."' "); + + $trans_post_id = $this->getPostIdFromProductId($trans_id, $trans_product['name'], (($post['comment_status'] === 'open')?'1':'0'), $post['menu_order'], true); + + // Gibt es zu dem Post schon eine trid? + $trid = $this->db->fetchOne("SELECT `trid` FROM `".$this->shop->prefix."icl_translations` WHERE `element_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."' AND `element_id` = '".wpsg_q($post_id)."' "); + if (!wpsg_isSizedInt($trid)) + { + + $trid = 1 + $this->db->fetchOne("SELECT MAX(`trid`) FROM ".$this->shop->prefix."icl_translations"); + $this->db->ImportQuery($this->shop->prefix."icl_translations", array( + 'element_type' => wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey')), + 'element_id' => wpsg_q($post_id), + 'trid' => wpsg_q($trid), + 'language_code' => wpsg_q($this->shop->getDefaultLanguageCode()), + 'source_language_code' => 'NULL' + )); + + } + + // Gibt es schon einen ICL Eintrag zur Übersetzung? + $icl_id = $this->db->fetchOne("SELECT `translation_id` FROM `".$this->shop->prefix."icl_translations` WHERE `element_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."' AND `element_id` = '".wpsg_q($trans_post_id)."' "); + if (!wpsg_isSizedInt($icl_id)) + { + + $this->db->ImportQuery($this->shop->prefix."icl_translations", array( + 'element_type' => wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey')), + 'element_id' => wpsg_q($trans_post_id), + 'trid' => wpsg_q($trid), + 'language_code' => wpsg_q($_REQUEST['wpsg_lang']), + 'source_language_code' => wpsg_q($this->shop->getDefaultLanguageCode()) + )); + + } + + } else throw new \Exception(wpsg_translate(__('Custom Post Type existiert zu Produkt (ID:#1#) noch nicht.', 'wpsg'), $product_id)); + + } + else + { + + // qTranslate + // Da sich die Übersetzung geÀndert hat muss das Produkt erneut gespeichert werden + $this->produkt_save($product_id); + + } } // public function produkt_save_translation(&$produkt_id, &$trans_id) @@ -428,135 +482,13 @@ { - $produkt_data['ean'] = wpsg_tf($_REQUEST['wpsg_mod_produktartikel']['ean']); - $produkt_data['gtin'] = wpsg_tf($_REQUEST['wpsg_mod_produktartikel']['gtin']); + $produkt_data['ean'] = wpsg_tf(wpsg_getStr($_REQUEST['wpsg_mod_produktartikel']['ean'])); + $produkt_data['gtin'] = wpsg_tf(wpsg_getStr($_REQUEST['wpsg_mod_produktartikel']['gtin'])); } // public function produkt_save_before(&$produkt_data) - public function produkt_save(&$produkt_id) - { - - global $wpdb, $current_user; - - // PrÃŒfen ob ein Post zu diesem Artikel existiert - $post_id = $this->db->fetchOne(" - SELECT - `id` - FROM - `".$this->shop->prefix."posts` - WHERE - `wpsg_produkt_id` = '".wpsg_q($produkt_id)."' AND - `post_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."' - "); - - $produkt = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($produkt_id)."'"); - - // Sollte der Path leer sein dann den Produktnamen nehmen - if (trim($_REQUEST['wpsg_mod_produktartikel']['path']) == '') - { - $_REQUEST['wpsg_mod_produktartikel']['path'] = $_REQUEST['name']; - } - - $arLanguages = $this->shop->getStoreLanguages(); - if (wpsg_isSizedArray($arLanguages) && sizeof($arLanguages) > 1) - { - - $post_title = ''; - $post_content = ''; - - // Titel der Übersetzten Produkte heraussuchen - foreach ($arLanguages as $l) - { - - $produkt_trans = $this->db->fetchRow("SELECT `id`, `name` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_locale` = '".wpsg_q($l['locale'])."' AND `lang_parent` = '".wpsg_q($produkt_id)."'"); - - if ($produkt_trans['id'] > 0) // Übersetzung existiert { - { - $post_title .= ''.$produkt_trans['name'].''; - $post_content .= ''.$this->shop->renderProdukt($produkt_id, false, $l['locale']).''; - } - else // Übersetzung existiert nicht, hier trage ich einfach den Originaltext ein - { - $post_title .= ''.$produkt['name'].''; - $post_content .= ''.$this->shop->renderProdukt($produkt_id).''; - } - - } - - } - else - { - - $post_title = $_REQUEST['name']; - $post_content = $this->shop->renderProdukt($produkt_id); - - } - - $data = array( - "post_title" => wpsg_q($post_title), - 'post_author' => $current_user->ID, - 'post_content' => wpsg_q($post_content), - "post_type" => wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey')), - "wpsg_produkt_id" => wpsg_q($produkt_id), - "comment_status" => wpsg_q(((wpsg_isSizedInt($_REQUEST['wpsg_mod_produktartikel']['kommentare']))?'open':'closed')), - "menu_order" => wpsg_q($_REQUEST['wpsg_produktartikel_menuorder']), - "post_modified" => "NOW()", - "post_modified_gmt" => "NOW()" - ); - - if ($post_id <= 0) - { - - $data['post_date'] = $produkt['cdate']; - $post_id = $this->db->ImportQuery($this->shop->prefix.'posts', $data); - - } - else - { - - $this->db->UpdateQuery($this->shop->prefix.'posts', $data, "`id` = '".wpsg_q($post_id)."'"); - - } - - // Pathkey - $data = array(); - $data['post_name'] = wpsg_q($this->shop->clear($_REQUEST['wpsg_mod_produktartikel']['path'], $post_id)); - $this->db->UpdateQuery($this->shop->prefix.'posts', $data, "`id` = '".wpsg_q($post_id)."'"); - - // Kategorie speichern - if (!wpsg_isSizedString($_REQUEST['wpsg_lang'])) - { - - // Die Kategorie darf nur beim speichern in der Originalsprache gesetzt werden! - - // Alte Zuordnung löschen - $this->db->Query("DELETE FROM `".$this->shop->prefix."term_relationships` WHERE `object_id` = '".wpsg_q($post_id)."'"); - - // Neue Zuordnung speichern - foreach ((array)$_REQUEST['tax_input']['wpsgtax'] as $c) - { - - $term_taxonomy_id = $this->db->fetchOne("SELECT `term_taxonomy_id` FROM `".$this->shop->prefix."term_taxonomy` WHERE `term_id` = '".wpsg_q($c)."'"); - - $this->db->ImportQuery($this->shop->prefix.'term_relationships', array( - 'object_id' => wpsg_q($post_id), - 'term_taxonomy_id' => wpsg_q($term_taxonomy_id), - 'term_order' => '0' - )); - - $count = $this->db->fetchOne("SELECT COUNT(*) FROM `".$this->shop->prefix."term_relationships` WHERE `term_taxonomy_id` = '".wpsg_q($term_taxonomy_id)."'"); - - $this->db->UpdateQuery($this->shop->prefix."term_taxonomy", array( - 'count' => wpsg_q($count) - ), "`term_taxonomy_id` = '".wpsg_q($term_taxonomy_id)."'"); - - } - - $this->updateTaxonomieCount(); - - } - - $this->updatePostThumbnail($produkt_id); - - flush_rewrite_rules(); + public function produkt_save(&$product_id) + { + + $this->getPostIdFromProductId($product_id, $_REQUEST['wpsg_mod_produktartikel']['path'], $_REQUEST['wpsg_mod_produktartikel']['kommentare'], $_REQUEST['wpsg_produktartikel_menuorder'], true); } // public function produkt_save($produkt_id) @@ -815,8 +747,10 @@ /** * Gibt die Post_ID anhand einer ProduktID zurÃŒck. - * Wird kein Post gefunden, so wird false zurÃŒckgegeben + * Wird kein Post gefunden, so wird der Post angelegt und zugeordnet */ - private function getPostIdFromProductId($product_id) - { + private function getPostIdFromProductId($product_id, $path = false, $comment_status = false, $menu_order = false, $update = false) + { + + global $wpdb, $current_user; $post_id = $this->db->fetchOne(" @@ -830,6 +764,146 @@ "); - if (wpsg_isSizedInt($post_id)) return $post_id; - else return false; + if (wpsg_isSizedInt($post_id) && $update !== true) return $post_id; + else + { + + // Hier wird der CustomPost Type angelegt + $product = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($product_id)."'"); + + $arLanguages = $this->shop->getStoreLanguages(); + + if (wpsg_isSizedArray($arLanguages) && sizeof($arLanguages) > 1) + { + + if (function_exists('icl_object_id')) //if (is_plugin_active('sitepress-multilingual-cms/sitepress.php')) + { + + // WPML speichert in extra Post, hier nichts machen + $post_title = $product['name']; + $post_content = $this->shop->renderProdukt($product_id); + + } + else + { + + // Fallback fÃŒr qTranslate => Alle Sprachen in einen Post + + $post_title = ''; + $post_content = ''; + + // Titel der Übersetzten Produkte heraussuchen + foreach ($arLanguages as $l) + { + + $produkt_trans = $this->db->fetchRow("SELECT `id`, `name` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_code` = '".wpsg_q($l['lang'])."' AND `lang_parent` = '".wpsg_q($product_id)."'"); + + if ($produkt_trans['id'] > 0) // Übersetzung existiert { + { + $post_title .= ''.$produkt_trans['name'].''; + $post_content .= ''.$this->shop->renderProdukt($product_id, false, $l['locale']).''; + } + else // Übersetzung existiert nicht, hier trage ich einfach den Originaltext ein + { + $post_title .= ''.$product['name'].''; + $post_content .= ''.$this->shop->renderProdukt($product_id).''; + } + + } + + } + + } + else + { + + $post_title = $product['name']; + $post_content = $this->shop->renderProdukt($product_id); + + } + + $data = array( + "post_title" => wpsg_q($post_title), + 'post_author' => $current_user->ID, + 'post_content' => wpsg_q($post_content), + "post_type" => wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey')), + "wpsg_produkt_id" => wpsg_q($product_id), + "post_modified" => "NOW()", + "post_modified_gmt" => "NOW()" + ); + + if ($comment_status !== false) $data['comment_status'] = wpsg_q(((wpsg_isSizedInt($comment_status))?'open':'closed')); + if ($menu_order !== false) $data['menu_order'] = $menu_order; + + if ($post_id <= 0) + { + + $data['post_date'] = $product['cdate']; + $post_id = $this->db->ImportQuery($this->shop->prefix.'posts', $data); + + } + else + { + + $this->db->UpdateQuery($this->shop->prefix.'posts', $data, "`id` = '".wpsg_q($post_id)."'"); + + } + + if ($path !== false) + { + + if (!wpsg_isSizedString($path)) $path = $product['name']; + + // Pathkey + $data = array(); + $data['post_name'] = wpsg_q($this->shop->clear($path, $post_id)); + $this->db->UpdateQuery($this->shop->prefix.'posts', $data, "`id` = '".wpsg_q($post_id)."'"); + + } + + // Kategorie speichern + if (!wpsg_isSizedString($_REQUEST['wpsg_lang'])) + { + + // Die Kategorie darf nur beim speichern in der Originalsprache gesetzt werden! + + // Alte Zuordnung löschen + $this->db->Query("DELETE FROM `".$this->shop->prefix."term_relationships` WHERE `object_id` = '".wpsg_q($post_id)."'"); + + // Neue Zuordnung speichern + if (wpsg_isSizedArray($_REQUEST['tax_input']['wpsgtax'])) + { + + foreach ($_REQUEST['tax_input']['wpsgtax'] as $c) + { + + $term_taxonomy_id = $this->db->fetchOne("SELECT `term_taxonomy_id` FROM `".$this->shop->prefix."term_taxonomy` WHERE `term_id` = '".wpsg_q($c)."'"); + + $this->db->ImportQuery($this->shop->prefix.'term_relationships', array( + 'object_id' => wpsg_q($post_id), + 'term_taxonomy_id' => wpsg_q($term_taxonomy_id), + 'term_order' => '0' + )); + + $count = $this->db->fetchOne("SELECT COUNT(*) FROM `".$this->shop->prefix."term_relationships` WHERE `term_taxonomy_id` = '".wpsg_q($term_taxonomy_id)."'"); + + $this->db->UpdateQuery($this->shop->prefix."term_taxonomy", array( + 'count' => wpsg_q($count) + ), "`term_taxonomy_id` = '".wpsg_q($term_taxonomy_id)."'"); + + } + + } + + $this->updateTaxonomieCount(); + + } + + $this->updatePostThumbnail($product_id); + + flush_rewrite_rules(); + + return $post_id; + + }; } // private function getPostIdFromProductId($product_id) Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 5918) +++ /mods/wpsg_mod_produktattribute.class.php (revision 5921) @@ -280,5 +280,5 @@ { - $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($p_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($p_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if (wpsg_isSizedInt($produkt_trans_id)) $p_id = $produkt_trans_id; @@ -526,5 +526,5 @@ { - $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($p_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($p_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if (wpsg_isSizedInt($produkt_trans_id)) $p_id = $produkt_trans_id; Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 5918) +++ /mods/wpsg_mod_rechnungen.class.php (revision 5921) @@ -900,5 +900,5 @@ { - $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if ($produkt_trans['id'] > 0) Index: /mods/wpsg_mod_relatedproducts.class.php =================================================================== --- /mods/wpsg_mod_relatedproducts.class.php (revision 5918) +++ /mods/wpsg_mod_relatedproducts.class.php (revision 5921) @@ -171,5 +171,5 @@ // Um Rekursion zu vermeiden - if ($this->shop->noReleatedProducts === true) return; + if (wpsg_isTrue($this->shop->noReleatedProducts)) return; $arRelated = $this->getRelatedProducts($produkt_data['id']); Index: /mods/wpsg_mod_varianten.class.php =================================================================== --- /mods/wpsg_mod_varianten.class.php (revision 5918) +++ /mods/wpsg_mod_varianten.class.php (revision 5921) @@ -1161,5 +1161,5 @@ { - $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_locale` = '".wpsg_q($this->shop->getCurrentLanguage())."'"); + $produkt_trans_id = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($produkt_id)."' AND `lang_code` = '".wpsg_q($this->shop->getCurrentLanguageCode())."'"); if (wpsg_isSizedInt($produkt_trans_id)) $produkt_id = $produkt_trans_id; Index: /views/mods/mod_deliverynote/deliverynote_pdf.phtml =================================================================== --- /views/mods/mod_deliverynote/deliverynote_pdf.phtml (revision 5918) +++ /views/mods/mod_deliverynote/deliverynote_pdf.phtml (revision 5921) @@ -199,5 +199,5 @@ { - $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['productkey']))."' AND `lang_locale` = '".wpsg_q(get_locale())."'"); + $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['productkey']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); if (is_array($trans_db) && sizeof($trans_db) > 0) Index: /views/mods/mod_rechnungen/rechnung_pdf.phtml =================================================================== --- /views/mods/mod_rechnungen/rechnung_pdf.phtml (revision 5918) +++ /views/mods/mod_rechnungen/rechnung_pdf.phtml (revision 5921) @@ -221,5 +221,5 @@ { - $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_locale` = '".wpsg_q(get_locale())."'"); + $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); if (is_array($trans_db) && sizeof($trans_db) > 0) Index: /views/produkt/addedit_general.phtml =================================================================== --- /views/produkt/addedit_general.phtml (revision 5918) +++ /views/produkt/addedit_general.phtml (revision 5921) @@ -12,6 +12,6 @@ getStoreLanguages() as $a) { ?> - - + getDefaultLanguageCode())) { ?> + getDefaultLanguageCode()) { ?> @@ -37,5 +37,5 @@ - hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> + hasMod('wpsg_mod_produktartikel')) { ?> view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?> @@ -54,6 +54,8 @@ - view['data']['rating'])); ?> - + + view['data']['rating'])); ?> + + callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> Index: /views/produkt/index.phtml =================================================================== --- /views/produkt/index.phtml (revision 5918) +++ /views/produkt/index.phtml (revision 5921) @@ -130,11 +130,9 @@ - " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> -
- " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> + isMultiLingual()) { ?> getStoreLanguages() as $l) { ?> getDefaultLanguageLocale()) { ?> - + <?php echo wpsg_translate(__('Produkt fÃŒr Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?> @@ -142,4 +140,8 @@ + " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=" class="row-title"> + +
+ " href="wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id="> | ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Produkt&action=del&edit_id=&noheader=1"> Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 5918) +++ /views/produkttemplates/standard.phtml (revision 5921) @@ -131,6 +131,6 @@ hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - view['data']['wpsg_mod_deliverytime_storeproduct'] >= '1') {?> + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> get_option('wpsg_mod_deliverytime_storetext')); ?> @@ -142,33 +142,14 @@
- get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?> - - view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?> - view['data']['wpsg_mod_deliverytime_deliverytime']; ?> - get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?> - get_option('wpsg_mod_deliverytime_mode_days_default')); ?> - - - - - - - view['data']['wpsg_mod_deliverytime_deliverytime'])) { ?> - view['data']['wpsg_mod_deliverytime_deliverytime']); ?> - - get_option('wpsg_mod_deliverytime_mode_select_values')); ?> - - - - -
- - - - get_option('wpsg_mod_deliverytime_delay') == '1') { ?> -
- get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> -
- + + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> + +
+ + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+ + @@ -245,23 +226,16 @@ - - view['data']['wpsg_mod_deliverytime_storeproduct'])) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?>
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + + + + + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> +