- Anfrage Modul aufgeräumt

1 files changed, 132 insertions, 112 deletions

diff --git a/views/mods/mod_coverletter/settings_edit.phtml b/views/mods/mod_coverletter/settings_edit.phtml
index 400f7a7..c8b6a6f 100644
--- a/views/mods/mod_coverletter/settings_edit.phtml
+++ b/views/mods/mod_coverletter/settings_edit.phtml
@@ -1,148 +1,162 @@
 <?php

 

 	/**

- * Template für die Einstellungen des "Anschreiben" Moduls

- */

+	 * Template für die Einstellungen des "Anschreiben" Moduls

+	 */

+

+	if (!defined('ABSPATH')) exit;

+

+	$arTexts = $this->view['wpsg_mod_coverletter']['arTexts'];

+

+	$logo_pos = $this->get_option('wpsg_mod_coverletter_logo_position');

+	$defaultAlign = ((!isset($logo_pos) || empty($logo_pos))?'align-buttons-active':'');

+

+	$alignLeft = (($logo_pos === 'left')?'align-buttons-active':'');

+	$alignCenter = (($logo_pos === 'center')?'align-buttons-active':'');

+	$alignRight = (($logo_pos === 'right')?'align-buttons-active':'');

+

+	$logo_transparency = (($this->get_option('wpsg_mod_coverletter_logo_transparency'))?$this->get_option('wpsg_mod_coverletter_logo_transparency'):'100%');

 

 ?>

 

 <div>

 	<ul class="nav nav-tabs" role="tablist">

-		<li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Vordefinierte Textfelder', 'wpsg'); ?></a></li>

+		<li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo esc_html__('Vordefinierte Textfelder', 'wpsg'); ?></a></li>

 	</ul>

 	<div class="tab-content">

 		<div role="tabpanel" class="tab-pane active" id="tab1">

-		

+

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['wpsg_mod_coverletter']['bp'] === false) { ?>

-					<p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>

+					<p><?php echo esc_html__('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>

 				<?php } else { ?>

-					<a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=getBp&noheader=1" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>

+					<a target="_blank" href="<?php echo esc_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=getBp&noheader=1'); ?>"><?php echo esc_html__('Derzeitiges Briefpapier', 'wpsg'); ?></a>

 				<?php } ?>

-				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_coverletter_bp" data-wpsg-tip="mod_coverletter_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_coverletter_bp"></a>

+				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&amp;subaction=loadHelp&amp;noheader=1&amp;field=mod_coverletter_bp" data-wpsg-tip="mod_coverletter_bp" rel="?page=wpsg-Admin&amp;subaction=loadHelp&amp;noheader=1&amp;field=mod_coverletter_bp"></a>

 				<input type="file" name="wpsg_mod_coverletter_bp">

-				<?php $strSuffix = ''; if ($this->view['wpsg_mod_coverletter']['bp'] !== false) { $strSuffix = '

-                    <label>

-						<input type="checkbox" name="wpsg_mod_coverletter_bp_del" value="1" />&nbsp;'.__('Löschen', 'wpsg').'

-					</label>';

-					echo __($strSuffix);

-				} ?>

+				<?php if ($this->view['wpsg_mod_coverletter']['bp'] !== false) { ?>

+					<label>

+						<input type="checkbox" name="wpsg_mod_coverletter_bp_del" value="1" />&nbsp;<?php echo esc_html__('Löschen', 'wpsg'); ?>

+					</label>

+				<?php } ?>

 			</div>

-			<?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_coverletter_bp')); ?>

-			

+			<?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), ['noP' => true, 'helps' => 'wpsg_mod_coverletter_bp']); ?>

+

 			<hr />

-			

-			<?php echo wpsg_drawForm_Input('wpsg_mod_coverletter_subject', __('Betreff', 'wpsg'),$this->get_option('wpsg_mod_coverletter_subject'), ['help' => 'wpsg_mod_coverletter_subject']); ?>

