Language Warning
'), 'Warning'); foreach ($this->langNot as $tag => $percentage) { $this->app->enqueueMessage(JText::sprintf('The %s language has %s% translated, you will need to translate %s% of the language strings before it will be added.', $tag, $percentage, $this->percentageLanguageAdd), 'Warning'); } + $this->app->enqueueMessage(JText::_('Language Notice
'), 'Notice'); $this->app->enqueueMessage(JText::sprintf('You can change this percentage of translated strings required in the global options of JCB.Please watch this tutorial for more help surrounding the JCB translations manager.', '"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice'); } // set why the strings were added @@ -110,6 +112,7 @@ class Compiler extends Infusion // show languages that were added if (ComponentbuilderHelper::checkArray($this->langSet)) { + $this->app->enqueueMessage(JText::_('
Language Notice
'), 'Notice'); foreach ($this->langSet as $tag => $percentage) { $this->app->enqueueMessage(JText::sprintf('The %s language has %s% translated. Was addeded %s', $tag, $percentage, $whyAddedLang), 'Notice'); @@ -142,6 +145,7 @@ class Compiler extends Infusion // set a notice if we have a mismatch if (isset($mismatch) && ComponentbuilderHelper::checkArray($mismatch)) { + $this->app->enqueueMessage(JText::_('Language Warning
'), 'Warning'); if (count($mismatch) > 1) { $this->app->enqueueMessage(JText::_('Please check the following mismatching Joomla.JText language constants.
'), 'Warning'); @@ -156,7 +160,6 @@ class Compiler extends Infusion $constant = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U'); $this->app->enqueueMessage(JText::sprintf('The Joomla.JText._('%s') language constant for %s does not have a correspondingJText::script('%s') decalaration, please add it.', $constant, $string, $string), 'Warning');
}
- $this->app->enqueueMessage('', 'Warning'); } } // check if we should add a EXTERNALCODE notice @@ -169,7 +172,6 @@ class Compiler extends Infusion // the notice $this->app->enqueueMessage(JText::_('
External Code Notice
'), 'Notice'); $this->app->enqueueMessage(JText::sprintf('There has been %s - %s added to this component as EXTERNALCODE. To avoid shipping your component with malicious %s always make sure that the correct code/string values were used.', $externalCount, $externalCodeString, $externalCodeString), 'Notice'); - $this->app->enqueueMessage('', 'Notice'); } // end the timer here $this->time_end = microtime(true); @@ -274,6 +276,11 @@ class Compiler extends Infusion { $answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3); } + // check if this file needs extra care :) + if (isset($this->updateFileContent[$path])) + { + $answer = $this->setDynamicValues($answer); + } // add answer back to file $this->writeFile($path, $answer); // count the file lines @@ -594,6 +601,7 @@ class Compiler extends Infusion { // Load escaped code since the target endhash has changed $this->loadEscapedCode($file, $target, $lineBites); + $this->app->enqueueMessage(JText::_('
Custom Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('Custom code could not be added to %s please review the file at line %s. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'Warning'); } } @@ -601,12 +609,14 @@ class Compiler extends Infusion { // Load escaped code since the target hash has changed $this->loadEscapedCode($file, $target, $lineBites); + $this->app->enqueueMessage(JText::_('Custom Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('Custom code could not be added to %s please review the file at line %s. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'Warning'); } } else { // Give developer a notice that file is not found. + $this->app->enqueueMessage(JText::_('Custom Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('File %s could not be found, so the custom code for this file could not be addded.', $target['path']), 'Warning'); } } diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 921820149..9b50685d0 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -709,6 +709,24 @@ class Get */ public $tabSpacer = "\t"; + /** + * mysql table setting keys + * + * @var array + */ + public $mysqlTableKeys = array( + 'engine' => array('default' => 'MyISAM'), + 'charset' => array('default' => 'utf8'), + 'collate' => array('default' => 'utf8_general_ci') + ); + + /** + * mysql table settings + * + * @var array + */ + public $mysqlTableSetting = array(); + /** * Constructor */ @@ -737,7 +755,8 @@ class Get // we do not have the tidy extention set fall back to StringManipulation $this->fieldBuilderType = 1; // load the sugestion to use string manipulation - $this->app->enqueueMessage(JText::_('Since you do not have Tidy extentsion setup on your system, we could not use the SimpleXMLElement class. We instead used string manipulation to build all your fields, this is a faster method, you must inspect the xml files in your component package to see if you are satisfied with the result.You can make this method your default by opening the global options of JCB and under the Global tab set the Field Builder Type to string manipulation.
'), 'Notice'); + $this->app->enqueueMessage(JText::_('
Field Notice
'), 'Notice'); + $this->app->enqueueMessage(JText::_('Since you do not have Tidy extentsion setup on your system, we could not use the SimpleXMLElement class. We instead used string manipulation to build all your fields, this is a faster method, you must inspect the xml files in your component package to see if you are satisfied with the result.You can make this method your default by opening the global options of JCB and under the Global tab set the Field Builder Type to string manipulation.'), 'Notice'); } // load the compiler path $this->compilerPath = $this->params->get('compiler_folder_path', JPATH_COMPONENT_ADMINISTRATOR . '/compiler'); @@ -1759,6 +1778,7 @@ class Get elseif ($old_field_name !== $field_name) { // give a notice atleast that the multi fields could have changed and no DB update was done + $this->app->enqueueMessage(JText::_('
Field Notice
'), 'Notice'); $this->app->enqueueMessage(JText::sprintf('You have a field called %s that has been added multiple times to the %s view, the name of that field has changed to %s. Normaly we would automaticly add the update SQL to your component, but with multiple fields this does not work automaticly since it could be that noting changed and it just seems like it did. Therefore you will have to do this manualy if it actualy did change!', $field_name, $name_single, $old_field_name), 'Notice'); } // remove tmp @@ -1777,6 +1797,20 @@ class Get { $this->setUpdateSQL(ComponentbuilderHelper::safeString($old_view->name_single), $name_single, 'table_name', $name_single); } + // loop the mysql table settings + foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal) + { + // check if the table engine changed + if (isset($old_view->{'mysql_table_' . $_mysqlTableKey}) && isset($view->{'mysql_table_' . $_mysqlTableKey})) + { + $this->setUpdateSQL( $old_view->{'mysql_table_' . $_mysqlTableKey}, $view->{'mysql_table_' . $_mysqlTableKey}, 'table_' . $_mysqlTableKey, $name_single); + } + // check if there is no history on table engine, and it changed from the default/global + elseif (isset($view->{'mysql_table_' . $_mysqlTableKey}) && ComponentbuilderHelper::checkString($view->{'mysql_table_' . $_mysqlTableKey}) && !is_numeric($view->{'mysql_table_' . $_mysqlTableKey})) + { + $this->setUpdateSQL($_mysqlTableVal['default'], $view->{'mysql_table_' . $_mysqlTableKey}, 'table_' . $_mysqlTableKey, $name_single); + } + } // clear this data unset($old_view); } @@ -2095,6 +2129,25 @@ class Get unset($view->sql); } } + // load table settings + if (!isset($this->mysqlTableSetting[$name_single])) + { + $this->mysqlTableSetting[$name_single] = array(); + } + // set mySql Table Settings + foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal) + { + if (isset($view->{'mysql_table_' . $_mysqlTableKey}) && ComponentbuilderHelper::checkString($view->{'mysql_table_' . $_mysqlTableKey}) && !is_numeric($view->{'mysql_table_' . $_mysqlTableKey})) + { + $this->mysqlTableSetting[$name_single][$_mysqlTableKey] = $view->{'mysql_table_' . $_mysqlTableKey}; + } + else + { + $this->mysqlTableSetting[$name_single][$_mysqlTableKey] = $_mysqlTableVal['default']; + } + // remove the table values since we moved to another object + unset($view->{'mysql_table_' . $_mysqlTableKey}); + } // clear placeholders unset($this->placeholders[$this->hhh . 'view' . $this->hhh]); unset($this->placeholders[$this->hhh . 'views' . $this->hhh]); @@ -3330,7 +3383,7 @@ class Get } } } - elseif ($key && ComponentbuilderHelper::checkString($new) && ComponentbuilderHelper::checkString($old) && $new !== $old) + elseif ($key && ((ComponentbuilderHelper::checkString($new) && ComponentbuilderHelper::checkString($old)) || (is_numeric($new) && is_numeric($old))) && $new !== $old) { // the string changed, lets add to SQL update if (!isset($this->updateSQL[$type]) || !ComponentbuilderHelper::checkArray($this->updateSQL[$type])) @@ -4560,7 +4613,6 @@ class Get // set the notice $this->app->enqueueMessage(JText::_('External Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('The %s is not a valid url/path!', $key), 'Warning'); - $this->app->enqueueMessage('', 'Warning'); // remove the placeholder $bucket[$key] = ''; } @@ -4570,7 +4622,8 @@ class Get // set key $key = '[EXTERNA' . 'LCODE=' . $target . ']'; // set the notice - $this->app->enqueueMessage(JText::sprintf('%s, you do not have permission to use EXTERNALCODE feature (so it was removed from the compilation), please contact you system administrator for more info!
(admin access required)', $this->user->get('name')), 'Error'); + $this->app->enqueueMessage(JText::_('
External Code Error
'), 'Error'); + $this->app->enqueueMessage(JText::sprintf('%s, you do not have permission to use EXTERNALCODE feature (so %s was removed from the compilation), please contact you system administrator for more info!(admin access required)', $this->user->get('name'), $key), 'Error'); // remove the placeholder $bucket[$key] = ''; } @@ -4630,7 +4683,6 @@ class Get // give notice of the change $this->app->enqueueMessage(JText::_('
External Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('The code/string from %s has been changed since the last compilation, please investigate to insure the changes are safe!', $key), 'Warning'); - $this->app->enqueueMessage('', 'Warning'); } } else @@ -4644,7 +4696,6 @@ class Get // give notice the first time this is added $this->app->enqueueMessage(JText::_('
External Code Notice
'), 'Notice'); $this->app->enqueueMessage(JText::sprintf('The code/string from %s has been added for the first time, please investigate to insure the correct code/string was used!', $key), 'Notice'); - $this->app->enqueueMessage('', 'Notice'); } } else @@ -4652,7 +4703,6 @@ class Get // set notice that we could not get a valid string from the target $this->app->enqueueMessage(JText::_('
External Code Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('The %s returned an invalid string!', $key), 'Warning'); - $this->app->enqueueMessage('', 'Warning'); } } // add to local bucket @@ -5689,6 +5739,7 @@ class Get { // reset found comment type $commentType = 0; + $this->app->enqueueMessage(JText::_('
Custom Codes Warning
'), 'Warning'); $this->app->enqueueMessage(JText::sprintf('We found dynamic code all in one line, and ignored it! Please review (%s) for more details!', $path), 'Warning'); continue; } diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 097d5f874..024a840f0 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -235,6 +235,13 @@ class Structure extends Get */ public $fileContentStatic = array(); + /** + * The standard folders + * + * @var array + */ + public $stdFolders = array('site', 'admin', 'media'); + /** * Dynamic File Content * @@ -277,6 +284,13 @@ class Structure extends Get */ public $notNew = array(); + /** + * Update the file content + * + * @var array + */ + public $updateFileContent = array(); + /** * The new files * @@ -320,6 +334,18 @@ class Structure extends Get // first we run the perent constructor if (parent::__construct($config)) { + // set incase no extra admin folder are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] = ''; + // set incase no extra site folder are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] = ''; + // set incase no extra media folder are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = ''; + // set incase no extra admin files are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FILES' . $this->hhh] = ''; + // set incase no extra site files are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FILES' . $this->hhh] = ''; + // set incase no extra media files are loaded + $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FILES' . $this->hhh] = ''; // run global updater ComponentbuilderHelper::runGlobalUpdater(); // set the Joomla version @@ -489,11 +515,7 @@ class Structure extends Get // only add if local if ($addLocalFolder) { - // check if we sould add it to the media xml list - if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh])) - { - $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = ''; - } + // add folder to ml of media folders $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(2) . "Dashboard Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The %s (%s) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error'); } } else { // set massage that something is wrong + $this->app->enqueueMessage(JText::_('Dashboard Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The %s (%s) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error'); } } else { // the target value is wrong + $this->app->enqueueMessage(JText::_('Dashboard Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The %s value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error'); } } else { // the target value is wrong + $this->app->enqueueMessage(JText::_('Dashboard Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The %s value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error'); } // if default was changed to dynamic dashboard the remove default tab and methods @@ -767,8 +793,6 @@ class Structure extends Get { $README = true; } - // set the standard folders - $stdFolders = array('site', 'admin', 'media'); // start moving foreach ($this->joomlaVersionData->move->static as $ftem => $details) { @@ -814,6 +838,7 @@ class Structure extends Get { if (!JFile::exists($currentFullPath)) { + $this->app->enqueueMessage(JText::_('File Path Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The file path: %s does not exist, and was not added!', $currentFullPath), 'Error'); } else @@ -834,12 +859,21 @@ class Structure extends Get { $this->newFiles['static'][] = array('path' => $packageFullPath, 'name' => $new, 'zip' => $zipFullPath); } + // ensure we update this file if needed + if (isset($this->updateFileContent[$ftem]) && $this->updateFileContent[$ftem]) + { + // remove the pointer + unset($this->updateFileContent[$ftem]); + // set the full path + $this->updateFileContent[$packageFullPath] = $packageFullPath; + } } } elseif ($details->type === 'folder') { if (!JFolder::exists($currentFullPath)) { + $this->app->enqueueMessage(JText::_('Folder Path Error
'), 'Error'); $this->app->enqueueMessage(JText::sprintf('The folder path: %s does not exist, and was not added!', $currentFullPath), 'Error'); } else @@ -851,19 +885,40 @@ class Structure extends Get } } // check if we should add the dynamic folder moving script to the installer script - if (!$this->setMoveFolders) + $checker = array_values((array) explode('/', $zipFullPath)); + // TODO <-- this may not be the best way, will keep an eye on this. + // We basicly only want to check if a folder is added that is not in the stdFolders array + if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $this->stdFolders)) { - $checker = explode('/', $zipFullPath); - // TODO <-- this may not be the best way, will keep an eye on this. - // We basicly only want to check if a folder is added that is not in the stdFolders array - if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $stdFolders)) + // check if we should add the dynamic folder moving script to the installer script + if (!$this->setMoveFolders) { // add the setDynamicF0ld3rs() method to the install scipt.php file $this->setMoveFolders = true; // set message that this was done (will still add a tutorial link later) - $this->app->enqueueMessage(JText::sprintf('Dynamic folder/s were detected.
A method (setDynamicF0ld3rs) was added to the install script.php of this package to insure that the folder/s are copied into the correct place when this componet is installed!
Dynamic folder/s were detected.
'), 'Notice'); + $this->app->enqueueMessage(JText::sprintf('A method (setDynamicF0ld3rs) was added to the install script.php of this package to insure that the folder/s are copied into the correct place when this componet is installed!'), 'Notice'); } } + elseif (count($checker) == 2 && ComponentbuilderHelper::checkString($checker[0]) && in_array($checker[0], $this->stdFolders)) + { + // set the target + $eNAME = 'FILES'; + $ename = 'filename'; + if ($details->type === 'folder') + { + $eNAME = 'FOLDERS'; + $ename = 'folder'; + } + // set the tab + $eTab = $this->_t(2); + if ('admin' === $checker[0]) + { + $eTab = $this->_t(3); + } + // set the xml file + $this->fileContentStatic[$this->hhh . 'EXSTRA_' . ComponentbuilderHelper::safeString($checker[0], 'U') . '_' . $eNAME . $this->hhh] .= PHP_EOL . $eTab . "<" . $ename . ">" . $checker[1] . ""; + } } return true; } @@ -1260,11 +1315,6 @@ class Structure extends Get $custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']); $rename = 'new'; $newname = $lastFolder; - // add fix to insure it gets added to xml if needed - if (($tkey = array_search($lastFolder, $pathArray)) !== false) - { - unset($pathArray[$tkey]); - } } elseif ('full' === $customPath) { @@ -1273,11 +1323,6 @@ class Structure extends Get $lastFolder = end($folderArray); $rename = 'new'; $newname = $lastFolder; - // add fix to insure it gets added to xml if needed - if (($tkey = array_search($lastFolder, $pathArray)) !== false) - { - unset($pathArray[$tkey]); - } } else { @@ -1285,46 +1330,19 @@ class Structure extends Get $rename = false; $newname = ''; } - // check if we sould add it to the media xml list - if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh])) - { - $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = ''; - } - if (count($pathArray) == 1 && $firstFolder === 'media') - { - $this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(2) . "Dynamic Button Error
'), 'Error'); + $this->app->enqueueMessage(JText::_('The option to add a dynamic button is not available in own custom field types, you will have to custom code it.'), 'Error'); } // load another file $target = array('admin' => 'customfield'); @@ -3128,7 +3129,8 @@ class Fields extends Structure // set the warning only once $this->setTidyWarning = true; // now set the warning - $this->app->enqueueMessage(JText::_('You must enable the Tidy extension in your php.ini file so we can tidy up your xml! If you need help please start here!'), 'error'); + $this->app->enqueueMessage(JText::_('Tidy Error
'), 'Error'); + $this->app->enqueueMessage(JText::_('You must enable the Tidy extension in your php.ini file so we can tidy up your xml! If you need help please start here!'), 'Error'); } return $xmlString; } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 584cd17c5..ac1ccca3c 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -613,7 +613,8 @@ class Interpretation extends Fields } } // give notice of this issue - $this->app->enqueueMessage(JText::sprintf('The WHMCS class could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'error'); + $this->app->enqueueMessage(JText::_('WHMCS Error
'), 'Error'); + $this->app->enqueueMessage(JText::sprintf('The WHMCS class could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'Error'); return "//" . $this->setLine(__LINE__) . " The WHMCS class could not be added to this component." . PHP_EOL . "//" . $this->setLine(__LINE__) . " Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes."; } @@ -624,8 +625,9 @@ class Interpretation extends Fields */ public function setGetCryptKey() { - // ENCRYPT_FILE - $this->fileContentStatic[$this->hhh . 'ENCRYPT_FILE' . $this->hhh] = ''; + // WHMCS_ENCRYPT_FILE + $this->fileContentStatic[$this->hhh . 'WHMCS_ENCRYPT_FILE' . $this->hhh] = ''; + // check if encryption is ative if ((isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder)) || (isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder)) || (isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder)) || @@ -3890,7 +3892,8 @@ class Interpretation extends Fields // Start script builder for library files if (!isset($this->libwarning[$id])) { - $this->app->enqueueMessage(JText::sprintf('The conditional script builder for %s is not ready, sorry!', $this->libraries[$id]->name), 'warning'); + $this->app->enqueueMessage(JText::_('Conditional Script Warning
'), 'Warning'); + $this->app->enqueueMessage(JText::sprintf('The conditional script builder for %s is not ready, sorry!', $this->libraries[$id]->name), 'Warning'); // set the warning only once $this->libwarning[$id] = true; } @@ -6314,7 +6317,23 @@ class Interpretation extends Fields $db_ .= "," . PHP_EOL . $this->_t(1) . "KEY `idx_" . $key . "` (`" . $key . "`)"; } } - $db_ .= PHP_EOL . ") ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;"; + // easy bucket + $easy = array(); + // get the mysql table settings + foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal) + { + if (isset($this->mysqlTableSetting[$view]) + && ComponentbuilderHelper::checkArray($this->mysqlTableSetting[$view]) + && isset($this->mysqlTableSetting[$view][$_mysqlTableKey])) + { + $easy[$_mysqlTableKey] = $this->mysqlTableSetting[$view][$_mysqlTableKey]; + } + else + { + $easy[$_mysqlTableKey] = $this->mysqlTableKeys[$_mysqlTableKey]['default']; + } + } + $db_ .= PHP_EOL . ") ENGINE=" . $easy['engine'] . " AUTO_INCREMENT=0 DEFAULT CHARSET=" . $easy['charset'] . " DEFAULT COLLATE=" . $easy['collate'] . ";"; // check if this is a new table that should be added via update SQL if (isset($this->addSQL['adminview']) && ComponentbuilderHelper::checkArray($this->addSQL['adminview']) && in_array($view, $this->addSQL['adminview'])) @@ -6322,6 +6341,19 @@ class Interpretation extends Fields // build the update array $this->updateSQLBuilder["CREATETABLEIFNOTEXISTS`#__" . $component . "_" . $view . "`"] = $db_; } + // check if the table engine has changed + if (isset($this->updateSQL['table_engine']) && isset($this->updateSQL['table_engine'][$view])) + { + // build the update array + $this->updateSQLBuilder["ALTERTABLE`#__" . $component . "_" . $view . "`ENGINE=" . $easy['engine']] = "ALTER TABLE `#__" . $component . "_" . $view . "` ENGINE = " . $easy['engine'] . ";"; + } + // check if the table charset OR collation has changed (must be updated together) + if ((isset($this->updateSQL['table_charset']) && isset($this->updateSQL['table_charset'][$view])) || + (isset($this->updateSQL['table_collate']) && isset($this->updateSQL['table_collate'][$view]))) + { + // build the update array + $this->updateSQLBuilder["ALTERTABLE`#__" . $component . "_" . $view . "CONVERTTOCHARACTERSET" . $easy['charset'] . "COLLATE" . $easy['collate']] = "ALTER TABLE `#__" . $component . "_" . $view . "` CONVERT TO CHARACTER SET " . $easy['charset'] . " COLLATE " . $easy['collate'] . ";"; + } // add to main DB string $db .= $db_ . PHP_EOL . PHP_EOL; @@ -7637,7 +7669,8 @@ class Interpretation extends Fields } else { - $this->app->enqueueMessage(JText::sprintf('Your %s field could not be added, since the %s alignment position is not available in the %s (publishing) tab. Please only target Left or right in the publishing tab.', $df_name, $alignmentNames[$df_alignment], $viewName_single), 'warning'); + $this->app->enqueueMessage(JText::_('Field Warning
'), 'Warning'); + $this->app->enqueueMessage(JText::sprintf('Your %s field could not be added, since the %s alignment position is not available in the %s (publishing) tab. Please only target Left or right in the publishing tab.', $df_name, $alignmentNames[$df_alignment], $viewName_single), 'Warning'); } } } @@ -7700,6 +7733,7 @@ class Interpretation extends Fields // only triger the info notice if there were custom fields targeted to the right alignment position. if ($fieldsAddedRight) { + $this->app->enqueueMessage(JText::_('Field Notice
'), 'Notice'); $this->app->enqueueMessage(JText::sprintf('Your field/s added to the right alignment position in the %s (publishing) tab was added to the left. Since we have metadata fields on the right. Fields can only be loaded to the right of the publishing tab if there is no metadata fields.', $viewName_single), 'Notice'); } // set the publishing layout @@ -10594,7 +10628,7 @@ class Interpretation extends Fields $codeName = $filter['code'] . ComponentbuilderHelper::safeString($filter['custom']['text'], 'F'); $type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F'); $otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection"; - $otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->getOptions();"; + $otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;"; $otherFilter[] = $this->_t(2) . "if (\$this->" . $codeName . "Options)"; $otherFilter[] = $this->_t(2) . "{"; $otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter"; diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 79fef55a6..e5a1d0663 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -175,9 +175,6 @@ class Infusion extends Interpretation // ADMIN_GLOBAL_EVENT $this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT' . $this->hhh] = ''; - // set incase no extra admin files are loaded - $this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FILES' . $this->hhh] = ''; - // now load the data for the global event if needed if ($this->componentData->add_admin_event == 1) { diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index dfc47557b..0d4f09a8e 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -541,7 +541,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE="Alias Builder Type" COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION="How should the alias be build for this view" COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL="Alias Builder Type" COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM" -COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="ARCHIVE" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_ARMSCIIEIGHT_ARMENIAN_MOST_SUITABLE_COLLATION_ARMSCIIEIGHT_GENERAL_CI="armscii8 - ARMSCII-8 Armenian (most suitable collation = armscii8_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_BIN_CHARSET_ARMSCIIEIGHT="armscii8_bin (charset = armscii8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_GENERAL_CI_CHARSET_ARMSCIIEIGHT="armscii8_general_ci (charset = armscii8)" COM_COMPONENTBUILDER_ADMIN_VIEW_ARRAY="ARRAY" COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN="Arrow Down" COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4" @@ -561,12 +564,20 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP="Arrow Up" COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_FOUR="Arrow Up 4" COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_THREE="Arrow Up 3" COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_TWO="Arrow Up 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_BIN_CHARSET_ASCII="ascii_bin (charset = ascii)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_GENERAL_CI_CHARSET_ASCII="ascii_general_ci (charset = ascii)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_US_ASCII_MOST_SUITABLE_COLLATION_ASCII_GENERAL_CI="ascii - US ASCII (most suitable collation = ascii_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_ATTACHMENT="Attachment" COM_COMPONENTBUILDER_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_BAN_CIRCLE="Ban Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_BARS="Bars" COM_COMPONENTBUILDER_ADMIN_VIEW_BASESIXTY_FOUR="BASE64" COM_COMPONENTBUILDER_ADMIN_VIEW_BASKET="Basket" +COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_BIGFIVE_TRADITIONAL_CHINESE_MOST_SUITABLE_COLLATION_BIGFIVE_CHINESE_CI="big5 - Big5 Traditional Chinese (most suitable collation = big5_chinese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_BIN_CHARSET_BIGFIVE="big5_bin (charset = big5)" +COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_CHINESE_CI_CHARSET_BIGFIVE="big5_chinese_ci (charset = big5)" +COM_COMPONENTBUILDER_ADMIN_VIEW_BINARY_BINARY_PSEUDO_CHARSET_MOST_SUITABLE_COLLATION_BINARY="binary - Binary pseudo charset (most suitable collation = binary)" +COM_COMPONENTBUILDER_ADMIN_VIEW_BINARY_CHARSET_BINARY="binary (charset = binary)" COM_COMPONENTBUILDER_ADMIN_VIEW_BOOK="Book" COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK="Bookmark" COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2" @@ -607,6 +618,37 @@ 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" COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE="core.edit.state" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_BIN_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY="cp850_bin (charset = cp850)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_DOS_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_FIFTY_GENERAL_CI="cp850 - DOS West European (most suitable collation = cp850_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY="cp850_general_ci (charset = cp850)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_BIN_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY_TWO="cp852_bin (charset = cp852)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_DOS_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_FIFTY_TWO_GENERAL_CI="cp852 - DOS Central European (most suitable collation = cp852_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY_TWO="cp852_general_ci (charset = cp852)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_BIN_CHARSET_CPEIGHT_HUNDRED_AND_SIXTY_SIX="cp866_bin (charset = cp866)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_DOS_RUSSIAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_SIXTY_SIX_GENERAL_CI="cp866 - DOS Russian (most suitable collation = cp866_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_SIXTY_SIX="cp866_general_ci (charset = cp866)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_BIN_CHARSET_CPNINE_HUNDRED_AND_THIRTY_TWO="cp932_bin (charset = cp932)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_JAPANESE_CI_CHARSET_CPNINE_HUNDRED_AND_THIRTY_TWO="cp932_japanese_ci (charset = cp932)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_SJIS_FOR_WINDOWS_JAPANESE_MOST_SUITABLE_COLLATION_CPNINE_HUNDRED_AND_THIRTY_TWO_JAPANESE_CI="cp932 - SJIS for Windows Japanese (most suitable collation = cp932_japanese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_bin (charset = cp1250)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_CROATIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_croatian_ci (charset = cp1250)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_CZECH_CS_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_czech_cs (charset = cp1250)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_general_ci (charset = cp1250)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_bin (charset = cp1251)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_BULGARIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_bulgarian_ci (charset = cp1251)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_general_ci (charset = cp1251)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CS_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_general_cs (charset = cp1251)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_UKRAINIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_ukrainian_ci (charset = cp1251)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_WINDOWS_CYRILLIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CI="cp1251 - Windows Cyrillic (most suitable collation = cp1251_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_POLISH_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_polish_ci (charset = cp1250)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_bin (charset = cp1257)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_general_ci (charset = cp1257)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_LITHUANIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_lithuanian_ci (charset = cp1257)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_WINDOWS_BALTIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_GENERAL_CI="cp1257 - Windows Baltic (most suitable collation = cp1257_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX="cp1256_bin (charset = cp1256)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX="cp1256_general_ci (charset = cp1256)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_WINDOWS_ARABIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_GENERAL_CI="cp1256 - Windows Arabic (most suitable collation = cp1256_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_WINDOWS_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_GENERAL_CI="cp1250 - Windows Central European (most suitable collation = cp1250_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admin View." COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By" COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created." @@ -628,6 +670,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import" COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard" COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database" +COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_BIN_CHARSET_DECEIGHT="dec8_bin (charset = dec8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_DEC_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_DECEIGHT_SWEDISH_CI="dec8 - DEC West European (most suitable collation = dec8_swedish_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_SWEDISH_CI_CHARSET_DECEIGHT="dec8_swedish_ci (charset = dec8)" COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT="Default" COM_COMPONENTBUILDER_ADMIN_VIEW_DELETE="Delete" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description" @@ -643,6 +688,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE="Envelope" COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE_OPENED="Envelope Opened" COM_COMPONENTBUILDER_ADMIN_VIEW_EQUALIZER="Equalizer" COM_COMPONENTBUILDER_ADMIN_VIEW_ERROR_UNIQUE_ALIAS="Another Admin View has the same alias." +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_BIN_CHARSET_EUCJPMS="eucjpms_bin (charset = eucjpms)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_JAPANESE_CI_CHARSET_EUCJPMS="eucjpms_japanese_ci (charset = eucjpms)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_UJIS_FOR_WINDOWS_JAPANESE_MOST_SUITABLE_COLLATION_EUCJPMS_JAPANESE_CI="eucjpms - UJIS for Windows Japanese (most suitable collation = eucjpms_japanese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_BIN_CHARSET_EUCKR="euckr_bin (charset = euckr)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_EUCKR_KOREAN_MOST_SUITABLE_COLLATION_EUCKR_KOREAN_CI="euckr - EUC-KR Korean (most suitable collation = euckr_korean_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_KOREAN_CI_CHARSET_EUCKR="euckr_korean_ci (charset = euckr)" COM_COMPONENTBUILDER_ADMIN_VIEW_EXIT="Exit" COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND="Expand" COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND_TWO="Expand 2" @@ -673,14 +724,39 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_REMOVE="Folder Remove" COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_THREE="Folder 3" COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_TWO="Forward 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_BIN_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_bin (charset = gb18030)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINA_NATIONAL_STANDARD_GBEIGHTEEN_THOUSAND_AND_THIRTY_MOST_SUITABLE_COLLATION_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI="gb18030 - China National Standard GB18030 (most suitable collation = gb18030_chinese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_chinese_ci (charset = gb18030)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_unicode_520_ci (charset = gb18030)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_BIN_CHARSET_GBK="gbk_bin (charset = gbk)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_CHINESE_CI_CHARSET_GBK="gbk_chinese_ci (charset = gbk)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_GBK_SIMPLIFIED_CHINESE_MOST_SUITABLE_COLLATION_GBK_CHINESE_CI="gbk - GBK Simplified Chinese (most suitable collation = gbk_chinese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_BIN_CHARSET_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE="gb2312_bin (charset = gb2312)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_CHINESE_CI_CHARSET_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE="gb2312_chinese_ci (charset = gb2312)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_SIMPLIFIED_CHINESE_MOST_SUITABLE_COLLATION_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_CHINESE_CI="gb2312 - GB2312 Simplified Chinese (most suitable collation = gb2312_chinese_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic" +COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_BIN_CHARSET_GEOSTDEIGHT="geostd8_bin (charset = geostd8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GENERAL_CI_CHARSET_GEOSTDEIGHT="geostd8_general_ci (charset = geostd8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GEOSTDEIGHT_GEORGIAN_MOST_SUITABLE_COLLATION_GEOSTDEIGHT_GENERAL_CI="geostd8 - GEOSTD8 Georgian (most suitable collation = geostd8_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_MYISAM="Global (default = MyISAM)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT="Global (default = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT_GENERAL_CI="Global (default = utf8_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_BIN_CHARSET_GREEK="greek_bin (charset = greek)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_GENERAL_CI_CHARSET_GREEK="greek_general_ci (charset = greek)" +COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINESEVEN_GREEK_MOST_SUITABLE_COLLATION_GREEK_GENERAL_CI="greek - ISO 8859-7 Greek (most suitable collation = greek_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_GRID="Grid" COM_COMPONENTBUILDER_ADMIN_VIEW_GRID_TWO="Grid 2" COM_COMPONENTBUILDER_ADMIN_VIEW_HEALTH="Health" COM_COMPONENTBUILDER_ADMIN_VIEW_HEART="Heart" COM_COMPONENTBUILDER_ADMIN_VIEW_HEART_TWO="Heart 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_BIN_CHARSET_HEBREW="hebrew_bin (charset = hebrew)" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_GENERAL_CI_CHARSET_HEBREW="hebrew_general_ci (charset = hebrew)" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINEEIGHT_HEBREW_MOST_SUITABLE_COLLATION_HEBREW_GENERAL_CI="hebrew - ISO 8859-8 Hebrew (most suitable collation = hebrew_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_HOME="Home" COM_COMPONENTBUILDER_ADMIN_VIEW_HOME_TWO="Home 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_BIN_CHARSET_HPEIGHT="hp8_bin (charset = hp8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_ENGLISH_CI_CHARSET_HPEIGHT="hp8_english_ci (charset = hp8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_HP_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_HPEIGHT_ENGLISH_CI="hp8 - HP West European (most suitable collation = hp8_english_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use for PHP]" @@ -704,6 +780,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION="Select applicable im COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL="Implementation" COM_COMPONENTBUILDER_ADMIN_VIEW_INFO="Info" COM_COMPONENTBUILDER_ADMIN_VIEW_INFO_CIRCLE="Info Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB="InnoDB" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default" @@ -728,18 +805,57 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add JavaScri COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript (edit view footer)" COM_COMPONENTBUILDER_ADMIN_VIEW_JOOMLA="Joomla" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY="Key" +COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_BIN_CHARSET_KEYBCSTWO="keybcs2_bin (charset = keybcs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_DOS_KAMENICKY_CZECHSLOVAK_MOST_SUITABLE_COLLATION_KEYBCSTWO_GENERAL_CI="keybcs2 - DOS Kamenicky Czech-Slovak (most suitable collation = keybcs2_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_GENERAL_CI_CHARSET_KEYBCSTWO="keybcs2_general_ci (charset = keybcs2)" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION="The key to use to link the child view." COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT="country" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE="Error! Please add key here." +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_BIN_CHARSET_KOIEIGHTR="koi8r_bin (charset = koi8r)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_GENERAL_CI_CHARSET_KOIEIGHTR="koi8r_general_ci (charset = koi8r)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_KOIEIGHTR_RELCOM_RUSSIAN_MOST_SUITABLE_COLLATION_KOIEIGHTR_GENERAL_CI="koi8r - KOI8-R Relcom Russian (most suitable collation = koi8r_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_BIN_CHARSET_KOIEIGHTU="koi8u_bin (charset = koi8u)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_GENERAL_CI_CHARSET_KOIEIGHTU="koi8u_general_ci (charset = koi8u)" +COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_KOIEIGHTU_UKRAINIAN_MOST_SUITABLE_COLLATION_KOIEIGHTU_GENERAL_CI="koi8u - KOI8-U Ukrainian (most suitable collation = koi8u_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_BIN_CHARSET_LATINFIVE="latin5_bin (charset = latin5)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_ISO_EIGHTY_EIGHTFIVENINENINE_TURKISH_MOST_SUITABLE_COLLATION_LATINFIVE_TURKISH_CI="latin5 - ISO 8859-9 Turkish (most suitable collation = latin5_turkish_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_TURKISH_CI_CHARSET_LATINFIVE="latin5_turkish_ci (charset = latin5)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_BIN_CHARSET_LATINONE="latin1_bin (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_CPONETWO_HUNDRED_AND_FIFTY_TWO_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_LATINONE_SWEDISH_CI="latin1 - cp1252 West European (most suitable collation = latin1_swedish_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_DANISH_CI_CHARSET_LATINONE="latin1_danish_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GENERAL_CI_CHARSET_LATINONE="latin1_general_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GENERAL_CS_CHARSET_LATINONE="latin1_general_cs (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GERMANONE_CI_CHARSET_LATINONE="latin1_german1_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GERMANTWO_CI_CHARSET_LATINONE="latin1_german2_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_SPANISH_CI_CHARSET_LATINONE="latin1_spanish_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_SWEDISH_CI_CHARSET_LATINONE="latin1_swedish_ci (charset = latin1)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_BIN_CHARSET_LATINSEVEN="latin7_bin (charset = latin7)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_ESTONIAN_CS_CHARSET_LATINSEVEN="latin7_estonian_cs (charset = latin7)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_GENERAL_CI_CHARSET_LATINSEVEN="latin7_general_ci (charset = latin7)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_GENERAL_CS_CHARSET_LATINSEVEN="latin7_general_cs (charset = latin7)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINETHIRTEEN_BALTIC_MOST_SUITABLE_COLLATION_LATINSEVEN_GENERAL_CI="latin7 - ISO 8859-13 Baltic (most suitable collation = latin7_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_BIN_CHARSET_LATINTWO="latin2_bin (charset = latin2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_CROATIAN_CI_CHARSET_LATINTWO="latin2_croatian_ci (charset = latin2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_CZECH_CS_CHARSET_LATINTWO="latin2_czech_cs (charset = latin2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_GENERAL_CI_CHARSET_LATINTWO="latin2_general_ci (charset = latin2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_HUNGARIAN_CI_CHARSET_LATINTWO="latin2_hungarian_ci (charset = latin2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINETWO_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_LATINTWO_GENERAL_CI="latin2 - ISO 8859-2 Central European (most suitable collation = latin2_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCK="Lock" COM_COMPONENTBUILDER_ADMIN_VIEW_LOOP="Loop" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_BIN_CHARSET_MACCE="macce_bin (charset = macce)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_GENERAL_CI_CHARSET_MACCE="macce_general_ci (charset = macce)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_MAC_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_MACCE_GENERAL_CI="macce - Mac Central European (most suitable collation = macce_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_BIN_CHARSET_MACROMAN="macroman_bin (charset = macroman)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_GENERAL_CI_CHARSET_MACROMAN="macroman_general_ci (charset = macroman)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_MAC_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_MACROMAN_GENERAL_CI="macroman - Mac West European (most suitable collation = macroman_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY="MEMORY" COM_COMPONENTBUILDER_ADMIN_VIEW_MENU="Menu" COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_THREE="Menu 3" COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_TWO="Menu 2" @@ -760,7 +876,17 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date" COM_COMPONENTBUILDER_ADMIN_VIEW_MOVE="Move" COM_COMPONENTBUILDER_ADMIN_VIEW_MUSIC="Music" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM="MyISAM" COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET="Mysql Table Charset" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_DESCRIPTION="Select the mySql Table Charset you would like to use for this admin view's table." +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_LABEL="mySql Table Charset" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE="Mysql Table Collate" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_DESCRIPTION="Select the mySql Table Collation you would like to use for this admin view's table." +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_LABEL="mySql Table Collation" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE="Mysql Table Engine" +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION="Select the mySql Table Engine you would like to use for this admin view's table." +COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL="mySql Table Engines" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL="Name" @@ -829,6 +955,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE="Pause" COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL="Pencil" COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL_TWO="Pencil 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA="PERFORMANCE_SCHEMA" COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions" COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone" COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2" @@ -968,6 +1095,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE="Error! Please add som COM_COMPONENTBUILDER_ADMIN_VIEW_SHUFFLE="Shuffle" COM_COMPONENTBUILDER_ADMIN_VIEW_SIGNUP="Signup" COM_COMPONENTBUILDER_ADMIN_VIEW_SINGLE="Single" +COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_BIN_CHARSET_SJIS="sjis_bin (charset = sjis)" +COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_JAPANESE_CI_CHARSET_SJIS="sjis_japanese_ci (charset = sjis)" +COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_SHIFTJIS_JAPANESE_MOST_SUITABLE_COLLATION_SJIS_JAPANESE_CI="sjis - Shift-JIS Japanese (most suitable collation = sjis_japanese_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY="Smiley" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL="Smiley Neutral" COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL_TWO="Smiley Neutral 2" @@ -991,6 +1121,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_STOP="Stop" COM_COMPONENTBUILDER_ADMIN_VIEW_STOP_CIRCLE="Stop Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_STRING="STRING" COM_COMPONENTBUILDER_ADMIN_VIEW_SUPPORT="Support" +COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_BIN_CHARSET_SWESEVEN="swe7_bin (charset = swe7)" +COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_SEVENBIT_SWEDISH_MOST_SUITABLE_COLLATION_SWESEVEN_SWEDISH_CI="swe7 - 7bit Swedish (most suitable collation = swe7_swedish_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_SWEDISH_CI_CHARSET_SWESEVEN="swe7_swedish_ci (charset = swe7)" COM_COMPONENTBUILDER_ADMIN_VIEW_SWITCH="Switch" COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME="System Name" COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_DESCRIPTION="Used only in the system." @@ -1014,12 +1147,46 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_LABEL="Task Name" COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_MESSAGE="Error! Please add task name here." COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down" COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_UP="Thumbs Up" +COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_BIN_CHARSET_TISSIX_HUNDRED_AND_TWENTY="tis620_bin (charset = tis620)" +COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_THAI_CI_CHARSET_TISSIX_HUNDRED_AND_TWENTY="tis620_thai_ci (charset = tis620)" +COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_TISSIX_HUNDRED_AND_TWENTY_THAI_MOST_SUITABLE_COLLATION_TISSIX_HUNDRED_AND_TWENTY_THAI_CI="tis620 - TIS620 Thai (most suitable collation = tis620_thai_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree" COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="for list target" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_BIN_CHARSET_UCSTWO="ucs2_bin (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CROATIAN_CI_CHARSET_UCSTWO="ucs2_croatian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CZECH_CI_CHARSET_UCSTWO="ucs2_czech_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_DANISH_CI_CHARSET_UCSTWO="ucs2_danish_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ESPERANTO_CI_CHARSET_UCSTWO="ucs2_esperanto_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ESTONIAN_CI_CHARSET_UCSTWO="ucs2_estonian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GENERAL_CI_CHARSET_UCSTWO="ucs2_general_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GENERAL_MYSQLFIVE_HUNDRED_CI_CHARSET_UCSTWO="ucs2_general_mysql500_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GERMANTWO_CI_CHARSET_UCSTWO="ucs2_german2_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_HUNGARIAN_CI_CHARSET_UCSTWO="ucs2_hungarian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ICELANDIC_CI_CHARSET_UCSTWO="ucs2_icelandic_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_LATVIAN_CI_CHARSET_UCSTWO="ucs2_latvian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_LITHUANIAN_CI_CHARSET_UCSTWO="ucs2_lithuanian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_PERSIAN_CI_CHARSET_UCSTWO="ucs2_persian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_POLISH_CI_CHARSET_UCSTWO="ucs2_polish_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ROMANIAN_CI_CHARSET_UCSTWO="ucs2_romanian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ROMAN_CI_CHARSET_UCSTWO="ucs2_roman_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SINHALA_CI_CHARSET_UCSTWO="ucs2_sinhala_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SLOVAK_CI_CHARSET_UCSTWO="ucs2_slovak_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SLOVENIAN_CI_CHARSET_UCSTWO="ucs2_slovenian_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SPANISHTWO_CI_CHARSET_UCSTWO="ucs2_spanish2_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SPANISH_CI_CHARSET_UCSTWO="ucs2_spanish_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SWEDISH_CI_CHARSET_UCSTWO="ucs2_swedish_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_TURKISH_CI_CHARSET_UCSTWO="ucs2_turkish_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UCSTWO_UNICODE_MOST_SUITABLE_COLLATION_UCSTWO_GENERAL_CI="ucs2 - UCS-2 Unicode (most suitable collation = ucs2_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UNICODE_CI_CHARSET_UCSTWO="ucs2_unicode_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UNICODE_FIVETWOZERO_CI_CHARSET_UCSTWO="ucs2_unicode_520_ci (charset = ucs2)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_VIETNAMESE_CI_CHARSET_UCSTWO="ucs2_vietnamese_ci (charset = ucs2)" COM_COMPONENTBUILDER_ADMIN_VIEW_UINT="UINT" +COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_BIN_CHARSET_UJIS="ujis_bin (charset = ujis)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_EUCJP_JAPANESE_MOST_SUITABLE_COLLATION_UJIS_JAPANESE_CI="ujis - EUC-JP Japanese (most suitable collation = ujis_japanese_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_JAPANESE_CI_CHARSET_UJIS="ujis_japanese_ci (charset = ujis)" COM_COMPONENTBUILDER_ADMIN_VIEW_UNARCHIVE="Unarchive" COM_COMPONENTBUILDER_ADMIN_VIEW_UNBLOCK="Unblock" COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO="Undo" @@ -1034,6 +1201,118 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_USERNAME="USERNAME" COM_COMPONENTBUILDER_ADMIN_VIEW_USERS="Users" COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users." COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_LABEL="User Check" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_BIN_CHARSET_UTFEIGHTMBFOUR="utf8mb4_bin (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_CROATIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_croatian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_CZECH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_czech_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_DANISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_danish_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ESPERANTO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_esperanto_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ESTONIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_estonian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_GENERAL_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_general_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_GERMANTWO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_german2_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_HUNGARIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_hungarian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ICELANDIC_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_icelandic_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_LATVIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_latvian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_LITHUANIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_lithuanian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_PERSIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_persian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_POLISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_polish_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ROMANIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_romanian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ROMAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_roman_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SINHALA_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_sinhala_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SLOVAK_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_slovak_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SLOVENIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_slovenian_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SPANISHTWO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_spanish2_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SPANISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_spanish_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SWEDISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_swedish_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_TURKISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_turkish_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UNICODE_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_unicode_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_unicode_520_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UTFEIGHT_UNICODE_MOST_SUITABLE_COLLATION_UTFEIGHTMBFOUR_GENERAL_CI="utf8mb4 - UTF-8 Unicode (most suitable collation = utf8mb4_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_VIETNAMESE_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_vietnamese_ci (charset = utf8mb4)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_BIN_CHARSET_UTFEIGHT="utf8_bin (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_CROATIAN_CI_CHARSET_UTFEIGHT="utf8_croatian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_CZECH_CI_CHARSET_UTFEIGHT="utf8_czech_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_DANISH_CI_CHARSET_UTFEIGHT="utf8_danish_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ESPERANTO_CI_CHARSET_UTFEIGHT="utf8_esperanto_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ESTONIAN_CI_CHARSET_UTFEIGHT="utf8_estonian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GENERAL_CI_CHARSET_UTFEIGHT="utf8_general_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GENERAL_MYSQLFIVE_HUNDRED_CI_CHARSET_UTFEIGHT="utf8_general_mysql500_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GERMANTWO_CI_CHARSET_UTFEIGHT="utf8_german2_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_HUNGARIAN_CI_CHARSET_UTFEIGHT="utf8_hungarian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ICELANDIC_CI_CHARSET_UTFEIGHT="utf8_icelandic_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_LATVIAN_CI_CHARSET_UTFEIGHT="utf8_latvian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_LITHUANIAN_CI_CHARSET_UTFEIGHT="utf8_lithuanian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_PERSIAN_CI_CHARSET_UTFEIGHT="utf8_persian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_POLISH_CI_CHARSET_UTFEIGHT="utf8_polish_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ROMANIAN_CI_CHARSET_UTFEIGHT="utf8_romanian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ROMAN_CI_CHARSET_UTFEIGHT="utf8_roman_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SINHALA_CI_CHARSET_UTFEIGHT="utf8_sinhala_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SLOVAK_CI_CHARSET_UTFEIGHT="utf8_slovak_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SLOVENIAN_CI_CHARSET_UTFEIGHT="utf8_slovenian_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SPANISHTWO_CI_CHARSET_UTFEIGHT="utf8_spanish2_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SPANISH_CI_CHARSET_UTFEIGHT="utf8_spanish_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SWEDISH_CI_CHARSET_UTFEIGHT="utf8_swedish_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_TURKISH_CI_CHARSET_UTFEIGHT="utf8_turkish_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UNICODE_CI_CHARSET_UTFEIGHT="utf8_unicode_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFEIGHT="utf8_unicode_520_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UTFEIGHT_UNICODE_MOST_SUITABLE_COLLATION_UTFEIGHT_GENERAL_CI="utf8 - UTF-8 Unicode (most suitable collation = utf8_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_VIETNAMESE_CI_CHARSET_UTFEIGHT="utf8_vietnamese_ci (charset = utf8)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_BIN_CHARSET_UTFSIXTEENLE="utf16le_bin (charset = utf16le)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_GENERAL_CI_CHARSET_UTFSIXTEENLE="utf16le_general_ci (charset = utf16le)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_UTFSIXTEENLE_UNICODE_MOST_SUITABLE_COLLATION_UTFSIXTEENLE_GENERAL_CI="utf16le - UTF-16LE Unicode (most suitable collation = utf16le_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_BIN_CHARSET_UTFSIXTEEN="utf16_bin (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_CROATIAN_CI_CHARSET_UTFSIXTEEN="utf16_croatian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_CZECH_CI_CHARSET_UTFSIXTEEN="utf16_czech_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_DANISH_CI_CHARSET_UTFSIXTEEN="utf16_danish_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ESPERANTO_CI_CHARSET_UTFSIXTEEN="utf16_esperanto_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ESTONIAN_CI_CHARSET_UTFSIXTEEN="utf16_estonian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_GENERAL_CI_CHARSET_UTFSIXTEEN="utf16_general_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_GERMANTWO_CI_CHARSET_UTFSIXTEEN="utf16_german2_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_HUNGARIAN_CI_CHARSET_UTFSIXTEEN="utf16_hungarian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ICELANDIC_CI_CHARSET_UTFSIXTEEN="utf16_icelandic_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_LATVIAN_CI_CHARSET_UTFSIXTEEN="utf16_latvian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_LITHUANIAN_CI_CHARSET_UTFSIXTEEN="utf16_lithuanian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_PERSIAN_CI_CHARSET_UTFSIXTEEN="utf16_persian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_POLISH_CI_CHARSET_UTFSIXTEEN="utf16_polish_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ROMANIAN_CI_CHARSET_UTFSIXTEEN="utf16_romanian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ROMAN_CI_CHARSET_UTFSIXTEEN="utf16_roman_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SINHALA_CI_CHARSET_UTFSIXTEEN="utf16_sinhala_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SLOVAK_CI_CHARSET_UTFSIXTEEN="utf16_slovak_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SLOVENIAN_CI_CHARSET_UTFSIXTEEN="utf16_slovenian_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SPANISHTWO_CI_CHARSET_UTFSIXTEEN="utf16_spanish2_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SPANISH_CI_CHARSET_UTFSIXTEEN="utf16_spanish_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SWEDISH_CI_CHARSET_UTFSIXTEEN="utf16_swedish_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_TURKISH_CI_CHARSET_UTFSIXTEEN="utf16_turkish_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UNICODE_CI_CHARSET_UTFSIXTEEN="utf16_unicode_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFSIXTEEN="utf16_unicode_520_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UTFSIXTEEN_UNICODE_MOST_SUITABLE_COLLATION_UTFSIXTEEN_GENERAL_CI="utf16 - UTF-16 Unicode (most suitable collation = utf16_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_VIETNAMESE_CI_CHARSET_UTFSIXTEEN="utf16_vietnamese_ci (charset = utf16)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_BIN_CHARSET_UTFTHIRTY_TWO="utf32_bin (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_CROATIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_croatian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_CZECH_CI_CHARSET_UTFTHIRTY_TWO="utf32_czech_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_DANISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_danish_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ESPERANTO_CI_CHARSET_UTFTHIRTY_TWO="utf32_esperanto_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ESTONIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_estonian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_GENERAL_CI_CHARSET_UTFTHIRTY_TWO="utf32_general_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_GERMANTWO_CI_CHARSET_UTFTHIRTY_TWO="utf32_german2_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_HUNGARIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_hungarian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ICELANDIC_CI_CHARSET_UTFTHIRTY_TWO="utf32_icelandic_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_LATVIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_latvian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_LITHUANIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_lithuanian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_PERSIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_persian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_POLISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_polish_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ROMANIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_romanian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ROMAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_roman_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SINHALA_CI_CHARSET_UTFTHIRTY_TWO="utf32_sinhala_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SLOVAK_CI_CHARSET_UTFTHIRTY_TWO="utf32_slovak_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SLOVENIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_slovenian_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SPANISHTWO_CI_CHARSET_UTFTHIRTY_TWO="utf32_spanish2_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SPANISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_spanish_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SWEDISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_swedish_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_TURKISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_turkish_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UNICODE_CI_CHARSET_UTFTHIRTY_TWO="utf32_unicode_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFTHIRTY_TWO="utf32_unicode_520_ci (charset = utf32)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UTFTHIRTY_TWO_UNICODE_MOST_SUITABLE_COLLATION_UTFTHIRTY_TWO_GENERAL_CI="utf32 - UTF-32 Unicode (most suitable collation = utf32_general_ci)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_VIETNAMESE_CI_CHARSET_UTFTHIRTY_TWO="utf32_vietnamese_ci (charset = utf32)" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name" @@ -6764,8 +7043,8 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH COM_COMPONENTBUILDER_THE_SERVER_DETAILS_FOR_BID_SB_COULD_NOT_BE_RETRIEVED="The server details for (ID: %s) could not be retrieved!" COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!" COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!" +COM_COMPONENTBUILDER_THE_TEXT_IS_LOADING="The text is loading" COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The url (%s) set to retrieve the packages does not exist!" -COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading" COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This %s is not linked to any other areas of JCB at this time!" COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package PASSED the checksum validation!Manually also validate that the correct checksum was used.
This checksum: %s must be the same as the one found @ " COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key." diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index f3f5cbdb9..b722cef9a 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -15,6 +15,9 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( + 'mysql_table_engine', + 'mysql_table_charset', + 'mysql_table_collate', 'add_sql', 'source', 'addtables' diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 864d060e3..186d3ba04 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -86,88 +86,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_import_headers)) + if (!empty($item->php_batchcopy)) { - // base64 Decode php_import_headers. - $item->php_import_headers = base64_decode($item->php_import_headers); - } - - if (!empty($item->html_import_view)) - { - // base64 Decode html_import_view. - $item->html_import_view = base64_decode($item->html_import_view); - } - - if (!empty($item->php_import_save)) - { - // base64 Decode php_import_save. - $item->php_import_save = base64_decode($item->php_import_save); - } - - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - - if (!empty($item->php_getitems)) - { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - - if (!empty($item->php_getitems_after_all)) - { - // base64 Decode php_getitems_after_all. - $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); - } - - if (!empty($item->php_getlistquery)) - { - // base64 Decode php_getlistquery. - $item->php_getlistquery = base64_decode($item->php_getlistquery); - } - - if (!empty($item->css_view)) - { - // base64 Decode css_view. - $item->css_view = base64_decode($item->css_view); - } - - if (!empty($item->php_getform)) - { - // base64 Decode php_getform. - $item->php_getform = base64_decode($item->php_getform); - } - - if (!empty($item->php_before_save)) - { - // base64 Decode php_before_save. - $item->php_before_save = base64_decode($item->php_before_save); - } - - if (!empty($item->css_views)) - { - // base64 Decode css_views. - $item->css_views = base64_decode($item->css_views); - } - - if (!empty($item->php_save)) - { - // base64 Decode php_save. - $item->php_save = base64_decode($item->php_save); - } - - if (!empty($item->php_postsavehook)) - { - // base64 Decode php_postsavehook. - $item->php_postsavehook = base64_decode($item->php_postsavehook); - } - - if (!empty($item->javascript_view_file)) - { - // base64 Decode javascript_view_file. - $item->javascript_view_file = base64_decode($item->javascript_view_file); + // base64 Decode php_batchcopy. + $item->php_batchcopy = base64_decode($item->php_batchcopy); } if (!empty($item->php_allowadd)) @@ -176,34 +98,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_allowadd = base64_decode($item->php_allowadd); } - if (!empty($item->php_allowedit)) + if (!empty($item->php_save)) { - // base64 Decode php_allowedit. - $item->php_allowedit = base64_decode($item->php_allowedit); + // base64 Decode php_save. + $item->php_save = base64_decode($item->php_save); } - if (!empty($item->javascript_view_footer)) + if (!empty($item->php_getform)) { - // base64 Decode javascript_view_footer. - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // base64 Decode php_getform. + $item->php_getform = base64_decode($item->php_getform); } - if (!empty($item->php_batchcopy)) + if (!empty($item->php_getitems_after_all)) { - // base64 Decode php_batchcopy. - $item->php_batchcopy = base64_decode($item->php_batchcopy); + // base64 Decode php_getitems_after_all. + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); } - if (!empty($item->php_batchmove)) + if (!empty($item->php_import_save)) { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); + // base64 Decode php_import_save. + $item->php_import_save = base64_decode($item->php_import_save); } - if (!empty($item->javascript_views_file)) + if (!empty($item->php_document)) { - // base64 Decode javascript_views_file. - $item->javascript_views_file = base64_decode($item->javascript_views_file); + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); } if (!empty($item->php_before_publish)) @@ -212,34 +134,106 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_before_publish = base64_decode($item->php_before_publish); } - if (!empty($item->php_after_publish)) - { - // base64 Decode php_after_publish. - $item->php_after_publish = base64_decode($item->php_after_publish); - } - - if (!empty($item->javascript_views_footer)) - { - // base64 Decode javascript_views_footer. - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); - } - if (!empty($item->php_before_delete)) { // base64 Decode php_before_delete. $item->php_before_delete = base64_decode($item->php_before_delete); } + if (!empty($item->html_import_view)) + { + // base64 Decode html_import_view. + $item->html_import_view = base64_decode($item->html_import_view); + } + + if (!empty($item->php_getitems)) + { + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + + if (!empty($item->php_getlistquery)) + { + // base64 Decode php_getlistquery. + $item->php_getlistquery = base64_decode($item->php_getlistquery); + } + + if (!empty($item->php_before_save)) + { + // base64 Decode php_before_save. + $item->php_before_save = base64_decode($item->php_before_save); + } + + if (!empty($item->php_postsavehook)) + { + // base64 Decode php_postsavehook. + $item->php_postsavehook = base64_decode($item->php_postsavehook); + } + + if (!empty($item->php_allowedit)) + { + // base64 Decode php_allowedit. + $item->php_allowedit = base64_decode($item->php_allowedit); + } + + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); + } + + if (!empty($item->php_after_publish)) + { + // base64 Decode php_after_publish. + $item->php_after_publish = base64_decode($item->php_after_publish); + } + if (!empty($item->php_after_delete)) { // base64 Decode php_after_delete. $item->php_after_delete = base64_decode($item->php_after_delete); } - if (!empty($item->php_document)) + if (!empty($item->php_import_headers)) { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); + // base64 Decode php_import_headers. + $item->php_import_headers = base64_decode($item->php_import_headers); + } + + if (!empty($item->css_view)) + { + // base64 Decode css_view. + $item->css_view = base64_decode($item->css_view); + } + + if (!empty($item->css_views)) + { + // base64 Decode css_views. + $item->css_views = base64_decode($item->css_views); + } + + if (!empty($item->javascript_view_file)) + { + // base64 Decode javascript_view_file. + $item->javascript_view_file = base64_decode($item->javascript_view_file); + } + + if (!empty($item->javascript_view_footer)) + { + // base64 Decode javascript_view_footer. + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + } + + if (!empty($item->javascript_views_file)) + { + // base64 Decode javascript_views_file. + $item->javascript_views_file = base64_decode($item->javascript_views_file); + } + + if (!empty($item->javascript_views_footer)) + { + // base64 Decode javascript_views_footer. + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } if (!empty($item->php_controller)) @@ -254,12 +248,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_model = base64_decode($item->php_model); } - if (!empty($item->sql)) - { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); - } - if (!empty($item->php_controller_list)) { // base64 Decode php_controller_list. @@ -272,6 +260,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_model_list = base64_decode($item->php_model_list); } + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); + } + + if (!empty($item->php_ajaxmethod)) + { + // base64 Decode php_ajaxmethod. + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + } + if (!empty($item->php_import_display)) { // base64 Decode php_import_display. @@ -284,32 +284,24 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import = base64_decode($item->php_import); } - if (!empty($item->php_ajaxmethod)) - { - // base64 Decode php_ajaxmethod. - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); - } - if (!empty($item->php_import_setdata)) { // base64 Decode php_import_setdata. $item->php_import_setdata = base64_decode($item->php_import_setdata); } + if (!empty($item->php_getitem)) + { + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); + } + if (!empty($item->php_import_ext)) { // base64 Decode php_import_ext. $item->php_import_ext = base64_decode($item->php_import_ext); } - if (!empty($item->addtables)) - { - // Convert the addtables field to an array. - $addtables = new Registry; - $addtables->loadString($item->addtables); - $item->addtables = $addtables->toArray(); - } - if (!empty($item->addpermissions)) { // Convert the addpermissions field to an array. @@ -334,6 +326,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->addlinked_views = $addlinked_views->toArray(); } + if (!empty($item->addtables)) + { + // Convert the addtables field to an array. + $addtables = new Registry; + $addtables->loadString($item->addtables); + $item->addtables = $addtables->toArray(); + } + if (!empty($item->alias_builder)) { // Convert the alias_builder field to an array. @@ -1220,19 +1220,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['system_name'] = $data['name_single']; } - // Set the addtables items to data. - if (isset($data['addtables']) && is_array($data['addtables'])) - { - $addtables = new JRegistry; - $addtables->loadArray($data['addtables']); - $data['addtables'] = (string) $addtables; - } - elseif (!isset($data['addtables'])) - { - // Set the empty addtables to data - $data['addtables'] = ''; - } - // Set the addpermissions items to data. if (isset($data['addpermissions']) && is_array($data['addpermissions'])) { @@ -1272,6 +1259,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['addlinked_views'] = ''; } + // Set the addtables items to data. + if (isset($data['addtables']) && is_array($data['addtables'])) + { + $addtables = new JRegistry; + $addtables->loadArray($data['addtables']); + $data['addtables'] = (string) $addtables; + } + elseif (!isset($data['addtables'])) + { + // Set the empty addtables to data + $data['addtables'] = ''; + } + // Set the alias_builder items to data. if (isset($data['alias_builder']) && is_array($data['alias_builder'])) { @@ -1311,88 +1311,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } - // Set the php_import_headers string to base64 string. - if (isset($data['php_import_headers'])) + // Set the php_batchcopy string to base64 string. + if (isset($data['php_batchcopy'])) { - $data['php_import_headers'] = base64_encode($data['php_import_headers']); - } - - // Set the html_import_view string to base64 string. - if (isset($data['html_import_view'])) - { - $data['html_import_view'] = base64_encode($data['html_import_view']); - } - - // Set the php_import_save string to base64 string. - if (isset($data['php_import_save'])) - { - $data['php_import_save'] = base64_encode($data['php_import_save']); - } - - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) - { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - - // Set the php_getitems_after_all string to base64 string. - if (isset($data['php_getitems_after_all'])) - { - $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); - } - - // Set the php_getlistquery string to base64 string. - if (isset($data['php_getlistquery'])) - { - $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); - } - - // Set the css_view string to base64 string. - if (isset($data['css_view'])) - { - $data['css_view'] = base64_encode($data['css_view']); - } - - // Set the php_getform string to base64 string. - if (isset($data['php_getform'])) - { - $data['php_getform'] = base64_encode($data['php_getform']); - } - - // Set the php_before_save string to base64 string. - if (isset($data['php_before_save'])) - { - $data['php_before_save'] = base64_encode($data['php_before_save']); - } - - // Set the css_views string to base64 string. - if (isset($data['css_views'])) - { - $data['css_views'] = base64_encode($data['css_views']); - } - - // Set the php_save string to base64 string. - if (isset($data['php_save'])) - { - $data['php_save'] = base64_encode($data['php_save']); - } - - // Set the php_postsavehook string to base64 string. - if (isset($data['php_postsavehook'])) - { - $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); - } - - // Set the javascript_view_file string to base64 string. - if (isset($data['javascript_view_file'])) - { - $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); + $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); } // Set the php_allowadd string to base64 string. @@ -1401,34 +1323,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_allowadd'] = base64_encode($data['php_allowadd']); } - // Set the php_allowedit string to base64 string. - if (isset($data['php_allowedit'])) + // Set the php_save string to base64 string. + if (isset($data['php_save'])) { - $data['php_allowedit'] = base64_encode($data['php_allowedit']); + $data['php_save'] = base64_encode($data['php_save']); } - // Set the javascript_view_footer string to base64 string. - if (isset($data['javascript_view_footer'])) + // Set the php_getform string to base64 string. + if (isset($data['php_getform'])) { - $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); + $data['php_getform'] = base64_encode($data['php_getform']); } - // Set the php_batchcopy string to base64 string. - if (isset($data['php_batchcopy'])) + // Set the php_getitems_after_all string to base64 string. + if (isset($data['php_getitems_after_all'])) { - $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); + $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) + // Set the php_import_save string to base64 string. + if (isset($data['php_import_save'])) { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); + $data['php_import_save'] = base64_encode($data['php_import_save']); } - // Set the javascript_views_file string to base64 string. - if (isset($data['javascript_views_file'])) + // Set the php_document string to base64 string. + if (isset($data['php_document'])) { - $data['javascript_views_file'] = base64_encode($data['javascript_views_file']); + $data['php_document'] = base64_encode($data['php_document']); } // Set the php_before_publish string to base64 string. @@ -1437,34 +1359,106 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_before_publish'] = base64_encode($data['php_before_publish']); } - // Set the php_after_publish string to base64 string. - if (isset($data['php_after_publish'])) - { - $data['php_after_publish'] = base64_encode($data['php_after_publish']); - } - - // Set the javascript_views_footer string to base64 string. - if (isset($data['javascript_views_footer'])) - { - $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); - } - // Set the php_before_delete string to base64 string. if (isset($data['php_before_delete'])) { $data['php_before_delete'] = base64_encode($data['php_before_delete']); } + // Set the html_import_view string to base64 string. + if (isset($data['html_import_view'])) + { + $data['html_import_view'] = base64_encode($data['html_import_view']); + } + + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) + { + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + + // Set the php_getlistquery string to base64 string. + if (isset($data['php_getlistquery'])) + { + $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + } + + // Set the php_before_save string to base64 string. + if (isset($data['php_before_save'])) + { + $data['php_before_save'] = base64_encode($data['php_before_save']); + } + + // Set the php_postsavehook string to base64 string. + if (isset($data['php_postsavehook'])) + { + $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); + } + + // Set the php_allowedit string to base64 string. + if (isset($data['php_allowedit'])) + { + $data['php_allowedit'] = base64_encode($data['php_allowedit']); + } + + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); + } + + // Set the php_after_publish string to base64 string. + if (isset($data['php_after_publish'])) + { + $data['php_after_publish'] = base64_encode($data['php_after_publish']); + } + // Set the php_after_delete string to base64 string. if (isset($data['php_after_delete'])) { $data['php_after_delete'] = base64_encode($data['php_after_delete']); } - // Set the php_document string to base64 string. - if (isset($data['php_document'])) + // Set the php_import_headers string to base64 string. + if (isset($data['php_import_headers'])) { - $data['php_document'] = base64_encode($data['php_document']); + $data['php_import_headers'] = base64_encode($data['php_import_headers']); + } + + // Set the css_view string to base64 string. + if (isset($data['css_view'])) + { + $data['css_view'] = base64_encode($data['css_view']); + } + + // Set the css_views string to base64 string. + if (isset($data['css_views'])) + { + $data['css_views'] = base64_encode($data['css_views']); + } + + // Set the javascript_view_file string to base64 string. + if (isset($data['javascript_view_file'])) + { + $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); + } + + // Set the javascript_view_footer string to base64 string. + if (isset($data['javascript_view_footer'])) + { + $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); + } + + // Set the javascript_views_file string to base64 string. + if (isset($data['javascript_views_file'])) + { + $data['javascript_views_file'] = base64_encode($data['javascript_views_file']); + } + + // Set the javascript_views_footer string to base64 string. + if (isset($data['javascript_views_footer'])) + { + $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } // Set the php_controller string to base64 string. @@ -1479,12 +1473,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_model'] = base64_encode($data['php_model']); } - // Set the sql string to base64 string. - if (isset($data['sql'])) - { - $data['sql'] = base64_encode($data['sql']); - } - // Set the php_controller_list string to base64 string. if (isset($data['php_controller_list'])) { @@ -1497,6 +1485,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_model_list'] = base64_encode($data['php_model_list']); } + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); + } + + // Set the php_ajaxmethod string to base64 string. + if (isset($data['php_ajaxmethod'])) + { + $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); + } + // Set the php_import_display string to base64 string. if (isset($data['php_import_display'])) { @@ -1509,18 +1509,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import'] = base64_encode($data['php_import']); } - // Set the php_ajaxmethod string to base64 string. - if (isset($data['php_ajaxmethod'])) - { - $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); - } - // Set the php_import_setdata string to base64 string. if (isset($data['php_import_setdata'])) { $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) + { + $data['php_getitem'] = base64_encode($data['php_getitem']); + } + // Set the php_import_ext string to base64 string. if (isset($data['php_import_ext'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index c33863740..b4863f8d2 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -31,8 +31,8 @@ class ComponentbuilderModelAdmin_views extends JModelList 'a.name_single','name_single', 'a.short_description','short_description', 'a.add_fadein','add_fadein', - 'a.add_custom_import','add_custom_import', 'a.type','type', + 'a.add_custom_import','add_custom_import', 'a.add_custom_button','add_custom_button', 'a.add_php_ajax','add_php_ajax' ); @@ -67,12 +67,12 @@ class ComponentbuilderModelAdmin_views extends JModelList $add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein'); $this->setState('filter.add_fadein', $add_fadein); - $add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import'); - $this->setState('filter.add_custom_import', $add_custom_import); - $type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type'); $this->setState('filter.type', $type); + $add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import'); + $this->setState('filter.add_custom_import', $add_custom_import); + $add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button'); $this->setState('filter.add_custom_button', $add_custom_button); @@ -136,10 +136,10 @@ class ComponentbuilderModelAdmin_views extends JModelList { // convert add_fadein $item->add_fadein = $this->selectionTranslation($item->add_fadein, 'add_fadein'); - // convert add_custom_import - $item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import'); // convert type $item->type = $this->selectionTranslation($item->type, 'type'); + // convert add_custom_import + $item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import'); // convert add_custom_button $item->add_custom_button = $this->selectionTranslation($item->add_custom_button, 'add_custom_button'); // convert add_php_ajax @@ -172,19 +172,6 @@ class ComponentbuilderModelAdmin_views extends JModelList return $add_fadeinArray[$value]; } } - // Array of add_custom_import language strings - if ($name === 'add_custom_import') - { - $add_custom_importArray = array( - 1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES', - 0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO' - ); - // Now check if value is found in this array - if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value])) - { - return $add_custom_importArray[$value]; - } - } // Array of type language strings if ($name === 'type') { @@ -198,6 +185,19 @@ class ComponentbuilderModelAdmin_views extends JModelList return $typeArray[$value]; } } + // Array of add_custom_import language strings + if ($name === 'add_custom_import') + { + $add_custom_importArray = array( + 1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES', + 0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO' + ); + // Now check if value is found in this array + if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value])) + { + return $add_custom_importArray[$value]; + } + } // Array of add_custom_button language strings if ($name === 'add_custom_button') { @@ -282,7 +282,7 @@ class ComponentbuilderModelAdmin_views extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.type LIKE '.$search.')'); + $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.name_list LIKE '.$search.')'); } } @@ -291,16 +291,16 @@ class ComponentbuilderModelAdmin_views extends JModelList { $query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein))); } - // Filter by Add_custom_import. - if ($add_custom_import = $this->getState('filter.add_custom_import')) - { - $query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import))); - } // Filter by Type. if ($type = $this->getState('filter.type')) { $query->where('a.type = ' . $db->quote($db->escape($type))); } + // Filter by Add_custom_import. + if ($add_custom_import = $this->getState('filter.add_custom_import')) + { + $query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import))); + } // Filter by Add_custom_button. if ($add_custom_button = $this->getState('filter.add_custom_button')) { @@ -376,76 +376,76 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_import_headers - $item->php_import_headers = base64_decode($item->php_import_headers); - // decode html_import_view - $item->html_import_view = base64_decode($item->html_import_view); - // decode php_import_save - $item->php_import_save = base64_decode($item->php_import_save); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); - // decode php_getitems_after_all - $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); - // decode php_getlistquery - $item->php_getlistquery = base64_decode($item->php_getlistquery); - // decode css_view - $item->css_view = base64_decode($item->css_view); - // decode php_getform - $item->php_getform = base64_decode($item->php_getform); - // decode php_before_save - $item->php_before_save = base64_decode($item->php_before_save); - // decode css_views - $item->css_views = base64_decode($item->css_views); - // decode php_save - $item->php_save = base64_decode($item->php_save); - // decode php_postsavehook - $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode javascript_view_file - $item->javascript_view_file = base64_decode($item->javascript_view_file); - // decode php_allowadd - $item->php_allowadd = base64_decode($item->php_allowadd); - // decode php_allowedit - $item->php_allowedit = base64_decode($item->php_allowedit); - // decode javascript_view_footer - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); // decode php_batchcopy $item->php_batchcopy = base64_decode($item->php_batchcopy); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode javascript_views_file - $item->javascript_views_file = base64_decode($item->javascript_views_file); - // decode php_before_publish - $item->php_before_publish = base64_decode($item->php_before_publish); - // decode php_after_publish - $item->php_after_publish = base64_decode($item->php_after_publish); - // decode javascript_views_footer - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); - // decode php_before_delete - $item->php_before_delete = base64_decode($item->php_before_delete); - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); + // decode php_allowadd + $item->php_allowadd = base64_decode($item->php_allowadd); + // decode php_save + $item->php_save = base64_decode($item->php_save); + // decode php_getform + $item->php_getform = base64_decode($item->php_getform); + // decode php_getitems_after_all + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + // decode php_import_save + $item->php_import_save = base64_decode($item->php_import_save); // decode php_document $item->php_document = base64_decode($item->php_document); + // decode php_before_publish + $item->php_before_publish = base64_decode($item->php_before_publish); + // decode php_before_delete + $item->php_before_delete = base64_decode($item->php_before_delete); + // decode html_import_view + $item->html_import_view = base64_decode($item->html_import_view); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); + // decode php_getlistquery + $item->php_getlistquery = base64_decode($item->php_getlistquery); + // decode php_before_save + $item->php_before_save = base64_decode($item->php_before_save); + // decode php_postsavehook + $item->php_postsavehook = base64_decode($item->php_postsavehook); + // decode php_allowedit + $item->php_allowedit = base64_decode($item->php_allowedit); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); + // decode php_after_publish + $item->php_after_publish = base64_decode($item->php_after_publish); + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); + // decode php_import_headers + $item->php_import_headers = base64_decode($item->php_import_headers); + // decode css_view + $item->css_view = base64_decode($item->css_view); + // decode css_views + $item->css_views = base64_decode($item->css_views); + // decode javascript_view_file + $item->javascript_view_file = base64_decode($item->javascript_view_file); + // decode javascript_view_footer + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // decode javascript_views_file + $item->javascript_views_file = base64_decode($item->javascript_views_file); + // decode javascript_views_footer + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); // decode php_controller $item->php_controller = base64_decode($item->php_controller); // decode php_model $item->php_model = base64_decode($item->php_model); - // decode sql - $item->sql = base64_decode($item->sql); // decode php_controller_list $item->php_controller_list = base64_decode($item->php_controller_list); // decode php_model_list $item->php_model_list = base64_decode($item->php_model_list); + // decode sql + $item->sql = base64_decode($item->sql); + // decode php_ajaxmethod + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); // decode php_import_display $item->php_import_display = base64_decode($item->php_import_display); // decode php_import $item->php_import = base64_decode($item->php_import); - // decode php_ajaxmethod - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // decode php_import_ext $item->php_import_ext = base64_decode($item->php_import_ext); // unset the values we don't want exported. @@ -512,8 +512,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $id .= ':' . $this->getState('filter.name_single'); $id .= ':' . $this->getState('filter.short_description'); $id .= ':' . $this->getState('filter.add_fadein'); - $id .= ':' . $this->getState('filter.add_custom_import'); $id .= ':' . $this->getState('filter.type'); + $id .= ':' . $this->getState('filter.add_custom_import'); $id .= ':' . $this->getState('filter.add_custom_button'); $id .= ':' . $this->getState('filter.add_php_ajax'); diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 034a34a70..19e1f18ef 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -441,9 +441,8 @@ class ComponentbuilderModelComponentbuilder extends JModelList public function getWiki() { - $document = JFactory::getDocument(); - $document->addScriptDeclaration(' - var gewiki = "https://raw.githubusercontent.com/wiki/vdm-io/Joomla-Component-Builder/Home.md"; + JFactory::getDocument()->addScriptDeclaration(' + var gewiki = "'. JURI::root() . 'administrator/components/com_componentbuilder/wiki_menu.txt"; jQuery(document).ready(function () { jQuery.get(gewiki) .success(function(wiki) { @@ -454,10 +453,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList }); });'); - return '
'.JText::_('COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING').'..
';
+ return ''.JText::_('COM_COMPONENTBUILDER_THE_TEXT_IS_LOADING').'..
';
}
-
public function getNoticeboard()
{
diff --git a/admin/models/fields/adminsviews.php b/admin/models/fields/adminsviews.php
index 074dcf976..f7f01fd4a 100644
--- a/admin/models/fields/adminsviews.php
+++ b/admin/models/fields/adminsviews.php
@@ -31,9 +31,9 @@ class JFormFieldAdminsviews extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index 6eb6a9ce3..eab812a5e 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -31,9 +31,9 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get custom folder files
$localfolder = JPATH_COMPONENT_ADMINISTRATOR.'/views';
diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php
index 428882209..930a07be5 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -31,9 +31,9 @@ class JFormFieldAdminviews extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/adminviewsreadonly.php b/admin/models/fields/adminviewsreadonly.php
index 8e83d3cc5..44ed0922b 100644
--- a/admin/models/fields/adminviewsreadonly.php
+++ b/admin/models/fields/adminviewsreadonly.php
@@ -31,9 +31,9 @@ class JFormFieldAdminviewsreadonly extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/aliasbuilder.php b/admin/models/fields/aliasbuilder.php
index daf9124aa..73924de37 100644
--- a/admin/models/fields/aliasbuilder.php
+++ b/admin/models/fields/aliasbuilder.php
@@ -31,9 +31,9 @@ class JFormFieldAliasbuilder extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db object
$db = JFactory::getDBO();
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 67a9f02b9..2de9a3d1a 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -31,9 +31,9 @@ class JFormFieldArticles extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index 7a4125cf9..21bc88cbd 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -138,9 +138,9 @@ class JFormFieldComponent extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/componentadminmenus.php b/admin/models/fields/componentadminmenus.php
index 6662acd41..771d68123 100644
--- a/admin/models/fields/componentadminmenus.php
+++ b/admin/models/fields/componentadminmenus.php
@@ -31,9 +31,9 @@ class JFormFieldComponentadminmenus extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/componentadminviews.php b/admin/models/fields/componentadminviews.php
index d1593e440..1aab206ca 100644
--- a/admin/models/fields/componentadminviews.php
+++ b/admin/models/fields/componentadminviews.php
@@ -31,9 +31,9 @@ class JFormFieldComponentadminviews extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php
index 41fb7e3f3..bb45545fd 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -31,9 +31,9 @@ class JFormFieldComponents extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php
index 2dd217195..f7ff9c042 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -31,9 +31,9 @@ class JFormFieldCustomadminviews extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php
index bb2f7ca9e..1307b440e 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -31,9 +31,9 @@ class JFormFieldCustomfilelist extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get custom folder files
$localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php
index c5660ab77..ea2801e79 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -31,9 +31,9 @@ class JFormFieldCustomfolderlist extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get custom folder folder
$localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php
index 3b571a777..911651035 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -31,9 +31,9 @@ class JFormFieldCustomgets extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php
index 65dc90bfb..cd3653456 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -31,9 +31,9 @@ class JFormFieldDbtables extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$tables= $db->getTableList();
diff --git a/admin/models/fields/dynamicdashboard.php b/admin/models/fields/dynamicdashboard.php
index 105181ca3..6593a09ef 100644
--- a/admin/models/fields/dynamicdashboard.php
+++ b/admin/models/fields/dynamicdashboard.php
@@ -31,9 +31,9 @@ class JFormFieldDynamicdashboard extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php
index c2d0cbd3e..a4c16dd82 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -138,9 +138,9 @@ class JFormFieldDynamicget extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php
index c45c2bef4..85ccf6c67 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -31,9 +31,9 @@ class JFormFieldDynamicgets extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/existingvalidationrules.php b/admin/models/fields/existingvalidationrules.php
index 38ec53960..a90c3ef32 100644
--- a/admin/models/fields/existingvalidationrules.php
+++ b/admin/models/fields/existingvalidationrules.php
@@ -31,9 +31,9 @@ class JFormFieldExistingvalidationrules extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get the existing validation rules names
if ($items = ComponentbuilderHelper::getExistingValidationRuleNames())
diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php
index ee76f9120..3db65d5ab 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -31,9 +31,9 @@ class JFormFieldFields extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index c14dfd782..365b6b743 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -138,9 +138,9 @@ class JFormFieldFieldtypes extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/filebehaviour.php b/admin/models/fields/filebehaviour.php
index 20fdbdce3..438035bb8 100644
--- a/admin/models/fields/filebehaviour.php
+++ b/admin/models/fields/filebehaviour.php
@@ -31,9 +31,9 @@ class JFormFieldFilebehaviour extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get the input from url
$jinput = JFactory::getApplication()->input;
diff --git a/admin/models/fields/joinfields.php b/admin/models/fields/joinfields.php
index fc7adabf6..700345da8 100644
--- a/admin/models/fields/joinfields.php
+++ b/admin/models/fields/joinfields.php
@@ -31,9 +31,9 @@ class JFormFieldJoinfields extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/joomlacomponents.php b/admin/models/fields/joomlacomponents.php
index 6a1e123f6..f05b0f86f 100644
--- a/admin/models/fields/joomlacomponents.php
+++ b/admin/models/fields/joomlacomponents.php
@@ -31,9 +31,9 @@ class JFormFieldJoomlacomponents extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php
index 6798d5cc7..b2033a7ff 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -31,9 +31,9 @@ class JFormFieldLang extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/libconfigfield.php b/admin/models/fields/libconfigfield.php
index 70795e84d..af2d59c86 100644
--- a/admin/models/fields/libconfigfield.php
+++ b/admin/models/fields/libconfigfield.php
@@ -31,9 +31,9 @@ class JFormFieldLibconfigfield extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/libraries.php b/admin/models/fields/libraries.php
index 86ffebd6c..4935bc2ce 100644
--- a/admin/models/fields/libraries.php
+++ b/admin/models/fields/libraries.php
@@ -138,9 +138,9 @@ class JFormFieldLibraries extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/librariesx.php b/admin/models/fields/librariesx.php
index 671b3fcdf..9fa3aa1f0 100644
--- a/admin/models/fields/librariesx.php
+++ b/admin/models/fields/librariesx.php
@@ -138,9 +138,9 @@ class JFormFieldLibrariesx extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get the input from url
$jinput = JFactory::getApplication()->input;
diff --git a/admin/models/fields/library.php b/admin/models/fields/library.php
index 6791cc0a2..caab1511d 100644
--- a/admin/models/fields/library.php
+++ b/admin/models/fields/library.php
@@ -138,9 +138,9 @@ class JFormFieldLibrary extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/libraryfiles.php b/admin/models/fields/libraryfiles.php
index b796e0a1a..b0b393ac1 100644
--- a/admin/models/fields/libraryfiles.php
+++ b/admin/models/fields/libraryfiles.php
@@ -31,9 +31,9 @@ class JFormFieldLibraryfiles extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get the input from url
$jinput = JFactory::getApplication()->input;
diff --git a/admin/models/fields/libraryreadonly.php b/admin/models/fields/libraryreadonly.php
index f52d5ec6e..8587b2b3c 100644
--- a/admin/models/fields/libraryreadonly.php
+++ b/admin/models/fields/libraryreadonly.php
@@ -31,9 +31,9 @@ class JFormFieldLibraryreadonly extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/listfields.php b/admin/models/fields/listfields.php
index ae285d157..d1b91bcf0 100644
--- a/admin/models/fields/listfields.php
+++ b/admin/models/fields/listfields.php
@@ -31,9 +31,9 @@ class JFormFieldListfields extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index e291a6867..cfaaa4127 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -138,9 +138,9 @@ class JFormFieldMaingets extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/matchfield.php b/admin/models/fields/matchfield.php
index 4358b20fa..f68d66117 100644
--- a/admin/models/fields/matchfield.php
+++ b/admin/models/fields/matchfield.php
@@ -31,9 +31,9 @@ class JFormFieldMatchfield extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/servers.php b/admin/models/fields/servers.php
index 1ead2fe3e..979018ffa 100644
--- a/admin/models/fields/servers.php
+++ b/admin/models/fields/servers.php
@@ -138,9 +138,9 @@ class JFormFieldServers extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index 31cfe2c3b..a8d3934c7 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -31,9 +31,9 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get custom folder files
$localfolder = JPATH_COMPONENT_SITE.'/views';
diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php
index 4617266ce..170aba55f 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -31,9 +31,9 @@ class JFormFieldSiteviews extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index fb19721c7..e9f499ee7 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -138,9 +138,9 @@ class JFormFieldSnippets extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/snippettype.php b/admin/models/fields/snippettype.php
index 2884ff7ad..8bf0ca050 100644
--- a/admin/models/fields/snippettype.php
+++ b/admin/models/fields/snippettype.php
@@ -31,9 +31,9 @@ class JFormFieldSnippettype extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
diff --git a/admin/models/fields/targetfields.php b/admin/models/fields/targetfields.php
index a3588add4..422bb0ea0 100644
--- a/admin/models/fields/targetfields.php
+++ b/admin/models/fields/targetfields.php
@@ -31,9 +31,9 @@ class JFormFieldTargetfields extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php
index 7ebc920e2..ed3469dee 100644
--- a/admin/models/fields/viewtabs.php
+++ b/admin/models/fields/viewtabs.php
@@ -31,9 +31,9 @@ class JFormFieldViewtabs extends JFormFieldList
/**
* Method to get a list of options for a list input.
*
- * @return array An array of JHtml options.
+ * @return array An array of JHtml options.
*/
- public function getOptions()
+ protected function getOptions()
{
// get the input from url
$jinput = JFactory::getApplication()->input;
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index e6c74249c..b31ba9b01 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -129,76 +129,104 @@
message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE"
hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT"
/>
-
+
Component Builder (v.2.9.6)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
@@ -54,7 +54,10 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
- Upgrade to Version 2.9.3 Was Successful! Let us know if anything is not working as expected.
';
+ Upgrade to Version 2.9.6 Was Successful! Let us know if anything is not working as expected.
';
}
}