Permalink
Browse files

eXtreme-Fusion 5.0.4 released

  • Loading branch information...
Inscure committed Aug 21, 2013
1 parent db99bed commit e0b5cb4bb40ceb37756522f0309f35e568d8c1fd
Showing with 24 additions and 68 deletions.
  1. +13 −65 admin/pages/upgrade.php
  2. +2 −1 bootstrap.php
  3. +8 −1 changelog.txt
  4. +1 −1 system/class/System.php
View
@@ -13,7 +13,7 @@
| at www.gnu.org/licenses/agpl.html. Removal of this
| copyright header is strictly prohibited without
| written permission from the original author(s).
|
|
**********************************************************
ORIGINALLY BASED ON
---------------------------------------------------------+
@@ -31,19 +31,19 @@
| copyright header is strictly prohibited without
| written permission from the original author(s).
+--------------------------------------------------------*/
try
try
{
require_once '../../config.php';
require DIR_SITE.'bootstrap.php';
require_once DIR_SYSTEM.'admincore.php';
$_locale->load(array('settings', 'upgrade'));
if ( ! $_user->hasPermission('admin.upgrade'))
{
throw new userException(__('Access denied'));
}
$_tpl = new Iframe;
if ($_request->get(array('status', 'act'))->show())
@@ -59,7 +59,7 @@
}
if (SYSTEM_VERSION !== $_sett->get('version'))
{
{
if (! HELP::validUpVersion($_sett->get('version'), SYSTEM_VERSION))
{
$_tpl->printMessage('error', 'Nie możesz skorzystać z tej aktualizacji. Pobierz inną, właściwą dla Twojej wersji systemu CMS: https://github.com/eXtreme-Fusion/EF5-updates');
@@ -68,75 +68,23 @@
{
if ($_request->post('save')->show())
{
/*
Zapytania wymagane podczas aktualizacji
*/
$_pdo->exec("INSERT INTO [admin] (`permissions`, `image`, `title`, `link`, `page`) VALUES ('admin.settings_synchro', 'synchro.png', 'Synchronization', 'settings_synchro.php', 4)");
$_pdo->exec("INSERT INTO [permissions] (`name`, `section`, `description`, `is_system`) VALUES ('admin.settings_synchro', 1, '".__('Perm: admin settings_synchro')."', 1)");
if(file_exists(DIR_SITE.'system'.DS.'opt'.DS.'opt.error.php'))
{
@unlink(DIR_SITE.'system'.DS.'opt'.DS.'opt.error.php');
}
if(file_exists(DIR_SITE.'themes'.DS.'eXtreme-Fusion-5'.DS.'core'.DS.'theme.php'))
{
//@unlink(DIR_SITE.'themes'.DS.'eXtreme-Fusion-5'.DS.'core'.DS.'theme.php');
}
/** ZAPYTANIA DLA NOWEJ WERSJI **/
$_pdo->exec("CREATE TABLE [admin_favourites]
(
`id` MEDIUMINT UNSIGNED NOT NULL AUTO_INCREMENT,
`user_id` MEDIUMINT UNSIGNED NOT NULL,
`page_id` MEDIUMINT UNSIGNED NOT NULL,
`count` MEDIUMINT NOT NULL,
`time` INT UNSIGNED NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY(`page_id`, `user_id`),
CONSTRAINT FOREIGN KEY (`page_id`) REFERENCES [admin](`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT FOREIGN KEY (`user_id`) REFERENCES [users](`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;"
);
$_pdo->exec("ALTER TABLE [users] ADD `algo` VARCHAR(10) NOT NULL DEFAULT 'sha512' AFTER `salt`");
$_pdo->exec("INSERT INTO [settings] (`key`, `value`) VALUES ('algorithm', 'sha512')");
$_pdo->exec("INSERT INTO [settings] (`key`, `value`) VALUES ('synchro', '0')");
$_pdo->exec("DELETE FROM [admin] WHERE `link` = 'panel_editor.php'");
$_pdo->exec("DELETE FROM [admin] WHERE `link` = 'upgrade.php'");
$_sett->update(array(
'routing' => serialize(array(
'param_sep' => '-',
'main_sep' => $_sett->getUns('routing', 'main_sep'),
'url_ext' => $_sett->getUns('routing', 'url_ext'),
'tpl_ext' => $_sett->getUns('routing', 'tpl_ext'),
'logic_ext' => $_sett->getUns('routing', 'logic_ext'),
'ext_allowed' => $_sett->getUns('routing', 'ext_allowed')
)),
'theme' => 'eXtreme-Fusion-5'
));
/** KONIEC ZAPYTAŃ DLA NOWEJ WERSJI **/
$_sett->update(array('version' => SYSTEM_VERSION));
//if ($count)
//{
$_log->insertSuccess('updating', __('The update has been finished successfully.'));
$_files->rmDirRecursive(DIR_CACHE);
$_request->redirect(FILE_PATH, array('act' => 'updating', 'status' => 'ok'));
//}
//$_log->insertFail('updating', __('Error! The update has not been finished.'));
//$_request->redirect(FILE_PATH, array('act' => 'updating', 'status' => 'error'));
$_log->insertSuccess('updating', __('The update has been finished successfully.'));
$_files->rmDirRecursive(DIR_CACHE);
$_request->redirect(FILE_PATH, array('act' => 'updating', 'status' => 'ok'));
}
$_tpl->assign('upgrade', TRUE);
}
}
$_tpl->template('upgrade');
}
catch(optException $exception)
View
@@ -82,7 +82,8 @@
}
}
defined ('SYSTEM_VERSION') || define('SYSTEM_VERSION', '5.0.4-unstable-master-repo');
//defined ('SYSTEM_VERSION') || define('SYSTEM_VERSION', '5.0.4-unstable-master-repo');
defined ('SYSTEM_VERSION') || define('SYSTEM_VERSION', '5.0.4');
// Array-imploded data separator for Database fields
defined('DBS') || define('DBS', '^');
View
@@ -1,5 +1,12 @@
eXtreme-Fusion 5.0.4
Fixes:
- dodanie pustej linii do .htaccess - serwery, które modyfikują ten plik, nie powiny wyświetlać już błędu 500
- usunięcie błędu z wyświetlaniem polskich nazw miesięcy
- czyszczenie cache po przypisaniu uzytkownika do grupy
Improvements:
- dodanie panelu ostatnich tematów na forum
- tłumaczenie czeskich plików językowych
- wprowadzenie synchronizacji dla języka czeskiego
eXtreme-Fusion 5.0.3 2013.07.31
View
@@ -162,7 +162,7 @@ public function clearCacheRecursive(Files $_files)
/**
* Opróżnia katalog pamięci podręcznej usuwając tylko pliki o roszerzeniach tpl, php lub txt.
*
* Nie usuwa plików z podfolderów folderu $dir! Aby je uunąć, użyj clearCacheRecursive().
* Nie usuwa plików z podfolderów folderu $dir! Aby je usunąć, użyj clearCacheRecursive().
*
* // Usuwa całą pamięć podręczną z głównego katalogu pamięci podręcznej.
* $_system->clearCache();

0 comments on commit e0b5cb4

Please sign in to comment.