Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 6618) +++ /controller/wpsg_ProduktController.class.php (revision 6619) @@ -827,5 +827,4 @@ 'euleistungsortregel' => wpsg_q(wpsg_getStr($_REQUEST['euleistungsortregel'])), 'basket_multiple' => wpsg_q(wpsg_getStr($_REQUEST['basket_multiple'])), - 'pstatus' => wpsg_q(wpsg_getStr($_REQUEST['pstatus'])), 'rating' => wpsg_q(wpsg_getStr($_REQUEST['rating'])) ); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6618) +++ /controller/wpsg_ShopController.class.php (revision 6619) @@ -1147,5 +1147,5 @@ } - if (wpsg_isSizedInt($this->view['data']['pstatus'])) return ''; + if (wpsg_isSizedInt($this->view['data']['disabled'])) return ''; // Produkt, bei dem die EU Leistungsortregel gilt ? @@ -2248,5 +2248,5 @@ { - return icl_object_id($page_id, 'page', true); + return apply_filters('wpml_object_id', $page_id, 'post', false, $this->getDefaultLanguageCode()); } else return $page_id; Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 6618) +++ /lib/functions.inc.php (revision 6619) @@ -884,5 +884,14 @@ } // function wpsg_translate($string) - + + /** + * Wie die Wordpress Funktion, bachtet aber die WPML Seitenzuordnung + */ + function wpsg_get_the_id() { + + return $GLOBALS['wpsg_sc']->getPageId(get_the_id()); + + } // function wpsg_get_the_id() + function wpsg_calculatePreis($value, $brutto_netto, $mwst) { Index: /lib/install.php =================================================================== --- /lib/install.php (revision 6618) +++ /lib/install.php (revision 6619) @@ -55,6 +55,5 @@ basket_multiple INT(1) NOT NULL, rating INT(1) NOT NULL, - postids VARCHAR(255) NOT NULL, - pstatus INT(1) DEFAULT 0 NOT NULL COMMENT '1=Entwurf', + postids VARCHAR(255) NOT NULL, PRIMARY KEY (id), KEY lang_parent (lang_parent) Index: /mods/wpsg_mod_addressvalidation.class.php =================================================================== --- /mods/wpsg_mod_addressvalidation.class.php (revision 6618) +++ /mods/wpsg_mod_addressvalidation.class.php (revision 6619) @@ -52,11 +52,12 @@ } // public function settings_save() - public function wpsg_enqueue_scripts() - { - $id = get_the_ID(); + public function wpsg_enqueue_scripts() { + + $id = wpsg_get_the_id(); + if (!is_admin() && wpsg_isSizedInt($id) && ( - get_the_ID() == $this->shop->get_option('wpsg_page_basket') || - get_the_ID() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_profil') || - get_the_ID() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_registrierung') + $id == $this->shop->get_option('wpsg_page_basket') || + $id == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_profil') || + $id == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_registrierung') )) { Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 6618) +++ /mods/wpsg_mod_billsafe.class.php (revision 6619) @@ -439,7 +439,7 @@ { - if (get_the_id() <= 0) return; - - if ($this->shop->get_option('wpsg_mod_billsafe_success') == get_the_id() && isset($_REQUEST['token'])) + if (wpsg_get_the_id() <= 0) return; + + if ($this->shop->get_option('wpsg_mod_billsafe_success') == wpsg_get_the_id() && isset($_REQUEST['token'])) { Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 6618) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 6619) @@ -973,7 +973,7 @@ { - if (get_the_id() <= 0) return; - - if (get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_profil')) + if (wpsg_get_the_id() <= 0) return; + + if (wpsg_get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_profil')) { @@ -1021,5 +1021,5 @@ } - else if (get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_registrierung')) + else if (wpsg_get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_registrierung')) { @@ -1069,5 +1069,5 @@ } - else if (get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_order')) + else if (wpsg_get_the_id() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_order')) { Index: /mods/wpsg_mod_onepagecheckout.class.php =================================================================== --- /mods/wpsg_mod_onepagecheckout.class.php (revision 6618) +++ /mods/wpsg_mod_onepagecheckout.class.php (revision 6619) @@ -66,8 +66,10 @@ public function content_filter(&$content) { + + $id = wpsg_get_the_id(); + + if ($id <= 0) return; - if (get_the_id() <= 0) return; - - if (get_the_id() == $this->shop->get_option('wpsg_mod_onepagecheckout_page')) + if ($id == $this->shop->get_option('wpsg_mod_onepagecheckout_page')) { @@ -82,8 +84,10 @@ public function template_redirect() { - - if (get_the_id() <= 0) return; + + $id = wpsg_get_the_id(); + + if ($id <= 0) return; - if (get_the_id() == $this->shop->get_option('wpsg_mod_onepagecheckout_page') && isset($_REQUEST['wpsg_checkout'])) + if ($id == $this->shop->get_option('wpsg_mod_onepagecheckout_page') && isset($_REQUEST['wpsg_checkout'])) { Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 6618) +++ /mods/wpsg_mod_productgroups.class.php (revision 6619) @@ -308,5 +308,7 @@ { - if (get_the_id() <= 0 || get_the_id() != $this->shop->get_option('wpsg_productgroups_page')) return; + $id = wpsg_get_the_id(); + + if ($id <= 0 || $id != $this->shop->get_option('wpsg_productgroups_page')) return; if (isset($_REQUEST['show']) && $_REQUEST['show'] > 0) Index: /mods/wpsg_mod_productindex.class.php =================================================================== --- /mods/wpsg_mod_productindex.class.php (revision 6618) +++ /mods/wpsg_mod_productindex.class.php (revision 6619) @@ -36,7 +36,9 @@ { - if (get_the_id() <= 0) return; - - $index_page = get_post_meta(get_the_id(), 'wpsg_mod_productindex_active', true); + $id = wpsg_get_the_id(); + + if ($id <= 0) return; + + $index_page = get_post_meta($id, 'wpsg_mod_productindex_active', true); if ($index_page === '1') @@ -44,8 +46,8 @@ // Shop ÃŒbernehmen? - if (class_exists('\\sto\\frontend\\Productindex') && in_array(get_post_meta(get_the_id(), 'wpsg_mod_productindex_template', true), array('0', '1'))) - { - - $content = \sto\frontend\Productindex::render(get_the_id()); + if (class_exists('\\sto\\frontend\\Productindex') && in_array(get_post_meta($id, 'wpsg_mod_productindex_template', true), array('0', '1'))) + { + + $content = \sto\frontend\Productindex::render($id); return -2; @@ -53,5 +55,5 @@ } - $this->shop->view['arProducts'] = $this->getProducts(get_the_id()); + $this->shop->view['arProducts'] = $this->getProducts($id); if (isset($_REQUEST['wpsg_mod_productindex']['template'])) @@ -64,5 +66,5 @@ { - $template = get_post_meta(get_the_id(), 'wpsg_mod_productindex_template', true); + $template = get_post_meta($id, 'wpsg_mod_productindex_template', true); } @@ -93,5 +95,5 @@ if (is_admin()) return; - $index_page = get_post_meta(get_the_id(), 'wpsg_mod_productindex_active', true); + $index_page = get_post_meta($id, 'wpsg_mod_productindex_active', true); if ($index_page === '1') @@ -283,5 +285,5 @@ $product_data = $this->shop->loadProduktArray($p_id); - if ($product_data['pstatus'] != 1) + if ($product_data['disabled'] != 1) { Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 6618) +++ /mods/wpsg_mod_produktartikel.class.php (revision 6619) @@ -651,5 +651,5 @@ { - $this->getPostIdFromProductId($product_id, $_REQUEST['wpsg_mod_produktartikel']['path'], $_REQUEST['wpsg_mod_produktartikel']['kommentare'], $_REQUEST['wpsg_produktartikel_menuorder'], true); + $this->getPostIdFromProductId($product_id, $_REQUEST['wpsg_mod_produktartikel']['path'], $_REQUEST['wpsg_mod_produktartikel']['kommentare'], $_REQUEST['wpsg_produktartikel_menuorder'], true, $_REQUEST['disabled']); } // public function produkt_save($produkt_id) @@ -908,5 +908,5 @@ * Wird kein Post gefunden, so wird der Post angelegt und zugeordnet */ - private function getPostIdFromProductId($product_id, $path = false, $comment_status = false, $menu_order = false, $update = false) + private function getPostIdFromProductId($product_id, $path = false, $comment_status = false, $menu_order = false, $update = false, $disabled = false) { @@ -996,5 +996,12 @@ 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 ($disabled !== false) + { + + if ($disabled === '1') $data['post_status'] = 'draft'; + else $data['post_status'] = 'publish'; + + } + if ($post_id <= 0) { Index: /mods/wpsg_mod_request.class.php =================================================================== --- /mods/wpsg_mod_request.class.php (revision 6618) +++ /mods/wpsg_mod_request.class.php (revision 6619) @@ -174,5 +174,5 @@ { - $page_id = get_the_ID(); + $page_id = wpsg_get_the_id(); if (wpsg_isSizedInt($page_id) && $page_id == $this->shop->get_option('wpsg_mod_request_page')) Index: /mods/wpsg_mod_wirecard.class.php =================================================================== --- /mods/wpsg_mod_wirecard.class.php (revision 6618) +++ /mods/wpsg_mod_wirecard.class.php (revision 6619) @@ -472,5 +472,5 @@ { - if (in_array(get_the_id(), array( + if (in_array(wpsg_get_the_id(), array( $this->shop->get_option('wpsg_page_mod_wirecard_success'), $this->shop->get_option('wpsg_page_mod_wirecard_error'), Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 6618) +++ /views/css/frontend.css (revision 6619) @@ -5,5 +5,5 @@ #wpsg_error, #wpsg_message { margin-bottom:1rem; } #wpsg_message li, #wpsg_error li, #wpsg_notice li, -#wpsg_message p, #wpsg_error p, #wpsg_notice p { margin-bottom:4px; padding:3px 0px 3px 8px; } +#wpsg_message p, #wpsg_error p, #wpsg_notice p { list-style:none; margin-bottom:4px; padding:3px 0px 3px 8px; } #wpsg_message li, #wpsg_message p { border-left:4px solid #7AD03A; } Index: /views/mods/mod_kundenverwaltung/login.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/login.phtml (revision 6618) +++ /views/mods/mod_kundenverwaltung/login.phtml (revision 6619) @@ -40,3 +40,16 @@ + view['data'] = $_SESSION['wpsg']['checkout']; + $this->view['error'] = $_SESSION['wpsg']['errorFields']; + $this->view['pflicht'] = $this->loadPflichtFeldDaten(); + $this->view['laender'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `name` ASC"); + + $this->clearMessages(); + + echo $this->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/register.phtml', false); + + ?> + Index: /views/mods/mod_paypalapi/paypalplus.phtml =================================================================== --- /views/mods/mod_paypalapi/paypalplus.phtml (revision 6618) +++ /views/mods/mod_paypalapi/paypalplus.phtml (revision 6619) @@ -14,5 +14,5 @@ "preselection": "", "country": "DE", - hasMod('wpsg_mod_onepagecheckout') && get_the_id() == $this->get_option('wpsg_mod_onepagecheckout_page')) { ?> + hasMod('wpsg_mod_onepagecheckout') && wpsg_get_the_id() == $this->get_option('wpsg_mod_onepagecheckout_page')) { ?> "onContinue": function(event) { Index: /views/produkt/addedit_general.phtml =================================================================== --- /views/produkt/addedit_general.phtml (revision 6618) +++ /views/produkt/addedit_general.phtml (revision 6619) @@ -63,6 +63,4 @@ - view['data']['pstatus']), array('noKeys' => false)); ?> - callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> Index: /views/warenkorb/index.phtml =================================================================== --- /views/warenkorb/index.phtml (revision 6618) +++ /views/warenkorb/index.phtml (revision 6619) @@ -80,5 +80,5 @@ - get_option('wpsg_page_basket') != get_the_ID() || isset($_REQUEST['produkt_id'])) { ?> + get_option('wpsg_page_basket') != wpsg_get_the_ID() || isset($_REQUEST['produkt_id'])) { ?> " />