Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 6531) +++ /controller/wpsg_AdminController.class.php (revision 6534) @@ -2793,5 +2793,5 @@ ); ob_end_clean(); - + // 1 gibt es bei Windows Rechnern zurÃŒck, da es hier egal ist // Ein Array ist es wenn das Formular bereits abgeschickt wurde und die Anfrage vom Formular kommt @@ -2840,5 +2840,5 @@ $ftp_path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_temp/'; else - $ftp_path = WP_CONTENT_DIR.'/uploads/wpsg_temp/'; + $ftp_path = WP_CONTENT_DIR.'/wpsg/uploads/wpsg_temp/'; $ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name); @@ -2859,5 +2859,5 @@ $zip = new ZipArchive(); - + if ($zip->open($temp_name) === true) { @@ -2865,6 +2865,6 @@ try { - - $bOK = @$zip->extractTo(WPSG_PATH.'/../'); + + $bOK = @$zip->extractTo(realpath(WPSG_PATH.'/../')); $zip->close(); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6531) +++ /controller/wpsg_ShopController.class.php (revision 6534) @@ -2155,4 +2155,44 @@ } + } + + $theme_mod_dir = get_template_directory().'/mods/'; + + if (file_exists($theme_mod_dir)) + { + + $theme_mod_dir_h = opendir($theme_mod_dir); + + while ($file = readdir($theme_mod_dir_h)) + { + + if (!is_dir($theme_mod_dir.$file) && $file != "." && $file != ".." && preg_match("/(.*)\.class\.php/i", $file) && $file != "wpsg_mod_basic.class.php") + { + + require_once($theme_mod_dir.$file); + + $class_name = preg_replace("/\.class\.php/", "", $file); + + $mod = new $class_name(); + + if ($this->get_option($class_name, $global) > 0) + { + + $this->arModule[$class_name] = $mod; + + } + + if ($all) + { + + $this->arAllModule[$class_name] = $mod; + + } + + } + + } + + } @@ -2947,6 +2987,6 @@ { - $path = WPSG_PATH_CONTENT.'uploads/wpsg_temp/'; - $url = WPSG_URL_CONTENT.'uploads/wpsg_temp/'; + $path = WPSG_PATH_CONTENT.'uploads/wpsg/wpsg_temp/'; + $url = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_temp/'; } Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 6531) +++ /lib/functions.inc.php (revision 6534) @@ -888,4 +888,7 @@ { + if (!wpsg_isSizedDouble($value)) return 0; + if (!wpsg_isSizedDouble($mwst)) return 0; + if ($brutto_netto == WPSG_BRUTTO) { Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 6531) +++ /mods/wpsg_mod_produktartikel.class.php (revision 6534) @@ -1083,15 +1083,5 @@ } // private function setPostType($query) - - /** - * Wird vom Produkttemplate aufgerufen um die Social Media Links einzubinden - */ - public function socialIntegration($produkt_id) - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktartikel/produkt.phtml'); - - } // public function socialIntegration($produkt_id) - + /** * Gibt einen Array mit Kategorien zurÃŒck Index: /system/old/mod_productview/productview.phtml =================================================================== --- /system/old/mod_productview/productview.phtml (revision 6534) +++ /system/old/mod_productview/productview.phtml (revision 6534) @@ -0,0 +1,256 @@ + + + + + +
+ + view['wpsg_mod_productview']['cols'] != 3) { ?> +

view['wpsg_mod_productview']['title']); ?>

+ + + view['wpsg_mod_productview']['products'])) { ?> + view['wpsg_mod_productview']['products'])[0]; ?> + + view['wpsg_mod_productview']['atts']['hideorder'])) { ?> +
+ view['wpsg_mod_productview']['order']; ?> + + + + + + + view['wpsg_mod_productview']['arOrder'][$order]; ?> +
+
+ view['wpsg_mod_productview']['arOrder'] as $value => $label) { ?> + + +
+
+
+ + + + + + view['wpsg_mod_productview']['atts']['hideviewselect'])) { ?> + + + +
+ +
+ + view['wpsg_mod_productview']['products'])) { ?> + + view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?> + +
+ +
+ + imagehandler->getAttachmentID($oProduct->getProductKey()); + + ?> + + +
+
+ +
+ +
+ +
+ + +
+ +
+

getProductName(); ?>

+
+ + rating > 0) { ?> +
+ +
+ + + canDisplayPrice()) { ?> +
+ getOldPrice(); ?> + getPrice()) { ?> +
getPrice(), $this->get_option('wpsg_currency')); ?>
+
get_option('wpsg_currency')); ?>
+ +
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
+ +
+ getFrontendTaxview() == WPSG_BRUTTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + getFrontendTaxview() == WPSG_NETTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + +
+ +

