From a889e5125ec9788f3b87807407bcb249f1c1503d Mon Sep 17 00:00:00 2001
From: Patrick Teichmann <patrick.teichmann@limesurvey.org>
Date: Fri, 30 Jul 2021 14:38:33 +0200
Subject: [PATCH] Dev: code style

---
 .../TopbarWidget/views/baseTopbar_view.php    |  12 +-
 .../includes/addGroupTopbarRight_view.php     |  13 +-
 .../includes/questionTopbarRight_view.php     |  10 +-
 .../views/includes/surveyTopbarRight_view.php |  58 +-
 .../views/includes/tokensTopbarRight_view.php |  44 +-
 .../views/questionTopbar_view.php             |  12 +-
 .../admin/export/generatestats/_header.php    |  27 +-
 .../views/admin/labels/labelsetsbar_view.php  | 118 ++--
 .../participants/attributeControl_view.php    |  66 +-
 .../admin/participants/blacklist_view.php     | 243 +++----
 .../participants/displayParticipants_view.php | 151 ++---
 .../participants/participantsPanel_view.php   | 131 ++--
 .../admin/participants/sharePanel_view.php    |  50 +-
 .../views/admin/participants/summary_view.php |  11 +-
 .../views/admin/permissiontemplates/index.php |  67 +-
 .../permissiontemplates/partials/_menubar.php |   8 +-
 .../admin/pluginmanager/scanFilesResult.php   |  22 +-
 .../views/admin/super/fullpagebar_view.php    |  33 +-
 application/views/admin/surveymenu/index.php  | 214 +++---
 .../admin/surveysgroups/surveySettings.php    |  17 +-
 .../admin/themes/templateeditorbar_view.php   | 105 ++-
 .../views/admin/user/personalsettings.php     | 608 +++++++++---------
 application/views/homepageSettings/index.php  | 183 +++---
 .../views/layouts/fullpagebar_view.php        |  38 +-
 .../surveyAdministration/newSurvey_view.php   |  22 +-
 application/views/themeOptions/update.php     | 252 ++++----
 .../views/userGroup/editUserGroup_view.php    |  14 +-
 .../views/userGroup/mailUserGroup_view.php    |  16 +-
 .../views/userGroup/usergroupbar_view.php     |  24 +-
 .../views/userGroup/viewUserGroup_view.php    | 120 ++--
 .../views/userManagement/partial/_menubar.php |  36 +-
 31 files changed, 1431 insertions(+), 1294 deletions(-)

diff --git a/application/extensions/TopbarWidget/views/baseTopbar_view.php b/application/extensions/TopbarWidget/views/baseTopbar_view.php
index 0eb9a459cde..8afe278260b 100644
--- a/application/extensions/TopbarWidget/views/baseTopbar_view.php
+++ b/application/extensions/TopbarWidget/views/baseTopbar_view.php
@@ -1,26 +1,26 @@
 <?php
 /**
  * Base toolbar layout
- *
  * This is the base view for toolbars that have one part aligned to the left and one part aligned to the right
- * 
+ *
  * @var string $topbarId defaults to 'surveybarid'
  * @var string $leftSideContent the left side content
  * @var string $rightSideContent the right side content
- * 
+ *
  */
+
 ?>
 
 <div class='menubar surveybar' id="<?= !(empty($topbarId)) ? $topbarId : 'surveybarid' ?>">
     <div class='row'>
-        <?php if (!empty($leftSideContent)): ?>
+        <?php if (!empty($leftSideContent)) : ?>
             <!-- Left Side -->
-            <div class="<?= !empty($rightSideContent) ? 'col-md-6' : 'col-md-12'?>">
+            <div class="<?= !empty($rightSideContent) ? 'col-md-6' : 'col-md-12' ?>">
                 <?= $leftSideContent ?>
             </div>
         <?php endif; ?>
 
-        <?php if (!empty($rightSideContent)): ?>
+        <?php if (!empty($rightSideContent)) : ?>
             <!-- Right Side -->
             <div class="<?= !empty($leftSideContent) ? 'col-md-6' : 'col-md-12' ?> pull-right text-right">
                 <?= $rightSideContent ?>
diff --git a/application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php b/application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php
index ee51bfc0a3a..57adfdd4039 100644
--- a/application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php
+++ b/application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php
@@ -1,7 +1,14 @@
+<?php
+/**
+ * @var string $backUrl
+ */
+
+?>
+
 <!-- Save -->
 <a id="save-button" class="btn btn-success pull-right" role="button">
     <i class="fa fa-check"></i>
-    <?php eT("Save"); ?>
+    <?php eT('Save'); ?>
 </a>
 <!-- Back Button -->
 <a class="btn btn-default" href="<?php echo $backUrl ?>" role="button">
@@ -12,10 +19,10 @@
 <!-- Save and add question -->
 <a class="btn btn-default" id='save-and-new-question-button' role="button">
     <span class="fa fa-plus"></span>
-    <?php eT("Save & add question"); ?>
+    <?php eT('Save & add question'); ?>
 </a>
 <!-- Save and new group -->
 <a class="btn btn-default" id='save-and-new-button' role="button">
     <span class="fa fa-plus"></span>
-    <?php eT("Save & add group"); ?>
+    <?php eT('Save & add group'); ?>
 </a>
diff --git a/application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php b/application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php
index 11cd975c5ae..93cbd6d0b65 100644
--- a/application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php
+++ b/application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php
@@ -1,6 +1,14 @@
+<?php
+/**
+ * @var Survey $oSurvey
+ * @var string $qid
+ */
+
+?>
+
 <!-- Delete -->
 <?php if (!empty($showDeleteButton)) : ?>
-    <?php if ($oSurvey->active != 'Y') : ?>
+    <?php if ($oSurvey->active !== 'Y') : ?>
         <button class="btn btn-danger"
                 data-toggle="modal"
                 data-target="#confirmation-modal"
diff --git a/application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php b/application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php
index f1afa29d2a9..aef04826378 100644
--- a/application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php
+++ b/application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php
@@ -1,58 +1,66 @@
+<?php
+/**
+ * @var string $closeUrl
+ * @var string $returnUrl
+ */
+
+?>
+
 <!-- White Close button -->
-<?php if (!empty($showWhiteCloseButton)) :?>
+<?php if (!empty($showWhiteCloseButton)) : ?>
     <a class="btn btn-default" href="<?php echo $closeUrl ?>" role="button">
         <span class="fa fa-close"></span>
-        <?php eT("Close");?>
+        <?php eT("Close"); ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Save and Close -->
-<?php if(!empty($showSaveAndCloseButton)): ?>
-    <a class="btn btn-default" 
+<?php if (!empty($showSaveAndCloseButton)): ?>
+    <a class="btn btn-default"
        href="<?php echo $closeUrl; ?>"
-       role="button" 
+       role="button"
        id="save-and-close-button"
        onclick="$(this).addClass('disabled').attr('onclick', 'return false;');">
-            <span class="fa fa-saved"></span>
-            <?php eT("Save and close");?>
+        <span class="fa fa-saved"></span>
+        <?php eT("Save and close"); ?>
     </a>
 <?php endif; ?>
 
 <!-- Green Save and Close -->
-<?php if(!empty($showGreenSaveAndCloseButton)): ?>
-    <a class="btn btn-success" 
+<?php if (!empty($showGreenSaveAndCloseButton)): ?>
+    <a class="btn btn-success"
        href="<?php echo $closeUrl; ?>"
-       role="button" 
+       role="button"
        id="save-and-close-button"
        onclick="$(this).addClass('disabled').attr('onclick', 'return false;');">
-            <span class="fa fa-saved"></span>
-            <?php eT("Save and close");?>
+        <span class="fa fa-saved"></span>
+        <?php eT("Save and close"); ?>
     </a>
 <?php endif; ?>
 
 <!-- Save -->
-<?php if(!empty($showSaveButton)): ?>
+<?php if (!empty($showSaveButton)): ?>
     <a id="save-button" class="btn btn-success pull-right" role="button">
         <i class="fa fa-check"></i>
-        <?php eT("Save");?>
+        <?php eT("Save"); ?>
     </a>
 <?php endif; ?>
 
 <!-- Export -->
-<?php if(!empty($showExportButton)): ?>
+<?php if (!empty($showExportButton)): ?>
     <button class="btn btn-success" name="export-button" id="export-button" data-submit-form=1>
         <span class="fa fa-download-alt"></span>
-        <?php eT("Export");?>
+        <?php eT("Export"); ?>
     </button>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Import -->
-<?php if(!empty($showImportButton)): ?>
+<?php if (!empty($showImportButton)): ?>
     <button class="btn btn-success" name="import-button" id="import-button" data-submit-form=1>
         <span class="fa fa-upload"></span>
-        <?php eT("Import");?>
+        <?php eT("Import"); ?>
     </button>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Return -->
 <?php if (!empty($showBackButton)): ?>
@@ -61,12 +69,12 @@
         &nbsp;&nbsp;
         <?php eT('Back') ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Close -->
-<?php if(!empty($showCloseButton)): ?>
+<?php if (!empty($showCloseButton)): ?>
     <a class="btn btn-danger" href="<?php echo $closeUrl; ?>" role="button">
         <span class="fa fa-close"></span>
-        <?php eT("Close");?>
+        <?php eT("Close"); ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
diff --git a/application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php b/application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php
index c04033dd018..77be85667a2 100644
--- a/application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php
+++ b/application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php
@@ -1,37 +1,45 @@
+<?php
+/**
+ * @var bool $showDelButton
+ * @var bool $hasSurveySettingsUpdatePermission
+ * @var bool $hasTokensDeletePermission
+ * @var Survey $oSurvey
+ */
+
+?>
+
 <!-- Delete tokens table -->
-<?php if (!empty($showDelButton) && ($hasSurveySettingsUpdatePermission || $hasTokensDeletePermission)): ?>
+<?php if (!empty($showDelButton) && ($hasSurveySettingsUpdatePermission || $hasTokensDeletePermission)) : ?>
     <a class="btn btn-danger" href="<?php echo Yii::App()->createUrl("admin/tokens/sa/kill/surveyid/$oSurvey->sid"); ?>" role="button">
         <?php eT("Delete participants table"); ?>
     </a>
 <?php endif; ?>
 
 <!-- Download CSV -->
-<?php if(!empty($showDownloadButton)):?>
+<?php if (!empty($showDownloadButton)) : ?>
     <a class="btn btn-success pull-right" href="#" role="button" id="save-button">
-        <span class="fa fa fa-export" ></span>
-            <?php eT("Download CSV file"); ?>
+        <span class="fa fa fa-export"></span>
+        <?php eT("Download CSV file"); ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Send invitations buttons -->
-<?php if(!empty($showSendInvitationButton)):?>
+<?php if (!empty($showSendInvitationButton)) : ?>
     <a class="btn btn-success pull-right" href="#" role="button" id="send-invitation-button">
-        <span class="icon-invite" ></span>
-        <?php eT("Send invitations");?>
+        <span class="icon-invite"></span>
+        <?php eT("Send invitations"); ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
 
 <!-- Send reminder buttons -->
-<?php if(!empty($showSendReminderButton)):?>
+<?php if (!empty($showSendReminderButton)) : ?>
     <a class="btn btn-success pull-right" href="#" role="button" id="send-reminders-button">
-        <span class="icon-invite" ></span>
-        <?php eT("Send reminders");?>
+        <span class="icon-invite"></span>
+        <?php eT("Send reminders"); ?>
     </a>
-<?php endif;?>
+<?php endif; ?>
 
-<?php 
-    /**
-     * Include the default buttons
-     */
-    $this->render('includes/surveyTopbarRight_view', get_defined_vars());
+<?php
+// Include the default buttons
+$this->render('includes/surveyTopbarRight_view', get_defined_vars());
 ?>
diff --git a/application/extensions/TopbarWidget/views/questionTopbar_view.php b/application/extensions/TopbarWidget/views/questionTopbar_view.php
index 14b5d01c879..d6c057eeeac 100644
--- a/application/extensions/TopbarWidget/views/questionTopbar_view.php
+++ b/application/extensions/TopbarWidget/views/questionTopbar_view.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * Question Editor toolbar layout.
- * 
  * This is used instead of the base layout because two toolbars must be rendered at the same time (one of them hidden)
- * 
+ * @var Question $oQuestion
  */
+
 $aData = get_defined_vars();
 $leftSideContentSummary = $this->render('includes/questionTopbarLeft_view', get_defined_vars(), true);
 $leftSideContentEditor = $this->render('includes/editQuestionTopbarLeft_view', get_defined_vars(), true);
 $rightSideContent = $this->render('includes/editQuestionTopbarRight_view', get_defined_vars(), true);
 $rightSideContentSummary = $this->render('includes/questionSummaryTopbarRight_view', get_defined_vars(), true);
-
 ?>
+
 <!-- Question Top Bar -->
 <div class='menubar surveybar' id="<?= !(empty($topbarId)) ? $topbarId : 'surveybarid' ?>">
-    <?php if ($oQuestion->qid !== 0): ?>
+    <?php if ($oQuestion->qid !== 0) : ?>
         <div id="question-summary-topbar" class='row'>
             <!-- Left Side -->
             <div class="col-md-6">
@@ -28,12 +28,12 @@
     <?php endif; ?>
     <div id="question-create-edit-topbar" class='row' style="display: none;">
         <!-- Left Side -->
-        <div class="<?= !empty($rightSideContent) ? 'col-md-6' : 'col-md-12'?>">
+        <div class="<?= !empty($rightSideContent) ? 'col-md-6' : 'col-md-12' ?>">
             <?= $leftSideContentEditor ?>
         </div>
 
         <!-- Right Side -->
-        <div class="<?= !empty($leftSideContentEditor) ? 'col-md-6' : 'col-md-12'?> pull-right text-right">
+        <div class="<?= !empty($leftSideContentEditor) ? 'col-md-6' : 'col-md-12' ?> pull-right text-right">
             <?= $rightSideContent ?>
         </div>
     </div>
diff --git a/application/views/admin/export/generatestats/_header.php b/application/views/admin/export/generatestats/_header.php
index e0259ef327e..3c26bfd70e6 100644
--- a/application/views/admin/export/generatestats/_header.php
+++ b/application/views/admin/export/generatestats/_header.php
@@ -10,26 +10,27 @@
  * @var $surveyid
  * @var $sql
  */
+
 ?>
 
 <!-- Message Box -->
 <div class="jumbotron message-box">
     <h2><?php eT("Results"); ?></h2>
-    <p><?php eT("Number of records in this query:")?>&nbsp;<?php echo $results;?></p>
+    <p><?php eT("Number of records in this query:") ?>&nbsp;<?php echo $results; ?></p>
     <p><?php eT("Total records in survey:"); ?>&nbsp;<?php echo $total; ?></p>
 
-    <?php if($total): ?>
+    <?php if ($total) : ?>
         <p><?php eT("Percentage of total:"); ?>&nbsp;<?php echo $percent; ?>%</p>
-    <?php endif;?>
+    <?php endif; ?>
 
-    <?php if($browse): ?>
-        <?php echo CHtml::form(array("admin/responses/sa/browse/surveyid/{$surveyid}"), 'post')."\n" ;?>
-            <p>
-                <?php Yii::app()->user->setState('sql_'.$surveyid,$sql); ?>
-                <input type='submit' class='btn btn-default' value='<?php eT("Browse");?>' />
-                <input type='hidden' name='subaction' value='all'/>
-            </p>
-        </form>
-    <?php endif;?>
+    <?php if ($browse) : ?>
+        <?php echo CHtml::form(["admin/responses/sa/browse/surveyid/{$surveyid}"], 'post') . "\n"; ?>
+        <p>
+            <?php Yii::app()->user->setState('sql_' . $surveyid, $sql); ?>
+            <input type='submit' class='btn btn-default' value='<?php eT("Browse"); ?>'/>
+            <input type='hidden' name='subaction' value='all'/>
+        </p>
+        <?php echo CHtml::endForm() ?>
+    <?php endif; ?>
 </div>
-<input type="hidden" id="showGraphOnPageLoad" />
+<input type="hidden" id="showGraphOnPageLoad"/>
diff --git a/application/views/admin/labels/labelsetsbar_view.php b/application/views/admin/labels/labelsetsbar_view.php
index 1ca184f9919..7d41df94a05 100644
--- a/application/views/admin/labels/labelsetsbar_view.php
+++ b/application/views/admin/labels/labelsetsbar_view.php
@@ -1,8 +1,16 @@
+<?php
+/**
+ * @var int $lid
+ * @var array $labelsets
+ * @var array $labelbar
+ */
+?>
+
 <script type="text/javascript">
     var sImageURL = ''; // in 2.06, used to display the icon in jQgrid, not necessary anymore
-    var duplicatelabelcode='<?php eT('Error: You are trying to use duplicate label codes.','js'); ?>';
-    var otherisreserved='<?php eT("Error: 'other' is a reserved keyword.",'js'); ?>';
-    var quickaddtitle='<?php eT('Quick-add subquestion or answer items','js'); ?>';
+    var duplicatelabelcode = '<?php eT('Error: You are trying to use duplicate label codes.', 'js'); ?>';
+    var otherisreserved = '<?php eT("Error: 'other' is a reserved keyword.", 'js'); ?>';
+    var quickaddtitle = '<?php eT('Quick-add subquestion or answer items', 'js'); ?>';
 </script>
 
 <!-- Label Bar menu -->
@@ -12,11 +20,10 @@
         <div class="col-lg-6">
 
             <!-- View buttons -->
-            <?php if (isset($labelbar['buttons']['view'])):?>
-                <?php if (Permission::model()->hasGlobalPermission('labelsets','create') || Permission::model()->hasGlobalPermission('labelsets','import')):?>
-
+            <?php if (isset($labelbar['buttons']['view'])) : ?>
+                <?php if (Permission::model()->hasGlobalPermission('labelsets', 'create') || Permission::model()->hasGlobalPermission('labelsets', 'import')) : ?>
                     <!-- Create or Import -->
-                    <a class="btn btn-default" href="<?php echo $this->createUrl("admin/labels/sa/newlabelset");?>" role="button">
+                    <a class="btn btn-default" href="<?php echo $this->createUrl("admin/labels/sa/newlabelset"); ?>" role="button">
                         <span class="icon-add text-success"></span>
                         <?php eT("Create or import new label set(s)"); ?>
                     </a>
@@ -27,76 +34,75 @@
 
             <!-- Edition buttons -->
 
-            <?php if (isset($labelbar['buttons']['edition'])):?>
-
-                <?php if (isset($labelbar['buttons']['edit'])): ?>
+            <?php if (isset($labelbar['buttons']['edition'])) : ?>
+                <?php if (isset($labelbar['buttons']['edit'])) : ?>
                     <!-- Edit label set -->
-                    <?php if (Permission::model()->hasGlobalPermission('labelsets','update')):?>
-                        <a class="btn btn-default" href="<?php echo $this->createUrl("admin/labels/sa/editlabelset/lid/".$lid);?>" role="button" style="margin-top:10px;">
+                    <?php if (Permission::model()->hasGlobalPermission('labelsets', 'update')) : ?>
+                        <a class="btn btn-default" href="<?php echo $this->createUrl("admin/labels/sa/editlabelset/lid/" . $lid); ?>" role="button" style="margin-top:10px;">
                             <span class="fa fa-pencil  text-success"></span>
                             <?php eT("Edit label set"); ?>
                         </a>
-                        <?php endif; ?>
+                    <?php endif; ?>
 
 
                     <!-- Export this label set -->
-                    <?php if (Permission::model()->hasGlobalPermission('labelsets','export')):?>
-                        <a class="btn btn-default" href="<?php echo $this->createUrl("admin/export/sa/dumplabel/lid/$lid");?>"
-                            role="button">
+                    <?php if (Permission::model()->hasGlobalPermission('labelsets', 'export')) : ?>
+                        <a class="btn btn-default" href="<?php echo $this->createUrl("admin/export/sa/dumplabel/lid/$lid"); ?>"
+                           role="button">
                             <span class="icon-export text-success"></span>
                             <?php eT("Export this label set"); ?>
                         </a>
-                        <?php endif; ?>
                     <?php endif; ?>
+                <?php endif; ?>
 
 
                 <!-- Delete label set -->
-                <?php if (isset($labelbar['buttons']['delete']) && $labelbar['buttons']['delete'] == true ): ?>
-                    <?php if (Permission::model()->hasGlobalPermission('labelsets','delete')): ?>
+                <?php if (isset($labelbar['buttons']['delete']) && $labelbar['buttons']['delete'] == true) : ?>
+                    <?php if (Permission::model()->hasGlobalPermission('labelsets', 'delete')) : ?>
                         <button class="btn btn-default"
-                           data-toggle="modal"
-                           data-title="<?= gt('Delete label set')?>"
-                           data-target="#confirmation-modal"
-                           data-btnclass='btn-danger'
-                           data-btntext="<?= gt('Delete')?>"
-                           data-onclick='(function() { <?php echo convertGETtoPOST(Yii::app()->createUrl("admin/labels/sa/delete/", ["lid" => $lid])); ?> })'
-                           data-message="<?php eT("Do you really want to delete this label set?","js"); ?>">
+                                data-toggle="modal"
+                                data-title="<?= gt('Delete label set') ?>"
+                                data-target="#confirmation-modal"
+                                data-btnclass='btn-danger'
+                                data-btntext="<?= gt('Delete') ?>"
+                                data-onclick='(function() { <?php echo convertGETtoPOST(Yii::app()->createUrl("admin/labels/sa/delete/", ["lid" => $lid])); ?> })'
+                                data-message="<?php eT("Do you really want to delete this label set?", "js"); ?>">
                             <span class="fa fa-trash text-danger"></span>
                             <?php eT("Delete label set"); ?>
                         </button>
-                        <?php endif; ?>
                     <?php endif; ?>
+                <?php endif; ?>
 
-                <?php endif;?>
+            <?php endif; ?>
 
         </div>
 
         <!-- Right action buttons -->
         <div class="col-lg-6 text-right">
