Merge branch 'master' of github.com:Fabrik/fabrik

Author: cheesegrits

administrator/components/com_fabrik/classes/39/FormField.php

@@ -349,6 +349,8 @@
                 		<option value="2">COM_FABRIK_LABELS_UCWORDS</option>
                 		<option value="3">COM_FABRIK_LABELS_CAPFIRST</option>
                 		<option value="4">COM_FABRIK_LABELS_CAPS</option>
+						<option value="5">COM_FABRIK_LABELS_LANGUAGESTRING</option>
+						<option value="6">COM_FABRIK_LABELS_UNCHANGED</option>						
         	</field>
     	</fieldset>
 

administrator/components/com_fabrik/config.xml

@@ -90,7 +90,7 @@ public function view()
 			$cache->get($view, 'display', $cacheId);
 			$contents = ob_get_contents();
 			ob_end_clean();
-			Html::addToSessionCacheIds($this->cacheId);
+			Html::addToSessionCacheIds($cacheId);
 			$token       = JSession::getFormToken();
 			$search      = '#<input type="hidden" name="[0-9a-f]{32}" value="1" />#';
 			$replacement = '<input type="hidden" name="' . $token . '" value="1" />';
@@ -120,6 +120,7 @@ public function process()
 			$view->setModel($model, true);
 		}
 
+		$listModel = $model->getListModel();
 		$model->setId($input->getInt('formid', 0));
 
 		$this->isMambot = $input->get('_isMambot', 0);
@@ -132,6 +133,50 @@ public function process()
 			JSession::checkToken() or die('Invalid Token');
 		}
 
+		/**
+		 * Do some ACL sanity checks.  Without this check, if spoof checking is disabled, a form can be submitted
+		 * with no ACL checks being performed.  With spoof checking, we do the ACL checks on form load, so can't get the
+		 * token without having access.
+		 *
+		 * Don't bother checking if not recording to database, as no list or list ACLs.
+		 */
+		if ($model->recordInDatabase())
+		{
+			$aclOK    = false;
+
+			if ($model->isNewRecord() && $listModel->canAdd())
+			{
+				$aclOK = true;
+			}
+			else
+			{
+				/*
+				 * Need to set up form data here so we can pass it to canEdit(), remembering to
+				 * add encrypted vars, so things like user elements which have ACLs on them get
+				 * included in data for canUserDo() checks.  Nay also need to do copyToFromRaw(),
+				 * but leave that until we find a need for it.
+				 *
+				 * Note that canEdit() expects form data as an object, and $formData is an array,
+				 * but the actual canUserDo() helper func it calls with the data will accept either.
+				 */
+				$formData = $model->setFormData();
+				$model->addEncrytedVarsToArray($formData);
+
+				if (!$model->isNewRecord() && $listModel->canEdit($formData))
+				{
+					$aclOK = true;
+				}
+			}
+
+			if (!$aclOK)
+			{
+				$msg = $model->aclMessage(true);
+				$this->app->enqueueMessage($msg);
+
+				return;
+			}
+		}
+
 		$validated = $model->validate();
 
 		if (!$validated)

administrator/components/com_fabrik/controllers/form.php

@@ -33,8 +33,8 @@ COM_FABRIK_ACCESS_EDITABLE_ELEMENT="Formular (hinzufügen)"
 COM_FABRIK_ACCESS_EDITABLE_ELEMENT_DESC="Zugriffsebene, die der Benutzer haben muss, um die <strong>editierbare Version</strong> dieses Elements zu sehen, wenn ein <strong>neuer</strong> Satz hinzugefügt wird."
 COM_FABRIK_ACCESS_EDIT_DESC="Zugriffsebene, die der Benutzer haben muss, um Einträge in dieser Liste <strong>editieren</strong> zu dürfen."
 COM_FABRIK_ACCESS_VIEW="Ansicht"
