diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-25 18:18:47 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-25 18:18:47 +0000 |
commit | 9de75b5dcfd96e0f3ba09a77d212ba0a15480691 (patch) | |
tree | 386eed08fd5ce5bfbea40221b5c03c77d88e9c93 /phpBB/admin | |
parent | ea43268a218a5182e6379af01d2a722cfcc7a93b (diff) | |
download | forums-9de75b5dcfd96e0f3ba09a77d212ba0a15480691.tar forums-9de75b5dcfd96e0f3ba09a77d212ba0a15480691.tar.gz forums-9de75b5dcfd96e0f3ba09a77d212ba0a15480691.tar.bz2 forums-9de75b5dcfd96e0f3ba09a77d212ba0a15480691.tar.xz forums-9de75b5dcfd96e0f3ba09a77d212ba0a15480691.zip |
Updated and fixed various issues, see post in developers forum for info
git-svn-id: file:///svn/phpbb/trunk@1083 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
-rw-r--r-- | phpBB/admin/admin_board.php | 40 | ||||
-rw-r--r-- | phpBB/admin/admin_users.php | 213 |
2 files changed, 163 insertions, 90 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 9a9f1a5990..d39b0c28a3 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -46,17 +46,8 @@ else if( isset($HTTP_POST_VARS['submit']) ) { - if( $config_name == "default_theme" ) - { - $new[$config_name] = substr($HTTP_POST_VARS['board_style'], strrpos($HTTP_POST_VARS['board_style'], "_") + 1); - } - else if( $config_name == "board_template" ) - { - $new[$config_name] = substr($HTTP_POST_VARS['board_style'], 0, strrpos($HTTP_POST_VARS['board_style'], "_")); - } - $sql = "UPDATE " . CONFIG_TABLE . " SET - config_value = '".$new[$config_name]."' + config_value = '" . $new[$config_name] . "' WHERE config_name = '$config_name'"; if( !$db->sql_query($sql) ) { @@ -71,18 +62,24 @@ else } } -$style_select = style_select($new['board_template'], $new['default_theme'], 'board_style', "../templates"); +$style_select = style_select($new['default_style'], 'default_style', "../templates"); +$admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates"); $lang_select = language_select($new['default_lang'], 'default_lang', "../language"); $timezone_select = tz_select($new['board_timezone'], 'board_timezone'); +$override_user_style_yes = ($new['override_user_style']) ? "checked=\"checked\"" : ""; +$override_user_style_no = (!$new['override_user_style']) ? "checked=\"checked\"" : ""; $html_yes = ($new['allow_html']) ? "checked=\"checked\"" : ""; $html_no = (!$new['allow_html']) ? "checked=\"checked\"" : ""; $bbcode_yes = ($new['allow_bbcode']) ? "checked=\"checked\"" : ""; $bbcode_no = (!$new['allow_bbcode']) ? "checked=\"checked\"" : ""; -$activation_yes = ($new['require_activation']) ? "checked=\"checked\"" : ""; -$activation_no = (!$new['require_activation']) ? "checked=\"checked\"" : ""; +$activation_none = ($new['require_activation'] == ACTIVATION_NONE) ? "checked=\"checked\"" : ""; +$activation_user = ($new['require_activation'] == ACTIVATION_USER) ? "checked=\"checked\"" : ""; +$activation_admin = ($new['require_activation'] == ACTIVATION_ADMIN) ? "checked=\"checked\"" : ""; $gzip_yes = ($new['gzip_compress']) ? "checked=\"checked\"" : ""; $gzip_no = (!$new['gzip_compress']) ? "checked=\"checked\"" : ""; +$prune_yes = ($new['prune_enable']) ? "checked=\"checked\"" : ""; +$prune_no = (!$new['prune_enable']) ? "checked=\"checked\"" : ""; $smile_yes = ($new['allow_smilies']) ? "checked=\"checked\"" : ""; $smile_no = (!$new['allow_smilies']) ? "checked=\"checked\"" : ""; $sig_yes = ($new['allow_sig']) ? "checked=\"checked\"" : ""; @@ -105,19 +102,27 @@ $template->set_filenames(array( $template->assign_vars(array( "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), "SITENAME" => $new['sitename'], - "ACTIVATION_YES" => $activation_yes, - "ACTIVATION_NO" => $activation_no, + "ACTIVATION_NONE" => ACTIVATION_NONE, + "ACTIVATION_NONE_CHECKED" => $activation_none, + "ACTIVATION_USER" => ACTIVATION_USER, + "ACTIVATION_USER_CHECKED" => $activation_user, + "ACTIVATION_ADMIN" => ACTIVATION_ADMIN, + "ACTIVATION_ADMIN_CHECKED" => $activation_admin, "FLOOD_INTERVAL" => $new['flood_interval'], "TOPICS_PER_PAGE" => $new['topics_per_page'], "POSTS_PER_PAGE" => $new['posts_per_page'], "HOT_TOPIC" => $new['hot_threshold'], "STYLE_SELECT" => $style_select, + "OVERRIDE_STYLE_YES" => $override_user_style_yes, + "OVERRIDE_STYLE_NO" => $override_user_style_no, "LANG_SELECT" => $lang_select, "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], "DEFAULT_DATEFORMAT" => $new['default_dateformat'], "TIMEZONE_SELECT" => $timezone_select, "GZIP_YES" => $gzip_yes, "GZIP_NO" => $gzip_no, + "PRUNE_YES" => $prune_yes, + "PRUNE_NO" => $prune_no, "HTML_YES" => $html_yes, "HTML_NO" => $html_no, "BBCODE_YES" => $bbcode_yes, @@ -138,8 +143,9 @@ $template->assign_vars(array( "AVATAR_MAX_HEIGHT" => $new['avatar_max_height'], "AVATAR_MAX_WIDTH" => $new['avatar_max_width'], "AVATAR_PATH" => $new['avatar_path'], - "EMAIL_FROM" => $new['email_from'], - "EMAIL_SIG" => $new['email_sig'], + "SMILIES_PATH" => $new['smilies_path'], + "EMAIL_FROM" => $new['board_email'], + "EMAIL_SIG" => $new['board_email_sig'], "SMTP_YES" => $smtp_yes, "SMTP_NO" => $smtp_no, "SMTP_HOST" => $new['smtp_host']) diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 9fd8352c69..ec01a8ed6a 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -35,6 +35,81 @@ $phpbb_root_path = "./../"; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); + +// +// Functions +// +function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$location, &$occupation, &$interests, &$sig) +{ + // ICQ number has to be only numbers. + if (!preg_match("/^[0-9]+$/", $icq)) + { + $icq = ""; + } + + // AIM address has to have length >= 2. + if (strlen($aim) < 2) + { + $aim = ""; + } + + // MSNM address has to have length >= 2. + if (strlen($msnm) < 2) + { + $msnm = ""; + } + + // YIM address has to have length >= 2. + if (strlen($yim) < 2) + { + $yim = ""; + } + + // website has to start with http://, followed by something with length at least 3 that + // contains at least one dot. + if($website != "") + { + if( !ereg("^http\:\/\/", $website) ) + { + $website = "http://" . $website; + } + + if (!preg_match("#^http\\:\\/\\/[a-z0-9]+\.[a-z0-9]+#i", $website)) + { + $website = ""; + } + } + + // location has to have length >= 2. + if (strlen($location) < 2) + { + $location = ""; + } + + // occupation has to have length >= 2. + if (strlen($occupation) < 2) + { + $occupation = ""; + } + + // interests has to have length >= 2. + if (strlen($interests) < 2) + { + $interests = ""; + } + + // sig has to have length >= 2. + if (strlen($sig) < 2) + { + $sig = ""; + } + + return; +} +// +// End Functions +// + // // Start session management // @@ -94,23 +169,16 @@ if ( isset($HTTP_GET_VARS['submit']) ) { $allowviewonline = $userdata['user_allow_viewonline']; $user_avatar = $userdata['user_avatar']; - $user_theme = $userdata['user_theme']; + $user_style = $userdata['user_style']; $user_lang = $userdata['user_lang']; $user_timezone = $userdata['user_timezone']; - $user_template = $userdata['user_template']; $user_dateformat = $userdata['user_dateformat']; $user_status = $userdata['user_active']; $user_allowavatar = $userdata['user_allowavatar']; $user_allowpm = $userdata['user_allow_pm']; - $COPPA = false; - - if(!isset($user_template)) - { - $selected_template = $board_config['board_template']; - } $html_status = ($board_config['allow_html']) ? $lang['ON'] : $lang['OFF']; $bbcode_status = ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF']; @@ -118,19 +186,15 @@ if ( isset($HTTP_GET_VARS['submit']) ) { $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; $s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" />'; - // Send the users current email address. If they change it, and account activation is turned on - // the user account will be disabled and the user will have to reactivate their account. - $s_hidden_fields .= '<input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />'; - if($user_avatar != '') + if( $user_avatar != "" ) { - $avatar = (strstr($user_avatar, 'http') && $board_config['allow_avatar_remote']) ? - "<br /><img src=\"" . $user_avatar . "\"><br />" - : "<br /><img src=\"" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" /><br />"; + $avatar = (strstr($user_avatar, 'http') && $board_config['allow_avatar_remote']) ? "<br /><img src=\"" . $user_avatar . "\"><br />" : "<br /><img src=\"../" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" /><br />"; + $s_hidden_fields .= '<input type="hidden" name="user_avatar" value="' . $user_avatar . '" />'; } else { - $avatar = ''; + $avatar = ""; } $template->set_filenames(array( @@ -167,17 +231,19 @@ if ( isset($HTTP_GET_VARS['submit']) ) { "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "checked=\"checked\"" : "", "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "", "AVATAR" => $avatar, + "LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'), "TIMEZONE_SELECT" => tz_select($user_timezone), + "STYLE_SELECT" => style_select($user_style, 'style'), "DATE_FORMAT" => $user_dateformat, "HTML_STATUS" => $html_status, "BBCODE_STATUS" => $bbcode_status, "SMILIES_STATUS" => $smilies_status, - "ALLOWPM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "", - "ALLOWAVATAR_YES" => ($user_allowavatar) ? "checked=\"checked\"" : "", - "STATUS_YES" => ($user_status) ? "checked=\"checked\"" : "", - "ALLOWPM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "", - "ALLOWAVATAR_NO" => (!$user_allowavatar) ? "checked=\"checked\"" : "", - "STATUS_NO" => (!$user_status) ? "checked=\"checked\"" : "", + "ALLOW_PM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "", + "ALLOW_PM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "", + "ALLOW_AVATAR_YES" => ($user_allowavatar) ? "checked=\"checked\"" : "", + "ALLOW_AVATAR_NO" => (!$user_allowavatar) ? "checked=\"checked\"" : "", + "USER_ACTIVE_YES" => ($user_status) ? "checked=\"checked\"" : "", + "USER_ACTIVE_NO" => (!$user_status) ? "checked=\"checked\"" : "", "L_PASSWORD_IF_CHANGED" => $lang['password_if_changed'], "L_PASSWORD_CONFIRM_IF_CHANGED" => $lang['password_confirm_if_changed'], @@ -191,8 +257,7 @@ if ( isset($HTTP_GET_VARS['submit']) ) { "L_LOCATION" => $lang['From'], "L_OCCUPATION" => $lang['Occupation'], "L_BOARD_LANGUAGE" => $lang['Board_lang'], - "L_BOARD_THEME" => $lang['Board_theme'], - "L_BOARD_TEMPLATE" => $lang['Board_template'], + "L_BOARD_STYLE" => $lang['Board_style'], "L_TIMEZONE" => $lang['Timezone'], "L_DATE_FORMAT" => $lang['Date_format'], "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], @@ -207,9 +272,9 @@ if ( isset($HTTP_GET_VARS['submit']) ) { "L_SPECIAL" => $lang['User_special'], "L_SPECIAL_EXPLAIN" => $lang['User_specail_explain'], - "L_STATUS" => $lang['User_status'], - "L_ALLOWPM" => $lang['User_allowpm'], - "L_ALLOWAVATAR" => $lang['User_allowavatar'], + "L_USER_ACTIVE" => $lang['User_status'], + "L_ALLOW_PM" => $lang['User_allowpm'], + "L_ALLOW_AVATAR" => $lang['User_allowavatar'], "L_AVATAR_PANEL" => $lang['Avatar_panel'], "L_AVATAR_EXPLAIN" => $lang['Admin_avatar_explain'], @@ -244,14 +309,12 @@ if ( isset($HTTP_GET_VARS['submit']) ) { } else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) { -// -// Ok, the profile has been modified and submitted, let's update -// + // + // Ok, the profile has been modified and submitted, let's update + // $user_id = $HTTP_POST_VARS['user_id']; - $current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email']))); - - $username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['username']))) : ""; + $username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : ""; $email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : ""; $password = (!empty($HTTP_POST_VARS['password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password']))) : ""; @@ -263,18 +326,13 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) $yim = (!empty($HTTP_POST_VARS['yim'])) ? trim(strip_tags($HTTP_POST_VARS['yim'])) : ""; $website = (!empty($HTTP_POST_VARS['website'])) ? trim(strip_tags($HTTP_POST_VARS['website'])) : ""; - if($website != "") - { - if( !ereg("^http\:\/\/", $website) ) - { - $website = "http://" . $website; - } - } $location = (!empty($HTTP_POST_VARS['location'])) ? trim(strip_tags($HTTP_POST_VARS['location'])) : ""; $occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : ""; $interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : ""; $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : ""; + validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); + $viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? $HTTP_POST_VARS['viewemail'] : 0; $allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : 1 ) : 1; $notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? $HTTP_POST_VARS['notifypm'] : 1; @@ -284,12 +342,14 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) $allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? $HTTP_POST_VARS['allowbbcode'] : $board_config['allow_bbcode']; $allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? $HTTP_POST_VARS['allowsmilies'] : $board_config['allow_smilies']; - $user_theme = ($HTTP_POST_VARS['theme']) ? $HTTP_POST_VARS['theme'] : $board_config['default_theme']; + $user_style = ($HTTP_POST_VARS['style']) ? $HTTP_POST_VARS['style'] : $board_config['default_style']; $user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; $user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? $HTTP_POST_VARS['timezone'] : $board_config['board_timezone']; $user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template']; $user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat']; + $user_avatar = ( isset($HTTP_POST_VARS['user_avatar']) ) ? $HTTP_POST_VARS['user_avatar'] : ""; + $user_status = (!empty($HTTP_POST_VARS['user_status'])) ? $HTTP_POST_VARS['user_status'] : 0; $user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? $HTTP_POST_VARS['usr_allowpm'] : 0; $user_allowavatar = (!empty($HTTP_POST_VARS['usr_allowavatar'])) ? $HTTP_POST_VARS['user_allowavatar'] : 0; @@ -320,13 +380,16 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) $error_msg = $lang['Password_mismatch']; } - if(isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile") + if( isset($HTTP_POST_VARS['avatardel']) ) { - if(file_exists("./".$board_config['avatar_path']."/".$userdata['user_avatar'])) + if( !eregi("http", $user_avatar) ) { - @unlink("./".$board_config['avatar_path']."/".$userdata['user_avatar']); - $avatar_sql = ", user_avatar = ''"; + if(file_exists("./../" . $board_config['avatar_path'] . "/" . $user_avatar)) + { + @unlink("./../" . $board_config['avatar_path'] . "/" . $user_avatar); + } } + $avatar_sql = ", user_avatar = ''"; } if(!$error) @@ -334,23 +397,25 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) if( $HTTP_POST_VARS['deleteuser'] ) { $sql = "UPDATE " . POSTS_TABLE . " - SET poster_id = '-1' - WHERE poster_id = $user_id"; + SET poster_id = '-1', post_username = '$username' + WHERE poster_id = $user_id"; if( $result = $db->sql_query($sql) ) { $sql = "UPDATE " . TOPICS_TABLE . " - SET topic_poster = '-1' - WHERE topic_poster = $user_id"; + SET topic_poster = '-1' + WHERE topic_poster = $user_id"; if( $result = $db->sql_query($sql) ) { $sql = "DELETE FROM " . USERS_TABLE . " - WHERE user_id = $user_id"; + WHERE user_id = $user_id"; if( $result = $db->sql_query($sql) ) { $sql = "DELETE FROM " . USER_GROUP_TABLE . " - WHERE user_id = $user_id"; + WHERE user_id = $user_id"; $result = @$db->sql_query($sql); + include('page_header_admin.'. $phpEx); + $template->set_filenames(array( "body" => "admin/admin_message_body.tpl") ); @@ -393,39 +458,42 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) else { $sql = "UPDATE " . USERS_TABLE . " - SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm user_notify_pm = $notifypm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_active = $user_status, user_actkey = '$user_actkey'" . $avatar_sql . " - WHERE user_id = $user_id"; + SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey'" . $avatar_sql . " + WHERE user_id = $user_id"; if($result = $db->sql_query($sql)) { - include('page_header_admin.' . $phpEx); - $template->set_filenames(array( - "body" => "admin/admin_message_body.tpl") - ); + include('page_header_admin.' . $phpEx); - $template->assign_vars(array( - "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'], - "MESSAGE_TEXT" => $lang['Profile_updated']) - ); - $template->pparse("body"); + $template->set_filenames(array( + "body" => "admin/admin_message_body.tpl") + ); + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'], + "MESSAGE_TEXT" => $lang['Profile_updated']) + ); + $template->pparse("body"); } else { - include('page_header_admin.' . $phpEx); - $template->set_filenames(array( - "body" => "admin/admin_message_body.tpl") - ); + include('page_header_admin.' . $phpEx); - $template->assign_vars(array( - "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'], - "MESSAGE_TEXT" => "Error updating user profile") - ); - $template->pparse("body"); + $template->set_filenames(array( + "body" => "admin/admin_message_body.tpl") + ); + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'], + "MESSAGE_TEXT" => "Error updating user profile") + ); + $template->pparse("body"); } } } else { include('page_header_admin.' . $phpEx); + $template->set_filenames(array( "body" => "admin/admin_message_body.tpl") ); @@ -444,7 +512,6 @@ else // // This should be altered on the final system // - $sql = "SELECT user_id, username FROM " . USERS_TABLE . " WHERE user_id <> " . ANONYMOUS ." @@ -480,4 +547,4 @@ else include('page_footer_admin.'.$phpEx); -?> +?>
\ No newline at end of file |