Nginx-less user templates

Author: serghey-rodin

web/templates/user/edit_web.html

@@ -118,6 +118,7 @@
                                     <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                 </td>
                             </tr>
+                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
@@ -139,6 +140,7 @@
                                     </table>
                                 </td>
                             </tr>
+                            <?php echo ""; }?> 
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
@@ -329,7 +331,6 @@
                                     <?php endforeach; ?>
                                 </td>
                             </tr>
-                            
                             <tr class="add-new-ftp-user-button" style="<?php print !empty($v_ftp_user) ? '' : 'display:none;' ?>">
                                 <td class="vst-text step-top v-add-new-user step-bottom">
                                     <a class="additional-control" onClick="App.Actions.WEB.add_ftp_user_form()"><?php print __('Add one more FTP Account');?></a>
@@ -350,7 +351,7 @@
                 </tr>
             </table>
         </form>
-        
+
         <div id="templates" class="hidden">
             <table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
                 <tr> 

web/templates/user/list_web.html

@@ -152,6 +152,7 @@
                                 </td>
                                 <td style="vertical-align:top;" width="238px">
                                     <table>
+                                        <tr><td>&nbsp;</td><td></td></tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
                                             <td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
@@ -160,33 +161,31 @@
                                             <td class="counter-name"><?php print __('SSL Support');?>:</td>
                                             <td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
                                         </tr>
-
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Statistics');?>: </td>
                                             <td class="counter-value"> <?php print __($web_stats) ?></td>
                                         </tr>
 
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Proxy Support');?>:</td>
-                                            <td class="counter-value"><?php print __($proxy_support);?></td>
-                                        </tr>
-
                                     </table>
                                 </td>
                                 <td rowspan=4 style="vertical-align:top;">
                                     <table>
+                                        <tr><td>&nbsp;</td><td></td></tr>
+                                        <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
                                         <tr>
-                                            <td class="counter-name"><?php print __('Proxy Template');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
+                                            <td class="counter-name"><?php print __('Proxy Support');?>:</td>
+                                            <td class="counter-value"><?php print __($proxy_support);?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Proxy Extensions');?>:</td>
-                                            <td class="counter-value"><?php echo $proxy_ext;?></td>
+                                            <td class="counter-name"><?php print __('Proxy Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
                                         </tr>
+                                        <?php echo ""; }?> 
                                         <tr>
                                             <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
                                             <td class="counter-value"> <?php print __($ftp_user) ?></td>
                                         </tr>
+
                                     </table>
                                 </td>
                             </tr>