Permalink
Browse files

Icy Phoenix RC2 latest modified files...

This will be the final RC2 version... I hope also it will be the latest RC before final release.

git-svn-id: http://svn.assembla.com/svn/icy_phoenix/ip/trunk@101 e0e46c49-be69-4f5a-ad62-21024a331aea
  • Loading branch information...
1 parent aa771a9 commit 89225038a5769f67b916bf62c1535270454a2fff @MightyGorgon committed May 16, 2009
Showing with 1,513 additions and 2,149 deletions.
  1. +1 −1 adm/admin_board.php
  2. +3 −3 adm/admin_board_extend.php
  3. +2 −2 adm/admin_megamail.php
  4. +2 −0 adm/ip_header.php
  5. +26 −12 ajax_chat.php
  6. +7 −5 ajax_shoutbox.php
  7. +5 −6 attachments.php
  8. +4 −2 blocks/blocks_imp_album.php
  9. +5 −4 calendar.php
  10. +417 −427 cms.php
  11. +8 −5 cms_ads.php
  12. +0 −310 cms_auth.php
  13. +17 −0 common.php
  14. +5 −4 contact_us.php
  15. +5 −4 dload.php
  16. +2 −2 docs/hl/Lo-Fi Mod.hl
  17. +2 −2 docs/hl/Permission List.hl
  18. +2 −2 docs/hl/phpBB XS.hl
  19. +5 −21 downloads.php
  20. +5 −4 faq.php
  21. +6 −5 forum.php
  22. +5 −4 groupcp.php
  23. +6 −4 gsearch.php
  24. BIN images/cms/cms_index_ads.png
  25. BIN images/cms/cms_index_custom_pages.png
  26. BIN images/cms/cms_index_standard_pages.png
  27. +5 −4 includes/album_mod/album_common.php
  28. +4 −1 includes/bbcb_mg.php
  29. +17 −0 includes/class_form.php
  30. +36 −14 includes/constants.php
  31. +11 −1 includes/db/mysql.php
  32. +3 −4 includes/functions.php
  33. +11 −19 includes/functions_cms.php
  34. +402 −311 includes/functions_cms_admin.php
  35. +1 −51 includes/functions_dbmtnc.php
  36. +0 −19 includes/functions_events_reg.php
  37. +3 −43 includes/functions_post.php
  38. +0 −36 includes/functions_selects.php
  39. +23 −29 includes/new_page_common.php
  40. +3 −3 includes/page_header.php
  41. +1 −1 includes/page_tail.php
  42. +4 −1 includes/usercp_viewprofile.php
  43. +16 −40 includes/viewtopic_events_reg.php
  44. +24 −15 index.php
  45. +3 −3 install/clean_tables_ip.php
  46. +77 −79 install/schemas/db_update_000.sql
  47. +26 −74 install/schemas/mysql_basic.sql
  48. +4 −4 install/schemas/mysql_schema.sql
  49. +3 −0 install/schemas/old_files.php
  50. +65 −82 install/schemas/sql_update_ip.php
  51. +1 −1 install/schemas/versions.php
  52. +5 −4 kb.php
  53. +3 −3 language/lang_english/lang_admin.php
  54. +8 −2 language/lang_english/lang_cms.php
  55. +2 −1 language/lang_english/lang_main.php
  56. +1 −1 language/lang_english/lang_main_upi2db.php
  57. +5 −4 link_register.php
  58. +5 −4 links.php
  59. +5 −4 memberlist.php
  60. +8 −5 posted_img_list.php
  61. +5 −21 posting.php
  62. +2 −2 privmsg.php
  63. +5 −4 profile.php
  64. +5 −1 ranks.php
  65. +5 −4 recent.php
  66. +5 −4 referrers.php
  67. +0 −1 robots.txt
  68. +1 −1 rss.php
  69. +5 −4 rules.php
  70. +15 −20 search.php
  71. +8 −4 shoutbox.php
  72. +5 −4 shoutbox_max.php
  73. +8 −4 shoutbox_view.php
  74. +2 −2 sitemap.php
  75. +5 −4 statistics.php
  76. +2 −1 templates/common/acp/index_frameset.tpl
  77. +1 −0 templates/common/acp/ip_header.tpl
  78. +1 −1 templates/common/cms/breadcrumbs.tpl
  79. +2 −2 templates/common/cms/cms_ads_body.tpl
  80. +1 −1 templates/common/cms/cms_adv_blocks_list_body.tpl
  81. +1 −2 templates/common/cms/cms_adv_index_body.tpl
  82. +1 −1 templates/common/cms/cms_block_content_body.tpl
  83. +2 −2 templates/common/cms/cms_blocks_list_body.tpl
  84. +1 −2 templates/common/cms/cms_index_body.tpl
  85. +15 −3 templates/common/cms/cms_layout_edit_body.tpl
  86. +28 −49 templates/common/cms/cms_layout_list_body.tpl
  87. +0 −4 templates/common/cms/cms_nav_menu_inc_start.tpl
  88. +0 −233 templates/common/cms/cms_pages_auth_body.tpl
  89. +0 −2 templates/common/cms/cms_top_nav.tpl
  90. +0 −1 templates/common/cms/page_header.tpl
  91. +1 −1 templates/common/lofi/bots/lofi_bots_footer.tpl
  92. +1 −1 templates/common/lofi/lofi_footer.tpl
  93. +3 −15 templates/common/style.cfg
  94. +3 −3 templates/default/default.cfg
  95. +5 −5 templates/default/privmsgs_read_body.tpl
  96. +3 −3 templates/default/viewtopic_events_reg.tpl
  97. +5 −5 templates/default/xs_topic.tpl
  98. +0 −8 templates/icy_phoenix/icy_phoenix.cfg
  99. +6 −1 upload.php
  100. +14 −19 viewforum.php
  101. +5 −4 viewforumlist.php
  102. +5 −4 viewonline.php
  103. +6 −4 viewtopic.php