-             <!-- Export Multiple -->
-                <?php if ( count($labelsets) > 0 ): ?>
-                    <?php if (Permission::model()->hasGlobalPermission('labelsets','export')):?>
-                        <a class="btn btn-default"
-                           href="<?php echo $this->createUrl("admin/labels/sa/exportmulti");?>"
-                           role="button">
-                                <span class="icon-export text-success"></span>
-                                <?php eT("Export"); ?>
-                            </a>
-                        <?php endif; ?>
-                    <?php else:?>
-                    <?php if (Permission::model()->hasGlobalPermission('labelsets','export')):?>
-                        <span title="<?php eT("No label sets available"); ?>" data-toggle="tooltip" data-placement="bottom" style="display: inline-block">
+            <!-- Export Multiple -->
+            <?php if (count($labelsets) > 0) : ?>
+                <?php if (Permission::model()->hasGlobalPermission('labelsets', 'export')) : ?>
+                    <a class="btn btn-default"
+                       href="<?php echo $this->createUrl("admin/labels/sa/exportmulti"); ?>"
+                       role="button">
+                        <span class="icon-export text-success"></span>
+                        <?php eT("Export"); ?>
+                    </a>
+                <?php endif; ?>
+            <?php else : ?>
+                <?php if (Permission::model()->hasGlobalPermission('labelsets', 'export')) : ?>
+                    <span title="<?php eT("No label sets available"); ?>" data-toggle="tooltip" data-placement="bottom" style="display: inline-block">
                             <a class="btn btn-default disabled" role="button">
                                 <span class="icon-export text-success"></span>
                                 <?php eT("Export multiple label sets"); ?>
                             </a>
                         </span>
-                    <?php endif; ?>
-                <?php endif; ?>          
+                <?php endif; ?>
+            <?php endif; ?>
 
             <!-- return to admin panel -->
-            <?php if (isset($labelbar['buttons']['return'])):?>
-              <a class="btn btn-default" href="<?php echo $this->createUrl('admin/index'); ?>" role="button">
+            <?php if (isset($labelbar['buttons']['return'])) : ?>
+                <a class="btn btn-default" href="<?php echo $this->createUrl('admin/index'); ?>" role="button">
                     <span class="fa fa-backward"></span>
                     &nbsp;&nbsp;
                     <?php eT('Back'); ?>
@@ -104,30 +110,30 @@
             <?php endif; ?>
 
             <!-- Close -->
-            <?php if(isset($labelbar['closebutton']['url'])):?>
+            <?php if (isset($labelbar['closebutton']['url'])) : ?>
                 <a class="btn btn-danger" href="<?php echo $labelbar['closebutton']['url']; ?>" role="button">
                     <span class="fa fa-close"></span>
-                    <?php eT("Close");?>
+                    <?php eT("Close"); ?>
                 </a>
-            <?php endif;?>
+            <?php endif; ?>
 
             <!-- White Close button -->
-            <?php if (isset($labelbar['white_closebutton']['url'])) :?>
+            <?php if (isset($labelbar['white_closebutton']['url'])) : ?>
                 <a class="btn btn-default" href="<?php echo $labelbar['white_closebutton']['url']; ?>" role="button">
-                     <span class="fa fa-close"></span>
-                    <?php eT("Close");?>
+                    <span class="fa fa-close"></span>
+                    <?php eT("Close"); ?>
                 </a>
-            <?php endif;?>
+            <?php endif; ?>
 
             <!-- Save and Close -->
-            <?php if(isset($labelbar['saveandclosebutton']['form'])):?>
+            <?php if (isset($labelbar['saveandclosebutton']['form'])) : ?>
                 <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $labelbar['saveandclosebutton']['form']; ?>">
                     <span class="fa fa-saved"></span>
-                    <?php eT("Save and close");?>
+                    <?php eT("Save and close"); ?>
                 </a>
             <?php endif; ?>
 
-            <?php if (isset($labelbar['buttons']['edition'])):?>
+            <?php if (isset($labelbar['buttons']['edition'])) : ?>
                 <!-- Save -->
                 <a class="btn btn-success"
                    href="#"
@@ -138,7 +144,7 @@
                     <span class="fa fa-floppy-o"></span>
                     <?php echo $labelbar['savebutton']['text']; ?>
                 </a>
-            <?php endif;?>
+            <?php endif; ?>
         </div>
     </div>
 </div>
diff --git a/application/views/admin/participants/attributeControl_view.php b/application/views/admin/participants/attributeControl_view.php
index 29ab217a804..28c602ca09c 100644
--- a/application/views/admin/participants/attributeControl_view.php
+++ b/application/views/admin/participants/attributeControl_view.php
@@ -1,48 +1,52 @@
 <?php
-/* @var $this AdminController */
-
+/**
+ * @var AdminController $this
+ * @var ParticipantAttributeName $model
+ * @var string $massiveAction
+ */
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('participantsAttributeControl');
 
 ?>
 <div id="pjax-content">
-
-        <div class="row">
-            <div class="container-fluid">
+    <div class="row">
+        <div class="container-fluid">
             <div class="row">
 
             </div>
             <div class="row">
                 <?php
-                $this->widget('bootstrap.widgets.TbGridView', array(
-                    'id' => 'list_attributes',
-                    'itemsCssClass' => 'table table-hover items',
-                    'dataProvider' => $model->search(),
-                    'columns' => $model->columns,
-                    'filter'=>$model,
-                    'emptyText'=>gT('No attributes found.'),
-                    'htmlOptions' => array('class'=> 'table-responsive', 'style' => 'cursor: pointer;'),
-                    'rowHtmlOptionsExpression' => '["data-attribute_id" => $data->attribute_id]',
-                    'itemsCssClass' => 'table table-responsive table-hover',
-                    'afterAjaxUpdate' => 'LS.CPDB.bindButtons',
-                    'template'  => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
-                    'summaryText'   => gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),
-                                CHtml::dropDownList(
-                                    'pageSizeAttributes',
-                                    Yii::app()->user->getState('pageSizeAttributes', Yii::app()->params['defaultPageSize']),
-                                    Yii::app()->params['pageSizeOptions'],
-                                    array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto'))
-                                ),
-                        ));
-                    ?>
-                </div>
+                $this->widget(
+                    'bootstrap.widgets.TbGridView',
+                    [
+                        'id'                       => 'list_attributes',
+                        'dataProvider'             => $model->search(),
+                        'columns'                  => $model->columns,
+                        'filter'                   => $model,
+                        'emptyText'                => gT('No attributes found.'),
+                        'htmlOptions'              => ['class' => 'table-responsive', 'style' => 'cursor: pointer;'],
+                        'rowHtmlOptionsExpression' => '["data-attribute_id" => $data->attribute_id]',
+                        'itemsCssClass'            => 'table table-responsive table-hover',
+                        'afterAjaxUpdate'          => 'LS.CPDB.bindButtons',
+                        'template'                 => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
+                        'summaryText'              => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(
+                            gT('%s rows per page'),
+                            CHtml::dropDownList(
+                                'pageSizeAttributes',
+                                Yii::app()->user->getState('pageSizeAttributes', Yii::app()->params['defaultPageSize']),
+                                Yii::app()->params['pageSizeOptions'],
+                                ['class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto']
+                            )
+                        ),
+                    ]
+                );
+                ?>
+            </div>
         </div>
 
-                <div id="pager">
+        <div id="pager">
 
-                </div>
-            </div>
         </div>
-        <span id="locator" data-location="attributes">&nbsp;</span>
     </div>
 </div>
+<span id="locator" data-location="attributes">&nbsp;</span>
diff --git a/application/views/admin/participants/blacklist_view.php b/application/views/admin/participants/blacklist_view.php
index 318d3a751d3..4c7a34d0678 100644
--- a/application/views/admin/participants/blacklist_view.php
+++ b/application/views/admin/participants/blacklist_view.php
@@ -1,5 +1,13 @@
 <?php
-/* @var $this AdminController */
+/**
+ * @var AdminController $this
+ * @var string $blacklistallsurveys
+ * @var string $blacklistnewsurveys
+ * @var string $blockaddingtosurveys
+ * @var string $hideblacklisted
+ * @var string $deleteblacklisted
+ * @var string $allowunblacklist
+ */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('participantsBlacklistControl');
@@ -10,127 +18,138 @@
     <div class="col-lg-12 list-surveys">
         <div class="row">
             <div class="col-lg-12 content-right">
-
-    <div id='usercontrol-1'>
-            <?php
-            if (Permission::model()->hasGlobalPermission('superadmin','read'))
-            {
-                $attribute = array('class' => 'col-md-6 col-md-offset-1 ');
-                echo CHtml::beginForm($this->createUrl('/admin/participants/sa/storeBlacklistValues'), 'post', $attribute);
-                $options = array('Y' => gT('Yes','unescaped'), 'N' => gT('No','unescaped'));
-                ?>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Blacklist all current surveys for participant once the global field is set:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'blacklistallsurveys',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $blacklistallsurveys == 'Y' ? '1' : 0
-                            )); ?>
+                <div id='usercontrol-1'>
+                    <?php
+                    if (Permission::model()->hasGlobalPermission('superadmin', 'read')) {
+                        $attribute = ['class' => 'col-md-6 col-md-offset-1 '];
+                        echo CHtml::beginForm($this->createUrl('/admin/participants/sa/storeBlacklistValues'), 'post', $attribute);
+                        $options = ['Y' => gT('Yes', 'unescaped'), 'N' => gT('No', 'unescaped')];
+                        ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Blacklist all current surveys for participant once the global field is set:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'blacklistallsurveys',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $blacklistallsurveys === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Blacklist participant for any new added survey once the global field is set:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'blacklistnewsurveys',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $blacklistnewsurveys == 'Y' ? '1' : 0
-                            )); ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Blacklist participant for any new added survey once the global field is set:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'blacklistnewsurveys',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $blacklistnewsurveys === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Allow blacklisted participants to be added to a survey:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'blockaddingtosurveys',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $blockaddingtosurveys == 'Y' ? '1' : 0
-                            )); ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Allow blacklisted participants to be added to a survey:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'blockaddingtosurveys',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $blockaddingtosurveys === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Hide blacklisted participants:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'hideblacklisted',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $hideblacklisted == 'Y' ? '1' : 0
-                            )); ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Hide blacklisted participants:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'hideblacklisted',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $hideblacklisted === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Delete globally blacklisted participant from the database:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'deleteblacklisted',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $deleteblacklisted == 'Y' ? '1' : 0
-                            )); ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Delete globally blacklisted participant from the database:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'deleteblacklisted',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $deleteblacklisted === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-10 bottom-10">
-                    <div class="form-group">
-                        <label class='control-label col-sm-8'>
-                            <?php eT('Allow participant to unblacklist himself/herself:'); ?>
-                        </label>
-                        <div class='col-sm-3'>
-                            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                'name' => 'allowunblacklist',
-                                'onLabel' => gT('Yes'),
-                                'offLabel' => gT('No'),
-                                'value' => $allowunblacklist == 'Y' ? '1' : 0
-                            )); ?>
+                        <div class="row ls-space margin top-10 bottom-10">
+                            <div class="form-group">
+                                <label class='control-label col-sm-8'>
+                                    <?php eT('Allow participant to unblacklist himself/herself:'); ?>
+                                </label>
+                                <div class='col-sm-3'>
+                                    <?php $this->widget(
+                                        'yiiwheels.widgets.switch.WhSwitch',
+                                        [
+                                            'name'     => 'allowunblacklist',
+                                            'onLabel'  => gT('Yes'),
+                                            'offLabel' => gT('No'),
+                                            'value'    => $allowunblacklist === 'Y' ? '1' : 0
+                                        ]
+                                    ); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="row ls-space margin top-25 bottom-10">
-                    <div class="form-group">
-                        <div class='col-sm-6'></div>
-                        <div class='col-sm-4'>
-                            <?php echo CHtml::submitButton('submit', array('value' => gT('Save'), 'class'=>'btn btn-default col-sm-12')); ?>
+                        <div class="row ls-space margin top-25 bottom-10">
+                            <div class="form-group">
+                                <div class='col-sm-6'></div>
+                                <div class='col-sm-4'>
+                                    <?php echo CHtml::submitButton('submit', ['value' => gT('Save'), 'class' => 'btn btn-default col-sm-12']); ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
+                        <?php
+                        echo CHtml::endForm();
+                    } else {
+                        echo "<div class='messagebox ui-corner-all'>" . gT("We are sorry but you don't have permissions to do this.") . "</div>";
+                    }
+                    ?>
                 </div>
-                <?php
-                echo CHtml::endForm();
-            }
-            else
-            {
-                echo "<div class='messagebox ui-corner-all'>" . gT("We are sorry but you don't have permissions to do this.") . "</div>";
-            }
-            ?>
-        </div>
-
-
             </div>
         </div>
-
     </div>
     <span id="locator" data-location="blacklist">&nbsp;</span>
 </div>
diff --git a/application/views/admin/participants/displayParticipants_view.php b/application/views/admin/participants/displayParticipants_view.php
index a8736098046..51475deb13f 100644
--- a/application/views/admin/participants/displayParticipants_view.php
+++ b/application/views/admin/participants/displayParticipants_view.php
@@ -1,5 +1,10 @@
 <?php
-/* @var $this AdminController */
+/**
+ * @var AdminController $this
+ * @var array $searchcondition
+ * @var Participant $model
+ * @var string $massiveAction
+ */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('displayParticipants');
@@ -7,87 +12,87 @@
 ?>
 <div id="pjax-content">
     <div class="row">
-    <div class="container-fluid">
-            <?php 
+        <div class="container-fluid">
+            <?php
             $hiddenFilterValues = "";
-            if($searchcondition)
-            {
-                echo "<div class='container-fluid' id='ParticipantFilters'>" 
-                        . "<div class='row'>"
-                            . "<div class='col-xs-12'>"
-                                    . gT("Active filters:")
-                                . "<span class=''>&nbsp;&nbsp;</span>"
-                                . "<button id='removeAllFilters' class='btn btn-warning btn-xs' data_url='".App()->createUrl("admin/participants/sa/displayParticipants")."'>".gT("Remove filters")."</button>"
-                            . "</div>"
-                        . "</div>";
-                $i=0;
-                $iNumberOfConditions = (count($searchcondition)+1)/4;
-                while ($i < $iNumberOfConditions)
-                {
-                    $sFieldname=$searchcondition[$i*4];
-                    $sOperator=$searchcondition[($i*4)+1];
-                    switch($sOperator)
-                        {
-                            case 'equal':
-                                $operator= gT('equals');
-                                break;
-                            case 'contains':
-                            case 'beginswith':
-                                $operator=gT("is like");
-                                break;
-                            case 'notequal':
-                            case 'notcontains':
-                                $operator=gT("is not like");
-                                break;
-                            case 'greaterthan':
-                                $operator=gT("is greater than");
-                                break;
-                            case 'lessthan':
-                                $operator=gT("is lesser than");
-                                break;
-                        }
-                    $sValue=$searchcondition[($i*4)+2];
-                    
-                        echo "<div class='row'>"
-                            . "<div class='col-xs-12'>"
-                            ." ".$model->getAttributeLabel($sFieldname)." ".$operator." ".$sValue
-                            . "</div>"
+            if ($searchcondition) {
+                echo "<div class='container-fluid' id='ParticipantFilters'>"
+                    . "<div class='row'>"
+                    . "<div class='col-xs-12'>"
+                    . gT("Active filters:")
+                    . "<span class=''>&nbsp;&nbsp;</span>"
+                    . "<button id='removeAllFilters' class='btn btn-warning btn-xs' data_url='" . App()->createUrl("admin/participants/sa/displayParticipants") . "'>" . gT("Remove filters") . "</button>"
+                    . "</div>"
+                    . "</div>";
+                $i = 0;
+                $iNumberOfConditions = (count($searchcondition) + 1) / 4;
+                while ($i < $iNumberOfConditions) {
+                    $sFieldname = $searchcondition[$i * 4];
+                    $sOperator = $searchcondition[($i * 4) + 1];
+                    switch ($sOperator) {
+                        case 'equal':
+                            $operator = gT('equals');
+                            break;
+                        case 'contains':
+                        case 'beginswith':
+                            $operator = gT("is like");
+                            break;
+                        case 'notequal':
+                        case 'notcontains':
+                            $operator = gT("is not like");
+                            break;
+                        case 'greaterthan':
+                            $operator = gT("is greater than");
+                            break;
+                        case 'lessthan':
+                            $operator = gT("is lesser than");
+                            break;
+                    }
+                    $sValue = $searchcondition[($i * 4) + 2];
+
+                    echo "<div class='row'>"
+                        . "<div class='col-xs-12'>"
+                        . " " . $model->getAttributeLabel($sFieldname) . " " . $operator . " " . $sValue
+                        . "</div>"
                         . "</div>";
                     $i++;
                 }
                 echo "</div>";
             }
-                
+
             ?>
-        <div class="row">
-            <?php
-                echo "<input type='hidden' id='searchcondition' name='searchcondition[]' value='".join("||",$searchcondition)."' />";
-                $this->widget('bootstrap.widgets.TbGridView', array(
-                    'id' => 'list_central_participants',
-                    'emptyText'=>gT('No participants found.'),
-                    'itemsCssClass' => 'table table-hover items',
-                    'dataProvider' => $model->search(),
-                    'columns' => $model->columns,
-                    'rowHtmlOptionsExpression' => '["data-participant_id" => $data->id]',
-                    'htmlOptions'     => array('style'=>'cursor: pointer;', 'class'=>'table-responsive'),
-                    'itemsCssClass' => 'table table-responsive table-hover',
-                    'filter'=>$model,
-                    'afterAjaxUpdate' => 'function(id, data){LS.CPDB.bindButtons;LS.CPDB.participantPanel();bindListItemclick();}',
-                    'ajaxType' => 'POST',
-                    'beforeAjaxUpdate' => 'insertSearchCondition',
-                    'template'  => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
-                    'summaryText'   => gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),
-                        CHtml::dropDownList(
-                            'pageSizeParticipantView',
-                            Yii::app()->user->getState('pageSizeParticipantView', Yii::app()->params['defaultPageSize']),
-                            Yii::app()->params['pageSizeOptionsTokens'],
-                            array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto')
-                        )
-                    ),
-                ));
+            <div class="row">
+                <?php
+                echo "<input type='hidden' id='searchcondition' name='searchcondition[]' value='" . join("||", $searchcondition) . "' />";
+                $this->widget(
+                    'bootstrap.widgets.TbGridView',
+                    [
+                        'id'                       => 'list_central_participants',
+                        'emptyText'                => gT('No participants found.'),
+                        'dataProvider'             => $model->search(),
+                        'columns'                  => $model->columns,
+                        'rowHtmlOptionsExpression' => '["data-participant_id" => $data->id]',
+                        'htmlOptions'              => ['style' => 'cursor: pointer;', 'class' => 'table-responsive'],
+                        'itemsCssClass'            => 'table table-responsive table-hover',
+                        'filter'                   => $model,
+                        'afterAjaxUpdate'          => 'function(id, data){LS.CPDB.bindButtons;LS.CPDB.participantPanel();bindListItemclick();}',
+                        'ajaxType'                 => 'POST',
+                        'beforeAjaxUpdate'         => 'insertSearchCondition',
+                        'template'                 => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
+                        'summaryText'              => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(
+                            gT('%s rows per page'),
+                            CHtml::dropDownList(
+                                'pageSizeParticipantView',
+                                Yii::app()->user->getState('pageSizeParticipantView', Yii::app()->params['defaultPageSize']),
+                                Yii::app()->params['pageSizeOptionsTokens'],
+                                ['class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto']
+                            )
+                        ),
+                    ]
+                );
                 ?>
+            </div>
         </div>
     </div>
-    </div>
     <span id="locator" data-location="participants">&nbsp;</span>
 </div>
diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
index 220b25a26fc..3199268d5f1 100644
--- a/application/views/admin/participants/participantsPanel_view.php
+++ b/application/views/admin/participants/participantsPanel_view.php
@@ -1,7 +1,8 @@
 <?php
-/*
+/**
  * @var bool $ownsAddParticipantsButton
  * @var bool $ownsAddAttributeButton
+ * @var bool $aAttributes
  */
 ?>
 
@@ -21,33 +22,35 @@
     var openModalParticipantPanel = "<?php echo ls\ajax\AjaxHelper::createUrl("/admin/participants/sa/openModalParticipantPanel"); ?>";
     var editValueParticipantPanel = "<?php echo Yii::app()->getController()->createUrl("/admin/participants/sa/editValueParticipantPanel"); ?>";
 
-    var translate_blacklisted = "<?php echo '<i class=\"fa fa-undo\"></i> '.gT('Remove from blacklist?'); ?>";
-    var translate_notBlacklisted = "<?php echo '<i class=\"fa fa-ban\"></i> '.gT('Add to blacklist?'); ?>";
+    var translate_blacklisted = "<?php echo '<i class=\"fa fa-undo\"></i> ' . gT('Remove from blacklist?'); ?>";
+    var translate_notBlacklisted = "<?php echo '<i class=\"fa fa-ban\"></i> ' . gT('Add to blacklist?'); ?>";
     var datepickerConfig =     <?php
         $dateformatdetails = getDateFormatData(Yii::app()->session['dateformat']);
-        echo json_encode(array(
-            'dateformatdetails'      => $dateformatdetails['dateformat'],
-            'dateformatdetailsjs'    => $dateformatdetails['jsdate'],
-            "initDatePickerObject" => array(
-                "format" => $dateformatdetails['jsdate'],
-                "tooltips" => array(
-                    "today" => gT('Go to today'),
-                    "clear" => gT('Clear selection'),
-                    "close" => gT('Close the picker'),
-                    "selectMonth" => gT('Select month'),
-                    "prevMonth" => gT('Previous month'),
-                    "nextMonth" => gT('Next month'),
-                    "selectYear" => gT('Select year'),
-                    "prevYear" => gT('Previous year'),
-                    "nextYear" => gT('Next year'),
-                    "selectDecade" => gT('Select decade'),
-                    "prevDecade" => gT('Previous decade'),
-                    "nextDecade" => gT('Next decade'),
-                    "prevCentury" => gT('Previous century'),
-                    "nextCentury" => gT('Next century')
-                )
-            )
-        ));?>;
+        echo json_encode(
+            [
+                'dateformatdetails'    => $dateformatdetails['dateformat'],
+                'dateformatdetailsjs'  => $dateformatdetails['jsdate'],
+                "initDatePickerObject" => [
+                    "format"   => $dateformatdetails['jsdate'],
+                    "tooltips" => [
+                        "today"        => gT('Go to today'),
+                        "clear"        => gT('Clear selection'),
+                        "close"        => gT('Close the picker'),
+                        "selectMonth"  => gT('Select month'),
+                        "prevMonth"    => gT('Previous month'),
+                        "nextMonth"    => gT('Next month'),
+                        "selectYear"   => gT('Select year'),
+                        "prevYear"     => gT('Previous year'),
+                        "nextYear"     => gT('Next year'),
+                        "selectDecade" => gT('Select decade'),
+                        "prevDecade"   => gT('Previous decade'),
+                        "nextDecade"   => gT('Next decade'),
+                        "prevCentury"  => gT('Previous century'),
+                        "nextCentury"  => gT('Next century')
+                    ]
+                ]
+            ]
+        );?>;
 </script>
 
 <!-- Participant Bar -->
