WEB. templates fixed #915

This commit is contained in:
Dmitry Naumov-Socolov 2016-11-22 07:05:19 -05:00
commit 02ac870ab7
38 changed files with 381 additions and 382 deletions

View file

@ -40,7 +40,7 @@
<a class="data-date"><?=$v_time?></a>
</td>
</tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
<tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
</table>
</td>
<td class="data-dotted">
@ -52,7 +52,8 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".htmlentities($v_domain); ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".htmlentities($v_domain); ?>>
<input type="text" size="20" class="vst-input" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
</td>
</tr>
<tr>
@ -62,7 +63,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".htmlentities($v_ip); ?>>
<input type="text" size="20" class="vst-input" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
</td>
</tr>
<tr>
@ -72,7 +73,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".htmlentities($v_exp); ?>>
<input type="text" size="20" class="vst-input" name="v_exp" value="<?=htmlentities(trim($v_exp, "'"))?>">
</td>
</tr>
<tr>
@ -82,7 +83,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_soa" <?php if (!empty($v_soa)) echo "value=".htmlentities($v_soa); ?>>
<input type="text" size="20" class="vst-input" name="v_soa" value="<?=htmlentities(trim($v_soa, "'"))?>">
</td>
</tr>
<tr>
@ -92,17 +93,17 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".htmlentities($v_ttl); ?>>
<input type="text" size="20" class="vst-input" name="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
</td>
</tr>
</table>
<table class="data-col2">
<tr>
<td class="step-top" width="116px">
<input type="submit" class="button" name="save" value="<?php print __('Save');?>">
<input type="submit" class="button" name="save" value="<?=__('Save')?>">
</td>
<td class="step-top">
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
<input type="button" class="button cancel" value="<?=__('Back')?>" onclick="<?=$back?>">
</td>
</tr>
</table>

View file

