GEANT / CAT

core/diag/RADIUSTests.php

Doc Comments +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Unused Use Statements +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Indentation +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Switch Indentation +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Spacing +2 added lines, -5 removed lines

@@ -927,7 +927,7 @@ 
                 }
                 if (isset($certdata['extensions'])) {
                     foreach ($certdata['extensions'] as $k => $v) {
-<<<<<<< HEAD
+<< << <<< HEAD
 =======
                         //error_log('extension '.$k.' '.$certdata['extensions'][$k]);
 >>>>>>> d0ff55e916bc398b201ef1f455c391cd4e2f9ca9
@@ -968,7 +968,4 @@ 
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Braces +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -4 removed lines

@@ -968,7 +968,4 @@
             $ret['cert_oddities'][] = $o;
         }
 
-        return $ret;
-    }
-
-}
+        return $ret
\ No newline at end of file

web/skins/modern/diag/diag_admin.php

Spacing +10 added lines, -10 removed lines

@@ -79,7 +79,7 @@ 
                 });
             });
         });
-        var comment = <?php echo '"' . _("Running realm tests") . '..."';?>;
+        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -135,15 +135,15 @@ 
             success:function(data) {
                 if (data.status === 1) {
                     var result = '';
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"';?>;
+                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
                     result = '<div class="padding">';
                     result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
                     result = result + '<table>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"';?> +'</td><td>' + data.spcontact + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"';?> +'</td><td>' + data.idpcontact + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"';?> +'</td><td>' + data.timestamp + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"'._("Suspected MAC address").'"';?> + '</td><td>' + data.mac + '</td></tr>';
-                    result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"';?> +'</td><td>' + data.description + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("SP email") . '"'; ?> +'</td><td>' + data.spcontact + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> +'</td><td>' + data.idpcontact + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> +'</td><td>' + data.timestamp + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Suspected MAC address") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                    result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.description + '</td></tr>';
                     result = result + '</div>';
                     showInfo(result, title);
                 }
@@ -159,7 +159,7 @@ 
          if ($('#mac').val().length > 0) {
             if ($('#mac').val().length != 17) {
                 $('#mac').addClass('error_input');
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"';?>);
+                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
             } else {
                 $('#mac').removeClass('error_input'); 
                 $('#mac').attr('title', '');
@@ -168,7 +168,7 @@ 
          if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val())) {
                 $('#email').addClass('error_input');
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"';?>);
+                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
             } else {
                 $('#email').removeClass('error_input');
                 $('#email').attr('title', '');
@@ -218,7 +218,7 @@ 
     </div>
     <table id='sp_questions'>
         <tr>
-            <td><?php echo _("What is the realm of the IdP in question?");?></td>
+            <td><?php echo _("What is the realm of the IdP in question?"); ?></td>
             <td>
                 <input type='text' name='admin_realm' id='admin_realm' value=''>
                 <button id='realm_in_db_admin' accesskey="C" type='button'>

web/skins/modern/diag/diag.php

Indentation +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
                         echo "0\">";
                         echo _("This service is for authenticated admins only.") . '<br>';
                         echo "<a href=\"javascript:infoCAT('manage', 'admin','administrator eduroam®')\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                                _("eduroam® admin access is needed") . "</a>";
                     }
                 ?>
             </div> 

Spacing +48 added lines, -48 removed lines

@@ -1,26 +1,26 @@ 
 <?php
-function my_nonce($optSalt='') {
+function my_nonce($optSalt = '') {
     $remote = filter_input(INPUT_SERVER, 'REMOTE_ADDR');
-    return hash_hmac('sha256', session_id().$optSalt, date("YmdG").'1qaz2wsx3edc!QAZ@WSX#EDC'.$remote);
+    return hash_hmac('sha256', session_id() . $optSalt, date("YmdG") . '1qaz2wsx3edc!QAZ@WSX#EDC' . $remote);
 }
 error_reporting(E_ALL | E_STRICT);
 $Gui->defaultPagePrelude();
 $_SESSION['current_page'] = $_SERVER['SCRIPT_NAME'];
 ?>
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js");?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js");?>"></script>
-<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-timepicker-addon.js");?>"></script>
-<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-sliderAccess.js");?>"></script>
-<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui-1.12.1.custom/jquery-ui.css");?>" media="all" />
-<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/Timepicker/jquery-ui-timepicker-addon.css");?>"  media="all" />
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js"); ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js"); ?>"></script>
+<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-timepicker-addon.js"); ?>"></script>
+<script type='text/javascript' src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-sliderAccess.js"); ?>"></script>
+<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui-1.12.1.custom/jquery-ui.css"); ?>" media="all" />
+<link type="text/css"  rel="stylesheet" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/Timepicker/jquery-ui-timepicker-addon.css"); ?>"  media="all" />
 <script type="text/javascript">
     var recognisedOS = '';
     var downloadMessage;
     var noDisco = 1;
     var sbPage = 1;
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
-    var dir = "<?php echo dirname(__DIR__);?>";
+    var dir = "<?php echo dirname(__DIR__); ?>";
 
 <?php
 $profile_list_size = 1;