@@ -55,71 +58,71 @@
     <div class='row'>
 
         <div class="col-md-9">
-            <?php if (Permission::model()->hasGlobalPermission('participantpanel','read')):?>
+            <?php if (Permission::model()->hasGlobalPermission('participantpanel', 'read')) : ?>
                 <!-- Display participants -->
                 <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/displayParticipants"); ?>" role="button">
                     <span class="fa fa-list text-success"></span>
-                    <?php eT("Display CPDB participants");?>
+                    <?php eT("Display CPDB participants"); ?>
                 </a>
-            <?php elseif (Permission::model()->hasGlobalPermission('participantpanel','create')
-                || ParticipantShare::model()->exists('share_uid = :userid', [':userid' => App()->user->id])):?>
+            <?php elseif (
+                Permission::model()->hasGlobalPermission('participantpanel', 'create')
+                || ParticipantShare::model()->exists('share_uid = :userid', [':userid' => App()->user->id])
+            ) : ?>
                 <!-- Display my participants -->
                 <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/displayParticipants"); ?>" role="button">
                     <span class="fa fa-list text-success"></span>
-                    <?php eT("Display my CPDB participants");?>
+                    <?php eT("Display my CPDB participants"); ?>
                 </a>
-            <?php endif;?>
+            <?php endif; ?>
 
             <!-- Summary -->
             <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/index"); ?>" role="button">
-                <span class="fa fa-list-alt text-success" ></span>
-                <?php eT("Summary");?>
+                <span class="fa fa-list-alt text-success"></span>
+                <?php eT("Summary"); ?>
             </a>
 
             <!-- Import from CSV file -->
             <?php
-            if (Permission::model()->hasGlobalPermission('participantpanel','import')): ?>
+            if (Permission::model()->hasGlobalPermission('participantpanel', 'import')) : ?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/importCSV"); ?>" role="button">
                     <span class="icon-importcsv text-success"></span>
-                    <?php eT("Import");?>
+                    <?php eT("Import"); ?>
                 </a>
-                <?php endif;?>
-
-            <?php if (Permission::model()->hasGlobalPermission('superadmin','read')):?>
+            <?php endif; ?>
 
+            <?php if (Permission::model()->hasGlobalPermission('superadmin', 'read')) : ?>
                 <!-- Global participant settings -->
                 <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/blacklistControl"); ?>" role="button">
                     <span class="icon-global text-success"></span>
-                    <?php eT("Blacklist settings");?>
+                    <?php eT("Blacklist settings"); ?>
                 </a>
 
                 <!-- Attribute management -->
                 <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/attributeControl"); ?>" role="button">
                     <span class="fa fa-tag text-success"></span>
-                    <?php eT("Attributes");?>
+                    <?php eT("Attributes"); ?>
                 </a>
 
-            <?php endif;?>
+            <?php endif; ?>
 
             <!-- Share panel -->
             <a class="btn btn-default" href="<?php echo $this->createUrl("admin/participants/sa/sharePanel"); ?>" role="button">
                 <span class="fa fa-share text-success"></span>
-                <?php eT("Share panel");?>
+                <?php eT("Share panel"); ?>
             </a>
 
             <!-- Export to CSV file -->
             <?php
-            if (Permission::model()->hasGlobalPermission('participantpanel','export')): ?>
-
-                    <a id="export" class="btn btn-default" href="#" role="button">
-                        <span class="icon-exportcsv text-success"></span>
-                        <?php eT("Export all participants");?>
-                    </a>
+            if (Permission::model()->hasGlobalPermission('participantpanel', 'export')) : ?>
+                <a id="export" class="btn btn-default" href="#" role="button">
+                    <span class="icon-exportcsv text-success"></span>
+                    <?php eT("Export all participants"); ?>
+                </a>
 
-            <?php endif;?>
+            <?php endif; ?>
 
-             <!-- Add Participants -->
-             <?php if (isset($ownsAddParticipantsButton) && ($ownsAddParticipantsButton)): ?>
+            <!-- Add Participants -->
+            <?php if (isset($ownsAddParticipantsButton) && ($ownsAddParticipantsButton)) : ?>
                 <button class="btn btn-default" id="addParticipantToCPP">
                     <i class="fa fa-plus-circle text-success"></i>&nbsp;
                     <?php eT("Add participant"); ?>
@@ -128,16 +131,16 @@
         </div>
 
         <div class="col-md-3 text-right">
-           
+
             <!-- Add Attribute -->
-            <?php if(isset($ownsAddAttributeButton) && ($ownsAddAttributeButton)): ?>
+            <?php if (isset($ownsAddAttributeButton) && ($ownsAddAttributeButton)) : ?>
                 <button class="btn btn-default" id="addParticipantAttributeName">
                     <i class="fa fa-plus-circle text-success"></i>
                     &nbsp;
                     <?php eT("Add new attribute"); ?>
                 </button>
             <?php endif; ?>
-            
+
             <!-- Back -->
             <a class="btn btn-default" href="<?php echo $this->createUrl('admin/index'); ?>" role="button">
                 <span class="fa fa-backward"></span>
@@ -151,18 +154,20 @@
 <!-- Modal for editing participants-->
 <div class="modal fade" id="participantPanel_edit_modal" tabindex="-1" role="dialog" aria-labelledby="participantPanel_edit_modal">
   <div class="modal-dialog " role="document">
-    <div class="modal-content">
+        <div class="modal-content">
 
+        </div>
     </div>
-  </div>
 </div>
 
 <?php
-    $aModalData = ['aAttributes' => $aAttributes];
-    App()->getController()->renderPartial('/admin/participants/modal_subviews/_exportCSV', $aModalData);
-
-App()->getClientScript()->registerScript('ParticipantsPanelBSSwitcher', "
-    LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
+$aModalData = ['aAttributes' => $aAttributes];
+App()->getController()->renderPartial('/admin/participants/modal_subviews/_exportCSV', $aModalData);
+
+App()->getClientScript()->registerScript(
+    'ParticipantsPanelBSSwitcher',
+    "LS.renderBootstrapSwitch();",
+    LSYii_ClientScript::POS_POSTSCRIPT
+);
 ?>
 
diff --git a/application/views/admin/participants/sharePanel_view.php b/application/views/admin/participants/sharePanel_view.php
index 26bf1f4b9f3..100806b1041 100644
--- a/application/views/admin/participants/sharePanel_view.php
+++ b/application/views/admin/participants/sharePanel_view.php
@@ -1,5 +1,10 @@
 <?php
-/* @var $this AdminController */
+/**
+ * @var AdminController $this
+ * @var ParticipantShare $model
+ * @var string $massiveAction
+ * @var int $pageSizeShareParticipantView
+ */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('participantsSharePanel');
@@ -11,26 +16,31 @@
             <div class="container-fluid">
                 <div class="row">
                     <?php
-                    $this->widget('bootstrap.widgets.TbGridView', array(
-                        'id' => 'share_central_participants',
-                        'emptyText' => gT('No shared participants found'),
-                        'itemsCssClass' => 'table table-striped items',
-                        'htmlOptions' => array('class'=> 'table-responsive'),
-                        'dataProvider' => $model->search(),
-                        'rowHtmlOptionsExpression' => '["data-participant_id" => $data->participant_id, "data-share_uid" => $data->share_uid]',
-                        'columns' => $model->columns,
-                        'filter'=>$model,
-                        'ajaxType' => 'POST',
-                        'afterAjaxUpdate' => 'LS.CPDB.bindButtons',
-                        'template'  => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
-                        'summaryText'   => gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),
-                            CHtml::dropDownList(
-                                'pageSizeShareParticipantView',
-                                $pageSizeShareParticipantView,
-                                Yii::app()->params['pageSizeOptions'],
-                                array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto'))
+                    $this->widget(
+                        'bootstrap.widgets.TbGridView',
+                        [
+                            'id'                       => 'share_central_participants',
+                            'emptyText'                => gT('No shared participants found'),
+                            'itemsCssClass'            => 'table table-striped items',
+                            'htmlOptions'              => ['class' => 'table-responsive'],
+                            'dataProvider'             => $model->search(),
+                            'rowHtmlOptionsExpression' => '["data-participant_id" => $data->participant_id, "data-share_uid" => $data->share_uid]',
+                            'columns'                  => $model->columns,
+                            'filter'                   => $model,
+                            'ajaxType'                 => 'POST',
+                            'afterAjaxUpdate'          => 'LS.CPDB.bindButtons',
+                            'template'                 => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
+                            'summaryText'              => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(
+                                gT('%s rows per page'),
+                                CHtml::dropDownList(
+                                    'pageSizeShareParticipantView',
+                                    $pageSizeShareParticipantView,
+                                    Yii::app()->params['pageSizeOptions'],
+                                    ['class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto']
+                                )
                             ),
-                        ));
+                        ]
+                    );
                     ?>
                 </div>
             </div>
diff --git a/application/views/admin/participants/summary_view.php b/application/views/admin/participants/summary_view.php
index 6a1badae48e..c29bd87d0c6 100644
--- a/application/views/admin/participants/summary_view.php
+++ b/application/views/admin/participants/summary_view.php
@@ -1,5 +1,12 @@
 <?php
-/* @var $this AdminController */
+/**
+ * @var AdminController $this
+ * @var string $totalrecords
+ * @var string $owned
+ * @var string $shared
+ * @var string $blacklisted
+ * @var string $attributecount
+ */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('participantsSummary');
@@ -9,7 +16,7 @@
     <div class="col-lg-12 list-surveys">
         <div class="row">
             <div class="col-lg-12 content-right">
-                <table class='statisticssummary table table-striped'>
+                <table class='statisticssummary table table-hover'>
                     <tr>
                         <th>
                             <?php eT("Total participants in central table"); ?>
diff --git a/application/views/admin/permissiontemplates/index.php b/application/views/admin/permissiontemplates/index.php
index ff9d2f8757a..3e6ca51ccd0 100644
--- a/application/views/admin/permissiontemplates/index.php
+++ b/application/views/admin/permissiontemplates/index.php
@@ -1,12 +1,12 @@
 <?php
-/* @var $this PermissiontemplatesController */
-/* @var $dataProvider CActiveDataProvider */
-
-?>
-
-<?php
-/* @var $this AdminController */
-/* @var $dataProvider CActiveDataProvider */
+/**
+ * @var PermissiontemplatesController $this
+ * @var CActiveDataProvider $dataProvider
+ * @var AdminController $this
+ * @var CActiveDataProvider $dataProvider
+ * @var Permissiontemplates $model
+ * @var string $massiveAction
+ */
 
 $pageSize = Yii::app()->user->getState('pageSize', Yii::app()->params['defaultPageSize']);
 // DO NOT REMOVE This is for automated testing to validate we see that page
@@ -18,29 +18,34 @@
     <div class="row">
         <div class="col-lg-12 content-right">
             <?php
-            $this->widget('bootstrap.widgets.TbGridView', array(
-                'id'              => 'RoleControl--identity-gridPanel',
-                'itemsCssClass'   => 'table items',
-                'htmlOptions'     => array('style'=>'cursor: pointer;'),
-                'dataProvider'    => $model->search(),
-                'columns'         => $model->columns,
-                'filter'          => $model,
-                'ajaxType'        => 'POST',
-                'ajaxUpdate'      => 'RoleControl--identity-gridPanel',
-                'afterAjaxUpdate' => 'LS.RoleControl.bindButtons',
-                'summaryText'     => "<div class='row' style='text-align:left; color:#000'>"
-                    . "<div class='col-xs-6'>" . $massiveAction . "</div>"
-                    . "<div class='col-xs-6'>"
-                    . gT('Displaying {start}-{end} of {count} result(s).') . ' '
-                    . sprintf(gT('%s rows per page'),
-                        CHtml::dropDownList(
-                            'pageSize',
-                            $pageSize,
-                            Yii::app()->params['pageSizeOptions'],
-                            array('class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto'))
-                    )
-                    . "</div></div>",
-            ));
+            $this->widget(
+                'bootstrap.widgets.TbGridView',
+                [
+                    'id'              => 'RoleControl--identity-gridPanel',
+                    'itemsCssClass'   => 'table items',
+                    'htmlOptions'     => ['style' => 'cursor: pointer;'],
+                    'dataProvider'    => $model->search(),
+                    'columns'         => $model->columns,
+                    'filter'          => $model,
+                    'ajaxType'        => 'POST',
+                    'ajaxUpdate'      => 'RoleControl--identity-gridPanel',
+                    'afterAjaxUpdate' => 'LS.RoleControl.bindButtons',
+                    'summaryText'     => "<div class='row' style='text-align:left; color:#000'>"
+                        . "<div class='col-xs-6'>" . $massiveAction . "</div>"
+                        . "<div class='col-xs-6'>"
+                        . gT('Displaying {start}-{end} of {count} result(s).') . ' '
+                        . sprintf(
+                            gT('%s rows per page'),
+                            CHtml::dropDownList(
+                                'pageSize',
+                                $pageSize,
+                                Yii::app()->params['pageSizeOptions'],
+                                ['class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto']
+                            )
+                        )
+                        . "</div></div>",
+                ]
+            );
 
             ?>
         </div>
diff --git a/application/views/admin/permissiontemplates/partials/_menubar.php b/application/views/admin/permissiontemplates/partials/_menubar.php
index 0fa5027a0c5..e61f83fd083 100644
--- a/application/views/admin/permissiontemplates/partials/_menubar.php
+++ b/application/views/admin/permissiontemplates/partials/_menubar.php
@@ -1,17 +1,17 @@
 <div class='menubar surveybar' id="rolemanagementbar">
     <div class='row'>
         <div class="col-md-9">
-            <?php if(Permission::model()->hasGlobalPermission('superadmin', 'read')) { ?>
-                <button data-href="<?=App()->createUrl("admin/roles/sa/editrolemodal")?>" data-toggle="modal" title="<?php eT('Add a new permission role'); ?>" class="btn btn-default RoleControl--action--openmodal">
+            <?php if (Permission::model()->hasGlobalPermission('superadmin', 'read')) { ?>
+                <button data-href="<?= App()->createUrl("admin/roles/sa/editrolemodal") ?>" data-toggle="modal" title="<?php eT('Add a new permission role'); ?>" class="btn btn-default RoleControl--action--openmodal">
                     <i class="fa fa-plus-circle text-success"></i> <?php eT("Add user role"); ?>
                 </button>
-                <button data-href="<?=App()->createUrl("admin/roles/sa/showImportXML")?>" data-toggle="modal" title="<?php eT('Import permission role from XML'); ?>" class="btn btn-default RoleControl--action--openmodal">
+                <button data-href="<?= App()->createUrl("admin/roles/sa/showImportXML") ?>" data-toggle="modal" title="<?php eT('Import permission role from XML'); ?>" class="btn btn-default RoleControl--action--openmodal">
                     <i class="fa fa-upload text-success"></i> <?php eT("Import (XML)"); ?>
                 </button>
             <?php } ?>
         </div>
         <div class="col-md-3 text-right">
-            <?php if(!isset($inImportView)): ?>
+            <?php if (!isset($inImportView)) : ?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl('admin/index'); ?>" role="button">
                     <span class="fa fa-backward"></span>
                     &nbsp;
diff --git a/application/views/admin/pluginmanager/scanFilesResult.php b/application/views/admin/pluginmanager/scanFilesResult.php
index 8429a46bf90..101564dd8c2 100644
--- a/application/views/admin/pluginmanager/scanFilesResult.php
+++ b/application/views/admin/pluginmanager/scanFilesResult.php
@@ -1,14 +1,20 @@
+<?php
+/**
+ * @var array $result
+ * @var string $installUrl
+ */
+?>
 <div class='col-lg-12'>
     <div class='col-sm-12'>
-        <?php foreach ($result as $name => $scannedPlugin): ?>
+        <?php foreach ($result as $name => $scannedPlugin) : ?>
             <div class='form-group col-lg-12'>
                 <label class='control-label col-sm-4'>
                     <?php echo $name; ?>
                 </label>
-                <?php if ($scannedPlugin['load_error'] == 0 && $scannedPlugin['extensionConfig'] == null): ?>
+                <?php if ($scannedPlugin['load_error'] == 0 && $scannedPlugin['extensionConfig'] == null) : ?>
                     <i class='fa fa-ban text-warning'></i>&nbsp;
                     <span class='text-warning'><?php eT('Missing configuration file.'); ?></span>
-                <?php elseif ($scannedPlugin['isCompatible']): ?>
+                <?php elseif ($scannedPlugin['isCompatible']) : ?>
                     <?php echo CHtml::beginForm($installUrl, 'post', ['style' => 'display: inline-block;']); ?>
                     <input type='hidden' name='pluginName' value='<?php echo $name; ?>'/>
                     <button href='' class='btn btn-success' data-toggle='tooltip' title='<?php eT('Install this plugin'); ?>'>
@@ -16,17 +22,19 @@
                         <?php eT('Install'); ?>
                     </button>
                     <?= CHtml::endForm() ?>
-                <?php elseif ($scannedPlugin['load_error'] == 0
+                <?php elseif (
+                    $scannedPlugin['load_error'] == 0
                     && $scannedPlugin['extensionConfig'] != null
-                    && !$scannedPlugin['isCompatible']): ?>
+                    && !$scannedPlugin['isCompatible']
+                ) : ?>
                     <i class='fa fa-ban text-warning'></i>&nbsp;
                     <span class='text-warning'><?php eT('Plugin is not compatible with your LimeSurvey version.'); ?></span>
-                <?php else: ?>
+                <?php else : ?>
                     <i class='fa fa-exclamation-triangle text-warning'></i>&nbsp;
                     <span class='text-warning'><?php eT('Load error. Please contact the plugin author.'); ?></span>
                 <?php endif; ?>
 
-                <?php if (isset($scannedPlugin['deleteUrl'])): ?>
+                <?php if (isset($scannedPlugin['deleteUrl'])) : ?>
                     <a href='#' class='btn btn-danger' data-target='#confirmation-modal' data-toggle='modal' data-href='<?= $scannedPlugin['deleteUrl'] ?>' data-message='<?php eT('Are you sure you want to delete this plugin from the file system?'); ?>' type='submit'>
                         <i class='fa fa-trash'></i>&nbsp;
                         <span data-toggle='tooltip' title='<?php eT('Delete this plugin from the file system'); ?>'>Delete files</span>
diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
index b9976e7d7c5..3ffce186d24 100644
--- a/application/views/admin/super/fullpagebar_view.php
+++ b/application/views/admin/super/fullpagebar_view.php
@@ -1,7 +1,9 @@
 <?php
+
 /**
  * Menu Bar show for full pages (without sidemenu, inside configuration menus)
  */
+
 ?>
 
 <!-- Full page menu bar -->
@@ -9,11 +11,12 @@
     <div class='row'>
         <div class="col-md-6 text-left">
             <!-- Plugin Manager -->
-            <?php if(isset($fullpagebar['pluginManager'])): ?>
-
+            <?php if (isset($fullpagebar['pluginManager'])) : ?>
                 <!-- Install Plugin Zip -->
-                <?php if (isset($fullpagebar['pluginManager']['buttons']['installPluginZipModal']['hasConfigDemoMode']) &&
-                    !$fullpagebar['pluginManager']['buttons']['installPluginZipModal']['hasConfigDemoMode']): ?>
+                <?php if (
+                    isset($fullpagebar['pluginManager']['buttons']['installPluginZipModal']['hasConfigDemoMode']) &&
+                    !$fullpagebar['pluginManager']['buttons']['installPluginZipModal']['hasConfigDemoMode']
+                ) : ?>
                     <a
                         href=''
                         class='btn btn-default'
@@ -28,7 +31,7 @@ class='btn btn-default'
                 <?php endif; ?>
 
                  <!-- Scan Files -->
-                <?php if(isset($fullpagebar['pluginManager']['buttons']['scanFiles'])): ?>
+                <?php if (isset($fullpagebar['pluginManager']['buttons']['scanFiles'])) : ?>
                     <a
                         href='<?php echo $fullpagebar["pluginManager"]["buttons"]["scanFiles"]["url"]; ?>'
                         class='btn btn-default'
@@ -54,8 +57,8 @@ class='btn btn-default'
             <?php endif; ?>
 
             <!-- Add new Menu entry -->
-            <?php if(isset($fullpagebar['menus'])): ?>
-                <?php if(isset($fullpagebar['menus']['buttons']['addMenuEntry']) && $fullpagebar['menus']['buttons']['addMenuEntry']): ?>
+            <?php if (isset($fullpagebar['menus'])) : ?>
+                <?php if (isset($fullpagebar['menus']['buttons']['addMenuEntry']) && $fullpagebar['menus']['buttons']['addMenuEntry']) : ?>
                     <a class="btn btn-default tab-dependent-button"
                        id="createnewmenuentry"
                        data-tab="#surveymenuentries"
@@ -78,7 +81,7 @@ class='btn btn-default'
             <?php endif;?>
 
             <!-- Return -->
-            <?php if(isset($fullpagebar['returnbutton']['url'])):?>
+            <?php if (isset($fullpagebar['returnbutton']['url'])) :?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl($fullpagebar['returnbutton']['url']); ?>" role="button">
                     <span class="fa fa-backward"></span>
                     &nbsp;&nbsp;
@@ -87,7 +90,7 @@ class='btn btn-default'
             <?php endif;?>
 
             <!-- Reset -->
-            <?php if(isset($fullpagebar['menus']['buttons']['reset']) && $fullpagebar['menus']['buttons']['reset']):?>
+            <?php if (isset($fullpagebar['menus']['buttons']['reset']) && $fullpagebar['menus']['buttons']['reset']) :?>
                 <a class="btn btn-warning"
                    href="#restoremodal"
                    data-toggle="modal">
@@ -97,7 +100,7 @@ class='btn btn-default'
             <?php endif; ?>
 
             <!-- Reorder -->
-            <?php if(isset($fullpagebar['menus']['buttons']['reorder']) && $fullpagebar['menus']['buttons']['reorder']): ?>
+            <?php if (isset($fullpagebar['menus']['buttons']['reorder']) && $fullpagebar['menus']['buttons']['reorder']) : ?>
                 <a class="btn btn-warning"
                    id="reorderentries">
                     <i class="fa fa-sort"></i>&nbsp;
@@ -106,7 +109,7 @@ class='btn btn-default'
             <?php endif; ?>
 
             <!-- Save and Close -->
-            <?php if(isset($fullpagebar['saveandclosebutton']['form'])):?>
+            <?php if (isset($fullpagebar['saveandclosebutton']['form'])) :?>
                 <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['saveandclosebutton']['form']; ?>">
                     <span class="fa fa-saved"></span>
                     <?php eT("Save and close");?>
@@ -114,7 +117,7 @@ class='btn btn-default'
             <?php endif; ?>
 
             <!-- Save -->
-            <?php if(isset($fullpagebar['savebutton']['form'])):?>
+            <?php if (isset($fullpagebar['savebutton']['form'])) :?>
                 <a class="btn btn-success" href="#" role="button" id="save-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>">
                     <span class="fa fa-check"></span>
                     <?php eT("Save");?>
@@ -122,7 +125,7 @@ class='btn btn-default'
             <?php endif;?>
 
             <!-- Close -->
-            <?php if(isset($fullpagebar['closebutton']['url'])):?>
+            <?php if (isset($fullpagebar['closebutton']['url'])) :?>
                 <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button" style="box-shadow: 3px 3px 3px;">
                     <span class="fa fa-close"></span>
                     <?php eT("Close");?>
@@ -130,7 +133,7 @@ class='btn btn-default'
             <?php endif;?>
 
             <!-- Box Buttons -->
-            <?php if(isset($fullpagebar['boxbuttons'])):?>
+            <?php if (isset($fullpagebar['boxbuttons'])) :?>
                 <a href="<?php echo $this->createUrl('homepageSettings/createBox/');?>" class="btn btn-default">
                     <span class="icon-add  text-success"></span>
                     <?php eT("Create a new box");?>
@@ -142,7 +145,7 @@ class='btn btn-default'
             <?php endif;?>
 
             <!-- Manage your Key -->
-            <?php if(isset($fullpagebar['update'])):?>
+            <?php if (isset($fullpagebar['update'])) :?>
                 <a href="<?php echo $this->createUrl('admin/update/sa/managekey/');?>" class="btn btn-default" style="margin-top:10px;">
                     <span class="fa fa-key text-success"></span>
                     <?php eT("Manage your key");?>
diff --git a/application/views/admin/surveymenu/index.php b/application/views/admin/surveymenu/index.php
index 6815962b0cf..57d16602b82 100644
--- a/application/views/admin/surveymenu/index.php
+++ b/application/views/admin/surveymenu/index.php
@@ -1,9 +1,11 @@
 <?php
-/* @var $this AdminController */
-/* @var $dataProvider CActiveDataProvider */
+/* @var AdminController $this */
+/* @var CActiveDataProvider $dataProvider */
+/* @var Surveymenu $model */
+/* @var SurveymenuEntries $entries_model */
 
-$pageSize=Yii::app()->user->getState('pageSize',Yii::app()->params['defaultPageSize']);
-$massiveAction = App()->getController()->renderPartial('/admin/surveymenu/massive_action/_selector', array(), true, false);
+$pageSize = Yii::app()->user->getState('pageSize', Yii::app()->params['defaultPageSize']);
+$massiveAction = App()->getController()->renderPartial('/admin/surveymenu/massive_action/_selector', [], true, false);
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('surveyMenus');
@@ -11,116 +13,118 @@
 ?>
 
 <div class="col-lg-12">
-	<div class="row">
-		<!-- Tabs -->
-		<ul class="nav nav-tabs" id="menueslist" role="tablist">
-			<li class="active">
+    <div class="row">
+        <!-- Tabs -->
+        <ul class="nav nav-tabs" id="menueslist" role="tablist">
+            <li class="active">
 				<a href="#surveymenues" aria-controls="surveymenues" role="tab" data-toggle="tab">
-					<?php eT('Survey menus'); ?>
-				</a>
-			</li>
-			<li>
+                    <?php eT('Survey menus'); ?>
+                </a>
+            </li>
+            <li>
 				<a href="#surveymenuentries" aria-controls="surveymenuentries" role="tab" data-toggle="tab">
-					<?php eT('Survey menu entries'); ?>
-				</a>
-			</li>
-		</ul>
+                    <?php eT('Survey menu entries'); ?>
+                </a>
+            </li>
+        </ul>
 
-		<!-- Tab Content -->
-		<div class="tab-content">
+        <!-- Tab Content -->
+        <div class="tab-content">
 
-			<!-- Survey Menu -->
-			<div id="surveymenues" class="tab-pane active">
-				<div class="col-12 ls-space margin top-15">
-					<div class="col-12 ls-flex-item">
-						<?php $this->widget('bootstrap.widgets.TbGridView', array(
-							'dataProvider' => $model->search(),
-							// Number of row per page selection
-							'id' => 'surveymenu-grid',
-							'columns' => $model->getColumns(),
-							'filter' => $model,
-							'emptyText'=>gT('No customizable entries found.'),
-							'summaryText'=>gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),
-								CHtml::dropDownList(
-									'pageSize',
-									$pageSize,
-									Yii::app()->params['pageSizeOptions'],
-									array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto')
-								)
-							),
-							'rowHtmlOptionsExpression' => '["data-surveymenu-id" => $data->id]',
-							'htmlOptions' => array('class'=> 'table table-hover'),
-							'itemsCssClass' => 'table table-hover',
-							'htmlOptions'=>array('class'=>' grid-view'),
-							'ajaxType' => 'POST',
-							'ajaxUpdate' => 'surveymenu-grid',
-							'template'  => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
-							'afterAjaxUpdate'=>'bindAction',
-						));
-						?>
-					</div>
-				</div>
-			</div>
+            <!-- Survey Menu -->
+            <div id="surveymenues" class="tab-pane active">
+                <div class="col-12 ls-space margin top-15">
+                    <div class="col-12 ls-flex-item">
+                        <?php $this->widget(
+                            'bootstrap.widgets.TbGridView',
+                            [
+                                'dataProvider'             => $model->search(),
+                                // Number of row per page selection
+                                'id'                       => 'surveymenu-grid',
+                                'columns'                  => $model->getColumns(),
+                                'filter'                   => $model,
+                                'emptyText'                => gT('No customizable entries found.'),
+                                'summaryText'              => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(
+                                    gT('%s rows per page'),
+                                    CHtml::dropDownList(
+                                        'pageSize',
+                                        $pageSize,
+                                        Yii::app()->params['pageSizeOptions'],
+                                        ['class' => 'changePageSize form-control', 'style' => 'display: inline; width: auto']
+                                    )
+                                ),
+                                'rowHtmlOptionsExpression' => '["data-surveymenu-id" => $data->id]',
+                                'itemsCssClass'            => 'table table-hover',
+                                'htmlOptions'              => ['class' => ' grid-view'],
+                                'ajaxType'                 => 'POST',
+                                'ajaxUpdate'               => 'surveymenu-grid',
+                                'template'                 => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
+                                'afterAjaxUpdate'          => 'bindAction',
+                            ]
+                        ); ?>
+                    </div>
+                </div>
+            </div>
 
