@@ -33,14 +33,14 @@ discard block  | 
                                                    ||
| 33 | 33 |  		<?php if(!empty($_['forms']['admin'])) { ?> | 
                                                        
| 34 | 34 |  			<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li> | 
                                                        
| 35 | 35 | <?php  | 
                                                        
| 36 | - }  | 
                                                        |
| 37 | -		foreach($_['forms']['personal'] as $form) { | 
                                                        |
| 38 | -			if (isset($form['anchor'])) { | 
                                                        |
| 39 | -				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); | 
                                                        |
| 40 | - $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 41 | - $sectionName = $form['section-name'];  | 
                                                        |
| 42 | - $active = $form['active'] ? ' class="active"' : '';  | 
                                                        |
| 43 | - ?>  | 
                                                        |
| 36 | + }  | 
                                                        |
| 37 | +        foreach($_['forms']['personal'] as $form) { | 
                                                        |
| 38 | +            if (isset($form['anchor'])) { | 
                                                        |
| 39 | +                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); | 
                                                        |
| 40 | + $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 41 | + $sectionName = $form['section-name'];  | 
                                                        |
| 42 | + $active = $form['active'] ? ' class="active"' : '';  | 
                                                        |
| 43 | + ?>  | 
                                                        |
| 44 | 44 | <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>  | 
                                                        
| 45 | 45 | <a href="<?php p($anchor); ?>">  | 
                                                        
| 46 | 46 |  						<?php if (!empty($form['icon'])) { ?> | 
                                                        
@@ -52,24 +52,24 @@ discard block  | 
                                                    ||
| 52 | 52 | </a>  | 
                                                        
| 53 | 53 | </li>  | 
                                                        
| 54 | 54 | <?php  | 
                                                        
| 55 | - }  | 
                                                        |
| 56 | - }  | 
                                                        |
| 57 | - ?>  | 
                                                        |
| 55 | + }  | 
                                                        |
| 56 | + }  | 
                                                        |
| 57 | + ?>  | 
                                                        |
| 58 | 58 | |
| 59 | 59 | <?php  | 
                                                        
| 60 | -		if(!empty($_['forms']['admin'])) { | 
                                                        |
| 61 | - ?>  | 
                                                        |
| 60 | +        if(!empty($_['forms']['admin'])) { | 
                                                        |
| 61 | + ?>  | 
                                                        |
| 62 | 62 |  			<li class="app-navigation-caption"><?php p($l->t('Administration')); ?></li> | 
                                                        
| 63 | 63 | <?php  | 
                                                        
| 64 | - }  | 
                                                        |
| 65 | -		foreach($_['forms']['admin'] as $form) { | 
                                                        |
| 66 | -			if (isset($form['anchor'])) { | 
                                                        |
| 64 | + }  | 
                                                        |
| 65 | +        foreach($_['forms']['admin'] as $form) { | 
                                                        |
| 66 | +            if (isset($form['anchor'])) { | 
                                                        |
| 67 | 67 | |
| 68 | -				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); | 
                                                        |
| 69 | - $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 70 | - $sectionName = $form['section-name'];  | 
                                                        |
| 71 | - $active = $form['active'] ? ' class="active"' : '';  | 
                                                        |
| 72 | - ?>  | 
                                                        |
| 68 | +                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); | 
                                                        |
| 69 | + $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 70 | + $sectionName = $form['section-name'];  | 
                                                        |
| 71 | + $active = $form['active'] ? ' class="active"' : '';  | 
                                                        |
| 72 | + ?>  | 
                                                        |
| 73 | 73 | <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>  | 
                                                        
| 74 | 74 | <a href="<?php p($anchor); ?>">  | 
                                                        
| 75 | 75 |  						<?php if (!empty($form['icon'])) { ?> | 
                                                        
@@ -81,9 +81,9 @@ discard block  | 
                                                    ||
| 81 | 81 | </a>  | 
                                                        
| 82 | 82 | </li>  | 
                                                        
| 83 | 83 | <?php  | 
                                                        
| 84 | - }  | 
                                                        |
| 85 | - }  | 
                                                        |
| 86 | - ?>  | 
                                                        |
| 84 | + }  | 
                                                        |
| 85 | + }  | 
                                                        |
| 86 | + ?>  | 
                                                        |
| 87 | 87 | </ul>  | 
                                                        
| 88 | 88 | </div>  | 
                                                        
| 89 | 89 | |
@@ -22,7 +22,7 @@ discard block  | 
                                                    ||
| 22 | 22 | */  | 
                                                        
| 23 | 23 | |
| 24 | 24 |  style('settings', 'settings'); | 
                                                        
| 25 | -script('settings', [ 'settings', 'admin', 'log', 'certificates'] ); | 
                                                        |
| 25 | +script('settings', ['settings', 'admin', 'log', 'certificates']); | 
                                                        |
| 26 | 26 |  script('core', 'setupchecks'); | 
                                                        
| 27 | 27 |  script('files', 'jquery.fileupload'); | 
                                                        
| 28 | 28 | |
@@ -30,14 +30,14 @@ discard block  | 
                                                    ||
| 30 | 30 | |
| 31 | 31 | <div id="app-navigation">  | 
                                                        
| 32 | 32 | <ul>  | 
                                                        
| 33 | -		<?php if(!empty($_['forms']['admin'])) { ?> | 
                                                        |
| 33 | +		<?php if (!empty($_['forms']['admin'])) { ?> | 
                                                        |
| 34 | 34 |  			<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li> | 
                                                        
| 35 | 35 | <?php  | 
                                                        
| 36 | 36 | }  | 
                                                        
| 37 | -		foreach($_['forms']['personal'] as $form) { | 
                                                        |
| 37 | +		foreach ($_['forms']['personal'] as $form) { | 
                                                        |
| 38 | 38 |  			if (isset($form['anchor'])) { | 
                                                        
| 39 | 39 |  				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); | 
                                                        
| 40 | - $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 40 | + $class = 'nav-icon-'.$form['anchor'];  | 
                                                        |
| 41 | 41 | $sectionName = $form['section-name'];  | 
                                                        
| 42 | 42 | $active = $form['active'] ? ' class="active"' : '';  | 
                                                        
| 43 | 43 | ?>  | 
                                                        
@@ -57,16 +57,16 @@ discard block  | 
                                                    ||
| 57 | 57 | ?>  | 
                                                        
| 58 | 58 | |
| 59 | 59 | <?php  | 
                                                        
| 60 | -		if(!empty($_['forms']['admin'])) { | 
                                                        |
| 60 | +		if (!empty($_['forms']['admin'])) { | 
                                                        |
| 61 | 61 | ?>  | 
                                                        
| 62 | 62 |  			<li class="app-navigation-caption"><?php p($l->t('Administration')); ?></li> | 
                                                        
| 63 | 63 | <?php  | 
                                                        
| 64 | 64 | }  | 
                                                        
| 65 | -		foreach($_['forms']['admin'] as $form) { | 
                                                        |
| 65 | +		foreach ($_['forms']['admin'] as $form) { | 
                                                        |
| 66 | 66 |  			if (isset($form['anchor'])) { | 
                                                        
| 67 | 67 | |
| 68 | 68 |  				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); | 
                                                        
| 69 | - $class = 'nav-icon-' . $form['anchor'];  | 
                                                        |
| 69 | + $class = 'nav-icon-'.$form['anchor'];  | 
                                                        |
| 70 | 70 | $sectionName = $form['section-name'];  | 
                                                        
| 71 | 71 | $active = $form['active'] ? ' class="active"' : '';  | 
                                                        
| 72 | 72 | ?>  |