+

+			<?php echo wpsg_drawForm_Input('wpsg_mod_coverletter_subject', __('Betreff', 'wpsg'), $this->get_option('wpsg_mod_coverletter_subject'), ['help' => 'wpsg_mod_coverletter_subject']); ?>

 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_coverletter_text', __('Textvorgabe', 'wpsg'), $this->get_option('wpsg_mod_coverletter_text'), ['help' => 'wpsg_mod_coverletter_text']); ?>

-			

+

 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<div style="position:relative;">

 				<?php if ($this->view['wpsg_mod_coverletter']['logo'] === false) { ?>

-					<p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>

+					<p><?php echo esc_html__('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>

 				<?php } else { ?>

-					<a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=getLogo&noheader=1" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>

+					<a target="_blank" href="<?php echo esc_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=getLogo&noheader=1'); ?>"><?php echo esc_html__('Derzeitiges Logo', 'wpsg'); ?></a>

 				<?php } ?>

-				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_coverletter_logo" data-wpsg-tip="mod_coverletter_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_coverletter_logo"></a>

+				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&amp;subaction=loadHelp&amp;noheader=1&amp;field=mod_coverletter_logo" data-wpsg-tip="mod_coverletter_logo" rel="?page=wpsg-Admin&amp;subaction=loadHelp&amp;noheader=1&amp;field=mod_coverletter_logo"></a>

 				<input type="file" name="wpsg_mod_coverletter_logo">

-				<?php $logo_pos = $this->get_option("wpsg_mod_coverletter_logo_position"); ?>

-				<?php $defaultAlign = !isset($logo_pos) || empty($logo_pos) ? "align-buttons-active" : ""; ?>

-

-				<?php $alignLeft = $logo_pos === 'left' ? "align-buttons-active" : ""; ?>

-				<?php $alignCenter = $logo_pos === 'center' ? "align-buttons-active" : ""; ?>

-				<?php $alignRight = $logo_pos === 'right' ? "align-buttons-active" : ""; ?>

-

-				<?php $logo_transparency = $this->get_option("wpsg_mod_coverletter_logo_transparency") ?: "100%"; ?>

 

-				<?php $strSuffix = ''; if ($this->view['wpsg_mod_coverletter']['logo'] !== false) { $strSuffix = '

+				<?php if ($this->view['wpsg_mod_coverletter']['logo'] !== false) { ?>

 					<div class="row"><br />

-                        <div class="col-md-12">

-        				    <div class="position">

-                            	<input type="text" style="width:45%; float:left; margin-right:10px;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_x" name="wpsg_mod_coverletter_logo_x" placeholder="'.__('X-Position', 'wpsg').'" value="'.$this->get_option('wpsg_mod_coverletter_logo_x').'" />

-                                <input type="text" style="width:45%;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_y" name="wpsg_mod_coverletter_logo_y" placeholder="'.__('Y-Position', 'wpsg').'" value="'.$this->get_option('wpsg_mod_coverletter_logo_y').'" />

-                            </div>

-                        </div>

+						<div class="col-md-12">

+							<div class="position">

+								<input type="text" style="width:45%; float:left; margin-right:10px;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_x" name="wpsg_mod_coverletter_logo_x" placeholder="<?php echo esc_attr__('X-Position', 'wpsg'); ?>" value="<?php echo esc_attr($this->get_option('wpsg_mod_coverletter_logo_x')); ?>" />

+								<input type="text" style="width:45%;" data-toggle="tooltip" class="wpsg_mod_coverletter_logo_y" name="wpsg_mod_coverletter_logo_y" placeholder="<?php echo esc_attr__('Y-Position', 'wpsg'); ?>" value="<?php echo esc_attr($this->get_option('wpsg_mod_coverletter_logo_y')); ?>" />

+							</div>

+						</div>

 						<div class="col-md-8 logo-transparency">

 							<label>

-								<input type="text" name="wpsg_mod_coverletter_logo_transparency" value="'.$logo_transparency.'" />&nbsp;'.__('Logodeckkraft', 'wpsg').'

-							</label>		

+								<input type="text" name="wpsg_mod_coverletter_logo_transparency" value="<?php echo esc_attr($logo_transparency); ?>" />&nbsp;<?php echo esc_html__('Logodeckkraft', 'wpsg'); ?>

+							</label>

 						</div>

 						<div class="col-md-12">

 							<label style="margin-top:20px; ">

-								<input type="checkbox" name="wpsg_mod_coverletter_logo_del" value="1" />&nbsp;'.__('Löschen', 'wpsg').'

-							</label>	

+								<input type="checkbox" name="wpsg_mod_coverletter_logo_del" value="1" />&nbsp;<?php echo esc_html__('Löschen', 'wpsg'); ?>

+							</label>

 						</div>

-					</div>';

-					echo __($strSuffix);

-				} ?>

+					</div>

+				<?php } ?>

 

-						

-					

 				<button class="button wpsg_coverletter_preview" style="float:right; margin-right:10px;" name="wpsg_coverletter_preview" type="button">

-					<?php echo __("Vorschau", "wpsg"); ?>

+					<?php echo esc_html__('Vorschau', 'wpsg'); ?>

 				</button>

 

 			</div>

-			

-			<?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_coverletter_logo')); ?>

+

+			<?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), ['noP' => true, 'helps' => 'wpsg_mod_coverletter_logo']); ?>

 

 			<hr /><br />

 

