Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 6846)
+++ /controller/wpsg_AdminController.class.php	(revision 6848)
@@ -2413,18 +2413,18 @@
 					if ($GLOBALS['wpsg_sc']->isMultiBlog())
 						$ftp_path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_temp/';
-						else
-							$ftp_path = WP_CONTENT_DIR.'/wpsg/uploads/wpsg_temp/';
+					else
+						$ftp_path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_temp/';
 								
-							$ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name);
+						$ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name);
 								
-							$bOK = $wp_filesystem->put_contents($ftp_path, $this->shop->get_url_content($url), FS_CHMOD_FILE);
+						$bOK = $wp_filesystem->put_contents($ftp_path, $this->shop->get_url_content($url), FS_CHMOD_FILE);
 								
-							if (!$bOK)
-							{
+						if (!$bOK)
+						{
 									
-								$this->shop->addBackendError(wpsg_translate(__('Modul (#1#) konnte nicht kopiert werden!', 'wpsg'), $modul_key));
-								return false;
+							$this->shop->addBackendError(wpsg_translate(__('Modul (#1#) konnte nicht kopiert werden!', 'wpsg'), $modul_key));
+							return false;
 			
-							}
+						}
 								
 				}
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6846)
+++ /controller/wpsg_ShopController.class.php	(revision 6848)
@@ -102,4 +102,5 @@
 		const STATUS_AKTIVABO = 600;
 		const STATUS_OFFENEABOKUENDIGUNG = 610;
+		const STATUS_GEKUENDIGTEABOS = 620;
 
 		/** Seitenkonstanten */
@@ -138,4 +139,5 @@
 				self::STATUS_AKTIVABO => __('aktive Abos', 'wpsg'),
 				self::STATUS_OFFENEABOKUENDIGUNG => __('ausstehende AbokÃŒndigungen', 'wpsg'),
+				self::STATUS_GEKUENDIGTEABOS => __('gekÃŒndigte Abos', 'wpsg'),
 			);
 
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 6846)
+++ /lib/filter_functions.inc.php	(revision 6848)
@@ -612,5 +612,5 @@
             $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_temp/update_temp/';
         else
-            $path = WP_CONTENT_DIR.'/uploads/wpsg_temp/update_temp/';
+            $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_temp/update_temp/';
     
         if (!file_exists($path)) wpsg_mkdir($path);
@@ -671,5 +671,5 @@
             $path = WP_CONTENT_DIR.'/'.WPSG_MB_UPLOADS.'/wpsg/wpsg_temp/update_temp/';
         else
-            $path = WP_CONTENT_DIR.'/uploads/wpsg_temp/update_temp/';
+            $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_temp/update_temp/';
     
         //if (file_exists($path.'/lib/translation.phtml')) copy($path.'/lib/translation.phtml', WPSG_PATH.'/lib/translation.phtml');
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 6846)
+++ /mods/wpsg_mod_basic.class.php	(revision 6848)
@@ -1243,6 +1243,6 @@
 			{
 				
-				if ($burl) $url = WPSG_URL_CONTENT.'uploads/wpsg_temp/';
-				$path = WP_CONTENT_DIR.'/uploads/wpsg_temp/';
+				if ($burl) $url = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_temp/';
+				$path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_temp/';
 				
 			}
