Просмотр исходного кода

Fix multiple small UI issues (#2289)

* #2286 Allow admin loginas suspended user
* #2282 Edit user delete button broken
* #2278 Show alias in list web
* Fix php error in /edit/server when no extra php version where installed
Jaap Marcus 4 лет назад
Родитель
Сommit
0f9c6cb2cb

+ 3 - 0
web/edit/server/index.php

@@ -247,6 +247,9 @@ if (!empty($_POST['save'])) {
     if (empty($_SESSION['error_msg'])) {
         if (!empty($v_php_versions)) {
             $post_php = $_POST['v_php_versions'];
+            if(empty($post_php)){
+                $post_php = array();
+            }
 
             array_map(function ($php_version) use ($post_php) {
                 if (array_key_exists($php_version->tpl, $post_php)) {

+ 2 - 0
web/inc/main.php

@@ -201,9 +201,11 @@ function top_panel($user, $TAB)
 
     // Log out active sessions for suspended users
     if (($panel[$user]['SUSPENDED'] === 'yes') && ($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'yes')) {
+        if(empty($_SESSION['look'])){
         $_SESSION['error_msg'] = 'You have been logged out. Please log in again.';
         destroy_sessions();
         header('Location: /login/');
+        }
     }
 
     // Reset user permissions if changed while logged in

+ 2 - 0
web/templates/pages/edit_user.html

@@ -18,6 +18,7 @@
 			<?php } ?>
 		</div>
 		<div class="l-unit-toolbar__buttonstrip float-right">
+			<div class="actions-panel clearfix">
 			<?php if (($_SESSION['user'] == $v_username) || (isset($_SESSION['look']))) {?>
 				<!-- Do not show delete button for currently logged in user-->
 			<?} else {?>
@@ -34,6 +35,7 @@
 				</div>
 			<?php } ?>
 			<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save');?></a>
+			</div>
 		</div>
 	</div>
 </div>

+ 10 - 2
web/templates/pages/list_web.html

@@ -177,8 +177,16 @@
 						<b>
 							<?php if ($read_only === 'true') {?>
 								<?=$key?>
-							<?php } else { ?>
-								<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Domain');?>: <?=$key?>"><?=$key?></a>
+							<?php } else {
+								$aliases = explode(',', $data[$key]['ALIAS']);
+								$alias_new = array();
+								foreach($aliases as $alias){
+									if($alias != 'www.'.$key){
+										$alias_new[] = trim($alias);
+									}
+								}
+								?>
+								<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Domain');?>: <?=$key?>"><?=$key?><?php if( !empty($alias_new) && !empty($data[$key]['ALIAS']) ){ echo " <span class=\"hint\">(".implode(',',$alias_new).")"; } ?></a>
 							<?php } ?>
 						</b>
 					</div>