View
@@ -457,7 +457,7 @@
'HEADER_TBL_YES' => $switch_header_table_yes,
'HEADER_TBL_NO' => $switch_header_table_no,
- 'HEADER_TBL_TXT' => (STRIP ? stripslashes($new['header_table_text']) : $new['header_table_text']),
+ 'HEADER_TBL_TXT' => ip_stripslashes($new['header_table_text']),
'LOGIN_MAX_FAILED' => $new['login_tries'],
'LOGIN_TIME_LOCKED' => $new['login_locked_out'],
@@ -289,7 +289,7 @@
if (isset($$field_name))
{
set_config($field_name, $$field_name);
- //set_config($field_name, (STRIP ? addslashes($$field_name) : $$field_name));
+ //set_config($field_name, ip_addslashes($$field_name));
}
if (isset($_POST[$field_name . '_over']) && !empty($field['user']) && isset($userdata[$field['user']]))
{
@@ -434,11 +434,11 @@
break;
case 'VARCHAR':
case 'HTMLVARCHAR':
- $input = '<input type="text" name="' . $field_name . '" maxlength="255" size="45" class="post" value="' . (STRIP ? stripslashes($config[$field_name]) : $config[$field_name]) . '" />';
+ $input = '<input type="text" name="' . $field_name . '" maxlength="255" size="45" class="post" value="' . ip_stripslashes($config[$field_name]) . '" />';
break;
case 'TEXT':
case 'HTMLTEXT':
- $input = '<textarea rows="5" cols="45" name="' . $field_name . '" class="post">' . (STRIP ? stripslashes($config[$field_name]) : $config[$field_name]) . '</textarea>';
+ $input = '<textarea rows="5" cols="45" name="' . $field_name . '" class="post">' . ip_stripslashes($config[$field_name]) . '</textarea>';
break;
default:
$input = '';
View
@@ -430,7 +430,7 @@
"",
);
- $plain_message = (STRIP ? stripslashes($mail_data['email_body']) : $mail_data['email_body']);
+ $plain_message = ip_stripslashes($mail_data['email_body']);
$plain_message = strtr($plain_message, array_flip(get_html_translation_table(HTML_ENTITIES)));
$plain_message = str_replace($look_up_array, $replacement_array, $plain_message);
$delete_url = append_sid('admin_megamail.' . PHP_EXT . '?mail_id=' . $mail_data['mail_id'] . '&amp;mode=delete');
@@ -439,7 +439,7 @@
'ROW' => ($row_class % 2) ? 'row2' : 'row1',
'ID' => $mail_data['mail_id'],
'GROUP' => ($mail_data['group_id'] != -1) ? $mail_data['group_name'] : $lang['All_users'],
- 'SUBJECT' => (STRIP ? stripslashes($mail_data['email_subject']) : $mail_data['email_subject']),
+ 'SUBJECT' => ip_stripslashes($mail_data['email_subject']),
'MASS_PM' => $mail_data['mass_pm'] ? $lang['Yes'] : $lang['No'],
'EMAIL_FORMAT' => (($mail_data['email_format'] == 2) ? $lang['FULL_HTML'] : (($mail_data['email_format'] == 1) ? $lang['BBCode'] : $lang['HTML'])),
'MESSAGE_BODY' => $plain_message,
View
@@ -154,12 +154,14 @@
'L_PORTAL' => $lang['Portal'],
'L_CMS' => $lang['CMS_TITLE'],
'L_PREVIEW_PORTAL' => $lang['Preview_Portal'],
+ 'L_CACHE_CLEAR' => $lang['127_Clear_Cache'],
'U_FORUM_INDEX' => append_sid('../' . FORUM_MG),
'U_PORTAL' => append_sid('../' . PORTAL_MG),
'U_ADMIN_INDEX' => append_sid('index.' . PHP_EXT . '?pane=right'),
'U_CMS' => append_sid('../cms.' . PHP_EXT),
'U_MSQD' => append_sid('../msqd/'),
+ 'U_CACHE_CLEAR' => append_sid('admin_board_clearcache.' . PHP_EXT . '?pane=right'),
'U_IP_MAIN' => '<a href="http://www.icyphoenix.com" target="_blank">' . $lang['IcyPhoenix_Main'] . '</a>',
'U_IP_DOWNLOAD' => '<a href="http://www.icyphoenix.com/dload.php" target="_blank">' . $lang['IcyPhoenix_Download'] . '</a>',
View
@@ -45,13 +45,21 @@
// Show shoutbox with header and footer if the user didn't request anything else
if (($mode == false) || ($mode != 'archive'))
{
- $cms_page_id_tmp = '0';
- $cms_page_name_tmp = 'ajax_chat';
- check_page_auth($cms_page_id_tmp, $cms_page_name_tmp);
- // I would shut wide blocks off since this may be run as stand alone
- $cms_global_blocks = false;
-
- $ajax_archive_link = check_page_auth(0, 'ajax_chat_archive', true);
+ if (!isset($cms_page_id))
+ {
+ $cms_page_id = 'ajax_chat';
+ }
+ // Set as tmp value to not overwrite page id if included as a block...
+ $cms_page_id_tmp = 'ajax_chat';
+ // Import settings from other vars if set... or force global blocks and page nav off since this may be run as stand alone
+ $cms_page_nav = isset($cms_page_nav) ? $cms_page_nav : false;
+ $cms_global_blocks = isset($cms_global_blocks) ? $cms_global_blocks : false;
+ $cms_auth_level_tmp = (isset($cms_config_layouts[$cms_page_id_tmp]['view']) ? $cms_config_layouts[$cms_page_id_tmp]['view'] : AUTH_ALL);
+ check_page_auth($cms_page_id_tmp, $cms_auth_level_tmp);
+
+ $cms_page_id_tmp = 'ajax_chat_archive';
+ $cms_auth_level_tmp = (isset($cms_config_layouts[$cms_page_id_tmp]['view']) ? $cms_config_layouts[$cms_page_id_tmp]['view'] : AUTH_ALL);
+ $ajax_archive_link = check_page_auth($cms_page_id_tmp, $cms_auth_level_tmp, true);
$page_title = $lang['Ajax_Chat'];
$meta_description = '';
@@ -75,11 +83,17 @@
}
else
{
- $cms_page_id_tmp = '0';
- $cms_page_name_tmp = 'ajax_chat_archive';
- check_page_auth($cms_page_id_tmp, $cms_page_name_tmp);
- // I would shut wide blocks off since this may be run as stand alone
- $cms_global_blocks = false;
+ if (!isset($cms_page_id))
+ {
+ $cms_page_id = 'ajax_chat_archive';
+ }
+ // Set as tmp value to not overwrite page id if included as a block...
+ $cms_page_id_tmp = 'ajax_chat_archive';
+ // Import settings from other vars if set... or force global blocks and page nav off since this may be run as stand alone
+ $cms_page_nav = isset($cms_page_nav) ? $cms_page_nav : false;
+ $cms_global_blocks = isset($cms_global_blocks) ? $cms_global_blocks : false;
+ $cms_auth_level_tmp = (isset($cms_config_layouts[$cms_page_id_tmp]['view']) ? $cms_config_layouts[$cms_page_id_tmp]['view'] : AUTH_ALL);
+ check_page_auth($cms_page_id_tmp, $cms_auth_level_tmp);
$page_title = $lang['Ajax_Chat'];
$meta_description = '';
View
@@ -27,12 +27,14 @@
init_userprefs($userdata);
// End session management
-$cms_page_id = '0';
-$cms_page_name = 'ajax_chat';
-check_page_auth($cms_page_id, $cms_page_name);
-$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? true : false;
-// I would shut wide blocks off since this may be run as stand alone
+$cms_page_id = 'ajax_chat';
+$cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
+$cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
+// Force to off...
+$cms_page_nav = false;
$cms_global_blocks = false;
+$cms_auth_level = (isset($cms_config_layouts[$cms_page_id]['view']) ? $cms_config_layouts[$cms_page_id]['view'] : AUTH_ALL);
+check_page_auth($cms_page_id, $cms_auth_level);
$shoutbox_template_parse = true;
include(IP_ROOT_PATH . 'includes/ajax_shoutbox_inc.' . PHP_EXT);
View
@@ -27,12 +27,11 @@
include(IP_ROOT_PATH . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_attach.' . PHP_EXT);
-$cms_page_id = '11';
-$cms_page_name = 'attachments';
-check_page_auth($cms_page_id, $cms_page_name);
-$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? true : false;
-// set the cms page to download now...
-$cms_page_name = 'download';
+$cms_page_id = 'attachments';
+$cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
+$cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
+$cms_auth_level = (isset($cms_config_layouts[$cms_page_id]['view']) ? $cms_config_layouts[$cms_page_id]['view'] : AUTH_ALL);
+check_page_auth($cms_page_id, $cms_auth_level);
$real_filename = 'real_filename';
$attach_table = ATTACHMENTS_TABLE;
@@ -25,9 +25,11 @@
function imp_album_block_func()
{
global $template, $db, $board_config, $lang, $images, $userdata;
- global $cms_global_blocks, $cms_page_id, $cms_config_vars, $block_id;
+ global $cms_global_blocks, $cms_page_id, $cms_config_vars, $cms_config_layouts, $block_id;
- $process_block = check_page_auth(0, 'album', true);
+ $cms_page_id_tmp = 'album';
+ $cms_auth_level_tmp = (isset($cms_config_layouts[$cms_page_id_tmp]['view']) ? $cms_config_layouts[$cms_page_id_tmp]['view'] : AUTH_ALL);
+ $process_block = check_page_auth($cms_page_id_tmp, $cms_auth_level_tmp, true);
if (!$process_block)
{
return;
View
@@ -33,10 +33,11 @@
init_userprefs($userdata);
// End session management
-$cms_page_id = '16';
-$cms_page_name = 'calendar';
-check_page_auth($cms_page_id, $cms_page_name);
-$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? true : false;
+$cms_page_id = 'calendar';
+$cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
+$cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
+$cms_auth_level = (isset($cms_config_layouts[$cms_page_id]['view']) ? $cms_config_layouts[$cms_page_id]['view'] : AUTH_ALL);
+check_page_auth($cms_page_id, $cms_auth_level);
// get parameters
Oops, something went wrong.

0 comments on commit 8922503

Please sign in to comment.