+			<style>

+				.wpsg_mod_coverletter_fieldtable { table-layout:fixed; width:100%; }

+				.wpsg_mod_coverletter_fieldtable > thead > tr > th,

+				.wpsg_mod_coverletter_fieldtable > tbody > tr > td { vertical-align:middle; padding:6px 5px; }

+				.wpsg_mod_coverletter_fieldtable .col_bezeichnung { width:110px; }

+				.wpsg_mod_coverletter_fieldtable .col_x,

+				.wpsg_mod_coverletter_fieldtable .col_y { width:70px; }

+				.wpsg_mod_coverletter_fieldtable .col_color { width:56px; }

+				.wpsg_mod_coverletter_fieldtable .col_groesse { width:72px; }

+				.wpsg_mod_coverletter_fieldtable .col_action { width:50px; text-align:center; }

+				.wpsg_mod_coverletter_fieldtable input[type="text"],

+				.wpsg_mod_coverletter_fieldtable select { width:100%; max-width:none; min-width:0; margin:0; }

+				.wpsg_mod_coverletter_fieldtable input.wpsg_mod_coverletter_number { text-align:right; }

+				.wpsg_mod_coverletter_fieldtable input[type="color"] { display:block; width:100%; height:30px; padding:2px; border:1px solid #8c8f94; border-radius:4px; background:#fff; cursor:pointer; }

+				.wpsg_mod_coverletter_fieldtable input[type="checkbox"] { margin:0; }

+			</style>

+

 			<table class="table table-body-striped wpsg_mod_coverletter_fieldtable">

 				<thead>

-				<tr>

-					<th class="col_bezeichnung"><?php echo __('Bezeichnung', 'wpsg'); ?></th>

-					<th class="col_freitext"><?php echo __('Freitext', 'wpsg'); ?></th>

-					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>

-					<th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>

-					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>

-					<th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>

-					<th class="col_action"></th>

-				</tr>

-				</thead>

-				<tbody>

-				<?php foreach ($this->view['wpsg_mod_coverletter']['fields'] as $f => $field_name) { ?>

 					<tr>

-						<td><?php echo wpsg_hspc($field_name); ?></td>

-						<td>

-							<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][text]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['text']); ?>" />

-						</td>

-						<td>

-							<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][x]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['x']); ?>" />

-						</td>

-						<td>

-							<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][y]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['y']); ?>" />

-						</td>

-						<td>

