Änderungen und Fehlerkorrekturen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6005 0d5edaf7-2b12-4e95-93f4-047927463d4b

1 files changed, 32 insertions, 90 deletions

diff --git a/views/mods/mod_keygen/settings_edit.phtml b/views/mods/mod_keygen/settings_edit.phtml
index f4ada77..a45ff27 100644
--- a/views/mods/mod_keygen/settings_edit.phtml
+++ b/views/mods/mod_keygen/settings_edit.phtml
@@ -14,85 +14,35 @@
 	<?php echo wpsg_drawForm_Input('wpsg_mod_keygen[wpsg_mod_keygen_date]', __('Enddatum (tt.mm.jjjj)', 'wpsg'), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_date']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_date']:'99.99.9999')); ?>

 	<?php echo wpsg_drawForm_Input('wpsg_mod_keygen[wpsg_mod_keygen_maxver]', __('Maximale Versionsnummer', 'wpsg'), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']:'9.9.9')); ?>

 		

-	<div class="wpsg_form_field">

-		<div class="wpsg_form_left">

-			<label><?php echo __('Module', 'wpsg'); ?>:</label>

-		</div>

-		<div class="wpsg_form_right">

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_rechnungen'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_rechnungen" />&nbsp;<?php echo __('Rechnungsmodul', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_downloadplus'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_downloadplus" />&nbsp;<?php echo __('Downloadplus', 'wpsg'); ?>

-			</label><br /> 

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_statistics'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_statistics" />&nbsp;<?php echo __('Statistikmodul', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_produktartikel'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_produktartikel" />&nbsp;<?php echo __('Produktartikel', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_videodownload'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_videodownload" />&nbsp;<?php echo __('Videodownloadmodul', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">			

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_ordercondition'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_ordercondition" />&nbsp;<?php echo __('Bestellbedingung', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">			

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_voucherproduct'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_voucherproduct" />&nbsp;<?php echo __('Gutscheinprodukt', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_orderupload'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_orderupload" />&nbsp;<?php echo __('Bestellupload', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_deliverynote'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_deliverynote" />&nbsp;<?php echo __('Lieferschein', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_abo'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_abo" />&nbsp;<?php echo __('Abo Produkte', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_shs'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_shs" />&nbsp;<?php echo __('Internetkasse', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_customergroup'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_customergroup" />&nbsp;<?php echo __('Kundengruppen', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-				<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_packagetracking'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_packagetracking" />&nbsp;<?php echo __('Paketverfolgung', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_request'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_request" />&nbsp;<?php echo __('Anfrage Produkte', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_minquantity'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_minquantity" />&nbsp;<?php echo __('Mindestbestellmenge', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_minrequest'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_minrequest" />&nbsp;<?php echo __('Mindestbestellwert', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_paypalapi'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_paypalapi" />&nbsp;<?php echo __('PayPal PLUS', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-			<label style="line-height:25px;">

-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_amazon'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_amazon" />&nbsp;<?php echo __('AmazonPayment', 'wpsg'); ?>

-			</label>

-			<div class="wpsg_clear"></div>

-		</div>	

-	</div>

+	<?php 

+	echo wpsg_drawForm_TextStart();

+	echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true));

+	

+	echo wpsg_drawForm_TextStart(); 

+	$i = 0;

+	// Lizenz = 1	Light Version

+	// Lizenz = 2	Pro Version

+	// Lizenz = 3	Enterprise Version

+	foreach ($this->arModule as $k => $v) { $i ++;

+		$mname = $k;

+		$lic = $v->lizenz;

+		//if ((key_exists('name', $v)) && ($lic == 1))

+		if ((key_exists('name', $v)))

+		{

+			$vname = $v->name;

+

+			$chk = (@key_exists($mname, $_SESSION['wpsg_mod_keygen']['mods'] == '1'))?1:0;

+			echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($vname, 'wpsg'), 

+				$chk, array('value' => wpsg_hspc($mname),

+							'noHidden' => true,

+							'fullWidth' => true

+			));

+		}

+		

+	}

+	echo wpsg_drawForm_TextEnd(__('', 'wpsg'), array('noP' => true));

+	?>

+

 	

 	<input type="hidden" name="aktiv" value="1" />

 	<input type="hidden" name="wpsg_genkey" value="1" />

@@ -101,21 +51,13 @@
 			

 </form>

 

-<br />

-

 <form name="form1" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;noheader=1" method="post" enctype="multipart/form-data">

 		

-	<div class="wpsg_form_field">

-		<div class="wpsg_form_left">

-			<label><?php echo __('Module', 'wpsg'); ?>:</label>

-		</div>

-		<div class="wpsg_form_right">

+	<?php echo wpsg_drawForm_TextStart(); ?>

 			<input type="file" name="testkey" />

-		</div>

-	</div>

-	

-	<br />

 	

+	<?php echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true)); ?>

+

 	<input type="hidden" name="aktiv" value="1" />

 	

 	<p class="submit"><input type="submit" value="<?php echo __('Key testen', 'wpsg'); ?>" class="button-primary" id="submit" name="submit">