Passed
Push — master ( 000527...89a5ea )
by William
03:18
created
application/themes/ccintranet/finance.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,11 +3,11 @@
 block discarded – undo
3 3
 <?php Loader::element('header'); ?>
4 4
     <div class="container-fluid">
5 5
         <div class="row">
6
-            <div class="toolbar"><?php $a= new GlobalArea('Finance Toolbar'); $a->display($c); ?></div>
6
+            <div class="toolbar"><?php $a = new GlobalArea('Finance Toolbar'); $a->display($c); ?></div>
7 7
             <div class="col-lg-12">
8 8
                 <h1 class="page-header"><?php $page = Page::getCurrentPage(); echo $page->getCollectionName(); ?></h1>
9 9
                 <br>
10
-                <?php $a= new Area('Page Content'); $a->display($c); ?>
10
+                <?php $a = new Area('Page Content'); $a->display($c); ?>
11 11
             </div> <!-- END col-lg-12 -->
12 12
         </div> <!-- END row -->
13 13
     </div> <!-- END container-fluid -->
Please login to merge, or discard this patch.
application/single_pages/account/edit_profile.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 	<legend><?php echo t('Basic Information')?></legend>
20 20
 	<div class="form-group">
21 21
 		<?php echo $form->label('uEmail', t('Email'))?>
22
-		<?php echo $form->text('uEmail',$profile->getUserEmail())?>
22
+		<?php echo $form->text('uEmail', $profile->getUserEmail())?>
23 23
 	</div>
24 24
 	<?php  if (Config::get('concrete.misc.user_timezones')) { ?>
25 25
 		<div class="form-group">
26 26
 			<?php echo  $form->label('uTimezone', t('Time Zone'))?>
27 27
 			<?php echo  $form->select('uTimezone',
28 28
 				Core::make('helper/date')->getTimezones(),
29
-				($profile->getUserTimezone()?$profile->getUserTimezone():date_default_timezone_get())
29
+				($profile->getUserTimezone() ? $profile->getUserTimezone() : date_default_timezone_get())
30 30
 		); ?>
31 31
 		</div>
32 32
 	<?php  } ?>
@@ -37,10 +37,10 @@  discard block
 block discarded – undo
37 37
 		</div>
38 38
 	<?php  } ?>
39 39
 	<?php
