Skip to content
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.

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

Fix Plugins #415

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions plugins/box/plugins/languages/en.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
return array(
'plugins' => array(
'Plugins' => 'Plugins',
'Name' => 'Name',
'Actions' => 'Actions',
'Description' => 'Description',
'Plugins manager plugin' => 'Plugins manager plugin',
'Installed' => 'Installed',
'Install New' => 'Install New',
'Actions' => 'Actions',
'Name' => 'Name',
'Description' => 'Description',
'Delete' => 'Delete',
'Delete plugin :plugin' => 'Delete plugin :plugin',
'This plugin does not exist' => 'This plugin does not exist',
Expand All @@ -17,5 +18,12 @@
'Install' => 'Install',
'Uninstall' => 'Uninstall',
'README.md not found' => 'README.md not found',
'Info' => 'Info',
'Upload' => 'Upload',
'Drop File Here' => 'Drop File Here',
'Uninstall plugin :plugin' => 'Uninstall plugin :plugin',
'Plugin was deleted' => 'Plugin was deleted',
'Plugin was uninstalled' => 'Plugin was uninstalled',
'Plugin was installed' => 'Plugin was installed',
)
);
5 changes: 5 additions & 0 deletions plugins/box/plugins/languages/ru.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
return array(
'plugins' => array(
'Plugins' => 'Плагины',
'Plugins manager plugin' => 'Плагин Менеджер Плагинов',
'Installed' => 'Установленные',
'Install New' => 'Установить новые',
'Actions' => 'Действия',
Expand All @@ -20,5 +21,9 @@
'Info' => 'Инфо',
'Upload' => 'Загрузить',
'Drop File Here' => 'Перетащите файл сюда',
'Uninstall plugin :plugin' => 'Удалить плагин :plugin',
'Plugin was deleted' => 'Плагин удален',
'Plugin was uninstalled' => 'Плагин удален',
'Plugin was installed' => 'Плагин установлен',
)
);
7 changes: 6 additions & 1 deletion plugins/box/plugins/languages/uk.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
return array(
'plugins' => array(
'Plugins' => 'Плагіни',
'Plugins manager plugin' => 'Плагін Менеджер плагінів',
'Installed' => 'Встановлені',
'Install New' => 'Встановити нові',
'Actions' => 'Дії',
Expand All @@ -15,10 +16,14 @@
'Author' => 'Автор',
'Get More Plugins' => 'Завантажити інші плагіни',
'Install' => 'Встановити',
'Uninstall' => 'Видалити',
'Uninstall' => 'Вилучити',
'README.md not found' => 'README.md не знайдено',
'Info' => 'Інфо',
'Upload' => 'Завантажити',
'Drop File Here' => 'Перенесіть файл сюди',
'Uninstall plugin :plugin' => 'Вилучити плагін :plugin',
'Plugin was deleted' => 'Плагін видалено',
'Plugin was uninstalled' => 'Плагін вилучено',
'Plugin was installed' => 'Плагін встановлено',
)
);
7 changes: 7 additions & 0 deletions plugins/box/plugins/plugins.admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ public static function main()
// Delete plugin form plugins table
$plugins->deleteWhere('[name="'.Request::get('delete_plugin').'"]');

// Notification
Notification::set('success', __('Plugin was uninstalled', 'plugins'));

// Redirect
Request::redirect('index.php?id=plugins');
}
Expand Down Expand Up @@ -95,6 +98,9 @@ public static function main()
include PLUGINS . DS . basename(Text::lowercase(Request::get('install')), '.manifest.xml') . DS . 'install' . DS . $plugin_name . '.install.php';
}

// Notification
Notification::set('success', __('Plugin was installed', 'plugins'));

Request::redirect('index.php?id=plugins');

} else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
Expand All @@ -113,6 +119,7 @@ public static function main()
Javascript::javascriptVersionIncrement();

