Completed
Pull Request — develop (#99)
by Patrick
04:46
created
class.FlipsideCAPTCHA.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -108,6 +108,9 @@  discard block
 block discarded – undo
108 108
         $this->wwwUrl = $settings->getGlobalSetting('www_url', 'https://www.burningflipside.com');
109 109
     }
110 110
 
111
+    /**
112
+     * @param string $fieldName
113
+     */
111 114
     protected function getCaptchField($fieldName)
112 115
     {
113 116
         $dataset = DataSetFactory::getDataSetByName('profiles');
@@ -130,6 +133,9 @@  discard block
 block discarded – undo
130 133
         return $this->getCaptchField('hint');
131 134
     }
132 135
 
136
+    /**
137
+     * @return string
138
+     */
133 139
     private function get_answer()
134 140
     {
135 141
         return $this->getCaptchField('answer');
Please login to merge, or discard this patch.
Http/class.WebPage.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 
42 42
         $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about');
43 43
         $this->content['header']['right']['About'] = array(
44
-          'url' => $this->aboutUrl,
45
-          'menu' => $this->settings->getGlobalSetting('about_menu', array(
44
+            'url' => $this->aboutUrl,
45
+            'menu' => $this->settings->getGlobalSetting('about_menu', array(
46 46
             'Burning Flipside' => $this->wwwUrl.'/about/event',
47 47
             'AAR, LLC' => $this->wwwUrl.'/organization/aar',
48 48
             'Privacy Policy' => $this->wwwUrl.'/about/privacy'
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         $this->content['urls']['loginUrl'] = $this->loginUrl;
59 59
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
60 60
 
61
-	if($this->user === false || $this->user === null)
61
+    if($this->user === false || $this->user === null)
62 62
         {
63 63
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
64 64
             {
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
     {
182 182
         if(!isset($this->content['notifications']))
183 183
         {
184
-          $this->content['notifications'] = array();
184
+            $this->content['notifications'] = array();
185 185
         }
186 186
         array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible));
187 187
     }
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     {
195 195
         if(!isset($this->content['body']))
196 196
         {
197
-          $this->content['body'] = $this->body;
197
+            $this->content['body'] = $this->body;
198 198
         }
199 199
         //Add page JS just before rednering so it is after any added by the page explicitly
200 200
         // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js');
Please login to merge, or discard this patch.