Skip to content

Commit

Permalink
Icy Phoenix RC2 latest modified files...
Browse files Browse the repository at this point in the history 
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
@MightyGorgon
MightyGorgon committed May 16, 2009
1 parent aa771a9 commit 8922503
Show file tree
Hide file tree
Showing 103 changed files with 1,513 additions and 2,149 deletions.
2 changes: 1 addition & 1 deletion adm/admin_board.php
View file
Expand Up @@ -457,7 +457,7 @@


'HEADER_TBL_YES' => $switch_header_table_yes, 'HEADER_TBL_YES' => $switch_header_table_yes,
'HEADER_TBL_NO' => $switch_header_table_no, '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_MAX_FAILED' => $new['login_tries'],
'LOGIN_TIME_LOCKED' => $new['login_locked_out'], 'LOGIN_TIME_LOCKED' => $new['login_locked_out'],
Expand Down
6 changes: 3 additions & 3 deletions adm/admin_board_extend.php
View file
Expand Up @@ -289,7 +289,7 @@
if (isset($$field_name)) if (isset($$field_name))
{ {
set_config($field_name, $$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']])) if (isset($_POST[$field_name . '_over']) && !empty($field['user']) && isset($userdata[$field['user']]))
{ {
Expand Down Expand Up @@ -434,11 +434,11 @@
break; break;
case 'VARCHAR': case 'VARCHAR':
case 'HTMLVARCHAR': 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; break;
case 'TEXT': case 'TEXT':
case 'HTMLTEXT': 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; break;
default: default:
$input = ''; $input = '';
Expand Down
4 changes: 2 additions & 2 deletions adm/admin_megamail.php
View file
Expand Up @@ -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 = strtr($plain_message, array_flip(get_html_translation_table(HTML_ENTITIES)));
$plain_message = str_replace($look_up_array, $replacement_array, $plain_message); $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'); $delete_url = append_sid('admin_megamail.' . PHP_EXT . '?mail_id=' . $mail_data['mail_id'] . '&amp;mode=delete');
Expand All @@ -439,7 +439,7 @@
'ROW' => ($row_class % 2) ? 'row2' : 'row1', 'ROW' => ($row_class % 2) ? 'row2' : 'row1',
'ID' => $mail_data['mail_id'], 'ID' => $mail_data['mail_id'],
'GROUP' => ($mail_data['group_id'] != -1) ? $mail_data['group_name'] : $lang['All_users'], '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'], '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'])), 'EMAIL_FORMAT' => (($mail_data['email_format'] == 2) ? $lang['FULL_HTML'] : (($mail_data['email_format'] == 1) ? $lang['BBCode'] : $lang['HTML'])),
'MESSAGE_BODY' => $plain_message, 'MESSAGE_BODY' => $plain_message,
Expand Down
2 changes: 2 additions & 0 deletions adm/ip_header.php
View file
Expand Up @@ -154,12 +154,14 @@
'L_PORTAL' => $lang['Portal'], 'L_PORTAL' => $lang['Portal'],
'L_CMS' => $lang['CMS_TITLE'], 'L_CMS' => $lang['CMS_TITLE'],
'L_PREVIEW_PORTAL' => $lang['Preview_Portal'], 'L_PREVIEW_PORTAL' => $lang['Preview_Portal'],
'L_CACHE_CLEAR' => $lang['127_Clear_Cache'],


'U_FORUM_INDEX' => append_sid('../' . FORUM_MG), 'U_FORUM_INDEX' => append_sid('../' . FORUM_MG),
'U_PORTAL' => append_sid('../' . PORTAL_MG), 'U_PORTAL' => append_sid('../' . PORTAL_MG),
'U_ADMIN_INDEX' => append_sid('index.' . PHP_EXT . '?pane=right'), 'U_ADMIN_INDEX' => append_sid('index.' . PHP_EXT . '?pane=right'),
'U_CMS' => append_sid('../cms.' . PHP_EXT), 'U_CMS' => append_sid('../cms.' . PHP_EXT),
'U_MSQD' => append_sid('../msqd/'), '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_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>', 'U_IP_DOWNLOAD' => '<a href="http://www.icyphoenix.com/dload.php" target="_blank">' . $lang['IcyPhoenix_Download'] . '</a>',
Expand Down
38 changes: 26 additions & 12 deletions ajax_chat.php
View file
Expand Up @@ -45,13 +45,21 @@
// Show shoutbox with header and footer if the user didn't request anything else // Show shoutbox with header and footer if the user didn't request anything else
if (($mode == false) || ($mode != 'archive')) if (($mode == false) || ($mode != 'archive'))
{ {
$cms_page_id_tmp = '0'; if (!isset($cms_page_id))
$cms_page_name_tmp = 'ajax_chat'; {
check_page_auth($cms_page_id_tmp, $cms_page_name_tmp); $cms_page_id = 'ajax_chat';
// I would shut wide blocks off since this may be run as stand alone }
$cms_global_blocks = false; // Set as tmp value to not overwrite page id if included as a block...

$cms_page_id_tmp = 'ajax_chat';
$ajax_archive_link = check_page_auth(0, 'ajax_chat_archive', true); // 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']; $page_title = $lang['Ajax_Chat'];
$meta_description = ''; $meta_description = '';
Expand All @@ -75,11 +83,17 @@
} }
else else
{ {
$cms_page_id_tmp = '0'; if (!isset($cms_page_id))
$cms_page_name_tmp = 'ajax_chat_archive'; {
check_page_auth($cms_page_id_tmp, $cms_page_name_tmp); $cms_page_id = 'ajax_chat_archive';
// I would shut wide blocks off since this may be run as stand alone }
$cms_global_blocks = false; // 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']; $page_title = $lang['Ajax_Chat'];
$meta_description = ''; $meta_description = '';
Expand Down
12 changes: 7 additions & 5 deletions ajax_shoutbox.php
View file
Expand Up @@ -27,12 +27,14 @@
init_userprefs($userdata); init_userprefs($userdata);
// End session management // End session management


$cms_page_id = '0'; $cms_page_id = 'ajax_chat';
$cms_page_name = 'ajax_chat'; $cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
check_page_auth($cms_page_id, $cms_page_name); $cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? true : false; // Force to off...
// I would shut wide blocks off since this may be run as stand alone $cms_page_nav = false;
$cms_global_blocks = 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; $shoutbox_template_parse = true;
include(IP_ROOT_PATH . 'includes/ajax_shoutbox_inc.' . PHP_EXT); include(IP_ROOT_PATH . 'includes/ajax_shoutbox_inc.' . PHP_EXT);
Expand Down
11 changes: 5 additions & 6 deletions attachments.php
View file
Expand Up @@ -27,12 +27,11 @@


include(IP_ROOT_PATH . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_attach.' . PHP_EXT); include(IP_ROOT_PATH . 'language/lang_' . $board_config['default_lang'] . '/lang_admin_attach.' . PHP_EXT);


$cms_page_id = '11'; $cms_page_id = 'attachments';
$cms_page_name = 'attachments'; $cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
check_page_auth($cms_page_id, $cms_page_name); $cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? true : false; $cms_auth_level = (isset($cms_config_layouts[$cms_page_id]['view']) ? $cms_config_layouts[$cms_page_id]['view'] : AUTH_ALL);
// set the cms page to download now... check_page_auth($cms_page_id, $cms_auth_level);
$cms_page_name = 'download';


$real_filename = 'real_filename'; $real_filename = 'real_filename';
$attach_table = ATTACHMENTS_TABLE; $attach_table = ATTACHMENTS_TABLE;
Expand Down
6 changes: 4 additions & 2 deletions blocks/blocks_imp_album.php
View file
Expand Up @@ -25,9 +25,11 @@
function imp_album_block_func() function imp_album_block_func()
{ {
global $template, $db, $board_config, $lang, $images, $userdata; 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) if (!$process_block)
{ {
return; return;
Expand Down
9 changes: 5 additions & 4 deletions calendar.php
View file
Expand Up @@ -33,10 +33,11 @@
init_userprefs($userdata); init_userprefs($userdata);
// End session management // End session management


$cms_page_id = '16'; $cms_page_id = 'calendar';
$cms_page_name = 'calendar'; $cms_page_nav = (!empty($cms_config_layouts[$cms_page_id]['page_nav']) ? true : false);
check_page_auth($cms_page_id, $cms_page_name); $cms_global_blocks = (!empty($cms_config_layouts[$cms_page_id]['global_blocks']) ? true : false);
$cms_global_blocks = ($board_config['wide_blocks_' . $cms_page_name] == 1) ? 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 // get parameters


Expand Down

0 comments on commit 8922503

Please sign in to comment.