+ + + getShortDescription(); if (wpsg_isSizedString($shortDescription)) { ?> +
+
+ +
+ + + canOrder()) { ?> + + + + + +
+ +
+ +
+ +
+ + imagehandler->getAttachmentID($oProduct->getProductKey()); + + ?> + + +
+ +
+ +
+ +
+ + rating > 0) { ?> +
+ +
+ + +
+ + canDisplayPrice()) { ?> +
+ + getOldPrice(); ?> + getPrice()) { ?> +
get_option('wpsg_currency')); ?>
+
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
getPrice(), $this->get_option('wpsg_currency')); ?>
+ + +
+ +
+ getFrontendTaxview() == WPSG_BRUTTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + getFrontendTaxview() == WPSG_NETTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + +
+ +
+ +
+ + +
+
+ +
+ + + +
+ +
+

getProductName(); ?>

+
+ +
+ shortdesc; ?> +
+ + canOrder()) { ?> + + + + + +
+ +
+ + view['wpsg_mod_productview']['cols'] === 0) { ?> +
+ + + + + +
+ + +
+ + $this->view['wpsg_mod_productview']['pages'], + 'page' => $this->view['wpsg_mod_productview']['page'], + 'per_page' => $this->view['wpsg_mod_productview']['per_page'], + 'margin' => 2, + 'onclick' => array( + 'func' => 'wpsg_switchProductview', + 'args' => array( + $this->view['wpsg_mod_productview']['index'], + '#PAGE#' + ) + ) + )); + + ?> + +
+ + + Index: /system/old/mod_productview/productview_filter.phtml =================================================================== --- /system/old/mod_productview/productview_filter.phtml (revision 6534) +++ /system/old/mod_productview/productview_filter.phtml (revision 6534) @@ -0,0 +1,123 @@ +
+ + view['showFilter'] as $filter_data) { ?> + + + +
+

+ '; + + foreach ($ar as $k => $cat) + { + + echo '
  • '; + echo ''.wpsg_hspc($cat->cat_name).''; + + $arSubCat = $shop->callMod('wpsg_mod_produktartikel', 'getSubCategory', array($cat->term_id)); + wpsg_renderCat($shop, $arSubCat, $level + 1); + + echo '
    • '; + + } + + echo ''; + + } + + } + + wpsg_renderCat($this, $filter_data['cat']); + + ?> +
    + + + +
    +

    +
    +
    + get_option('wpsg_currency'); ?> - get_option('wpsg_currency'); ?> + + +
    +
    + + + + +
    +

    + + +
    + + + + + + + + + + + + + + +
    +
    + +
    +

    + +
    + + + + + + + + + + + + + + +
    +
    +
    + + + +
    +

    + +
    + $auswahl) { ?> + + + + + + + + +
    +
    + + + + +
    Index: /views/admin/modulelist.phtml =================================================================== --- /views/admin/modulelist.phtml (revision 6531) +++ /views/admin/modulelist.phtml (revision 6534) @@ -116,5 +116,5 @@ } - else if (version_compare($modul_info['version'], WPSG_VERSION) > 0) + else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], WPSG_VERSION) > 0) { @@ -122,5 +122,5 @@ } - else if (version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->version) > 0) + else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->version) > 0) { Index: /views/admin/ueber.phtml =================================================================== --- /views/admin/ueber.phtml (revision 6531) +++ /views/admin/ueber.phtml (revision 6534) @@ -182,14 +182,25 @@ } - $arDir = iterateDir(WPSG_PATH_USERVIEW); - - $sd = ''; - foreach ($arDir as $k => $d) - $sd .= $d.'
    '; - echo wpsg_drawForm_TextStart(); - echo $sd; + + if (file_exists(WPSG_PATH_USERVIEW) && is_dir(WPSG_PATH_USERVIEW)) + { + + $arDir = iterateDir(WPSG_PATH_USERVIEW); + + $sd = ''; foreach ($arDir as $k => $d) $sd .= $d.'
    '; + + echo $sd; + + } + else + { + + echo WPSG_PATH_USERVIEW; + + } + echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg')); - + ?> Index: ews/mods/mod_produktartikel/produkt.phtml =================================================================== --- /views/mods/mod_produktartikel/produkt.phtml (revision 6531) +++ (revision ) @@ -1,58 +1,0 @@ - - -get_option('wpsg_mod_produktartikel_twitter') == '1' || $this->get_option('wpsg_mod_produktartikel_google') == '1' || $this->get_option('wpsg_mod_produktartikel_facebook') == '1') { ?> -
    - - - -
    - -