Index: /mods/wpsg_mod_downloadplus.class.php
===================================================================
--- /mods/wpsg_mod_downloadplus.class.php	(revision 8264)
+++ /mods/wpsg_mod_downloadplus.class.php	(revision 8265)
@@ -181,4 +181,5 @@
 	        $this->shop->checkDefault('wpsg_mod_downloadplus_autosend', '1');
 	        $this->shop->checkDefault('wpsg_mod_downloadplus_indiv_mode', '1');
+			$this->shop->checkDefault('wpsg_mod_downloadplus_setpwd', '1');
 
 	    } // public function install()
@@ -334,4 +335,5 @@
 	        $this->shop->update_option('wpsg_mod_downloadplus_range_von', $_REQUEST['wpsg_mod_downloadplus_range_von'], false, false, WPSG_SANITIZE_TEXTFIELD);
 	        $this->shop->update_option('wpsg_mod_downloadplus_range_bis', $_REQUEST['wpsg_mod_downloadplus_range_bis'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_downloadplus_setpwd', $_REQUEST['wpsg_mod_downloadplus_setpwd'], false, false, WPSG_SANITIZE_CHECKBOX);
 	        $this->shop->update_option('wpsg_mod_downloadplus_masterpass', $_REQUEST['wpsg_mod_downloadplus_masterpass'], false, false, WPSG_SANITIZE_TEXTFIELD);
 	        $this->shop->update_option('wpsg_mod_downloadplus_openpass', $_REQUEST['wpsg_mod_downloadplus_openpass'], false, false, WPSG_SANITIZE_TEXTFIELD);
@@ -347,5 +349,5 @@
 	        $this->shop->update_option('wpsg_mod_downloadplus_startnumber', $_REQUEST['wpsg_mod_downloadplus_startnumber'], false, false, WPSG_SANITIZE_TEXTFIELD);
 	        $this->shop->update_option('wpsg_mod_downloadplus_attachement', $_REQUEST['wpsg_mod_downloadplus_attachement'], false, false, WPSG_SANITIZE_CHECKBOX);
-
+ 
 	    } // public function settings_save()
 
@@ -656,5 +658,5 @@
 	            $product_key = $_REQUEST['product_key'];
 	            $product_id = intval($this->shop->getProduktID($product_key));
-
+				
 	            check_admin_referer('wpsg-dp-download-'.$order_id.'-'.$product_key);
 
@@ -960,12 +962,16 @@
 	            $pdf = new wpsg_dl_fpdf($orientation, "mm", array($w, $h));;
 
-	            $arRights = array();
-
-	            if ($this->shop->get_option("wpsg_mod_downloadplus_securitysave") == "1") $arRights[] = "copy";
-	            if ($this->shop->get_option("wpsg_mod_downloadplus_securityprint") == "1") $arRights[] = "print";
-	            if ($this->shop->get_option("wpsg_mod_downloadplus_securitymod") == "1") $arRights[] = "modify";
-	            if ($this->shop->get_option("wpsg_mod_downloadplus_securitynote") == "1") $arRights[] = "annot-forms";
-
-	            $pdf->SetProtection($arRights, $this->shop->get_option("wpsg_mod_downloadplus_openpass"), $this->shop->get_option("wpsg_mod_downloadplus_masterpass"));
+				if ($this->shop->get_option("wpsg_mod_downloadplus_setpwd") == "1") {
+
+					$arRights = array();
+
+					if ($this->shop->get_option("wpsg_mod_downloadplus_securitysave") == "1") $arRights[] = "copy";
+					if ($this->shop->get_option("wpsg_mod_downloadplus_securityprint") == "1") $arRights[] = "print";
+					if ($this->shop->get_option("wpsg_mod_downloadplus_securitymod") == "1") $arRights[] = "modify";
+					if ($this->shop->get_option("wpsg_mod_downloadplus_securitynote") == "1") $arRights[] = "annot-forms";
+ 
+					$pdf->SetProtection($arRights, $this->shop->get_option("wpsg_mod_downloadplus_openpass"), $this->shop->get_option("wpsg_mod_downloadplus_masterpass"));
+
+				}
 
 	            $pagecount = $pdf->setSourceFile($src_file);
Index: /views/mods/mod_downloadplus/settings_edit.phtml
===================================================================
--- /views/mods/mod_downloadplus/settings_edit.phtml	(revision 8264)
+++ /views/mods/mod_downloadplus/settings_edit.phtml	(revision 8265)
@@ -46,11 +46,14 @@
             </div>
 
-            <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_masterpass', __('Passwort (Um Schutz aufzuheben)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_masterpass'), array('help' => 'wpsg_mod_downloadplus_masterpass')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_openpass', __('Passwort (Um Dokument öffnen zu können)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_openpass'), array('help' => 'wpsg_mod_downloadplus_openpass')); ?>
+            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_setpwd', __('Passwortschutz aktivieren', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_setpwd'), array('help' => 'wpsg_mod_downloadplus_setpwd')); ?>
+            <div class="wpsg_mod_downloadplus_setpwd_activ" style="display:none;">
+                <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_masterpass', __('Passwort (Um Schutz aufzuheben)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_masterpass'), array('help' => 'wpsg_mod_downloadplus_masterpass')); ?>
+			    <?php echo wpsg_drawForm_Input('wpsg_mod_downloadplus_openpass', __('Passwort (Um Dokument öffnen zu können)', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_openpass'), array('help' => 'wpsg_mod_downloadplus_openpass')); ?>
 
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitysave', __('Speichern erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitysave'), array('label' => __('Dokumentenberechtigung', 'wpsg'))); ?>
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securityprint', __('Drucken erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securityprint')); ?>
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitymod', __('Modifizieren erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitymod')); ?>
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitynote', __('Bemerkungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitynote')); ?>
+                <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitysave', __('Speichern erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitysave'), array('label' => __('Dokumentenberechtigung', 'wpsg'))); ?>
+                <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securityprint', __('Drucken erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securityprint')); ?>
+                <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitymod', __('Modifizieren erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitymod')); ?>
+                <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitynote', __('Bemerkungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitynote')); ?>
+            </div>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
@@ -122,4 +125,11 @@
         } ).change();
 
+        jQuery('#wpsg_mod_downloadplus_setpwd').bind('change', function() {
+
+            if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_downloadplus_setpwd_activ').show();
+            else jQuery('.wpsg_mod_downloadplus_setpwd_activ').hide();
+
+        } ).change();
+
     } );