Update of /cvsroot/mxbb/mx_xs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4005 Modified Files: Tag: core28x xs_cache.php xs_chmod.php xs_clone.php xs_config.php xs_download.php xs_edit.php xs_edit_data.php xs_export.php xs_export_data.php xs_frame_top.php xs_frameset.php xs_import.php xs_include.php xs_include_import2.php xs_index.php xs_install.php xs_style_config.php xs_styles.php xs_uninstall.php xs_update.php Log Message: upgrade Index: xs_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_config.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_config.php 13 Sep 2007 00:24:18 -0000 1.1 --- xs_config.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 11,16 **** ! define ('IN_PORTAL', 1); ! /* if(!empty ($setmodules)) --- 11,15 ---- ! @define ('IN_PORTAL', 1); /* if(!empty ($setmodules)) *************** *** 31,35 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 30,34 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 37,46 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_config.'.$phpEx) . '">' . $lang['xs_configuration'] . '</a>')); ! $lang['xs_config_updated_explain'] = str_replace('{URL}', append_sid('xs_config.'.$phpEx), $lang['xs_config_updated_explain']); $lang['xs_config_title'] = str_replace('{VERSION}', $template->xs_versiontxt, $lang['xs_config_title']); ! $lang['xs_config_warning_explain'] = str_replace('{URL}', append_sid('xs_chmod.'.$phpEx), $lang['xs_config_warning_explain']); ! $lang['xs_config_back'] = str_replace('{URL}', append_sid('xs_config.'.$phpEx), $lang['xs_config_back']); // --- 36,45 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_config.'.$phpEx) . '">' . $lang['xs_configuration'] . '</a>')); ! $lang['xs_config_updated_explain'] = str_replace('{URL}', mx_append_sid('xs_config.'.$phpEx), $lang['xs_config_updated_explain']); $lang['xs_config_title'] = str_replace('{VERSION}', $template->xs_versiontxt, $lang['xs_config_title']); ! $lang['xs_config_warning_explain'] = str_replace('{URL}', mx_append_sid('xs_chmod.'.$phpEx), $lang['xs_config_warning_explain']); ! $lang['xs_config_back'] = str_replace('{URL}', mx_append_sid('xs_config.'.$phpEx), $lang['xs_config_back']); // *************** *** 63,67 **** { $template->assign_block_vars('left_refresh', array( ! 'ACTION' => append_sid('index.' . $phpEx . '?pane=left') )); } --- 62,66 ---- { $template->assign_block_vars('left_refresh', array( ! 'ACTION' => mx_append_sid('index.' . $phpEx . '?pane=left') )); } *************** *** 176,180 **** 'XS_FTP_LOGIN' => defined('DEMO_MODE') ? '' : $xs_ftp_login, 'XS_FTP_PATH' => defined('DEMO_MODE') ? '' : $xs_ftp_path, ! 'FORM_ACTION' => append_sid('xs_config.' . $phpEx), )); --- 175,179 ---- 'XS_FTP_LOGIN' => defined('DEMO_MODE') ? '' : $xs_ftp_login, 'XS_FTP_PATH' => defined('DEMO_MODE') ? '' : $xs_ftp_path, ! 'FORM_ACTION' => mx_append_sid('xs_config.' . $phpEx), )); Index: xs_style_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_style_config.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_style_config.php 13 Sep 2007 00:24:20 -0000 1.1 --- xs_style_config.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,27 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } ! define('IN_XS', true); include_once('xs_include.' . $phpEx); --- 20,27 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } ! @define('IN_XS', true); include_once('xs_include.' . $phpEx); *************** *** 46,50 **** } $template->assign_block_vars('left_refresh', array( ! 'ACTION' => append_sid('index.' . $phpEx . '?pane=left') )); xs_error($lang['xs_invalid_style_name']); --- 46,50 ---- } $template->assign_block_vars('left_refresh', array( ! 'ACTION' => mx_append_sid('index.' . $phpEx . '?pane=left') )); xs_error($lang['xs_invalid_style_name']); *************** *** 168,172 **** )); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_style_config.'.$phpEx.'?tpl='.urlencode($tpl)) . '">' . $lang['xs_style_configuration'] . ': ' . $tpl . '</a>')); $template->set_filenames(array('body' => XS_TPL_PATH . 'style_config.'.$tplEx)); --- 168,172 ---- )); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_style_config.'.$phpEx.'?tpl='.urlencode($tpl)) . '">' . $lang['xs_style_configuration'] . ': ' . $tpl . '</a>')); $template->set_filenames(array('body' => XS_TPL_PATH . 'style_config.'.$tplEx)); Index: xs_cache.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_cache.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_cache.php 13 Sep 2007 00:24:18 -0000 1.1 --- xs_cache.php 1 Feb 2008 03:58:45 -0000 1.1.2.1 *************** *** 11,15 **** ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 11,15 ---- ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 21,25 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 21,25 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 27,31 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_cache.'.$phpEx) . '">' . $lang['xs_manage_cache'] . '</a>')); $data = ''; --- 27,31 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_cache.'.$phpEx) . '">' . $lang['xs_manage_cache'] . '</a>')); $data = ''; Index: xs_chmod.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_chmod.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_chmod.php 13 Sep 2007 00:24:18 -0000 1.1 --- xs_chmod.php 1 Feb 2008 03:58:45 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 26,33 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_config.'.$phpEx) . '">' . $lang['xs_configuration'] . '</a>')); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_chmod.'.$phpEx) . '">' . $lang['xs_chmod'] . '</a>')); ! $lang['xs_chmod_return'] = str_replace('{URL}', append_sid('xs_config.'.$phpEx), $lang['xs_chmod_return']); $lang['xs_chmod_message1'] .= $lang['xs_chmod_return']; $lang['xs_chmod_error1'] .= $lang['xs_chmod_return']; --- 26,33 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_config.'.$phpEx) . '">' . $lang['xs_configuration'] . '</a>')); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_chmod.'.$phpEx) . '">' . $lang['xs_chmod'] . '</a>')); ! $lang['xs_chmod_return'] = str_replace('{URL}', mx_append_sid('xs_config.'.$phpEx), $lang['xs_chmod_return']); $lang['xs_chmod_message1'] .= $lang['xs_chmod_return']; $lang['xs_chmod_error1'] .= $lang['xs_chmod_return']; *************** *** 38,46 **** } ! if(!get_ftp_config(append_sid('xs_chmod.'.$phpEx), array(), false)) { exit; } ! xs_ftp_connect(append_sid('xs_chmod.'.$phpEx), array(), true); if($ftp === XS_FTP_LOCAL) --- 38,46 ---- } ! if(!get_ftp_config(mx_append_sid('xs_chmod.'.$phpEx), array(), false)) { exit; } ! xs_ftp_connect(mx_append_sid('xs_chmod.'.$phpEx), array(), true); if($ftp === XS_FTP_LOCAL) Index: xs_export.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_export.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_export.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_export.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 26,32 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_export.'.$phpEx) . '">' . $lang['xs_export_styles'] . '</a>')); ! $lang['xs_export_back'] = str_replace('{URL}', append_sid('xs_export.'.$phpEx), $lang['xs_export_back']); // --- 26,32 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_export.'.$phpEx) . '">' . $lang['xs_export_styles'] . '</a>')); ! $lang['xs_export_back'] = str_replace('{URL}', mx_append_sid('xs_export.'.$phpEx), $lang['xs_export_back']); // *************** *** 62,66 **** $xs_send_method = $xs_send['method'] == 'ftp' ? 'ftp' : ($xs_send['method'] == 'file' ? 'file' : 'save'); $template->assign_vars(array( ! 'FORM_ACTION' => append_sid('xs_export.'.$phpEx), 'EXPORT_TEMPLATE' => htmlspecialchars($export), 'STYLE_ID' => $theme_rowset[0]['themes_id'], --- 62,66 ---- $xs_send_method = $xs_send['method'] == 'ftp' ? 'ftp' : ($xs_send['method'] == 'file' ? 'file' : 'save'); $template->assign_vars(array( ! 'FORM_ACTION' => mx_append_sid('xs_export.'.$phpEx), 'EXPORT_TEMPLATE' => htmlspecialchars($export), 'STYLE_ID' => $theme_rowset[0]['themes_id'], Index: xs_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_edit.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_edit.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_edit.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 52,56 **** ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_edit.'.$phpEx.$filter_str) . '">' . $lang['xs_edit_templates'] . '</a>')); $editable = array('.htm', '.html', '.tpl', '.css', '.txt', '.cfg', '.xml', '.php', '.htaccess'); --- 52,56 ---- ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_edit.'.$phpEx.$filter_str) . '">' . $lang['xs_edit_templates'] . '</a>')); $editable = array('.htm', '.html', '.tpl', '.css', '.txt', '.cfg', '.xml', '.php', '.htaccess'); *************** *** 75,81 **** $current_dir_root = $current_dir ? $current_dir . '/' : ''; ! $return_dir = str_replace('{URL}', append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir)), $lang['xs_edittpl_back_dir']); $return_url = $return_dir; ! $return_url_root = str_replace('{URL}', append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), $lang['xs_edittpl_back_dir']); --- 75,81 ---- $current_dir_root = $current_dir ? $current_dir . '/' : ''; ! $return_dir = str_replace('{URL}', mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir)), $lang['xs_edittpl_back_dir']); $return_url = $return_dir; ! $return_url_root = str_replace('{URL}', mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), $lang['xs_edittpl_back_dir']); *************** *** 83,87 **** 'FILTER_EXT' => htmlspecialchars($filter_data['ext']), 'FILTER_DATA' => htmlspecialchars($filter_data['data']), ! 'FILTER_URL' => append_sid('xs_edit.'.$phpEx), 'FILTER_DIR' => htmlspecialchars($current_dir), 'S_FILTER' => '<input type="hidden" name="filter" value="' . htmlspecialchars($filter) . '" />' --- 83,87 ---- 'FILTER_EXT' => htmlspecialchars($filter_data['ext']), 'FILTER_DATA' => htmlspecialchars($filter_data['data']), ! 'FILTER_URL' => mx_append_sid('xs_edit.'.$phpEx), 'FILTER_DIR' => htmlspecialchars($current_dir), 'S_FILTER' => '<input type="hidden" name="filter" value="' . htmlspecialchars($filter) . '" />' *************** *** 106,110 **** $HTTP_POST_VARS['content'] = addslashes(implode('', @file($backup_name))); unset($HTTP_GET_VARS['edit']); ! $return_file = str_replace('{URL}', append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; } --- 106,110 ---- $HTTP_POST_VARS['content'] = addslashes(implode('', @file($backup_name))); unset($HTTP_GET_VARS['edit']); ! $return_file = str_replace('{URL}', mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; } *************** *** 135,147 **** 'filter' => $filter, ); ! $return_file = str_replace('{URL}', append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; // get ftp configuration $write_local = false; ! if(!get_ftp_config(append_sid('xs_edit.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(append_sid('xs_edit.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { --- 135,147 ---- 'filter' => $filter, ); ! $return_file = str_replace('{URL}', mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; // get ftp configuration $write_local = false; ! if(!get_ftp_config(mx_append_sid('xs_edit.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(mx_append_sid('xs_edit.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { *************** *** 228,239 **** xs_exit(); } ! $return_file = str_replace('{URL}', append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; $template->assign_vars(array( ! 'U_ACTION' => append_sid('xs_edit.'.$phpEx), ! 'U_BROWSE' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir)), ! 'U_EDIT' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), ! 'U_BACKUP' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dobackup=1&dir='.urlencode($current_dir).'&edit='.urlencode($file)), ! 'U_DOWNLOAD' => append_sid('xs_edit.'.$phpEx.$filter_str.'&download=1&dir='.urlencode($current_dir).'&edit='.urlencode($file)), 'CURRENT_DIR' => htmlspecialchars($current_dir_full), 'DIR' => htmlspecialchars($current_dir), --- 228,239 ---- xs_exit(); } ! $return_file = str_replace('{URL}', mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), $lang['xs_edittpl_back_edit']); $return_url = $return_file . '<br /><br />' . $return_dir; $template->assign_vars(array( ! 'U_ACTION' => mx_append_sid('xs_edit.'.$phpEx), ! 'U_BROWSE' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir)), ! 'U_EDIT' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)), ! 'U_BACKUP' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dobackup=1&dir='.urlencode($current_dir).'&edit='.urlencode($file)), ! 'U_DOWNLOAD' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&download=1&dir='.urlencode($current_dir).'&edit='.urlencode($file)), 'CURRENT_DIR' => htmlspecialchars($current_dir_full), 'DIR' => htmlspecialchars($current_dir), *************** *** 245,249 **** if($current_dir_full) { ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.$current_dir) . '">' . htmlspecialchars($current_dir_full) . '</a>')); } --- 245,249 ---- if($current_dir_full) { ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.$current_dir) . '">' . htmlspecialchars($current_dir_full) . '</a>')); } *************** *** 252,256 **** $template->assign_block_vars('tree', array( 'ITEM' => 'phpBB', ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), 'SEPARATOR' => '', )); --- 252,256 ---- $template->assign_block_vars('tree', array( 'ITEM' => 'phpBB', ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), 'SEPARATOR' => '', )); *************** *** 266,270 **** $template->assign_block_vars('tree', array( 'ITEM' => htmlspecialchars($dirs[$i]), ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), 'SEPARATOR' => '/', )); --- 266,270 ---- $template->assign_block_vars('tree', array( 'ITEM' => htmlspecialchars($dirs[$i]), ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), 'SEPARATOR' => '/', )); *************** *** 324,331 **** $template->assign_block_vars('backup', array( 'TIME' => create_date($board_config['default_dateformat'], $backups[$i], $board_config['board_timezone']), ! 'U_RESTORE' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&restore='.$backups[$i]), ! 'U_DELETE' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&delbackup='.$backups[$i]), ! 'U_DOWNLOAD' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&downloadbackup='.$backups[$i]), ! 'U_VIEW' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&viewbackup='.$backups[$i]), ) ); --- 324,331 ---- $template->assign_block_vars('backup', array( 'TIME' => create_date($board_config['default_dateformat'], $backups[$i], $board_config['board_timezone']), ! 'U_RESTORE' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&restore='.$backups[$i]), ! 'U_DELETE' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&delbackup='.$backups[$i]), ! 'U_DOWNLOAD' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&downloadbackup='.$backups[$i]), ! 'U_VIEW' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file).'&viewbackup='.$backups[$i]), ) ); *************** *** 347,351 **** $template->assign_block_vars('tree', array( 'ITEM' => 'phpBB', ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), 'SEPARATOR' => '', )); --- 347,351 ---- $template->assign_block_vars('tree', array( 'ITEM' => 'phpBB', ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='), 'SEPARATOR' => '', )); *************** *** 361,365 **** $template->assign_block_vars('tree', array( 'ITEM' => htmlspecialchars($dirs[$i]), ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), 'SEPARATOR' => '/', )); --- 361,365 ---- $template->assign_block_vars('tree', array( 'ITEM' => htmlspecialchars($dirs[$i]), ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), 'SEPARATOR' => '/', )); *************** *** 436,440 **** 'NAME' => '..', 'FULLNAME' => htmlspecialchars($back_dir ? $back_dir . '/' : ''), ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($back_dir)), ) ); --- 436,440 ---- 'NAME' => '..', 'FULLNAME' => htmlspecialchars($back_dir ? $back_dir . '/' : ''), ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($back_dir)), ) ); *************** *** 450,454 **** 'NAME' => htmlspecialchars($dir), 'FULLNAME' => htmlspecialchars($current_dir_root . $dir), ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), ) ); --- 450,454 ---- 'NAME' => htmlspecialchars($dir), 'FULLNAME' => htmlspecialchars($current_dir_root . $dir), ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($str)), ) ); *************** *** 481,485 **** 'SIZE' => @filesize($localfile), 'TIME' => $filetime, ! 'URL' => append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)) ) ); --- 481,485 ---- 'SIZE' => @filesize($localfile), 'TIME' => $filetime, ! 'URL' => mx_append_sid('xs_edit.'.$phpEx.$filter_str.'&dir='.urlencode($current_dir).'&edit='.urlencode($file)) ) ); Index: xs_include.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_include.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_include.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_include.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 15,20 **** } - - if(defined('XS_INCLUDED')) { --- 15,18 ---- *************** *** 188,192 **** define('XS_UPDATE_MOD', 2); define('XS_UPDATE_PHPBB', 3); ! define('XS_TPL_PATH', './../' . $tplEx . '/'); define('XS_BACKUP_PREFIX', 'backup.'); define('XS_BACKUP_EXT', '.backup'); --- 186,190 ---- define('XS_UPDATE_MOD', 2); define('XS_UPDATE_PHPBB', 3); ! define('XS_TPL_PATH', '_core/'); define('XS_BACKUP_PREFIX', 'backup.'); define('XS_BACKUP_EXT', '.backup'); *************** *** 214,218 **** $template->preparse = 'xs_header'; $template->postparse = 'xs_footer'; ! $template->assign_block_vars('nav_left',array('ITEM' => '<a href="' . append_sid('xs_index.'.$phpEx) . '">' . $lang['xs_menu'] . '</a>')); } --- 212,216 ---- $template->preparse = 'xs_header'; $template->postparse = 'xs_footer'; ! $template->assign_block_vars('nav_left',array('ITEM' => '<a href="' . mx_append_sid('xs_index.'.$phpEx) . '">' . $lang['xs_menu'] . '</a>')); } Index: xs_styles.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_styles.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_styles.php 13 Sep 2007 00:24:20 -0000 1.1 --- xs_styles.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 26,30 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_styles.'.$phpEx) . '">' . $lang['xs_default_style'] . '</a>')); // --- 26,30 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_styles.'.$phpEx) . '">' . $lang['xs_default_style'] . '</a>')); // *************** *** 159,166 **** 'ID' => $id, 'TOTAL' => $total, ! 'U_TOTAL' => append_sid('xs_styles.' . $phpEx . '?list=' . $id), ! 'U_DEFAULT' => append_sid('xs_styles.' . $phpEx . '?setdefault=' . $id), ! 'U_OVERRIDE' => append_sid('xs_styles.' . $phpEx . '?setoverride=' . ($style_override ? '0' : '1')), ! 'U_SWITCHALL' => append_sid('xs_styles.' . $phpEx . '?moveusers=' . $id), ) ); --- 159,166 ---- 'ID' => $id, 'TOTAL' => $total, ! 'U_TOTAL' => mx_append_sid('xs_styles.' . $phpEx . '?list=' . $id), ! 'U_DEFAULT' => mx_append_sid('xs_styles.' . $phpEx . '?setdefault=' . $id), ! 'U_OVERRIDE' => mx_append_sid('xs_styles.' . $phpEx . '?setoverride=' . ($style_override ? '0' : '1')), ! 'U_SWITCHALL' => mx_append_sid('xs_styles.' . $phpEx . '?moveusers=' . $id), ) ); *************** *** 189,193 **** { $template->assign_block_vars('styles.nodefault.admin_only', array( ! 'U_CHANGE' => append_sid('xs_styles.'.$phpEx.'?setadmin='.$id.'&admin=0') )); } --- 189,193 ---- { $template->assign_block_vars('styles.nodefault.admin_only', array( ! 'U_CHANGE' => mx_append_sid('xs_styles.'.$phpEx.'?setadmin='.$id.'&admin=0') )); } *************** *** 195,199 **** { $template->assign_block_vars('styles.nodefault.public', array( ! 'U_CHANGE' => append_sid('xs_styles.'.$phpEx.'?setadmin='.$id.'&admin=1') )); } --- 195,199 ---- { $template->assign_block_vars('styles.nodefault.public', array( ! 'U_CHANGE' => mx_append_sid('xs_styles.'.$phpEx.'?setadmin='.$id.'&admin=1') )); } Index: xs_export_data.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_export_data.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_export_data.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_export_data.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 11,15 **** ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 11,15 ---- ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 21,25 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 21,25 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 27,33 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_export_data.'.$phpEx) . '">' . $lang['xs_edit_styles_data'] . '</a>')); ! $lang['xs_export_data_back'] = str_replace('{URL}', append_sid('xs_export_data.'.$phpEx), $lang['xs_export_data_back']); // --- 27,33 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_export_data.'.$phpEx) . '">' . $lang['xs_edit_styles_data'] . '</a>')); ! $lang['xs_export_data_back'] = str_replace('{URL}', mx_append_sid('xs_export_data.'.$phpEx), $lang['xs_export_data_back']); // *************** *** 61,65 **** 'TOTAL' => count($theme_rowset), 'EXPORT' => htmlspecialchars($export), ! 'U_ACTION' => append_sid("xs_export_data.{$phpEx}") ) ); --- 61,65 ---- 'TOTAL' => count($theme_rowset), 'EXPORT' => htmlspecialchars($export), ! 'U_ACTION' => mx_append_sid("xs_export_data.{$phpEx}") ) ); *************** *** 102,110 **** } $write_local = false; ! if(!get_ftp_config(append_sid('xs_export_data.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(append_sid('xs_export_data.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { --- 102,110 ---- } $write_local = false; ! if(!get_ftp_config(mx_append_sid('xs_export_data.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(mx_append_sid('xs_export_data.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { Index: xs_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_uninstall.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_uninstall.php 13 Sep 2007 00:24:20 -0000 1.1 --- xs_uninstall.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 26,33 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_uninstall.'.$phpEx) . '">' . $lang['xs_uninstall_styles'] . '</a>')); ! $lang['xs_uninstall_back'] = str_replace('{URL}', append_sid('xs_uninstall.'.$phpEx), $lang['xs_uninstall_back']); ! $lang['xs_goto_default'] = str_replace('{URL}', append_sid('xs_styles.'.$phpEx), $lang['xs_goto_default']); // --- 26,33 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_uninstall.'.$phpEx) . '">' . $lang['xs_uninstall_styles'] . '</a>')); ! $lang['xs_uninstall_back'] = str_replace('{URL}', mx_append_sid('xs_uninstall.'.$phpEx), $lang['xs_uninstall_back']); ! $lang['xs_goto_default'] = str_replace('{URL}', mx_append_sid('xs_styles.'.$phpEx), $lang['xs_goto_default']); // *************** *** 39,43 **** if($board_config['default_style'] == $remove_id) { ! xs_error(str_replace('{URL}', append_sid('xs_styles.'.$phpEx), $lang['xs_uninstall_default']) . '<br /><br />' . $lang['xs_uninstall_back']); } $sql = "SELECT themes_id, template_name, style_name FROM " . THEMES_TABLE . " WHERE themes_id='{$remove_id}'"; --- 39,43 ---- if($board_config['default_style'] == $remove_id) { ! xs_error(str_replace('{URL}', mx_append_sid('xs_styles.'.$phpEx), $lang['xs_uninstall_default']) . '<br /><br />' . $lang['xs_uninstall_back']); } $sql = "SELECT themes_id, template_name, style_name FROM " . THEMES_TABLE . " WHERE themes_id='{$remove_id}'"; *************** *** 67,71 **** $db->sql_query($sql); $template->assign_block_vars('left_refresh', array( ! 'ACTION' => append_sid('index.' . $phpEx . '?pane=left') )); // recache config table for cat_hierarchy 2.1.0 --- 67,71 ---- $db->sql_query($sql); $template->assign_block_vars('left_refresh', array( ! 'ACTION' => mx_append_sid('index.' . $phpEx . '?pane=left') )); // recache config table for cat_hierarchy 2.1.0 *************** *** 123,131 **** $remove = stripslashes($HTTP_POST_VARS['remove']); $params = array('remove' => $remove); ! if(!get_ftp_config(append_sid('xs_uninstall.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(append_sid('xs_uninstall.'.$phpEx), $params, true); $write_local = false; if($ftp === XS_FTP_LOCAL) --- 123,131 ---- $remove = stripslashes($HTTP_POST_VARS['remove']); $params = array('remove' => $remove); ! if(!get_ftp_config(mx_append_sid('xs_uninstall.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(mx_append_sid('xs_uninstall.'.$phpEx), $params, true); $write_local = false; if($ftp === XS_FTP_LOCAL) *************** *** 217,221 **** 'ID' => $styles[$i]['themes_id'], 'THEME' => htmlspecialchars($styles[$i]['style_name']), ! 'U_DELETE' => append_sid('xs_uninstall.'.$phpEx.'?remove='.$styles[$i]['themes_id'].'&nocfg=1'), ) ); --- 217,221 ---- 'ID' => $styles[$i]['themes_id'], 'THEME' => htmlspecialchars($styles[$i]['style_name']), ! 'U_DELETE' => mx_append_sid('xs_uninstall.'.$phpEx.'?remove='.$styles[$i]['themes_id'].'&nocfg=1'), ) ); *************** *** 229,237 **** 'ID' => $styles[$i]['themes_id'], 'THEME' => htmlspecialchars($styles[$i]['style_name']), ! 'U_DELETE' => append_sid('xs_uninstall.'.$phpEx.'?remove='.$styles[$i]['themes_id']), ) ); $template->assign_block_vars('styles.item.delete', array( ! 'U_DELETE' => append_sid('xs_uninstall.'.$phpEx.'?dir=1&remove='.$styles[$i]['themes_id']), ) ); --- 229,237 ---- 'ID' => $styles[$i]['themes_id'], 'THEME' => htmlspecialchars($styles[$i]['style_name']), ! 'U_DELETE' => mx_append_sid('xs_uninstall.'.$phpEx.'?remove='.$styles[$i]['themes_id']), ) ); $template->assign_block_vars('styles.item.delete', array( ! 'U_DELETE' => mx_append_sid('xs_uninstall.'.$phpEx.'?dir=1&remove='.$styles[$i]['themes_id']), ) ); Index: xs_include_import2.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_include_import2.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_include_import2.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_include_import2.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 36,40 **** } ! $lang['xs_import_back'] = str_replace('{URL}', append_sid('xs_import.'.$phpEx), $lang['xs_import_back']); // list of text types. only last 4 characters of filename --- 36,40 ---- } ! $lang['xs_import_back'] = str_replace('{URL}', mx_append_sid('xs_import.'.$phpEx), $lang['xs_import_back']); // list of text types. only last 4 characters of filename *************** *** 191,195 **** { // show as text ! $str = '<div align="left">' . $lang['xs_import_list_contents'] . $f . ' [<a href="' . append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($f) . '&get_content=1') . '">' . $lang['xs_import_download_lc'] . '</a>]<br /><br />'; $str .= '<textarea cols="120" rows="30" style="width: 100%">' . htmlspecialchars($contents) . '</textarea>'; $str .= '</div>'; --- 191,195 ---- { // show as text ! $str = '<div align="left">' . $lang['xs_import_list_contents'] . $f . ' [<a href="' . mx_append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($f) . '&get_content=1') . '">' . $lang['xs_import_download_lc'] . '</a>]<br /><br />'; $str .= '<textarea cols="120" rows="30" style="width: 100%">' . htmlspecialchars($contents) . '</textarea>'; $str .= '</div>'; *************** *** 267,273 **** if(xs_in_array($ext, $text_types) || xs_in_array($ext, $img_types)) { ! $str .= '[<a href="' . append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($var)) . '">' . $lang['xs_import_view_lc'] . '</a>] '; } ! $str .= '[<a href="' . append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($var)) . '&get_content=1">' . $lang['xs_import_download_lc'] . '</a>] '; } $str .= str_replace('{NUM}', $value['size'], $lang['xs_import_file_size']) . '</td></tr>'; --- 267,273 ---- if(xs_in_array($ext, $text_types) || xs_in_array($ext, $img_types)) { ! $str .= '[<a href="' . mx_append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($var)) . '">' . $lang['xs_import_view_lc'] . '</a>] '; } ! $str .= '[<a href="' . mx_append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($filename) . '&get_file=' . urlencode($var)) . '&get_content=1">' . $lang['xs_import_download_lc'] . '</a>] '; } $str .= str_replace('{NUM}', $value['size'], $lang['xs_import_file_size']) . '</td></tr>'; Index: xs_frame_top.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_frame_top.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_frame_top.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_frame_top.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 24,44 **** $template->assign_block_vars('left_nav', array( ! 'URL' => append_sid('xs_index.'.$phpEx), 'TEXT' => $lang['xs_menu_lc'] )); /* $template->assign_block_vars('left_nav', array( ! 'URL' => append_sid('xs_download.'.$phpEx), 'TEXT' => $lang['xs_download_styles_lc'] )); */ $template->assign_block_vars('left_nav', array( ! 'URL' => append_sid('xs_styles.'.$phpEx), 'TEXT' => $lang['xs_set_default_style_lc'] )); $template->assign_block_vars('left_nav', array( ! 'URL' => append_sid('xs_import.'.$phpEx), 'TEXT' => $lang['xs_import_styles_lc'] )); $template->assign_block_vars('left_nav', array( ! 'URL' => append_sid('xs_install.'.$phpEx), 'TEXT' => $lang['xs_install_styles_lc'] )); --- 24,44 ---- $template->assign_block_vars('left_nav', array( ! 'URL' => mx_append_sid('xs_index.'.$phpEx), 'TEXT' => $lang['xs_menu_lc'] )); /* $template->assign_block_vars('left_nav', array( ! 'URL' => mx_append_sid('xs_download.'.$phpEx), 'TEXT' => $lang['xs_download_styles_lc'] )); */ $template->assign_block_vars('left_nav', array( ! 'URL' => mx_append_sid('xs_styles.'.$phpEx), 'TEXT' => $lang['xs_set_default_style_lc'] )); $template->assign_block_vars('left_nav', array( ! 'URL' => mx_append_sid('xs_import.'.$phpEx), 'TEXT' => $lang['xs_import_styles_lc'] )); $template->assign_block_vars('left_nav', array( ! 'URL' => mx_append_sid('xs_install.'.$phpEx), 'TEXT' => $lang['xs_install_styles_lc'] )); Index: xs_index.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_index.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_index.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_index.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 28,49 **** if(isset($HTTP_GET_VARS['showwarning'])) { ! $msg = str_replace('{URL}', append_sid('xs_index.'.$phpEx), $lang['xs_main_comment3']); xs_message($lang['Information'], $msg); } $template->assign_vars(array( ! 'U_CONFIG' => append_sid('xs_config.'.$phpEx), ! 'U_DEFAULT_STYLE' => append_sid('xs_styles.'.$phpEx), ! 'U_MANAGE_CACHE' => append_sid('xs_cache.'.$phpEx), ! 'U_IMPORT_STYLES' => append_sid('xs_import.'.$phpEx), ! 'U_EXPORT_STYLES' => append_sid('xs_export.'.$phpEx), ! 'U_CLONE_STYLE' => append_sid('xs_clone.'.$phpEx), ! 'U_DOWNLOAD_STYLES' => append_sid('xs_download.'.$phpEx), ! 'U_INSTALL_STYLES' => append_sid('xs_install.'.$phpEx), ! 'U_UNINSTALL_STYLES' => append_sid('xs_uninstall.'.$phpEx), ! 'U_EDIT_STYLES' => append_sid('xs_edit.'.$phpEx), ! 'U_EDIT_STYLES_DATA' => append_sid('xs_edit_data.'.$phpEx), ! 'U_EXPORT_DATA' => append_sid('xs_export_data.'.$phpEx), ! 'U_UPDATES' => append_sid('xs_update.'.$phpEx), 'S_SHOW_UPDATES' => defined('XS_ENABLE_UPDATES') ? 1 : 0, )); --- 28,49 ---- if(isset($HTTP_GET_VARS['showwarning'])) { ! $msg = str_replace('{URL}', mx_append_sid('xs_index.'.$phpEx), $lang['xs_main_comment3']); xs_message($lang['Information'], $msg); } $template->assign_vars(array( ! 'U_CONFIG' => mx_append_sid('xs_config.'.$phpEx), ! 'U_DEFAULT_STYLE' => mx_append_sid('xs_styles.'.$phpEx), ! 'U_MANAGE_CACHE' => mx_append_sid('xs_cache.'.$phpEx), ! 'U_IMPORT_STYLES' => mx_append_sid('xs_import.'.$phpEx), ! 'U_EXPORT_STYLES' => mx_append_sid('xs_export.'.$phpEx), ! 'U_CLONE_STYLE' => mx_append_sid('xs_clone.'.$phpEx), ! 'U_DOWNLOAD_STYLES' => mx_append_sid('xs_download.'.$phpEx), ! 'U_INSTALL_STYLES' => mx_append_sid('xs_install.'.$phpEx), ! 'U_UNINSTALL_STYLES' => mx_append_sid('xs_uninstall.'.$phpEx), ! 'U_EDIT_STYLES' => mx_append_sid('xs_edit.'.$phpEx), ! 'U_EDIT_STYLES_DATA' => mx_append_sid('xs_edit_data.'.$phpEx), ! 'U_EXPORT_DATA' => mx_append_sid('xs_export_data.'.$phpEx), ! 'U_UPDATES' => mx_append_sid('xs_update.'.$phpEx), 'S_SHOW_UPDATES' => defined('XS_ENABLE_UPDATES') ? 1 : 0, )); Index: xs_import.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_import.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_import.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_import.php 1 Feb 2008 03:58:47 -0000 1.1.2.1 *************** *** 10,14 **** */ ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 10,14 ---- */ ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 20,24 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 20,24 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 26,32 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_import.'.$phpEx) . '">' . $lang['xs_import_styles'] . '</a>')); ! $lang['xs_import_back'] = str_replace('{URL}', append_sid('xs_import.'.$phpEx), $lang['xs_import_back']); $return_url = isset($HTTP_POST_VARS['return']) ? stripslashes($HTTP_POST_VARS['return']) : (isset($HTTP_GET_VARS['return']) ? stripslashes($HTTP_GET_VARS['return']) : ''); --- 26,32 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_import.'.$phpEx) . '">' . $lang['xs_import_styles'] . '</a>')); ! $lang['xs_import_back'] = str_replace('{URL}', mx_append_sid('xs_import.'.$phpEx), $lang['xs_import_back']); $return_url = isset($HTTP_POST_VARS['return']) ? stripslashes($HTTP_POST_VARS['return']) : (isset($HTTP_GET_VARS['return']) ? stripslashes($HTTP_GET_VARS['return']) : ''); *************** *** 51,55 **** if(!xs_check_cache($cache_filename)) { ! xs_error(str_replace(array('{URL1}', '{URL2}'), array(append_sid('xs_chmod.'.$phpEx), append_sid('xs_import.'.$phpEx)), $lang['xs_import_nowrite_cache'])); } --- 51,55 ---- if(!xs_check_cache($cache_filename)) { ! xs_error(str_replace(array('{URL1}', '{URL2}'), array(mx_append_sid('xs_chmod.'.$phpEx), mx_append_sid('xs_import.'.$phpEx)), $lang['xs_import_nowrite_cache'])); } *************** *** 110,118 **** $params['return'] = $return_url; } ! if(!get_ftp_config(append_sid('xs_import.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(append_sid('xs_import.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { --- 110,118 ---- $params['return'] = $return_url; } ! if(!get_ftp_config(mx_append_sid('xs_import.'.$phpEx), $params, true)) { xs_exit(); } ! xs_ftp_connect(mx_append_sid('xs_import.'.$phpEx), $params, true); if($ftp === XS_FTP_LOCAL) { *************** *** 157,161 **** fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst) . $return), $lang['xs_import_uploaded2']) . '<br /><br />' . $lang['xs_import_back']); } --- 157,161 ---- fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', mx_append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst) . $return), $lang['xs_import_uploaded2']) . '<br /><br />' . $lang['xs_import_back']); } *************** *** 192,196 **** fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst)), $lang['xs_import_uploaded3']) . '<br /><br />' . $lang['xs_import_back']); } --- 192,196 ---- fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', mx_append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst)), $lang['xs_import_uploaded3']) . '<br /><br />' . $lang['xs_import_back']); } *************** *** 232,236 **** fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst)), $lang['xs_import_uploaded4']) . '<br /><br />' . $lang['xs_import_back']); } --- 232,236 ---- fwrite($f, $str); fclose($f); ! xs_message($lang['Information'], str_replace('{URL}', mx_append_sid('xs_import.'.$phpEx.'?importstyle=' . urlencode($dst)), $lang['xs_import_uploaded4']) . '<br /><br />' . $lang['xs_import_back']); } *************** *** 253,257 **** $template->set_filenames(array('import' => XS_TPL_PATH . 'import2.'.$tplEx)); $template->assign_vars(array( ! 'FORM_ACTION' => append_sid('xs_import.'.$phpEx), 'S_RETURN' => $return_url ? '<input type="hidden" name="return" value="' . htmlspecialchars($return_url) . '" />' : '', 'IMPORT_FILENAME' => htmlspecialchars($file), --- 253,257 ---- $template->set_filenames(array('import' => XS_TPL_PATH . 'import2.'.$tplEx)); $template->assign_vars(array( ! 'FORM_ACTION' => mx_append_sid('xs_import.'.$phpEx), 'S_RETURN' => $return_url ? '<input type="hidden" name="return" value="' . htmlspecialchars($return_url) . '" />' : '', 'IMPORT_FILENAME' => htmlspecialchars($file), *************** *** 344,351 **** 'DATE' => create_date($board_config['default_dateformat'], $item['date'], $board_config['board_timezone']), 'COMMENT' => htmlspecialchars($item['comment']), ! 'U_DELETE' => append_sid('xs_import.' . $phpEx . '?del=' . urlencode($item['file'])), ! 'U_IMPORT' => append_sid('xs_import.' . $phpEx . '?importstyle=' . urlencode($item['file'])), ! 'U_DOWNLOAD' => append_sid('xs_download.' . $phpEx), ! 'U_LIST' => append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($item['file'])), )); if(empty($item['error'])) --- 344,351 ---- 'DATE' => create_date($board_config['default_dateformat'], $item['date'], $board_config['board_timezone']), 'COMMENT' => htmlspecialchars($item['comment']), ! 'U_DELETE' => mx_append_sid('xs_import.' . $phpEx . '?del=' . urlencode($item['file'])), ! 'U_IMPORT' => mx_append_sid('xs_import.' . $phpEx . '?importstyle=' . urlencode($item['file'])), ! 'U_DOWNLOAD' => mx_append_sid('xs_download.' . $phpEx), ! 'U_LIST' => mx_append_sid('xs_import.' . $phpEx . '?list=1&import=' . urlencode($item['file'])), )); if(empty($item['error'])) *************** *** 370,374 **** } $template->assign_vars(array( ! 'U_SCRIPT' => append_sid('xs_import.'.$phpEx), )); --- 370,374 ---- } $template->assign_vars(array( ! 'U_SCRIPT' => mx_append_sid('xs_import.'.$phpEx), )); Index: xs_edit_data.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_edit_data.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_edit_data.php 13 Sep 2007 00:24:19 -0000 1.1 --- xs_edit_data.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 11,15 **** ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 11,15 ---- ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 21,25 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 21,25 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 27,33 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_edit_data.'.$phpEx) . '">' . $lang['xs_edit_styles_data'] . '</a>')); ! $lang['xs_edittpl_back_list'] = str_replace('{URL}', append_sid('xs_edit_data.'.$phpEx), $lang['xs_edittpl_back_list']); function xs_empty_name() --- 27,33 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_edit_data.'.$phpEx) . '">' . $lang['xs_edit_styles_data'] . '</a>')); ! $lang['xs_edittpl_back_list'] = str_replace('{URL}', mx_append_sid('xs_edit_data.'.$phpEx), $lang['xs_edittpl_back_list']); function xs_empty_name() *************** *** 189,193 **** { $id = intval($HTTP_POST_VARS['edit']); ! $lang['xs_edittpl_back_edit'] = str_replace('{URL}', append_sid('xs_edit_data.'.$phpEx.'?edit='.$id), $lang['xs_edittpl_back_edit']); $data_item = array(); $data_item_update = array(); --- 189,193 ---- { $id = intval($HTTP_POST_VARS['edit']); ! $lang['xs_edittpl_back_edit'] = str_replace('{URL}', mx_append_sid('xs_edit_data.'.$phpEx.'?edit='.$id), $lang['xs_edittpl_back_edit']); $data_item = array(); $data_item_update = array(); *************** *** 281,285 **** // show variables $template->assign_vars(array( ! 'U_ACTION' => append_sid('xs_edit_data.'.$phpEx), 'TPL' => htmlspecialchars($item['template-name']), 'STYLE' => htmlspecialchars($item['style_name']), --- 281,285 ---- // show variables $template->assign_vars(array( ! 'U_ACTION' => mx_append_sid('xs_edit_data.'.$phpEx), 'TPL' => htmlspecialchars($item['template-name']), 'STYLE' => htmlspecialchars($item['style_name']), *************** *** 371,375 **** 'TPL' => htmlspecialchars($item['template_name']), 'STYLE' => htmlspecialchars($item['style_name']), ! 'U_EDIT' => append_sid('xs_edit_data.'.$phpEx.'?edit='.$item['themes_id']) ) ); --- 371,375 ---- 'TPL' => htmlspecialchars($item['template_name']), 'STYLE' => htmlspecialchars($item['style_name']), ! 'U_EDIT' => mx_append_sid('xs_edit_data.'.$phpEx.'?edit='.$item['themes_id']) ) ); Index: xs_download.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_download.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_download.php 13 Sep 2007 00:24:18 -0000 1.1 --- xs_download.php 1 Feb 2008 03:58:46 -0000 1.1.2.1 *************** *** 11,15 **** ! define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; --- 11,15 ---- ! @define('IN_PORTAL', 1); $module_root_path = '../'; $mx_root_path = '../../../'; *************** *** 21,25 **** if(empty($template->xs_version) || $template->xs_version !== 8) { ! message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } --- 21,25 ---- if(empty($template->xs_version) || $template->xs_version !== 8) { ! mx_message_die(GENERAL_ERROR, isset($lang['xs_error_not_installed']) ? $lang['xs_error_not_installed'] : 'eXtreme Styles module is not installed. You forgot to upload includes/template.php'); } *************** *** 27,32 **** include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_import.'.$phpEx) . '">' . $lang['xs_import_styles'] . '</a>')); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . append_sid('xs_download.'.$phpEx) . '">' . $lang['xs_download_styles'] . '</a>')); // submit url --- 27,32 ---- include_once('xs_include.' . $phpEx); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_import.'.$phpEx) . '">' . $lang['xs_import_styles'] . '</a>')); ! $template->assign_block_vars('nav_left',array('ITEM' => '» <a href="' . mx_append_sid('xs_download.'.$phpEx) . '">' . $lang['xs_download_styles'] . '</a>')); // submit url *************** *** 44,48 **** ); $str = '<form action="' . $board_config[$var] . '" method="post" style="display: inline;" target="main"><input type="hidden" name="data" value="' . htmlspecialchars(serialize($import_data)) . '" /><input type="submit" value="' . $lang['xs_continue'] . '" class="post" /></form>'; ! $message = $lang['xs_import_download_warning'] . '<br /><br />' . $str . '<br /><br />' . str_replace('{URL}', append_sid('xs_download.'.$phpEx), $lang['xs_download_back']); xs_message($lang['Information'], $message); } --- 44,48 ---- ); $str = '<form action="' . $board_config[$var] . '" method="post" style="display: inline;" target="main"><input type="hidden" name="data" value="' . htmlspecialchars(serialize($import_data)) . '" /><input type="submit" value="' . $lang['xs_continue'] . '" class="post" /></form>'; ! $message = $lang['xs_import_download_warning'] . '<br /><br />' . $str . '<br /><br />' . str_replace('{URL}', mx_append_sid('xs_download.'.$phpEx), $lang['xs_download_back']); xs_message($lang['Information'], $message); } *************** *** 140,150 **** 'URL' => htmlspecialchars($board_config['xs_downloads_'.$i]), 'TITLE' => htmlspecialchars($board_config['xs_downloads_title_'.$i]), ! 'U_DOWNLOAD' => append_sid('xs_download.'.$phpEx.'?url='.$i), ! 'U_EDIT' => append_sid('xs_download.'.$phpEx.'?edit='.$i), )); } $template->assign_vars(array( ! 'U_POST' => append_sid('xs_download.'.$phpEx) )); --- 140,150 ---- 'URL' => htmlspecialchars($board_config['xs_downloads_'.$i]), 'TITLE' => htmlspecialchars($board_config['xs_downloads_title_'.$i]), ! 'U_DOWNLOAD' => mx_append_sid('xs_download.'.$phpEx.'?url='.$i), ! 'U_EDIT' => mx_append_sid('xs_download.'.$phpEx.'?edit='.$i), )); } $template->assign_vars(array( ! 'U_POST' => mx_append_sid('xs_download.'.$phpEx) )); Index: xs_update.php =================================================================== RCS file: /cvsroot/mxbb/mx_xs/admin/xs_update.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xs_update.php 13 Sep 2007 00... [truncated message content] |