Index: /mods/wpsg_mod_billsafe.class.php
===================================================================
--- /mods/wpsg_mod_billsafe.class.php	(revision 6846)
+++ /mods/wpsg_mod_billsafe.class.php	(revision 6848)
@@ -943,6 +943,6 @@
 			{
 				
-				$htaccess = WP_CONTENT_DIR.'/uploads/wpsg_billsafe/.htaccess';
-				$path = WP_CONTENT_DIR.'/uploads/wpsg_billsafe/'.$order_id.'/';
+				$htaccess = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_billsafe/.htaccess';
+				$path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_billsafe/'.$order_id.'/';
 				if (!file_exists($path)) mkdir($path, 0777, true);
 				
@@ -950,5 +950,5 @@
 				{
 					
-					$url = WPSG_URL_CONTENT.'uploads/wpsg_billsafe/'.$order_id.'/';
+					$url = WPSG_URL_CONTENT.'uploads/wpsg/wpsg_billsafe/'.$order_id.'/';
 					
 				}
Index: /mods/wpsg_mod_downloadplus.class.php
===================================================================
--- /mods/wpsg_mod_downloadplus.class.php	(revision 6846)
+++ /mods/wpsg_mod_downloadplus.class.php	(revision 6848)
@@ -68,6 +68,6 @@
         {
 
-            $path = WP_CONTENT_DIR.'/uploads/wpsg_dlplus/';
-            $new_path = WP_CONTENT_DIR.'/uploads/wpsg_pdfprodukte/';
+            $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_dlplus/';
+            $new_path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_pdfprodukte/';
 
         }
@@ -1622,5 +1622,5 @@
             {
 
-                $path = WP_CONTENT_DIR.'/uploads/wpsg_pdfprodukte/'.$produkt_id.'/';
+                $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_pdfprodukte/'.$produkt_id.'/';
 
             }
@@ -1668,5 +1668,5 @@
             {
 
-                $path = WP_CONTENT_DIR.'/uploads/wpsg_pdfprodukte_order/'.$order_id.'/';
+                $path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_pdfprodukte_order/'.$order_id.'/';
 
             }
Index: /mods/wpsg_mod_downloadprodukte.class.php
===================================================================
--- /mods/wpsg_mod_downloadprodukte.class.php	(revision 6846)
+++ /mods/wpsg_mod_downloadprodukte.class.php	(revision 6848)
@@ -298,9 +298,9 @@
 			{
 				
-				if ($url) return WPSG_URL_CONTENT.'uploads/wpsg_downloadprodukte/'.$produkt_id.'/';
+				if ($url) return WPSG_URL_CONTENT.'uploads/wpsg/wpsg_downloadprodukte/'.$produkt_id.'/';
 				else 
 				{
 					
-					$path = WP_CONTENT_DIR.'/uploads/wpsg_downloadprodukte/'.$produkt_id.'/';
+					$path = WP_CONTENT_DIR.'/uploads/wpsg/wpsg_downloadprodukte/'.$produkt_id.'/';
 					
 					if (!file_exists($path)) mkdir($path, 0777, true);
Index: /system/old/wpsg_mod_core.class
===================================================================
--- /system/old/wpsg_mod_core.class	(revision 6846)
+++ /system/old/wpsg_mod_core.class	(revision 6848)
@@ -496,5 +496,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.'/uploads/wpsg/wpsg_temp/';
 								
 							$ftp_path = trailingslashit($wp_filesystem->find_folder($ftp_path)).preg_replace('/(.*)\/wpsg_temp\//', '', $temp_name);
Index: /system/readme.txt
===================================================================
--- /system/readme.txt	(revision 6846)
+++ /system/readme.txt	(revision 6848)
@@ -64,5 +64,5 @@
 (empfohlen: chmod 0777)
 `/uploads/wpsg/
-/uploads/wpsg_produktbilder/
+/uploads/wpsg/wpsg_produktbilder/
 /wp-content/plugins/wpshopgermany/lib/`
 
Index: /views/mods/mod_downloadplus/settings_edit.phtml
===================================================================
--- /views/mods/mod_downloadplus/settings_edit.phtml	(revision 6846)
+++ /views/mods/mod_downloadplus/settings_edit.phtml	(revision 6848)
@@ -35,6 +35,6 @@
             <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_cleanraiddownloads', __('Abgelaufene Downloads bereinigen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanraiddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanraiddownloads')); ?>
             <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_cleanolddownloads', __('Downloads nach X Tagen löschen', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_cleanolddownloads'), array('help' => 'wpsg_mod_downloadplus_cleanolddownloads')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfpath', __('Pfad fÃŒr die PDFs der Produkte', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfpath'), array('hint' => __('Standard: uploads/wpsg_pdfprodukte/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfpath')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfindivpath', __('Pfad fÃŒr die Individualisierten PDFs', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfindivpath'), array('hint' => __('Standard: uploads/wpsg_pdfprodukte_order/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfindivpath')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfpath', __('Pfad fÃŒr die PDFs der Produkte', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfpath'), array('hint' => __('Standard: uploads/wpsg/wpsg_pdfprodukte/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfpath')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_pdfindivpath', __('Pfad fÃŒr die Individualisierten PDFs', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_pdfindivpath'), array('hint' => __('Standard: uploads/wpsg/wpsg_pdfprodukte_order/', 'wpsg'), 'help' => 'wpsg_mod_downloadplus_pdfindivpath')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_format', __('Auslieferungsformat', 'wpsg'), array(0 => __('Direkt', 'wpsg'), 1 => __('Gezippt (intern)', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_format'), array('help' => 'wpsg_mod_downloadplus_format')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_downloadplus_range', __('Anpassung', 'wpsg'), array(0 => __('Gesamtes Dokument', 'wpsg'), 1 => __('Bereich', 'wpsg')), $this->get_option('wpsg_mod_downloadplus_range'), array ('field_class' => 'wpsg_change', 'help' => 'wpsg_mod_downloadplus_range')); ?>