-			<!-- Survey Menue Entries -->
-			<div id="surveymenuentries" class="tab-pane">
-				<?php  App()->getController()->renderPartial('surveymenu_entries/index', array('model' => $entries_model)); ?> 
-			</div>
-		</div>
-	</div>
+            <!-- Survey Menue Entries -->
+            <div id="surveymenuentries" class="tab-pane">
+                <?php App()->getController()->renderPartial('surveymenu_entries/index', ['model' => $entries_model]); ?>
+            </div>
+        </div>
+    </div>
 </div>
 
-<input type="hidden" id="surveymenu_open_url_selected_entry" value="0" />
+<input type="hidden" id="surveymenu_open_url_selected_entry" value="0"/>
 <!-- modal! -->
 
 <div class="modal fade" id="editcreatemenu" tabindex="-1" role="dialog">
-  	<div class="modal-dialog modal-lg" role="document">
-    	<div class="modal-content">
-		</div>
-	</div>
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+        </div>
+    </div>
 </div>
 <div class="modal fade" id="deletemodal" tabindex="-1" role="dialog">
-  	<div class="modal-dialog modal-lg" role="document">
-    	<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title"><?php eT("Delete this survey menu?");?></h4>
-			</div>
-			<div class="modal-body">
-				<?php eT("All menu entries of this menu will also be deleted."); ?>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT('Cancel'); ?></button>
-				<button type="button" id="deletemodal-confirm" class="btn btn-danger"><?php eT('Delete'); ?></button>
-			</div>
-		</div>
-	</div>
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><?php eT("Delete this survey menu?"); ?></h4>
+            </div>
+            <div class="modal-body">
+                <?php eT("All menu entries of this menu will also be deleted."); ?>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT('Cancel'); ?></button>
+                <button type="button" id="deletemodal-confirm" class="btn btn-danger"><?php eT('Delete'); ?></button>
+            </div>
+        </div>
+    </div>
 </div>
 
 <div class="modal fade" id="restoremodal" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
     <div class="modal-dialog modal-lg" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h4 class="modal-title"><?php eT("Really restore the default survey menus?");?></h4>
-        </div>
-        <div class="modal-body">
-          <p>
-            <?php eT("All custom menus will be lost."); ?>
-          </p>
-          <p>
-            <?php eT("Please do a backup of the menus you want to keep."); ?>
-          </p>
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><?php eT("Really restore the default survey menus?"); ?></h4>
+            </div>
+            <div class="modal-body">
+                <p>
+                    <?php eT("All custom menus will be lost."); ?>
+                </p>
+                <p>
+                    <?php eT("Please do a backup of the menus you want to keep."); ?>
+                </p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">
+                    <?php eT('Cancel'); ?>
+                </button>
+                <button type="button" id="reset-menus-confirm" class="btn btn-danger">
+                    <?php eT('Yes, restore default'); ?>
+                </button>
+            </div>
         </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">
-            <?php eT('Cancel'); ?>
-          </button>
-          <button type="button" id="reset-menus-confirm" class="btn btn-danger">
-            <?php eT('Yes, restore default'); ?>
-          </button>
-        </div>
-      </div>
     </div>
-  </div>
+</div>
 
 <script>
 	$('#menueslist a').on('shown.bs.tab', function () {
@@ -128,18 +132,18 @@
         $('.tab-dependent-button:not([data-tab="' + tabId + '"])').hide();
         $('.tab-dependent-button[data-tab="' + tabId + '"]').show();
     });
-    $(document).on('ready pjax:scriptcomplete', function() {
+    $(document).on('ready pjax:scriptcomplete', function () {
         if (window.location.hash) {
-            $('#menueslist').find('a[href=' + window.location.hash+']').trigger('click');
+            $('#menueslist').find('a[href=' + window.location.hash + ']').trigger('click');
         }
     });
 
-var surveyMenuEntryFunctions = new SurveyMenuFunctionsWrapper('#editcreatemenu','surveymenu-grid', {
-    loadSurveyEntryFormUrl: "<?php echo Yii::app()->urlManager->createUrl('/admin/menus/sa/getsurveymenuform' ) ?>",
-    restoreEntriesUrl: "<?php echo Yii::app()->getController()->createUrl('/admin/menus/sa/restore'); ?>",
-    deleteEntryUrl: "<?php echo Yii::app()->getController()->createUrl('/admin/menus/sa/delete'); ?>"
-  }),
-  bindAction = surveyMenuEntryFunctions.getBindActionForSurveymenus();
+    var surveyMenuEntryFunctions = new SurveyMenuFunctionsWrapper('#editcreatemenu', 'surveymenu-grid', {
+            loadSurveyEntryFormUrl: "<?php echo Yii::app()->urlManager->createUrl('/admin/menus/sa/getsurveymenuform') ?>",
+            restoreEntriesUrl: "<?php echo Yii::app()->getController()->createUrl('/admin/menus/sa/restore'); ?>",
+            deleteEntryUrl: "<?php echo Yii::app()->getController()->createUrl('/admin/menus/sa/delete'); ?>"
+        }),
+        bindAction = surveyMenuEntryFunctions.getBindActionForSurveymenus();
 
-  $(document).on('ready pjax:scriptcomplete', bindAction);
+    $(document).on('ready pjax:scriptcomplete', bindAction);
 </script>
diff --git a/application/views/admin/surveysgroups/surveySettings.php b/application/views/admin/surveysgroups/surveySettings.php
index 1fab5ffa04c..649695098a4 100644
--- a/application/views/admin/surveysgroups/surveySettings.php
+++ b/application/views/admin/surveysgroups/surveySettings.php
@@ -1,6 +1,11 @@
 <?php
 /* @var SurveysGroupsController $this */
 /* @var SurveysGroups $model */
+/* @var array $jsData */
+/* @var SurveysGroupsettings $oSurvey */
+/* @var string $partial */
+/* @var array $users */
+/* @var array $aDateFormatDetails */
 
 $optionsOnOff = [
     'Y' => gT('On', 'unescaped'),
@@ -31,7 +36,7 @@
                 <?php endif; ?>
                 <?php echo CHtml::form(["admin/surveysgroups/sa/surveysettings/id/" . $oSurvey->gsid . "/#surveySettingsGeneral"], 'post', ['id' => 'survey-settings-options-form']); ?>
                 <div class="tab-content col-md-10">
-                    <?php if ($partial == '_generaloptions_panel') { ?>
+                    <?php if ($partial === '_generaloptions_panel') { ?>
                         <div id="surveySettingsGeneral" class="row">
                             <?php $this->renderPartial(
                                 'survey/subview/accordion/_generaloptions_panel',
@@ -45,7 +50,7 @@
                                 ]
                             ); ?>
                         </div>
-                    <?php } elseif ($partial == '_presentation_panel') { ?>
+                    <?php } elseif ($partial === '_presentation_panel') { ?>
                         <div id="surveySettingsPresentation">
                             <?php $this->renderPartial(
                                 'survey/subview/accordion/_presentation_panel',
@@ -57,7 +62,7 @@
                                 ]
                             ); ?>
                         </div>
-                    <?php } elseif ($partial == '_tokens_panel') { ?>
+                    <?php } elseif ($partial === '_tokens_panel') { ?>
                         <div id="surveySettingsParticipants">
                             <?php $this->renderPartial(
                                 'survey/subview/accordion/_tokens_panel',
@@ -69,7 +74,7 @@
                                 ]
                             ); ?>
                         </div>
-                    <?php } elseif ($partial == '_notification_panel') { ?>
+                    <?php } elseif ($partial === '_notification_panel') { ?>
                         <div id="surveySettingsNotification">
                             <?php $this->renderPartial(
                                 'survey/subview/accordion/_notification_panel',
@@ -82,7 +87,7 @@
                                 ]
                             ); ?>
                         </div>
-                    <?php } elseif ($partial == '_publication_panel') { ?>
+                    <?php } elseif ($partial === '_publication_panel') { ?>
                         <div id="surveySettingsPublication">
                             <?php $this->renderPartial(
                                 'survey/subview/accordion/_publication_panel',
@@ -103,7 +108,7 @@
                     </div>
 
                 </div>
-                </form>
+                <?php echo CHtml::endForm()?>
             </div>
         </div>
     </div>
diff --git a/application/views/admin/themes/templateeditorbar_view.php b/application/views/admin/themes/templateeditorbar_view.php
index a1bcde84911..f771af6251f 100644
--- a/application/views/admin/themes/templateeditorbar_view.php
+++ b/application/views/admin/themes/templateeditorbar_view.php
@@ -1,5 +1,7 @@
 <?php
-/* @var $this AdminController */
+/* @var AdminController $this */
+/* @var string $codelanguage */
+/* @var string $highlighter */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('themeEditor');
@@ -9,7 +11,6 @@
     var highlighter='<?php echo $highlighter; ?>';
 </script>
 <script type='text/javascript'>
-    <!--
     function copyprompt(text, defvalue, copydirectory, action)
     {
         if (newtemplatename=window.prompt(text, defvalue))
@@ -28,12 +29,12 @@ function copyprompt(text, defvalue, copydirectory, action)
             if(filename==""){
                 return false; // False click
             }
-            var allowedtypes=',<?php echo Yii::app()->getConfig('allowedthemeuploads').','.Yii::app()->getConfig('allowedthemeimageformats'); ?>,';
+            var allowedtypes=',<?php echo Yii::app()->getConfig('allowedthemeuploads') . ',' . Yii::app()->getConfig('allowedthemeimageformats'); ?>,';
             var lastdotpos=-1;
             var ext='';
             if ((lastdotpos=filename.lastIndexOf('.')) < 0)
             {
-                alert('<?php eT('This file type is not allowed to be uploaded.','js'); ?>');
+                alert('<?php eT('This file type is not allowed to be uploaded.', 'js'); ?>');
                 return false;
             }
             else
@@ -42,7 +43,7 @@ function copyprompt(text, defvalue, copydirectory, action)
                 ext = ext.toLowerCase();
                 if (allowedtypes.indexOf(ext) < 0)
                 {
-                    alert('<?php eT('This file type is not allowed to be uploaded.','js'); ?>');
+                    alert('<?php eT('This file type is not allowed to be uploaded.', 'js'); ?>');
                     return false;
                 }
                 else
@@ -52,7 +53,6 @@ function copyprompt(text, defvalue, copydirectory, action)
             }
         });
     });
-    //-->
 </script>
 
 <!-- Template Editor Bar -->
@@ -62,11 +62,10 @@ function copyprompt(text, defvalue, copydirectory, action)
         <!-- Left Menu -->
         <div class="col-md-5">
 
-            <?php $importModal=false;?>
-            <?php if(is_writable($tempdir)):?>
-
+            <?php $importModal = false;?>
+            <?php if (is_writable($tempdir)) :?>
                 <!-- Export -->
-                <?php if(Permission::model()->hasGlobalPermission('templates','export') && class_exists('ZipArchive')):?>
+                <?php if (Permission::model()->hasGlobalPermission('templates', 'export') && class_exists('ZipArchive')) :?>
                     <a class="btn btn-default" id="button-export" href="<?php echo $this->createUrl('admin/themes/sa/templatezip/templatename/' . $templatename) ?>" role="button">
                         <span class="icon-export text-success"></span>
                         <?php eT("Export"); ?>
@@ -74,78 +73,74 @@ function copyprompt(text, defvalue, copydirectory, action)
                 <?php endif;?>
 
                 <!-- Copy -->
-                <?php if(Permission::model()->hasGlobalPermission('templates','create')):?>
-                    <?php if (is_writable($userthemerootdir)):?>
-                        <a class="btn btn-default" id="button-extend-<?php echo $templatename; ?>" href="#" role="button" onclick="javascript: copyprompt('<?php eT("Please enter the name for the new theme:"); ?>', '<?php echo gT("extends_")."$templatename"; ?>', '<?php echo $templatename; ?>', 'copy')">
+                <?php if (Permission::model()->hasGlobalPermission('templates', 'create')) :?>
+                    <?php if (is_writable($userthemerootdir)) :?>
+                        <a class="btn btn-default" id="button-extend-<?php echo $templatename; ?>" href="#" role="button" onclick="javascript: copyprompt('<?php eT("Please enter the name for the new theme:"); ?>', '<?php echo gT("extends_") . "$templatename"; ?>', '<?php echo $templatename; ?>', 'copy')">
                             <span class="icon-copy text-success"></span>
                             <?php eT("Extend"); ?>
                         </a>
-                        <?php else: ?>
+                    <?php else : ?>
                         <span class="btntooltip" data-toggle="tooltip" data-placement="bottom" title="<?php eT("The theme upload directory doesn't exist or is not writable."); ?>" style="display: inline-block" data-toggle="tooltip" data-placement="bottom">
                             <button type="button" class="btn btn-default btntooltip" disabled="disabled">
                                 <span class="icon-copy text-success"></span>
                                 <?php eT("Copy"); ?>
                             </button>
                         </span>
-                        <?php endif;?>
                     <?php endif;?>
+                <?php endif;?>
 
-                <?php else: ?>
-
+            <?php else : ?>
                 <!-- All buttons disabled -->
 
                 <!-- import disabled -->
-                <?php
-
-                if (!class_exists('ZipArchive'))
-                {
-                    $sMessage=gT("You cannot upload themes because you do not have the required ZIP library installed in PHP.");
-                }
-                else
-                {
-                    $sMessage=gT("Some directories are not writable. Please change the folder permissions for /tmp and /upload/themes in order to enable this option.");
-                }
-                if(Permission::model()->hasGlobalPermission('templates','import')):?>
+                    <?php
+
+                    if (!class_exists('ZipArchive')) {
+                        $sMessage = gT("You cannot upload themes because you do not have the required ZIP library installed in PHP.");
+                    } else {
+                        $sMessage = gT("Some directories are not writable. Please change the folder permissions for /tmp and /upload/themes in order to enable this option.");
+                    }
+                    if (Permission::model()->hasGlobalPermission('templates', 'import')) :?>
                     <span class="btntooltip" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>"  style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>" >
                         <button type="button" class="btn btn-default btntooltip" disabled="disabled">
                             <span class="icon-import text-muted"></span>
-                            <?php eT("Import"); ?>
+                                <?php eT("Import"); ?>
                         </button>
                     </span>
                     <?php endif;?>
 
             <!-- export disabled -->
-            <?php if(Permission::model()->hasGlobalPermission('templates','export')):?>
+                    <?php if (Permission::model()->hasGlobalPermission('templates', 'export')) :?>
                 <span class="btntooltip" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>"  style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>" >
                     <button type="button" class="btn btn-default btntooltip" disabled="disabled">
                         <span class="icon-export text-muted"></span>
                         <?php eT("Export"); ?>
                     </button>
                 </span>
-                <?php endif;?>
+                    <?php endif;?>
 
             <!-- create disabled -->
-            <?php if(Permission::model()->hasGlobalPermission('templates','create')):?>
+                    <?php if (Permission::model()->hasGlobalPermission('templates', 'create')) :?>
                 <span class="btntooltip" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>"  style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php echo $sMessage; ?>" >
                     <button type="button" class="btn btn-default btntooltip" disabled="disabled">
                         <span class="icon-copy text-muted"></span>
                         <?php eT("Copy"); ?>
                     </button>
                 </span>
-                <?php endif;?>
+                    <?php endif;?>
 
             <?php endif;?>
 
 
-            <?php if(is_template_editable($templatename)):?>
-                <?php if(Permission::model()->hasGlobalPermission('templates','update')):?>
+            <?php if (is_template_editable($templatename)) :?>
+                <?php if (Permission::model()->hasGlobalPermission('templates', 'update')) :?>
                     <a class="btn btn-default" id="button-rename-theme" href="#" role="button" onclick="javascript: copyprompt('<?php eT("Rename this theme to:"); ?>', '<?php echo $templatename; ?>', '<?php echo $templatename; ?>', 'rename');">
                         <span class="fa fa-pencil  text-success"></span>
                         <?php eT("Rename"); ?>
                     </a>
