Fix issue with CSRF tokens being added to database

Jamie Snape · Jamie Snape · commit f55f80fb6706 · 2014-12-11T23:27:38.000-05:00
diff --git a/modules/api/controllers/AdminController.php b/modules/api/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/archive/controllers/AdminController.php b/modules/archive/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/cleanup/controllers/AdminController.php b/modules/cleanup/controllers/AdminController.php
@@ -49,7 +49,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/demo/controllers/AdminController.php b/modules/demo/controllers/AdminController.php
@@ -51,7 +51,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/dicomextractor/controllers/AdminController.php b/modules/dicomextractor/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/dicomserver/controllers/AdminController.php b/modules/dicomserver/controllers/AdminController.php
@@ -42,7 +42,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/googleauth/controllers/AdminController.php b/modules/googleauth/controllers/AdminController.php
@@ -39,7 +39,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/landingpage/controllers/AdminController.php b/modules/landingpage/controllers/AdminController.php
@@ -61,7 +61,9 @@ public function indexAction()
                 unset($values[LANDINGPAGE_TEXT_KEY]);
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/ldap/controllers/AdminController.php b/modules/ldap/controllers/AdminController.php
@@ -39,7 +39,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/mail/controllers/AdminController.php b/modules/mail/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/metadataextractor/controllers/AdminController.php b/modules/metadataextractor/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/oai/controllers/AdminController.php b/modules/oai/controllers/AdminController.php
@@ -39,7 +39,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/pvw/controllers/AdminController.php b/modules/pvw/controllers/AdminController.php
@@ -49,7 +49,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/remoteprocessing/controllers/AdminController.php b/modules/remoteprocessing/controllers/AdminController.php
@@ -39,7 +39,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/solr/controllers/AdminController.php b/modules/solr/controllers/AdminController.php
@@ -39,7 +39,9 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    $this->Setting->setConfig($key, $value, $this->moduleName);
+                    if ($key !== 'csrf' && !is_null($value)) {
+                        $this->Setting->setConfig($key, $value, $this->moduleName);
+                    }
                 }
             }
 
diff --git a/modules/statistics/controllers/AdminController.php b/modules/statistics/controllers/AdminController.php
@@ -42,7 +42,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/thumbnailcreator/controllers/AdminController.php b/modules/thumbnailcreator/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/tracker/controllers/AdminController.php b/modules/tracker/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }
diff --git a/modules/visualize/controllers/AdminController.php b/modules/visualize/controllers/AdminController.php
@@ -39,7 +39,7 @@ public function indexAction()
                 $values = $form->getValues();
 
                 foreach ($values as $key => $value) {
-                    if ($value !== null) {
+                    if ($key !== 'csrf' && !is_null($value)) {
                         $this->Setting->setConfig($key, $value, $this->moduleName);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function indexAction()`
`39`	`39`	`$values = $form->getValues();`
`40`	`40`
`41`	`41`	`foreach ($values as $key => $value) {`
`42`		`- if ($value !== null) {`
	`42`	`+ if ($key !== 'csrf' && !is_null($value)) {`
`43`	`43`	`$this->Setting->setConfig($key, $value, $this->moduleName);`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function indexAction()`
`49`	`49`	`$values = $form->getValues();`
`50`	`50`
`51`	`51`	`foreach ($values as $key => $value) {`
`52`		`- if ($value !== null) {`
	`52`	`+ if ($key !== 'csrf' && !is_null($value)) {`
`53`	`53`	`$this->Setting->setConfig($key, $value, $this->moduleName);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ public function indexAction()`
`51`	`51`	`$values = $form->getValues();`
`52`	`52`
`53`	`53`	`foreach ($values as $key => $value) {`
`54`		`- $this->Setting->setConfig($key, $value, $this->moduleName);`
	`54`	`+ if ($key !== 'csrf' && !is_null($value)) {`
	`55`	`+ $this->Setting->setConfig($key, $value, $this->moduleName);`
	`56`	`+ }`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public function indexAction()`
`42`	`42`	`$values = $form->getValues();`
`43`	`43`
`44`	`44`	`foreach ($values as $key => $value) {`
`45`		`- $this->Setting->setConfig($key, $value, $this->moduleName);`
	`45`	`+ if ($key !== 'csrf' && !is_null($value)) {`
	`46`	`+ $this->Setting->setConfig($key, $value, $this->moduleName);`
	`47`	`+ }`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ public function indexAction()`
`39`	`39`	`$values = $form->getValues();`
`40`	`40`
`41`	`41`	`foreach ($values as $key => $value) {`
`42`		`- $this->Setting->setConfig($key, $value, $this->moduleName);`
	`42`	`+ if ($key !== 'csrf' && !is_null($value)) {`
	`43`	`+ $this->Setting->setConfig($key, $value, $this->moduleName);`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ public function indexAction()`
`61`	`61`	`unset($values[LANDINGPAGE_TEXT_KEY]);`
`62`	`62`
`63`	`63`	`foreach ($values as $key => $value) {`
`64`		`- $this->Setting->setConfig($key, $value, $this->moduleName);`
	`64`	`+ if ($key !== 'csrf' && !is_null($value)) {`
	`65`	`+ $this->Setting->setConfig($key, $value, $this->moduleName);`
	`66`	`+ }`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`