Skip to content

Commit

Permalink
Updated the Geeklog Installer to UIkit 3 (feature #849)
Browse files Browse the repository at this point in the history
  • Loading branch information
mystralkk committed Aug 24, 2019
1 parent fd17c8c commit 16cd46e
Show file tree
Hide file tree
Showing 21 changed files with 620 additions and 355 deletions.
269 changes: 139 additions & 130 deletions public_html/admin/install/classes/installer.class.php

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public_html/admin/install/index.php
Expand Up @@ -33,6 +33,8 @@
// | docs/english/install.html which describes how to install Geeklog. |
// +---------------------------------------------------------------------------+

error_reporting(-1);

define('PATH_INSTALL', __DIR__ . '/');
define('PATH_LAYOUT', PATH_INSTALL . 'layout');
define('BASE_FILE', str_replace('\\', '/', __FILE__));
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/install-plugins.php
Expand Up @@ -239,7 +239,7 @@

. '<div class="uk-overflow-container">' . PHP_EOL

. '<table style="width:650px" class="uk-table">' . PHP_EOL
. '<table style="max-width: 650px;" class="uk-table">' . PHP_EOL
. '<tr>' . PHP_EOL
. '<th style="width:60px">' . $LANG_PLUGINS[13] . '</th>' . PHP_EOL
. '<th>' . $LANG_PLUGINS[14] . '</th>' . PHP_EOL
Expand Down
41 changes: 41 additions & 0 deletions public_html/admin/install/language/_list.php
@@ -0,0 +1,41 @@
<?php

// When you add a new language file, you must add information of the language to the array below.
// All language files must be in UTF-8.
return [
'chinese_simplified_utf-8.php' => [
'langCode' => 'zh-CN',
'langName' => '中文(简体字)',
'english' => 'Simplified Chinese',
],
'chinese_traditional_utf-8.php' => [
'langCode' => 'zh-TW',
'langName' => '中文(繁體字)',
'english' => 'Traditional Chinese',
],
'english_utf-8.php' => [
'langCode' => 'en',
'langName' => 'English',
'english' => 'English',
],
'german_utf-8.php' => [
'langCode' => 'de',
'langName' => 'Deutsch',
'english' => 'German',
],
'hebrew_utf-8.php' => [
'langCode' => 'he',
'langName' => 'עברית',
'english' => 'Hebrew',
],
'japanese_utf-8.php' => [
'langCode' => 'ja',
'langName' => '日本語',
'english' => 'Japanese',
],
'polish_utf-8.php' => [
'langCode' => 'pl',
'langName' => 'polski',
'english' => 'Polish',
],
];
13 changes: 9 additions & 4 deletions public_html/admin/install/language/chinese_simplified_utf-8.php
Expand Up @@ -2,13 +2,13 @@

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 2.1 |
// | Geeklog 2.2 |
// +---------------------------------------------------------------------------+
// | chinese_simplified_utf-8.php |
// | |
// | Chinese language file for the Geeklog installation script |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2010 by the following authors: |
// | Copyright (C) 2000-2019 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
Expand Down Expand Up @@ -49,6 +49,11 @@
// +---------------------------------------------------------------------------+
// install.php

$LANG_INFO = [
'langCode' => 'zh-CN',
'langName' => '中文(简体字)',
];

$LANG_INSTALL = array(
0 => '志乐 – 终极网志系统',
1 => '安装支助',
Expand Down Expand Up @@ -345,13 +350,13 @@
20 => 'Plugin Compatibility',
21 => 'Geeklog internally has undergone some changes which may affect compatibility of some older plugins which have not been updated in a while. Please make sure all the plugins you have installed have been updated to the latest version before upgrading Geeklog to v2.2.0.<br><br>If you still wish to upgrade Geeklog to v2.2.0 and you are not sure about a plugin please post a question about it on our <a href="https://www.geeklog.net/forum/index.php?forum=2" target="_blank">Geeklog Forum</a>. Else, you can also disable or uninstall the plugin and then perform the Geeklog upgrade.<br><br>If you do perform the upgrade and run into problems you can then use the <a href="/admin/install/rescue.php">Geeklog Emergency Rescue Tool</a> to disable the plugin with the issue.',
22 => 'Default Security Group Assignments',
23 => 'User security group assignments for groups "Root" and "All Users" will be fixed along with the security group assignments for the "Admin" (2) user. The "Admin" user had duplicate permissions in some cases and these will be removed after this upgrade.<br><br>Please Note: The issue that caused duplicate permissions has been fixed but it does mean any user that you may have edited in the Admin User Editor before Geeklog v2.2.1 may have been affected. This only really affects permissions when you have security groups within security groups. While these permissions at the time of saving the user are correct if you modified security groups since then these users may still have access to groups they may have been removed from now. As each site is setup differently, the only way to fix this is for the Admin to review each user manually and confirm their security privileges.',
23 => 'User security group assignments for groups "Root" and "All Users" will be fixed along with the security group assignments for the "Admin" (2) user. The "Admin" user had duplicate permissions in some cases and these will be removed after this upgrade.<br><br>Please Note: The issue that caused duplicate permissions has been fixed but it does mean any user that you may have edited in the Admin User Editor before Geeklog v2.2.1 may have been affected. This only really affects permissions when you have security groups within security groups. While these permissions at the time of saving the user are correct if you modified security groups since then these users may still have access to groups they may have been removed from now. As each site is setup differently, the only way to fix this is for the Admin to review each user manually and confirm their security privileges.',
24 => 'FCKEditor Removed',
25 => 'The Advanced Editor FCKEditor has been removed from Geeklog since development for it has been stopped. If your Geeklog website is currently set to use the FCKEditor it will be updated to use the editor which currently ships with Geeklog called the CKEditor.',
26 => 'Google+ OAuth Login',
27 => 'The <a href="https://support.google.com/plus/answer/9195133" target="_blank">Google+ service shut down on April 2, 2019</a>. As of Geeklog v2.2.1 we will move from the Google+ OAuth authentication method and scope to the Google OAuth authentication method and scope. Because of this change and depending on when you created your Google API keys, you may need to update these keys in the Geeklog configuration or users who use this login method may receive an error.<br><br>Geeklog now offers the option to convert remote accounts to local accounts. If you have any remote accounts (like Google OAuth, Facebook OAuth, OpenID, etc..) you want to convert, edit the user account from the User Manager and then check off the "convert from remote to a local account" option and click on save. At this point the account will be converted to a local account and a random password will be generated. If the account has an email address and the status is set to "Active" an email will be automatically sent to the user about how to access their account. If not, you will manually have to fill in this information and let the user know how they can access their local account.',
28 => 'Duplicate Usernames & Usernames with Trailing Spaces',
29 => 'In some cases through remote accounts blank or duplicate usernames (some may have had trailing spaces) could be created. Blank username accounts are the results of remote account login errors so they will be deleted. Accounts that have duplicate names (could include local accounts) will have their accounts renamed. Some local account users may need to use the "Forget Your Password" to retrieve their new username.<br><br>Please note: This issue is a very rare occurrence and can only happen if you have remote user accounts. Most users will be unaffected.'
29 => 'In some cases through remote accounts blank or duplicate usernames (some may have had trailing spaces) could be created. Blank username accounts are the results of remote account login errors so they will be deleted. Accounts that have duplicate names (could include local accounts) will have their accounts renamed. Some local account users may need to use the "Forget Your Password" to retrieve their new username.<br><br>Please note: This issue is a very rare occurrence and can only happen if you have remote user accounts. Most users will be unaffected.'
);

// +---------------------------------------------------------------------------+
Expand Down
13 changes: 9 additions & 4 deletions public_html/admin/install/language/chinese_traditional_utf-8.php
Expand Up @@ -2,13 +2,13 @@

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 2.1 |
// | Geeklog 2.2 |
// +---------------------------------------------------------------------------+
// | chinese_traditional_utf-8.php |
// | |
// | Chinese language file for the Geeklog installation script |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2010 by the following authors: |
// | Copyright (C) 2000-2019 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
Expand Down Expand Up @@ -49,6 +49,11 @@
// +---------------------------------------------------------------------------+
// install.php

$LANG_INFO = [
'langCode' => 'zh-TW',
'langName' => '中文(繁體字)',
];

$LANG_INSTALL = array(
0 => '志樂 – 終極網志系統',
1 => '安裝支助',
Expand Down Expand Up @@ -345,13 +350,13 @@
20 => 'Plugin Compatibility',
21 => 'Geeklog internally has undergone some changes which may affect compatibility of some older plugins which have not been updated in a while. Please make sure all the plugins you have installed have been updated to the latest version before upgrading Geeklog to v2.2.0.<br><br>If you still wish to upgrade Geeklog to v2.2.0 and you are not sure about a plugin please post a question about it on our <a href="https://www.geeklog.net/forum/index.php?forum=2" target="_blank">Geeklog Forum</a>. Else, you can also disable or uninstall the plugin and then perform the Geeklog upgrade.<br><br>If you do perform the upgrade and run into problems you can then use the <a href="/admin/install/rescue.php">Geeklog Emergency Rescue Tool</a> to disable the plugin with the issue.',
22 => 'Default Security Group Assignments',
23 => 'User security group assignments for groups "Root" and "All Users" will be fixed along with the security group assignments for the "Admin" (2) user. The "Admin" user had duplicate permissions in some cases and these will be removed after this upgrade.<br><br>Please Note: The issue that caused duplicate permissions has been fixed but it does mean any user that you may have edited in the Admin User Editor before Geeklog v2.2.1 may have been affected. This only really affects permissions when you have security groups within security groups. While these permissions at the time of saving the user are correct if you modified security groups since then these users may still have access to groups they may have been removed from now. As each site is setup differently, the only way to fix this is for the Admin to review each user manually and confirm their security privileges.',
23 => 'User security group assignments for groups "Root" and "All Users" will be fixed along with the security group assignments for the "Admin" (2) user. The "Admin" user had duplicate permissions in some cases and these will be removed after this upgrade.<br><br>Please Note: The issue that caused duplicate permissions has been fixed but it does mean any user that you may have edited in the Admin User Editor before Geeklog v2.2.1 may have been affected. This only really affects permissions when you have security groups within security groups. While these permissions at the time of saving the user are correct if you modified security groups since then these users may still have access to groups they may have been removed from now. As each site is setup differently, the only way to fix this is for the Admin to review each user manually and confirm their security privileges.',
24 => 'FCKEditor Removed',
25 => 'The Advanced Editor FCKEditor has been removed from Geeklog since development for it has been stopped. If your Geeklog website is currently set to use the FCKEditor it will be updated to use the editor which currently ships with Geeklog called the CKEditor.',
26 => 'Google+ OAuth Login',
27 => 'The <a href="https://support.google.com/plus/answer/9195133" target="_blank">Google+ service shut down on April 2, 2019</a>. As of Geeklog v2.2.1 we will move from the Google+ OAuth authentication method and scope to the Google OAuth authentication method and scope. Because of this change and depending on when you created your Google API keys, you may need to update these keys in the Geeklog configuration or users who use this login method may receive an error.<br><br>Geeklog now offers the option to convert remote accounts to local accounts. If you have any remote accounts (like Google OAuth, Facebook OAuth, OpenID, etc..) you want to convert, edit the user account from the User Manager and then check off the "convert from remote to a local account" option and click on save. At this point the account will be converted to a local account and a random password will be generated. If the account has an email address and the status is set to "Active" an email will be automatically sent to the user about how to access their account. If not, you will manually have to fill in this information and let the user know how they can access their local account.',
28 => 'Duplicate Usernames & Usernames with Trailing Spaces',
29 => 'In some cases through remote accounts blank or duplicate usernames (some may have had trailing spaces) could be created. Blank username accounts are the results of remote account login errors so they will be deleted. Accounts that have duplicate names (could include local accounts) will have their accounts renamed. Some local account users may need to use the "Forget Your Password" to retrieve their new username.<br><br>Please note: This issue is a very rare occurrence and can only happen if you have remote user accounts. Most users will be unaffected.'
29 => 'In some cases through remote accounts blank or duplicate usernames (some may have had trailing spaces) could be created. Blank username accounts are the results of remote account login errors so they will be deleted. Accounts that have duplicate names (could include local accounts) will have their accounts renamed. Some local account users may need to use the "Forget Your Password" to retrieve their new username.<br><br>Please note: This issue is a very rare occurrence and can only happen if you have remote user accounts. Most users will be unaffected.'
);

// +---------------------------------------------------------------------------+
Expand Down

0 comments on commit 16cd46e

Please sign in to comment.