bauer-git · bauer-git · Oct 15, 2015 · Oct 15, 2015 · Oct 16, 2015 · Oct 16, 2015
diff --git a/.gitignore b/.gitignore
@@ -98,3 +98,4 @@ custom.css
 !software_license.txt
 /ZendFramework-1.12.3
 /mobiquo
+/node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/administrator/components/com_fabrik/classes/34/field.php b/administrator/components/com_fabrik/classes/34/field.php
@@ -719,7 +719,7 @@ protected function getLabel()
 
 		// Get the label text from the XML element, defaulting to the element name.
 		$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
-		$text = $this->translateLabel ? FText::_($text) : $text;
+		$text = $this->translateLabel ? JText::_($text) : $text;
 
 		// Forcing the Alias field to display the tip below
 		$position = $this->element['name'] == 'alias' ? ' data-placement="bottom" ' : '';

diff --git a/administrator/components/com_fabrik/classes/renderer/xml.php b/administrator/components/com_fabrik/classes/renderer/xml.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 // No direct access

diff --git a/administrator/components/com_fabrik/com_fabrik.manifest.class.php b/administrator/components/com_fabrik/com_fabrik.manifest.class.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/com_fabrik_skeleton/admin.php b/administrator/components/com_fabrik/com_fabrik_skeleton/admin.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/com_fabrik_skeleton/fabrik_skeleton.php b/administrator/components/com_fabrik/com_fabrik_skeleton/fabrik_skeleton.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/...or/components/com_fabrik/com_fabrik_skeleton/mod_fabrik_skeleton_form/mod_fabrik_form.php b/...or/components/com_fabrik/com_fabrik_skeleton/mod_fabrik_skeleton_form/mod_fabrik_form.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/com_fabrik_skeleton/views/form/view.html.php b/administrator/components/com_fabrik/com_fabrik_skeleton/views/form/view.html.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       3.0
  */

diff --git a/administrator/components/com_fabrik/com_fabrik_skeleton/views/list/view.html.php b/administrator/components/com_fabrik/com_fabrik_skeleton/views/list/view.html.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       3.0
  */

diff --git a/administrator/components/com_fabrik/com_fabrik_skeleton/views/package/view.html.php b/administrator/components/com_fabrik/com_fabrik_skeleton/views/package/view.html.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       3.0
  */

diff --git a/administrator/components/com_fabrik/config.xml b/administrator/components/com_fabrik/config.xml
@@ -36,6 +36,16 @@
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>	
 		</field>
+
+		<field name="allow_user_defines"
+			class="radio btn-group"
+			type="radio"
+			default="0"
+			label="COM_FABRIK_FIELD_ALLOW_USER_DEFINES_LABEL"
+			description="COM_FABRIK_FIELD_ALLOW_USER_DEFINES_DESC">
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+		</field>
 
 	</fieldset>
 	<fieldset label="COM_FABRIK_LISTS" name="lists">

diff --git a/administrator/components/com_fabrik/controller.php b/administrator/components/com_fabrik/controller.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/controllers/connection.php b/administrator/components/com_fabrik/controllers/connection.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/controllers/connections.php b/administrator/components/com_fabrik/controllers/connections.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/cron.php b/administrator/components/com_fabrik/controllers/cron.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/cron.raw.php b/administrator/components/com_fabrik/controllers/cron.raw.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/crons.php b/administrator/components/com_fabrik/controllers/crons.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       3.0
  */
@@ -37,6 +37,8 @@ class FabrikAdminControllerCrons extends FabControllerAdmin
 	 */
 	protected $view_item = 'crons';
 
