From 14fd892181f9d0f5bb1fc435bc1fd299b420e4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 10 Feb 2015 19:39:52 +0100
Subject: [PATCH 1/7] Fix: Trailing semicolons (consistency)

---
 module/User/view/zfc-user/user/index.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index b7b6efbb..c969797c 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -11,7 +11,7 @@
             </div>
         </div>
         <?php foreach ($this->flashMessenger()->getMessages() as $message): ?>
-            <h3 class="zf-green"><?php echo $message ?></h3>
+            <h3 class="zf-green"><?php echo $message; ?></h3>
         <?php endforeach; ?>
 
         <ul class="nav nav-tabs">
@@ -42,17 +42,17 @@
                 ?>
             </div>
             <div class="tab-pane" id="repositories">
-                <div class="well" style="text-align:center">Synchronizing with GitHub <img src="<?php echo $this->basePath('/img/ajax-loader.gif') ?>" alt="loading" /></div>
+                <div class="well" style="text-align:center">Synchronizing with GitHub <img src="<?php echo $this->basePath('/img/ajax-loader.gif'); ?>" alt="loading" /></div>
             </div>
 
             <div class="tab-pane" id="organizations">
-                <?php echo $this->userOrganizations() ?>
+                <?php echo $this->userOrganizations(); ?>
             </div>
         </div>
     </div>
     <div class="col-md-4">
         <div class="sidebar" style="text-align: center">
-            <h3 style="text-align:center">Hello, <?php echo $this->zfcUserDisplayName() ?>!</h3>
+            <h3 style="text-align:center">Hello, <?php echo $this->zfcUserDisplayName(); ?>!</h3>
             <?php /* @var User\Entity\User $identity */ ?>
             <?php $identity = $this->zfcUserIdentity(); ?>
             <img class="thumbnail" src="<?php echo $identity->getPhotoUrl(); ?>" alt="<?php echo $this->zfcUserDisplayName() ?>"/>

From 704a6fe1fd962c027bd6ae113bdb0282ce97e8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 10 Feb 2015 19:42:59 +0100
Subject: [PATCH 2/7] Fix: Use alternative syntax in view scripts

---
 .../User/view/scn-social-auth/user/login.phtml   | 16 +++++++---------
 module/User/view/zfc-user/user/index.phtml       | 16 ++++++----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/module/User/view/scn-social-auth/user/login.phtml b/module/User/view/scn-social-auth/user/login.phtml
index ffff9248..2485baf1 100644
--- a/module/User/view/scn-social-auth/user/login.phtml
+++ b/module/User/view/scn-social-auth/user/login.phtml
@@ -3,13 +3,11 @@
     <p>
         There is no sign-up form anymore! Just log in with your GitHub account. All your information will be provided by GitHub.
     </p>
-    <?php
-    $socialSignIn = true;
-    foreach ($this->options->getEnabledProviders() as $provider) {
-        if ($socialSignIn) {
-            $socialSignIn = false;
-        }
-        echo '<p>' . $this->socialSignInButton($provider) . '</p>';
-    }
-    ?>
+    <?php $socialSignIn = true; ?>
+    <?php foreach ($this->options->getEnabledProviders() as $provider): ?>
+        <?php if ($socialSignIn): ?>
+            <?php $socialSignIn = false; ?>
+        <?php endif; ?>
+        <p><?php echo $this->socialSignInButton($provider); ?></p>
+    <?php endforeach; ?>
 </div>
diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index c969797c..07e0dc08 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -22,15 +22,11 @@
         <br />
         <div class="tab-content">
             <div class="tab-pane active" id="modules">
