newicon / neon

neon/phoebe/plugins/smarty/function.ddsForm.php

Spacing +7 added lines, -7 removed lines

@@ -148,7 +148,7 @@ 
 
 	// process the parameters
 	if (!isset($params['classType']))
-		throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+		throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params, true));
 	$classType = $params['classType'];
 	$cssClass = isset($params['cssClass']) ? $params['cssClass'] : null;
 	$label = isset($params['label']) ? $params['label'] : null;
@@ -160,12 +160,12 @@ 
 	$assignSaved = !empty($params['assignSaved']) ? $params['assignSaved'] : 'saved';
 	$assignErrors = !empty($params['assignErrors']) ? $params['assignErrors'] : 'errors';
 	$assignSubmitted = !empty($params['assignSubmitted']) ? $params['assignSubmitted'] : 'submitted';
-	$readOnly = isset($params['readOnly']) ? (bool)$params['readOnly'] : false;
-	$printOnly = isset($params['printOnly']) ? (bool)$params['printOnly'] : false;
+	$readOnly = isset($params['readOnly']) ? (bool) $params['readOnly'] : false;
+	$printOnly = isset($params['printOnly']) ? (bool) $params['printOnly'] : false;
 	$uuid = !empty($params['uuid']) ? $params['uuid'] : null;
 	$dataSources = !empty($params['dataSources']) ? $params['dataSources'] : null;
-	$enableAjaxValidation = isset($params['enableAjaxValidation']) ? (bool)$params['enableAjaxValidation'] : true;
-	$enableAjaxSubmission = isset($params['enableAjaxSubmission']) ? (bool)$params['enableAjaxSubmission'] : false;
+	$enableAjaxValidation = isset($params['enableAjaxValidation']) ? (bool) $params['enableAjaxValidation'] : true;
+	$enableAjaxSubmission = isset($params['enableAjaxSubmission']) ? (bool) $params['enableAjaxSubmission'] : false;
 	$ajaxValidationUrl = !empty($params['ajaxValidationUrl']) ? $params['ajaxValidationUrl'] : '/phoebe/database/index/validate-form';
 	$returnUrl = !empty($params['returnUrl']) ? $params['returnUrl'] : null;
 	$formName = !empty($params['name']) ? $params['name'] : null;
@@ -178,7 +178,7 @@ 
 	$id = ($id ? $id : ($uuid ? $uuid : null));
 	if ($id) {
 		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_')
-			$id = 'z' . $id;
+			$id = 'z'.$id;
 	}
 	$changeLogUuids = [];
 
@@ -249,7 +249,7 @@ 
 
 	// assign all of the save results to the template
 	foreach ($saveFormResults as $k=>$v)
-		$template->assign($k,$v);
+		$template->assign($k, $v);
 
 
 	// assign the resulting form

Braces +9 added lines, -6 removed lines

@@ -147,8 +147,9 @@ 
 	$phoebeType = 'daedalus';
 
 	// process the parameters
-	if (!isset($params['classType']))
-		throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	if (!isset($params['classType'])) {
+			throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	}
 	$classType = $params['classType'];
 	$cssClass = isset($params['cssClass']) ? $params['cssClass'] : null;
 	$label = isset($params['label']) ? $params['label'] : null;
@@ -177,8 +178,9 @@ 
 	// prefix invalid (HTML5) ids with a letter
 	$id = ($id ? $id : ($uuid ? $uuid : null));
 	if ($id) {
-		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_')
-			$id = 'z' . $id;
+		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_') {
+					$id = 'z' . $id;
+		}
 	}
 	$changeLogUuids = [];
 
@@ -248,8 +250,9 @@ 
 	}
 
 	// assign all of the save results to the template
-	foreach ($saveFormResults as $k=>$v)
-		$template->assign($k,$v);
+	foreach ($saveFormResults as $k=>$v) {
+			$template->assign($k,$v);
+	}
 
 
 	// assign the resulting form

neon/phoebe/App.php

Braces +60 added lines, -40 removed lines

@@ -252,16 +252,18 @@ 
 		$formDefinition = [];
 		if (!empty($options['uuid'])) {
 			$object = $phoebe->getObject($options['uuid']);
-			if (!$object)
-				throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			if (!$object) {
+							throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			}
 			$class = $object->getIPhoebeClass();
 			$formDefinition = $class->getClassFormDefinition($fields);
 		} else {
 			// otherwise get a clean class
 			if ($classType) {
 				$formDefinition = $this->getFormDefinition($phoebeType, $classType, $fields);
-				if (!count($formDefinition))
-					throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				if (!count($formDefinition)) {
+									throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				}
 			}
 		}
 		$fieldCount = count($formDefinition['fields']);
@@ -269,16 +271,19 @@ 
 
 
 		// temporary code to cover problems with differences between appForms and ddsForms
-		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds']))
-			throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds'])) {
+					throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		}
 
 		// set the form class
-		if (!empty($options['cssClass']))
-			$form->setAttributes(['class'=>$options['cssClass']]);
+		if (!empty($options['cssClass'])) {
+					$form->setAttributes(['class'=>$options['cssClass']]);
+		}
 
 		// set the form id
