Skip to content

Update installation/model/languages.php #5331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Update installation/model/languages.php #5331

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3041a59
Update installation/model/languages.php
richard67 Dec 5, 2014
0c3d142
Corrections for Travis
richard67 Dec 5, 2014
ca776d4
Corrected errors in SQL names quoting, rolled back with names quoting…
richard67 Dec 7, 2014
38f3478
Added SQL names quoting again for last statement with join
richard67 Dec 7, 2014
574c1f3
Again correction for name quoting in last SQL statement
richard67 Dec 7, 2014
6b48c81
Again corrected last SQL statement
richard67 Dec 7, 2014
96aae62
And again correction for Travis
richard67 Dec 7, 2014
08615de
And again multi-line function call code-style
richard67 Dec 7, 2014
2178b14
Final code style I hope
richard67 Dec 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 81 additions & 47 deletions installation/model/languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,26 +73,47 @@ public function __construct()
*/
public function getItems()
{
$updater = JUpdater::getInstance();
// Get the extension_id of the en-GB package.
$db = JFactory::getDbo();
$extQuery = $db->getQuery(true);

/*
* The following function uses extension_id 600, that is the English language extension id.
* In #__update_sites_extensions you should have 600 linked to the Accredited Translations Repo.
*/
$updater->findUpdates(array(600), 0);
$extQuery->select($db->qn('extension_id'))
->from($db->qn('#__extensions'))
->where($db->qn('type') . ' = ' . $db->q('language'))
->where($db->qn('element') . ' = ' . $db->q('en-GB'))
->where($db->qn('client_id') . ' = 0');

$db = JFactory::getDbo();
$query = $db->getQuery(true);
$db->setQuery($extQuery);

// Select the required fields from the updates table.
$query->select('update_id, name, version')
->from('#__updates')
->order('name');
$extId = (int) $db->loadResult();

$db->setQuery($query);
$list = $db->loadObjectList();
if ($extId)
{
$updater = JUpdater::getInstance();

/*
* The following function call uses the extension_id of the en-GB package.
* In #__update_sites_extensions you should have this extension_id linked
* to the Accredited Translations Repo.
*/
$updater->findUpdates(array($extId), 0);

$query = $db->getQuery(true);

if (!$list || $list instanceof Exception)
// Select the required fields from the updates table.
$query->select($db->qn(array('update_id', 'name', 'version')))
->from($db->qn('#__updates'))
->order($db->qn('name'));

$db->setQuery($query);
$list = $db->loadObjectList();

if (!$list || $list instanceof Exception)
{
$list = array();
}
}
else
{
$list = array();
}
Expand Down Expand Up @@ -337,12 +358,12 @@ protected function getLanguageList($client_id = 1)
$query = $db->getQuery(true);

// Select field element from the extensions table.
$query->select('a.element, a.name')
->from('#__extensions AS a')
->where('a.type = ' . $db->quote('language'))
->where('state = 0')
->where('enabled = 1')
->where('client_id=' . (int) $client_id);
$query->select($db->qn(array('element', 'name')))
->from($db->qn('#__extensions'))
->where($db->qn('type') . ' = ' . $db->q('language'))
->where($db->qn('state') . ' = 0')
->where($db->qn('enabled') . ' = 1')
->where($db->qn('client_id') . ' = ' . (int) $client_id);

$db->setQuery($query);

Expand Down Expand Up @@ -532,10 +553,10 @@ public function enablePlugin($pluginName)

$query
->clear()
->update('#__extensions')
->set('enabled = 1')
->where('name = ' . $db->quote($pluginName))
->where('type = ' . $db->quote('plugin'));
->update($db->qn('#__extensions'))
->set($db->qn('enabled') . ' = 1')
->where($db->qn('name') . ' = ' . $db->q($pluginName))
->where($db->qn('type') . ' = ' . $db->q('plugin'));

$db->setQuery($query);

Expand All @@ -557,10 +578,10 @@ public function enablePlugin($pluginName)
. '}';
$query
->clear()
->update('#__extensions')
->set('params = ' . $db->quote($params))
->where('name = ' . $db->quote('plg_system_languagefilter'))
->where('type = ' . $db->quote('plugin'));
->update($db->qn('#__extensions'))
->set($db->qn('params') . ' = ' . $db->q($params))
->where($db->qn('name') . ' = ' . $db->q('plg_system_languagefilter'))
->where($db->qn('type') . ' = ' . $db->q('plugin'));

$db->setQuery($query);

Expand Down Expand Up @@ -641,8 +662,8 @@ public function addModuleInModuleMenu($moduleId)

// Add Module in Module menus.
$query->clear()
->insert('#__modules_menu')
->columns(array($db->quoteName('moduleid'), $db->quoteName('menuid')))
->insert($db->qn('#__modules_menu'))
->columns(array($db->qn('moduleid'), $db->qn('menuid')))
->values($moduleId . ', 0');
$db->setQuery($query);

Expand Down Expand Up @@ -954,12 +975,12 @@ public function disableModuleMainMenu()
// Add Module in Module menus.
$query
->clear()
->update($db->quoteName('#__modules'))
->set($db->quoteName('published') . ' = 0')
->where($db->quoteName('module') . ' = ' . $db->quote('mod_menu'))
->where($db->quoteName('language') . ' = ' . $db->quote('*'))
->where($db->quoteName('client_id') . ' = ' . $db->quote('0'))
->where($db->quoteName('position') . ' = ' . $db->quote('position-7'));
->update($db->qn('#__modules'))
->set($db->qn('published') . ' = 0')
->where($db->qn('module') . ' = ' . $db->q('mod_menu'))
->where($db->qn('language') . ' = ' . $db->q('*'))
->where($db->qn('client_id') . ' = ' . $db->q('0'))
->where($db->qn('position') . ' = ' . $db->q('position-7'));
$db->setQuery($query);

if (!$db->execute())
Expand Down Expand Up @@ -987,9 +1008,9 @@ public function enableModule($moduleName)

$query
->clear()
->update($db->quoteName('#__modules'))
->set($db->quoteName('published') . ' = 1')
->where($db->quoteName('module') . ' = ' . $db->quote($moduleName));
->update($db->qn('#__modules'))
->set($db->qn('published') . ' = 1')
->where($db->qn('module') . ' = ' . $db->q($moduleName));
$db->setQuery($query);

if (!$db->execute())
Expand Down Expand Up @@ -1132,7 +1153,7 @@ public function addArticle($itemLanguage, $categoryId)
$newId = $article->get('id');

$query = $db->getQuery(true)
->insert($db->quoteName('#__content_frontpage'))
->insert($db->qn('#__content_frontpage'))
->values($newId . ', 0');

$db->setQuery($query);
Expand Down Expand Up @@ -1163,14 +1184,27 @@ private function getAdminId()
$db = JFactory::getDbo();
$query = $db->getQuery(true);

// Select the required fields from the updates table.
// Select the admin user ID
$query
->clear()
->select('u.id')
->from('#__users as u')
->join('LEFT', '#__user_usergroup_map AS map ON map.user_id = u.id')
->join('LEFT', '#__usergroups AS g ON map.group_id = g.id')
->where('g.title = ' . $db->q('Super Users'));
->select($db->qn('u') . '.' . $db->qn('id'))
->from($db->qn('#__users', 'u'))
->join(
'LEFT',
$db->qn('#__user_usergroup_map', 'map')
. ' ON ' . $db->qn('map') . '.' . $db->qn('user_id')
. ' = ' . $db->qn('u') . '.' . $db->qn('id')
)
->join(
'LEFT',
$db->qn('#__usergroups', 'g')
. ' ON ' . $db->qn('map') . '.' . $db->qn('group_id')
. ' = ' . $db->qn('g') . '.' . $db->qn('id')
)
->where(
$db->qn('g') . '.' . $db->qn('title')
. ' = ' . $db->q('Super Users')
);

$db->setQuery($query);
$id = $db->loadResult();
Expand Down