GEANT / CAT

web/lib/admin/http/RevokeCertificateCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeCertificateCommand extends AbstractInvokerCommand{
+class RevokeCertificateCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokecertificate';
 
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,7 +33,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $profile = $this->context->getProfile();
         $certificateId = $this->parseInt($_POST[self::COMMAND]);
         

web/lib/admin/http/AbstractController.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
      * @param string $commandToken
      * @return AbstractCommand
      */
-    public function createCommand($commandToken){
-        if(!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null){
+    public function createCommand($commandToken) {
+        if (!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null) {
             $this->commands[$commandToken] = $this->doCreateCommand($commandToken);
         }
         return $this->commands[$commandToken];

web/lib/admin/http/DefaultCommand.php

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
  * @author Zilvinas Vaira
  *
  */
-class DefaultCommand extends AbstractCommand{
+class DefaultCommand extends AbstractCommand {
 
     /**
      * 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         
     }
 

web/lib/admin/http/TermsOfUseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class TermsOfUseCommand extends AbstractInvokerCommand{
+class TermsOfUseCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'termsofuse';
     
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,8 +33,8 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::AGREEMENT])){
+    public function execute() {
+        if (isset($_POST[self::AGREEMENT])) {
             $this->context->signAgreement();
         }
         $this->context->redirectAfterSubmit();

web/lib/admin/http/SaveUsersCommand.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SaveUsersCommand extends AbstractInvokerCommand{
+class SaveUsersCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'saveusers';
 
@@ -29,7 +29,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -39,13 +39,13 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])) {
             $userIds = $this->parseArray($_POST[self::PARAM_ID]);
             foreach ($userIds as $key => $userId) {
                 $user = SilverbulletUser::prepare($userId);
                 $user->load();
-                if(isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE]=='true'){
+                if (isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE] == 'true') {
                     $user->makeAcknowledged();
                 }
                 $user->save();

web/lib/admin/http/SilverbulletContext.php

Braces +4 added lines, -4 removed lines

@@ -92,14 +92,14 @@ 
         $user = new SilverbulletUser($this->profile->identifier, $username);
         if(empty($username)){
             $command->storeErrorMessage(_('User name should not be empty!'));
-        }elseif(empty($expiry)){
+        } elseif(empty($expiry)){
             $command->storeErrorMessage(_('No expiry date has been provided!'));
-        }else{
+        } else{
             $user->setExpiry($expiry);
             $user->save();
             if(empty($user->get(SilverbulletUser::EXPIRY))){
                 $command->storeErrorMessage(sprintf(_("Expiry date was incorect for '%s'!"), $username));
-            }elseif(empty($user->getIdentifier())){
+            } elseif(empty($user->getIdentifier())){
                 $command->storeErrorMessage(sprintf(_("Username '%s' already exist!"), $username));
             }
         }
@@ -146,7 +146,7 @@ 
         foreach ($this->users as $user) {
             if($user->hasActiveCertificates()){
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else{
                 $count[self::STATS_PASSIVE]++;
             }
         }

Spacing +30 added lines, -30 removed lines

@@ -11,7 +11,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletContext extends DefaultContext  implements MessageDistributor{
+class SilverbulletContext extends DefaultContext  implements MessageDistributor {
     
     const STATS_TOTAL = 'total';
     const STATS_ACTIVE = 'active';
@@ -61,7 +61,7 @@ 
      * 
      * @param SilverbulletController $controller
      */
-    public function setController($controller){
+    public function setController($controller) {
         $this->controller = $controller;
     }
     
@@ -70,7 +70,7 @@ 
      *
      * @return ProfileSilverbullet
      */
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
@@ -79,7 +79,7 @@ 
      *
      * @return InstitutionPageBuilder
      */
-    public function getBuilder(){
+    public function getBuilder() {
         return $this->builder;
     }
     
@@ -88,7 +88,7 @@ 
      *
      * @return boolean
      */
-    public function isAgreementSigned(){
+    public function isAgreementSigned() {
         $agreement_attributes = $this->profile->getAttributes("hiddenprofile:tou_accepted");
         return count($agreement_attributes) > 0;
     }
@@ -96,8 +96,8 @@ 
     /**
      * Marks agreement as signed inside the database
      */
-    public function signAgreement(){
-        $this->profile->addAttribute("hiddenprofile:tou_accepted",NULL,TRUE);
+    public function signAgreement() {
+        $this->profile->addAttribute("hiddenprofile:tou_accepted", NULL, TRUE);
     }
     
     /**
@@ -108,18 +108,18 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletUser
      */
-    public function createUser($username, $expiry, $command){
+    public function createUser($username, $expiry, $command) {
         $user = new SilverbulletUser($this->profile->identifier, $username);
-        if(empty($username)){
+        if (empty($username)) {
             $command->storeErrorMessage(_('User name should not be empty!'));
-        }elseif(empty($expiry)){
+        }elseif (empty($expiry)) {
             $command->storeErrorMessage(_('No expiry date has been provided!'));
-        }else{
+        } else {
             $user->setExpiry($expiry);
             $user->save();
-            if(empty($user->get(SilverbulletUser::EXPIRY))){
+            if (empty($user->get(SilverbulletUser::EXPIRY))) {
                 $command->storeErrorMessage(sprintf(_("Expiry date was incorect for '%s'!"), $username));
-            }elseif(empty($user->getIdentifier())){
+            }elseif (empty($user->getIdentifier())) {
                 $command->storeErrorMessage(sprintf(_("Username '%s' already exist!"), $username));
             }
         }
@@ -133,13 +133,13 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletInvitation
      */
-    public function createInvitation($user, $command, $quantity = 1){
+    public function createInvitation($user, $command, $quantity = 1) {
         $invitation = new SilverbulletInvitation($user);
-        if($quantity > 1){
+        if ($quantity > 1) {
             $invitation->setQuantity($quantity);
         }
         $invitation->save();
-        if(empty($invitation->getIdentifier())){
+        if (empty($invitation->getIdentifier())) {
             $command->storeErrorMessage(_('Could not create invitation!'));
         }
         return $invitation;
@@ -150,7 +150,7 @@ 
      *
      * @return SilverbulletUser
      */
-    public function createUsers(){
+    public function createUsers() {
         $this->users = SilverbulletUser::getList($this->profile->identifier);
         return $this->users;
     }
@@ -160,16 +160,16 @@ 
      *
      * @return array
      */
-    public function getUserStats(){
+    public function getUserStats() {
         $silverbulletMaxUsers = $this->profile->getAttributes("internal:silverbullet_maxusers");
         $count = array();
         $count[self::STATS_TOTAL] = isset($silverbulletMaxUsers[0]['value']) ? $silverbulletMaxUsers[0]['value'] : -1;
         $count[self::STATS_ACTIVE] = 0;
         $count[self::STATS_PASSIVE] = 0;
         foreach ($this->users as $user) {
-            if($user->hasActiveCertificates()){
+            if ($user->hasActiveCertificates()) {
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else {
                 $count[self::STATS_PASSIVE]++;
             }
         }
@@ -179,10 +179,10 @@ 
     /**
      * Redirects page to itself in order to prevent acidental form resubmition
      */
-    public function redirectAfterSubmit(){
-        if(isset($_SERVER['REQUEST_URI'])){
+    public function redirectAfterSubmit() {
+        if (isset($_SERVER['REQUEST_URI'])) {
             $location = $this->addQuery($_SERVER['SCRIPT_NAME']);
-            header('Location: ' . $location );
+            header('Location: ' . $location);
             exit;
         }
     }
@@ -193,11 +193,11 @@ 
      * @param string $url
      * @return string
      */
-    public function addQuery($url){
+    public function addQuery($url) {
         $query = '';
         if (is_array($_GET) && count($_GET)) {
-            foreach($_GET as $key => $val) {
-                if(strpos($key , '/') === false){
+            foreach ($_GET as $key => $val) {
+                if (strpos($key, '/') === false) {
                     if (empty($key) || empty($val)) { continue; }
                     $query .= ($query == '') ? '?' : "&";
                     $query .= urlencode($key) . '=' . urlencode($val);
@@ -212,7 +212,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::addMessageInvoker()
      */
-    public function addMessageInvoker($commandToken, $invoker){
+    public function addMessageInvoker($commandToken, $invoker) {
         $this->invokers[$commandToken] = $invoker;
     }
     
@@ -221,10 +221,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::distributeMessages()
      */
-    public function distributeMessages($commandToken, $receiver){
-        if($this->controller != null){
+    public function distributeMessages($commandToken, $receiver) {
+        if ($this->controller != null) {
             $this->controller->createCommand($commandToken);
-            if(isset($this->invokers[$commandToken])){
+            if (isset($this->invokers[$commandToken])) {
                 $this->invokers[$commandToken]->publishMessages($receiver);
             }
         }

web/skins/eduroam2016/user/cat_info.php

Indentation +12 added lines, -12 removed lines

@@ -35,8 +35,8 @@ 
 switch ($page) {
     case 'about' :
        require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php");
-       $out = "<div>$out</div>";
-       break;
+        $out = "<div>$out</div>";
+        break;
     case 'tou':
         require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php");
         $out = "no_title<div>
@@ -62,18 +62,18 @@ 
             case 'what_is_eduroam' :
                 $out = "no_title<div><h1>" . _("Help") . "</h1>";
                 foreach ($Faq as $faqItem) {
-                   if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                       $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                       $out .= "" . $faqItem['text'] . "</div>\n";
-                   }
+                    if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
+                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
+                        $out .= "" . $faqItem['text'] . "</div>\n";
+                    }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
                 $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
                 foreach ($Faq as $faqItem) {
-                   $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                   $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
+                    $out .= "" . $faqItem['text'] . "</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -97,10 +97,10 @@ 
                         $out .= _("Please authenticate yourself and login");
                     }
                     $out .= "<p><button onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-               }
-               break;
-       }
-       break;
+                }
+                break;
+        }
+        break;
     default:
         break;
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 $Gui->langObject->setTextDomain("web_user");
 
 $page = $_REQUEST['page'];
-$subpage= $_REQUEST['subpage'];
+$subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about' :
        require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php");

web/skins/eduroam2016/user/cat_back.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 // extract request parameters; action is mandatory
 if(!isset($_REQUEST['action'])) {
-   exit;
+    exit;
 }
 
 $action  = $_REQUEST['action'];

Spacing +11 added lines, -11 removed lines

@@ -14,24 +14,24 @@ 
  *
  * @package UserAPI
  */
-include(dirname(dirname(dirname(__FILE__)))."/config/_config.php");
+include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php");
 $API = new \core\UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action'])) {
+if (!isset($_REQUEST['action'])) {
    exit;
 }
 
 $action  = $_REQUEST['action'];
-$id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
-$lang    = ( isset($_REQUEST['lang'])    ? $_REQUEST['lang']    : FALSE );
-$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE );
-$disco   = ( isset($_REQUEST['disco'])   ? $_REQUEST['disco']   : FALSE );
-$sort    = ( isset($_REQUEST['sort'])    ? $_REQUEST['sort']    : 0 );
-$generatedfor      = ( isset($_REQUEST['generatedfor'])      ? $_REQUEST['generatedfor']      : 'user' );
+$id      = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE);
+$lang    = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE);
+$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE);
+$disco   = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE);
+$sort    = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0);
+$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user');
     
 $loggerInstance = new \core\Logging();
-$loggerInstance->debug(4,"cat_back action: ".$action.':'.$id.':'.$lang.':'.$profile.':'.$disco."\n");
+$loggerInstance->debug(4, "cat_back action: " . $action . ':' . $id . ':' . $lang . ':' . $profile . ':' . $disco . "\n");
 
 switch ($action) {
     case 'listLanguages':
@@ -50,7 +50,7 @@ 
         if ($id === FALSE) {
             exit;
         }
-        $API->JSON_listProfiles($id,$sort);
+        $API->JSON_listProfiles($id, $sort);
         break;
     case 'listDevices':
         $API->JSON_listDevices($id);
@@ -67,7 +67,7 @@ 
         }
         $validator = new \web\lib\common\InputValidation();
         $device = $validator->Device($id); // throws an Exception if unknown
-        $API->downloadInstaller($device, $profile,$generatedfor);
+        $API->downloadInstaller($device, $profile, $generatedfor);
         break;
     case 'profileAttributes': // needs $id set
         if ($id === FALSE) { 

web/skins/eduroam2016/user/js/cat_js.php

Indentation +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 ?>
 <?php 
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+    echo preg_replace('/"/','&quot;',$s);
 }
 
 $langObject = new \core\common\Language();
@@ -23,7 +23,7 @@ 
 if (! is_numeric($profileId)) {
     exit;
 }
- ?>
+    ?>
 var n;
 var profile;
 // var device_button_bg ="#0a698e";
@@ -345,7 +345,7 @@ 
 }
 
 <?php if($idpId) { 
-      print "front_page = 0;\n";
+        print "front_page = 0;\n";
 } ?>
 
 function showTOU(){
@@ -421,7 +421,7 @@ 
 if ($profileId) {
     print "listProfiles($idpId,$profileId);";
 }
- ?>
+    ?>
 
 $(".signin").click(function(event){
      event.preventDefault();
@@ -500,12 +500,12 @@ 
         });
 DiscoJuice.Constants.Countries = {
 <?php 
-  $C = $Gui->printCountryList(1);
-     $ret = '';
-   foreach ($C as $key => $val) {
+    $C = $Gui->printCountryList(1);
+        $ret = '';
+    foreach ($C as $key => $val) {
     $ret .= "'$key': \"$val\",";
-   }
-   echo substr($ret, 0, -1);
+    }
+    echo substr($ret, 0, -1);
 ?>
         };
 

Spacing +25 added lines, -25 removed lines

@@ -10,18 +10,18 @@ 
 ?>
 <?php 
 function escaped_echo($s) {
-   echo preg_replace('/"/','&quot;',$s);
+   echo preg_replace('/"/', '&quot;', $s);
 }
 
 $langObject = new \core\common\Language();
 $langObject->setTextDomain('web_user');
 $cat = new core\CAT();
 $idpId = empty($_REQUEST['idp']) ? 0 : $_REQUEST['idp'];
-if (! is_numeric($idpId)) {
+if (!is_numeric($idpId)) {
     exit;
 }
 $profileId = empty($_REQUEST['profile']) ? 0 : $_REQUEST['profile'];
-if (! is_numeric($profileId)) {
+if (!is_numeric($profileId)) {
     exit;
 }
  ?>
@@ -70,7 +70,7 @@ 
     result = j.status;
     if(! result) {
       alert("<?php escaped_echo(_("no matching data found"))?>");
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
     }
     j = j.data;
     n = j.length;
@@ -187,8 +187,8 @@ 
        j1 = $.parseJSON(data);
        result = j1.status;
        if(! result) {
-            alert("<?php escaped_echo( _("no matching data found"))?>");
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
+            alert("<?php escaped_echo(_("no matching data found"))?>");
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
        }
        j = j1.data;
        if(j.description !== undefined && j.description) {
@@ -199,15 +199,15 @@ 
          $("#profile_desc").text('');
        }
        if(j.local_url !== undefined && j.local_url) 
-         txt = txt+'<tr><td><?php escaped_echo(_("WWW:"));?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("WWW:")); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
        if(j.local_email !== undefined && j.local_email) 
-         txt = txt+'<tr><td><?php escaped_echo(_("email:"));?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("email:")); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
        if(j.local_phone !== undefined && j.local_phone) 
-         txt = txt+'<tr><td><?php escaped_echo(_("tel:"));?></td><td>'+j.local_phone+'</td></tr>';
+         txt = txt+'<tr><td><?php escaped_echo(_("tel:")); ?></td><td>'+j.local_phone+'</td></tr>';
        if(txt) 
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>';
         else 
-         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst)); ?>.</th></tr></table>";
+         txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst)); ?>.</th></tr></table>";
       $("#user_info").html(txt);
       $("#user_info").show();
       resetDevices();
@@ -220,7 +220,7 @@ 
           $("#g_"+v.id).addClass('alertButton');
           $("#cross_icon_"+v.id).show();
           $("#"+v.id).addClass('disabledDevice');
-          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>");
+          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>");
           $("#info_b_"+v.id+",#g_info_b_"+v.id).hide();
         } else  {
           if(v.status == -1)
@@ -232,7 +232,7 @@ 
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
-            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue"));?></a></span>";
+            t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue")); ?></a></span>";
             i_div.html(t);
             $(".redirect_link").click(function(event) {
                i_div.hide();
@@ -240,13 +240,13 @@ 
                
           });
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
-          var continue_text = "<?php escaped_echo(_("Continue"));?>";
+          var continue_text = "<?php escaped_echo(_("Continue")); ?>";
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
             if(v.status > 0) {
-              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>";
-              continue_text = "<?php escaped_echo(_("Close"));?>";
+              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>";
+              continue_text = "<?php escaped_echo(_("Close")); ?>";
             } else {
             t = i_div.html();
             if(v.message != '0') {
@@ -301,7 +301,7 @@ 
   }
 
   function infoCAT(k,subK,title) {
-      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE","user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) {
+      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) {
     if(data.substring(0,8) == 'no_title') {
        data = data.substring(8,data.length);
     } else {
@@ -323,7 +323,7 @@ 
    $("#loading_ico").css('left',x+'px');
    $("#loading_ico").attr('src','resources/images/icons/loading9.gif');
    $("#loading_ico").show();
-   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE","admin/overview_user.php")?>?lang="+lang);
+   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE", "admin/overview_user.php")?>?lang="+lang);
 }
 
 
@@ -345,7 +345,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if($idpId) { 
+<?php if ($idpId) { 
       print "front_page = 0;\n";
 } ?>
 
@@ -384,10 +384,10 @@ 
     $("#download_info a").attr('href',download_link);
     $('#download_info').show();
     if( generateTimer > 0 ) {
-       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer);
+       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer);
     }
     else {
-       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link;
+       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link;
     }
   }
 }
@@ -460,13 +460,13 @@ 
    "overlay":true,"cookie":true,"type":false,
    "country":true,"location":true,
    "title":"<?php escaped_echo($cat->nomenclature_inst) ?>",
-   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"),$cat->nomenclature_inst)) ?>",
-   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"),$cat->nomenclature_inst)) ?>",
-   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
+   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"), $cat->nomenclature_inst)) ?>",
+   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"), $cat->nomenclature_inst)) ?>",
+   "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>",
    "textLocateMe": "<?php escaped_echo(_("Locate me more accurately using HTML5 Geo-Location")) ?>",
    "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"), $cat->nomenclature_inst)) ?>",
    "textAllCountries": "<?php escaped_echo(_("all countries")) ?>",
-   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"),$cat->nomenclature_inst)) ?>",
+   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"), $cat->nomenclature_inst)) ?>",
    "textShowAllCountries": "<?php escaped_echo(_("show all countries")) ?>",
    "textLimited1" : "<?php escaped_echo(_("Results limited to"))?>",
    "textLimited2" : "<?php escaped_echo(_("entries - show more"))?>",