-                    <?php endif;?>
+                <?php endif;?>
 
-                <?php if(Permission::model()->hasGlobalPermission('templates','delete')):?>
+                <?php if (Permission::model()->hasGlobalPermission('templates', 'delete')) :?>
                     <a
                         id="button-delete"
                         href="<?php echo Yii::app()->getController()->createUrl('admin/themes/sa/delete/'); ?>"
@@ -156,8 +151,8 @@ class="btn btn-danger selector--ConfirmModal">
                             <span class="fa fa-trash "></span>
                             <?php eT('Delete'); ?>
                         </a>
-                    <?php endif;?>
                 <?php endif;?>
+            <?php endif;?>
         </div>
 
         <!-- Right Menu -->
@@ -168,7 +163,7 @@ class="btn btn-danger selector--ConfirmModal">
                 <label for='templatedir'><?php eT("Theme:"); ?></label>
                 <select class="listboxtemplates form-control btn" id='templatedir' name='templatedir' onchange="javascript: var uri = new Uri('<?php
                     // Don't put 'sa' into the URL dirctly because YIi will then try to use filenames directly in the path because of the route
-                    echo $this->createUrl("admin/themes",array('sa'=>'view','editfile'=>$relativePathEditfile,'screenname'=>$screenname)); ?>'); uri.addQueryParam('templatename',this.value); window.open(uri.toString(), '_top')">
+                    echo $this->createUrl("admin/themes", array('sa' => 'view','editfile' => $relativePathEditfile,'screenname' => $screenname)); ?>'); uri.addQueryParam('templatename',this.value); window.open(uri.toString(), '_top')">
                     <?php echo themeoptions($templates, $templatename); ?>
                 </select>
             </div>
@@ -176,48 +171,48 @@ class="btn btn-danger selector--ConfirmModal">
             <!-- Screen Select Box -->
             <div class="form-group">
                 <label for='listboxtemplates'><?php eT("Screen:"); ?></label>