-                <?php
-                if (empty($modules)) {
-                    ?>
-                    <div class="alert alert-block">No modules have been submitted yet</div>
-                    <?php
-                }
-                /* @var ZfModule\Entity\Module[] $modules */
-                foreach ($modules as $module) {
-                    echo $this->moduleView([
+                <?php if (empty($modules)): ?>
+                <div class="alert alert-block">No modules have been submitted yet</div>
+                <?php endif; ?>
+                <?php foreach ($modules as $module): ?>
+                <?php echo $this->moduleView([
                         'owner' => $module->getOwner(),
                         'name' => $module->getName(),
                         'created_at' => $module->getCreatedAt(),
@@ -38,8 +34,8 @@
                         'photo_url' => $module->getPhotoUrl(),
                         'description' => $module->getDescription(),
                     ], 'remove');
-                }
                 ?>
+                <?php endforeach; ?>
             </div>
             <div class="tab-pane" id="repositories">
                 <div class="well" style="text-align:center">Synchronizing with GitHub <img src="<?php echo $this->basePath('/img/ajax-loader.gif'); ?>" alt="loading" /></div>

From 455bedcd8897a29f3ea6d08dc1d3923ce04f8d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 10 Feb 2015 20:20:23 +0100
Subject: [PATCH 3/7] Fix: Remove assignment and condition with effect, but no
 use

---
 module/User/view/scn-social-auth/user/login.phtml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/module/User/view/scn-social-auth/user/login.phtml b/module/User/view/scn-social-auth/user/login.phtml
index 2485baf1..7e088f7f 100644
--- a/module/User/view/scn-social-auth/user/login.phtml
+++ b/module/User/view/scn-social-auth/user/login.phtml
@@ -3,11 +3,7 @@
     <p>
         There is no sign-up form anymore! Just log in with your GitHub account. All your information will be provided by GitHub.
     </p>
-    <?php $socialSignIn = true; ?>
     <?php foreach ($this->options->getEnabledProviders() as $provider): ?>
-        <?php if ($socialSignIn): ?>
-            <?php $socialSignIn = false; ?>
-        <?php endif; ?>
         <p><?php echo $this->socialSignInButton($provider); ?></p>
     <?php endforeach; ?>
 </div>

From e8acdfe3407373625fbfd2d612941aa60940f2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 10 Feb 2015 20:22:35 +0100
Subject: [PATCH 4/7] Enhancement: Do not bother iterating when there's nothing

---
 module/User/view/zfc-user/user/index.phtml | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index 07e0dc08..82d54d8e 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -22,20 +22,21 @@
         <br />
         <div class="tab-content">
             <div class="tab-pane active" id="modules">
-                <?php if (empty($modules)): ?>
+            <?php if (0 === count($modules)): ?>
                 <div class="alert alert-block">No modules have been submitted yet</div>
-                <?php endif; ?>
+            <?php else: ?>
                 <?php foreach ($modules as $module): ?>
-                <?php echo $this->moduleView([
-                        'owner' => $module->getOwner(),
-                        'name' => $module->getName(),
-                        'created_at' => $module->getCreatedAt(),
-                        'url' => $module->getUrl(),
-                        'photo_url' => $module->getPhotoUrl(),
-                        'description' => $module->getDescription(),
-                    ], 'remove');
-                ?>
+                    <?php echo $this->moduleView([
+                            'owner' => $module->getOwner(),
+                            'name' => $module->getName(),
+                            'created_at' => $module->getCreatedAt(),
+                            'url' => $module->getUrl(),
+                            'photo_url' => $module->getPhotoUrl(),
+                            'description' => $module->getDescription(),
+                        ], 'remove');
+                    ?>
                 <?php endforeach; ?>
+            <?php endif; ?>
             </div>
             <div class="tab-pane" id="repositories">
                 <div class="well" style="text-align:center">Synchronizing with GitHub <img src="<?php echo $this->basePath('/img/ajax-loader.gif'); ?>" alt="loading" /></div>

From facbce409efbf3531e5b3dc6c344918043baae1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 10 Feb 2015 20:41:20 +0100
Subject: [PATCH 5/7] Enhancement: More alternative syntax

---
 module/User/view/zfc-user/user/index.phtml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index 82d54d8e..c547f95d 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -57,12 +57,4 @@
         </div>
     </div>
 </div>
-
-<?php
-$url = $this->url('zf-module');
-$this->inlineScript()->appendScript(<<<EOT
-
-$("#repositories").load("$url");
-
-EOT
-);
+<?php $this->inlineScript()->appendScript('$("#repositories").load("' . $this->url('zf-module') . '");'); ?>

From fd60c8011021c66e98f45faa26c16655010719e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 17 Feb 2015 14:58:33 +0100
Subject: [PATCH 6/7] Fix: Escape url in JS context

---
 module/User/view/zfc-user/user/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index c547f95d..de6f70ef 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -57,4 +57,4 @@
         </div>
     </div>
 </div>
-<?php $this->inlineScript()->appendScript('$("#repositories").load("' . $this->url('zf-module') . '");'); ?>
+<?php $this->inlineScript()->appendScript('$("#repositories").load("' . $this->escapeJs($this->url('zf-module')) . '");'); ?>

From f515390d6db3fe1e7afa79dc5d06d1a1e40f6d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 17 Feb 2015 16:01:49 +0100
Subject: [PATCH 7/7] Fix: Escape message

---
 module/User/view/zfc-user/user/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/User/view/zfc-user/user/index.phtml b/module/User/view/zfc-user/user/index.phtml
index de6f70ef..7c26d125 100644
--- a/module/User/view/zfc-user/user/index.phtml
+++ b/module/User/view/zfc-user/user/index.phtml
@@ -11,7 +11,7 @@
             </div>
         </div>
         <?php foreach ($this->flashMessenger()->getMessages() as $message): ?>
-            <h3 class="zf-green"><?php echo $message; ?></h3>
+            <h3 class="zf-green"><?php echo $this->escapeHtml($message); ?></h3>
         <?php endforeach; ?>
 
         <ul class="nav nav-tabs">