+	protected $runningId = null;
+
 	/**
 	 * Proxy for getModel.
 	 *
@@ -53,6 +55,22 @@ public function getModel($name = 'Cron', $prefix = 'FabrikAdminModel', $config =
 		return $model;
 	}
 
+	public function shutdownHandler()
+	{
+		$id = $this->runningId;
+		if (@is_array($e = @error_get_last())) {
+			$code = isset($e['type']) ? $e['type'] : 0;
+			$msg = isset($e['message']) ? $e['message'] : '';
+			$file = isset($e['file']) ? $e['file'] : '';
+			$line = isset($e['line']) ? $e['line'] : '';
+			if ($code>0) {
+				$this->log->message = "$code,$msg,$file,$line";
+				$this->log->store();
+			}
+		}
+	}
+
+
 	/**
 	 * Run the selected cron plugins
 	 *
@@ -76,16 +94,18 @@ public function run()
 		$pluginManager = JModelLegacy::getInstance('Pluginmanager', 'FabrikFEModel');
 		$listModel = JModelLegacy::getInstance('list', 'FabrikFEModel');
 		$c = 0;
-		$log = FabTable::getInstance('Log', 'FabrikTable');
+		$this->log = FabTable::getInstance('Log', 'FabrikTable');
+
+		register_shutdown_function(array($this, 'shutdownHandler'));
 
 		foreach ($rows as $row)
 		{
 			// Load in the plugin
 			$rowParams = json_decode($row->params);
-			$log->message = '';
-			$log->id = null;
-			$log->referring_url = '';
-			$log->message_type = 'plg.cron.' . $row->plugin;
+			$this->log->message = '';
+			$this->log->id = null;
+			$this->log->referring_url = '';
+			$this->log->message_type = 'plg.cron.' . $row->plugin;
 			$plugin = $pluginManager->getPlugIn($row->plugin, 'cron');
 			$table = FabTable::getInstance('cron', 'FabrikTable');
 			$table->load($row->id);
@@ -98,7 +118,7 @@ public function run()
 			if ($tid !== 0)
 			{
 				$thisListModel->setId($tid);
-				$log->message .= "\n\n$row->plugin\n listid = " . $thisListModel->getId();
+				$this->log->message .= "\n\n$row->plugin\n listid = " . $thisListModel->getId();
 
 				if ($plugin->requiresTableData())
 				{
@@ -111,14 +131,16 @@ public function run()
 			{
 				$data = array();
 			}
+
+			$this->runningId = $row->id;
 			// $$$ hugh - added table model param, in case plugin wants to do further table processing
 			$c = $c + $plugin->process($data, $thisListModel, $thisAdminListModel);
 
-			$log->message = $plugin->getLog() . "\n\n" . $log->message;
+			$this->log->message = $plugin->getLog() . "\n\n" . $this->log->message;
 
 			if ($plugin->getParams()->get('log', 0) == 1)
 			{
-				$log->store();
+				$this->log->store();
 			}
 
 			// Email log message
@@ -128,7 +150,7 @@ public function run()
 			{
 				$recipient = explode(',', $recipient);
 				$subject = $config->get('sitename') . ': ' . $row->plugin . ' scheduled task';
-				$mailer->sendMail($config->get('mailfrom'), $config->get('fromname'), $recipient, $subject, $log->message, true);
+				$mailer->sendMail($config->get('mailfrom'), $config->get('fromname'), $recipient, $subject, $this->log->message, true);
 			}
 		}
 

diff --git a/administrator/components/com_fabrik/controllers/details.pdf.php b/administrator/components/com_fabrik/controllers/details.pdf.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/details.php b/administrator/components/com_fabrik/controllers/details.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/element.php b/administrator/components/com_fabrik/controllers/element.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/element.raw.php b/administrator/components/com_fabrik/controllers/element.raw.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/elements.php b/administrator/components/com_fabrik/controllers/elements.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/emailform.php b/administrator/components/com_fabrik/controllers/emailform.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/fabcontrolleradmin.php b/administrator/components/com_fabrik/controllers/fabcontrolleradmin.php
@@ -4,7 +4,7 @@
  * items, along with call to model to perform additional
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/fabcontrollerform.php b/administrator/components/com_fabrik/controllers/fabcontrollerform.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/form.php b/administrator/components/com_fabrik/controllers/form.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/form.raw.php b/administrator/components/com_fabrik/controllers/form.raw.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/forms.php b/administrator/components/com_fabrik/controllers/forms.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/controllers/group.php b/administrator/components/com_fabrik/controllers/group.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/groups.php b/administrator/components/com_fabrik/controllers/groups.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  * @since       1.6
  */

diff --git a/administrator/components/com_fabrik/controllers/home.php b/administrator/components/com_fabrik/controllers/home.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/controllers/import.php b/administrator/components/com_fabrik/controllers/import.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */
 

diff --git a/administrator/components/com_fabrik/controllers/list.pdf.php b/administrator/components/com_fabrik/controllers/list.pdf.php
@@ -4,7 +4,7 @@
  *
  * @package     Joomla.Administrator
  * @subpackage  Fabrik
- * @copyright   Copyright (C) 2005-2013 fabrikar.com - All rights reserved.
+ * @copyright   Copyright (C) 2005-2015 fabrikar.com - All rights reserved.
  * @license     GNU/GPL http://www.gnu.org/copyleft/gpl.html
  */