' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
';
+ }
+ }
+ return '';
+ }
+ $display[] = '
';
+ $display[] = '
';
+ $display[] = $name;
+ if ($needKey)
+ {
+ $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . '';
+ }
+ else
+ {
+ $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . '';
+ }
+ $display[] = '
';
+ $display[] = $info['short_description'][$key];
+ $display[] = '
';
+ $display[] = '
';
+ // load the list items
+ foreach (self::$compOwnerSearch['ul'] as $li => $value)
+ {
+ if (isset($info[$li]) && isset($info[$li][$key]))
+ {
+ $display[] = '- '.JText::sprintf($value, $info[$li][$key]).'
';
+ }
+ }
+ $display[] = '
';
+ // if we have a source link we add it
+ if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
+ {
+ $display[] = '
source code';
+ }
+ // load other
+ foreach (self::$compOwnerSearch['other'] as $other => $value)
+ {
+ if (isset($info[$other]) && isset($info[$other][$key]))
+ {
+ $display[] = JText::sprintf($value, $info[$other][$key]);
+ }
+ }
+ $display[] = '
';
+
+ $counter++;
+ }
+ // close the div if needed
+ if ($cAmount > 1)
+ {
+ $display[] = '
'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'
';
+ }
+
+ /**
+ * The array of dynamic content
+ *
+ * @var array
+ */
+ protected static $dynamicContent = array(
+ // The banners by size
+ 'banner' => array(
+ '728-90' => array(
+ ' '',
+ 'short_description' => $result->short_description,
+ 'description' => $result->description);
+ // number pointer
+ $nr = 0;
+ // php tracker (we must try to load alteast 17 rows
+ $phpTracker = array();
+ // value to check since there are false and null values even 0 in the values returned
+ $confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+ // set the headers
+ $field['values_description'] .= '| ' . JText::_('COM_COMPONENTBUILDER_PROPERTY') . ' | ' . JText::_('COM_COMPONENTBUILDER_EXAMPLE') . ' | ' . JText::_('COM_COMPONENTBUILDER_DESCRIPTION') . ' |
|---|
';
+ foreach ($properties as $property)
+ {
+ $example = (isset($property['example']) && self::checkString($property['example'])) ? $property['example'] : '';
+ $field['values_description'] .= '' . $property['name'] . ' | ' . $example . ' | ' . $property['description'] . ' |
';
+ // check if we should load the value
+ $value = self::getValueFromXMLstring($xml, $property['name'], $confirmation);
+ // check if this is a php field
+ $addPHP = false;
+ if (strpos($property['name'], 'type_php') !== false)
+ {
+ $addPHP = true;
+ // set the line number
+ $phpLine = (int) preg_replace('/[^0-9]/', '', $property['name']);
+ // set the key
+ $phpKey = trim(preg_replace('/[0-9]+/', '', $property['name']), '_');
+ // start array if not already set
+ if (!isset($field['php'][$phpKey]))
+ {
+ $field['php'][$phpKey] = array();
+ $field['php'][$phpKey]['value'] = array();
+ $field['php'][$phpKey]['desc'] = $property['description'];
+ // start tracker
+ $phpTracker[$phpKey] = 1;
+ }
+ }
+ // was the settings for the property passed
+ if(self::checkArray($settings) && isset($settings[$property['name']]))
+ {
+ // add the xml values
+ $field['values'] .= PHP_EOL . "\t" . $property['name'] . '="'. $settings[$property['name']] . '" ';
+ // add the json values
+ if ($addPHP)
+ {
+ $field['php'][$phpKey]['value'][$phpLine] = $settings[$property['name']];
+ $phpTracker[$phpKey]++;
+ }
+ else
+ {
+ $field['subform']['properties'.$nr] = array('name' => $property['name'], 'value' => $settings[$property['name']], 'desc' => $property['description']);
+ }
+ }
+ elseif (!$xml || $confirmation !== $value)
+ {
+ // add the xml values
+ $field['values'] .= PHP_EOL."\t" . $property['name'] . '="' . ($confirmation !== $value) ? $value : $example .'" ';
+ // add the json values
+ if ($addPHP)
+ {
+ $field['php'][$phpKey]['value'][$phpLine] = ($confirmation !== $value) ? $value : $example;
+ $phpTracker[$phpKey]++;
+ }
+ else
+ {
+ $field['subform']['properties' . $nr] = array('name' => $property['name'], 'value' => ($confirmation !== $value) ? $value : $example, 'desc' => $property['description']);
+ }
+ }
+ // add the name List Options
+ if (!$addPHP)
+ {
+ $field['nameListOptions'][$property['name']] = $property['name'];
+ }
+ // increment the number
+ $nr++;
+ }
+ // check if all php is loaded using the tracker
+ if (self::checkString($xml) && isset($phpTracker) && self::checkArray($phpTracker))
+ {
+ foreach ($phpTracker as $phpKey => $start)
+ {
+ if ($start < 30)
+ {
+ // we must search for more code in the xml just incase
+ foreach(range(2, 30) as $t_nr)
+ {
+ $get_ = $phpKey . '_' . $t_nr;
+ if (!isset($field['php'][$phpKey]['value'][$t_nr]) && ($value = self::getValueFromXMLstring($xml, $get_, $confirmation)) !== $confirmation)
+ {
+ $field['php'][$phpKey]['value'][$t_nr] = $value;
+ }
+ }
+ }
+ }
+ }
+ $field['values'] .= PHP_EOL . "/>";
+ $field['values_description'] .= '
';
+ // return found field options
+ return $field;
+ }
+ return false;
+ }
+
+ public static function getValueFromXMLstring(&$xml, &$get, $confirmation = '')
+ {
+ if (self::checkString($xml))
+ {
+ // if we have a PHP value, we must base64 decode it
+ if (strpos($get, 'type_php') !== false)
+ {
+ return self::openValidBase64(self::getBetween($xml, $get.'="', '"', $confirmation));
+ }
+ return self::getBetween($xml, $get . '="', '"', $confirmation);
+ }
+ return $confirmation;
+ }
+
+
+ /**
+ * The zipper method
+ *
+ * @param string $workingDIR The directory where the items must be zipped
+ * @param string $filepath The path to where the zip file must be placed
+ *
+ * @return bool true On success
+ *
+ */
+ public static function zip($workingDIR, &$filepath)
+ {
+ // store the current joomla working directory
+ $joomla = getcwd();
+
+ // we are changing the working directory to the component temp folder
+ chdir($workingDIR);
+
+ // the full file path of the zip file
+ $filepath = JPath::clean($filepath);
+
+ // delete an existing zip file (or use an exclusion parameter in JFolder::files()
+ JFile::delete($filepath);
+
+ // get a list of files in the current directory tree
+ $files = JFolder::files('.', '', true, true);
+ $zipArray = array();
+ // setup the zip array
+ foreach ($files as $file)
+ {
+ $tmp = array();
+ $tmp['name'] = str_replace('./', '', $file);
+ $tmp['data'] = JFile::read($file);
+ $tmp['time'] = filemtime($file);
+ $zipArray[] = $tmp;
+ }
+
+ // change back to joomla working directory
+ chdir($joomla);
+
+ // get the zip adapter
+ $zip = JArchive::getAdapter('zip');
+
+ //create the zip file
+ if ($zip->create($filepath, $zipArray))
+ {
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * Write a file to the server
+ *
+ * @param string $path The path and file name where to safe the data
+ * @param string $data The data to safe
+ *
+ * @return bool true On success
+ *
+ */
+ public static function writeFile($path, $data)
+ {
+ $klaar = false;
+ if (self::checkString($data))
+ {
+ // open the file
+ $fh = fopen($path, "w");
+ if (!is_resource($fh))
+ {
+ return $klaar;
+ }
+ // write to the file
+ if (fwrite($fh, $data))
+ {
+ // has been done
+ $klaar = true;
+ }
+ // close file.
+ fclose($fh);
+ }
+ return $klaar;
+ }
+
+
+ /**
+ * Remove folders with files
+ *
+ * @param string $dir The path to folder to remove
+ * @param boolean $ignore The folders and files to ignore and not remove
+ *
+ * @return boolean True in all is removed
+ *
+ */
+ public static function removeFolder($dir, $ignore = false)
+ {
+ if (JFolder::exists($dir))
+ {
+ $it = new RecursiveDirectoryIterator($dir);
+ $it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+ foreach ($it as $file)
+ {
+ if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
+ if ($file->isDir())
+ {
+ $keeper = false;
+ if (self::checkArray($ignore))
+ {
+ foreach ($ignore as $keep)
+ {
+ if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
+ {
+ $keeper = true;
+ }
+ }
+ }
+ if ($keeper)
+ {
+ continue;
+ }
+ JFolder::delete($file->getPathname());
+ }
+ else
+ {
+ $keeper = false;
+ if (self::checkArray($ignore))
+ {
+ foreach ($ignore as $keep)
+ {
+ if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
+ {
+ $keeper = true;
+ }
+ }
+ }
+ if ($keeper)
+ {
+ continue;
+ }
+ JFile::delete($file->getPathname());
+ }
+ }
+ if (!self::checkArray($ignore))
+ {
+ return JFolder::delete($dir);
+ }
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * get the github repo file list
+ *
+ * @return array on success
+ *
+ */
+ public static function getGithubRepoFileList($type, $target)
+ {
+ // get the current Packages (public)
+ if (!$repoData = self::get($type))
+ {
+ if (self::urlExists($target))
+ {
+ $repoData = self::getFileContents($target);
+ if (self::checkJson($repoData))
+ {
+ $test = json_decode($repoData);
+ if (self::checkObject($test) && isset($test->tree) && self::checkArray($test->tree) )
+ {
+ // remember to set it
+ self::set($type, $repoData);
+ }
+ // check if we have error message from github
+ elseif ($errorMessage = self::githubErrorHandeler(array('error' => null), $test))
+ {
+ if (self::checkString($errorMessage['error']))
+ {
+ JFactory::getApplication()->enqueueMessage($errorMessage['error'], 'Error');
+ }
+ $repoData = false;
+ }
+ }
+ else
+ {
+ $repoData = false;
+ }
+ }
+ else
+ {
+ JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST', $target), 'Error');
+ }
+ }
+ // check if we could find packages
+ if (isset($repoData) && self::checkJson($repoData))
+ {
+ $repoData = json_decode($repoData);
+ if (self::checkObject($repoData) && isset($repoData->tree) && self::checkArray($repoData->tree) )
+ {
+ return $repoData->tree;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * get the github error messages
+ *
+ * @return array of errors on success
+ *
+ */
+ protected static function githubErrorHandeler($message, &$github)
+ {
+ if (self::checkObject($github) && isset($github->message) && self::checkString($github->message))
+ {
+ // set the message
+ $errorMessage = $github->message;
+ // add the documentation URL
+ if (isset($github->documentation_url) && self::checkString($github->documentation_url))
+ {
+ $errorMessage = $errorMessage.'
'.$github->documentation_url;
+ }
+ // check the message
+ if (strpos($errorMessage, 'Authenticated') !== false)
+ {
+ // add little more help if it is an access token issue
+ $errorMessage = JText::sprintf('COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO', $errorMessage);
+ }
+ // set error notice
+ $message['error'] = $errorMessage;
+ // we have error message
+ return $message;
+ }
+ return false;
+ }
+
public static function getDynamicScripts($type, $fieldName = false)
{
@@ -1685,181 +2211,6 @@ abstract class ComponentbuilderHelper
return false;
}
- /**
- * Run Global Updater if any are set
- *
- * @return void
- *
- */
- public static function runGlobalUpdater()
- {
- // check if any updates are set to run
- if (self::checkArray(self::$globalUpdater))
- {
- // get the database object
- $db = JFactory::getDbo();
- foreach (self::$globalUpdater as $tableKeyID => $object)
- {
- // get the table
- $table = explode('.', $tableKeyID);
- // update the item
- $db->updateObject('#__componentbuilder_' . (string) $table[0] , $object, (string) $table[1]);
- }
- // rest updater
- self::$globalUpdater = array();
- }
- }
-
- /**
- * Copy Any Item (only use for direct database copying)
- *
- * @param int $id The item to copy
- * @param string $table The table and model to copy from and with
- * @param array $config The values that should change
- *
- * @return boolean True if success
- *
- */
- public static function copyItem($id, $type, $config = array())
- {
- // only continue if we have an id
- if ((int) $id > 0)
- {
- // get the model
- $model = self::getModel($type);
- $app = \JFactory::getApplication();
- // get item
- if ($item = $model->getItem($id))
- {
- // update values that should change
- if (self::checkArray($config))
- {
- foreach($config as $key => $value)
- {
- if (isset($item->{$key}))
- {
- $item->{$key} = $value;
- }
- }
- }
- // clone the object
- $data = array();
- foreach ($item as $key => $value)
- {
- $data[$key] = $value;
- }
- // reset some values
- $data['id'] = 0;
- $data['version'] = 1;
- if (isset($data['tags']))
- {
- $data['tags'] = null;
- }
- if (isset($data['associations']))
- {
- $data['associations'] = array();
- }
- // remove some unneeded values
- unset($data['params']);
- unset($data['asset_id']);
- unset($data['checked_out']);
- unset($data['checked_out_time']);
- // Attempt to save the data.
- if ($model->save($data))
- {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * the basic localkey
- **/
- protected static $localkey = false;
-
- /**
- * get the localkey
- **/
- public static function getLocalKey()
- {
- if (!self::$localkey)
- {
- // get the basic key
- self::$localkey = md5(self::getCryptKey('basic', 'localKey34fdWEkl'));
- }
- return self::$localkey;
- }
-
- /**
- * indent HTML
- */
- public static function indent($html)
- {
- // load the class
- require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/indenter.php';
- // set new indenter
- $indenter = new Indenter();
- // return indented html
- return $indenter->indent($html);
- }
-
- public static function checkFileType($file, $sufix)
- {
- // now check if the file ends with the sufix
- return $sufix === "" || ($sufix == substr(strrchr($file, "."), -strlen($sufix)));
- }
-
- public static function imageInfo($path, $request = 'type')
- {
- // set image
- $image = JPATH_SITE.'/'.$path;
- // check if exists
- if (file_exists($image) && $result = @getimagesize($image))
- {
- // return type request
- switch ($request)
- {
- case 'width':
- return $result[0];
- break;
- case 'height':
- return $result[1];
- break;
- case 'type':
- $extensions = array(
- IMAGETYPE_GIF => "gif",
- IMAGETYPE_JPEG => "jpg",
- IMAGETYPE_PNG => "png",
- IMAGETYPE_SWF => "swf",
- IMAGETYPE_PSD => "psd",
- IMAGETYPE_BMP => "bmp",
- IMAGETYPE_TIFF_II => "tiff",
- IMAGETYPE_TIFF_MM => "tiff",
- IMAGETYPE_JPC => "jpc",
- IMAGETYPE_JP2 => "jp2",
- IMAGETYPE_JPX => "jpx",
- IMAGETYPE_JB2 => "jb2",
- IMAGETYPE_SWC => "swc",
- IMAGETYPE_IFF => "iff",
- IMAGETYPE_WBMP => "wbmp",
- IMAGETYPE_XBM => "xbm",
- IMAGETYPE_ICO => "ico"
- );
- return $extensions[$result[2]];
- break;
- case 'attr':
- return $result[3];
- break;
- case 'all':
- default:
- return $result;
- break;
- }
- }
- return false;
- }
/**
* get between
@@ -1999,278 +2350,6 @@ abstract class ComponentbuilderHelper
return self::getVars('fieldtype', (array) array_map(function($name) use($db) { return $db->quote(ucfirst($name)); }, self::$fieldGroups['spacer']), 'name', 'id');
}
- /**
- * set the session defaults if not set
- **/
- protected static function setSessionDefaults()
- {
- // noting for now
- return true;
- }
-
- /**
- * the Butler
- **/
- public static $session = array();
-
- /**
- * the Butler Assistant
- **/
- protected static $localSession = array();
-
- /**
- * start a session if not already set, and load with data
- **/
- public static function loadSession()
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // set the defaults
- self::setSessionDefaults();
- }
-
- /**
- * give Session more to keep
- **/
- public static function set($key, $value)
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // set to local memory to speed up program
- self::$localSession[$key] = $value;
- // load to session for later use
- return self::$session->set($key, self::$localSession[$key]);
- }
-
- /**
- * get info from Session
- **/
- public static function get($key, $default = null)
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // check if in local memory
- if (!isset(self::$localSession[$key]))
- {
- // set to local memory to speed up program
- self::$localSession[$key] = self::$session->get($key, $default);
- }
- return self::$localSession[$key];
- }
-
- /**
- * check if it is a new hash
- **/
- public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '', $fileType = 'txt')
- {
- // make sure we have a hash
- if (self::checkString($hash))
- {
- // first get the file path
- $path_filename = self::getFilePath('path', $name.$type, $fileType, $key, JPATH_COMPONENT_ADMINISTRATOR);
- // set as read if not already set
- if ($content = self::getFileContents($path_filename, false))
- {
- if ($hash == $content)
- {
- return false;
- }
- }
- // set the hash
- return self::writeFile($path_filename, $hash);
- }
- return false;
- }
-
- protected static $pkOwnerSearch = array(
- 'company' => 'COM_COMPONENTBUILDER_DTCOMPANYDTDDSDD',
- 'owner' => 'COM_COMPONENTBUILDER_DTOWNERDTDDSDD',
- 'email' => 'COM_COMPONENTBUILDER_DTEMAILDTDDSDD',
- 'website' => 'COM_COMPONENTBUILDER_DTWEBSITEDTDDSDD',
- 'license' => 'COM_COMPONENTBUILDER_DTLICENSEDTDDSDD',
- 'copyright' => 'COM_COMPONENTBUILDER_DTCOPYRIGHTDTDDSDD'
- );
-
- /**
- * get the JCB package owner details display
- **/
- public static function getPackageOwnerDetailsDisplay(&$info, $trust = false)
- {
- $hasOwner = false;
- $ownerDetails = '';
- $ownerDetails .= '';
- // load the list items
- foreach (self::$pkOwnerSearch as $key => $dd)
- {
- if ($value = self::getPackageOwnerValue($key, $info))
- {
- $ownerDetails .= JText::sprintf($dd, $value);
- // check if we have a owner/source name
- if (('owner' === $key || 'company' === $key) && !$hasOwner)
- {
- $hasOwner = true;
- $owner = $value;
- }
- }
- }
- $ownerDetails .= '
';
-
- // provide some details to how the user can get a key
- if ($hasOwner && isset($info['getKeyFrom']['buy_link']) && self::checkString($info['getKeyFrom']['buy_link']))
- {
- $ownerDetails .= '
';
- $ownerDetails .= JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_SSA', 'class="btn btn-primary" href="'.$info['getKeyFrom']['buy_link'].'" target="_blank" title="get a key from '.$owner.'"', $owner);
- }
- // add more custom links
- elseif ($hasOwner && isset($info['getKeyFrom']['buy_links']) && self::checkArray($info['getKeyFrom']['buy_links']))
- {
- $buttons = array();
- foreach ($info['getKeyFrom']['buy_links'] as $keyName => $link)
- {
- $buttons[] = JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROM_SB_FOR_A_SSA', $owner, 'class="btn btn-primary" href="'.$link.'" target="_blank" title="get a key from '.$owner.'"', $keyName);
- }
- $ownerDetails .= '
';
- $ownerDetails .= implode('
', $buttons);
- }
- // return the owner details
- if (!$hasOwner)
- {
- $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '
';
- if (!$trust)
- {
- $ownerDetails .= '' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
';
- }
- }
- return ''.$ownerDetails.'
';
- }
-
- public static function getPackageOwnerValue($key, &$info)
- {
- $source = (isset($info['source']) && isset($info['source'][$key])) ? 'source' : ((isset($info['getKeyFrom']) && isset($info['getKeyFrom'][$key])) ? 'getKeyFrom' : false);
- if ($source && self::checkString($info[$source][$key]))
- {
- return $info[$source][$key];
- }
- return false;
- }
-
- /**
- * get the JCB package component key status
- **/
- public static function getPackageComponentsKeyStatus(&$info)
- {
- // check the package key status
- if (!isset($info['key']))
- {
- if (isset($info['getKeyFrom']) && isset($info['getKeyFrom']['owner']))
- {
- // this just confirms it for older packages
- $info['key'] = true;
- }
- else
- {
- // this just confirms it for older packages
- $info['key'] = false;
- }
- }
- return $info['key'];
- }
-
- protected static $compOwnerSearch = array(
- 'ul' => array (
- 'companyname' => 'COM_COMPONENTBUILDER_ICOMPANYI_BSB',
- 'author' => 'COM_COMPONENTBUILDER_IAUTHORI_BSB',
- 'email' => 'COM_COMPONENTBUILDER_IEMAILI_BSB',
- 'website' => 'COM_COMPONENTBUILDER_IWEBSITEI_BSB',
- ),
- 'other' => array(
- 'license' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERLICENSEHFOURPSP',
- 'copyright' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERCOPYRIGHTHFOURPSP'
- )
- );
-
- /**
- * get the JCB package component details display
- **/
- public static function getPackageComponentsDetailsDisplay(&$info)
- {
- // check if these components need a key
- $needKey = self::getPackageComponentsKeyStatus($info);
- if (isset($info['name']) && self::checkArray($info['name']))
- {
- $cAmount = count((array) $info['name']);
- $class2 = ($cAmount == 1) ? 'span12' : 'span6';
- $counter = 1;
- $display = array();
- foreach ($info['name'] as $key => $value)
- {
- // set the name
- $name= $value . ' v' . $info['component_version'][$key];
- if ($cAmount > 1 && $counter == 3)
- {
- $display[] = '';
- $counter = 1;
- }
- if ($cAmount > 1 && $counter == 1)
- {
- $display[] = '';
- }
- $display[] = '
';
- $display[] = '
';
- $display[] = $name;
- if ($needKey)
- {
- $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . '';
- }
- else
- {
- $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . '';
- }
- $display[] = '
';
- $display[] = $info['short_description'][$key];
- $display[] = '
';
- $display[] = '
';
- // load the list items
- foreach (self::$compOwnerSearch['ul'] as $li => $value)
- {
- if (isset($info[$li]) && isset($info[$li][$key]))
- {
- $display[] = '- '.JText::sprintf($value, $info[$li][$key]).'
';
- }
- }
- $display[] = '
';
- // if we have a source link we add it
- if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
- {
- $display[] = '
source code';
- }
- // load other
- foreach (self::$compOwnerSearch['other'] as $other => $value)
- {
- if (isset($info[$other]) && isset($info[$other][$key]))
- {
- $display[] = JText::sprintf($value, $info[$other][$key]);
- }
- }
- $display[] = '
';
-
- $counter++;
- }
- // close the div if needed
- if ($cAmount > 1)
- {
- $display[] = '
'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'
';
- }
/**
* open base64 string if stored as base64
@@ -5192,11 +5271,11 @@ abstract class ComponentbuilderHelper
*
* @input array The array to check
*
- * @returns bool true on success
+ * @returns bool/int number of items in array on success
**/
public static function checkArray($array, $removeEmptyString = false)
{
- if (isset($array) && is_array($array) && count((array)$array) > 0)
+ if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
{
// also make sure the empty strings are removed
if ($removeEmptyString)
@@ -5210,7 +5289,7 @@ abstract class ComponentbuilderHelper
}
return self::checkArray($array, false);
}
- return true;
+ return $nr;
}
return false;
}
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 1d75c498a..9dc3bd2b3 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -322,6 +322,8 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW="A New Admin Fields"
COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE_DB="None DB"
COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION="id, asset_id, state, access, ordering, created_by, created, modified_by, modified, checked_out, checked_out_time, version, hits, metakey, metadesc, metadata (you don't need to add them again)
For more help please watch this tutorial."
COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL="The following fields are added by default to all views."
+COM_COMPONENTBUILDER_ADMIN_FIELDS_ONLY_IN_ADMIN_LIST_VIEW="Only in Admin List View"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_ONLY_IN_LINKED_LIST_VIEWS="Only in Linked List Views"
COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDERING_LABEL="Ordering"
COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_DESCRIPTION="Order in relation to tab & alignment of admin and site."
COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_LABEL="Order in Edit"
@@ -385,7 +387,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_OF_TABS="Right of Tabs"
COM_COMPONENTBUILDER_ADMIN_FIELDS_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin Fields to customise the alias."
COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION="Select if the field is to be searchable in list view, if shown."
COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL="Searchable"
-COM_COMPONENTBUILDER_ADMIN_FIELDS_SHOW_IN_LIST_VIEW="Show in list view"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_SHOW_IN_ALL_LIST_VIEWS="Show in All List Views"
COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown."
COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL="Sortable"
COM_COMPONENTBUILDER_ADMIN_FIELDS_STATUS="Status"
@@ -614,6 +616,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE="core.create"
COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE="core.delete"
COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT="core.edit"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITACCESS="core.edit.access"
COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED="core.edit.created"
COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY="core.edit.created_by"
COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN="core.edit.own"
@@ -1324,6 +1327,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS="view.access"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE="view.create"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE="view.delete"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDIT="view.edit"
+COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITACCESS="view.edit.access"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED="view.edit.created"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY="view.edit.created_by"
COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN="view.edit.own"
@@ -3597,7 +3601,10 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By"
COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified."
COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
-COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="[save to see placeholder]
You can also pass values to this code like this: [save to see placeholder trick]
Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arg1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]
Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.
Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI.
This note will change once we have resolved these limitations."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="[save to see placeholder]
You can also pass values to this code like this: [save to see placeholder trick]
+Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arg1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]
+To use the following [ ] , + = in your string being passed, use the following: [ ⇒ [; ] ⇒ ]; , ⇒ ,; + ⇒ +; = ⇒ =
+Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.
Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI.
This note will change once we have resolved these limitations."
COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder."
COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="
user->name); ?>.
-
+
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index 9a357b22a..3cba321fa 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -87,7 +87,7 @@ JHtml::_('behavior.tooltip');
-
+
'.$github->documentation_url;
- }
- // check the message
- if (strpos($errorMessage, 'Authenticated') !== false)
- {
- // add little more help if it is an access token issue
- $errorMessage = JText::sprintf('COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO', $errorMessage);
- }
- // set error notice
- $message['error'] = $errorMessage;
- // we have error message
- return $message;
- }
- return false;
- }
/**
* The array of constant paths
@@ -581,72 +496,6 @@ abstract class ComponentbuilderHelper
// load this for all
jimport('joomla.application');
}
-
- /**
- * Remove folders with files
- *
- * @param string $dir The path to folder to remove
- * @param boolean $ignore The folders and files to ignore and not remove
- *
- * @return boolean True in all is removed
- *
- */
- public static function removeFolder($dir, $ignore = false)
- {
- if (JFolder::exists($dir))
- {
- $it = new RecursiveDirectoryIterator($dir);
- $it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
- foreach ($it as $file)
- {
- if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
- if ($file->isDir())
- {
- $keeper = false;
- if (self::checkArray($ignore))
- {
- foreach ($ignore as $keep)
- {
- if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
- {
- $keeper = true;
- }
- }
- }
- if ($keeper)
- {
- continue;
- }
- JFolder::delete($file->getPathname());
- }
- else
- {
- $keeper = false;
- if (self::checkArray($ignore))
- {
- foreach ($ignore as $keep)
- {
- if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
- {
- $keeper = true;
- }
- }
- }
- if ($keeper)
- {
- continue;
- }
- JFile::delete($file->getPathname());
- }
- }
- if (!self::checkArray($ignore))
- {
- return JFolder::delete($dir);
- }
- return true;
- }
- return false;
- }
/**
* The dynamic builder of views, tables and fields
@@ -656,203 +505,6 @@ abstract class ComponentbuilderHelper
self::autoLoader('extrusion');
$extruder = new Extrusion($data);
}
-
- public static function getFieldOptions($value, $type, $settings = array(), $xml = null)
- {
- // Get a db connection.
- $db = JFactory::getDbo();
-
- // Create a new query object.
- $query = $db->getQuery(true);
- $query->select($db->quoteName(array('properties', 'short_description', 'description')));
- $query->from($db->quoteName('#__componentbuilder_fieldtype'));
- $query->where($db->quoteName('published') . ' = 1');
- $query->where($db->quoteName($type) . ' = '. $value);
-
- // Reset the query using our newly populated query object.
- $db->setQuery($query);
- $db->execute();
- if ($db->getNumRows())
- {
- $result = $db->loadObject();
- $properties = json_decode($result->properties, true);
- $field = array(
- 'subform' => array(),
- 'nameListOptions' => array(),
- 'php' => array(),
- 'values' => " '',
- 'short_description' => $result->short_description,
- 'description' => $result->description);
- // number pointer
- $nr = 0;
- // value to check since there are false and null values even 0 in the values returned
- $confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
- // set the headers
- $field['values_description'] .= '| ' . JText::_('COM_COMPONENTBUILDER_PROPERTY') . ' | ' . JText::_('COM_COMPONENTBUILDER_EXAMPLE') . ' | ' . JText::_('COM_COMPONENTBUILDER_DESCRIPTION') . ' |
|---|
';
- foreach ($properties as $property)
- {
- $example = (isset($property['example']) && self::checkString($property['example'])) ? $property['example'] : '';
- $field['values_description'] .= '' . $property['name'] . ' | ' . $example . ' | ' . $property['description'] . ' |
';
- // check if we should load the value
- $value = self::getValueFromXMLstring($xml, $property['name'], $confirmation);
- // check if this is a php field
- $addPHP = false;
- if (strpos($property['name'], 'type_php') !== false)
- {
- $addPHP = true;
- $phpKey = trim(preg_replace('/[0-9]+/', '', $property['name']), '_');
- // start array if not already set
- if (!isset($field['php'][$phpKey]))
- {
- $field['php'][$phpKey] = array();
- $field['php'][$phpKey]['value'] = array();
- $field['php'][$phpKey]['desc'] = $property['description'];
- }
- }
- // was the settings for the property passed
- if(self::checkArray($settings) && isset($settings[$property['name']]))
- {
- // add the xml values
- $field['values'] .= PHP_EOL . "\t" . $property['name'] . '="'. $settings[$property['name']] . '" ';
- // add the json values
- if ($addPHP)
- {
- $field['php'][$phpKey]['value'][] = $settings[$property['name']];
- }
- else
- {
- $field['subform']['properties'.$nr] = array('name' => $property['name'], 'value' => $settings[$property['name']], 'desc' => $property['description']);
- }
- }
- elseif (!$xml || $confirmation !== $value)
- {
- // add the xml values
- $field['values'] .= PHP_EOL."\t" . $property['name'] . '="' . ($confirmation !== $value) ? $value : $example .'" ';
- // add the json values
- if ($addPHP)
- {
- $field['php'][$phpKey]['value'][] = ($confirmation !== $value) ? $value : $example;
- }
- else
- {
- $field['subform']['properties' . $nr] = array('name' => $property['name'], 'value' => ($confirmation !== $value) ? $value : $example, 'desc' => $property['description']);
- }
- }
- // add the name List Options
- if (!$addPHP)
- {
- $field['nameListOptions'][$property['name']] = $property['name'];
- }
- // increment the number
- $nr++;
- }
- $field['values'] .= PHP_EOL . "/>";
- $field['values_description'] .= '
';
- // return found field options
- return $field;
- }
- return false;
- }
-
- public static function getValueFromXMLstring(&$xml, &$get, $confirmation = '')
- {
- if (self::checkString($xml))
- {
- // if we have a PHP value, we must base64 decode it
- if (strpos($get, 'type_php') !== false)
- {
- return self::openValidBase64(self::getBetween($xml, $get.'="', '"', $confirmation));
- }
- return self::getBetween($xml, $get . '="', '"', $confirmation);
- }
- return $confirmation;
- }
-
-
- /**
- * The zipper method
- *
- * @param string $workingDIR The directory where the items must be zipped
- * @param string $filepath The path to where the zip file must be placed
- *
- * @return bool true On success
- *
- */
- public static function zip($workingDIR, &$filepath)
- {
- // store the current joomla working directory
- $joomla = getcwd();
-
- // we are changing the working directory to the component temp folder
- chdir($workingDIR);
-
- // the full file path of the zip file
- $filepath = JPath::clean($filepath);
-
- // delete an existing zip file (or use an exclusion parameter in JFolder::files()
- JFile::delete($filepath);
-
- // get a list of files in the current directory tree
- $files = JFolder::files('.', '', true, true);
- $zipArray = array();
- // setup the zip array
- foreach ($files as $file)
- {
- $tmp = array();
- $tmp['name'] = str_replace('./', '', $file);
- $tmp['data'] = JFile::read($file);
- $tmp['time'] = filemtime($file);
- $zipArray[] = $tmp;
- }
-
- // change back to joomla working directory
- chdir($joomla);
-
- // get the zip adapter
- $zip = JArchive::getAdapter('zip');
-
- //create the zip file
- if ($zip->create($filepath, $zipArray))
- {
- return true;
- }
- return false;
- }
-
-
- /**
- * Write a file to the server
- *
- * @param string $path The path and file name where to safe the data
- * @param string $data The data to safe
- *
- * @return bool true On success
- *
- */
- public static function writeFile($path, $data)
- {
- $klaar = false;
- if (self::checkString($data))
- {
- // open the file
- $fh = fopen($path, "w");
- if (!is_resource($fh))
- {
- return $klaar;
- }
- // write to the file
- if (fwrite($fh, $data))
- {
- // has been done
- $klaar = true;
- }
- // close file.
- fclose($fh);
- }
- return $klaar;
- }
-
/*
* Convert repeatable field to subform
@@ -965,6 +617,880 @@ abstract class ComponentbuilderHelper
}
return $object;
}
+
+ /**
+ * Run Global Updater if any are set
+ *
+ * @return void
+ *
+ */
+ public static function runGlobalUpdater()
+ {
+ // check if any updates are set to run
+ if (self::checkArray(self::$globalUpdater))
+ {
+ // get the database object
+ $db = JFactory::getDbo();
+ foreach (self::$globalUpdater as $tableKeyID => $object)
+ {
+ // get the table
+ $table = explode('.', $tableKeyID);
+ // update the item
+ $db->updateObject('#__componentbuilder_' . (string) $table[0] , $object, (string) $table[1]);
+ }
+ // rest updater
+ self::$globalUpdater = array();
+ }
+ }
+
+ /**
+ * Copy Any Item (only use for direct database copying)
+ *
+ * @param int $id The item to copy
+ * @param string $table The table and model to copy from and with
+ * @param array $config The values that should change
+ *
+ * @return boolean True if success
+ *
+ */
+ public static function copyItem($id, $type, $config = array())
+ {
+ // only continue if we have an id
+ if ((int) $id > 0)
+ {
+ // get the model
+ $model = self::getModel($type);
+ $app = \JFactory::getApplication();
+ // get item
+ if ($item = $model->getItem($id))
+ {
+ // update values that should change
+ if (self::checkArray($config))
+ {
+ foreach($config as $key => $value)
+ {
+ if (isset($item->{$key}))
+ {
+ $item->{$key} = $value;
+ }
+ }
+ }
+ // clone the object
+ $data = array();
+ foreach ($item as $key => $value)
+ {
+ $data[$key] = $value;
+ }
+ // reset some values
+ $data['id'] = 0;
+ $data['version'] = 1;
+ if (isset($data['tags']))
+ {
+ $data['tags'] = null;
+ }
+ if (isset($data['associations']))
+ {
+ $data['associations'] = array();
+ }
+ // remove some unneeded values
+ unset($data['params']);
+ unset($data['asset_id']);
+ unset($data['checked_out']);
+ unset($data['checked_out_time']);
+ // Attempt to save the data.
+ if ($model->save($data))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * the basic localkey
+ **/
+ protected static $localkey = false;
+
+ /**
+ * get the localkey
+ **/
+ public static function getLocalKey()
+ {
+ if (!self::$localkey)
+ {
+ // get the basic key
+ self::$localkey = md5(self::getCryptKey('basic', 'localKey34fdWEkl'));
+ }
+ return self::$localkey;
+ }
+
+ /**
+ * indent HTML
+ */
+ public static function indent($html)
+ {
+ // load the class
+ require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/indenter.php';
+ // set new indenter
+ $indenter = new Indenter();
+ // return indented html
+ return $indenter->indent($html);
+ }
+
+ public static function checkFileType($file, $sufix)
+ {
+ // now check if the file ends with the sufix
+ return $sufix === "" || ($sufix == substr(strrchr($file, "."), -strlen($sufix)));
+ }
+
+ public static function imageInfo($path, $request = 'type')
+ {
+ // set image
+ $image = JPATH_SITE.'/'.$path;
+ // check if exists
+ if (file_exists($image) && $result = @getimagesize($image))
+ {
+ // return type request
+ switch ($request)
+ {
+ case 'width':
+ return $result[0];
+ break;
+ case 'height':
+ return $result[1];
+ break;
+ case 'type':
+ $extensions = array(
+ IMAGETYPE_GIF => "gif",
+ IMAGETYPE_JPEG => "jpg",
+ IMAGETYPE_PNG => "png",
+ IMAGETYPE_SWF => "swf",
+ IMAGETYPE_PSD => "psd",
+ IMAGETYPE_BMP => "bmp",
+ IMAGETYPE_TIFF_II => "tiff",
+ IMAGETYPE_TIFF_MM => "tiff",
+ IMAGETYPE_JPC => "jpc",
+ IMAGETYPE_JP2 => "jp2",
+ IMAGETYPE_JPX => "jpx",
+ IMAGETYPE_JB2 => "jb2",
+ IMAGETYPE_SWC => "swc",
+ IMAGETYPE_IFF => "iff",
+ IMAGETYPE_WBMP => "wbmp",
+ IMAGETYPE_XBM => "xbm",
+ IMAGETYPE_ICO => "ico"
+ );
+ return $extensions[$result[2]];
+ break;
+ case 'attr':
+ return $result[3];
+ break;
+ case 'all':
+ default:
+ return $result;
+ break;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * set the session defaults if not set
+ **/
+ protected static function setSessionDefaults()
+ {
+ // noting for now
+ return true;
+ }
+
+ /**
+ * check if it is a new hash
+ **/
+ public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '', $fileType = 'txt')
+ {
+ // make sure we have a hash
+ if (self::checkString($hash))
+ {
+ // first get the file path
+ $path_filename = self::getFilePath('path', $name.$type, $fileType, $key, JPATH_COMPONENT_ADMINISTRATOR);
+ // set as read if not already set
+ if ($content = self::getFileContents($path_filename, false))
+ {
+ if ($hash == $content)
+ {
+ return false;
+ }
+ }
+ // set the hash
+ return self::writeFile($path_filename, $hash);
+ }
+ return false;
+ }
+
+ protected static $pkOwnerSearch = array(
+ 'company' => 'COM_COMPONENTBUILDER_DTCOMPANYDTDDSDD',
+ 'owner' => 'COM_COMPONENTBUILDER_DTOWNERDTDDSDD',
+ 'email' => 'COM_COMPONENTBUILDER_DTEMAILDTDDSDD',
+ 'website' => 'COM_COMPONENTBUILDER_DTWEBSITEDTDDSDD',
+ 'license' => 'COM_COMPONENTBUILDER_DTLICENSEDTDDSDD',
+ 'copyright' => 'COM_COMPONENTBUILDER_DTCOPYRIGHTDTDDSDD'
+ );
+
+ /**
+ * get the JCB package owner details display
+ **/
+ public static function getPackageOwnerDetailsDisplay(&$info, $trust = false)
+ {
+ $hasOwner = false;
+ $ownerDetails = '';
+ $ownerDetails .= '';
+ // load the list items
+ foreach (self::$pkOwnerSearch as $key => $dd)
+ {
+ if ($value = self::getPackageOwnerValue($key, $info))
+ {
+ $ownerDetails .= JText::sprintf($dd, $value);
+ // check if we have a owner/source name
+ if (('owner' === $key || 'company' === $key) && !$hasOwner)
+ {
+ $hasOwner = true;
+ $owner = $value;
+ }
+ }
+ }
+ $ownerDetails .= '
';
+
+ // provide some details to how the user can get a key
+ if ($hasOwner && isset($info['getKeyFrom']['buy_link']) && self::checkString($info['getKeyFrom']['buy_link']))
+ {
+ $ownerDetails .= '
';
+ $ownerDetails .= JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_SSA', 'class="btn btn-primary" href="'.$info['getKeyFrom']['buy_link'].'" target="_blank" title="get a key from '.$owner.'"', $owner);
+ }
+ // add more custom links
+ elseif ($hasOwner && isset($info['getKeyFrom']['buy_links']) && self::checkArray($info['getKeyFrom']['buy_links']))
+ {
+ $buttons = array();
+ foreach ($info['getKeyFrom']['buy_links'] as $keyName => $link)
+ {
+ $buttons[] = JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROM_SB_FOR_A_SSA', $owner, 'class="btn btn-primary" href="'.$link.'" target="_blank" title="get a key from '.$owner.'"', $keyName);
+ }
+ $ownerDetails .= '
';
+ $ownerDetails .= implode('
', $buttons);
+ }
+ // return the owner details
+ if (!$hasOwner)
+ {
+ $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '
';
+ if (!$trust)
+ {
+ $ownerDetails .= '' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
';
+ }
+ }
+ return ''.$ownerDetails.'
';
+ }
+
+ public static function getPackageOwnerValue($key, &$info)
+ {
+ $source = (isset($info['source']) && isset($info['source'][$key])) ? 'source' : ((isset($info['getKeyFrom']) && isset($info['getKeyFrom'][$key])) ? 'getKeyFrom' : false);
+ if ($source && self::checkString($info[$source][$key]))
+ {
+ return $info[$source][$key];
+ }
+ return false;
+ }
+
+ /**
+ * get the JCB package component key status
+ **/
+ public static function getPackageComponentsKeyStatus(&$info)
+ {
+ // check the package key status
+ if (!isset($info['key']))
+ {
+ if (isset($info['getKeyFrom']) && isset($info['getKeyFrom']['owner']))
+ {
+ // this just confirms it for older packages
+ $info['key'] = true;
+ }
+ else
+ {
+ // this just confirms it for older packages
+ $info['key'] = false;
+ }
+ }
+ return $info['key'];
+ }
+
+ protected static $compOwnerSearch = array(
+ 'ul' => array (
+ 'companyname' => 'COM_COMPONENTBUILDER_ICOMPANYI_BSB',
+ 'author' => 'COM_COMPONENTBUILDER_IAUTHORI_BSB',
+ 'email' => 'COM_COMPONENTBUILDER_IEMAILI_BSB',
+ 'website' => 'COM_COMPONENTBUILDER_IWEBSITEI_BSB',
+ ),
+ 'other' => array(
+ 'license' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERLICENSEHFOURPSP',
+ 'copyright' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERCOPYRIGHTHFOURPSP'
+ )
+ );
+
+ /**
+ * get the JCB package component details display
+ **/
+ public static function getPackageComponentsDetailsDisplay(&$info)
+ {
+ // check if these components need a key
+ $needKey = self::getPackageComponentsKeyStatus($info);
+ if (isset($info['name']) && self::checkArray($info['name']))
+ {
+ $cAmount = count((array) $info['name']);
+ $class2 = ($cAmount == 1) ? 'span12' : 'span6';
+ $counter = 1;
+ $display = array();
+ foreach ($info['name'] as $key => $value)
+ {
+ // set the name
+ $name= $value . ' v' . $info['component_version'][$key];
+ if ($cAmount > 1 && $counter == 3)
+ {
+ $display[] = '';
+ $counter = 1;
+ }
+ if ($cAmount > 1 && $counter == 1)
+ {
+ $display[] = '';
+ }
+ $display[] = '
';
+ $display[] = '
';
+ $display[] = $name;
+ if ($needKey)
+ {
+ $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . '';
+ }
+ else
+ {
+ $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . '';
+ }
+ $display[] = '
';
+ $display[] = $info['short_description'][$key];
+ $display[] = '
';
+ $display[] = '
';
+ // load the list items
+ foreach (self::$compOwnerSearch['ul'] as $li => $value)
+ {
+ if (isset($info[$li]) && isset($info[$li][$key]))
+ {
+ $display[] = '- '.JText::sprintf($value, $info[$li][$key]).'
';
+ }
+ }
+ $display[] = '
';
+ // if we have a source link we add it
+ if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
+ {
+ $display[] = '
source code';
+ }
+ // load other
+ foreach (self::$compOwnerSearch['other'] as $other => $value)
+ {
+ if (isset($info[$other]) && isset($info[$other][$key]))
+ {
+ $display[] = JText::sprintf($value, $info[$other][$key]);
+ }
+ }
+ $display[] = '
';
+
+ $counter++;
+ }
+ // close the div if needed
+ if ($cAmount > 1)
+ {
+ $display[] = '
'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'
';
+ }
+
+ /**
+ * The array of dynamic content
+ *
+ * @var array
+ */
+ protected static $dynamicContent = array(
+ // The banners by size
+ 'banner' => array(
+ '728-90' => array(
+ '
',
+ '
'
+ ),
+ '160-600' => array(
+ '',
+ '
'
+ )
+ ),
+ // The build-gif by size
+ 'builder-gif' => array(
+ '707-400' => array(
+ ''
+ )
+ )
+ );
+
+ /**
+ * get the dynamic content
+ *
+ * @param string $type The type of content
+ * @param string $size The size of the content
+ *
+ * @return string on success
+ *
+ */
+ public static function getDynamicContent($type, $size, $default = '')
+ {
+ if (isset(self::$dynamicContent[$type]) && isset(self::$dynamicContent[$type][$size]) && ($nr = self::checkArray(self::$dynamicContent[$type][$size])))
+ {
+ // get the random item number
+ $get = (int) rand(0, --$nr);
+ // return found content
+ return self::$dynamicContent[$type][$size][$get];
+ }
+ return $default;
+ }
+
+ /**
+ * the Butler
+ **/
+ public static $session = array();
+
+ /**
+ * the Butler Assistant
+ **/
+ protected static $localSession = array();
+
+ /**
+ * start a session if not already set, and load with data
+ **/
+ public static function loadSession()
+ {
+ if (!isset(self::$session) || !self::checkObject(self::$session))
+ {
+ self::$session = JFactory::getSession();
+ }
+ // set the defaults
+ self::setSessionDefaults();
+ }
+
+ /**
+ * give Session more to keep
+ **/
+ public static function set($key, $value)
+ {
+ if (!isset(self::$session) || !self::checkObject(self::$session))
+ {
+ self::$session = JFactory::getSession();
+ }
+ // set to local memory to speed up program
+ self::$localSession[$key] = $value;
+ // load to session for later use
+ return self::$session->set($key, self::$localSession[$key]);
+ }
+
+ /**
+ * get info from Session
+ **/
+ public static function get($key, $default = null)
+ {
+ if (!isset(self::$session) || !self::checkObject(self::$session))
+ {
+ self::$session = JFactory::getSession();
+ }
+ // check if in local memory
+ if (!isset(self::$localSession[$key]))
+ {
+ // set to local memory to speed up program
+ self::$localSession[$key] = self::$session->get($key, $default);
+ }
+ return self::$localSession[$key];
+ }
+
+
+ public static function getFieldOptions($value, $type, $settings = array(), $xml = null)
+ {
+ // Get a db connection.
+ $db = JFactory::getDbo();
+
+ // Create a new query object.
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName(array('properties', 'short_description', 'description')));
+ $query->from($db->quoteName('#__componentbuilder_fieldtype'));
+ $query->where($db->quoteName('published') . ' = 1');
+ $query->where($db->quoteName($type) . ' = '. $value);
+
+ // Reset the query using our newly populated query object.
+ $db->setQuery($query);
+ $db->execute();
+ if ($db->getNumRows())
+ {
+ $result = $db->loadObject();
+ $properties = json_decode($result->properties, true);
+ $field = array(
+ 'subform' => array(),
+ 'nameListOptions' => array(),
+ 'php' => array(),
+ 'values' => " '',
+ 'short_description' => $result->short_description,
+ 'description' => $result->description);
+ // number pointer
+ $nr = 0;
+ // php tracker (we must try to load alteast 17 rows
+ $phpTracker = array();
+ // value to check since there are false and null values even 0 in the values returned
+ $confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+ // set the headers
+ $field['values_description'] .= '| ' . JText::_('COM_COMPONENTBUILDER_PROPERTY') . ' | ' . JText::_('COM_COMPONENTBUILDER_EXAMPLE') . ' | ' . JText::_('COM_COMPONENTBUILDER_DESCRIPTION') . ' |
|---|
';
+ foreach ($properties as $property)
+ {
+ $example = (isset($property['example']) && self::checkString($property['example'])) ? $property['example'] : '';
+ $field['values_description'] .= '' . $property['name'] . ' | ' . $example . ' | ' . $property['description'] . ' |
';
+ // check if we should load the value
+ $value = self::getValueFromXMLstring($xml, $property['name'], $confirmation);
+ // check if this is a php field
+ $addPHP = false;
+ if (strpos($property['name'], 'type_php') !== false)
+ {
+ $addPHP = true;
+ // set the line number
+ $phpLine = (int) preg_replace('/[^0-9]/', '', $property['name']);
+ // set the key
+ $phpKey = trim(preg_replace('/[0-9]+/', '', $property['name']), '_');
+ // start array if not already set
+ if (!isset($field['php'][$phpKey]))
+ {
+ $field['php'][$phpKey] = array();
+ $field['php'][$phpKey]['value'] = array();
+ $field['php'][$phpKey]['desc'] = $property['description'];
+ // start tracker
+ $phpTracker[$phpKey] = 1;
+ }
+ }
+ // was the settings for the property passed
+ if(self::checkArray($settings) && isset($settings[$property['name']]))
+ {
+ // add the xml values
+ $field['values'] .= PHP_EOL . "\t" . $property['name'] . '="'. $settings[$property['name']] . '" ';
+ // add the json values
+ if ($addPHP)
+ {
+ $field['php'][$phpKey]['value'][$phpLine] = $settings[$property['name']];
+ $phpTracker[$phpKey]++;
+ }
+ else
+ {
+ $field['subform']['properties'.$nr] = array('name' => $property['name'], 'value' => $settings[$property['name']], 'desc' => $property['description']);
+ }
+ }
+ elseif (!$xml || $confirmation !== $value)
+ {
+ // add the xml values
+ $field['values'] .= PHP_EOL."\t" . $property['name'] . '="' . ($confirmation !== $value) ? $value : $example .'" ';
+ // add the json values
+ if ($addPHP)
+ {
+ $field['php'][$phpKey]['value'][$phpLine] = ($confirmation !== $value) ? $value : $example;
+ $phpTracker[$phpKey]++;
+ }
+ else
+ {
+ $field['subform']['properties' . $nr] = array('name' => $property['name'], 'value' => ($confirmation !== $value) ? $value : $example, 'desc' => $property['description']);
+ }
+ }
+ // add the name List Options
+ if (!$addPHP)
+ {
+ $field['nameListOptions'][$property['name']] = $property['name'];
+ }
+ // increment the number
+ $nr++;
+ }
+ // check if all php is loaded using the tracker
+ if (self::checkString($xml) && isset($phpTracker) && self::checkArray($phpTracker))
+ {
+ foreach ($phpTracker as $phpKey => $start)
+ {
+ if ($start < 30)
+ {
+ // we must search for more code in the xml just incase
+ foreach(range(2, 30) as $t_nr)
+ {
+ $get_ = $phpKey . '_' . $t_nr;
+ if (!isset($field['php'][$phpKey]['value'][$t_nr]) && ($value = self::getValueFromXMLstring($xml, $get_, $confirmation)) !== $confirmation)
+ {
+ $field['php'][$phpKey]['value'][$t_nr] = $value;
+ }
+ }
+ }
+ }
+ }
+ $field['values'] .= PHP_EOL . "/>";
+ $field['values_description'] .= '
';
+ // return found field options
+ return $field;
+ }
+ return false;
+ }
+
+ public static function getValueFromXMLstring(&$xml, &$get, $confirmation = '')
+ {
+ if (self::checkString($xml))
+ {
+ // if we have a PHP value, we must base64 decode it
+ if (strpos($get, 'type_php') !== false)
+ {
+ return self::openValidBase64(self::getBetween($xml, $get.'="', '"', $confirmation));
+ }
+ return self::getBetween($xml, $get . '="', '"', $confirmation);
+ }
+ return $confirmation;
+ }
+
+
+ /**
+ * The zipper method
+ *
+ * @param string $workingDIR The directory where the items must be zipped
+ * @param string $filepath The path to where the zip file must be placed
+ *
+ * @return bool true On success
+ *
+ */
+ public static function zip($workingDIR, &$filepath)
+ {
+ // store the current joomla working directory
+ $joomla = getcwd();
+
+ // we are changing the working directory to the component temp folder
+ chdir($workingDIR);
+
+ // the full file path of the zip file
+ $filepath = JPath::clean($filepath);
+
+ // delete an existing zip file (or use an exclusion parameter in JFolder::files()
+ JFile::delete($filepath);
+
+ // get a list of files in the current directory tree
+ $files = JFolder::files('.', '', true, true);
+ $zipArray = array();
+ // setup the zip array
+ foreach ($files as $file)
+ {
+ $tmp = array();
+ $tmp['name'] = str_replace('./', '', $file);
+ $tmp['data'] = JFile::read($file);
+ $tmp['time'] = filemtime($file);
+ $zipArray[] = $tmp;
+ }
+
+ // change back to joomla working directory
+ chdir($joomla);
+
+ // get the zip adapter
+ $zip = JArchive::getAdapter('zip');
+
+ //create the zip file
+ if ($zip->create($filepath, $zipArray))
+ {
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * Write a file to the server
+ *
+ * @param string $path The path and file name where to safe the data
+ * @param string $data The data to safe
+ *
+ * @return bool true On success
+ *
+ */
+ public static function writeFile($path, $data)
+ {
+ $klaar = false;
+ if (self::checkString($data))
+ {
+ // open the file
+ $fh = fopen($path, "w");
+ if (!is_resource($fh))
+ {
+ return $klaar;
+ }
+ // write to the file
+ if (fwrite($fh, $data))
+ {
+ // has been done
+ $klaar = true;
+ }
+ // close file.
+ fclose($fh);
+ }
+ return $klaar;
+ }
+
+
+ /**
+ * Remove folders with files
+ *
+ * @param string $dir The path to folder to remove
+ * @param boolean $ignore The folders and files to ignore and not remove
+ *
+ * @return boolean True in all is removed
+ *
+ */
+ public static function removeFolder($dir, $ignore = false)
+ {
+ if (JFolder::exists($dir))
+ {
+ $it = new RecursiveDirectoryIterator($dir);
+ $it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
+ foreach ($it as $file)
+ {
+ if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
+ if ($file->isDir())
+ {
+ $keeper = false;
+ if (self::checkArray($ignore))
+ {
+ foreach ($ignore as $keep)
+ {
+ if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
+ {
+ $keeper = true;
+ }
+ }
+ }
+ if ($keeper)
+ {
+ continue;
+ }
+ JFolder::delete($file->getPathname());
+ }
+ else
+ {
+ $keeper = false;
+ if (self::checkArray($ignore))
+ {
+ foreach ($ignore as $keep)
+ {
+ if (strpos($file->getPathname(), $dir.'/'.$keep) !== false)
+ {
+ $keeper = true;
+ }
+ }
+ }
+ if ($keeper)
+ {
+ continue;
+ }
+ JFile::delete($file->getPathname());
+ }
+ }
+ if (!self::checkArray($ignore))
+ {
+ return JFolder::delete($dir);
+ }
+ return true;
+ }
+ return false;
+ }
+
+
+ /**
+ * get the github repo file list
+ *
+ * @return array on success
+ *
+ */
+ public static function getGithubRepoFileList($type, $target)
+ {
+ // get the current Packages (public)
+ if (!$repoData = self::get($type))
+ {
+ if (self::urlExists($target))
+ {
+ $repoData = self::getFileContents($target);
+ if (self::checkJson($repoData))
+ {
+ $test = json_decode($repoData);
+ if (self::checkObject($test) && isset($test->tree) && self::checkArray($test->tree) )
+ {
+ // remember to set it
+ self::set($type, $repoData);
+ }
+ // check if we have error message from github
+ elseif ($errorMessage = self::githubErrorHandeler(array('error' => null), $test))
+ {
+ if (self::checkString($errorMessage['error']))
+ {
+ JFactory::getApplication()->enqueueMessage($errorMessage['error'], 'Error');
+ }
+ $repoData = false;
+ }
+ }
+ else
+ {
+ $repoData = false;
+ }
+ }
+ else
+ {
+ JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST', $target), 'Error');
+ }
+ }
+ // check if we could find packages
+ if (isset($repoData) && self::checkJson($repoData))
+ {
+ $repoData = json_decode($repoData);
+ if (self::checkObject($repoData) && isset($repoData->tree) && self::checkArray($repoData->tree) )
+ {
+ return $repoData->tree;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * get the github error messages
+ *
+ * @return array of errors on success
+ *
+ */
+ protected static function githubErrorHandeler($message, &$github)
+ {
+ if (self::checkObject($github) && isset($github->message) && self::checkString($github->message))
+ {
+ // set the message
+ $errorMessage = $github->message;
+ // add the documentation URL
+ if (isset($github->documentation_url) && self::checkString($github->documentation_url))
+ {
+ $errorMessage = $errorMessage.'
'.$github->documentation_url;
+ }
+ // check the message
+ if (strpos($errorMessage, 'Authenticated') !== false)
+ {
+ // add little more help if it is an access token issue
+ $errorMessage = JText::sprintf('COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO', $errorMessage);
+ }
+ // set error notice
+ $message['error'] = $errorMessage;
+ // we have error message
+ return $message;
+ }
+ return false;
+ }
+
public static function getDynamicScripts($type, $fieldName = false)
{
@@ -1685,181 +2211,6 @@ abstract class ComponentbuilderHelper
return false;
}
- /**
- * Run Global Updater if any are set
- *
- * @return void
- *
- */
- public static function runGlobalUpdater()
- {
- // check if any updates are set to run
- if (self::checkArray(self::$globalUpdater))
- {
- // get the database object
- $db = JFactory::getDbo();
- foreach (self::$globalUpdater as $tableKeyID => $object)
- {
- // get the table
- $table = explode('.', $tableKeyID);
- // update the item
- $db->updateObject('#__componentbuilder_' . (string) $table[0] , $object, (string) $table[1]);
- }
- // rest updater
- self::$globalUpdater = array();
- }
- }
-
- /**
- * Copy Any Item (only use for direct database copying)
- *
- * @param int $id The item to copy
- * @param string $table The table and model to copy from and with
- * @param array $config The values that should change
- *
- * @return boolean True if success
- *
- */
- public static function copyItem($id, $type, $config = array())
- {
- // only continue if we have an id
- if ((int) $id > 0)
- {
- // get the model
- $model = self::getModel($type);
- $app = \JFactory::getApplication();
- // get item
- if ($item = $model->getItem($id))
- {
- // update values that should change
- if (self::checkArray($config))
- {
- foreach($config as $key => $value)
- {
- if (isset($item->{$key}))
- {
- $item->{$key} = $value;
- }
- }
- }
- // clone the object
- $data = array();
- foreach ($item as $key => $value)
- {
- $data[$key] = $value;
- }
- // reset some values
- $data['id'] = 0;
- $data['version'] = 1;
- if (isset($data['tags']))
- {
- $data['tags'] = null;
- }
- if (isset($data['associations']))
- {
- $data['associations'] = array();
- }
- // remove some unneeded values
- unset($data['params']);
- unset($data['asset_id']);
- unset($data['checked_out']);
- unset($data['checked_out_time']);
- // Attempt to save the data.
- if ($model->save($data))
- {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * the basic localkey
- **/
- protected static $localkey = false;
-
- /**
- * get the localkey
- **/
- public static function getLocalKey()
- {
- if (!self::$localkey)
- {
- // get the basic key
- self::$localkey = md5(self::getCryptKey('basic', 'localKey34fdWEkl'));
- }
- return self::$localkey;
- }
-
- /**
- * indent HTML
- */
- public static function indent($html)
- {
- // load the class
- require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/indenter.php';
- // set new indenter
- $indenter = new Indenter();
- // return indented html
- return $indenter->indent($html);
- }
-
- public static function checkFileType($file, $sufix)
- {
- // now check if the file ends with the sufix
- return $sufix === "" || ($sufix == substr(strrchr($file, "."), -strlen($sufix)));
- }
-
- public static function imageInfo($path, $request = 'type')
- {
- // set image
- $image = JPATH_SITE.'/'.$path;
- // check if exists
- if (file_exists($image) && $result = @getimagesize($image))
- {
- // return type request
- switch ($request)
- {
- case 'width':
- return $result[0];
- break;
- case 'height':
- return $result[1];
- break;
- case 'type':
- $extensions = array(
- IMAGETYPE_GIF => "gif",
- IMAGETYPE_JPEG => "jpg",
- IMAGETYPE_PNG => "png",
- IMAGETYPE_SWF => "swf",
- IMAGETYPE_PSD => "psd",
- IMAGETYPE_BMP => "bmp",
- IMAGETYPE_TIFF_II => "tiff",
- IMAGETYPE_TIFF_MM => "tiff",
- IMAGETYPE_JPC => "jpc",
- IMAGETYPE_JP2 => "jp2",
- IMAGETYPE_JPX => "jpx",
- IMAGETYPE_JB2 => "jb2",
- IMAGETYPE_SWC => "swc",
- IMAGETYPE_IFF => "iff",
- IMAGETYPE_WBMP => "wbmp",
- IMAGETYPE_XBM => "xbm",
- IMAGETYPE_ICO => "ico"
- );
- return $extensions[$result[2]];
- break;
- case 'attr':
- return $result[3];
- break;
- case 'all':
- default:
- return $result;
- break;
- }
- }
- return false;
- }
/**
* get between
@@ -1999,278 +2350,6 @@ abstract class ComponentbuilderHelper
return self::getVars('fieldtype', (array) array_map(function($name) use($db) { return $db->quote(ucfirst($name)); }, self::$fieldGroups['spacer']), 'name', 'id');
}
- /**
- * set the session defaults if not set
- **/
- protected static function setSessionDefaults()
- {
- // noting for now
- return true;
- }
-
- /**
- * the Butler
- **/
- public static $session = array();
-
- /**
- * the Butler Assistant
- **/
- protected static $localSession = array();
-
- /**
- * start a session if not already set, and load with data
- **/
- public static function loadSession()
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // set the defaults
- self::setSessionDefaults();
- }
-
- /**
- * give Session more to keep
- **/
- public static function set($key, $value)
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // set to local memory to speed up program
- self::$localSession[$key] = $value;
- // load to session for later use
- return self::$session->set($key, self::$localSession[$key]);
- }
-
- /**
- * get info from Session
- **/
- public static function get($key, $default = null)
- {
- if (!isset(self::$session) || !self::checkObject(self::$session))
- {
- self::$session = JFactory::getSession();
- }
- // check if in local memory
- if (!isset(self::$localSession[$key]))
- {
- // set to local memory to speed up program
- self::$localSession[$key] = self::$session->get($key, $default);
- }
- return self::$localSession[$key];
- }
-
- /**
- * check if it is a new hash
- **/
- public static function newHash($hash, $name = 'backup', $type = 'hash', $key = '', $fileType = 'txt')
- {
- // make sure we have a hash
- if (self::checkString($hash))
- {
- // first get the file path
- $path_filename = self::getFilePath('path', $name.$type, $fileType, $key, JPATH_COMPONENT_ADMINISTRATOR);
- // set as read if not already set
- if ($content = self::getFileContents($path_filename, false))
- {
- if ($hash == $content)
- {
- return false;
- }
- }
- // set the hash
- return self::writeFile($path_filename, $hash);
- }
- return false;
- }
-
- protected static $pkOwnerSearch = array(
- 'company' => 'COM_COMPONENTBUILDER_DTCOMPANYDTDDSDD',
- 'owner' => 'COM_COMPONENTBUILDER_DTOWNERDTDDSDD',
- 'email' => 'COM_COMPONENTBUILDER_DTEMAILDTDDSDD',
- 'website' => 'COM_COMPONENTBUILDER_DTWEBSITEDTDDSDD',
- 'license' => 'COM_COMPONENTBUILDER_DTLICENSEDTDDSDD',
- 'copyright' => 'COM_COMPONENTBUILDER_DTCOPYRIGHTDTDDSDD'
- );
-
- /**
- * get the JCB package owner details display
- **/
- public static function getPackageOwnerDetailsDisplay(&$info, $trust = false)
- {
- $hasOwner = false;
- $ownerDetails = '';
- $ownerDetails .= '';
- // load the list items
- foreach (self::$pkOwnerSearch as $key => $dd)
- {
- if ($value = self::getPackageOwnerValue($key, $info))
- {
- $ownerDetails .= JText::sprintf($dd, $value);
- // check if we have a owner/source name
- if (('owner' === $key || 'company' === $key) && !$hasOwner)
- {
- $hasOwner = true;
- $owner = $value;
- }
- }
- }
- $ownerDetails .= '
';
-
- // provide some details to how the user can get a key
- if ($hasOwner && isset($info['getKeyFrom']['buy_link']) && self::checkString($info['getKeyFrom']['buy_link']))
- {
- $ownerDetails .= '
';
- $ownerDetails .= JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_SSA', 'class="btn btn-primary" href="'.$info['getKeyFrom']['buy_link'].'" target="_blank" title="get a key from '.$owner.'"', $owner);
- }
- // add more custom links
- elseif ($hasOwner && isset($info['getKeyFrom']['buy_links']) && self::checkArray($info['getKeyFrom']['buy_links']))
- {
- $buttons = array();
- foreach ($info['getKeyFrom']['buy_links'] as $keyName => $link)
- {
- $buttons[] = JText::sprintf('COM_COMPONENTBUILDER_BGET_THE_KEY_FROM_SB_FOR_A_SSA', $owner, 'class="btn btn-primary" href="'.$link.'" target="_blank" title="get a key from '.$owner.'"', $keyName);
- }
- $ownerDetails .= '
';
- $ownerDetails .= implode('
', $buttons);
- }
- // return the owner details
- if (!$hasOwner)
- {
- $ownerDetails = '' . JText::_('COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND') . '
';
- if (!$trust)
- {
- $ownerDetails .= '' . JText::_('COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE') . '
';
- }
- }
- return ''.$ownerDetails.'
';
- }
-
- public static function getPackageOwnerValue($key, &$info)
- {
- $source = (isset($info['source']) && isset($info['source'][$key])) ? 'source' : ((isset($info['getKeyFrom']) && isset($info['getKeyFrom'][$key])) ? 'getKeyFrom' : false);
- if ($source && self::checkString($info[$source][$key]))
- {
- return $info[$source][$key];
- }
- return false;
- }
-
- /**
- * get the JCB package component key status
- **/
- public static function getPackageComponentsKeyStatus(&$info)
- {
- // check the package key status
- if (!isset($info['key']))
- {
- if (isset($info['getKeyFrom']) && isset($info['getKeyFrom']['owner']))
- {
- // this just confirms it for older packages
- $info['key'] = true;
- }
- else
- {
- // this just confirms it for older packages
- $info['key'] = false;
- }
- }
- return $info['key'];
- }
-
- protected static $compOwnerSearch = array(
- 'ul' => array (
- 'companyname' => 'COM_COMPONENTBUILDER_ICOMPANYI_BSB',
- 'author' => 'COM_COMPONENTBUILDER_IAUTHORI_BSB',
- 'email' => 'COM_COMPONENTBUILDER_IEMAILI_BSB',
- 'website' => 'COM_COMPONENTBUILDER_IWEBSITEI_BSB',
- ),
- 'other' => array(
- 'license' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERLICENSEHFOURPSP',
- 'copyright' => 'COM_COMPONENTBUILDER_HFOUR_CLASSNAVHEADERCOPYRIGHTHFOURPSP'
- )
- );
-
- /**
- * get the JCB package component details display
- **/
- public static function getPackageComponentsDetailsDisplay(&$info)
- {
- // check if these components need a key
- $needKey = self::getPackageComponentsKeyStatus($info);
- if (isset($info['name']) && self::checkArray($info['name']))
- {
- $cAmount = count((array) $info['name']);
- $class2 = ($cAmount == 1) ? 'span12' : 'span6';
- $counter = 1;
- $display = array();
- foreach ($info['name'] as $key => $value)
- {
- // set the name
- $name= $value . ' v' . $info['component_version'][$key];
- if ($cAmount > 1 && $counter == 3)
- {
- $display[] = '';
- $counter = 1;
- }
- if ($cAmount > 1 && $counter == 1)
- {
- $display[] = '';
- }
- $display[] = '
';
- $display[] = '
';
- $display[] = $name;
- if ($needKey)
- {
- $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_PAIDLOCKED') . '';
- }
- else
- {
- $display[] = ' - ' . JText::sprintf('COM_COMPONENTBUILDER_FREEOPEN') . '';
- }
- $display[] = '
';
- $display[] = $info['short_description'][$key];
- $display[] = '
';
- $display[] = '
';
- // load the list items
- foreach (self::$compOwnerSearch['ul'] as $li => $value)
- {
- if (isset($info[$li]) && isset($info[$li][$key]))
- {
- $display[] = '- '.JText::sprintf($value, $info[$li][$key]).'
';
- }
- }
- $display[] = '
';
- // if we have a source link we add it
- if (isset($info['joomla_source_link']) && self::checkArray($info['joomla_source_link']) && isset($info['joomla_source_link'][$key]) && self::checkString($info['joomla_source_link'][$key]))
- {
- $display[] = '
source code';
- }
- // load other
- foreach (self::$compOwnerSearch['other'] as $other => $value)
- {
- if (isset($info[$other]) && isset($info[$other][$key]))
- {
- $display[] = JText::sprintf($value, $info[$other][$key]);
- }
- }
- $display[] = '
';
-
- $counter++;
- }
- // close the div if needed
- if ($cAmount > 1)
- {
- $display[] = '
'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'
';
- }
/**
* open base64 string if stored as base64
@@ -4926,11 +5005,11 @@ abstract class ComponentbuilderHelper
*
* @input array The array to check
*
- * @returns bool true on success
+ * @returns bool/int number of items in array on success
**/
public static function checkArray($array, $removeEmptyString = false)
{
- if (isset($array) && is_array($array) && count((array)$array) > 0)
+ if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
{
// also make sure the empty strings are removed
if ($removeEmptyString)
@@ -4944,7 +5023,7 @@ abstract class ComponentbuilderHelper
}
return self::checkArray($array, false);
}
- return true;
+ return $nr;
}
return false;
}
+
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Joomla-Component-Builder#sponsor)]
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/README.txt b/admin/README.txt
index 3f09e23ff..dd42ce373 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -117,7 +117,15 @@ Our idea was to almost let this tool serve as a cheat sheet to how things can be
MAKING IT BETTER!
====================
-Watch the [proposed development workflow](https://vdm.bz/proposed-development-workflow).
+Get involved on the forums, and the GitHub issues, and you can even help us develop/improve the pipeline of JCB for continues delivery. We really want to see JCB remain the tool of choice for all Joomla Component Development needs and ideas.
+
+TODO
+======
+
+- Add automatic (REST) API ability for all components build with JCB. So we can link any component build with JCB to an Android/Apple APP.
+- Add automatic unit testing. To nurture pipeline integration for all components build with JCB.
+- Team collaborative development across JCB installations offline and online.
+- Documentation (maintained by the community) for JCB. (help us select the best system for this)
# Build Details
@@ -125,13 +133,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
-+ *Last Build*: 7th October, 2018
++ *Last Build*: 27th November, 2018
+ *Version*: 2.9.7
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195701**
++ *Line count*: **195519**
+ *Field count*: **1087**
-+ *File count*: **1277**
++ *File count*: **1275**
+ *Folder count*: **201**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php
index 2913f37da..854e96267 100644
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@@ -854,11 +854,11 @@ abstract class ###Component###Helper
*
* @input array The array to check
*
- * @returns bool true on success
+ * @returns bool/int number of items in array on success
**/
public static function checkArray($array, $removeEmptyString = false)
{
- if (isset($array) && is_array($array) && count((array)$array) > 0)
+ if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
{
// also make sure the empty strings are removed
if ($removeEmptyString)
@@ -872,7 +872,7 @@ abstract class ###Component###Helper
}
return self::checkArray($array, false);
}
- return true;
+ return $nr;
}
return false;
}
diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php
index db1f8c8f1..ae2ce5aad 100644
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@@ -846,11 +846,11 @@ abstract class ###Component###Helper
*
* @input array The array to check
*
- * @returns bool true on success
+ * @returns bool/int number of items in array on success
**/
public static function checkArray($array, $removeEmptyString = false)
{
- if (isset($array) && is_array($array) && count((array)$array) > 0)
+ if (isset($array) && is_array($array) && ($nr = count((array)$array)) > 0)
{
// also make sure the empty strings are removed
if ($removeEmptyString)
@@ -864,7 +864,7 @@ abstract class ###Component###Helper
}
return self::checkArray($array, false);
}
- return true;
+ return $nr;
}
return false;
}
diff --git a/admin/compiler/joomla_3/JTable.php b/admin/compiler/joomla_3/JTable.php
index 061b1410d..73304bb31 100644
--- a/admin/compiler/joomla_3/JTable.php
+++ b/admin/compiler/joomla_3/JTable.php
@@ -222,7 +222,7 @@ class ###Component###Table###View### extends JTable
{
// asset alread set so use saved rules
$assetId = (int) $db->loadResult();
- return JAccess::getAssetRules($assetId);
+ return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed.
}
// try again
elseif ($try)
diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php
index d58bda581..f787a500f 100644
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@@ -328,7 +328,8 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
$_tablesArray = array(
'admin_fields',
'admin_fields_conditions',
- 'admin_fields_relations'
+ 'admin_fields_relations',
+ 'admin_custom_tabs'
);
foreach($_tablesArray as $_updateTable)
{
diff --git a/admin/custom/wiki_menu.txt b/admin/custom/wiki_menu.txt
deleted file mode 100644
index 647db7539..000000000
--- a/admin/custom/wiki_menu.txt
+++ /dev/null
@@ -1 +0,0 @@
-[EXTERNALCODE=https://raw.githubusercontent.com/wiki/vdm-io/Joomla-Component-Builder/1.---Home.md]
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index aa9873fae..bf929fb01 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -83,7 +83,8 @@ class Get
'[' => '[',
']' => ']',
',' => ',',
- '+' => '+'
+ '+' => '+',
+ '=' => '='
);
/**
@@ -2713,7 +2714,7 @@ class Get
return $field['type_name'];
}
// check that we have the poperties
- if (ComponentbuilderHelper::checkArray($field['settings']->properties))
+ if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) && isset($field['settings']->properties) && ComponentbuilderHelper::checkArray($field['settings']->properties))
{
// search for own custom fields
if (strpos($field['settings']->type_name, '@') !== false)
@@ -4316,139 +4317,155 @@ class Get
$counter = 'a';
// Create a new query object.
$query = $this->db->getQuery(true);
+ // switch to onlu trigger the run of the query if we have tables to query
+ $runQuery = false;
foreach ($tables as $table)
{
- if ($counter === 'a')
+ if (isset($table['table']))
{
- // the main table fields
- if (strpos($table['sourcemap'], PHP_EOL) !== false)
+ if ($counter === 'a')
{
- $fields = explode(PHP_EOL, $table['sourcemap']);
- if (ComponentbuilderHelper::checkArray($fields))
+ // the main table fields
+ if (strpos($table['sourcemap'], PHP_EOL) !== false)
{
- // reset array buckets
- $sourceArray = array();
- $targetArray = array();
- foreach ($fields as $field)
+ $fields = explode(PHP_EOL, $table['sourcemap']);
+ if (ComponentbuilderHelper::checkArray($fields))
{
- if (strpos($field, "=>") !== false)
+ // reset array buckets
+ $sourceArray = array();
+ $targetArray = array();
+ foreach ($fields as $field)
{
- list($source, $target) = explode("=>", $field);
- $sourceArray[] = $counter . '.' . trim($source);
- $targetArray[] = trim($target);
+ if (strpos($field, "=>") !== false)
+ {
+ list($source, $target) = explode("=>", $field);
+ $sourceArray[] = $counter . '.' . trim($source);
+ $targetArray[] = trim($target);
+ }
}
- }
- if (ComponentbuilderHelper::checkArray($sourceArray) && ComponentbuilderHelper::checkArray($targetArray))
- {
- // add to query
- $query->select($this->db->quoteName($sourceArray, $targetArray));
- $query->from('#__' . $table['table'] . ' AS a');
- }
- // we may need to filter the selection
- if (isset($this->sqlTweak[$view_id]['where']))
- {
- // add to query the where filter
- $query->where('a.id IN (' . $this->sqlTweak[$view_id]['where'] . ')');
- }
- }
- }
- }
- else
- {
- // the other tables
- if (strpos($table['sourcemap'], PHP_EOL) !== false)
- {
- $fields = explode(PHP_EOL, $table['sourcemap']);
- if (ComponentbuilderHelper::checkArray($fields))
- {
- // reset array buckets
- $sourceArray = array();
- $targetArray = array();
- foreach ($fields as $field)
- {
- if (strpos($field, "=>") !== false)
+ if (ComponentbuilderHelper::checkArray($sourceArray) && ComponentbuilderHelper::checkArray($targetArray))
{
- list($source, $target) = explode("=>", $field);
- $sourceArray[] = $counter . '.' . trim($source);
- $targetArray[] = trim($target);
- }
- if (strpos($field, "==") !== false)
- {
- list($aKey, $bKey) = explode("==", $field);
// add to query
- $query->join('LEFT', $this->db->quoteName('#__' . $table['table'], $counter) . ' ON (' . $this->db->quoteName('a.' . trim($aKey)) . ' = ' . $this->db->quoteName($counter . '.' . trim($bKey)) . ')');
+ $query->select($this->db->quoteName($sourceArray, $targetArray));
+ $query->from('#__' . $table['table'] . ' AS a');
+ $runQuery = true;
+ }
+ // we may need to filter the selection
+ if (isset($this->sqlTweak[$view_id]['where']))
+ {
+ // add to query the where filter
+ $query->where('a.id IN (' . $this->sqlTweak[$view_id]['where'] . ')');
}
}
- if (ComponentbuilderHelper::checkArray($sourceArray) && ComponentbuilderHelper::checkArray($targetArray))
- {
- // add to query
- $query->select($this->db->quoteName($sourceArray, $targetArray));
- }
}
}
- }
- $counter++;
- }
- // now get the data
- $this->db->setQuery($query);
- $this->db->execute();
- if ($this->db->getNumRows())
- {
- // get the data
- $data = $this->db->loadObjectList();
- // start building the MySql dump
- $dump = "--";
- $dump .= PHP_EOL . "-- Dumping data for table `#__" . $this->bbb . "component" . $this->ddd . "_" . $view . "`";
- $dump .= PHP_EOL . "--";
- $dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__" . $this->bbb . "component" . $this->ddd . "_" . $view . "` (";
- foreach ($data as $line)
- {
- $comaSet = 0;
- foreach ($line as $fieldName => $fieldValue)
- {
- if ($comaSet == 0)
- {
- $dump .= $this->db->quoteName($fieldName);
- }
- else
- {
- $dump .= ", " . $this->db->quoteName($fieldName);
- }
- $comaSet++;
- }
- break;
- }
- $dump .= ") VALUES";
- $coma = 0;
- foreach ($data as $line)
- {
- if ($coma == 0)
- {
- $dump .= PHP_EOL . "(";
- }
else
{
- $dump .= "," . PHP_EOL . "(";
- }
- $comaSet = 0;
- foreach ($line as $fieldName => $fieldValue)
- {
- if ($comaSet == 0)
+ // the other tables
+ if (strpos($table['sourcemap'], PHP_EOL) !== false)
{
- $dump .= $this->mysql_escape($fieldValue);
+ $fields = explode(PHP_EOL, $table['sourcemap']);
+ if (ComponentbuilderHelper::checkArray($fields))
+ {
+ // reset array buckets
+ $sourceArray = array();
+ $targetArray = array();
+ foreach ($fields as $field)
+ {
+ if (strpos($field, "=>") !== false)
+ {
+ list($source, $target) = explode("=>", $field);
+ $sourceArray[] = $counter . '.' . trim($source);
+ $targetArray[] = trim($target);
+ }
+ if (strpos($field, "==") !== false)
+ {
+ list($aKey, $bKey) = explode("==", $field);
+ // add to query
+ $query->join('LEFT', $this->db->quoteName('#__' . $table['table'], $counter) . ' ON (' . $this->db->quoteName('a.' . trim($aKey)) . ' = ' . $this->db->quoteName($counter . '.' . trim($bKey)) . ')');
+ }
+ }
+ if (ComponentbuilderHelper::checkArray($sourceArray) && ComponentbuilderHelper::checkArray($targetArray))
+ {
+ // add to query
+ $query->select($this->db->quoteName($sourceArray, $targetArray));
+ }
+ }
+ }
+ }
+ $counter++;
+ }
+ else
+ {
+ // see where
+ // var_dump($view);
+ // jexit();
+ }
+ }
+ // check if we should run query
+ if ($runQuery)
+ {
+ // now get the data
+ $this->db->setQuery($query);
+ $this->db->execute();
+ if ($this->db->getNumRows())
+ {
+ // get the data
+ $data = $this->db->loadObjectList();
+ // start building the MySql dump
+ $dump = "--";
+ $dump .= PHP_EOL . "-- Dumping data for table `#__" . $this->bbb . "component" . $this->ddd . "_" . $view . "`";
+ $dump .= PHP_EOL . "--";
+ $dump .= PHP_EOL . PHP_EOL . "INSERT INTO `#__" . $this->bbb . "component" . $this->ddd . "_" . $view . "` (";
+ foreach ($data as $line)
+ {
+ $comaSet = 0;
+ foreach ($line as $fieldName => $fieldValue)
+ {
+ if ($comaSet == 0)
+ {
+ $dump .= $this->db->quoteName($fieldName);
+ }
+ else
+ {
+ $dump .= ", " . $this->db->quoteName($fieldName);
+ }
+ $comaSet++;
+ }
+ break;
+ }
+ $dump .= ") VALUES";
+ $coma = 0;
+ foreach ($data as $line)
+ {
+ if ($coma == 0)
+ {
+ $dump .= PHP_EOL . "(";
}
else
{
- $dump .= ", " . $this->mysql_escape($fieldValue);
+ $dump .= "," . PHP_EOL . "(";
}
- $comaSet++;
+ $comaSet = 0;
+ foreach ($line as $fieldName => $fieldValue)
+ {
+ if ($comaSet == 0)
+ {
+ $dump .= $this->mysql_escape($fieldValue);
+ }
+ else
+ {
+ $dump .= ", " . $this->mysql_escape($fieldValue);
+ }
+ $comaSet++;
+ }
+ $dump .= ")";
+ $coma++;
}
- $dump .= ")";
- $coma++;
+ $dump .= ";";
+ // return build dump query
+ return $dump;
}
- $dump .= ";";
- // return build dump query
- return $dump;
}
}
return false;
@@ -4764,7 +4781,7 @@ class Get
* @return string
*
*/
- public function setCustomCodeData($string, $debug = 0)
+ public function setCustomCodeData($string, $debug = 0, $not = null)
{
// insure the code is loaded
$loaded = false;
@@ -4863,6 +4880,11 @@ class Get
{
continue;
}
+ // make sure to remove the not if set
+ if ($not && is_numeric($not) && $not > 0 && $not == $id)
+ {
+ continue;
+ }
$bucket[$id] = $id;
}
}
@@ -4879,7 +4901,7 @@ class Get
// insure we add the langs to both site and admin
$this->lang = 'both';
// now load the code to memory
- $loaded = $this->getCustomCode($bucket, false);
+ $loaded = $this->getCustomCode($bucket, false, $debug);
// revert lang to current setting
$this->lang = $_tmpLang;
}
@@ -4922,6 +4944,7 @@ class Get
echo '$this->customCode:';
var_dump($this->customCode);
}
+ // load the code
foreach ($this->customCode as $item)
{
$this->buildCustomCodePlaceholders($item, $code, $debug);
@@ -5401,7 +5424,7 @@ class Get
* @return void
*
*/
- public function getCustomCode($ids = null, $setLang = true)
+ public function getCustomCode($ids = null, $setLang = true, $debug = 0)
{
// should the result be stored in memory
$loadInMemory = false;
@@ -5410,7 +5433,7 @@ class Get
$query->from($this->db->quoteName('#__componentbuilder_custom_code', 'a'));
if (ComponentbuilderHelper::checkArray($ids))
{
- if ($idArray = $this->customCodeMemory($ids))
+ if ($idArray = $this->checkCustomCodeMemory($ids))
{
$query->select($this->db->quoteName(array('a.id', 'a.code', 'a.comment_type')));
$query->where($this->db->quoteName('a.id') . ' IN (' . implode(',', $idArray) . ')');
@@ -5449,6 +5472,11 @@ class Get
{
$customCode['code'] = $this->setLangStrings($customCode['code']);
}
+ // check for more custom code (since this is a custom code placeholder)
+ else
+ {
+ $customCode['code'] = $this->setCustomCodeData($customCode['code'], $debug, $nr);
+ }
if (isset($customCode['hashtarget']))
{
$customCode['hashtarget'] = explode("__", $customCode['hashtarget']);
@@ -5475,7 +5503,7 @@ class Get
* @return void
*
*/
- protected function customCodeMemory($ids)
+ protected function checkCustomCodeMemory($ids)
{
// reset custom code
$this->customCode = array();
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 9a31387ff..c45d28f8c 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -2107,6 +2107,8 @@ class Fields extends Structure
// setup a default field
if (ComponentbuilderHelper::checkArray($field['settings']->properties))
{
+ // we need a deeper php code search tracker
+ $phpTracker = array();
foreach ($field['settings']->properties as $property)
{
// reset
@@ -2155,6 +2157,8 @@ class Fields extends Structure
$this->setDynamicValues(ComponentbuilderHelper::openValidBase64(
ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"')
));
+ // load tracker
+ $phpTracker['type_' . $phpKey] = $phpKey;
}
elseif ($property['name'] === 'prime_php' && $setCustom)
{
@@ -2338,6 +2342,24 @@ class Fields extends Structure
$fieldAttributes['default'] = $xmlValue;
}
}
+ // check if all php is loaded using the tracker
+ if (ComponentbuilderHelper::checkArray($phpTracker))
+ {
+ // litle search validation
+ $confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+ foreach ($phpTracker as $searchKey => $phpKey)
+ {
+ // we must search for more code in the xml just incase
+ foreach(range(2, 30) as $phpLine)
+ {
+ $get_ = $searchKey . '_' . $phpLine;
+ if (!isset($fieldAttributes['custom'][$phpKey][$phpLine]) && ($value = ComponentbuilderHelper::getValueFromXMLstring($field['settings']->xml, $get_, $confirmation)) !== $confirmation)
+ {
+ $fieldAttributes['custom'][$phpKey][$phpLine] = $this->setDynamicValues(ComponentbuilderHelper::openValidBase64($value));
+ }
+ }
+ }
+ }
// do some nice twigs beyond the default
if (isset($fieldAttributes['name']))
{
@@ -2460,7 +2482,7 @@ class Fields extends Structure
}
}
// set list switch
- $listSwitch = (isset($field['list']) && $field['list'] == 1);
+ $listSwitch = (isset($field['list']) && ($field['list'] == 1 || $field['list'] == 3 || $field['list'] == 4 ));
// set list join
$listJoin = (isset($this->listJoinBuilder[$view_name_list][(int) $field['field']]));
// add history to this view
@@ -2523,7 +2545,8 @@ class Fields extends Structure
'sort' => (isset($field['sort']) && $field['sort']) ? true : false,
'custom' => $custom,
'multiple' => $multiple,
- 'options' => $options);
+ 'options' => $options,
+ 'target' => (int) $field['list']);
}
// build custom builder list
if ($listSwitch || $listJoin)
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index d496e21a2..53191cb53 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -4554,6 +4554,9 @@ class Interpretation extends Fields
public function setMethodItemSave(&$view)
{
$script = '';
+ // get component name
+ $Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
+ $component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
// check if there was script added before modeling of data
$script .= $this->getCustomScriptBuilder('php_before_save', $view, PHP_EOL . PHP_EOL);
// turn array into JSON string
@@ -4568,7 +4571,22 @@ class Interpretation extends Fields
$script .= PHP_EOL . $this->_t(3) . "\$" . $jsonItem . "->loadArray(\$data['" . $jsonItem . "']);";
$script .= PHP_EOL . $this->_t(3) . "\$data['" . $jsonItem . "'] = (string) \$" . $jsonItem . ";";
$script .= PHP_EOL . $this->_t(2) . "}";
- $script .= PHP_EOL . $this->_t(2) . "elseif (!isset(\$data['" . $jsonItem . "']))";
+ if (isset($this->permissionFields[$view]) && isset($this->permissionFields[$view][$jsonItem]) && ComponentbuilderHelper::checkArray($this->permissionFields[$view][$jsonItem]))
+ {
+ $script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Also check permission since the value may be removed due to permissions";
+ $script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Then we do not want to clear it out, but simple ignore the empty " . $jsonItem;
+ $script .= PHP_EOL . $this->_t(2) . "elseif (!isset(\$data['" . $jsonItem . "'])";
+ // only add permission that are available
+ foreach ($this->permissionFields[$view][$jsonItem] as $permission_option => $fieldType)
+ {
+ $script .= PHP_EOL . $this->_t(3) . "&& JFactory::getUser()->authorise('" . $view . "." . $permission_option . "." . $jsonItem . "', 'com_" . $component . "')";
+ }
+ $script .= ")";
+ }
+ else
+ {
+ $script .= PHP_EOL . $this->_t(2) . "elseif (!isset(\$data['" . $jsonItem . "']))";
+ }
$script .= PHP_EOL . $this->_t(2) . "{";
$script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set the empty " . $jsonItem . " to data";
$script .= PHP_EOL . $this->_t(3) . "\$data['" . $jsonItem . "'] = '';";
@@ -4600,7 +4618,6 @@ class Interpretation extends Fields
}
}
// turn string into encrypted string
- $Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
foreach ($this->cryptionTypes as $cryptionType)
{
if (isset($this->{$cryptionType . 'EncryptionBuilder'}[$view]) && ComponentbuilderHelper::checkArray($this->{$cryptionType . 'EncryptionBuilder'}[$view]))
@@ -6759,25 +6776,29 @@ class Interpretation extends Fields
// start adding the dynamic
foreach ($this->listBuilder[$viewName_list] as $item)
{
- // set some defaults
- $customAdminViewButtons = '';
- // set the item default class
- $itemClass = 'hidden-phone';
- // set the item row
- $itemRow = $this->getListItemBuilder($item, $viewName_single, $viewName_list, $itemClass, $doNotEscape, $coreLoad, $core);
- // check if buttons was aready added
- if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
+ // check if target is admin list
+ if (1 == $item['target'] || 3 == $item['target'])
{
- // get custom admin view buttons
- $customAdminViewButtons = $this->getCustomAdminViewButtons($viewName_list);
- // make sure the custom admin view buttons are only added once
- $firstTimeBeingAdded = false;
+ // set some defaults
+ $customAdminViewButtons = '';
+ // set the item default class
+ $itemClass = 'hidden-phone';
+ // set the item row
+ $itemRow = $this->getListItemBuilder($item, $viewName_single, $viewName_list, $itemClass, $doNotEscape, $coreLoad, $core);
+ // check if buttons was aready added
+ if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
+ {
+ // get custom admin view buttons
+ $customAdminViewButtons = $this->getCustomAdminViewButtons($viewName_list);
+ // make sure the custom admin view buttons are only added once
+ $firstTimeBeingAdded = false;
+ }
+ // add row to body
+ $body .= PHP_EOL . $this->_t(2) . "