-							<input type="text" style="width:100%;" name="text[<?php echo $f; ?>][color]" value="<?php echo wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['color']); ?>" />

-						</td>

-						<td>

-							<select name="text[<?php echo $f; ?>][fontsize]" style="width:100%;">

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "8")?'selected="selected"':''); ?> value="8">8</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "9")?'selected="selected"':''); ?> value="9">9</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "10")?'selected="selected"':''); ?> value="10">10</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "11")?'selected="selected"':''); ?> value="11">11</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "12")?'selected="selected"':''); ?> value="12">12</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "13")?'selected="selected"':''); ?> value="13">13</option>

-								<option <?php echo ((wpsg_getStr($this->view['wpsg_mod_coverletter']['arTexts'][$f]['fontsize']) == "14")?'selected="selected"':''); ?> value="14">14</option>

-							</select>

-						</td>

-						<td>

-							<input type="checkbox" title="<?php echo __('Diese Checkbox aktivieren, damit die Textzeile verwendet wird.', 'wpsg'); ?>" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['wpsg_mod_coverletter']['arTexts'][$f]['aktiv']))?'checked="checked"':''); ?> />

-						</td>

+						<th class="col_bezeichnung"><?php echo esc_html__('Bezeichnung', 'wpsg'); ?></th>

+						<th class="col_freitext"><?php echo esc_html__('Freitext', 'wpsg'); ?></th>

+						<th class="col_x"><?php echo esc_html__('X', 'wpsg'); ?></th>

+						<th class="col_y"><?php echo esc_html__('Y', 'wpsg'); ?></th>

+						<th class="col_color"><?php echo esc_html__('Farbe', 'wpsg'); ?></th>

+						<th class="col_groesse"><?php echo esc_html__('Größe', 'wpsg'); ?></th>

+						<th class="col_action"><?php echo esc_html__('Aktiv', 'wpsg'); ?></th>

 					</tr>

-				<?php } ?>

+				</thead>

+				<tbody>

+					<?php foreach ($this->view['wpsg_mod_coverletter']['fields'] as $f => $field_name) { ?>

+						<?php $arText = ((is_array($arTexts[$f]??null))?$arTexts[$f]:[]); ?>

+						<tr>

+							<td><?php echo wpsg_hspc($field_name); ?></td>

+							<td>

+								<input type="text" name="text[<?php echo esc_attr($f); ?>][text]" value="<?php echo esc_attr($arText['text']??''); ?>" />

+							</td>

+							<td>

+								<input type="text" class="wpsg_mod_coverletter_number" inputmode="decimal" name="text[<?php echo esc_attr($f); ?>][x]" value="<?php echo esc_attr($arText['x']??''); ?>" />

+							</td>

+							<td>

+								<input type="text" class="wpsg_mod_coverletter_number" inputmode="decimal" name="text[<?php echo esc_attr($f); ?>][y]" value="<?php echo esc_attr($arText['y']??''); ?>" />

+							</td>

+							<td>

+								<input type="color" name="text[<?php echo esc_attr($f); ?>][color]" value="<?php echo esc_attr($arText['color']??'#000000'); ?>" />

+							</td>

+							<td>

+								<select name="text[<?php echo esc_attr($f); ?>][fontsize]">

+									<?php for ($size = 8; $size <= 14; $size++) { ?>

+										<option <?php echo (((string)($arText['fontsize']??'') === (string)$size)?'selected="selected"':''); ?> value="<?php echo esc_attr($size); ?>"><?php echo esc_html($size); ?></option>

+									<?php } ?>

+								</select>

+							</td>

+							<td class="col_action">

+								<input type="checkbox" title="<?php echo esc_attr__('Diese Checkbox aktivieren, damit die Textzeile verwendet wird.', 'wpsg'); ?>" value="1" name="text[<?php echo esc_attr($f); ?>][aktiv]" <?php echo ((is_numeric($arText['aktiv']??null) && $arText['aktiv'] > 0)?'checked="checked"':''); ?> />

+							</td>

+						</tr>

+					<?php } ?>

 				</tbody>

 			</table>

 

