diff --git a/root/adm/style/portal/acp_portal_upload_module.html b/root/adm/style/portal/acp_portal_upload_module.html index d29ace3f..bf785efa 100755 --- a/root/adm/style/portal/acp_portal_upload_module.html +++ b/root/adm/style/portal/acp_portal_upload_module.html @@ -51,7 +51,7 @@ {new_files.SOURCE}   ({L_FILE_MISSING}) {new_files.TARGET} - {L_PORTAL_MODULE_SUCCESS}{L_PORTAL_MODULE_ERROR} + {L_PORTAL_MODULE_SUCCESS}color: red;">{L_PORTAL_MODULE_ERROR} diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index 3377a0fc..a34adb42 100755 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -112,6 +112,12 @@ $lang = array_merge($lang, array( 'MODULE_UPLOAD_MKDIR_FAILURE' => 'Unable to create a folder.', 'MODULE_COPY_FAILURE' => 'Unable to copy the following file: %1$s', 'MODULE_CORRUPTED' => 'The module you are trying to upload seems to be corrupted.', + 'PORTAL_NEW_FILES' => 'New files', + 'PORTAL_MODULE_SOURCE' => 'Source', + 'PORTAL_MODULE_TARGET' => 'Target', + 'PORTAL_MODULE_STATUS' => 'Status', + 'PORTAL_MODULE_SUCCESS' => 'Success', + 'PORTAL_MODULE_ERROR' => 'Error', // Install 'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules', diff --git a/root/portal/includes/functions.php b/root/portal/includes/functions.php index c31da79c..999b8472 100644 --- a/root/portal/includes/functions.php +++ b/root/portal/includes/functions.php @@ -1039,6 +1039,7 @@ function board3_basic_install($mode = 'install', $purge_modules = true, $u_actio set_config('board3_max_topics_' . $row['module_id'], $portal_config['portal_max_topics']); set_config('board3_recent_title_limit_' . $row['module_id'], $portal_config['portal_recent_title_limit']); set_config('board3_recent_forum_' . $row['module_id'], $portal_config['portal_recent_forum']); + set_config('board3_recent_exclude_forums_' . $row['module_id'], $portal_config['portal_exclude_forums']); break; case 'topposters': @@ -1053,6 +1054,11 @@ function board3_basic_install($mode = 'install', $purge_modules = true, $u_actio // do nothing } } + + // Now that we are done, delete all data that seems useless to us + $sql = 'DELETE FROM ' . PORTAL_CONFIG_TABLE . ' + WHERE config_name ' . $db->sql_like_expression(utf8_clean_string('portal_') . $db->any_char); + $db->sql_query($sql); } return $user->lang['PORTAL_CONVERT_SUCCESS']; } @@ -1075,7 +1081,7 @@ function board3_basic_install($mode = 'install', $purge_modules = true, $u_actio 'board3_phpbb_menu', 'board3_display_jumpbox', ); - $sql = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE config_name ' . str_replace('\\', '', $db->sql_like_expression('board3_%')) . ' + $sql = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE config_name ' . $db->sql_like_expression(utf8_clean_string('board3_') . $db->any_char) . ' AND ' . $db->sql_in_set('config_name', $skip_entries, true); $db->sql_query($sql); diff --git a/root/portal/includes/functions_upload.php b/root/portal/includes/functions_upload.php index e0eac582..9ad1f43b 100644 --- a/root/portal/includes/functions_upload.php +++ b/root/portal/includes/functions_upload.php @@ -300,7 +300,6 @@ class portal_upload } rename($to, $to . '.bak'); phpbb_chmod($to, CHMOD_ALL); - unlink($to); } if (!@copy($from, $to))