Index: ds/wpsg_mod_bankalignment.class.php =================================================================== --- /mods/wpsg_mod_bankalignment.class.php (revision 5690) +++ (revision ) @@ -1,230 +1,0 @@ -name = __('Bankabgleich', 'wpsg'); - $this->group = __('Bestellung', 'wpsg'); - $this->desc = __('Ermöglicht den Kontoabgleich Ìber exportierte CSV Dateien.', 'wpsg'); - - } // public function __construct() - - public function produkt_index_head() - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/produkt_index_head.phtml'); - - } // public function produkt_index_head() - - public function produkt_index_aftersearch() - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/produkt_index_aftersearch.phtml'); - - } // public function produkt_index_aftersearch() - - public function install() - { - - $this->shop->checkDefault('wpsg_mod_bankalignment_separator', ';'); - - } // public function install() - - public function settings_edit() - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/settings_edit.phtml'); - - } // public function settings_edit() - - public function settings_save() - { - - $this->shop->update_option('wpsg_mod_bankalignment_separator', $_REQUEST['wpsg_mod_bankalignment_separator']); - - } // public function settings_save() - - public function order_ajax() - { - - if ($_REQUEST['mod'] != 'wpsg_mod_bankalignment') return; - - if (isset($_REQUEST['wpsg_mod_bankalignment_submit'])) - { - - $nSet = 0; - - foreach ($_REQUEST['set'] as $order_id) - { - - if ($order_id > 0) - { - - $order = $this->shop->cache->loadOrder($order_id); - - if ($order['status'] == 0) - { - - $this->shop->setOrderStatus($order_id, 100, true); - $nSet ++; - - } - - } - - } - - $this->shop->addBackendMessage(wpsg_translate(__('Es wurden #1# Bestellungen auf "#2#" gesetzt.', 'wpsg'), $nSet, $this->shop->arStatus[100])); - $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order'); - - } - - if (!file_exists($_FILES['wpsg_mod_bankalignment_file']['tmp_name'])) - { - - $this->shop->addBackendError(__('Bitte geben sie eine Datei an!', 'wpsg')); - die(''); - - } - else if (file_exists($_FILES['wpsg_mod_bankalignment_file']['tmp_name'])) - { - - // Alle Bestellungen die noch "Bestellung eingegangen" - $arOrder = $this->db->fetchAssoc(" - SELECT - O.`id` AS o_id, O.`onr` AS onr, - CONCAT(K.`vname`, ' ', K.`name`, ', ', REPLACE(FORMAT(O.`price_gesamt`, 2), '.', ','), ' ".$this->shop->get_option('wpsg_currency')."') AS okey - FROM - `".WPSG_TBL_ORDER."` AS O - LEFT JOIN `".WPSG_TBL_KU."` AS K ON (K.`id` = O.`k_id`) - WHERE - O.`status` = '0' - "); - - if (sizeof($arOrder) <= 0) - { - - $this->shop->addBackendError(__('Keine Bestellungen vorhanden, die noch nicht bezahlt sind!', 'wpsg')); - die(''); - - } - - foreach ($arOrder as $k => $v) - { - - if ($this->shop->hasMod('wpsg_mod_prepayment')) - { - - $arOrder[$k]['wpsg_mod_prepayment'] = $this->shop->callMod('wpsg_mod_prepayment', 'get_subject', array($v['o_id'])); - - } - - } - - $_SESSION['wpsg']['wpsg_mod_prepayment']['set'] = array(); - - $h = fopen($_FILES['wpsg_mod_bankalignment_file']['tmp_name'], "r"); - - $row = 0; - while (($data = fgetcsv($h, 1000, $this->shop->get_option('wpsg_mod_bankalignment_separator'))) !== FALSE) - { - - if ($row === 0) - { - - $this->shop->view['colInfo'] = $data; - - } - else - { - - $set = array(); - $set['data'] = $data; - $set['order_id'] = false; - $set['onr'] = false; - $set['okey'] = false; - - foreach ($arOrder as $k => $v) - { - - // Betreff aus dem Vorkassemodul - if ($this->shop->hasMod('wpsg_mod_prepayment') && $this->in_array($v['wpsg_mod_prepayment'], $data)) - { - - $set['order_id'] = $v['o_id']; - $set['onr'] = $v['onr']; - $set['okey'] = $v['key']; - break; - - } - - - } - - $_SESSION['wpsg']['wpsg_mod_prepayment']['set'][] = $set; - - } - - $row ++; - - } - - fclose($h); - - $this->shop->view['set'] = $_SESSION['wpsg']['wpsg_mod_prepayment']['set']; - $this->shop->view['arOrder'] = $arOrder; - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/order_ajax.phtml'); - - } - - } // public function order_ajax() - - public function product_index_tab(&$arTabs) - { - - $arTabs['left'][$this->id] = array( - 'tab_title' => __('Bankabgleich', 'wpsg'), - 'tab_icon' => 'glyphicon glyphicon-usd', - 'tab_content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/product_index_tab.phtml', false) - ); - - } // public function product_index_tab(&$arTabs) - - /** - * Hilfsfunktion die wie in_array prÌft ob $betreff in $data ist - * PrÌft aber nicht ganz so restriktiv - */ - private function in_array($betreff, $data) - { - - foreach ((array)$data as $k => $v) - { - - if (preg_match('/(.*)'.$v.'(.*)/i', $betreff)) return true; - - } - - return false; - - } // private function in_array($betreff, $data) - - } // class wpsg_mod_bankalignment extends wpsg_mod_basic - -?> Index: ds/wpsg_mod_orderupload.class.php =================================================================== --- /mods/wpsg_mod_orderupload.class.php (revision 5690) +++ (revision ) @@ -1,284 +1,0 @@ -name = __('Bestellupload', 'wpsg'); - $this->group = __('Bestellung', 'wpsg'); - $this->desc = __('Erlaubt das hochladen von Dateien zu Bestellungen.', 'wpsg'); - - } // public function __construct() - - public function install() - { - - $this->shop->checkDefault('wpsg_mod_orderupload_filename', '%order_onr%_%filename%'); - $this->shop->checkDefault('wpsg_mod_orderupload_allowedext', 'jpg,jpeg'); - $this->shop->checkDefault('wpsg_mod_orderupload_multifiles', '0'); - $this->shop->checkDefault('wpsg_mod_orderupload_optional', '0'); - - } // public function install() - - public function settings_edit() - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/settings_edit.phtml'); - - } // public function settings_edit() - - public function settings_save() - { - - $this->shop->update_option('wpsg_mod_orderupload_filename', $_REQUEST['wpsg_mod_orderupload_filename']); - $this->shop->update_option('wpsg_mod_orderupload_allowedext', $_REQUEST['wpsg_mod_orderupload_allowedext']); - $this->shop->update_option('wpsg_mod_orderupload_multifiles', $_REQUEST['wpsg_mod_orderupload_multifiles']); - $this->shop->update_option('wpsg_mod_orderupload_optional', $_REQUEST['wpsg_mod_orderupload_optional']); - - } // public function settings_save() - - public function checkout_inner_prebutton(&$checkout_view) { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/checkout_inner_prebutton.phtml'); - - } // public function checkout_inner_prebutton(&$checkout_view) - - public function checkCheckout(&$state, &$error, &$arCheckout) - { - - if ($state == '1') - { - - if ( - $this->shop->get_option('wpsg_mod_orderupload_optional') != '1' && - sizeof($_SESSION['wpsg']['wpsg_mod_orderupload']) <= 0 && - (!isset($_FILES['wpsg_mod_orderupload_file']) || !file_exists($_FILES['wpsg_mod_orderupload_file']['tmp_name'])) - ) - { - - // Noch keine Datei hochgeladen und es ist Pflicht ! - $this->shop->addFrontendError(__('Bitte eine Datei zum Upload wÀhlen.', 'wpsg')); - $error = true; return; - - } - - if (isset($_FILES['wpsg_mod_orderupload_file']) && file_exists($_FILES['wpsg_mod_orderupload_file']['tmp_name'])) - { - - $ending = strtolower(preg_replace('/(.*)\./', '', $_FILES['wpsg_mod_orderupload_file']['name'])); - - if (!in_array($ending, (array)explode(',', strtolower($this->shop->get_option('wpsg_mod_orderupload_allowedext'))))) - { - - $this->shop->addFrontendError(__('Bitte eine gÌltige Dateiendung verwenden.', 'wpsg')); - $error = true; return; - - } - else - { - - // Upload durchfÌhren - $tmp = time().'-'.rand(1, 10000).'.'.$ending; - - move_uploaded_file($_FILES['wpsg_mod_orderupload_file']['tmp_name'], $this->getTmpFilePath().'/'.$tmp); - - if (!is_array($_SESSION['wpsg']['wpsg_mod_orderupload'])) $_SESSION['wpsg']['wpsg_mod_orderupload'] = array(); - else if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload']) && $this->shop->get_option('wpsg_mod_orderupload_multifiles') != '1') - { - - // Cache sauber haltens - foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $ou) - { - - unlink($ou[3]); - - } - - $_SESSION['wpsg']['wpsg_mod_orderupload'] = array(); - - } - - $_SESSION['wpsg']['wpsg_mod_orderupload'][] = wpsg_xss(array( - $_FILES['wpsg_mod_orderupload_file']['name'], - $tmp, - $this->getTmpFilePath(true).'/'.$tmp, - $this->getTmpFilePath().'/'.$tmp - )); - - $this->shop->addFrontendMessage(__('Datei wurde erfolgreich hochgeladen.', 'wpsg')); - - if ($this->shop->get_option('wpsg_mod_orderupload_multifiles') == '1') - { - - $error = true; - - } - - } - - } - - } - - } // public function checkCheckout(&$state, &$error, &$arCheckout) - - public function wp_loaded() - { - - if ($_REQUEST['wpsg_plugin'] == 'wpsg_mod_orderupload' && $_REQUEST['wpsg_action'] == 'remove') - { - - unlink($_SESSION['wpsg']['wpsg_mod_orderupload'][$_REQUEST['file_index']][3]); - unset($_SESSION['wpsg']['wpsg_mod_orderupload'][$_REQUEST['file_index']]); - - $this->shop->addFrontendMessage(__('Dokument wurde aus der Bestellung entfernt.', 'wpsg')); - - $this->shop->redirect($this->shop->getURL(wpsg_ShopController::URL_CHECKOUT)); - - } - - } // public function wp_loaded() - - public function order_ajax() - { - - if (isset($_REQUEST['wpsg_mod_orderupload_download'])) - { - - header('Content-Disposition: attachment; filename="'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']).'"'); - header('Content-type: application/download'); - header('Content-Disposition: inline; filename="'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']).'"'); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); - - die(file_get_contents($this->getSavePath($_REQUEST['edit_id']).'/'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']))); - - } - - } // public function order_ajax() - - public function basket_save_done(&$o_id, &$k_id, &$oBasket) - { - - if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload'])) - { - - foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $k => $ou) - { - - $path_target = $this->getSavePath($o_id); - - copy( - $ou[3], - $path_target.'/'.$this->getNewName($ou[0], $o_id) - ); - - // TemporÀren Ordner sÀubern - unlink($ou[3]); - - unset($_SESSION['wpsg']['wpsg_mod_orderupload'][$k]); - - } - - } - - } // public function basket_save_done($o_id, $k_id) - - public function order_view_sidebar(&$order_id) - { - - $arFiles = scandir($this->getSavePath($order_id)); - - foreach ($arFiles as $k => $v) { if (in_array($v['id'], array('.', '..', '.htaccess', '.htpasswd'))) { unset($arFiles[$k]); } } - - if (sizeof($arFiles) <= 0) return; - - $this->shop->view['arFiles'] = $arFiles; - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/order_view_sidebar.phtml'); - - } // public function order_view_sidebar(&$order_id) - - public function delOrder(&$order_id) - { - - // Hochgeladene Dateien löschen - $path = $this->getSavePath($order_id); - - wpsg_rrmdir($path); - - } // public function delOrder(&$order_id) - - /* -- */ - - public function getNewName($filename, $order_id) - { - - $arReplace = array( - '/%filename%/' => $filename, - '/%filename_clear%/' => preg_replace('/\.(.*)$/', '', $filename) - ); - - $filename = preg_replace(array_keys($arReplace), array_values($arReplace), $this->shop->get_option('wpsg_mod_orderupload_filename')); - - $filename = $this->shop->replaceUniversalPlatzhalter($filename, $order_id); - - return $filename; - - } // public function getNewName($filename, $order_id) - - public function getSavePath($order_id, $burl = false) - { - - if ($this->shop->isMultiBlog()) - { - - $url = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/'.$order_id.'/'; - $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/'.$order_id.'/'; - $htaccess = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/.htaccess'; - - } - else - { - - $url = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_orderupload/'.$order_id.'/'; - $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_orderupload/'.$order_id.'/'; - $htaccess = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_orderupload/.htaccess'; - - } - - if (!file_exists($path)) mkdir($path, 0777, true); - - if (!file_exists($htaccess)) - { - - $handle = fopen($htaccess, "w+"); - $content = "Deny from all"; - fwrite($handle, $content, strlen($content)); - fclose($handle); - - } - - if ($burl) return $url; - else return $path; - - } // private function getSavePath($order_id, $url = false) - - } // class wpsg_mod_orderupload extends wpsg_mod_basic - - -?> Index: /system/intern/mods/wpsg_mod_bankalignment.class.php =================================================================== --- /system/intern/mods/wpsg_mod_bankalignment.class.php (revision 5691) +++ /system/intern/mods/wpsg_mod_bankalignment.class.php (revision 5691) @@ -0,0 +1,230 @@ +name = __('Bankabgleich', 'wpsg'); + $this->group = __('Bestellung', 'wpsg'); + $this->desc = __('Ermöglicht den Kontoabgleich Ìber exportierte CSV Dateien.', 'wpsg'); + + } // public function __construct() + + public function produkt_index_head() + { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/produkt_index_head.phtml'); + + } // public function produkt_index_head() + + public function produkt_index_aftersearch() + { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/produkt_index_aftersearch.phtml'); + + } // public function produkt_index_aftersearch() + + public function install() + { + + $this->shop->checkDefault('wpsg_mod_bankalignment_separator', ';'); + + } // public function install() + + public function settings_edit() + { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/settings_edit.phtml'); + + } // public function settings_edit() + + public function settings_save() + { + + $this->shop->update_option('wpsg_mod_bankalignment_separator', $_REQUEST['wpsg_mod_bankalignment_separator']); + + } // public function settings_save() + + public function order_ajax() + { + + if ($_REQUEST['mod'] != 'wpsg_mod_bankalignment') return; + + if (isset($_REQUEST['wpsg_mod_bankalignment_submit'])) + { + + $nSet = 0; + + foreach ($_REQUEST['set'] as $order_id) + { + + if ($order_id > 0) + { + + $order = $this->shop->cache->loadOrder($order_id); + + if ($order['status'] == 0) + { + + $this->shop->setOrderStatus($order_id, 100, true); + $nSet ++; + + } + + } + + } + + $this->shop->addBackendMessage(wpsg_translate(__('Es wurden #1# Bestellungen auf "#2#" gesetzt.', 'wpsg'), $nSet, $this->shop->arStatus[100])); + $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order'); + + } + + if (!file_exists($_FILES['wpsg_mod_bankalignment_file']['tmp_name'])) + { + + $this->shop->addBackendError(__('Bitte geben sie eine Datei an!', 'wpsg')); + die(''); + + } + else if (file_exists($_FILES['wpsg_mod_bankalignment_file']['tmp_name'])) + { + + // Alle Bestellungen die noch "Bestellung eingegangen" + $arOrder = $this->db->fetchAssoc(" + SELECT + O.`id` AS o_id, O.`onr` AS onr, + CONCAT(K.`vname`, ' ', K.`name`, ', ', REPLACE(FORMAT(O.`price_gesamt`, 2), '.', ','), ' ".$this->shop->get_option('wpsg_currency')."') AS okey + FROM + `".WPSG_TBL_ORDER."` AS O + LEFT JOIN `".WPSG_TBL_KU."` AS K ON (K.`id` = O.`k_id`) + WHERE + O.`status` = '0' + "); + + if (sizeof($arOrder) <= 0) + { + + $this->shop->addBackendError(__('Keine Bestellungen vorhanden, die noch nicht bezahlt sind!', 'wpsg')); + die(''); + + } + + foreach ($arOrder as $k => $v) + { + + if ($this->shop->hasMod('wpsg_mod_prepayment')) + { + + $arOrder[$k]['wpsg_mod_prepayment'] = $this->shop->callMod('wpsg_mod_prepayment', 'get_subject', array($v['o_id'])); + + } + + } + + $_SESSION['wpsg']['wpsg_mod_prepayment']['set'] = array(); + + $h = fopen($_FILES['wpsg_mod_bankalignment_file']['tmp_name'], "r"); + + $row = 0; + while (($data = fgetcsv($h, 1000, $this->shop->get_option('wpsg_mod_bankalignment_separator'))) !== FALSE) + { + + if ($row === 0) + { + + $this->shop->view['colInfo'] = $data; + + } + else + { + + $set = array(); + $set['data'] = $data; + $set['order_id'] = false; + $set['onr'] = false; + $set['okey'] = false; + + foreach ($arOrder as $k => $v) + { + + // Betreff aus dem Vorkassemodul + if ($this->shop->hasMod('wpsg_mod_prepayment') && $this->in_array($v['wpsg_mod_prepayment'], $data)) + { + + $set['order_id'] = $v['o_id']; + $set['onr'] = $v['onr']; + $set['okey'] = $v['key']; + break; + + } + + + } + + $_SESSION['wpsg']['wpsg_mod_prepayment']['set'][] = $set; + + } + + $row ++; + + } + + fclose($h); + + $this->shop->view['set'] = $_SESSION['wpsg']['wpsg_mod_prepayment']['set']; + $this->shop->view['arOrder'] = $arOrder; + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/order_ajax.phtml'); + + } + + } // public function order_ajax() + + public function product_index_tab(&$arTabs) + { + + $arTabs['left'][$this->id] = array( + 'tab_title' => __('Bankabgleich', 'wpsg'), + 'tab_icon' => 'glyphicon glyphicon-usd', + 'tab_content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_bankalignment/product_index_tab.phtml', false) + ); + + } // public function product_index_tab(&$arTabs) + + /** + * Hilfsfunktion die wie in_array prÌft ob $betreff in $data ist + * PrÌft aber nicht ganz so restriktiv + */ + private function in_array($betreff, $data) + { + + foreach ((array)$data as $k => $v) + { + + if (preg_match('/(.*)'.$v.'(.*)/i', $betreff)) return true; + + } + + return false; + + } // private function in_array($betreff, $data) + + } // class wpsg_mod_bankalignment extends wpsg_mod_basic + +?> Index: /system/intern/mods/wpsg_mod_orderupload.class.php =================================================================== --- /system/intern/mods/wpsg_mod_orderupload.class.php (revision 5691) +++ /system/intern/mods/wpsg_mod_orderupload.class.php (revision 5691) @@ -0,0 +1,284 @@ +name = __('Bestellupload', 'wpsg'); + $this->group = __('Bestellung', 'wpsg'); + $this->desc = __('Erlaubt das hochladen von Dateien zu Bestellungen.', 'wpsg'); + + } // public function __construct() + + public function install() + { + + $this->shop->checkDefault('wpsg_mod_orderupload_filename', '%order_onr%_%filename%'); + $this->shop->checkDefault('wpsg_mod_orderupload_allowedext', 'jpg,jpeg'); + $this->shop->checkDefault('wpsg_mod_orderupload_multifiles', '0'); + $this->shop->checkDefault('wpsg_mod_orderupload_optional', '0'); + + } // public function install() + + public function settings_edit() + { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/settings_edit.phtml'); + + } // public function settings_edit() + + public function settings_save() + { + + $this->shop->update_option('wpsg_mod_orderupload_filename', $_REQUEST['wpsg_mod_orderupload_filename']); + $this->shop->update_option('wpsg_mod_orderupload_allowedext', $_REQUEST['wpsg_mod_orderupload_allowedext']); + $this->shop->update_option('wpsg_mod_orderupload_multifiles', $_REQUEST['wpsg_mod_orderupload_multifiles']); + $this->shop->update_option('wpsg_mod_orderupload_optional', $_REQUEST['wpsg_mod_orderupload_optional']); + + } // public function settings_save() + + public function checkout_inner_prebutton(&$checkout_view) { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/checkout_inner_prebutton.phtml'); + + } // public function checkout_inner_prebutton(&$checkout_view) + + public function checkCheckout(&$state, &$error, &$arCheckout) + { + + if ($state == '1') + { + + if ( + $this->shop->get_option('wpsg_mod_orderupload_optional') != '1' && + sizeof($_SESSION['wpsg']['wpsg_mod_orderupload']) <= 0 && + (!isset($_FILES['wpsg_mod_orderupload_file']) || !file_exists($_FILES['wpsg_mod_orderupload_file']['tmp_name'])) + ) + { + + // Noch keine Datei hochgeladen und es ist Pflicht ! + $this->shop->addFrontendError(__('Bitte eine Datei zum Upload wÀhlen.', 'wpsg')); + $error = true; return; + + } + + if (isset($_FILES['wpsg_mod_orderupload_file']) && file_exists($_FILES['wpsg_mod_orderupload_file']['tmp_name'])) + { + + $ending = strtolower(preg_replace('/(.*)\./', '', $_FILES['wpsg_mod_orderupload_file']['name'])); + + if (!in_array($ending, (array)explode(',', strtolower($this->shop->get_option('wpsg_mod_orderupload_allowedext'))))) + { + + $this->shop->addFrontendError(__('Bitte eine gÌltige Dateiendung verwenden.', 'wpsg')); + $error = true; return; + + } + else + { + + // Upload durchfÌhren + $tmp = time().'-'.rand(1, 10000).'.'.$ending; + + move_uploaded_file($_FILES['wpsg_mod_orderupload_file']['tmp_name'], $this->getTmpFilePath().'/'.$tmp); + + if (!is_array($_SESSION['wpsg']['wpsg_mod_orderupload'])) $_SESSION['wpsg']['wpsg_mod_orderupload'] = array(); + else if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload']) && $this->shop->get_option('wpsg_mod_orderupload_multifiles') != '1') + { + + // Cache sauber haltens + foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $ou) + { + + unlink($ou[3]); + + } + + $_SESSION['wpsg']['wpsg_mod_orderupload'] = array(); + + } + + $_SESSION['wpsg']['wpsg_mod_orderupload'][] = wpsg_xss(array( + $_FILES['wpsg_mod_orderupload_file']['name'], + $tmp, + $this->getTmpFilePath(true).'/'.$tmp, + $this->getTmpFilePath().'/'.$tmp + )); + + $this->shop->addFrontendMessage(__('Datei wurde erfolgreich hochgeladen.', 'wpsg')); + + if ($this->shop->get_option('wpsg_mod_orderupload_multifiles') == '1') + { + + $error = true; + + } + + } + + } + + } + + } // public function checkCheckout(&$state, &$error, &$arCheckout) + + public function wp_loaded() + { + + if ($_REQUEST['wpsg_plugin'] == 'wpsg_mod_orderupload' && $_REQUEST['wpsg_action'] == 'remove') + { + + unlink($_SESSION['wpsg']['wpsg_mod_orderupload'][$_REQUEST['file_index']][3]); + unset($_SESSION['wpsg']['wpsg_mod_orderupload'][$_REQUEST['file_index']]); + + $this->shop->addFrontendMessage(__('Dokument wurde aus der Bestellung entfernt.', 'wpsg')); + + $this->shop->redirect($this->shop->getURL(wpsg_ShopController::URL_CHECKOUT)); + + } + + } // public function wp_loaded() + + public function order_ajax() + { + + if (isset($_REQUEST['wpsg_mod_orderupload_download'])) + { + + header('Content-Disposition: attachment; filename="'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']).'"'); + header('Content-type: application/download'); + header('Content-Disposition: inline; filename="'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']).'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); + header('Pragma: public'); + + die(file_get_contents($this->getSavePath($_REQUEST['edit_id']).'/'.rawurldecode($_REQUEST['wpsg_mod_orderupload_download']))); + + } + + } // public function order_ajax() + + public function basket_save_done(&$o_id, &$k_id, &$oBasket) + { + + if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload'])) + { + + foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $k => $ou) + { + + $path_target = $this->getSavePath($o_id); + + copy( + $ou[3], + $path_target.'/'.$this->getNewName($ou[0], $o_id) + ); + + // TemporÀren Ordner sÀubern + unlink($ou[3]); + + unset($_SESSION['wpsg']['wpsg_mod_orderupload'][$k]); + + } + + } + + } // public function basket_save_done($o_id, $k_id) + + public function order_view_sidebar(&$order_id) + { + + $arFiles = scandir($this->getSavePath($order_id)); + + foreach ($arFiles as $k => $v) { if (in_array($v['id'], array('.', '..', '.htaccess', '.htpasswd'))) { unset($arFiles[$k]); } } + + if (sizeof($arFiles) <= 0) return; + + $this->shop->view['arFiles'] = $arFiles; + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_orderupload/order_view_sidebar.phtml'); + + } // public function order_view_sidebar(&$order_id) + + public function delOrder(&$order_id) + { + + // Hochgeladene Dateien löschen + $path = $this->getSavePath($order_id); + + wpsg_rrmdir($path); + + } // public function delOrder(&$order_id) + + /* -- */ + + public function getNewName($filename, $order_id) + { + + $arReplace = array( + '/%filename%/' => $filename, + '/%filename_clear%/' => preg_replace('/\.(.*)$/', '', $filename) + ); + + $filename = preg_replace(array_keys($arReplace), array_values($arReplace), $this->shop->get_option('wpsg_mod_orderupload_filename')); + + $filename = $this->shop->replaceUniversalPlatzhalter($filename, $order_id); + + return $filename; + + } // public function getNewName($filename, $order_id) + + public function getSavePath($order_id, $burl = false) + { + + if ($this->shop->isMultiBlog()) + { + + $url = WPSG_URL_CONTENT.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/'.$order_id.'/'; + $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/'.$order_id.'/'; + $htaccess = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_orderupload/.htaccess'; + + } + else + { + + $url = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_orderupload/'.$order_id.'/'; + $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_orderupload/'.$order_id.'/'; + $htaccess = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_orderupload/.htaccess'; + + } + + if (!file_exists($path)) mkdir($path, 0777, true); + + if (!file_exists($htaccess)) + { + + $handle = fopen($htaccess, "w+"); + $content = "Deny from all"; + fwrite($handle, $content, strlen($content)); + fclose($handle); + + } + + if ($burl) return $url; + else return $path; + + } // private function getSavePath($order_id, $url = false) + + } // class wpsg_mod_orderupload extends wpsg_mod_basic + + +?> Index: /system/intern/views/mod_bankalignment/order_ajax.phtml =================================================================== --- /system/intern/views/mod_bankalignment/order_ajax.phtml (revision 5691) +++ /system/intern/views/mod_bankalignment/order_ajax.phtml (revision 5691) @@ -0,0 +1,95 @@ + +
+