@@ -37,28 +37,28 @@ 
 
 </script>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 
 </head>
 <body>
 <div id="main_page">
     <div id="loading_ico">
-          <span id='load_comment'></span><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Loading stuff ..."/>
+          <span id='load_comment'></span><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Loading stuff ..."/>
     </div>
     <form id="cat_form" name="cat_form" method="POST"  accept-charset="UTF-8" action="">
-    <input name="myNonce" id="myNonce" type="hidden" value="<?php echo my_nonce($_SERVER['SCRIPT_NAME']);?>">
+    <input name="myNonce" id="myNonce" type="hidden" value="<?php echo my_nonce($_SERVER['SCRIPT_NAME']); ?>">
     <?php echo $divs->div_heading(); ?>
     <div id="info_overlay"> <!-- device info -->
         <div id="info_window"></div>
-        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
     </div>
     <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
     </div>
     <div id="main_body">
         <div id="user_page">
-            <?php echo $divs->div_pagetitle(_("Diagnostics site"), _("We will do our best to resolve your problems!<br>Help us and answer precisely to our questions."));?>
+            <?php echo $divs->div_pagetitle(_("Diagnostics site"), _("We will do our best to resolve your problems!<br>Help us and answer precisely to our questions.")); ?>
             <div id="user_info" style='padding-top: 10px;'>
             <div id='diagnostic_choice'>
                 <?php echo _("Are you reporting the problem as"); ?>
@@ -96,7 +96,7 @@ 
                 </div>
                 <div id="sociopath_query_area" style="margin-top:20px; display:none;">
                     <b>
-                        <?php echo _("Now we have a few questions..");?>
+                        <?php echo _("Now we have a few questions.."); ?>
                     </b>
                     <div id="sociopath_queries"></div>
                 </div>
@@ -155,13 +155,13 @@ 
             type2 = 'sp';
         }
         var options = '';