-		if (!empty($options['id']))
-			$form->setId($options['id']);
+		if (!empty($options['id'])) {
+					$form->setId($options['id']);
+		}
 		$formId = $form->getId();
 		if ($printOnly) {
 			$form->printOnly = true;
@@ -289,17 +294,20 @@ 
 		}
 
 		// set the forms label - allow clearing of it via empty string
-		if (isset($options['label']))
-			$form->setLabel($options['label']);
+		if (isset($options['label'])) {
+					$form->setLabel($options['label']);
+		}
 
 
 		// check to see if we are not posting from the client, populate it from the database
 		// !set the form name before checking data set!
-		if (!empty($options['name']))
-			$form->setName($options['name']);
+		if (!empty($options['name'])) {
+					$form->setName($options['name']);
+		}
 		if (!empty($options['initialiseFromDds']) && (!$object || !$object->data)) {
-			if (!$object)
-				$object = $phoebe->createStubObject($classType);
+			if (!$object) {
+							$object = $phoebe->createStubObject($classType);
+			}
 			$object->initialiseFromDds($options['initialiseFromDds']);
 		}
 		if ($object && !$form->hasRequestData()) {
@@ -307,8 +315,9 @@ 
 		}
 
 		if (!($printOnly || $readOnly)) {
-			if (!empty($options['uuid']))
-				$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			if (!empty($options['uuid'])) {
+							$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			}
 
 			// set any additional data sources
 			if (!empty($options['dataSources'])) {
@@ -316,8 +325,9 @@ 
 					$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaDataSourceString}$key", ['value'=>$value]);
 					// for dds forms, set the values on the form too for initial display
 					if ($phoebeType == 'daedalus') {
-						if ($form->hasField($key))
-							$form->getField($key)->setValue($value);
+						if ($form->hasField($key)) {
+													$form->getField($key)->setValue($value);
+						}
 					}
 				}
 			}
@@ -328,8 +338,9 @@ 
 			if (!empty($options['mapFilters'])) {
 				foreach ($options['mapFilters'] as $key=>$filters) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFilters))
-						$f->dataMapFilters = $filters;
+					if ($f && isset($f->dataMapFilters)) {
+											$f->dataMapFilters = $filters;
+					}
 				}
 			}
 
@@ -339,8 +350,9 @@ 
 			if (!empty($options['mapFields'])) {
 				foreach ($options['mapFields'] as $key=>$mapFields) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFields))
-						$f->dataMapFields = $mapFields;
+					if ($f && isset($f->dataMapFields)) {
+											$f->dataMapFields = $mapFields;
+					}
 				}
 			}
 
@@ -365,20 +377,24 @@ 
 			}
 
 			// set the forms action
-			if (!empty($options['action']))
-				$form->setAction($options['action']);
+			if (!empty($options['action'])) {
+							$form->setAction($options['action']);
+			}
 
 			// set whether or not ajax validation is required
-			if (isset($options['enableAjaxValidation']))
-				$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			if (isset($options['enableAjaxValidation'])) {
+							$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			}
 
 			// set whether or not ajax submission is required
-			if (isset($options['enableAjaxSubmission']))
-				$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			if (isset($options['enableAjaxSubmission'])) {
+							$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			}
 
 			// set where the form will check itself via ajaxValidation
-			if (!empty($options['ajaxValidationUrl']))
-				$form->validationUrl = $options['ajaxValidationUrl'];
+			if (!empty($options['ajaxValidationUrl'])) {
+							$form->validationUrl = $options['ajaxValidationUrl'];
+			}
 
 			// set where the browser will go to after completion of the form
 			if (!empty($options['returnUrl'])) {
@@ -438,8 +454,9 @@ 
 			$definition = $this->getFormDefinition($phoebeType, $classType);
 			$form = new \neon\core\form\Form($definition);
 		}
-		if (!empty($formName))
-			$form->setName($formName);
+		if (!empty($formName)) {
+					$form->setName($formName);
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			// prevent multiple renders resulting in multiple saves of the form
@@ -461,13 +478,15 @@ 
 					$changeLogUuids['add'] = $object->getChangeLogUuid();
 				}
 				$uuid = $object->uuid;
-				if (!empty($meta['dataSources']))
-					$object->setDataSources($meta['dataSources']);
+				if (!empty($meta['dataSources'])) {
+									$object->setDataSources($meta['dataSources']);
+				}
 				if ($object->editObject($data) === true) {
 					$alreadySubmitted[$submittedCheck] = $uuid;
 					$changeLogUuids['edit'] = $object->getChangeLogUuid();
-					if (!empty($meta['returnUrl']))
-						neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					if (!empty($meta['returnUrl'])) {
+											neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					}
 					return true;
 				}
 			} else {
@@ -512,8 +531,9 @@ 
 					$meta['uuid'] = $v;
 				} else if (strpos($key, $this->formMetaDataSourceString) === 0) {
 					$itemKey = substr($key, strlen($this->formMetaDataSourceString));
-					if (empty($meta['dataSources'][$itemKey]))
-						$meta['dataSources'][$itemKey] = $v;
+					if (empty($meta['dataSources'][$itemKey])) {
+											$meta['dataSources'][$itemKey] = $v;
+					}
 				} else if ($key==$this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
 					$meta['returnUrl'] = $v;
 				}