Dir::delete(PLUGINS . DS . basename(Request::get('delete_plugin_from_server'), '.manifest.xml'));
Notification::set('success', __('Plugin was deleted', 'plugins'));
Request::redirect('index.php?id=plugins');

} else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
Expand Down
2 changes: 1 addition & 1 deletion plugins/box/plugins/views/backend/index.view.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<?php } ?>
<?php echo Html::anchor(__('Uninstall', 'plugins'),
'index.php?id=plugins&delete_plugin='.$plugin['id'].'&token='.Security::token(),
array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin['title']))."')"));
array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Uninstall plugin :plugin', 'plugins', array(':plugin' => $plugin['title']))."')"));
?>
</div>
</td>
Expand Down
2 changes: 2 additions & 0 deletions plugins/box/system/languages/en.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,7 @@
'Official Support Forum' => 'Official Support Forum',
'Documentation' => 'Documentation',
'Your changes have been saved.' => 'Your changes have been saved.',
'Monstra proceeds to the maintenance mode.' => 'Monstra proceeds to the maintenance mode.',
'Monstra out of maintenance mode.' => 'Monstra out of maintenance mode.',
)
);
2 changes: 2 additions & 0 deletions plugins/box/system/languages/ru.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,7 @@
'Official Support Forum' => 'Официальный Форум Поддержки',
'Documentation' => 'Документация',
'Your changes have been saved.' => 'Ваши изменения сохранены.',
'Monstra proceeds to the maintenance mode.' => 'Monstra переходит в режим технического обслуживания.',
'Monstra out of maintenance mode.' => 'Monstra выходит из режима технического обслуживания.',
)
);
2 changes: 2 additions & 0 deletions plugins/box/system/languages/uk.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,7 @@
'Official Support Forum' => 'Офіційний Форум Підтримки',
'Documentation' => 'Документація',
'Your changes have been saved.' => 'Ваші зміни були збережені.',
'Monstra proceeds to the maintenance mode.' => 'Monstra переходить в режим технічного обслуговування.',
'Monstra out of maintenance mode.' => 'Monstra виходить з режиму технічного обслуговування.',
)
);
14 changes: 12 additions & 2 deletions plugins/box/system/system.admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,23 @@ public static function main()
if (Security::check(Request::get('token'))) {

if ('on' == Request::get('maintenance')) {

Option::update('maintenance_status', 'on');
Request::redirect('index.php?id=system');

Notification::set('success', __('Monstra proceeds to the maintenance mode.', 'system'));

Request::redirect('index.php?id=system');

}

if ('off' == Request::get('maintenance')) {

Option::update('maintenance_status', 'off');
Request::redirect('index.php?id=system');

Notification::set('success', __('Monstra out of maintenance mode.', 'system'));

Request::redirect('index.php?id=system');

}

} else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
Expand Down
2 changes: 1 addition & 1 deletion storage/database/options.table.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<root><options><autoincrement>21</autoincrement></options><fields><name/><value/></fields><options><id>1</id><uid>527510b419</uid><name>sitename</name><value>Sitename</value></options><options><id>2</id><uid>5fe7b20ebb</uid><name>keywords</name><value>Site keywords</value></options><options><id>3</id><uid>2996da0de2</uid><name>description</name><value>Site description</value></options><options><id>4</id><uid>4056d724b8</uid><name>slogan</name><value>Site slogan</value></options><options><id>5</id><uid>620d3e963e</uid><name>defaultpage</name><value>home</value></options><options><id>6</id><uid>6c9cd389f6</uid><name>siteurl</name><value>http://example.org/</value></options><options><id>7</id><uid>2db8769b1e</uid><name>timezone</name><value>Kwajalein</value></options><options><id>8</id><uid>a0b440adce</uid><name>language</name><value>en</value></options><options><id>9</id><uid>d7bd60ad05</uid><name>maintenance_status</name><value>off</value></options><options><id>10</id><uid>c415980d92</uid><name>maintenance_message</name><value>&lt;h1&gt;Monstra :: Maintenance mode&lt;/h1&gt;</value></options><options><id>11</id><uid>4c4e8f0aa8</uid><name>theme_site_name</name><value>default</value></options><options><id>12</id><uid>4c4e8f0aa8</uid><name>theme_admin_name</name><value>default</value></options><options><id>12</id><uid>4c4e8f0aa8</uid><name>users_frontend_registration</name><value>true</value></options><options><id>18</id><uid>f469fc791c</uid><name>captcha_installed</name><value>true</value></options><options><id>19</id><uid>f119fc791c</uid><name>system_email</name><value>admin@admin.com</value></options><options><id>20</id><uid>f119fc121c</uid><name>styles_version</name><value>1</value></options><options><id>21</id><uid>f119fc133c</uid><name>javascript_version</name><value>1</value></options></root>
<root><options><autoincrement>21</autoincrement></options><fields><name/><value/></fields><options><id>1</id><uid>527510b419</uid><name>sitename</name><value>Sitename</value></options><options><id>2</id><uid>5fe7b20ebb</uid><name>keywords</name><value>Site keywords</value></options><options><id>3</id><uid>2996da0de2</uid><name>description</name><value>Site description</value></options><options><id>4</id><uid>4056d724b8</uid><name>slogan</name><value>Site slogan</value></options><options><id>5</id><uid>620d3e963e</uid><name>defaultpage</name><value>home</value></options><options><id>6</id><uid>6c9cd389f6</uid><name>siteurl</name><value>http://example.org/</value></options><options><id>7</id><uid>2db8769b1e</uid><name>timezone</name><value>Kwajalein</value></options><options><id>8</id><uid>a0b440adce</uid><name>language</name><value>en</value></options><options><id>9</id><uid>d7bd60ad05</uid><name>maintenance_status</name><value>off</value></options><options><id>10</id><uid>c415980d92</uid><name>maintenance_message</name><value>&lt;h1&gt;Monstra :: Maintenance mode&lt;/h1&gt;&lt;br/&gt;&lt;h3&gt;Briefly unavailable for scheduled maintenance. Check back in a minute.&lt;/h3&gt;</value></options><options><id>11</id><uid>4c4e8f0aa8</uid><name>theme_site_name</name><value>default</value></options><options><id>12</id><uid>4c4e8f0aa8</uid><name>theme_admin_name</name><value>default</value></options><options><id>12</id><uid>4c4e8f0aa8</uid><name>users_frontend_registration</name><value>true</value></options><options><id>18</id><uid>f469fc791c</uid><name>captcha_installed</name><value>true</value></options><options><id>19</id><uid>f119fc791c</uid><name>system_email</name><value>admin@admin.com</value></options><options><id>20</id><uid>f119fc121c</uid><name>styles_version</name><value>1</value></options><options><id>21</id><uid>f119fc133c</uid><name>javascript_version</name><value>1</value></options></root>