-COM_FABRIK_ACCESS_VIEWABLE_ELEMENT="Template für Detail-Ansicht"
-COM_FABRIK_ACCESS_VIEWABLE_ELEMENT_DESC="Zugriffsebene, die der Benutzer haben muss, um die <strong>readonly</strong> dieses Elements zu sehen. Gilt immer für die Detail-Ansicht</li><li>Gilt auch für die Form-Ansicht, FALLS  die Zugriffsebenen 'Form (hinzufügen/editieren)' beschränkt ist </li></ul>"
+COM_FABRIK_ACCESS_VIEWABLE_ELEMENT="Detail-Ansicht"
+COM_FABRIK_ACCESS_VIEWABLE_ELEMENT_DESC="Zugriffsebene, die der Benutzer haben muss, um die <strong>readonly-Ansicht</strong> dieses Elements zu sehen. Gilt immer für die Detail-Ansicht</li><li>Gilt auch für die Form-Ansicht, FALLS  die Zugriffsebenen 'Form (hinzufügen/editieren)' beschränkt ist </li></ul>"
 COM_FABRIK_ACCESS_LISTVIEW_LABEL="Listenansicht"
 COM_FABRIK_ACCESS_LISTVIEW_DESC="Zugriffsebene, die der Benutzer haben muss, um dieses Element in der  <strong>Listenansicht</strong> zu sehen. Listenansicht Einstellungen -> in Liste anzeigen auf JA gesetzt sein."
 COM_FABRIK_ACCESS_VIEW_DESC="Zugriffsebene, die der Benutzer haben muss, um die <strong>Liste zu sehen</strong>."

administrator/components/com_fabrik/language/de-DE/de-DE.com_fabrik.ini

@@ -1471,7 +1471,8 @@ COM_FABRIK_LABELS_LOWERCASE="Lowercase (e.g. user_Name becomes 'user name')"
 COM_FABRIK_LABELS_UCWORDS="Proper name (e.g. user_Name becomes 'User Name')"
 COM_FABRIK_LABELS_CAPFIRST="Capitalize first letter (e.g. user_Name becomes 'User name')"
 COM_FABRIK_LABELS_CAPS="All Caps (e.g. user_name becomes 'USER NAME')"
-
+COM_FABRIK_LABELS_LANGUAGESTRING="All Caps and underscores (e.g. 'user name' becomes 'USER_NAME'), usable as language string"
+COM_FABRIK_LABELS_UNCHANGED="Leave mySQL column name (e.g. user_Name remains 'user_Name')"
 COM_FABRIK_SHOW_IN_DASHBOARD_DESC="If turned on, then this will add a link to the list into the Fabrik Admin Quick Icon module"
 COM_FABRIK_SHOW_IN_DASHBOARD_LABEL="Show in module"
 COM_FABRIK_DASHBOARD_ICON_DESC="Link icon,glyphicon or fontawesome class  e.g. 'icon-joomla'"

administrator/components/com_fabrik/language/en-GB/en-GB.com_fabrik.ini

@@ -1493,6 +1493,12 @@ protected function makeElementsFromFields($groupId, $tableName)
 				case '4':
 					$element->label = strtoupper($element->label);
 					break;
+				case '5':
+					$element->label = strtoupper(str_replace(" ", "_", $element->label));
+					break;
+				case '6':
+					$element->label = FArrayHelper::getValue($elementLabels, $ordering, $label);
+					break;
 				default:
 					break;
 			}

administrator/components/com_fabrik/models/list.php

@@ -10,7 +10,8 @@
 
 $d = $displayData;
 
-$span = floor(12 / $d->columns);
+// avoid potential divide by 0 if something went wrong and $d->columns is 0 or empty
+$span = empty($d->columns) ? 12 : floor(12 / $d->columns);
 $i    = 0;
 $id   = is_null($d->spanId) ? '' : ' id="' . $d->spanId . '"';
 $grid = array();

components/com_fabrik/layouts/fabrik-bootstrap-grid.php

@@ -0,0 +1,10 @@
+css_dir = "."
+sass_dir = "."
+images_dir = "."
+fonts_dir = "fonts"
+relative_assets = true
+
+output_style = :compact
+line_comments = false
+
+preferred_syntax = :scss