@ -41,7 +41,7 @@
<a class="data-date"><?=$v_time?></a>
</td>
</tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
<tr><td class="data-<?=$v_status?>"><b><?=__($v_status)?></b></td></tr>
</table>
</td>
<td class="data-dotted">
@ -53,7 +53,8 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_user" <?php if (!empty($v_username)) echo "value=".htmlentities($v_username); ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".htmlentities($v_username); ?>>
<input type="text" size="20" class="vst-input" name="v_user" value="<?=htmlentities(trim($v_username, "'"))?>" disabled>
<input type="hidden" name="v_username" value="<?=htmlentities(trim($v_username, "'"))?>">
</td>
</tr>
<tr>
@ -63,7 +64,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input password" name="v_password" <?php if (!empty($v_password)) echo "value=".htmlentities($v_password); ?>>
<input type="text" size="20" class="vst-input password" name="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
</td>
</tr>
<tr>
@ -73,7 +74,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".htmlentities($v_email); ?>>
<input type="text" size="20" class="vst-input" name="v_email" value="<?=htmlentities(trim($v_email, "'"))?>">
</td>
</tr>
<tr>
@ -107,7 +108,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=\"".htmlentities($v_fname)."\""; ?>>
<input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
</td>
</tr>
<tr>
@ -117,7 +118,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=\"".htmlentities($v_lname)."\""; ?>>
<input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
</td>
</tr>
<tr>
@ -128,31 +129,21 @@
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo 'value="'.htmlentities($v_ns1).'"'; ?>>
<input type="text" size="20" class="vst-input" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
<span class="remove-ns additional-control delete"><?=__('delete')?></span>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo 'value="'.htmlentities($v_ns2).'"'; ?>>
<input type="text" size="20" class="vst-input" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
<span class="remove-ns additional-control delete"><?=__('delete')?></span>
</td>
</tr>
<!-- tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".htmlentities($v_ns1); ?>>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".htmlentities($v_ns2); ?>>
</td>
</tr -->
<? if($v_ns3)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
<input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities(trim($v_ns3, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -160,7 +151,7 @@
if($v_ns4)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
<input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities(trim($v_ns4, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -168,7 +159,7 @@
if($v_ns5)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
<input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities(trim($v_ns5, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -176,7 +167,7 @@
if($v_ns6)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
<input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities(trim($v_ns6, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -184,7 +175,7 @@
if($v_ns7)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
<input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities(trim($v_ns7, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -192,7 +183,7 @@
if($v_ns8)
echo '<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
<input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities(trim($v_ns8, "'")).'">
<span class="remove-ns additional-control delete">'.__('delete').'</span>
</td>
</tr>';
@ -207,10 +198,10 @@
<table class="data-col2">
<tr>
<td class="step-top" width="116px">
<input type="submit" class="button" name="save" value="<?php print __('Save');?>">
<input type="submit" class="button" name="save" value="<?=__('Save')?>">
</td>
<td class="step-top">
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
<input type="button" class="button cancel" value="<?=__('Back')?>" onclick="<?=$back?>">
</td>
</tr>
</table>
@ -218,4 +209,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -41,7 +41,7 @@
<a class="data-date"><?=$v_time?></a>
</td>
</tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
<tr><td class="data-<?=$v_status ?>"><b><?=__($v_status) ?></b></td></tr>
</table>
</td>
<td class="data-dotted">
@ -53,7 +53,8 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".htmlentities($v_domain); ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".htmlentities($v_domain); ?>>
<input type="text" size="20" class="vst-input" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
</td>
</tr>
<tr>
@ -81,7 +82,7 @@
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo htmlentities($v_aliases); ?></textarea>
<textarea size="20" class="vst-textinput" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
</td>
</tr>
<tr>
@ -118,12 +119,12 @@
<tr>
<td class="vst-text input-label">
<?php print __('SSL Certificate');?>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=htmlentites(trim($v_domain, "'"))?>"><?=__('Generate CSR')?></a></span>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo htmlentities($v_ssl_crt); ?></textarea>
<textarea size="20" class="vst-textinput" name="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
</td>
</tr>
<tr>
@ -133,7 +134,7 @@
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo htmlentities($v_ssl_key); ?></textarea>
<textarea size="20" class="vst-textinput" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
</td>
</tr>
<tr>
@ -143,7 +144,7 @@
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo htmlentities($v_ssl_ca); ?></textarea>
<textarea size="20" class="vst-textinput" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
</td>
</tr>
<?
@ -253,7 +254,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".htmlentities($v_stats_user); ?>>
<input type="text" size="20" class="vst-input" name="v_stats_user" value="<?=htmlentities(trim($v_stats_user, "'"))?>">
</td>
</tr>
<tr>
@ -263,7 +264,7 @@
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input password" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".htmlentities($v_stats_password); ?> id="v_password">
<input type="text" size="20" class="vst-input password" name="v_stats_password" value="<?=htmlentities(trim($v_stats_password, "'"))?>" id="v_password">
</td>
</tr>
</table>
@ -301,7 +302,7 @@
</tr>
<tr>
<td class="step-left">
<input type="text" size="20" class="vst-input v-ftp-user" <?php print $ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?> name="v_ftp_user[<?php print $i ?>][v_ftp_user]" <?php if (!empty($v_ftp_user)) echo "value=".htmlentities($v_ftp_user); ?>>
<input type="text" size="20" class="vst-input v-ftp-user" <?php print $ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?> name="v_ftp_user[<?php print $i ?>][v_ftp_user]" value="<?=htmlentities(trim($v_ftp_user, "'"))?>">
<small class="hint"></small>
</td>
</tr>
@ -312,7 +313,7 @@
</tr>
<tr>
<td class="step-left">
<input type="text" class="vst-input v-ftp-user-psw password" name="v_ftp_user[<?php print $i ?>][v_ftp_password]" <?php if (!empty($v_ftp_password)) echo "value=".htmlentities($v_ftp_password); ?>>
<input type="text" class="vst-input v-ftp-user-psw password" name="v_ftp_user[<?php print $i ?>][v_ftp_password]" value="<?=htmlentities(trim($v_ftp_password, "'"))?>">
</td>
</tr>
@ -323,10 +324,10 @@
</tr>
<tr>
<td class="step-left">
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="<?php print !empty($v_ftp_pre_path) ? htmlentities($v_ftp_pre_path) : '/'; ?>">
<input type="hidden" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path_prev]" <?php if (!empty($v_ftp_path)) echo "value=".($v_ftp_path[0] != '/' ? '/' : '').htmlentities($v_ftp_path); ?>>
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path]" <?php if (!empty($v_ftp_path)) echo "value=".($v_ftp_path[0] != '/' ? '/' : '').htmlentities($v_ftp_path); ?>>
<br /><span class="ftp-path-prefix"><?php print $v_ftp_pre_path ?></span><span class="ftp-path-value v-ftp-path-hint"></span>
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="<?php print !empty($v_ftp_pre_path) ? htmlentities(trim($v_ftp_pre_path, "'")) : '/'; ?>">
<input type="hidden" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path_prev]" value="<?=($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'"))?>">
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path]" value="<?=($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'"))?>">
<br /><span class="ftp-path-prefix"><?=$v_ftp_pre_path ?></span><span class="ftp-path-value v-ftp-path-hint"></span>
</td>
</tr>
<?php if ($ftp_user['is_new'] == 1): ?>
@ -337,7 +338,7 @@
</tr>
<tr>
<td class="step-left">
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[<?php print $i ?>][v_ftp_email]" <?php if (!empty($v_ftp_email)) echo "value=".htmlentities($v_ftp_email); ?>>
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[<?php print $i ?>][v_ftp_email]" value="<?=htmlentities(trim($v_ftp_email, "'"))?>">
</td>
</tr>
<?php endif; ?>
@ -355,10 +356,10 @@
<table class="data-col2">
<tr>
<td class="step-top" width="116px">
<input type="submit" class="button" name="save" value="<?php print __('Save');?>">
<input type="submit" class="button" name="save" value="<?=__('Save')?>">
</td>
<td class="step-top">
<input type="button" class="button cancel" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
<input type="button" class="button cancel" value="<?=__('Back')?>" onclick="<?=$back?>">
</td>
</tr>
</table>
@ -408,7 +409,7 @@
<td class="step-left">
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="">
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[%INDEX%][v_ftp_path]" value="">
<br /><span class="ftp-path-prefix"><?php print $v_ftp_pre_path_new_user ?></span><span class="ftp-path-value v-ftp-path-hint"></span>
<br /><span class="ftp-path-prefix"><?=$v_ftp_pre_path_new_user ?></span><span class="ftp-path-value v-ftp-path-hint"></span>
</td>
</tr>
<tr>