-			<input class="button" onclick="if (!confirm('<?php echo __('Sind Sie sich sicher? Ihre bisherigen Einstellungen gehen verloren!', 'wpsg'); ?>')) return false; else location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;do=reset&amp;noheader=1';" type="button" value="<?php echo __('Standardeinstellungen laden', 'wpsg'); ?>" />

+			<input class="button" onclick="if (!confirm('<?php echo esc_js(__('Sind Sie sich sicher? Ihre bisherigen Einstellungen gehen verloren!', 'wpsg')); ?>')) return false; else location.href = '<?php echo esc_js(wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=reset&noheader=1', 'wpsg-coverletter-reset')); ?>';" type="button" value="<?php echo esc_attr__('Standardeinstellungen laden', 'wpsg'); ?>" />

 

 			<br /><br />

 

 			<div class="info">

 				<p>

-					<?php echo __('Die Angaben für X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />

-					<?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>

+					<?php echo esc_html__('Die Angaben für X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?>

 				</p>

 			</div>

 

@@ -157,40 +171,42 @@
 	/**

 	 * Stellt sicher, dass immer nur ein Button der align-buttons die highlight Klasse hat

 	 */

-	function handleLogoAlignClick(pressedEl)

-	{

+	function handleLogoAlignClick(pressedEl) {

+

+		if (pressedEl.hasClass('align-buttons-active')) {

+

+			return;

 

-		if(pressedEl.hasClass("align-buttons-active")) return;

-		else

-		{

+		} else {

 

-			pressedEl.addClass("align-buttons-active");

-			pressedEl[0].value = pressedEl[0].value + " selected";

+			pressedEl.addClass('align-buttons-active');

+			pressedEl[0].value = pressedEl[0].value + ' selected';

 

-			jQuery.each($(".logo-align-button"), function(index, element) {

-				if(element.classList.contains("align-buttons-active") && element !== pressedEl[0]){

+			jQuery.each(jQuery('.logo-align-button'), function(index, element) {

 

-					var values = element.value.split(" ");

+				if (element.classList.contains('align-buttons-active') && element !== pressedEl[0]) {

+

+					var values = element.value.split(' ');

 					element.value = values[0];

 

-					element.classList.remove("align-buttons-active");

+					element.classList.remove('align-buttons-active');

 

 					return false;

 

 				}

+

 			});

 

 		}

 

-	} // function handleLogoAlignClick()

+	} // function handleLogoAlignClick(pressedEl)

 

 	/**

 	 * Wird beim Klicken auf den Vorschau Button ausgelöst

 	 */

-	function wpsg_coverletter_preview()

-	{

+	function wpsg_coverletter_preview() {

 

-		var url = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=orderAjax&noheader=1&wpsg_mod_coverletter_preview=1";

+		var url = <?php echo wp_json_encode(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_coverletter&do=orderAjax&noheader=1&wpsg_mod_coverletter_preview=1'); ?>;

 

 		window.open(url, '_blank');

 

@@ -198,19 +214,23 @@
 

 	} // function wpsg_coverletter_preview()

 

-

-

 	jQuery(document).ready(function() {

 

-		jQuery('#wpsg_tab').wpsg_tab( {

+		jQuery('#wpsg_tab').wpsg_tab({

 			'cookiename': 'wpsg_mod_coverletter_tab',

 			'tab2': function() {

+

 				jQuery('.tablink').show();

+

 			}

-		} );

+		});

+

+		jQuery('.wpsg_coverletter_preview').click(function() {

+

+			wpsg_coverletter_preview();

 

-		jQuery(".wpsg_coverletter_preview").click(function(){ wpsg_coverletter_preview(); });

+		});

 

-	} );

+	});

 

 	/* ]]> */</script>
\ No newline at end of file