diff --git a/.gitignore b/.gitignore index 5e49b9dff5b..08dab7e85e6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ *.jpg cache/* administrator/* -!administrator/components/com_fabrik/* +!administrator/components/com_fabrik/ cache/* components/* !components/com_fabrik @@ -26,7 +26,13 @@ plugins/* plugins/search/* !plugins/search/fabrik plugins/system/* -!plugins/system/fabrikcron/ +!plugins/fabrik_element/ +!plugins/fabrik_form/ +!plugins/fabrik_list/ +!plugins/fabrik_cron/ +!plugins/fabrik_validationrule/ +!plugins/fabrik_visualization/ +!tttplugins/system/fabrikcron/ robots.txt sql/* tests/* diff --git a/administrator/components/com_fabrik/models/fields/popupforms.php b/administrator/components/com_fabrik/models/fields/popupforms.php index 1fb2808fb2d..f0d0570f4a0 100644 --- a/administrator/components/com_fabrik/models/fields/popupforms.php +++ b/administrator/components/com_fabrik/models/fields/popupforms.php @@ -41,13 +41,13 @@ function getOptions() // Initialize variables. $options = array(); - $db = FabrikWorker::getDbo(); + $db = FabrikWorker::getDbo(true); $query = $db->getQuery(true); - $query->select('f.id AS value, f.label AS text, l.id AS listid'); - $query->from('#__fabrik_forms AS f'); - $query->join('LEFT', '#__fabrik_lists As l ON f.id = l.form_id'); - $query->where('f.published = 1 AND l.db_table_name =' . $db->Quote($this->form->getValue('params.join_db_name'))); - $query->order('f.label'); + $query->select('f.id AS value, f.label AS text, l.id AS listid') + ->from('#__{package}_forms AS f') + ->join('LEFT', '#__{package}_lists As l ON f.id = l.form_id') + ->where('f.published = 1 AND l.db_table_name = '.$db->Quote($this->form->getValue('params.join_db_name'))) + ->order('f.label'); // Get the options. $db->setQuery($query); diff --git a/administrator/components/com_fabrik/models/list.php b/administrator/components/com_fabrik/models/list.php index d366ca72004..75743f323f9 100644 --- a/administrator/components/com_fabrik/models/list.php +++ b/administrator/components/com_fabrik/models/list.php @@ -925,7 +925,7 @@ function makeElementsFromFields($groupId, $tableName) $elementModel = new plgFabrik_Element($dispatcher); $pluginManager = $this->getFormModel()->getPluginManager(); $user = JFactory::getUser(); - $elementTypes = JRequest::getVar('elementtype', array(), 'default', 'array'); + $elementTypes = JRequest::getVar('elementtype', array()); $fields = $fabrikDb->getTableFields(array($tableName)); $fields = $fields[$tableName]; $createdate = JFactory::getDate()->toMySQL(); @@ -933,7 +933,7 @@ function makeElementsFromFields($groupId, $tableName) $ordering = 0; // no existing fabrik table so we take a guess at the most //relavent element types to create - $elementLabels = JRequest::getVar('elementlabels', array(), 'default', 'array'); + $elementLabels = JRequest::getVar('elementlabels', array()); foreach ($fields as $label => $type) { $element = FabTable::getInstance('Element', 'FabrikTable'); if (array_key_exists($ordering, $elementTypes)) { @@ -1155,7 +1155,7 @@ public function copy() { $db = FabrikWorker::getDbo(true); $user = JFactory::getUser(); - $pks = JRequest::getVar('cid', array(), 'default', 'array'); + $pks = JRequest::getVar('cid', array()); $post = JRequest::get('post'); foreach ($pks as $i => $pk) { $item =& $this->getTable(); diff --git a/plugins/fabrik_element/databasejoin/databasejoin.php b/plugins/fabrik_element/databasejoin/databasejoin.php index 58c2a46b2bb..9fd9679f76c 100644 --- a/plugins/fabrik_element/databasejoin/databasejoin.php +++ b/plugins/fabrik_element/databasejoin/databasejoin.php @@ -707,15 +707,24 @@ function getTitlePart($data, $repeatCounter = 0, $opts = array()) protected function getLinkedForms() { if (!isset($this->_linkedForms)) { - $db =& FabrikWorker::getDbo(); - $params =& $this->getParams(); + $db = FabrikWorker::getDbo(true); + $params = $this->getParams(); //forms for potential add record pop up form - $db->setQuery("SELECT f.id AS value, f.label AS text, l.id AS listid FROM - #__{package}_forms AS f LEFT JOIN #__{package}_lists As l - ON f.id = l.form_id - WHERE f.published = 1 AND l.db_table_name = '" . $params->get('join_db_name') . "' - ORDER BY f.label"); + + $query = $db->getQuery(true); + $query->select('f.id AS value, f.label AS text, l.id AS listid') + ->from('#__{package}_forms AS f') + ->join('LEFT', '#__{package}_lists As l ON f.id = l.form_id') + ->where('f.published = 1 AND l.db_table_name = '.$db->Quote($params->get('join_db_name'))) + ->order('f.label'); + $db->setQuery($query); + $this->_linkedForms = $db->loadObjectList('value'); + + // Check for a database error. + if ($db->getErrorNum()) { + JError::raiseError(500, $db->getErrorMsg()); + } } return $this->_linkedForms; } diff --git a/plugins/fabrik_form/pingdotfm/.svn/all-wcprops b/plugins/fabrik_form/pingdotfm/.svn/all-wcprops deleted file mode 100644 index a8f70f39feb..00000000000 --- a/plugins/fabrik_form/pingdotfm/.svn/all-wcprops +++ /dev/null @@ -1,29 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 90 -/svn/fabrik_fabrik2/!svn/ver/5421/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm -END -fabrikpingdotfm.xml -K 25 -svn:wc:ra_dav:version-url -V 110 -/svn/fabrik_fabrik2/!svn/ver/5421/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm/fabrikpingdotfm.xml -END -index.html -K 25 -svn:wc:ra_dav:version-url -V 101 -/svn/fabrik_fabrik2/!svn/ver/3993/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm/index.html -END -fabrikpingdotfm.php -K 25 -svn:wc:ra_dav:version-url -V 110 -/svn/fabrik_fabrik2/!svn/ver/4953/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm/fabrikpingdotfm.php -END -PHPingFM.php -K 25 -svn:wc:ra_dav:version-url -V 103 -/svn/fabrik_fabrik2/!svn/ver/4309/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm/PHPingFM.php -END diff --git a/plugins/fabrik_form/pingdotfm/.svn/entries b/plugins/fabrik_form/pingdotfm/.svn/entries deleted file mode 100644 index 674b38c9be3..00000000000 --- a/plugins/fabrik_form/pingdotfm/.svn/entries +++ /dev/null @@ -1,167 +0,0 @@ -10 - -dir -5609 -http://fabrik.unfuddle.com/svn/fabrik_fabrik2/trunk/components/com_fabrik/plugins/form/fabrikpingdotfm -http://fabrik.unfuddle.com/svn/fabrik_fabrik2 - - - -2011-07-14T10:28:33.593205Z -5421 -Rob - - - - - - - - - - - - - - -5a4c691c-288c-451f-b78b-f9805f0daa74 - -administrator -dir - -fabrikpingdotfm.xml -file - - - - -2011-08-30T09:32:19.250976Z -c5de231bfa8da1f6c56df5a512736a16 -2011-07-14T10:28:33.593205Z -5421 -Rob - - - - - - - - - - - - - - - - - - - - - -3130 - -index.html -file - - - - -2011-08-30T09:32:19.252929Z -d41d8cd98f00b204e9800998ecf8427e -2010-08-28T14:17:09.651078Z -3993 -peamak - - - - - - - - - - - - - - - - - - - - - -0 - -fabrikpingdotfm.php -file - - - - -2011-08-30T09:32:19.255859Z -0cf46bdd1330dcfda9c6e1b85fd9db85 -2011-03-30T14:06:28.895047Z -4953 -rob - - - - - - - - - - - - - - - - - - - - - -5992 - -PHPingFM.php -file - - - - -2011-08-30T09:32:19.270507Z -1cc1f66c912e65daeda815774f93cf15 -2010-11-12T15:50:55.268401Z -4309 -rob - - - - - - - - - - - - - - - - - - - - - -10098 -