From b5699dcac39823f486b0ef61077f1e6ccb082a32 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 26 Sep 2017 17:14:27 -0400 Subject: [PATCH] google code style --- web/skins/classic/views/options.php | 149 ++++++++++++---------------- 1 file changed, 63 insertions(+), 86 deletions(-) diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index b9fa5828f..170b25c44 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -18,10 +18,9 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // -if ( !canView( 'System' ) ) -{ - $view = "error"; - return; +if ( !canView( 'System' ) ) { + $view = 'error'; + return; } $canEdit = canEdit( 'System' ); @@ -45,9 +44,9 @@ $tabs['lowband'] = translate('LowBW'); $tabs['users'] = translate('Users'); if ( isset($_REQUEST['tab']) ) - $tab = validHtmlStr($_REQUEST['tab']); + $tab = validHtmlStr($_REQUEST['tab']); else - $tab = "system"; + $tab = 'system'; $focusWindow = true; @@ -55,54 +54,52 @@ xhtmlHeaders( __FILE__, translate('Options') ); # Have to do this stuff up here before including header.php because fof the cookie setting $skin_options = array_map( 'basename', glob('skins/*',GLOB_ONLYDIR) ); -if($tab == 'skins') { - $current_skin = $_COOKIE['zmSkin']; - $reload = false; - if ( isset($_GET['skin-choice']) && ( $_GET['skin-choice'] != $current_skin ) ) { - setcookie('zmSkin',$_GET['skin-choice'], time()+3600*24*30*12*10 ); - //header("Location: index.php?view=options&tab=skins&reset_parent=1"); - $reload = true; - } - $current_css = $_COOKIE['zmCSS']; - if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) { - setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 ); - //header("Location: index.php?view=options&tab=skins&reset_parent=1"); - $reload = true; - } - if ( $reload ) - echo ""; +if ( $tab == 'skins' ) { + $current_skin = $_COOKIE['zmSkin']; + $reload = false; + if ( isset($_GET['skin-choice']) && ( $_GET['skin-choice'] != $current_skin ) ) { + setcookie('zmSkin',$_GET['skin-choice'], time()+3600*24*30*12*10 ); + //header("Location: index.php?view=options&tab=skins&reset_parent=1"); + $reload = true; + } + $current_css = $_COOKIE['zmCSS']; + if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) { + setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 ); + //header("Location: index.php?view=options&tab=skins&reset_parent=1"); + $reload = true; + } + if ( $reload ) + echo ""; } # end if tab == skins ?> -
-
-
-
    +
    +
    +
    +
      $value ) -{ +foreach ( $tabs as $name=>$value ) { ?> > -
    -
    - -
    -
    +
+
+
+
-
- - -
- -
- + +
+ +
+ @@ -159,24 +154,20 @@ elseif ( $tab == "users" ) @@ -289,33 +280,25 @@ elseif ( $tab == "users" )
checked="checked"/> 3 ) - { + if ( count( $options ) > 3 ) { ?>