-        var select = <?php echo '"<td>' . _("Select country:") . ' </td>"';?>;
+        var select = <?php echo '"<td>' . _("Select country:") . ' </td>"'; ?>;
         select = select + '<td><select id="' + type1 + '_country" name="' + type1 + '_country" style="width:400px;">';
         if ($("#"+type2+"_country").is('select')) {
             options = ($('#'+type2+'_country').html());
             countryAddSelect(select, options, type1);
         } else {
-            var comment = <?php echo '"' . _("Fetching countries list") . '..."';?>;
+            var comment = <?php echo '"' . _("Fetching countries list") . '..."'; ?>;
             inProgress(1, comment);
             $.ajax({
                 url: "findRealm.php",
@@ -194,7 +194,7 @@ 
         return false;
     }
     function testSociopath(realm, susp, answer) {
-        var comment = <?php echo '"'._("Testing realm").'..."';?>; 
+        var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; 
         inProgress(1, comment);
         if ($('#tested_realm').length == 0) {
             $('<input>').attr({
@@ -246,61 +246,61 @@ 
        }); 
     }
     function finalVerdict(realm, verdict) {
-        var title = <?php echo '"' . _("Diagnistic tests results for selected realm") . '"';?>;
+        var title = <?php echo '"' . _("Diagnistic tests results for selected realm") . '"'; ?>;
         result = '<div class="padding">';
         result = result + '<div><h3>';
-        result = result + <?php echo '"' . _("The result for tested realm:") . ' "';?> + realm;
+        result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm;
         result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">';
-        result = result + <?php echo '"' . _("We located") . '" ';?>  + ' ';
+        result = result + <?php echo '"' . _("We located") . '" '; ?>  + ' ';
         result = result + Object.keys(verdict).length + ' ';
-        result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"';?> + '<br>';
-        result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"';?>;
+        result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>';
+        result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>;
         result = result + '</div><div style="padding: 5px;"><table>';
         k = 1;
         for (key in verdict) {
             result = result + '<tr><td>' + k + '.</td>';
             k = k + 1;
             if (key === 'INFRA_DEVICE') {
-                result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_80211') {
-                result = result + '<td>' + <?php echo '"' . _("WIFI network around you sucks") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("WIFI network around you sucks") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_LAN') {
-                result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your service provider has a problem") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your service provider has a problem") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_IDP_AUTHBACKEND') {
-                result = result + '<td>' + <?php echo '"' . _("RADIUS server in your home institution has a problem to authenticate users") .'"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("RADIUS server in your home institution has a problem to authenticate users") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between your current location and your federation server is broken") .'"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between your current location and your federation server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between your current location, your federation server and top level server is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between your current location, your federation server and top level server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between your home institution, your federation server and top level server is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between your home institution, your federation server and top level server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_ETLR') {
-                result = result + '<td>' + <?php echo '"' . _("The communication to top level server is down") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The communication to top level server is down") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_ETLR_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between top level server and your federation server is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between top level server and your federation server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_ETLR_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between top level server and your service provider is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between top level server and your service provider is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between your federation server and your institution server is broken") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("The link between your federation server and your institution server is broken") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_IdP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your home institution has a problem").'"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("RADIUS server of your home institution has a problem") . '"'; ?> + '</td>';
             }
             if (key === 'INFRA_NONEXISTENTREALM') {
-                result = result + '<td>' + <?php echo '"' . _("Entered realm doesn't exist") . '"';?> + '</td>';
+                result = result + '<td>' + <?php echo '"' . _("Entered realm doesn't exist") . '"'; ?> + '</td>';
             }
             result = result + '<td style="padding-left: 5px;">' + (verdict[key] * 100).toFixed(2) + "%</td></tr>";
         }
@@ -347,7 +347,7 @@ 
         return false;
    });
    $(document).on('change', '#idp_country, #sp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list").'..."';?>;  
+        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -362,7 +362,7 @@ 
                     if (data.status === 1) {
                         inProgress(0);
                         var institutions = data.institutions;
-                        var select = <?php echo '"<td>' . _("Select institution:") . '</td>"';?>;
+                        var select = <?php echo '"<td>' . _("Select institution:") . '</td>"'; ?>;
                         select = select + '<td><select id="' + type + '_inst" name="' + type + '_inst" style="width:400px;"><option value=""></option>';
                         for (var i in institutions) {
                             select = select + '<option value="' + institutions[i].ID + '">' + institutions[i].name + '</option>';
@@ -394,7 +394,7 @@ 
             $('#start_test_area').hide();
             return false;
         }
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."';?>;
+        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -406,7 +406,7 @@ 
                     var realms = data.realms;
                     var realmselect = '';
                     if (realms.length > 1) {
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"';?>;
+                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 19px'>";
                         for (var i in realms) {
                             console.log("i = "+i);
@@ -419,7 +419,7 @@ 
                         }
                         realmselect = realmselect + '</span></td>';
                     } else {
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"';?>;
+                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 19px'>";
                         realmselect = realmselect + realms[0] + '</span>';
                         realmselect = realmselect + '<input type="hidden" name="realm[]" value="' + realms[0] + '">';
@@ -473,7 +473,7 @@ 
             });
             t = 1;
         }
-        var comment = <?php echo '"' . _("Running realm tests") . '..."';?>;
+        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -569,12 +569,12 @@ 
                         testSociopath(realm, data.suspects['SUSPECTS'], 0);
                     } else {
                         var title = <?php echo '"' . _("Diagnistic tests results for selected realms") . '"'; ?>;
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem appears") . '"';?>;
+                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem appears") . '"'; ?>;
                         result = result + '</h3>'
                         if (r.length == 1) {
-                            result = result + <?php echo '"' . _("This test includes checking of following realm") . '"';?>;
+                            result = result + <?php echo '"' . _("This test includes checking of following realm") . '"'; ?>;
                         } else {    
-                            result = result + <?php echo '"' . _("This test includes checking of following realms") . '"';?>;
+                            result = result + <?php echo '"' . _("This test includes checking of following realms") . '"'; ?>;
                         }
                         result = result + ': '
                         for (var i=0; i < r.length; i++) {
@@ -584,7 +584,7 @@ 
                             result = result + r[i];
                         }
                         result = result + '.<br>';
-                        result = result + <?php echo '"' . _("You should report this to") . '"';?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
+                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
                         result = result + '</div>';
                         showInfo(result, title);
                     }