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

specialworks · Nov 18, 2013 · 485eaac · 485eaac
2 parents 9f8ee73 + 92e83b8
commit 485eaac
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/components/com_fabrik/helpers/image.php b/components/com_fabrik/helpers/image.php
@@ -239,6 +239,10 @@ function resize($maxWidth, $maxHeight, $origFile, $destFile)
 	public static function cacheRemote($src, $path, $file, $lifeTime = 29)
 	{
 		$folder = JPATH_SITE . '/' . ltrim($path, '/');
+
+                // For SSL a user agent may need to be set.
+                ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
+
 		if (!JFolder::exists($folder))
 		{
 			JFolder::create($folder);

diff --git a/components/com_fabrik/models/plugin-form.php b/components/com_fabrik/models/plugin-form.php
@@ -388,10 +388,11 @@ public function getEmailData()
 					{
 						$email_value = $this->emailData[$k];
 					}
+					// $$$ rob end of barfage
+					*/
+					$this->emailData[$k] = $elementModel->getEmailValue($email_value, $model->_formDataWithTableName, $c);
 
-					$this->emailData[$k] = $elementModel->getEmailValue($email_value, $model->_formDataWithTableName, $c); */
 
-					// $$$ rob end of barfage
 
 					if ($elementModel->_inRepeatGroup && $elementModel->_inJoin)
 					{

diff --git a/plugins/fabrik_element/databasejoin/databasejoin.php b/plugins/fabrik_element/databasejoin/databasejoin.php
@@ -213,6 +213,8 @@ protected function filterValueList_Exact($normal, $tableName = '', $label = '',
 		{
 			$fbConfig = JComponentHelper::getParams('com_fabrik');
 			$limit = $fbConfig->get('filter_list_max', 100);
+			//$where = $this->_buildQueryWhere(array(), true, null, array('mode' => 'filter'));
+			//$rows = array_values($this->checkboxRows(null, null, $where, null, 0, $limit));
 			$rows = array_values($this->checkboxRows(null, null, null, null, 0, $limit));
 		}
 		else

diff --git a/plugins/fabrik_form/juser/juser.php b/plugins/fabrik_form/juser/juser.php
@@ -218,7 +218,9 @@ public function onLoad($params, &$formModel)
 				}
 				if ($userid > 0)
 				{
-					$user = JFactory::getUser($userid);
+                                        // See https://github.com/Fabrik/fabrik/issues/1026 - don't use JFactory as this loads in session stored user
+                                        $user = new JUser($userid);
+
 					if ($user->get('id') == $userid)
 					{
 						$this->namefield = $this->getFieldName($params, 'juser_field_name');

diff --git a/plugins/fabrik_visualization/fusionchart/forms/fields.xml b/plugins/fabrik_visualization/fusionchart/forms/fields.xml
@@ -47,6 +47,8 @@
 			<field description="PLG_VISUALIZATION_FUSIONCHART_MX_ATTRIBUTES_DESC" label="PLG_VISUALIZATION_FUSIONCHART_MX_ATTRIBUTES_LABEL" name="fusionchart_mx_attributes" size="40" type="text"/>
 
 			<field description="PLG_VISUALIZATION_FUSIONCHART_WHERE_DESC" label="PLG_VISUALIZATION_FUSIONCHART_WHERE_LABEL" name="fusionchart_where" size="40" type="text"/>
+
+			<field description="PLG_VISUALIZATION_FUSIONCHART_LIMIT_DESC" label="PLG_VISUALIZATION_FUSIONCHART_LIMIT_LABEL" name="fusionchart_limit" size="10" type="text"/>
 
 		</fieldset>
 

diff --git a/...k_visualization/fusionchart/language/en-GB/en-GB.plg_fabrik_visualization_fusionchart.ini b/...k_visualization/fusionchart/language/en-GB/en-GB.plg_fabrik_visualization_fusionchart.ini
@@ -99,6 +99,8 @@ PLG_VISUALIZATION_FUSIONCHART_LABEL_STEP_RATIO_LABEL="Label Step Ratio"
 PLG_VISUALIZATION_FUSIONCHART_LABEL_STEP_RATIO_DESC="Alters the number of X axis labels displayed, use if your labels are overlapping.  The lower the number, the less labels.  Start with something like 2 and work upwards. <strong>FusionCharts Attribute:</strong>"
 PLG_VISUALIZATION_FUSIONCHART_LIMITS_DECIMAL_PRECISION_DESC="Number of decimal places to which upper and lower limit values on the chart would be rounded to. <strong>FusionCharts Attribute: limitsDecimalPrecision</strong>"
 PLG_VISUALIZATION_FUSIONCHART_LIMITS_DECIMAL_PRECISION_LABEL="Limits Decimal Precision"
+PLG_VISUALIZATION_FUSIONCHART_LIMIT_DESC="If set, will limit the number of records selected from the table"
+PLG_VISUALIZATION_FUSIONCHART_LIMIT_LABEL="Limit"
 PLG_VISUALIZATION_FUSIONCHART_MSG_LOADING_LABEL="Loading Message"
 PLG_VISUALIZATION_FUSIONCHART_MSG_NODATA_LABEL="No Data Message"
 PLG_VISUALIZATION_FUSIONCHART_MSG_PARSING_DATA_LABEL="Parsing Data Message"

diff --git a/plugins/fabrik_visualization/fusionchart/models/fusionchart.php b/plugins/fabrik_visualization/fusionchart/models/fusionchart.php
@@ -443,6 +443,7 @@ public function getFusionchart()
 
 		$dual_y_parents = $params->get('fusionchart_dual_y_parent');
 		$chartWheres = (array) $params->get('fusionchart_where');
+		$limits = (array) $params->get('fusionchart_limit');
 		$this->c = 0;
 		$gdata = array();
 		$glabels = array();
@@ -492,7 +493,8 @@ public function getFusionchart()
 			 * object if we call getPagination after render().  So call it first, then render() will
 			 * get our cached pagination, rather than vice versa.
 			 */
-			$listModel->setLimits(0, 0);
+			$limit = (int) JArrayHelper::getValue($limits, $this->c, 0);
+			$listModel->setLimits(0, $limit);
 			$nav = $listModel->getPagination(0, 0, 0);
 			$listModel->render();
 			$alldata = $listModel->getData();