+

+ - +

+ +
+ +
+ + + + + + + + + + view['set'] as $row) { $i ++; ?> + + + + + + +
+ + + + + + +
+ " href="#"> +
+
+
+ view['colInfo'] as $k => $v) { ?> + :
+ +
+ 		+ +
+ +
+ + + +
+ + + +
Index: /system/intern/views/mod_bankalignment/product_index_tab.phtml =================================================================== --- /system/intern/views/mod_bankalignment/product_index_tab.phtml (revision 5691) +++ /system/intern/views/mod_bankalignment/product_index_tab.phtml (revision 5691) @@ -0,0 +1,21 @@ + + + +
+ + + +
+ +
+ +
+ +
+ Index: /system/intern/views/mod_bankalignment/settings_edit.phtml =================================================================== --- /system/intern/views/mod_bankalignment/settings_edit.phtml (revision 5691) +++ /system/intern/views/mod_bankalignment/settings_edit.phtml (revision 5691) @@ -0,0 +1,9 @@ + + +get_option('wpsg_mod_bankalignment_separator')); ?> Index: /system/intern/views/mod_orderupload/checkout_inner_prebutton.phtml =================================================================== --- /system/intern/views/mod_orderupload/checkout_inner_prebutton.phtml (revision 5691) +++ /system/intern/views/mod_orderupload/checkout_inner_prebutton.phtml (revision 5691) @@ -0,0 +1,26 @@ + +
+
get_option('wpsg_mod_orderupload_optional') != '1') { ?>*
+
+ + + + +
+
+ $ou) { ?> + + + +  
+ + + +
+
Index: /system/intern/views/mod_orderupload/order_view_sidebar.phtml =================================================================== --- /system/intern/views/mod_orderupload/order_view_sidebar.phtml (revision 5691) +++ /system/intern/views/mod_orderupload/order_view_sidebar.phtml (revision 5691) @@ -0,0 +1,22 @@ + +
+

+

+ +

+
+ view['arFiles'])) { ?> +

+ + view['arFiles'] as $f) { ?> + (callMod('wpsg_mod_orderupload', 'getSavePath', array($this->view['data']['id'])).$f); ?>)
+ + +
+
Index: /system/intern/views/mod_orderupload/settings_edit.phtml =================================================================== --- /system/intern/views/mod_orderupload/settings_edit.phtml (revision 5691) +++ /system/intern/views/mod_orderupload/settings_edit.phtml (revision 5691) @@ -0,0 +1,11 @@ + +get_option('wpsg_mod_orderupload_filename'), array('help' => 'wpsg_mod_orderupload_filename')); ?> +get_option('wpsg_mod_orderupload_allowedext'), array('help' => 'wpsg_mod_orderupload_allowedext')); ?> +get_option('wpsg_mod_orderupload_multifiles'), array('help' => 'wpsg_mod_orderupload_multifiles')); ?> +get_option('wpsg_mod_orderupload_optional'), array('help' => 'wpsg_mod_orderupload_optional')); ?> Index: /views/mods/mod_ordervars/settings_edit.phtml =================================================================== --- /views/mods/mod_ordervars/settings_edit.phtml (revision 5690) +++ /views/mods/mod_ordervars/settings_edit.phtml (revision 5691) @@ -30,20 +30,8 @@ /* ]]> */ -

-

+ +
mod->ov_list(); ?>
+
-
- -
-
-
- - -
-
-
-
- mod->ov_list(); ?> -
- -
+ +