-                <?php echo CHtml::dropDownList('screenname',$screenname,$screens,array(
-                    'id'=>'listboxtemplates',
-                    'class'=>"listboxtemplates form-control btn",
-                    'onchange'=> "javascript:  var uri = new Uri('".$this->createUrl("admin/themes",array('sa'=>'view','editfile'=>$relativePathEditfile,'templatename'=>$templatename))."'); uri.addQueryParam('screenname',this.value); window.open(uri.toString(), '_top')"
+                <?php echo CHtml::dropDownList('screenname', $screenname, $screens, array(
+                    'id' => 'listboxtemplates',
+                    'class' => "listboxtemplates form-control btn",
+                    'onchange' => "javascript:  var uri = new Uri('" . $this->createUrl("admin/themes", array('sa' => 'view','editfile' => $relativePathEditfile,'templatename' => $templatename)) . "'); uri.addQueryParam('screenname',this.value); window.open(uri.toString(), '_top')"
                 )); ?>
             </div>
 
-            <?php if(isset($fullpagebar['savebutton']['form'])):?>
+            <?php if (isset($fullpagebar['savebutton']['form'])) :?>
                 <a class="btn btn-success" href="#" role="button" id="save-form-button" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>">
                     <span class="fa fa-floppy-o" ></span>
                     <?php eT("Save");?>
                 </a>
-                <?php endif;?>
+            <?php endif;?>
 
             <!-- Close -->
-            <?php if(isset($fullpagebar['closebutton']['url'])):?>
+            <?php if (isset($fullpagebar['closebutton']['url'])) :?>
                 <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button">
                     <span class="fa fa-close" ></span>
                     <?php eT("Close");?>
                 </a>
-                <?php endif;?>
+            <?php endif;?>
 
             <!-- Return to Theme List -->
-            <?php if(isset($templateEditorBar['buttons']['returnbutton'])):?>
+            <?php if (isset($templateEditorBar['buttons']['returnbutton'])) :?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl("themeOptions/index"); ?>" role="button">
                     <span class="fa fa-backward" ></span>
                     &nbsp;&nbsp;
                     <?php eT("Back"); ?>
                 </a>
-                <?php endif;?>
+            <?php endif;?>
         </div>
     </div>
 </div>
 
-<?php if($importModal):?>
+<?php if ($importModal) :?>
     <?php $this->renderPartial('themeOptions/import_modal', ['importTemplate' => 'importtemplate', 'importModal' => 'importModal']); ?>
 <?php endif;?>
 
 <!-- Template Editor -->
 <div class="col-lg-12 templateeditor">
 
-    <?php if(!is_template_editable($templatename)):?>
+    <?php if (!is_template_editable($templatename)) :?>
         <div class="alert alert-info alert-dismissible" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span >&times;</span></button>
             <span class="fa fa-info-sign" ></span>&nbsp;&nbsp;&nbsp;
@@ -225,12 +220,12 @@ class="btn btn-danger selector--ConfirmModal">
                 <?php eT('Note: This is a standard theme.');?>
             </strong>
             <?php
-            printf(gT('If you want to modify it %s you can extend it%s.'),"<a href='#' title=\"".gT("Extend theme")."\""
-                ." onclick=\"javascript: copyprompt('".gT("Please enter the name for the new theme:")."', '".gT("extends_")."$templatename', '$templatename', 'copy')\">",'</a>');
+            printf(gT('If you want to modify it %s you can extend it%s.'), "<a href='#' title=\"" . gT("Extend theme") . "\""
+                . " onclick=\"javascript: copyprompt('" . gT("Please enter the name for the new theme:") . "', '" . gT("extends_") . "$templatename', '$templatename', 'copy')\">", '</a>');
             ?>
         </div>
     <?php endif;?>
-    <?php if(intval($templateapiversion) < intval(App()->getConfig("templateapiversion")) ):?>
+    <?php if ((int)$templateapiversion < (int)App()->getConfig("templateapiversion")) :?>
         <div class="alert alert-info alert-dismissible" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span >&times;</span></button>
             <div class="h4">
@@ -238,7 +233,7 @@ class="btn btn-danger selector--ConfirmModal">
                 <?php eT('This theme is out of date.');?>
             </div>
             <?php
-                printf(gT("We can not guarantee optimum operation. It would be preferable to no longer use it or to make it compatible with the version %s of the LimeSurvey API."),intval(App()->getConfig("versionnumber")));
+                printf(gT("We can not guarantee optimum operation. It would be preferable to no longer use it or to make it compatible with the version %s of the LimeSurvey API."), intval(App()->getConfig("versionnumber")));
             ?>
         </div>
     <?php endif;?>
diff --git a/application/views/admin/user/personalsettings.php b/application/views/admin/user/personalsettings.php
index d9f6f8374da..473f7d7de87 100644
--- a/application/views/admin/user/personalsettings.php
+++ b/application/views/admin/user/personalsettings.php
@@ -6,7 +6,7 @@
  * @var $oQuestionSelector              PreviewModalWidget
  */
 
-$aQuestionTypeGroups = array();
+$aQuestionTypeGroups = [];
 
 if (App()->session['questionselectormode'] !== 'default') {
     $selectormodeclass = App()->session['questionselectormode'];
@@ -16,9 +16,9 @@
 foreach ($aQuestionTypeList as $questionTheme) {
     $htmlReadyGroup = str_replace(' ', '_', strtolower($questionTheme->group));
     if (!isset($aQuestionTypeGroups[$htmlReadyGroup])) {
-        $aQuestionTypeGroups[$htmlReadyGroup] = array(
+        $aQuestionTypeGroups[$htmlReadyGroup] = [
             'questionGroupName' => $questionTheme->group
-        );
+        ];
     }
     $imageName = $questionTheme->question_type;
     if ($imageName == ":") {
@@ -51,364 +51,378 @@
     $aQuestionTypeGroups[$htmlReadyGroup]['questionTypes'][] = $questionTypeData;
 }
 
-$oQuestionSelector = $this->beginWidget('ext.admin.PreviewModalWidget.PreviewModalWidget', array(
-    'widgetsJsName' => "preselectquestiontype",
-    'renderType' => "group-simple",
-    'modalTitle' => "Select question type",
-    'groupTitleKey' => "questionGroupName",
-    'groupItemsKey' => "questionTypes",
-    'debugKeyCheck' => "Type: ",
-    'previewWindowTitle' => gT("Preview question type"),
-    'groupStructureArray' => $aQuestionTypeGroups,
-    'value' => $currentPreselectedQuestiontype,
-    'theme' => $currentPreselectedQuestionTheme,
-    'debug' => YII_DEBUG,
-    'currentSelected' => $selectedQuestion['title'] ?? gT('Invalid question'),
-    'buttonClasses' => ['btn-primary'],
-    'optionArray' => [
-        'selectedClass' => $selectedQuestion['settings']->class ?? 'invalid_question',
-        'onUpdate' => [
-            'value',
-            'theme',
-            "$('#preselectquestiontheme').val(theme);"
-        ],
+$oQuestionSelector = $this->beginWidget(
+    'ext.admin.PreviewModalWidget.PreviewModalWidget',
+    [
+        'widgetsJsName'       => "preselectquestiontype",
+        'renderType'          => "group-simple",
+        'modalTitle'          => "Select question type",
+        'groupTitleKey'       => "questionGroupName",
+        'groupItemsKey'       => "questionTypes",
+        'debugKeyCheck'       => "Type: ",
+        'previewWindowTitle'  => gT("Preview question type"),
+        'groupStructureArray' => $aQuestionTypeGroups,
+        'value'               => $currentPreselectedQuestiontype,
+        'theme'               => $currentPreselectedQuestionTheme,
+        'debug'               => YII_DEBUG,
+        'currentSelected'     => $selectedQuestion['title'] ?? gT('Invalid question'),
+        'buttonClasses'       => ['btn-primary'],
+        'optionArray'         => [
+            'selectedClass' => $selectedQuestion['settings']->class ?? 'invalid_question',
+            'onUpdate'      => [
+                'value',
+                'theme',
+                "$('#preselectquestiontheme').val(theme);"
+            ],
+        ]
     ]
-));
+);
 
 echo $oQuestionSelector->getModal();
 ?>
 
-<div class="container">
-<?php echo TbHtml::form($this->createUrl("/admin/user/sa/personalsettings"), 'post', array('class' => 'form44 ', 'id'=>'personalsettings','autocomplete'=>"off")); ?>
-    <div class="row">
-        <div class="col-xs-12">
-            <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#your-profile" role="tab" data-toggle="tab"><?php eT("My profile"); ?></a></li>
-                <li role="presentation"><a href="#your-personal-settings" role="tab" data-toggle="tab"><?php eT("My personal settings"); ?></a></li>
-                <li role="presentation" ><a href="#your-personal-menues" role="tab" data-toggle="tab"><?php eT("My personal menus"); ?></a></li>
-                <li role="presentation" ><a href="#your-personal-menueentries" role="tab" data-toggle="tab"><?php eT("My personal menu entries"); ?></a></li>
-            </ul>
-            <div class="tab-content">
+    <div class="container">
+        <?php echo TbHtml::form($this->createUrl("/admin/user/sa/personalsettings"), 'post', ['class' => 'form44 ', 'id' => 'personalsettings', 'autocomplete' => "off"]); ?>
+        <div class="row">
+            <div class="col-xs-12">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="active"><a href="#your-profile" role="tab" data-toggle="tab"><?php eT("My profile"); ?></a></li>
+                    <li role="presentation"><a href="#your-personal-settings" role="tab" data-toggle="tab"><?php eT("My personal settings"); ?></a></li>
+                    <li role="presentation"><a href="#your-personal-menues" role="tab" data-toggle="tab"><?php eT("My personal menus"); ?></a></li>
+                    <li role="presentation"><a href="#your-personal-menueentries" role="tab" data-toggle="tab"><?php eT("My personal menu entries"); ?></a></li>
+                </ul>
+                <div class="tab-content">
 
-                <!-- TAB: My profile settings -->
-                <div role="tabpanel" class="tab-pane fade in active" id="your-profile">
-                    <div class="pagetitle h3"><?php eT("My profile"); ?></div>
-                    <div class="container-fluid">
-                        <div class="row">
-                            <div class="col-sm-12 col-md-12">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("User name:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php echo TbHtml::textField('username', $sUsername,array('class'=>'form-control','readonly'=>'readonly')); ?>
-                                    </div>
-                                    <div class="">
-                                        <span class='text-info'><?php eT("The user name cannot be changed."); ?></span>
+                    <!-- TAB: My profile settings -->
+                    <div role="tabpanel" class="tab-pane fade in active" id="your-profile">
+                        <div class="pagetitle h3"><?php eT("My profile"); ?></div>
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-sm-12 col-md-12">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("User name:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::textField('username', $sUsername, ['class' => 'form-control', 'readonly' => 'readonly']); ?>
+                                        </div>
+                                        <div class="">
+                                            <span class='text-info'><?php eT("The user name cannot be changed."); ?></span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
-                            <hr/>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Full name:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php echo TbHtml::textField('fullname', $sFullname ,array('class'=>'form-control','maxlength'=>50)); ?>
+                            <div class="row">
+                                <hr/>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Full name:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::textField('fullname', $sFullname, ['class' => 'form-control', 'maxlength' => 50]); ?>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
-                            <hr/>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-3">
-                                <button class="btn btn-default btn-warning " id="selector__showChangePassword" style="color: white; outline: none;">
-                                    <i class="fa fa-lock"></i>
-                                    <?=gT("Change password and/or Email")?>
-                                </button>
-                                
-                                <br/>
+                            <div class="row">
+                                <hr/>
                             </div>
-                        </div>
-                        <div class="row selector__password-row hidden">
-                            <input type="hidden" id="newpasswordshown" name="newpasswordshown" value="0" />
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <label for="oldpassword" class="control-label">
-                                        <?php echo gT("Current password:"); ?>
-                                        <span class="required">*</span>
-                                    </label>
-                                    <div class="">
-                                        <?php echo TbHtml::passwordField('oldpassword', '',array('disabled'=>true, 'class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
-                                    </div>
+                            <div class="row">
+                                <div class="col-md-3">
+                                    <button class="btn btn-default btn-warning " id="selector__showChangePassword" style="color: white; outline: none;">
+                                        <i class="fa fa-lock"></i>
+                                        <?= gT("Change password and/or Email") ?>
+                                    </button>
+
+                                    <br/>
                                 </div>
                             </div>
-                            <div class="col-md-6">                            
-                            </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("New password:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php echo TbHtml::passwordField('password', '',array('disabled'=>true, 'class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                            <div class="row selector__password-row hidden">
+                                <input type="hidden" id="newpasswordshown" name="newpasswordshown" value="0"/>
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label for="oldpassword" class="control-label">
+                                            <?php echo gT("Current password:"); ?>
+                                            <span class="required">*</span>
+                                        </label>
+                                        <div class="">
+                                            <?php echo TbHtml::passwordField('oldpassword', '', ['disabled' => true, 'class' => 'form-control', 'autocomplete' => "off", 'placeholder' => html_entity_decode(str_repeat("&#9679;", 10), ENT_COMPAT, 'utf-8')]); ?>
+                                        </div>
                                     </div>
-                                    <div class="">
-                                        <span class='text-info'><?php echo $passwordHelpText; ?></span>
+                                </div>
+                                <div class="col-md-6">
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("New password:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::passwordField('password', '', ['disabled' => true, 'class' => 'form-control', 'autocomplete' => "off", 'placeholder' => html_entity_decode(str_repeat("&#9679;", 10), ENT_COMPAT, 'utf-8')]); ?>
+                                        </div>
+                                        <div class="">
+                                            <span class='text-info'><?php echo $passwordHelpText; ?></span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Repeat new password:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php echo TbHtml::passwordField('repeatpassword', '',array('disabled'=>true, 'class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Repeat new password:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::passwordField('repeatpassword', '', ['disabled' => true, 'class' => 'form-control', 'autocomplete' => "off", 'placeholder' => html_entity_decode(str_repeat("&#9679;", 10), ENT_COMPAT, 'utf-8')]); ?>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Email:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php echo TbHtml::emailField('email', $sEmailAdress,array('class'=>'form-control','maxlength'=>254)); ?>
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Email:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::emailField('email', $sEmailAdress, ['class' => 'form-control', 'maxlength' => 254]); ?>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <!-- TAB: My personal settings -->
-                <div role="tabpanel" class="tab-pane fade" id="your-personal-settings">
-                    <div class="pagetitle h3"><?php eT("My personal settings"); ?></div>
-                    <div class="container-fluid">
-                        <div class="row">
-                            <div class="col-sm-12 col-md-6">
-                                <!-- Interface language -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Interface language:"), 'lang', array('class'=>" control-label")); ?>
-                                    <div class="selector_contain_select2">
-                                        <?php
-                                        $this->widget('yiiwheels.widgets.select2.WhSelect2', array(
-                                            'asDropDownList' => true,
-                                            'name' => 'lang',
-                                            'data' => $aLanguageData,
-                                            'pluginOptions' => array(
-                                                'buttonWidth' => '100%',
-                                                'htmlOptions' => array(
-                                                    'id' => 'lang',
-                                                    'style'=> "widht:100%;"
-                                                )
-                                            ),
-                                            'value' => $sSavedLanguage,
-                                            'htmlOptions' => array(
-                                                'class'=> "form-control",
-                                                'style'=> "widht:100%;",
-                                                'data-width' => '100%'
-                                            )
-                                        ));
-
-                                            ?>
+                    <!-- TAB: My personal settings -->
+                    <div role="tabpanel" class="tab-pane fade" id="your-personal-settings">
+                        <div class="pagetitle h3"><?php eT("My personal settings"); ?></div>
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- Interface language -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Interface language:"), 'lang', ['class' => " control-label"]); ?>
+                                        <div class="selector_contain_select2">
+                                            <?php $this->widget(
+                                                'yiiwheels.widgets.select2.WhSelect2',
+                                                [
+                                                    'asDropDownList' => true,
+                                                    'name'           => 'lang',
+                                                    'data'           => $aLanguageData,
+                                                    'pluginOptions'  => [
+                                                        'buttonWidth' => '100%',
+                                                        'htmlOptions' => [
+                                                            'id'    => 'lang',
+                                                            'style' => "widht:100%;"
+                                                        ]
+                                                    ],
+                                                    'value'          => $sSavedLanguage,
+                                                    'htmlOptions'    => [
+                                                        'class'      => "form-control",
+                                                        'style'      => "widht:100%;",
+                                                        'data-width' => '100%'
+                                                    ]
+                                                ]
+                                            ); ?>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-sm-12 col-md-6">
-                                <!-- HTML editor mode -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("HTML editor mode:"), 'htmleditormode', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php
-                                            echo TbHtml::dropDownList('htmleditormode',  App()->session['htmleditormode'], array(
-                                                'default' => gT("Default",'unescaped'),
-                                                'inline' => gT("Inline HTML editor",'unescaped'),
-                                                'popup' => gT("Popup HTML editor",'unescaped'),
-                                                'none' => gT("Sourcecode editor",'unescaped'),
-                                            ), array('class'=>"form-control"));
-                                        ?>
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- HTML editor mode -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("HTML editor mode:"), 'htmleditormode', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::dropDownList(
+                                                'htmleditormode',
+                                                App()->session['htmleditormode'],
+                                                [
+                                                    'default' => gT("Default", 'unescaped'),
+                                                    'inline'  => gT("Inline HTML editor", 'unescaped'),
+                                                    'popup'   => gT("Popup HTML editor", 'unescaped'),
+                                                    'none'    => gT("Sourcecode editor", 'unescaped'),
+                                                ],
+                                                ['class' => "form-control"]
+                                            ); ?>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-12 col-md-6">
-                                <!-- Question type selector -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Question type selector:"), 'questionselectormode', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php
-                                        echo TbHtml::dropDownList('questionselectormode', App()->session['questionselectormode'], array(
-                                            'default' => gT("Default",'unescaped'),
-                                            'full' => gT("Full selector",'unescaped'),
-                                            'none' => gT("Simple selector",'unescaped')
-                                        ), array('class'=>"form-control"));
-                                        ?>
+                            <div class="row">
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- Question type selector -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Question type selector:"), 'questionselectormode', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::dropDownList(
+                                                'questionselectormode',
+                                                App()->session['questionselectormode'],
+                                                [
+                                                    'default' => gT("Default", 'unescaped'),
+                                                    'full'    => gT("Full selector", 'unescaped'),
+                                                    'none'    => gT("Simple selector", 'unescaped')
+                                                ],
+                                                ['class' => "form-control"]
+                                            ); ?>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-sm-12 col-md-6">
-                                <!-- Question type preselect -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Preselected question type:"), 'preselectquestiontype', array('class'=>" control-label")); ?>
-                                    <?=$oQuestionSelector->getButtonOrSelect(true)?>
-                                    <?php $this->endWidget('ext.admin.PreviewModalWidget.PreviewModalWidget'); ?>
-                                    <?php echo TbHtml::hiddenField('preselectquestiontheme', $currentPreselectedQuestionTheme); ?>
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- Question type preselect -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Preselected question type:"), 'preselectquestiontype', ['class' => " control-label"]); ?>
+                                        <?= $oQuestionSelector->getButtonOrSelect(true) ?>
+                                        <?php $this->endWidget('ext.admin.PreviewModalWidget.PreviewModalWidget'); ?>
+                                        <?php echo TbHtml::hiddenField('preselectquestiontheme', $currentPreselectedQuestionTheme); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-sm-12 col-md-6">
-                                <!-- Template editor mode -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label(gT("Template editor mode:"), 'templateeditormode', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <?php
-                                        echo TbHtml::dropDownList('templateeditormode', App()->session['templateeditormode'], array(
-                                            'default' => gT("Default"),
-                                            'full' => gT("Full template editor"),
-                                            'none' => gT("Simple template editor")
-                                        ), array('class'=>"form-control"));
-                                        ?>
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- Template editor mode -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Template editor mode:"), 'templateeditormode', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <?php echo TbHtml::dropDownList(
+                                                'templateeditormode',
+                                                App()->session['templateeditormode'],
+                                                [
+                                                    'default' => gT("Default"),
+                                                    'full'    => gT("Full template editor"),
+                                                    'none'    => gT("Simple template editor")
+                                                ],
+                                                ['class' => "form-control"]
+                                            ); ?>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col-sm-12 col-md-6">
-                                <!-- Date format -->
-                                <div class="form-group">
-                                    <?php echo TbHtml::label( gT("Date format:"), 'dateformat', array('class'=>" control-label")); ?>
-                                    <div class="">
-                                        <select name='dateformat' id='dateformat' class="form-control">
-                                            <?php
-                                            foreach (getDateFormatData(0,App()->session['adminlang']) as $index => $dateformatdata)
-                                            {
-                                                echo "<option value='{$index}'";
-                                                if ($index == App()->session['dateformat'])
-                                                {
-                                                    echo " selected='selected'";
-                                                }
+                                <div class="col-sm-12 col-md-6">
+                                    <!-- Date format -->
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Date format:"), 'dateformat', ['class' => " control-label"]); ?>
+                                        <div class="">
+                                            <select name='dateformat' id='dateformat' class="form-control">
+                                                <?php foreach (getDateFormatData(0, App()->session['adminlang']) as $index => $dateformatdata) {
+                                                    echo "<option value='{$index}'";
+                                                    if ($index == App()->session['dateformat']) {
+                                                        echo " selected='selected'";
+                                                    }
 
-                                                echo ">" . $dateformatdata['dateformat'] . '</option>';
-                                            }
-                                            ?>
-                                        </select>
+                                                    echo ">" . $dateformatdata['dateformat'] . '</option>';
+                                                } ?>
+                                            </select>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <!-- Show script field in question editor -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label( gT("Show script field:"), 'showScriptEdit', array('class'=>" control-label")); ?>
-                                    <?php
-                                        echo TbHtml::dropDownList('showScriptEdit', ($aUserSettings['showScriptEdit'] ?? '0'), array(
-                                            '0' => gT("No",'unescaped'),
-                                            '1' => gT("Yes",'unescaped'),
-                                        ), array('class'=>"form-control"));
-                                    ?>
+                                <!-- Show script field in question editor -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Show script field:"), 'showScriptEdit', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::dropDownList(
+                                            'showScriptEdit',
+                                            ($aUserSettings['showScriptEdit'] ?? '0'),
+                                            [
+                                                '0' => gT("No", 'unescaped'),
+                                                '1' => gT("Yes", 'unescaped'),
+                                            ],
+                                            ['class' => "form-control"]
+                                        ); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- Directly show edit mode -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label( gT("Directly show edit mode:"), 'noViewMode', array('class'=>" control-label")); ?>
-                                    <?php
-                                        echo TbHtml::dropDownList('noViewMode', ($aUserSettings['noViewMode'] ?? '0'), array(
-                                            '0' => gT("No",'unescaped'),
-                                            '1' => gT("Yes",'unescaped'),
-                                        ), array('class'=>"form-control"));
-                                    ?>
+                                <!-- Directly show edit mode -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Directly show edit mode:"), 'noViewMode', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::dropDownList(
+                                            'noViewMode',
+                                            ($aUserSettings['noViewMode'] ?? '0'),
+                                            [
+                                                '0' => gT("No", 'unescaped'),
+                                                '1' => gT("Yes", 'unescaped'),
+                                            ],
+                                            ['class' => "form-control"]
+                                        ); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- Basic non numerical part of answer options -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                    <?php echo TbHtml::label( gT("Non-Numerical answer option prefix:"), 'answeroptionprefix', array('class'=>" control-label")); ?>
-                                    <?php
-                                        echo TbHtml::textField(
+                                <!-- Basic non numerical part of answer options -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Non-Numerical answer option prefix:"), 'answeroptionprefix', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::textField(
                                             'answeroptionprefix',
                                             ($aUserSettings['answeroptionprefix'] ?? 'AO'),
-                                            array(
-                                                'class'=>"form-control",
+                                            [
+                                                'class'   => "form-control",
                                                 'pattern' => "[A-Za-z]{0,3}"
-                                            )
-                                        );
-                                    ?>
+                                            ]
+                                        ); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- Basic non numerical part of subquestions -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                <?php echo TbHtml::label( gT("Non-Numerical subquestions prefix:"), 'subquestionprefix', array('class'=>" control-label")); ?>
-                                    <?php
-                                        echo TbHtml::textField(
+                                <!-- Basic non numerical part of subquestions -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Non-Numerical subquestions prefix:"), 'subquestionprefix', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::textField(
                                             'subquestionprefix',
                                             ($aUserSettings['subquestionprefix'] ?? 'SQ'),
-                                            array(
-                                                'class'=>"form-control",
+                                            [
+                                                'class'   => "form-control",
                                                 'pattern' => "[A-Za-z]{0,3}"
-                                            )
+                                            ]
                                         );
-                                    ?>
+                                        ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- Lock questionorganizer in sidebar -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                <?php echo TbHtml::label( gT("Lock question organizer in sidebar by default:"), 'lock_organizer', array('class'=>" control-label")); ?>
-                                    <?php
-                                     echo TbHtml::dropDownList('lock_organizer', ($aUserSettings['lock_organizer'] ?? '0'), array(
-                                         '0' => gT("No",'unescaped'),
-                                         '1' => gT("Yes",'unescaped'),
-                                     ), array('class'=>"form-control"));
-                                 ?>
+                                <!-- Lock questionorganizer in sidebar -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Lock question organizer in sidebar by default:"), 'lock_organizer', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::dropDownList(
+                                            'lock_organizer',
+                                            ($aUserSettings['lock_organizer'] ?? '0'),
+                                            [
+                                                                      '0' => gT("No", 'unescaped'),
+                                                                      '1' => gT("Yes", 'unescaped'),
+                                                                  ],
+                                            ['class' => "form-control"]
+                                        ); ?>
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- Create example question group and question -->
-                            <div class="col-sm-12 col-md-6">
-                                <div class="form-group">
-                                <?php echo TbHtml::label( gT("Create example question group and question:"), 'createsample', array('class'=>" control-label")); ?>
-                                    <?php
-                                        echo TbHtml::dropDownList(
+                                <!-- Create example question group and question -->
+                                <div class="col-sm-12 col-md-6">
+                                    <div class="form-group">
+                                        <?php echo TbHtml::label(gT("Create example question group and question:"), 'createsample', ['class' => " control-label"]); ?>
+                                        <?php echo TbHtml::dropDownList(
                                             'createsample',
                                             ($aUserSettings['createsample'] ?? 'default'),
-                                            array(
-                                                'default' => gT("Default",'unescaped'),
-                                                '0' => gT("No",'unescaped'),
-                                                '1' => gT("Yes",'unescaped'),
-                                            ),
-                                            array('class' => "form-control")
-                                        );
-                                    ?>
+                                            [
+                                                'default' => gT("Default", 'unescaped'),
+                                                '0'       => gT("No", 'unescaped'),
+                                                '1'       => gT("Yes", 'unescaped'),
+                                            ],
+                                            ['class' => "form-control"]
+                                        ); ?>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div role="tabpanel" class="tab-pane fade" id="your-personal-menues">
-                    <?php $this->renderPartial('/admin/surveymenu/shortlist', $surveymenu_data); ?>
-                </div>
-                <div role="tabpanel" class="tab-pane fade" id="your-personal-menueentries">
-                    <?php $this->renderPartial('/admin/surveymenu_entries/shortlist', $surveymenuentry_data); ?>
+                    <div role="tabpanel" class="tab-pane fade" id="your-personal-menues">
+                        <?php $this->renderPartial('/admin/surveymenu/shortlist', $surveymenu_data); ?>
+                    </div>
+                    <div role="tabpanel" class="tab-pane fade" id="your-personal-menueentries">
+                        <?php $this->renderPartial('/admin/surveymenu_entries/shortlist', $surveymenuentry_data); ?>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
         <!-- Buttons -->
         <p>
             <?php echo TbHtml::hiddenField('action', 'savepersonalsettings'); ?>
-            <?php echo TbHtml::submitButton(gT("Save settings",'unescaped'),array('class' => 'hidden')); ?>
+            <?php echo TbHtml::submitButton(gT("Save settings", 'unescaped'), ['class' => 'hidden']); ?>
         </p>
-    <?php echo TbHtml::endForm(); ?>
+        <?php echo TbHtml::endForm(); ?>
 
-</div>
+    </div>
 
-<?php App()->getClientScript()->registerScript("personalSettings", "
-$('#selector__showChangePassword').on('click', function(e){
-    e.preventDefault();
-    $('#newpasswordshown').val('1');
-    $('.selector__password-row').removeClass('hidden').find('input').each(
-        function(i,item){
-            $(item).prop('disabled', false);
-        }
-    );
-    $(this).closest('div').remove();
-});
-", LSYii_ClientScript::POS_POSTSCRIPT);
+<?php App()->getClientScript()->registerScript(
+    "personalSettings",
+    "$('#selector__showChangePassword').on('click', function(e){
+        e.preventDefault();
+        $('#newpasswordshown').val('1');
+        $('.selector__password-row').removeClass('hidden').find('input').each(
+            function(i,item){
+                $(item).prop('disabled', false);
+           }
+        );
+        $(this).closest('div').remove();
+    });",
+    LSYii_ClientScript::POS_POSTSCRIPT
+);
diff --git a/application/views/homepageSettings/index.php b/application/views/homepageSettings/index.php
index 9f7bccf7d73..b088343298b 100644
--- a/application/views/homepageSettings/index.php
+++ b/application/views/homepageSettings/index.php
@@ -1,26 +1,28 @@
 <?php
-/* @var $this AdminController  */
-/* @var $dataProvider CActiveDataProvider */
+/* @var AdminController $this */
+/* @var CActiveDataProvider $dataProvider */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('homepageSettings');
 
-App()->getClientScript()->registerScript('HomepageSettingsBSSwitcher', "
-LS.renderBootstrapSwitch();
-", LSYii_ClientScript::POS_POSTSCRIPT);
+App()->getClientScript()->registerScript(
+    'HomepageSettingsBSSwitcher',
+    "LS.renderBootstrapSwitch();",
+    LSYii_ClientScript::POS_POSTSCRIPT
+);
 
 ?>
 <script type="text/javascript">
-    strConfirm='<?php eT('Please confirm','js');?>';
-    strCancel='<?php eT('Cancel','js');?>';
-    strOK='<?php eT('OK','js');?>';
+    strConfirm = '<?php eT('Please confirm', 'js');?>';
+    strCancel = '<?php eT('Cancel', 'js');?>';
+    strOK = '<?php eT('OK', 'js');?>';
 </script>
 
 <div class="col-lg-12 list-surveys">
 
     <div class="row">
 
-        <!-- Tabs --> 
+        <!-- Tabs -->
         <ul class="nav nav-tabs" id="boxeslist" role="tablist">
             <li class="active">
                 <a href='#boxes'>
@@ -36,121 +38,128 @@
         <div class="tab-content">
             <!-- Boxes -->
             <div id="boxes" class="tab-pane active">
-                <?php $this->widget('bootstrap.widgets.TbGridView',
-                    array(
+                <?php $this->widget(
+                    'bootstrap.widgets.TbGridView',
+                    [
                         'dataProvider' => $dataProviderBox,
-                        'summaryText'=>gT('Displaying {start}-{end} of {count} result(s).'),
-                        'columns' => array(
-                    array(
-                        'header' => gT('Position'),
-                        'name' => 'position',
-                        'value'=>'$data->position',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('Action'),
-                        'name' => 'actions',
-                        'value'=>'$data->buttons',
-                        'type'=>'raw',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('Title'),
-                        'name' => 'title',
-                        'value'=>'$data->title',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('Icon'),
-                        'name' => 'icon',
-                        'value'=>'$data->spanicon',
-                        'type'=>'raw',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('Description'),
-                        'name' => 'desc',
-                        'value'=>'$data->desc',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('URL'),
-                        'name' => 'url',
-                        'value'=>'$data->url',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                    array(
-                        'header' => gT('User group'),
-                        'name' => 'url',
-                        'value'=>'$data->usergroupname',
-                        'htmlOptions' => array('class' => 'col-md-1'),
-                    ),
-                ),
-            ));
-            ?>
+                        'summaryText'  => gT('Displaying {start}-{end} of {count} result(s).'),
+                        'columns'      => [
+                            [
+                                'header'      => gT('Position'),
+                                'name'        => 'position',
+                                'value'       => '$data->position',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('Action'),
+                                'name'        => 'actions',
+                                'value'       => '$data->buttons',
+                                'type'        => 'raw',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('Title'),
+                                'name'        => 'title',
+                                'value'       => '$data->title',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('Icon'),
+                                'name'        => 'icon',
+                                'value'       => '$data->spanicon',
+                                'type'        => 'raw',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('Description'),
+                                'name'        => 'desc',
+                                'value'       => '$data->desc',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('URL'),
+                                'name'        => 'url',
+                                'value'       => '$data->url',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                            [
+                                'header'      => gT('User group'),
+                                'name'        => 'url',
+                                'value'       => '$data->usergroupname',
+                                'htmlOptions' => ['class' => 'col-md-1'],
+                            ],
+                        ],
+                    ]
+                ); ?>
             </div>
             <!-- Box Settings -->
             <div id="boxsettings" class="tab-pane">
-               
+
                 <div class="row">
-                    <label class="col-sm-2 control-label"><?php eT("Display logo:");?> </label>
+                    <label class="col-sm-2 control-label"><?php eT("Display logo:"); ?> </label>
                     <div class="col-sm-2">
-                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_logo', 'id'=>'show_logo', 'value'=>$bShowLogo, 'onLabel'=>gT('On'),'offLabel'=>gT('Off')));?>
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', ['name' => 'show_logo', 'id' => 'show_logo', 'value' => $bShowLogo, 'onLabel' => gT('On'), 'offLabel' => gT('Off')]); ?>
 
-                        <input type="hidden" id="show_logo-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowLogoStatus');?>" />
+                        <input type="hidden" id="show_logo-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowLogoStatus'); ?>"/>
                     </div>
 
-                    <label class="col-sm-2 control-label"><?php eT("Show last visited survey and question:");?> </label>
+                    <label class="col-sm-2 control-label"><?php eT("Show last visited survey and question:"); ?> </label>
                     <div class="col-sm-2">
-                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_last_survey_and_question', 'id'=>'show_last_survey_and_question', 'value'=>$bShowLastSurveyAndQuestion, 'onLabel'=>gT('On'),'offLabel'=>gT('Off')));?>
-                        <input type="hidden" id="show_last_survey_and_question-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowLastSurveyAndQuestion');?>" />
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', ['name' => 'show_last_survey_and_question', 'id' => 'show_last_survey_and_question', 'value' => $bShowLastSurveyAndQuestion, 'onLabel' => gT('On'), 'offLabel' => gT('Off')]); ?>
+                        <input type="hidden" id="show_last_survey_and_question-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowLastSurveyAndQuestion'); ?>"/>
                     </div>
 
                     <br/><br/>
                 </div>
 
                 <div class="row">
-                    <label class="col-sm-2 control-label"><?php eT("Show survey list:");?> </label>
+                    <label class="col-sm-2 control-label"><?php eT("Show survey list:"); ?> </label>
                     <div class="col-sm-2">
-                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_survey_list', 'id'=>'show_survey_list', 'value'=>$bShowSurveyList, 'onLabel'=>gT('On'),'offLabel'=>gT('Off')));?>
-                        <input type="hidden" id="show_survey_list-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowSurveyList');?>" />
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', ['name' => 'show_survey_list', 'id' => 'show_survey_list', 'value' => $bShowSurveyList, 'onLabel' => gT('On'), 'offLabel' => gT('Off')]); ?>
+                        <input type="hidden" id="show_survey_list-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowSurveyList'); ?>"/>
                     </div>
 
-                    <label class="col-sm-2 control-label"><?php eT("Show search box on survey list:");?> </label>
+                    <label class="col-sm-2 control-label"><?php eT("Show search box on survey list:"); ?> </label>
                     <div class="col-sm-2">
-                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_survey_list_search', 'id'=>'show_survey_list_search', 'value'=>$bShowSurveyListSearch, 'onLabel'=>gT('On'),'offLabel'=>gT('Off')));?>
-                        <input type="hidden" id="show_survey_list_search-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowSurveyListSearch');?>" />
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', ['name' => 'show_survey_list_search', 'id' => 'show_survey_list_search', 'value' => $bShowSurveyListSearch, 'onLabel' => gT('On'), 'offLabel' => gT('Off')]); ?>
+                        <input type="hidden" id="show_survey_list_search-url" data-url="<?php echo App()->createUrl('homepageSettings/toggleShowSurveyListSearch'); ?>"/>
                     </div>
 
                     <br/><br/>
                 </div>
 
                 <div class="row">
-                    <label class="col-sm-2 control-label"><?php eT("Wrap container around boxes");?> </label>
+                    <label class="col-sm-2 control-label"><?php eT("Wrap container around boxes"); ?> </label>
                     <div class="col-sm-2">
-                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'boxes_in_container', 'id'=>'boxes_in_container', 'value'=>$bBoxesInContainer, 'onLabel'=>gT('On'),'offLabel'=>gT('Off')));?>
-                        <input type="hidden" id="boxes_in_container-url" data-url="<?php echo App()->createUrl('homepageSettings/changeBoxesInContainer');?>" />
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', ['name' => 'boxes_in_container', 'id' => 'boxes_in_container', 'value' => $bBoxesInContainer, 'onLabel' => gT('On'), 'offLabel' => gT('Off')]); ?>
+                        <input type="hidden" id="boxes_in_container-url" data-url="<?php echo App()->createUrl('homepageSettings/changeBoxesInContainer'); ?>"/>
                     </div>
                     <br/><br/>
                     <br/><br/>
                 </div>
 
                 <div class="row">
-                    <label class="col-sm-2 control-label"><?php eT("Boxes by row:");?></label>
+                    <label class="col-sm-2 control-label"><?php eT("Boxes by row:"); ?></label>
                     <div class="col-sm-1">
-                        <input class="form-control" type="number" id="iBoxesByRow" value="<?php echo $iBoxesByRow;?>" max="6" min="0" name="boxes_by_row"/>
+                        <input class="form-control" type="number" id="iBoxesByRow" value="<?php echo $iBoxesByRow; ?>" max="6" min="0" name="boxes_by_row"/>
                     </div>
-                    <label class="col-sm-2 col-sm-offset-1 control-label"><?php eT("Box orientation:");?></label>
+                    <label class="col-sm-2 col-sm-offset-1 control-label"><?php eT("Box orientation:"); ?></label>
                     <div class="col-sm-1">
-                        <select  class="form-control" id="iBoxesOffset" name="boxes_offset">
-                            <option value="1" <?php if($iBoxesOffset=='1'){ echo "selected"; } ?> ><?php eT('Left to right') ?></option>
-                            <option value="2" <?php if($iBoxesOffset=='2'){ echo "selected"; } ?> ><?php eT('Right to left') ?></option>
-                            <option value="3" <?php if($iBoxesOffset=='3'){ echo "selected"; } ?> ><?php eT('Centered') ?></option>
+                        <select class="form-control" id="iBoxesOffset" name="boxes_offset">
+                            <option value="1" <?php if ($iBoxesOffset == '1') {
+                                echo "selected";
+                                              } ?> ><?php eT('Left to right') ?></option>
+                            <option value="2" <?php if ($iBoxesOffset == '2') {
+                                echo "selected";
+                                              } ?> ><?php eT('Right to left') ?></option>
+                            <option value="3" <?php if ($iBoxesOffset == '3') {
+                                echo "selected";
+                                              } ?> ><?php eT('Centered') ?></option>
                         </select>
                     </div>
                     <div class="col-sm-3">
-                        <input type="hidden" id="boxesupdatemessage" data-ajaxsuccessmessage="<?php eT('Box settings updated!');?>" />
-                        <button class="btn btn-default" type="button" id="save_boxes_setting" data-url="<?php echo App()->createUrl('homepageSettings/updateBoxesSettings');?>"><?php eT('Save boxes settings');?></button>
+                        <input type="hidden" id="boxesupdatemessage" data-ajaxsuccessmessage="<?php eT('Box settings updated!'); ?>"/>
+                        <button class="btn btn-default" type="button" id="save_boxes_setting" data-url="<?php echo App()->createUrl('homepageSettings/updateBoxesSettings'); ?>"><?php eT('Save boxes settings'); ?></button>
                     </div>
                     <br/><br/><br/><br/>
                 </div>
@@ -166,9 +175,9 @@
         e.preventDefault();
         $(this).tab('show');
     });
-    $(document).on('ready pjax:scriptcomplete', function() {
+    $(document).on('ready pjax:scriptcomplete', function () {
         if (window.location.hash) {
-            $('#boxeslist').find('a[href=' + window.location.hash+']').trigger('click');
+            $('#boxeslist').find('a[href=' + window.location.hash + ']').trigger('click');
         }
     });
 </script>
diff --git a/application/views/layouts/fullpagebar_view.php b/application/views/layouts/fullpagebar_view.php
index f36a8b51c03..cd05fa78782 100644
--- a/application/views/layouts/fullpagebar_view.php
+++ b/application/views/layouts/fullpagebar_view.php
@@ -12,19 +12,20 @@
         <div class="col-md-6 text-left">
 
             <!-- Themes -->
-            <?php if (isset($fullpagebar['themes'])): ?>
+            <?php if (isset($fullpagebar['themes'])) : ?>
                 <!-- Upload and Install -->
-                <?php if (isset($fullpagebar['themes']['buttons']['uploadAndInstall']) && $fullpagebar['themes']['canImport']): ?>
-                    <a  id="uploadandinstall"
-                        class="btn btn-default"
-                        href=""
-                        role="button" 
-                        data-toggle="modal" 
-                        data-target="#<?php echo $fullpagebar['themes']['buttons']['uploadAndInstall']['modalSurvey']; ?>"
+                <?php if (isset($fullpagebar['themes']['buttons']['uploadAndInstall']) && $fullpagebar['themes']['canImport']) : ?>
+                    <a id="uploadandinstall"
+                       class="btn btn-default"
+                       href=""
+                       role="button"
+                       data-toggle="modal"
+                       data-target="#<?php echo $fullpagebar['themes']['buttons']['uploadAndInstall']['modalSurvey']; ?>"
+                    >
                         <span class="icon-import text-success"></span>
                         <?php eT("Upload & install"); ?>
                     </a>
-                <?php elseif(isset($fullpagebar['themes']['buttons']['uploadAndInstall']) && !$fullpagebar['themes']['canImport'] && isset($fullpagebar['themes']['importErrorMessage'])): ?>
+                <?php elseif (isset($fullpagebar['themes']['buttons']['uploadAndInstall']) && !$fullpagebar['themes']['canImport'] && isset($fullpagebar['themes']['importErrorMessage'])) : ?>
                     <!-- import disabled -->
                     <span class="btntooltip" data-toggle="tooltip" data-placement="bottom" title="<?php echo $fullpagebar['themes']['importErrorMessage']['importErrorMessage']; ?>" style="display: inline-block">
                     <button type="button" class="btn btn-default btntooltip" disabled="disabled">
@@ -36,26 +37,32 @@ class="btn btn-default"
             <?php endif; ?>
 
             <!-- List Surveys - Create a new Survey -->
-            <?php if(isset($fullpagebar['listSurveys']['buttons']['createSurvey']) &&
-                Permission::model()->hasGlobalPermission('surveys','create')):?>
+            <?php if (
+                isset($fullpagebar['listSurveys']['buttons']['createSurvey']) &&
+                Permission::model()->hasGlobalPermission('surveys', 'create')
+            ) : ?>
                 <a class="btn btn-default tab-dependent-button"
                    data-tab="#surveys"
                    href="<?php echo $fullpagebar['listSurveys']['buttons']['createSurvey']['url']; ?>"
                    role="button"
-                   style="display: none;">
+                   style="display: none;"
+                >
                     <span class="icon-add text-success"></span>
                     <?php eT("Create a new survey");?>
                 </a>
             <?php endif;?>
 
             <!-- List Surveys - Create a new Survey group -->
-            <?php if(isset($fullpagebar['listSurveys']['buttons']['createSurveyGroup']) &&
-                Permission::model()->hasGlobalPermission('surveysgroups','create')):?>
+            <?php if (
+                isset($fullpagebar['listSurveys']['buttons']['createSurveyGroup']) &&
+                Permission::model()->hasGlobalPermission('surveysgroups', 'create')
+            ) : ?>
                 <a class="btn btn-default tab-dependent-button"
                    data-tab="#surveygroups"
                    href="<?php echo $fullpagebar['listSurveys']['buttons']['createSurveyGroup']['url']; ?>"
                    role="button"
-                   style="display: none;">
+                   style="display: none;"
+                >
                     <span class="icon-add text-success"></span>
                     <?php eT("Create a new survey group");?>
                 </a>
@@ -109,7 +116,6 @@ class="btn btn-default"
 
             <!-- Box Buttons -->
             <?php if (isset($fullpagebar['boxbuttons'])) :?>
-
                 <!-- Reset Boxes Button -->
                 <a href="<?php echo $this->createUrl('homepageSettings/resetAllBoxes/');?>" class="btn btn-warning" data-confirm="<?php eT('This will delete all current boxes to restore the default ones. Are you sure you want to continue?'); ?>">
                     <span class="fa fa-refresh"></span>
diff --git a/application/views/surveyAdministration/newSurvey_view.php b/application/views/surveyAdministration/newSurvey_view.php
index 5023c223440..06288ad9f15 100644
--- a/application/views/surveyAdministration/newSurvey_view.php
+++ b/application/views/surveyAdministration/newSurvey_view.php
@@ -12,12 +12,12 @@
 ?>
 <!-- new survey view -->
 <?php
-    extract($arrayed_data);
-    $active = Yii::app()->request->getParam('tab', 'create');
+extract($arrayed_data, EXTR_OVERWRITE);
+$active = Yii::app()->request->getParam('tab', 'create');
 ?>
 <script type="text/javascript">
-    standardthemerooturl='<?php echo Yii::app()->getConfig('standardthemerooturl');?>';
-    templaterooturl='<?php echo Yii::app()->getConfig('userthemerooturl');?>';
+    standardthemerooturl = '<?php echo Yii::app()->getConfig('standardthemerooturl');?>';
+    templaterooturl = '<?php echo Yii::app()->getConfig('userthemerooturl');?>';
 </script>
 <div class="row">
     <div class="col-lg-12">
@@ -29,28 +29,28 @@
             <!-- General Tab (contains accrodion) -->
             <div id="general" class="tab-pane fade in
             <?php
-            if ($active=='create') {
+            if ($active === 'create') {
                 echo ' active ';
             }
             ?>">
-                <?php $this->renderPartial('tabCreate_view', array('data'=>$data));?>
+                <?php $this->renderPartial('tabCreate_view', ['data' => $data]); ?>
             </div>
 
             <!-- Import -->
-            <div id='import'  class="tab-pane fade in
+            <div id='import' class="tab-pane fade in
             <?php
-            if ($active=='import') {
+            if ($active === 'import') {
                 echo ' active ';
-            }?>">
+            } ?>">
                 <?php $this->renderPartial('tabImport_view', $data); ?>
             </div>
 
             <!-- Copy -->
             <div id='copy' class="tab-pane fade in
             <?php
-            if ($active=='copy') {
+            if ($active === 'copy') {
                 echo ' active ';
-            }?>" >
+            } ?>">
                 <?php $this->renderPartial('tabCopy_view', $data); ?>
             </div>
         </div>
diff --git a/application/views/themeOptions/update.php b/application/views/themeOptions/update.php
index 856ea2e7e6c..86f7a85ec62 100644
--- a/application/views/themeOptions/update.php
+++ b/application/views/themeOptions/update.php
@@ -1,21 +1,21 @@
 <?php
-/* @var $this ThemeOptionsController */
-/* @var $model TemplateConfiguration  */
+/* @var ThemeOptionsController $this */
+/* @var TemplateConfiguration $model */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('surveyTemplateOptionsUpdate');
 
 ?>
-<?php if (empty($model->sid)): ?>
-<!-- This is only visible when we're not in survey view. -->
+<?php if (empty($model->sid)) : ?>
+    <!-- This is only visible when we're not in survey view. -->
     <div class='menubar surveybar' id='theme-options-bar'>
         <div class='row'>
             <div class='text-right'>
 
                 <?php
-                  $sThemeOptionUrl = App()->createUrl("themeOptions");
-                  $sGroupEditionUrl = App()->createUrl("admin/surveysgroups/sa/update", array("id"=>$gsid, "#" => 'templateSettingsFortThisGroup'));
-                  $sUrl = (is_null($gsid))?$sThemeOptionUrl:$sGroupEditionUrl;
+                $sThemeOptionUrl = App()->createUrl("themeOptions");
+                $sGroupEditionUrl = App()->createUrl("admin/surveysgroups/sa/update", ["id" => $gsid, "#" => 'templateSettingsFortThisGroup']);
+                $sUrl = (is_null($gsid)) ? $sThemeOptionUrl : $sGroupEditionUrl;
                 ?>
 
                 <!-- Back -->
@@ -32,8 +32,8 @@
             </div>
         </div>
     </div>
-<?php else: ?>
-<div class="col-sm-12 side-body <?=getSideBodyClass(false)?>" id="theme-option-sidebody">
+<?php else : ?>
+<div class="col-sm-12 side-body <?= getSideBodyClass(false) ?>" id="theme-option-sidebody">
 <?php endif; ?>
     <!-- Using bootstrap tabs to differ between just hte options and advanced direct settings -->
     <div class="row">
@@ -41,14 +41,14 @@
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist">
                 <?php
-                    if ($aOptionAttributes['optionsPage'] == 'core'){
-                        foreach($aOptionAttributes['categories'] as $key => $category){ ?>
-                        <li role="presentation" class="<?php echo $key==0 ? 'active' : 'action_hide_on_inherit'; ?>"><a href="#category-<?php echo $key; ?>" aria-controls="category-<?php echo $key; ?>" role="tab" data-toggle="tab"><?php echo $category; ?></a></li>
+                if ($aOptionAttributes['optionsPage'] == 'core') {
+                    foreach ($aOptionAttributes['categories'] as $key => $category) { ?>
+                        <li role="presentation" class="<?php echo $key == 0 ? 'active' : 'action_hide_on_inherit'; ?>"><a href="#category-<?php echo $key; ?>" aria-controls="category-<?php echo $key; ?>" role="tab" data-toggle="tab"><?php echo $category; ?></a></li>
                     <?php } ?>
                 <?php } else { ?>
-                        <li role="presentation" class="active"><a href="#simple" aria-controls="home" role="tab" data-toggle="tab"><?php eT('Simple options')?></a></li>
+                    <li role="presentation" class="active"><a href="#simple" aria-controls="home" role="tab" data-toggle="tab"><?php eT('Simple options') ?></a></li>
                 <?php } ?>
-                <li role="presentation"><a href="#advanced" aria-controls="profile" role="tab" data-toggle="tab" class="<?php echo Yii::app()->getConfig('debug') > 1 ? '' : 'hidden'; ?>"><?php eT('Advanced options')?></a></li>
+                <li role="presentation"><a href="#advanced" aria-controls="profile" role="tab" data-toggle="tab" class="<?php echo Yii::app()->getConfig('debug') > 1 ? '' : 'hidden'; ?>"><?php eT('Advanced options') ?></a></li>
             </ul>
         </div>
     </div>
@@ -57,49 +57,46 @@
             <!-- Tab panes -->
             <?php /* Begin theme option form */ ?>
             <form class='form action_update_options_string_form' action=''>
-            <?php echo TbHtml::submitButton($model->isNewRecord ? gT('Create') : gT('Save'), [ 'id' => 'theme-options--submit', 'class'=> 'hidden action_update_options_string_button']); ?>
+                <?php echo TbHtml::submitButton($model->isNewRecord ? gT('Create') : gT('Save'), ['id' => 'theme-options--submit', 'class' => 'hidden action_update_options_string_button']); ?>
                 <div class="tab-content">
                     <?php
-                        /***
-                         * Here we render just the options as a simple form.
-                         * On save, the options are parsed to a JSON string and put into the relevant field in the "real" form
-                         * before saving that to database.
-                         */
+                    /*
+                     * Here we render just the options as a simple form.
+                     * On save, the options are parsed to a JSON string and put into the relevant field in the "real" form
+                     * before saving that to database.
+                     */
 
-                        //First convert options to json and check if it is valid
-                        $oOptions = json_decode($model->options);
-                        $jsonError = json_last_error();
-                        //if it is not valid, render message
-                        if($jsonError !== JSON_ERROR_NONE && $model->options !== 'inherit')
-                        {
-                            //return
-                            echo "<div class='ls-flex-column fill'><h4>".gT('There are no simple options in this survey theme.')."</h4></div>";
-                        }
+                    //First convert options to json and check if it is valid
+                    $oOptions = json_decode($model->options);
+                    $jsonError = json_last_error();
+                    //if it is not valid, render message
+                    if ($jsonError !== JSON_ERROR_NONE && $model->options !== 'inherit') {
+                        //return
+                        echo "<div class='ls-flex-column fill'><h4>" . gT('There are no simple options in this survey theme.') . "</h4></div>";
+                    } else {
                         //if however there is no error in the parsing of the json string go forth and render the form
-                        else
-                        {
-                            /**
-                             * The form element needs to hold the class "action_update_options_string_form" to be correctly bound
-                             * To be able to change the value in the "real" form, the input needs to now what to change.
-                             * So the name attribute should contain the object key we want to change
-                             */
+                        /*
+                         * The form element needs to hold the class "action_update_options_string_form" to be correctly bound
+                         * To be able to change the value in the "real" form, the input needs to now what to change.
+                         * So the name attribute should contain the object key we want to change
+                         */
 
-                            if ($aOptionAttributes['optionsPage'] == 'core'){
-                                $this->renderPartial('./options_core', array(
-                                    'aOptionAttributes' => $aOptionAttributes,
+                        if ($aOptionAttributes['optionsPage'] == 'core') {
+                            $this->renderPartial(
+                                './options_core',
+                                [
+                                    'aOptionAttributes'      => $aOptionAttributes,
                                     'aTemplateConfiguration' => $aTemplateConfiguration,
-                                    'oParentOptions' => $oParentOptions,
-                                    'sPackagesToLoad' => $sPackagesToLoad
-                                    )
-                                );
-                            } else {
-                                echo '<div role="tabpanel" class="tab-pane active" id="simple">';
-                                echo $templateOptionPage;
-                                echo '</div>';
-                            }
+                                    'oParentOptions'         => $oParentOptions,
+                                    'sPackagesToLoad'        => $sPackagesToLoad
+                                ]
+                            );
+                        } else {
+                            echo '<div role="tabpanel" class="tab-pane active" id="simple">';
+                            echo $templateOptionPage;
+                            echo '</div>';
                         }
-
-                        //
+                    }
                     ?>
                 </div>
             </form>
@@ -116,45 +113,45 @@
                     </div>
 
                     <?php
-                        $actionBaseUrl = 'themeOptions/update/';
-                        $actionUrlArray = array('id' => $model->id);
+                    $actionBaseUrl = 'themeOptions/update/';
+                    $actionUrlArray = ['id' => $model->id];
 
-                        if($model->sid) {
-                            unset($actionUrlArray['id']);
-                            $actionUrlArray['sid'] = $model->sid;
-                            $actionUrlArray['surveyd'] = $model->sid;
-                            $actionUrlArray['gsid'] = $model->gsid;
-                            $actionBaseUrl = 'themeOptions/updateSurvey/';
-                            }
-                        if($model->gsid) {
-                            unset($actionUrlArray['id']);
-                            $actionBaseUrl = 'themeOptions/updateSurveyGroup/';
-                            $actionUrlArray['gsid'] = $model->gsid;
-                            $actionUrlArray['id'] = $model->id;
-                        }
+                    if ($model->sid) {
+                        unset($actionUrlArray['id']);
+                        $actionUrlArray['sid'] = $model->sid;
+                        $actionUrlArray['surveyd'] = $model->sid;
+                        $actionUrlArray['gsid'] = $model->gsid;
+                        $actionBaseUrl = 'themeOptions/updateSurvey/';
+                    }
+                    if ($model->gsid) {
+                        unset($actionUrlArray['id']);
+                        $actionBaseUrl = 'themeOptions/updateSurveyGroup/';
+                        $actionUrlArray['gsid'] = $model->gsid;
+                        $actionUrlArray['id'] = $model->id;
+                    }
 
-                        $actionUrl = Yii::app()->getController()->createUrl($actionBaseUrl,$actionUrlArray);
+                    $actionUrl = Yii::app()->getController()->createUrl($actionBaseUrl, $actionUrlArray);
                     ?>
                     <div class="container-fluid">
                         <div class="row ls-space margin bottom-15">
                             <div class="container-fluid">
                                 <div class="row">
                                     <div class="col-sm-6 h4">
-                                        <?php printf(gT("Upload an image (maximum size: %d MB):"),getMaximumFileUploadSize()/1024/1024); ?>
+                                        <?php printf(gT("Upload an image (maximum size: %d MB):"), getMaximumFileUploadSize() / 1024 / 1024); ?>
                                     </div>
                                     <div class="col-sm-6">
-                                    <?php echo TbHtml::form(array('admin/themes/sa/upload'), 'post', array('id'=>'uploadimage', 'name'=>'uploadimage', 'enctype'=>'multipart/form-data')); ?>
+                                        <?php echo TbHtml::form(['admin/themes/sa/upload'], 'post', ['id' => 'uploadimage', 'name' => 'uploadimage', 'enctype' => 'multipart/form-data']); ?>
                                         <span id="fileselector">
                                             <label class="btn btn-default col-xs-8" for="upload_image">
-                                                <input class="hidden" id="upload_image" name="upload_image" type="file" >
+                                                <input class="hidden" id="upload_image" name="upload_image" type="file">
                                                 <i class="fa fa-upload ls-space margin right-10"></i><?php eT("Upload"); ?>
                                             </label>
                                         </span>
 
-                                            <input type='hidden' name='templatename' value='<?php echo $model->template_name; ?>' />
-                                            <input type='hidden' name='templateconfig' value='<?php echo $model->id; ?>' />
-                                            <input type='hidden' name='action' value='templateuploadimagefile' />
-                                        </form>
+                                        <input type='hidden' name='templatename' value='<?php echo $model->template_name; ?>'/>
+                                        <input type='hidden' name='templateconfig' value='<?php echo $model->id; ?>'/>
+                                        <input type='hidden' name='action' value='templateuploadimagefile'/>
+                                        <?php echo TbHtml::endForm() ?>
                                     </div>
                                 </div>
                                 <div class="row">
@@ -171,84 +168,87 @@
                         </div>
                         <div class="row">
                             <div class="container-fluid">
-                                <?php $form=$this->beginWidget('TbActiveForm', array(
-                                    'id'=>'template-options-form',
-                                    'enableAjaxValidation'=>false,
-                                    'htmlOptions' => ['class' => 'form '],
-                                    'action' => $actionUrl
-                                )); ?>
+                                <?php $form = $this->beginWidget(
+                                    'TbActiveForm',
+                                    [
+                                        'id'                   => 'template-options-form',
+                                        'enableAjaxValidation' => false,
+                                        'htmlOptions'          => ['class' => 'form '],
+                                        'action'               => $actionUrl
+                                    ]
+                                ); ?>
                                 <p class="note"><?php echo sprintf(gT('Fields with %s are required.'), '<span class="required">*</span>'); ?></p>
                                 <?php echo $form->errorSummary($model); ?>
 
 
-                                <?php echo $form->hiddenField($model,'template_name'); ?>
-                                <?php echo $form->hiddenField($model,'sid'); ?>
-                                <?php echo $form->hiddenField($model,'gsid'); ?>
-                                <?php echo $form->hiddenField($model,'uid'); ?>
+                                <?php echo $form->hiddenField($model, 'template_name'); ?>
+                                <?php echo $form->hiddenField($model, 'sid'); ?>
+                                <?php echo $form->hiddenField($model, 'gsid'); ?>
+                                <?php echo $form->hiddenField($model, 'uid'); ?>
 
-                                <?php echo CHtml::hiddenField('optionInheritedValues' , json_encode($optionInheritedValues)); ?>
-                                <?php echo CHtml::hiddenField('optionCssFiles' , json_encode($optionCssFiles)); ?>
-                                <?php echo CHtml::hiddenField('optionCssFramework' , json_encode($optionCssFramework)); ?>
-                                <?php echo CHtml::hiddenField('translationInheritedValue' , gT("Inherited value:").' '); ?>
+                                <?php echo CHtml::hiddenField('optionInheritedValues', json_encode($optionInheritedValues)); ?>
+                                <?php echo CHtml::hiddenField('optionCssFiles', json_encode($optionCssFiles)); ?>
+                                <?php echo CHtml::hiddenField('optionCssFramework', json_encode($optionCssFramework)); ?>
+                                <?php echo CHtml::hiddenField('translationInheritedValue', gT("Inherited value:") . ' '); ?>
 
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'files_css'); ?>
-                                        <?php echo $form->textArea($model,'files_css',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'files_css'); ?>
+                                        <?php echo $form->labelEx($model, 'files_css'); ?>
+                                        <?php echo $form->textArea($model, 'files_css', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'files_css'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'files_js'); ?>
-                                        <?php echo $form->textArea($model,'files_js',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'files_js'); ?>
+                                        <?php echo $form->labelEx($model, 'files_js'); ?>
+                                        <?php echo $form->textArea($model, 'files_js', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'files_js'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'files_print_css'); ?>
-                                        <?php echo $form->textArea($model,'files_print_css',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'files_print_css'); ?>
+                                        <?php echo $form->labelEx($model, 'files_print_css'); ?>
+                                        <?php echo $form->textArea($model, 'files_print_css', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'files_print_css'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'options'); ?>
-                                        <?php echo $form->textArea($model,'options',array('rows'=>6, 'cols'=>50 )); ?>
-                                        <?php echo $form->error($model,'options'); ?>
+                                        <?php echo $form->labelEx($model, 'options'); ?>
+                                        <?php echo $form->textArea($model, 'options', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'options'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'cssframework_name'); ?>
-                                        <?php echo $form->textField($model,'cssframework_name',array('size'=>45,'maxlength'=>45)); ?>
-                                        <?php echo $form->error($model,'cssframework_name'); ?>
+                                        <?php echo $form->labelEx($model, 'cssframework_name'); ?>
+                                        <?php echo $form->textField($model, 'cssframework_name', ['size' => 45, 'maxlength' => 45]); ?>
+                                        <?php echo $form->error($model, 'cssframework_name'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'cssframework_css'); ?>
-                                        <?php echo $form->textArea($model,'cssframework_css',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'cssframework_css'); ?>
+                                        <?php echo $form->labelEx($model, 'cssframework_css'); ?>
+                                        <?php echo $form->textArea($model, 'cssframework_css', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'cssframework_css'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'cssframework_js'); ?>
-                                        <?php echo $form->textArea($model,'cssframework_js',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'cssframework_js'); ?>
+                                        <?php echo $form->labelEx($model, 'cssframework_js'); ?>
+                                        <?php echo $form->textArea($model, 'cssframework_js', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'cssframework_js'); ?>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <?php echo $form->labelEx($model,'packages_to_load'); ?>
-                                        <?php echo $form->textArea($model,'packages_to_load',array('rows'=>6, 'cols'=>50)); ?>
-                                        <?php echo $form->error($model,'packages_to_load'); ?>
+                                        <?php echo $form->labelEx($model, 'packages_to_load'); ?>
+                                        <?php echo $form->textArea($model, 'packages_to_load', ['rows' => 6, 'cols' => 50]); ?>
+                                        <?php echo $form->error($model, 'packages_to_load'); ?>
                                     </div>
                                 </div>
                                 <div class="row buttons hidden">
-                                    <?php echo TbHtml::submitButton($model->isNewRecord ? gT('Create') : gT('Save'), ['class'=> 'btn-success']); ?>
+                                    <?php echo TbHtml::submitButton($model->isNewRecord ? gT('Create') : gT('Save'), ['class' => 'btn-success']); ?>
                                 </div>
 
                                 <?php $this->endWidget(); ?>
@@ -259,24 +259,26 @@
             </div>
         </div>
     </div>
-<?php if (!empty($model->sid)): // If we are in survey view, we have an additional div that we need to close ?>
+    <?php if (!empty($model->sid)) : // If we are in survey view, we have an additional div that we need to close  ?>
 </div>
-<?php endif; ?>
+    <?php endif; ?>
 
 <!-- Form for image file upload -->
 <div class="hidden">
-    <?php echo TbHtml::form(array('admin/themes/sa/upload'), 'post', array('id'=>'upload_frontend', 'name'=>'upload_frontend', 'enctype'=>'multipart/form-data')); ?>
-        <?php if(isset($aTemplateConfiguration['sid']) && !empty($aTemplateConfiguration['sid'])): ?>
-            <input type='hidden' name='surveyid' value='<?= $aTemplateConfiguration['sid'] ?>' />
-        <?php endif; ?>
-        <input type='hidden' name='templatename' value='<?php echo $aTemplateConfiguration['template_name']; ?>' />
-        <input type='hidden' name='templateconfig' value='<?php echo $aTemplateConfiguration['id']; ?>' />
-        <input type='hidden' name='action' value='templateuploadimagefile' />
-    </form>
+    <?php echo TbHtml::form(['admin/themes/sa/upload'], 'post', ['id' => 'upload_frontend', 'name' => 'upload_frontend', 'enctype' => 'multipart/form-data']); ?>
+    <?php if (isset($aTemplateConfiguration['sid']) && !empty($aTemplateConfiguration['sid'])) : ?>
+        <input type='hidden' name='surveyid' value='<?= $aTemplateConfiguration['sid'] ?>'/>
+    <?php endif; ?>
+    <input type='hidden' name='templatename' value='<?php echo $aTemplateConfiguration['template_name']; ?>'/>
+    <input type='hidden' name='templateconfig' value='<?php echo $aTemplateConfiguration['id']; ?>'/>
+    <input type='hidden' name='action' value='templateuploadimagefile'/>
+    <?php echo TbHtml::endForm() ?>
 </div>
 
 <?php
-Yii::app()->getClientScript()->registerScript("themeoptions-scripts", '
+Yii::app()->getClientScript()->registerScript(
+    "themeoptions-scripts",
+    '
 
         var bindUpload = function(options){
             var $activeForm = $(options.form);
@@ -367,5 +369,7 @@
             
 
         });
-    ', LSYii_ClientScript::POS_END);
+    ',
+    LSYii_ClientScript::POS_END
+);
 ?>
diff --git a/application/views/userGroup/editUserGroup_view.php b/application/views/userGroup/editUserGroup_view.php
index a896325a7e4..b59f06dfc38 100644
--- a/application/views/userGroup/editUserGroup_view.php
+++ b/application/views/userGroup/editUserGroup_view.php
@@ -1,30 +1,28 @@
 <?php
-
-/** @var $model  UserGroup    the UserGroup model */
-/** @var $ugid integer*/
-
+/** @var UserGroup $model the UserGroup model */
+/** @var integer $ugid */
 ?>
 
 <div class="col-lg-12 list-surveys">
 
     <div class="row">
-        <?php echo CHtml::form(array("userGroup/edit/ugid/{$ugid}"), 'post', array('class'=>'col-md-6 col-md-offset-3', 'id'=>'usergroupform', 'name'=>'usergroupform')); ?>
+        <?php echo CHtml::form(array("userGroup/edit/ugid/{$ugid}"), 'post', array('class' => 'col-md-6 col-md-offset-3', 'id' => 'usergroupform', 'name' => 'usergroupform')); ?>
             
             <div class="form-group">
                 <label for='name'><?php eT("Name:"); ?></label>
-                <input type='text' size='50' maxlength='20' id='name' name='name' value="<?php echo htmlspecialchars($model['name'],ENT_QUOTES, 'UTF-8'); ?>" class="form-control" />
+                <input type='text' size='50' maxlength='20' id='name' name='name' value="<?php echo htmlspecialchars($model['name'], ENT_QUOTES, 'UTF-8'); ?>" class="form-control" />
             </div>
 
             <div class="form-group">
                 <label for='description'><?php eT("Description:"); ?></label>
-                <textarea cols='50' rows='4' id='description' name='description' class="form-control"><?php echo htmlspecialchars($model['description'],ENT_QUOTES, 'UTF-8'); ?></textarea>
+                <textarea cols='50' rows='4' id='description' name='description' class="form-control"><?php echo htmlspecialchars($model['description'], ENT_QUOTES, 'UTF-8'); ?></textarea>
             </div>
 
             <input type='submit' value='<?php eT("Update user group"); ?>' class="hidden" />
             <input type='hidden' name='action' value='editusergroupindb' />
             <input type='hidden' name='owner_id' value='<?php echo Yii::app()->session['loginID']; ?>' />
             <input type='hidden' name='ugid' value='<?php echo $ugid; ?>' />
-        </form>
+        <?php echo CHtml::endForm() ?>
     </div>
 </div>
 
diff --git a/application/views/userGroup/mailUserGroup_view.php b/application/views/userGroup/mailUserGroup_view.php
index 70934de1699..73408ee7311 100644
--- a/application/views/userGroup/mailUserGroup_view.php
+++ b/application/views/userGroup/mailUserGroup_view.php
@@ -1,19 +1,19 @@
 <?php
-
-/**  @var  $ugid integer */
-
+/**  @var  integer $ugid */
 ?>
 
 <div class="col-lg-12 list-surveys">
 
     <div class="row">
-        <?php echo CHtml::form(array("userGroup/MailToAllUsersInGroup/ugid/{$ugid}"), 'post',
-            array('class' => 'col-md-6 col-md-offset-3', 'id' => 'mailusergroup', 'name' => 'mailusergroup')); ?>
+        <?php echo CHtml::form(
+            ["userGroup/MailToAllUsersInGroup/ugid/{$ugid}"],
+            'post',
+            ['class' => 'col-md-6 col-md-offset-3', 'id' => 'mailusergroup', 'name' => 'mailusergroup']
+        ); ?>
         <div class="form-group">
             <label for='copymail'>
                 <?php eT("Send me a copy:"); ?>
-                <input id='copymail' name='copymail' type='checkbox' class='checkboxbtn' value='1'
-                       class="form-control"/>
+                <input id='copymail' name='copymail' type='checkbox' class='checkboxbtn' value='1'/>
             </label>
         </div>
         <div class="form-group">
@@ -31,6 +31,6 @@ class="form-control"/>
 
         <input type='hidden' name='action' value='mailsendusergroup'/>
         <input type='hidden' name='ugid' value='<?php echo $ugid; ?>'/>
-        </form>
+        <?php echo CHtml::endForm() ?>
     </div>
 </div>
diff --git a/application/views/userGroup/usergroupbar_view.php b/application/views/userGroup/usergroupbar_view.php
index c508d5dae32..c3decaaa19a 100644
--- a/application/views/userGroup/usergroupbar_view.php
+++ b/application/views/userGroup/usergroupbar_view.php
@@ -9,7 +9,7 @@
         <div class="col-lg-6 col-sm-8">
 
             <!-- Add -->
-            <?php if (Permission::model()->hasGlobalPermission('usergroups','create') && isset($usergroupbar['returnbutton']['url'])):?>
+            <?php if (Permission::model()->hasGlobalPermission('usergroups', 'create') && isset($usergroupbar['returnbutton']['url'])) :?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl("userGroup/addGroup"); ?>" role="button">
                     <span class="icon-add text-success"></span>
                     <?php eT("Add user group"); ?>
@@ -17,24 +17,24 @@
             <?php endif; ?>
 
             <!-- Mail to all Members -->
-            <?php if(isset($usergroupbar['edit'])): ?>
-                <a class="btn btn-default" href="<?php echo $this->createUrl("userGroup/mailToAllUsersInGroup/ugid/".$userGroup->ugid); ?>" role="button">
+            <?php if (isset($usergroupbar['edit'])) : ?>
+                <a class="btn btn-default" href="<?php echo $this->createUrl("userGroup/mailToAllUsersInGroup/ugid/" . $userGroup->ugid); ?>" role="button">
                     <span class="icon-invite text-success"></span>
                     <?php eT("Mail to all Members"); ?>
                 </a>
-             <?php endif;?>
+            <?php endif;?>
 
             <!-- Edit current user group -->
-            <?php if(isset($usergroupbar['edit']) &&  (Yii::app()->session['loginID'] == $userGroup->owner_id || Permission::model()->hasGlobalPermission('superadmin','read')) ):?>
-                <a class="btn btn-default" href="<?php echo $this->createUrl("userGroup/edit/ugid/".$userGroup->ugid); ?>" role="button">
+            <?php if (isset($usergroupbar['edit']) &&  (Yii::app()->session['loginID'] == $userGroup->owner_id || Permission::model()->hasGlobalPermission('superadmin', 'read'))) :?>
+                <a class="btn btn-default" href="<?php echo $this->createUrl("userGroup/edit/ugid/" . $userGroup->ugid); ?>" role="button">
                     <span class="fa fa-pencil text-success"></span>
                     <?php eT("Edit current user group"); ?>
                 </a>
             <?php endif;?>
 
             <!-- Delete current user group -->
-            <?php if(isset($usergroupbar['edit']) &&  (Yii::app()->session['loginID'] == $userGroup->owner_id || Permission::model()->hasGlobalPermission('superadmin','read')) ):?>
-                <a class="btn btn-default" href='#' onclick='if (confirm("<?php eT("Are you sure you want to delete this entry?","js"); ?>")) { <?php echo convertGETtoPOST($this->createUrl('userGroup/deleteGroup?ugid='.$userGroup->ugid)); ?>}'>
+            <?php if (isset($usergroupbar['edit']) &&  (Yii::app()->session['loginID'] == $userGroup->owner_id || Permission::model()->hasGlobalPermission('superadmin', 'read'))) :?>
+                <a class="btn btn-default" href='#' onclick='if (confirm("<?php eT("Are you sure you want to delete this entry?", "js"); ?>")) { <?php echo convertGETtoPOST($this->createUrl('userGroup/deleteGroup?ugid=' . $userGroup->ugid)); ?>}'>
                     <span class="fa fa-trash text-success"></span>
                     <?php eT("Delete current user group"); ?>
                 </a>
@@ -45,7 +45,7 @@
         <div class="col-lg-6 col-sm-4 text-right">
 
             <!-- Close -->
-            <?php if(isset($usergroupbar['closebutton']['url'])):?>
+            <?php if (isset($usergroupbar['closebutton']['url'])) :?>
                 <a class="btn btn-danger" href="<?php echo $usergroupbar['closebutton']['url']; ?>" role="button">
                     <span class="fa fa-close" ></span>
                     <?php eT("Close");?>
@@ -53,7 +53,7 @@
             <?php endif;?>
 
             <!-- Back -->
-            <?php if(isset($usergroupbar['returnbutton']['url'])):?>
+            <?php if (isset($usergroupbar['returnbutton']['url'])) :?>
                 <a class="btn btn-default" style="margin-left:5px;" href="<?php echo $this->createUrl($usergroupbar['returnbutton']['url']); ?>" role="button">
                     <span class="fa fa-backward" ></span>
                     &nbsp;&nbsp;
@@ -62,7 +62,7 @@
             <?php endif;?>
 
             <!-- Reset -->
-            <?php if(isset($usergroupbar['resetbutton']['form'])):?>
+            <?php if (isset($usergroupbar['resetbutton']['form'])) :?>
                 <button class="btn btn-warning" type="reset" role="button" form="<?php echo $usergroupbar['resetbutton']['form'] ?>" id="reset-form-button" value="Reset">
                     <span class="fa fa-refresh"></span>
                     <?php echo $usergroupbar['resetbutton']['text']; ?>
@@ -70,7 +70,7 @@
             <?php endif; ?>
 
             <!-- Save -->
-            <?php if(isset($usergroupbar['savebutton']['form'])):?>
+            <?php if (isset($usergroupbar['savebutton']['form'])) :?>
                 <a class="btn btn-primary" type="submit" href="#" role="button" id="save-form-button" data-form-id="<?php echo $usergroupbar['savebutton']['form']; ?>">
                     <span class="fa fa-floppy-o" ></span>
                     <?php echo $usergroupbar['savebutton']['text'];?>
diff --git a/application/views/userGroup/viewUserGroup_view.php b/application/views/userGroup/viewUserGroup_view.php
index 2a5586d522a..727ff20dde0 100644
--- a/application/views/userGroup/viewUserGroup_view.php
+++ b/application/views/userGroup/viewUserGroup_view.php
@@ -3,69 +3,68 @@
         <div class="col-lg-12 content-right text-center">
             <div class="h4"><?php eT("Group members"); ?></div>
 
-            <?php if(isset($groupfound)):?>
-                <strong><?php eT("Group description: ");?></strong>
-                <?php echo htmlspecialchars($usergroupdescription);?>
+            <?php if (isset($groupfound)) : ?>
+                <strong><?php eT("Group description: "); ?></strong>
+                <?php echo htmlspecialchars($usergroupdescription); ?>
+
+            <?php endif; ?>
 
-            <?php endif;?>
-            
             <br/><br/>
-            
-            <?php if(isset($headercfg)): ?>
-                <?php if($headercfg["type"] == "success"): ?>
 
+            <?php if (isset($headercfg)) : ?>
+                <?php if ($headercfg["type"] === "success") : ?>
                     <div class="alert alert-success alert-dismissible" role="alert">
                         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <?php echo $headercfg["message"];?>
+                        <?php echo $headercfg["message"]; ?>
                     </div>
 
-                <?php else:?>
-
+                <?php else : ?>
                     <div class="alert alert-warning alert-dismissible" role="alert">
                         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <?php echo $headercfg["message"];?>
+                        <?php echo $headercfg["message"]; ?>
                     </div>
 
-                <?php endif;?>
-            <?php endif;?>
+                <?php endif; ?>
+            <?php endif; ?>
 
             <br/><br/>
             <?php if (!empty($userloop)) { ?>
                 <table class='users table hoverAction' style="cursor: pointer;">
-                    <thead><tr>
-                        <th style="text-align: center;"><?php eT("Action");?></th>
-                        <th style="text-align: center;"><?php eT("Username");?></th>
-                        <th style="text-align: center;"><?php eT("Email");?></th>
-                        </tr></thead>
+                    <thead>
+                    <tr>
+                        <th style="text-align: center;"><?php eT("Action"); ?></th>
+                        <th style="text-align: center;"><?php eT("Username"); ?></th>
+                        <th style="text-align: center;"><?php eT("Email"); ?></th>
+                    </tr>
+                    </thead>
                     <tbody>
                     <?php
                     foreach ($userloop as $currentuser) {
                         ?>
-                        <tr class='<?php echo $currentuser["rowclass"];?>'>
+                        <tr class='<?php echo $currentuser["rowclass"]; ?>'>
                             <td align='center'>
-                            <?php
-							if ((isset($currentuser["displayactions"]) && $currentuser["displayactions"] == true || Permission::model()->hasGlobalPermission('superadmin')) && $currentuser["userid"] != '1') { ?>
-                                <?php echo CHtml::form(array("userGroup/DeleteUserFromGroup/ugid/{$ugid}/"), 'post'); ?>
-                                    <button 
-                                        data-toggle="tooltip" 
-                                        data-placement="bottom" 
-                                        title="<?php eT('Delete');?>" 
-                                        type="submit" 
-                                        onclick='return confirm("<?php eT("Are you sure you want to delete this entry?","js");?>")' class="btn btn-default btn-sm">
+                                <?php if ((isset($currentuser["displayactions"]) && $currentuser["displayactions"] == true || Permission::model()->hasGlobalPermission('superadmin')) && $currentuser["userid"] != '1') { ?>
+                                    <?php echo CHtml::form(["userGroup/DeleteUserFromGroup/ugid/{$ugid}/"], 'post'); ?>
+                                    <button
+                                        data-toggle="tooltip"
+                                        data-placement="bottom"
+                                        title="<?php eT('Delete'); ?>"
+                                        type="submit"
+                                        onclick='return confirm("<?php eT("Are you sure you want to delete this entry?", "js"); ?>")' class="btn btn-default btn-sm">
                                         <span class="fa fa-trash text-warning"></span>
                                     </button>
-                                    <input name='uid' type='hidden' value='<?php echo $currentuser["userid"]; ?>' />
-                                </form>
-                                <?php
-                            } else {
+                                    <input name='uid' type='hidden' value='<?php echo $currentuser["userid"]; ?>'/>
+                                    <?php echo CHtml::endForm() ?>
+                                    <?php
+                                } else {
+                                    ?>
+                                    &nbsp;
+                                    <?php
+                                }
                                 ?>
-                                &nbsp;
-                            <?php
-                            }
-                            ?>
                             </td>
-                            <td align='center'><?php echo \CHtml::encode($currentuser["username"]);?></td>
-                            <td align='center'><?php echo \CHtml::encode($currentuser["email"]);?></td>
+                            <td align='center'><?php echo \CHtml::encode($currentuser["username"]); ?></td>
+                            <td align='center'><?php echo \CHtml::encode($currentuser["email"]); ?></td>
                         </tr>
                         <?php
                     }
@@ -75,29 +74,28 @@
             <?php } ?>
 
             <?php
-            if (!empty($useradddialog))
-            {
+            if (!empty($useradddialog)) {
                 ?>
-                    <?php echo CHtml::form(array("userGroup/AddUserToGroup/ugid/{$ugid}"), 'post'); ?>
-                        <table class='users'>
-                            <tbody>
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td align='center'>
-                                        <div class="row">
-                                            <div class="col-lg-8">
-                                                <?php echo CHtml::dropDownList('uid','-1',$addableUsers,array('class'=>"form-control col-lg-4")); ?>
-                                            </div>
-                                            <div class="col-lg-4">
-                                                <input type='submit' value='<?php eT("Add user"); ?>' class="btn btn-default"/>
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </form>
+                <?php echo CHtml::form(["userGroup/AddUserToGroup/ugid/{$ugid}"], 'post'); ?>
+                <table class='users'>
+                    <tbody>
+                    <tr>
+                        <td>&nbsp;</td>
+                        <td>&nbsp;</td>
+                        <td align='center'>
+                            <div class="row">
+                                <div class="col-lg-8">
+                                    <?php echo CHtml::dropDownList('uid', '-1', $addableUsers, ['class' => "form-control col-lg-4"]); ?>
+                                </div>
+                                <div class="col-lg-4">
+                                    <input type='submit' value='<?php eT("Add user"); ?>' class="btn btn-default"/>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+                <?php echo CHtml::endForm() ?>
                 <?php
             }
             ?>
diff --git a/application/views/userManagement/partial/_menubar.php b/application/views/userManagement/partial/_menubar.php
index 9daa3cd4613..9a0d24d9a3c 100644
--- a/application/views/userManagement/partial/_menubar.php
+++ b/application/views/userManagement/partial/_menubar.php
@@ -1,63 +1,63 @@
 <div class='menubar surveybar' id="usermanagementbar">
     <div class='row'>
         <div class="col-md-9">
-            <?php if(!isset($inImportView)) { ?>
-                <?php if(Permission::model()->hasGlobalPermission('users', 'create')) {
+            <?php if (!isset($inImportView)) { ?>
+                <?php if (Permission::model()->hasGlobalPermission('users', 'create')) {
                     ?>
                     <!-- Add User -->
-                    <button  data-href="<?=$this->createUrl("userManagement/addEditUser")?>" data-toggle="modal" title="<?php eT('Add a new survey administrator'); ?>"
-                             class="btn btn-default UserManagement--action--openmodal">
+                    <button data-href="<?= $this->createUrl("userManagement/addEditUser") ?>" data-toggle="modal" title="<?php eT('Add a new survey administrator'); ?>"
+                            class="btn btn-default UserManagement--action--openmodal">
                         <i class="fa fa-plus-circle text-success"></i> <?php eT("Add user"); ?>
                     </button>
 
                     <!-- Add Dummy User -->
-                    <button  data-href="<?=$this->createUrl("userManagement/addDummyUser")?>" data-toggle="modal" title="<?php eT('Add a new survey administrator with random values'); ?>"
-                             class="btn btn-default UserManagement--action--openmodal">
-                        <i class="fa fa-plus-square text-success"></i> <?=gT('Add dummy user')?>
+                    <button data-href="<?= $this->createUrl("userManagement/addDummyUser") ?>" data-toggle="modal" title="<?php eT('Add a new survey administrator with random values'); ?>"
+                            class="btn btn-default UserManagement--action--openmodal">
+                        <i class="fa fa-plus-square text-success"></i> <?= gT('Add dummy user') ?>
                     </button>
 
                     <!-- Import CSV -->
-                    <button  data-href="<?=$this->createUrl("userManagement/renderUserImport",["importFormat"=>"csv"])?>" data-toggle="modal" title="<?php eT('Import survey administrators from CSV'); ?>" class="btn btn-default UserManagement--action--openmodal">
+                    <button data-href="<?= $this->createUrl("userManagement/renderUserImport", ["importFormat" => "csv"]) ?>" data-toggle="modal" title="<?php eT('Import survey administrators from CSV'); ?>" class="btn btn-default UserManagement--action--openmodal">
                         <span class="icon-import text-success"></span> <?php eT("Import (CSV)"); ?>
                     </button>
 
                     <!-- Import JSON -->
-                    <button  data-href="<?=App()->createUrl("userManagement/renderUserImport",["importFormat"=>"json"])?>" data-toggle="modal" title="<?php eT('Import survey administrators from Json'); ?>" class="btn btn-default UserManagement--action--openmodal">
+                    <button data-href="<?= App()->createUrl("userManagement/renderUserImport", ["importFormat" => "json"]) ?>" data-toggle="modal" title="<?php eT('Import survey administrators from Json'); ?>" class="btn btn-default UserManagement--action--openmodal">
                         <span class="icon-import text-success"></span> <?php eT("Import (JSON)"); ?>
                     </button>
 
-                <?php
+                    <?php
                 } ?>
-                <?php if(Permission::model()->hasGlobalPermission('users', 'export')) { ?>
-                    <div div class="btn-group">
+                <?php if (Permission::model()->hasGlobalPermission('users', 'export')) { ?>
+                    <div class="btn-group">
                         <!-- Export -->
                         <button class="btn btn-default" type="button" data-toggle="dropdown">
-                            <i class="fa fa-upload text-success"></i> <?php eT("Export");?>
+                            <i class="fa fa-upload text-success"></i> <?php eT("Export"); ?>
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu">
                             <li>
-                                <?= CHtml::link(gT("CSV"),App()->createUrl("userManagement/exportUser",["outputFormat"=>"csv"]));?>
+                                <?= CHtml::link(gT("CSV"), App()->createUrl("userManagement/exportUser", ["outputFormat" => "csv"])); ?>
                             </li>
                             <li>
-                                <?= CHtml::link(gT("JSON"),App()->createUrl("userManagement/exportUser",["outputFormat"=>"json"]));?>
+                                <?= CHtml::link(gT("JSON"), App()->createUrl("userManagement/exportUser", ["outputFormat" => "json"])); ?>
                             </li>
                         </ul>
                     </div>
                 <?php } ?>
             <?php } else {
                 ?>
-            <a class="btn btn-default" href="<?php echo $this->createUrl('userManagement/index'); ?>" role="button">
+                <a class="btn btn-default" href="<?php echo $this->createUrl('userManagement/index'); ?>" role="button">
                     <span class="fa fa-backward"></span>
                     &nbsp;
                     <?php eT('Return to main view'); ?>
                 </a>
-            <?php
+                <?php
             } ?>
         </div>
 
         <div class="col-md-3 text-right">
-            <?php if(!isset($inImportView)): ?>
+            <?php if (!isset($inImportView)): ?>
                 <a class="btn btn-default" href="<?php echo $this->createUrl('admin/index'); ?>" role="button">
                     <span class="fa fa-backward"></span>
                     &nbsp;