40
-	if(is_array($attribs) && count($attribs)) {
40
+	if (is_array($attribs) && count($attribs)) {
41 41
 		$af = Loader::helper('form/attribute');
42 42
 		$af->setAttributeObject($profile);
43
-		foreach($attribs as $ak) {
43
+		foreach ($attribs as $ak) {
44 44
 			print '<div class="ccm-profile-attribute">';
45 45
 			print $af->display($ak, $ak->isAttributeKeyRequiredOnProfile());
46 46
 			print '</div>';
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
     	<legend><?php echo t('Change Password')?></legend>
75 75
         <div class="form-group">
76 76
             <?php echo $form->label('uPasswordNew', t('New Password'))?>
77
-            <?php echo $form->password('uPasswordNew',array('autocomplete' => 'off'))?>
77
+            <?php echo $form->password('uPasswordNew', array('autocomplete' => 'off'))?>
78 78
             <a href="javascript:void(0)" title="<?php echo t("Leave blank to keep current password.")?>"><i class="icon-question-sign"></i></a>
79 79
 		</div>
80 80
 
81 81
         <div class="form-group">
82 82
             <?php echo $form->label('uPasswordNewConfirm', t('Confirm New Password'))?>
83 83
             <div class="controls">
84
-                <?php echo $form->password('uPasswordNewConfirm',array('autocomplete' => 'off'))?>
84
+                <?php echo $form->password('uPasswordNewConfirm', array('autocomplete' => 'off'))?>
85 85
             </div>
86 86
         </div>
87 87
 
Please login to merge, or discard this patch.
application/single_pages/account/view.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
         <p><?php echo t('You are currently logged in as <strong>%s</strong>', $profile->getUserDisplayName())?>.</p>
13 13
 
14 14
 
15
-        <?php foreach($pages as $p) { ?>
15
+        <?php foreach ($pages as $p) { ?>
16 16
             <hr/>
17 17
             <div>
18 18
                 <a href="<?php echo $p->getCollectionLink()?>"><?php echo h(t($p->getCollectionName()))?></a>
Please login to merge, or discard this patch.
application/single_pages/dashboard/system/basics/icons.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
             ?>
12 12
             <div class="form-group">
13 13
                 <div class="col-md-6">
14
-                    <?php echo $concrete_asset_library->file('ccm-favicon-file', 'faviconFID', t('Choose File'), $f);?>
14
+                    <?php echo $concrete_asset_library->file('ccm-favicon-file', 'faviconFID', t('Choose File'), $f); ?>
15 15
                 </div>
16 16
                 <div class="col-md-6">
17 17
                     <button class="pull-right btn btn-default" type="submit" ><?php echo t('Save')?></button>
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
         <legend><?php echo t('iPhone Thumbnail')?></legend>
29 29
         <div class="help-block"><?php echo t('iPhone home screen icons should be 57x57 and be in the .png format.')?></div>
30 30
         <?php
31
-        $iosHomeFID=intval(Config::get('concrete.misc.iphone_home_screen_thumbnail_fid'));
31
+        $iosHomeFID = intval(Config::get('concrete.misc.iphone_home_screen_thumbnail_fid'));
32 32
         $f = File::getByID($iosHomeFID);
33 33
         ?>
34 34
         <div class="form-group">
35 35
             <div class="col-md-6">
36
-                <?php echo $concrete_asset_library->file('ccm-iphone-file', 'iosHomeFID', t('Choose File'), $f);?>
36
+                <?php echo $concrete_asset_library->file('ccm-iphone-file', 'iosHomeFID', t('Choose File'), $f); ?>
37 37
             </div>
38 38
             <div class="col-md-6">
39 39
                 <button class="pull-right btn btn-default" type="submit" ><?php echo t('Save')?></button>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         <div class="help-block"><?php echo t('Windows 8 start screen tiles should be 144x144 and be in the .png format.'); ?></div>
96 96
         <div class="form-group">
97 97
             <div class="col-md-6">
98
-                <?php echo $concrete_asset_library->file('ccm-modern-file', 'modernThumbFID', t('Choose File'), $f);?>
98
+                <?php echo $concrete_asset_library->file('ccm-modern-file', 'modernThumbFID', t('Choose File'), $f); ?>
99 99
             </div>
100 100
             <div class="col-md-2">
101 101
                 <button class="pull-right btn btn-default" type="submit" ><?php echo t('Save')?></button>
Please login to merge, or discard this patch.
application/elements/header.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,17 +60,17 @@
 block discarded – undo
60 60
             <?php 
61 61
                 $u = new User();
62 62
                 global $u;
63
-                $u = new User(); if($u->inGroup(Group::getByName('Staff'))){ 
63
+                $u = new User(); if ($u->inGroup(Group::getByName('Staff'))) { 
64 64
 
65
-                    if(!isset($_COOKIE['CI-CONCRETE5'])) {
65
+                    if (!isset($_COOKIE['CI-CONCRETE5'])) {
66 66
 
67 67
                         define('IV_SIZE', mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
68 68
 
69
-                        function encrypt ($key, $username) {
69
+                        function encrypt($key, $username) {
70 70
                           $iv = mcrypt_create_iv(IV_SIZE, MCRYPT_DEV_URANDOM);
71 71
                           $crypt = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $username, MCRYPT_MODE_CBC, $iv);
72
-                          $combo = $iv . $crypt;
73
-                          $output = base64_encode($iv . $crypt);
72
+                          $combo = $iv.$crypt;
73
+                          $output = base64_encode($iv.$crypt);
74 74
                           return $output;
75 75
                         }
76 76
 
Please login to merge, or discard this patch.
application/elements/navigation.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,13 +124,13 @@
 block discarded – undo
124 124
     <?php
125 125
         $url = $_SERVER['REQUEST_URI'];
126 126
 
127
-        if (strpos($url,'computing-support') !== false) {
127
+        if (strpos($url, 'computing-support') !== false) {
128 128
             $dept_name = 'Computing Support';
129 129
             $dept_url = 'computing-support';
130
-        } elseif (strpos($url,'marketing') !== false) {
130
+        } elseif (strpos($url, 'marketing') !== false) {
131 131
             $dept_name = 'Marketing';
132 132
             $dept_url = 'marketing';
133
-        } elseif (strpos($url,'human-resources') !== false) {
133
+        } elseif (strpos($url, 'human-resources') !== false) {
134 134
             $dept_name = 'Human Resources';
135 135
             $dept_url = 'human-resources';
136 136
         } else {
Please login to merge, or discard this patch.
application/elements/page_types/composer/form/output/form.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@  discard block
 block discarded – undo
19 19
 <div class="alert alert-info" style="display: none" id="ccm-page-type-composer-form-save-status"></div>
20 20
 
21 21
     <style>.form-group.ccm-composer-url-slug {display:none}</style>
22
-<?php $u = new User(); if($u->inGroup(Group::getByName('Administrators'))){ ?>
22
+<?php $u = new User(); if ($u->inGroup(Group::getByName('Administrators'))) { ?>
23 23
     <style>.form-group.ccm-composer-url-slug {display:block !important}</style>
24 24
 <?php } ?>
25 25
 
26 26
     <input type="hidden" name="ptID" value="<?php echo $pagetype->getPageTypeID()?>" />
27 27
 
28
-<?php foreach($fieldsets as $cfl) { ?>
28
+<?php foreach ($fieldsets as $cfl) { ?>
29 29
 	<fieldset>
30 30
 		<?php if ($cfl->getPageTypeComposerFormLayoutSetDisplayName()) { ?>
31 31
 			<legend><?php echo $cfl->getPageTypeComposerFormLayoutSetDisplayName()?></legend>
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		<?php } ?>
36 36
 		<?php $controls = PageTypeComposerFormLayoutSetControl::getList($cfl);
37 37
 
38
-		foreach($controls as $con) {
38
+		foreach ($controls as $con) {
39 39
 			if (is_object($page)) { // we are loading content in
40 40
 				$con->setPageObject($page);
41 41
 			}
Please login to merge, or discard this patch.
application/elements/logged-in-user.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 global $u;
24 24
 
25 25
 if ($u->isLoggedIn()) {
26
-    echo '<p class="welcome-username">Welcome ' . $u->getUserName() . '</p>';
26
+    echo '<p class="welcome-username">Welcome '.$u->getUserName().'</p>';
27 27
 } else {
28 28
     echo '<p class="welcome-username"><a href="/login">Click here to Login</a></p>';
29 29
 
Please login to merge, or discard this patch.
application/blocks/file/view.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 $fp = new Permissions($f);
4 4
 if ($f && $fp->canViewFile()) {
5 5
 	$c = Page::getCurrentPage();
6
-	if($c instanceof Page) {
6
+	if ($c instanceof Page) {
7 7
 		$cID = $c->getCollectionID();
8 8
 	}
9 9
 
Please login to merge, or discard this patch.