Index: /changelog =================================================================== --- /changelog (revision 5441) +++ /changelog (revision 5447) @@ -825,2 +825,4 @@ - Bugfix - Speichert man die Einstellungen eines aktiviertes Modul, bei dem der DEMO Modus abgelaufen wird kein Fehler mehr erzeugt. +#4.0.0 / 5259 + - Feature - Produktbilder - Mehrfacher Upload möglich Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5441) +++ /controller/wpsg_AdminController.class.php (revision 5447) @@ -1079,5 +1079,5 @@ foreach ($_REQUEST['pflicht'] as $k => $v) { - //wpsg_debug($v); + if ($k == 'custom') { @@ -1116,5 +1116,5 @@ } - + $this->update_option('wpsg_admin_pflicht', $this->shop->view['pflicht']); Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5441) +++ /controller/wpsg_ProduktController.class.php (revision 5447) @@ -469,5 +469,5 @@ } - + // Produktobject $this->shop->view['oProduct'] = wpsg_product::getInstance($_REQUEST['edit_id']); @@ -505,4 +505,12 @@ } + $this->shop->view['arSubAction'] = array( + 'general' => array( + 'title' => __('Allgemein', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_general.phtml', false) + ) + ); + + $this->shop->callMods('product_addedit_content', array(&$this->shop->view['arSubAction'], &$this->shop->view['data'])); $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit.phtml'); @@ -611,5 +619,5 @@ // Erlaubte Zahlungsarten speichern $data['allowedpayments'] = ''; - if ($_REQUEST['wpsg_paymentmethods_select'] == '1') + if (wpsg_isSizedInt($_REQUEST['wpsg_paymentmethods_select'], '1')) { @@ -622,5 +630,5 @@ // Erlaubte Versandarten speichern $data['allowedshipping'] = ''; - if ($_REQUEST['wpsg_shippingmethods_select'] == '1') + if (wpsg_isSizedInt($_REQUEST['wpsg_shippingmethods_select'], '1')) { Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5441) +++ /lib/functions.inc.php (revision 5447) @@ -189,4 +189,18 @@ } // function wpsg_asort_function($a, $b) + + /** + * Gibt einen Pfad formatiert zurÃŒck + * - Entfernt doppelte // bzw. \\ + * - Wandelt // in Systemspezifische Trenner um + */ + function wpsg_format_path($strPath) + { + + $strPath = preg_replace('/(\/+)|(\\+)/', DIRECTORY_SEPARATOR, $strPath); + + return $strPath; + + } // function wpsg_format_path($strPath) function wpsg_array_csort_pk_function($accountA, $accountB) Index: /mods/wpsg_mod_produktbilder.class.php =================================================================== --- /mods/wpsg_mod_produktbilder.class.php (revision 5441) +++ /mods/wpsg_mod_produktbilder.class.php (revision 5447) @@ -129,30 +129,35 @@ if ($_REQUEST['cmd'] == 'upload') { - - if (file_exists($_FILES['userfile']['tmp_name'])) + + foreach ($_FILES['userfile']['tmp_name'] as $k => $file_tmp_name) { - - $uploaddir = $this->getPicPath($_REQUEST['edit_id']); - - if (!file_exists($uploaddir)) mkdir($uploaddir, 0777, true); - if (!file_exists($uploaddir.'tn/')) mkdir($uploaddir.'tn/', 0777, true); - - $uploadfile = $uploaddir.basename($_FILES['userfile']['name']); - - move_uploaded_file($_FILES['userfile']['tmp_name'], $uploadfile); - - $uri = $this->makeTn($_REQUEST['edit_id'], $_FILES['userfile']['name'], get_option("wpsg_mod_produktbilder_width"), get_option("wpsg_mod_produktbilder_height"), get_option("wpsg_mod_produktbilder_mode")); - - if ($this->shop->hasMod('wpsg_mod_produktartikel')) $this->shop->callMod('wpsg_mod_produktartikel', 'updatePostThumbnail', array($_REQUEST['edit_id'])); - - die("1"); - - } - else - { - - die(__('Fehler beim Upload! Datei existiert nicht.', 'wpsg')); - + + if (file_exists($file_tmp_name)) + { + + $uploaddir = $this->getPicPath($_REQUEST['edit_id']); + + if (!file_exists($uploaddir)) mkdir($uploaddir, 0777, true); + if (!file_exists($uploaddir.'tn/')) mkdir($uploaddir.'tn/', 0777, true); + + $uploadfile = $uploaddir.basename($_FILES['userfile']['name'][$k]); + + move_uploaded_file($file_tmp_name, $uploadfile); + + $uri = $this->makeTn($_REQUEST['edit_id'], $_FILES['userfile']['name'][$k], get_option("wpsg_mod_produktbilder_width"), get_option("wpsg_mod_produktbilder_height"), get_option("wpsg_mod_produktbilder_mode")); + + if ($this->shop->hasMod('wpsg_mod_produktartikel')) $this->shop->callMod('wpsg_mod_produktartikel', 'updatePostThumbnail', array($_REQUEST['edit_id'])); + + } + else + { + + die(__('Fehler beim Upload! Datei existiert nicht.', 'wpsg')); + + } + } + + die("1"); } @@ -182,17 +187,27 @@ { - if (wpsg_isSizedArray($_FILES['wpsg_mod_produktbilder_file']) && file_exists($_FILES['wpsg_mod_produktbilder_file']['tmp_name'])) - { - - $uploaddir = $this->getPicPath($produkt_id); - - if (!file_exists($uploaddir)) mkdir($uploaddir, 0777, true); - if (!file_exists($uploaddir.'tn/')) mkdir($uploaddir.'tn/', 0777, true); - - $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_produktbilder_file']['name']); - - move_uploaded_file($_FILES['wpsg_mod_produktbilder_file']['tmp_name'], $uploadfile); - - $uri = $this->makeTn($produkt_id, $_FILES['wpsg_mod_produktbilder_file']['name'], get_option("wpsg_mod_produktbilder_width"), get_option("wpsg_mod_produktbilder_height"), get_option("wpsg_mod_produktbilder_mode")); + if (wpsg_isSizedArray($_FILES['wpsg_mod_produktbilder_file'])) + { + + foreach ($_FILES['wpsg_mod_produktbilder_file']['tmp_name'] as $k => $file_tmp_name) + { + + if (file_exists($file_tmp_name)) + { + + $uploaddir = $this->getPicPath($produkt_id); + + if (!file_exists($uploaddir)) mkdir($uploaddir, 0777, true); + if (!file_exists($uploaddir.'tn/')) mkdir($uploaddir.'tn/', 0777, true); + + $uploadfile = $uploaddir.basename($_FILES['wpsg_mod_produktbilder_file']['name'][$k]); + + move_uploaded_file($file_tmp_name, $uploadfile); + + $uri = $this->makeTn($produkt_id, $_FILES['wpsg_mod_produktbilder_file']['name'][$k], get_option("wpsg_mod_produktbilder_width"), get_option("wpsg_mod_produktbilder_height"), get_option("wpsg_mod_produktbilder_mode")); + + } + + } } @@ -208,4 +223,27 @@ } // public function produkt_del(&$product_id) + public function product_addedit_content(&$product_content, &$product_data) + { + + // Wenn eine Übersetzung bearbeitet wird, dann nichts machen + if (isset($_REQUEST['wpsg_lang'])) return; + + if (wpsg_isSizedInt($product_data['id'])) + { + + $this->shop->view['modul'] = &$this; + $this->shop->view['ProduktBilderPath'] = $this->getPicPath($product_data['id']); + $this->shop->view['ProduktBilderURL'] = $this->getPicPath($product_data['id'], true); + $this->shop->view['ProduktList'] = $this->getProduktBilderListe($product_data['id']); + + } + + $product_content['wpsg_mod_productbilder'] = array( + 'title' => __('Produktbilder', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktbilder/produkt_addedit_content.phtml', false) + ); + + } // public function product_addedit_content(&$product_content, &$produkt_data) + public function produkt_edit_content(&$produkt_data) { @@ -253,42 +291,5 @@ /* Modulfunktionen */ - - /** - * Generiert ein Bild fÃŒr ein Produkt, ersetzt ###BILD_1_500_500_c### - * - * @param unknown_type $p_id - * @param unknown_type $pic - * @param unknown_type $setW - * @param unknown_type $setH - * @param unknown_type $mode - */ - public function genBild($p_id, $pic, $setW, $setH, $mode, $rel = 'gallery') - { - - $produkt = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($p_id)."'"); - - $handle = opendir($this->getPicPath($produkt['id'])); - - if (is_int($pic)) - { - - // Bilder des Produktes laden - $arBilder = $this->getProduktBilder($p_id); if ($pic > 0) $pic --; - - if (!array_key_exists($pic, $arBilder)) return; - - $pic = $arBilder[$pic]; - - } - - $this->shop->view['url_tn'] = $this->makeTn($produkt['id'], $pic, $setW, $setH, $mode); - $this->shop->view['url_orginal'] = $this->getPicPath($produkt['id'], true).$pic; - $this->shop->view['produkt'] = $produkt; - $this->shop->view['rel'] = $rel; - - return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktbilder/produktbild.phtml', false); - - } // public function genBild($p_id, $pic, $setW, $setH, $mode) - + /** * Wird vom Template produkt_edit_content.phtml aufgerufen und per Ajax aktualisiert. @@ -396,5 +397,5 @@ { - if ($url) return WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_produktbilder/'.$produkt_id.'/'; + if ($url) $path = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_produktbilder/'.$produkt_id.'/'; else { @@ -403,7 +404,5 @@ if (!file_exists($path)) mkdir($path, 0777, true); - - return $path; - + } @@ -412,5 +411,5 @@ { - if ($url) return WPSG_URL_CONTENT.'uploads/wpsg_produktbilder/'.$produkt_id.'/'; + if ($url) $path = WPSG_URL_CONTENT.'uploads/wpsg_produktbilder/'.$produkt_id.'/'; else { @@ -419,10 +418,11 @@ if (!file_exists($path)) mkdir($path, 0777, true); - - return $path; - + } } + + if ($url === true) return $path; + else return wpsg_format_path($path); } // private function getPicPath($produkt_id, $url = false) Index: /views/admin/kundendaten.phtml =================================================================== --- /views/admin/kundendaten.phtml (revision 5441) +++ /views/admin/kundendaten.phtml (revision 5447) @@ -18,5 +18,5 @@ - +