phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images icon_email_arabic.gif,1.1,1.2 icon_pm_arabic.gif,1.1,1.2

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images
In directory usw-pr-cvs1:/tmp/cvs-serv19210/templates/subSilver/images

Modified Files:
	icon_email_arabic.gif icon_pm_arabic.gif 
Log Message:
Updates

Index: icon_email_arabic.gif
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/icon_email_arabic.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsErxvLn and /tmp/cvswXV8nB differ

Index: icon_pm_arabic.gif
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/images/icon_pm_arabic.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsAGfm6m and /tmp/cvs6vpW3z differ

[Phpbb-checkins] CVS: phpBB2/language/lang_arabic lang_admin.php,NONE,1.1 lang_main.php,1.3,1.4

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_arabic
In directory usw-pr-cvs1:/tmp/cvs-serv18939/language/lang_arabic

Modified Files:
	lang_main.php 
Added Files:
	lang_admin.php 
Log Message:
Updates to lang_main + first version lang_admin by waheed

--- NEW FILE ---
<?php

/***************************************************************************
 *                            lang_admin.php [English]
 *                              -------------------
 *     begin                : Sat Dec 16 2000
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : su...@ph...
 *
 *     $Id: lang_admin.php,v 1.27 2001/12/30 13:49:37 psotfx Exp $
 *
 ****************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

//
// Format is same as lang_main
//

//
// Modules, this replaces the keys used
// in the modules[][] arrays in each module file
//
$lang['General'] = "ÅÏÇÑÉ ÚÇãÉ";
$lang['Users'] = "ÇÏÇÑÉ ÇáãÔÊÑßíä";
$lang['Groups'] = "ÅÏÇÑÉ ÇáãÌãæÚÇÊ";
$lang['Forums'] = "ÅÏÇÑÉ ÇáãäÊÏì";
$lang['Styles'] = "ÇÏÇÑÉ ÇáÊäÓíÞ";

$lang['Configuration'] = "ÇÚÏÇÏ";
$lang['Permissions'] = "ÕáÇÍíÇÊ";
$lang['Manage'] = "ÇÏÇÑÉ";
$lang['Disallow'] = "ÇãäÚ ÇÓãÇÁ";
$lang['Prune'] = "ÊåÐíÈ";
$lang['Mass_Email'] = "ÈÑíÏ ÌãÇÚí";
$lang['Ranks'] = "ãÓÊæíÇÊ";
$lang['Smilies'] = "æÌæå ÖÇÍßÉ";
$lang['Ban_Management'] = "ÊÍßã ÇáãäÚ";
$lang['Word_Censor'] = "ãÇäÚ ÇáßáãÇÊ";
$lang['Export'] = "ÊÕÏíÑ";
$lang['Create_new'] = "ßæä";
$lang['Add_new'] = "ÇÖÝ";
$lang['Backup_DB'] = "ÇÍÝÙ ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['Restore_DB'] = "ÇÓÊÑÌÚ ÞÇÚÏÉ ÇáÈíÇäÇÊ";


//
// Index
//
$lang['Admin'] = "ÇáÅÏÇÑÉ";
$lang['Not_admin'] = "áíÓ áß ÕáÇÍíÉ ÇÏÇÑÉ ÇáãäÊÏì";
$lang['Welcome_phpBB'] = "ÇåáÇ Èß Çáì phpBB";
$lang['Admin_intro'] = "Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools.";
$lang['Main_index'] = "Forum Index";
$lang['Forum_stats'] = "Forum Statistics";
$lang['Admin_Index'] = "Admin Index";
$lang['Preview_forum'] = "Preview Forum";

$lang['Click_return_admin_index'] = "Click %sHere%s to return to the Admin Index";

$lang['Statistic'] = "Statistic";
$lang['Value'] = "Value";
$lang['Number_posts'] = "Number of posts";
$lang['Posts_per_day'] = "Posts per day";
$lang['Number_topics'] = "Number of topics";
$lang['Topics_per_day'] = "Topics per day";
$lang['Number_users'] = "Number of users";
$lang['Users_per_day'] = "Users per day";
$lang['Board_started'] = "Board started";
$lang['Avatar_dir_size'] = "Avatar directory size";
$lang['Database_size'] = "Database size";
$lang['Gzip_compression'] ="Gzip compression";
$lang['Not_available'] = "Not available";

$lang['ON'] = "ON"; // This is for GZip compression
$lang['OFF'] = "OFF"; 


//
// DB Utils
//
$lang['Database_Utilities'] = "Database Utilities";

$lang['Restore'] = "Restore";
$lang['Backup'] = "Backup";
$lang['Restore_explain'] = "This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may upload a gzip compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.";
$lang['Backup_explain'] = "Here you can backup all your phpBB related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well please enter their names separated by commas in the Additional Tables textbox below. If your server supports it you may also gzip compress the file to reduce its size before download.";

$lang['Backup_options'] = "Backup options";
$lang['Start_backup'] = "Start Backup";
$lang['Full_backup'] = "Full backup";
$lang['Structure_backup'] = "Structure Only backup";
$lang['Data_backup'] = "Data only backup";
$lang['Additional_tables'] = "Additional tables";
$lang['Gzip_compress'] = "Gzip compress file";
$lang['Select_file'] = "Select a file";
$lang['Start_Restore'] = "Start Restore";

$lang['Restore_success'] = "The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.";
$lang['Backup_download'] = "Your download will start shortly please wait till it begins";
$lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system";

$lang['Restore_Error_uploading'] = "Error in uploading the backup file";
$lang['Restore_Error_filename'] = "Filename problem, please try an alternative file";
$lang['Restore_Error_decompress'] = "Cannot decompress a gzip file, please upload a plain text version";
$lang['Restore_Error_no_file'] = "No file was uploaded";


//
// Auth pages
//
$lang['Select_a_User'] = "Select a User";
$lang['Select_a_Group'] = "Select a Group";
$lang['Select_a_Forum'] = "Select a Forum";
$lang['Auth_Control_User'] = "User Permissions Control"; 
$lang['Auth_Control_Group'] = "Group Permissions Control"; 
$lang['Auth_Control_Forum'] = "Forum Permissions Control"; 
$lang['Look_up_User'] = "Look up User"; 
$lang['Look_up_Group'] = "Look up Group"; 
$lang['Look_up_Forum'] = "Look up Forum"; 

$lang['Group_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case.";
$lang['User_auth_explain'] = "Here you can alter the permissions and moderator status assigned to each individual user. Do not forget when changing user permissions that group permissions may still allow the user entry to forums, etc. You will be warned if this is the case.";
$lang['Forum_auth_explain'] = "Here you can alter the authorisation levels of each forum. You will have both a simple and advanced method for doing this, advanced offers greater control of each forum operation. Remember that changing the permission level of forums will affect which users can carry out the various operations within them.";

$lang['Simple_mode'] = "Simple Mode";
$lang['Advanced_mode'] = "Advanced Mode";
$lang['Moderator_status'] = "Moderator status";

$lang['Allowed_Access'] = "Allowed Access";
$lang['Disallowed_Access'] = "Disallowed Access";
$lang['Is_Moderator'] = "Is Moderator";
$lang['Not_Moderator'] = "Not Moderator";

$lang['Conflict_warning'] = "Authorisation Conflict Warning";
$lang['Conflict_access_userauth'] = "This user still has access rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having access rights. The groups granting rights (and the forums involved) are noted below.";
$lang['Conflict_mod_userauth'] = "This user still has moderator rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having moderator rights. The groups granting rights (and the forums involved) are noted below.";

$lang['Conflict_access_groupauth'] = "The following user (or users) still have access rights to this forum via their user permission settings. You may want to alter the user permissions to fully prevent them having access rights. The users granted rights (and the forums involved) are noted below.";
$lang['Conflict_mod_groupauth'] = "The following user (or users) still have moderator rights to this forum via their user permissions settings. You may want to alter the user permissions to fully prevent them having moderator rights. The users granted rights (and the forums involved) are noted below.";

$lang['Public'] = "Public";
$lang['Private'] = "Private";
$lang['Registered'] = "Registered";
$lang['Administrators'] = "Administrators";
$lang['Hidden'] = "Hidden";

$lang['View'] = "View";
$lang['Read'] = "Read";
$lang['Post'] = "Post";
$lang['Reply'] = "Reply";
$lang['Edit'] = "Edit";
$lang['Delete'] = "Delete";
$lang['Sticky'] = "Sticky";
$lang['Announce'] = "Announce"; 
$lang['Vote'] = "Vote";
$lang['Pollcreate'] = "Poll create";

$lang['Permissions'] = "Permissions";
$lang['Simple_Permission'] = "Simple Permission";

$lang['User_Level'] = "User Level"; 
$lang['Auth_User'] = "User";
$lang['Auth_Admin'] = "Administrator";
$lang['Group_memberships'] = "Usergroup memberships";
$lang['Usergroup_members'] = "This group has the following members";

$lang['Forum_auth_updated'] = "Forum permissions updated";
$lang['User_auth_updated'] = "User permissions updated";
$lang['Group_auth_updated'] = "Group permissions updated";

$lang['Auth_updated'] = "Permissions have been updated";
$lang['Click_return_userauth'] = "Click %sHere%s to return to User Permissions";
$lang['Click_return_groupauth'] = "Click %sHere%s to return to Group Permissions";
$lang['Click_return_forumauth'] = "Click %sHere%s to return to Forum Permissions";


//
// Banning
//
$lang['Ban_control'] = "Ban Control";
$lang['Ban_explain'] = "Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to logon or post to your board, you should use one of the first two methods to achieve this.";
$lang['Ban_explain_warn'] = "Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range try to keep it small or better yet state specific addresses.";

$lang['Select_username'] = "Select a Username";
$lang['Select_ip'] = "Select an IP";
$lang['Select_email'] = "Select an Email address";

$lang['Ban_username'] = "Ban one or more specific users";
$lang['Ban_username_explain'] = "You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";

$lang['Ban_IP'] = "Ban one or more IP addresses or hostnames";
$lang['IP_hostname'] = "IP addresses or hostnames";
$lang['Ban_IP_explain'] = "To specify several different IP's or hostnames separate them with commas. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *";

$lang['Ban_email'] = "Ban one or more email addresses";
$lang['Ban_email_explain'] = "To specify more than one email address separate them with commas. To specify a wildcard username use *, for example *@hotmail.com";

$lang['Unban_username'] = "Un-ban one more specific users";
$lang['Unban_username_explain'] = "You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser";

$lang['Unban_IP'] = "Un-ban one or more IP addresses";
$lang['Unban_IP_explain'] = "You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser";

$lang['Unban_email'] = "Un-ban one or more email addresses";
$lang['Unban_email_explain'] = "You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser";

$lang['No_banned_users'] = "No banned usernames";
$lang['No_banned_ip'] = "No banned IP addresses";
$lang['No_banned_email'] = "No banned email addresses";

$lang['Ban_update_sucessful'] = "The banlist has been updated successfully";
$lang['Click_return_banadmin'] = "Click %sHere%s to return to Ban Control";


//
// Configuration
//
$lang['General_Config'] = "General Configuration";
$lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.";

$lang['Click_return_config'] = "Click %sHere%s to return to General Configuration";

$lang['General_settings'] = "General Board Settings";
$lang['Site_name'] = "Site name";
$lang['Site_desc'] = "Site description";
$lang['Board_disable'] = "Disable board";
$lang['Board_disable_explain'] = "This will make the board unavailable to users. Do not logout when you disable the board, you will not be able to log back in!";
$lang['Acct_activation'] = "Enable account activation";
$lang['Acc_None'] = "None"; // These three entries are the type of activation
$lang['Acc_User'] = "User";
$lang['Acc_Admin'] = "Admin";

$lang['Abilities_settings'] = "User and Forum Basic Settings";
$lang['Max_poll_options'] = "Max number of poll options";
$lang['Flood_Interval'] = "Flood Interval";
$lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; 
$lang['Board_email_form'] = "User email via board";
$lang['Board_email_form_explain'] = "Users send email to each other via this board";
$lang['Topics_per_page'] = "Topics Per Page";
$lang['Posts_per_page'] = "Posts Per Page";
$lang['Hot_threshold'] = "Posts for Popular Threshold";
$lang['Default_style'] = "Default Style";
$lang['Override_style'] = "Override user style";
$lang['Override_style_explain'] = "Replaces users style with the default";
$lang['Default_language'] = "Default Language";
$lang['Date_format'] = "Date Format";
$lang['System_timezone'] = "System Timezone";
$lang['Enable_gzip'] = "Enable GZip Compression";
$lang['Enable_prune'] = "Enable Forum Pruning";
$lang['Allow_HTML'] = "Allow HTML";
$lang['Allow_BBCode'] = "Allow BBCode";
$lang['Allowed_tags'] = "Allowed HTML tags";
$lang['Allowed_tags_explain'] = "Separate tags with commas";
$lang['Allow_smilies'] = "Allow Smilies";
$lang['Smilies_path'] = "Smilies Storage Path";
$lang['Smilies_path_explain'] = "Path under your phpBB root dir, e.g. images/smilies";
$lang['Allow_sig'] = "Allow Signatures";
$lang['Max_sig_length'] = "Maximum signature length";
$lang['Max_sig_length_explain'] = "Maximum number of characters in user signatures";
$lang['Allow_name_change'] = "Allow Username changes";

$lang['Avatar_settings'] = "Avatar Settings";
$lang['Allow_local'] = "Enable gallery avatars";
$lang['Allow_remote'] = "Enable remote avatars";
$lang['Allow_remote_explain'] = "Avatars linked to from another website";
$lang['Allow_upload'] = "Enable avatar uploading";
$lang['Max_filesize'] = "Maximum Avatar File Size";
$lang['Max_filesize_explain'] = "For uploaded avatar files";
$lang['Max_avatar_size'] = "Maximum Avatar Dimensions";
$lang['Max_avatar_size_explain'] = "(Height x Width in pixels)";
$lang['Avatar_storage_path'] = "Avatar Storage Path";
$lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars";
$lang['Avatar_gallery_path'] = "Avatar Gallery Path";
$lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery";

$lang['COPPA_settings'] = "COPPA Settings";
$lang['COPPA_fax'] = "COPPA Fax Number";
$lang['COPPA_mail'] = "COPPA Mailing Address";
$lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms";

$lang['Email_settings'] = "Email Settings";
$lang['Admin_email'] = "Admin Email Address";
$lang['Email_sig'] = "Email Signature";
$lang['Email_sig_explain'] = "This text will be attached to all emails the board sends";
$lang['Use_SMTP'] = "Use SMTP Server for email";
$lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a named server instead of the local mail function";
$lang['SMTP_server'] = "SMTP Server Address";

$lang['Disable_privmsg'] = "Private Messaging";
$lang['Inbox_limits'] = "Max posts in Inbox";
$lang['Sentbox_limits'] = "Max posts in Sentbox";
$lang['Savebox_limits'] = "Max posts in Savebox";

$lang['Cookie_settings'] = "Cookie settings"; 
$lang['Cookie_settings_explain'] = "These control how the cookie sent to browsers is defined. In most cases the default should be sufficient. If you need to change these do so with care, incorrect settings can prevent users logging in.";
$lang['Cookie_name'] = "Cookie name";
$lang['Cookie_domain'] = "Cookie domain";
$lang['Cookie_path'] = "Cookie path";
$lang['Session_length'] = "Session length [ seconds ]";
$lang['Cookie_secure'] = "Cookie secure [ https ]";


//
// Forum Management
//
$lang['Forum_admin'] = "Forum Administration";
$lang['Forum_admin_explain'] = "From this panel you can add, delete, edit, re-order and re-synchronise categories and forums";
$lang['Edit_forum'] = "Edit forum";
$lang['Create_forum'] = "Create new forum";
$lang['Create_category'] = "Create new category";
$lang['Remove'] = "Remove";
$lang['Action'] = "Action";
$lang['Update_order'] = "Update Order";
$lang['Config_updated'] = "Forum Configuration Updated Successfully";
$lang['Edit'] = "Edit";
$lang['Delete'] = "Delete";
$lang['Move_up'] = "Move up";
$lang['Move_down'] = "Move down";
$lang['Resync'] = "Resync";
$lang['No_mode'] = "No mode was set";
$lang['Forum_edit_delete_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side";

$lang['Move_contents'] = "Move all contents";
$lang['Forum_delete'] = "Delete Forum";
$lang['Forum_delete_explain'] = "The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.";

$lang['Forum_settings'] = "General Forum Settings";
$lang['Forum_name'] = "Forum name";
$lang['Forum_desc'] = "Description";
$lang['Forum_status'] = "Forum status";
$lang['Forum_pruning'] = "Auto-pruning";

$lang['prune_freq'] = 'Check for topic age every';
$lang['prune_days'] = "Remove topics that have not been posted to in";
$lang['Set_prune_data'] = "You have turned on auto-prune for this forum but did not set a frequency or number of days to prune. Please go back and do so";

$lang['Move_and_Delete'] = "Move and Delete";

$lang['Delete_all_posts'] = "Delete all posts";
$lang['Nowhere_to_move'] = "Nowhere to move too";

$lang['Edit_Category'] = "Edit Category";
$lang['Edit_Category_explain'] = "Use this form to modify a categories name.";

$lang['Forums_updated'] = "Forum and Category information updated successfully";

$lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category";

$lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration";


//
// Smiley Management
//
$lang['smiley_title'] = "Smiles Editing Utility";
$lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages.";

$lang['smiley_config'] = "Smiley Configuration";
$lang['smiley_code'] = "Smiley Code";
$lang['smiley_url'] = "Smiley Image File";
$lang['smiley_emot'] = "Smiley Emotion";
$lang['smile_add'] = "Add a new Smiley";
$lang['Smile'] = "Smile";
$lang['Emotion'] = "Emotion";

$lang['Select_pak'] = "Select Pack (.pak) File";
$lang['replace_existing'] = "Replace Existing Smiley";
$lang['keep_existing'] = "Keep Existing Smiley";
$lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the appropriate Smiley directory for your installation.  Then select the correct information in this form to import the smiley pack.";
$lang['smiley_import'] = "Smiley Pack Import";
$lang['choose_smile_pak'] = "Choose a Smile Pack .pak file";
$lang['import'] = "Import Smileys";
$lang['smile_conflicts'] = "What should be done in case of conflicts";
$lang['del_existing_smileys'] = "Delete existing smileys before import";
$lang['import_smile_pack'] = "Import Smiley Pack";
$lang['export_smile_pack'] = "Create Smiley Pack";
$lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, click %sHere%s to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension.  Then create a zip file containing all of your smiley images plus this .pak configuration file.";

$lang['smiley_add_success'] = "The Smiley was successfully added";
$lang['smiley_edit_success'] = "The Smiley was successfully updated";
$lang['smiley_import_success'] = "The Smiley Pack was imported successfully!";
$lang['smiley_del_success'] = "The Smiley was successfully removed";
$lang['Click_return_smileadmin'] = "Click %sHere%s to return to Smiley Administration";


//
// User Management
//
$lang['User_admin'] = "User Administration";
$lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system.";

$lang['Look_up_user'] = "Look up user";

$lang['Admin_user_fail'] = "Couldn't update the users profile.";
$lang['Admin_user_updated'] = "The user's profile was successfully updated.";
$lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration";

$lang['User_delete'] = "Delete this user";
$lang['User_delete_explain'] = "Click here to delete this user, this cannot be undone.";
$lang['User_deleted'] = "User was successfully deleted.";

$lang['User_status'] = "User is active";
$lang['User_allowpm'] = "Can send Private Messages";
$lang['User_allowavatar'] = "Can display avatar";

$lang['Admin_avatar_explain'] = "Here you can see and delete the user's current avatar.";

$lang['User_special'] = "Special admin-only fields";
$lang['User_special_explain'] = "These fields are not able to be modified by the users.  Here you can set their status and other options that are not given to users.";


//
// Group Management
//
$lang['Group_administration'] = "Group Administration";
$lang['Group_admin_explain'] = "From this panel you can administer all your usergroups, you can; delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description";
$lang['Error_updating_groups'] = "There was an error while updating the groups";
$lang['Updated_group'] = "The group was successfully updated";
$lang['Added_new_group'] = "The new group was successfully created";
$lang['Deleted_group'] = "The group was successfully deleted";
$lang['New_group'] = "Create new group";
$lang['Edit_group'] = "Edit group";
$lang['group_name'] = "Group name";
$lang['group_description'] = "Group description";
$lang['group_moderator'] = "Group moderator";
$lang['group_status'] = "Group status";
$lang['group_open'] = "Open group";
$lang['group_closed'] = "Closed group";
$lang['group_hidden'] = "Hidden group";
$lang['group_delete'] = "Delete group";
$lang['group_delete_check'] = "Delete this group";
$lang['submit_group_changes'] = "Submit Changes";
$lang['reset_group_changes'] = "Reset Changes";
$lang['No_group_name'] = "You must specify a name for this group";
$lang['No_group_moderator'] = "You must specify a moderator for this group";
$lang['No_group_mode'] = "You must specify a mode for this group, open or closed";
$lang['delete_group_moderator'] = "Delete the old group moderator?";
$lang['delete_moderator_explain'] = "If you're changing the group moderator, check this box to remove the old moderator from the group.  Otherwise, do not check it, and the user will become a regular member of the group.";
$lang['Click_return_groupsadmin'] = "Click %sHere%s to return to Group Administration.";
$lang['Select_group'] = "Select a group";
$lang['Look_up_group'] = "Look up group";


//
// Prune Administration
//
$lang['Forum_Prune'] = "Forum Prune";
$lang['Forum_Prune_explain'] = "This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove these topics manually.";
$lang['Do_Prune'] = "Do Prune";
$lang['All_Forums'] = "All Forums";
$lang['Prune_topics_not_posted'] = "Prune topics with no replies in this many days";
$lang['Topics_pruned'] = "Topics pruned";
$lang['Posts_pruned'] = "Posts pruned";
$lang['Prune_success'] = "Pruning of forums was successful";


//
// Word censor
//
$lang['Words_title'] = "Word Censoring";
$lang['Words_explain'] = "From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, eg. *test* will match detestable, test* would match testing, *test would match detest.";
$lang['Word'] = "Word";
$lang['Edit_word_censor'] = "Edit word censor";
$lang['Replacement'] = "Replacement";
$lang['Add_new_word'] = "Add new word";
$lang['Update_word'] = "Update word censor";

$lang['Must_enter_word'] = "You must enter a word and its replacement";
$lang['No_word_selected'] = "No word selected for editing";

$lang['Word_updated'] = "The selected word censor has been successfully updated";
$lang['Word_added'] = "The word censor has been successfully added";
$lang['Word_removed'] = "The selected word censor has been successfully removed";

$lang['Click_return_wordadmin'] = "Click %sHere%s to return to Word Censor Administration";


//
// Mass Email
//
$lang['Mass_email_explain'] = "Here you can email a message to either all of your users, or all users of a specific group.  To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for amass emailing to take a long time, you will be notified when the script has completed";
$lang['Compose'] = "Compose"; 

$lang['Recipients'] = "Recipients"; 
$lang['All_users'] = "All Users";

$lang['Email_successfull'] = "Your message has been sent";
$lang['Click_return_massemail'] = "Click %sHere%s to return to the Mass Email form";


//
// Ranks admin
//
$lang['Ranks_title'] = "Rank Administration";
$lang['Ranks_explain'] = "Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility";

$lang['Add_new_rank'] = "Add new rank";

$lang['Rank_title'] = "Rank Title";
$lang['Rank_special'] = "Set as Special Rank";
$lang['Rank_minimum'] = "Minimum Posts";
$lang['Rank_maximum'] = "Maximum Posts";
$lang['Rank_image'] = "Rank Image (Relative to phpBB2 root path)";
$lang['Rank_image_explain'] = "Use this to define a small image associated with the rank";

$lang['Must_select_rank'] = "You must select a rank";
$lang['No_assigned_rank'] = "No special rank assigned";

$lang['Rank_updated'] = "The rank was successfully updated";
$lang['Rank_added'] = "The rank was successfully added";
$lang['Rank_removed'] = "The rank was successfully deleted";

$lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration";


//
// Disallow Username Admin
//
$lang['Disallow_control'] = "Username Disallow Control";
$lang['Disallow_explain'] = "Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of *.  Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it";

$lang['Delete_disallow'] = "Delete";
$lang['Delete_disallow_title'] = "Remove a Disallowed Username";
$lang['Delete_disallow_explain'] = "You can remove a disallowed username by selecting the username from this list and clicking submit";

$lang['Add_disallow'] = "Add";
$lang['Add_disallow_title'] = "Add a disallowed username";
$lang['Add_disallow_explain'] = "You can disallow a username using the wildcard character * to match any character";

$lang['No_disallowed'] = "No Disallowed Usernames";

$lang['Disallowed_deleted'] = "The disallowed username has been successfully removed";
$lang['Disallow_successful'] = "The disallowed username has been successfully added";
$lang['Disallowed_already'] = "The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present";

$lang['Click_return_disallowadmin'] = "Click %sHere%s to return to Disallow Username Administration";


//
// Styles Admin
//
$lang['Styles_admin'] = "Styles Administration";
$lang['Styles_explain'] = "Using this facility you can add, remove and manage styles (templates and themes) available to your users";
$lang['Styles_addnew_explain'] = "The following list contains all the themes that are available for the templates you currently have. The items on this list have not yet been installed into the phpBB database. To install a theme simply click the install link beside an entry";

$lang['Select_template'] = "Select a Template";

$lang['Style'] = "Style";
$lang['Template'] = "Template";
$lang['Install'] = "Install";
$lang['Download'] = "Download";

$lang['Edit_theme'] = "Edit Theme";
$lang['Edit_theme_explain'] = "In the form below you can edit the settings for the selected theme";

$lang['Create_theme'] = "Create Theme";
$lang['Create_theme_explain'] = "Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, i.e.. CCCCCC is valid, #CCCCCC is not";

$lang['Export_themes'] = "Export Themes";
$lang['Export_explain'] = "In this panel you will be able to export the theme data for a selected template. Select the template from the list below and the script will create the theme configuration file and attempt to save it to the selected template directory. If it cannot save the file itself it will give you the option to download it. In order for the script to save the file you must give write access to the webserver for the selected template dir. For more information on this see the phpBB 2 users guide.";

$lang['Theme_installed'] = "The selected theme has been installed successfully";
$lang['Style_removed'] = "The selected style has been removed from the database. To fully remove this style from your system you must delete the appropriate style from your templates directory.";
$lang['Theme_info_saved'] = "The theme information for the selected template has been saved. You should now return the permissions on the theme_info.cfg (and if applicable the selected template directory) to read-only";
$lang['Theme_updated'] = "The selected theme has been updated. You should now export the new theme settings";
$lang['Theme_created'] = "Theme created. You should now export the theme to the theme configuration file for safe keeping or use elsewhere";

$lang['Confirm_delete_style'] = "Are you sure you want to delete this style";

$lang['Download_theme_cfg'] = "The exporter could not write the theme information file. Click the button below to download this file with your browser. Once you have downloaded it you can transfer it to the directory containing the template files. You can then package the files for distribution or use elsewhere if you desire";
$lang['No_themes'] = "The template you selected has no themes attached to it. To create a new theme click the Create New link on the left hand panel";
$lang['No_template_dir'] = "Could not open the template directory. It may be unreadable by the webserver or may not exist";
$lang['Cannot_remove_style'] = "You cannot remove the style selected since it is currently the forum default. Please change the default style and try again.";
$lang['Style_exists'] = "The style name to selected already exists, please go back and choose a different name.";

$lang['Click_return_styleadmin'] = "Click %sHere%s to return to Style Administration";

$lang['Theme_settings'] = "Theme Settings";
$lang['Theme_element'] = "Theme Element";
$lang['Simple_name'] = "Simple Name";
$lang['Value'] = "Value";
$lang['Save_Settings'] = "Save Settings";

$lang['Stylesheet'] = "CSS Stylesheet";
$lang['Background_image'] = "Background Image";
$lang['Background_color'] = "Background Colour";
$lang['Theme_name'] = "Theme Name";
$lang['Link_color'] = "Link Colour";
$lang['Text_color'] = "Text Colour";
$lang['VLink_color'] = "Visited Link Colour";
$lang['ALink_color'] = "Active Link Colour";
$lang['HLink_color'] = "Hover Link Colour";
$lang['Tr_color1'] = "Table Row Colour 1";
$lang['Tr_color2'] = "Table Row Colour 2";
$lang['Tr_color3'] = "Table Row Colour 3";
$lang['Tr_class1'] = "Table Row Class 1";
$lang['Tr_class2'] = "Table Row Class 2";
$lang['Tr_class3'] = "Table Row Class 3";
$lang['Th_color1'] = "Table Header Colour 1";
$lang['Th_color2'] = "Table Header Colour 2";
$lang['Th_color3'] = "Table Header Colour 3";
$lang['Th_class1'] = "Table Header Class 1";
$lang['Th_class2'] = "Table Header Class 2";
$lang['Th_class3'] = "Table Header Class 3";
$lang['Td_color1'] = "Table Cell Colour 1";
$lang['Td_color2'] = "Table Cell Colour 2";
$lang['Td_color3'] = "Table Cell Colour 3";
$lang['Td_class1'] = "Table Cell Class 1";
$lang['Td_class2'] = "Table Cell Class 2";
$lang['Td_class3'] = "Table Cell Class 3";
$lang['fontface1'] = "Font Face 1";
$lang['fontface2'] = "Font Face 2";
$lang['fontface3'] = "Font Face 3";
$lang['fontsize1'] = "Font Size 1";
$lang['fontsize2'] = "Font Size 2";
$lang['fontsize3'] = "Font Size 3";
$lang['fontcolor1'] = "Font Colour 1";
$lang['fontcolor2'] = "Font Colour 2";
$lang['fontcolor3'] = "Font Colour 3";
$lang['span_class1'] = "Span Class 1";
$lang['span_class2'] = "Span Class 2";
$lang['span_class3'] = "Span Class 3";
$lang['img_poll_size'] = "Polling Image Size [px]";
$lang['img_pm_size'] = "Private Message Status size [px]";


//
// Install Process
//
$lang['Welcome_install'] = "ãÑÍÈÇ Èß Ýí ÊÑßíÈ ãäÊÏì phpBB 2";
$lang['Initial_config'] = "ÊÑßíÈ ÇÓÇÓí";
$lang['DB_config'] = "ÇÚÏÇÏÇÊ ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['Admin_config'] = "ÇÚÏÇÏÇÊ ÇáãÏíÑ";
$lang['continue_upgrade'] = "ÝæÑ ÇäÊåÇÁ ÓÍÈ ãáÝ ÇáÇÚÏÇÏ Çáì ÌåÇÒß ÇÖÛØ Úáì ÒÑ\"ÇÓÊãÑ ÇáÊÍÏíË\" Ýí ÇáÇÓÝá áÇÓÊßãÇá ÇáÊÑßíÈ.  ÇáÑÌÇÁ ÇäÊÙÇÑ ÇäÊåÇÁ ÇáÊÑßíÈ áßí ÊäÞá ãáÝ ÇáÇÚÏÇÏ Çáì ÇáÌåÇÒ ÇáÑÆíÓí.";
$lang['upgrade_submit'] = "ÇÓÊãÑ Ýí ÇáÇÚÏÇÏ";

$lang['Installer_Error'] = "ÍÏË ÎØà ãÇ ÇËäÇÁ ÇáÊÑßíÈ";
$lang['Previous_Install'] = "åäÇß ÊÑßíÈ ãÓÈÞ ááãäÊÏì";
$lang['Install_db_error'] = "ÍÏË ÎØà ÇËäÇÁ ÇÚÏÇÏ ÞÇÚÏÉ ÇáÈíÇäÇÊ";

$lang['Re_install'] = "ÇáÇÚÏÇÏ ÇáÓÇÈÞ ãÇÒÇá ÝÚÇá. <br /><br />Çä ßäÊ ÊÑíÏ ÇÚÇÏÉ ÊÑßíÈ phpBB 2 Úáíß ÇáÖÛØ Úáì ÒÑ äÚã Yes Ýí ÇáÇÓÝá. ÇäÊÈå ÝÅä åÐÇ ÓæÝ íÖíÚ ÌãíÚ ÇáÈíÇäÇÊ ÇáÓÇÈÞÉ, áä íÊã ÍÝÙ äÓÎÉ ÇÍÊíÇØíÉ! ÇÓã æßáãÉ ÓÑ ÇáãÏíÑ ÓíÊã ÇÚÇÏÉ ÊßæíäåãÇ Úä ÇáÇäÊåÇÁ ãä ÇáÊÑßíÈ, ÌãíÚ ÇáÇÚÏÇÏÇÊ ÇáÓÇÈÞÉ ÓæÝ ÊáÛì. <br /><br />ÝßÑ ÈÊãÚä ÞÈá ÇáÖÛØ Úáì ÇáÒÑ äÚã Yes!";

$lang['Inst_Step_0'] = "äÔßÑß áÇÎÊíÇÑß ÇáãäÊÏì phpBB 2. áÇßãÇá ÇáÊÑßíÈ ÇáÑÌÇÁ ÇßãÇá ãáÁ ÇáãÑÈÚÇÊ ÇáÊÇáíÉ. ÇäÊÈå Çä ÞÇÚÏÉ ÇáÈíÇäÇÊ ÇáÊí ÓæÝ ÊäÔà ÈåÇ ÇáÌÏÇæá íÌÈ Çä Êßæä ãæÌæÏÉ. ÇÐÇ ßäÊ ÊÍãá ÇáÈÑäÇãÌ ÈÇÓÊÚãÇá ÞÇÚÏÉ ÈíÇäÇÊ ÊÓÊÚãá äÙÇã ODBC, ãËá MS Access Úáíß ÊÚÑíÝ ÇáÜ DSN áåÇ ÞÈá ÇáÈÏÁ ÈÇáÊÑßíÈ.";

$lang['Start_Install'] = "ÇÈÏà ÈÇáÊÑßíÈ";
$lang['Finish_Install'] = "Çßãá ÇáÊÑßíÈ";

$lang['Default_lang'] = "áÛÉ ÇáãäÊÏì ÇáÇÓÇÓíÉ";
$lang['DB_Host'] = "ÇÓã ÇáÌåÇÒ ÇáÐí íÍæí ÞÇÚÏÉ ÇáÈíÇäÇÊ / DSN";
$lang['DB_Name'] = "ÇÓã ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['DB_Username'] = "ÇÓã ãÓÊÎÏã ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['DB_Password'] = "ßáãÉ ÓÑ ãÓÊÎÏã ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['Database'] = "ÞÇÚÏÉ ÈíÇäÇÊß";
$lang['Install_lang'] = "ÇÎÊÑ áÛÉ ÇáÊÑßíÈ";
$lang['dbms'] = "äæÚ ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['Table_Prefix'] = "ÇáßáãÉ ÇáãÓÈÞÉ ááÌÏÇæá Ýí ÞÇÚÏÉ ÇáÈíÇäÇÊ";
$lang['Admin_Username'] = "ÇÓã ÇáãÏíÑ";
$lang['Admin_Password'] = "ßáãÉ ÓÑ ÇáãÏíÑ";
$lang['Admin_Password_confirm'] = "ßáãÉ ÓÑ ÇáãÏíÑ [ ááÊÃßíÏ ]";

$lang['Inst_Step_2'] = "Êã Êßæíä ÇÓã ÇáãÏíÑ.  Ýí åÐå ÇááÍÙÉ ÞÏ Êã ÇäÌÇÒ ÇáÊÑßíÈ ÇáÇÓÇÓí. ÓíÊã ÇáÇäÊÞÇá Çáì ÇáÔÇÔÉ ÇáÊÇáíÉ áÇßãÇá ÇÚÏÇÏ ÇáãäÊÏì. ÇáÑÌÇÁ ÇáÊÃßÏ ãä ÇáÇÚÏÇÏÇÊ ÇáÚÇãÉ. äÔßÑß áÇÎÊíÇÑ ÇáãäÊÏì phpBB 2.";

$lang['Unwriteable_config'] = "áã ÇÊãßä ãä ßÊÇÈÉ ãáÝ ÇáÇÚÏÇÏ. äÓÎÉ ãä ãáÝ ÇáÇÚÏÇÏ ÓíÊã äÞáåÇ áß Úä ÇáÖÛØ Úáì ÇáÒÑ Ýí ÇáÇÓÝá. Úáíß äÞá ÇáãáÝ Çáì ãßÇä æÌæÏ ÇáãäÊÏì. ÚäÏãÇ ÊäÞá ÇáãáÝ ÇÏÎá ÇáãäÊÏì ÈÇÓã ÇáãÏíÑ æßáãÉ ÇáÓÑ ÇáÊí Êã ÊÍÏíÏåÇ Ýí ÇáÕÝÍÉ ÇáÓÇÈÞÉ æÇäÊÞá Çáì áæÍÉ ÇáÊÍßã (ÊÓÊØíÚ ÇáÇäÊÞÇá Çáì áæÍÉ ÇáÊÍßã ÈÇáÖÛØ Úáì ÇáæÕáÉ Ýí ÇÓÝá ÇáÕÝÍÉ ãä ÇáãäÊÏì ÇáÑÆíÓí)  ááÊÏÞíÞ Úáì ÇáÇÚÏÇÏÇÊ ÇáÚÇãÉ. äÔßÑß áÇÎÊíÇÑ ÇáãäÊÏì phpBB 2.";
$lang['Download_config'] = "ÇÓÍÈ ãáÝ ÇáÇÚÏÇÏ";

$lang['ftp_choose'] = "ÇÎÊÑ ØÑíÞÉ ÓÍÈ ÇáãáÝ";
$lang['ftp_option'] = "<br />ÍíË Çä ÊãÏíÏÇÊ ÇáÜ FTP ãÔÛáÉ Ýí åÐå ÇáäÓÎÉ ãä ÇáÜ PHP ÊÓÊØíÚ ÊÌÑÈÉ ÇãßÇäíÉ ÇÑÓÇá ãáÝ ÇáÇÚÏÇÏ ÂáíÇ Çáì ãæÞÚ ÇáãäÊÏì Ýí ÇáÌåÇÒ.";
$lang['ftp_instructs'] = "áÞÏ ÇÎÊÑÊ äÞá ãáÝ ÇáÇÚÏÇÏ áÜ phpBB 2 ÂáíÇ.  ÇáÑÌÇÁ ÇÏÎÇá ÇáãÚáæãÇÊ ÇáÊÇáíÉ áÊãßíä Ðáß. áÇÍÙ Çä ãßÇä ÇáäÞá ááÜ FTP íÌÈ Çä íßæä ÇáÏáíá ÇáÕÍíÍ áãßÇä ÊÑßíÈ ÇáãäÊÏì phpBB2 ßÃäß ÊÞæã ÈÚãáíÉ ÇáäÞá íÏæíÇ.";
$lang['ftp_info'] = "ÇÏÎá ãÚáæãÇÊ ÇáÜ FTP";
$lang['Attempt_ftp'] = "ÍÇæá äÞá ãáÝ ÇáÇÚÏÇÏ Çáì ÇáãßÇä ÇáÕÍíÍ";
$lang['Send_file'] = "ÇÈÚË ãáÝ ÇáÇÚÏÇÏ Çáí æÓÃÞæã ÃäÇ ÈÇÑÓÇáå Çáì ÇáãßÇä ÇáÕÍíÍ";
$lang['ftp_path'] = "ãßÇä ÇáÜ FTP Çáì phpBB 2";
$lang['ftp_username'] = "ÇÓã ÇáãÊÓÎÏã ááÜ FTP";
$lang['ftp_password'] = "ßáãÉ ÇáÓÑ ááÜ FTP";
$lang['Transfer_config'] = "ÇÈÏÃ ÇáäÞá";
$lang['NoFTP_config'] = "áÞÏ ÝÔáÊ ãÍÇæáÉ äÞá ãáÝ ÇáÇÚÏÇÏ Çáì ãæÞÚ ÇáãäÊÏì.  
ÇáÑÌÇÁ ÓÍÈ ãáÝ ÇáÇÚÏÇÏ æÇÑÓÇáå Çáì ãßÇäå ÇáÕÍíÍ íÏæíÇ.";

$lang['Install'] = "ÊÑßíÈ ÌÏíÏ"
$lang['Upgrade'] = "ÊÍÏíË";


$lang['Install_Method'] = "ÇÎÊÑ ØÑíÞÉ ÊÑßíÈ ÇáãäÊÏì";

//
// That's all Folks!
// -------------------------------------------------

?>
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_arabic/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_main.php	2002/01/28 12:42:41	1.3
--- lang_main.php	2002/01/30 01:58:33	1.4
***************
*** 113,116 ****
--- 113,117 ----
  //
  $lang['Registered_users'] = "ãÔÊÑßíä ãÓÌáíä:";
+ $lang['Browsing_forum'] = "ÚÏÏ ãÊÕÝÍíä ÇáãäÊÏì:";
  $lang['Online_users_zero_total'] = "ßßá åäÇß <b>0</b> ãÓÊÎÏã Úáì ÇáÎØ :: ";
  $lang['Online_users_total'] = "ßßá åäÇß <b>%d</b> ãÓÊÎÏãíä Úáì ÇáÎØ :: ";
***************
*** 238,242 ****
  // Viewtopic
  //
! $lang['View_topic'] = "View topic";
  
  $lang['Guest'] = "ÒÇÆÑ";
--- 239,243 ----
  // Viewtopic
  //
! $lang['View_topic'] = "ÇØáÚ Úáì ÇáãæÖæÚ";
  
  $lang['Guest'] = "ÒÇÆÑ";
***************
*** 387,391 ****
  $lang['color_blue'] = "ÇÒÑÞ";
  $lang['color_dark_blue'] = "ÇÒÑÞ ÞÇÊã";
! $lang['color_indigo'] = "Indigo";
  $lang['color_violet'] = "ÈäÝÓÌí";
  $lang['color_white'] = "ÇÈíÖ";
--- 388,392 ----
  $lang['color_blue'] = "ÇÒÑÞ";
  $lang['color_dark_blue'] = "ÇÒÑÞ ÞÇÊã";
! $lang['color_indigo'] = "äíáí";
  $lang['color_violet'] = "ÈäÝÓÌí";
  $lang['color_white'] = "ÇÈíÖ";
***************
*** 447,450 ****
--- 448,455 ----
  $lang['No_such_user'] = "äÃÓÝ áßä áÇ íæÌÏ ãÔÊÑß ÈåÐÇ ÇáÇÓã";
  
+ $lang['Disable_HTML_pm'] = "ÚØá HTML Ýí åÐå ÇáÑÓÇáÉ";
+ $lang['Disable_BBCode_pm'] = "ÚØá BBCode Ýí åÐå ÇáÑÓÇáÉ";
+ $lang['Disable_Smilies_pm'] = "ÚØá Smilies Ýí åÐå ÇáÑÓÇáÉ";
+ 
  $lang['Message_sent'] = "áÞÏ ÇÑÓáÊ ÑÓÇáÊß";
  
***************
*** 512,516 ****
  $lang['No_user_id_specified'] = "äÃÓÝ áßä åÐÇ ÇáãÔÊÑß ÛíÑ ãæÌæÏ";
  $lang['Wrong_Profile'] = "áÇ ÊÓÊØíÚ ÊÚÏíá ÇáäÈÐÉ ÇáÔÎÕíÉ æÇáÊí áíÓÊ áß.";
! $lang['Sorry_banned_or_taken_email'] = "äÃÓÝ áßä ÇáÈÑíÏ ÇáÇáßÊÑæäí ÇáãÐßæÑ ÇãÇ ÞÏ Êã ãäÚå, Ãæ ÞÏ ÇÚØí áãÔÊÑß ÂÎÑ Ãæ ÛíÑ ÕÍíÍ. ÇáÑÌÇÁ ÇÚØÇÁ ÈÑíÏ ÂÎÑ, Çä ßÇä åæ ÇáÂÎÑ ããäæÚ ÝÊÓÊØíÚ ÇáÇÊÕÇá ÈãÏíÑ ÇáãæÞÚ";
  $lang['Only_one_avatar'] = "íÓãÍ ÈÊÍÏíÏ ÔÎÕíÉ æÇÍÏÉ ÝÞØ";
  $lang['File_no_data'] = "ÇáãáÝ ÇáãÓÌá ÚÈÑ ÚäæÇä ÇáÇäÊÑäÊ áÇ íÍÊæí Úáì ÔíÁ";
--- 517,521 ----
  $lang['No_user_id_specified'] = "äÃÓÝ áßä åÐÇ ÇáãÔÊÑß ÛíÑ ãæÌæÏ";
  $lang['Wrong_Profile'] = "áÇ ÊÓÊØíÚ ÊÚÏíá ÇáäÈÐÉ ÇáÔÎÕíÉ æÇáÊí áíÓÊ áß.";
! 
  $lang['Only_one_avatar'] = "íÓãÍ ÈÊÍÏíÏ ÔÎÕíÉ æÇÍÏÉ ÝÞØ";
  $lang['File_no_data'] = "ÇáãáÝ ÇáãÓÌá ÚÈÑ ÚäæÇä ÇáÇäÊÑäÊ áÇ íÍÊæí Úáì ÔíÁ";
***************
*** 540,543 ****
--- 545,549 ----
  $lang['New_password'] = "ßáãÉ ÇáÓÑ ÇáÌÏíÏÉ";
  $lang['Confirm_password'] = "ÊÃßíÏ ßáãÉ ÇáÓÑ";
+ $lang['Confirm_password_explain'] = "Úáíß ÊÃßíÏ ßáãÉ ÇáÓÑ ÇáÍÇáíÉ ÅÐÇ ßäÊ ÊÑíÏ ÊÛííÑ ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí";
  $lang['password_if_changed'] = "ÇÐÇ ÇÑÏÊ ÇáÊÛííÑ Úáíß ÝÞØ ÊÒæíÏäÇ ÈßáãÉ ÇáÓÑ";
  $lang['password_confirm_if_changed'] = "Úáíß ÊÒæíÏäÇ ÈÊÃßíÏ áßãÉ ÇáÓÑ ÇÐÇ Êã ÊÛííÑåÇ Ýí ÇáÇÚáì";
***************
*** 545,550 ****
  $lang['Avatar'] = "ÔÎÕíÉ";
  $lang['Avatar_explain'] = "ÊÙåÑ ÕæÑÉ ãÇ ÇÓÝá ÇÓãß Ýí ÇáäÔÑÉ. íãßä ÇÙåÇÑ ÕæÑÉ æÇÍÏÉ ááãÔÊÑß, ÚÑÖåÇ áÇ íÒíÏ Úä %d äÞØÉ, æÇÑÊÝÇÚåÇ áÇ íÒíÏ Úä %d äÞØÉ æÍÌã ÇáãáÝ áÇ íÒíÏ Úä %dkB."; 
! $lang['Upload_Avatar_file'] = "ÇÑÓá ÇáÕæÑÉ ãä ÌåÇÒß";
! $lang['Upload_Avatar_URL'] = "ÇÓÍÈ ÕæÑÉ ÇáÔÎÕíÉ ãä ÇáãæÞÚ";
  $lang['Upload_Avatar_URL_explain'] = "ÇÏÎá ÚäæÇä ÇáÇäÊÑäÊ ááÍÕæá Úáì ÇáÕæÑÉ ãäåÇ, ÓæÝ íÊã ÊÎÒíäåÇ Ýí åÐÇ ÇáãæÞÚ.";
  $lang['Pick_local_Avatar'] = "ÇÎÊÑ ÇáÔÎÕíÉ ãä ãßÊÈÉ ÇáÕæÑ";
--- 551,555 ----
  $lang['Avatar'] = "ÔÎÕíÉ";
  $lang['Avatar_explain'] = "ÊÙåÑ ÕæÑÉ ãÇ ÇÓÝá ÇÓãß Ýí ÇáäÔÑÉ. íãßä ÇÙåÇÑ ÕæÑÉ æÇÍÏÉ ááãÔÊÑß, ÚÑÖåÇ áÇ íÒíÏ Úä %d äÞØÉ, æÇÑÊÝÇÚåÇ áÇ íÒíÏ Úä %d äÞØÉ æÍÌã ÇáãáÝ áÇ íÒíÏ Úä %dkB."; 
! $lang['Upload_Avatar_URL'] = "ÇÑÓá ÇáÕæÑÉ ãä ÚäæÇä ÇäÊÑäÊ";
  $lang['Upload_Avatar_URL_explain'] = "ÇÏÎá ÚäæÇä ÇáÇäÊÑäÊ ááÍÕæá Úáì ÇáÕæÑÉ ãäåÇ, ÓæÝ íÊã ÊÎÒíäåÇ Ýí åÐÇ ÇáãæÞÚ.";
  $lang['Pick_local_Avatar'] = "ÇÎÊÑ ÇáÔÎÕíÉ ãä ãßÊÈÉ ÇáÕæÑ";
***************
*** 572,576 ****
  $lang['Password_mismatch'] = "ßáãÇÊ ÇáÓÑ ÇáÊí Êã ÇÏÎÇáåÇ ÛíÑ ãÊØÇÈÞÉ";
  $lang['Current_password_mismatch'] = "ßáãÉ ÇáÓÑ ÇáãÚØÇÉ áÇ ÊØÇÈÞ Êáß ÇáãÎÒäÉ Ýí ÞÇÚÏÉ ÇáÈíÇäÇÊ";
! $lang['Invalid_username'] = "ÇÓã ÇáãÔÊÑß ÇáãÚØì ÇãÇ ãÃÎæÐ Ãæ ããäæÚ ãä ÇáÏÎæá, Ãæ íÍÊæí Úáì ÍÑæÝ ããäæÚÉ ãËá \"";
  $lang['Signature_too_long'] = "ÍÌã ÊæÞíÚß ßÈíÑ ÌÏÇ";
  $lang['Fields_empty'] = "Úáíß ãáÁ ÇáÍÞæá/ÇáãÑÈÚÇÊ ÇáÝÇÑÛÉ";
--- 577,587 ----
  $lang['Password_mismatch'] = "ßáãÇÊ ÇáÓÑ ÇáÊí Êã ÇÏÎÇáåÇ ÛíÑ ãÊØÇÈÞÉ";
  $lang['Current_password_mismatch'] = "ßáãÉ ÇáÓÑ ÇáãÚØÇÉ áÇ ÊØÇÈÞ Êáß ÇáãÎÒäÉ Ýí ÞÇÚÏÉ ÇáÈíÇäÇÊ";
! $lang['Password_long'] = "íÌÈ Çä Êßæä ßáãÉ ÇáÓÑ ÇÞá ãä 33 ÍÑÝ";
! $lang['Username_taken'] = "äÃÓÝ áßä åÐÇ ÇáÇÓã ãÃÎæÐ";
! $lang['Username_invalid'] = "äÃÓÝ áßä åÐÇ ÇáÇÓã íÍÊæì Úáì ÍÑÝ ÛíÑ ãÓãæÍ Èå ãËá \"";
! $lang['Username_disallowed'] = "äÃÓÝ áßä åÐÇ ÇáÇÓã ãä ÇáÇÓãÇÁ ÇáããäæÚÉ";
! $lang['Email_taken'] = "äÃÓÝ áßä ÇáÈÑíÏ ÇáÇáßÊÑæäí ãÓÌá áÔÎÕ ÂÎÑ";
! $lang['Email_banned'] = "äÃÓÝ áßä åÐÇ ÇáÈÑíÏ ÇáÇáßÊÑæäí ÞÏ ãäÚ ãÓÈÞÇ";
! $lang['Email_invalid'] = "äÃÓÝ áßä ÇáÈÑíÏ ÇáÇáßÊÑæäí ÎØÃ";
  $lang['Signature_too_long'] = "ÍÌã ÊæÞíÚß ßÈíÑ ÌÏÇ";
  $lang['Fields_empty'] = "Úáíß ãáÁ ÇáÍÞæá/ÇáãÑÈÚÇÊ ÇáÝÇÑÛÉ";

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.28,1.29

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv5042/language/lang_english

Modified Files:
	lang_admin.php 
Log Message:
Some additional error checking in the install to make sure that the server's php configuration is going to work with phpBB2.. (two new lines in lang_admin.php sorry translators, & please don't shoot me Paul :D )


Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** lang_admin.php	2002/01/28 02:44:26	1.28
--- lang_admin.php	2002/01/29 22:46:16	1.29
***************
*** 698,704 ****
  $lang['Install_Method'] = "Choose your installation method";
  
  //
  // That's all Folks!
  // -------------------------------------------------
  
! ?>
\ No newline at end of file
--- 698,708 ----
  $lang['Install_Method'] = "Choose your installation method";
  
+ $lang['Install_No_Ext'] = "The php configuration on your server doesn't support the database type that you choose";
+ 
+ $lang['Install_No_PCRE'] = "phpBB2 Requires the Perl-Compatible Regular Expressions Module for php which your php configuration doesn't appear to support!";
+ 
  //
  // That's all Folks!
  // -------------------------------------------------
  
! ?>

[Phpbb-checkins] CVS: phpBB2 install.php,1.30,1.31

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5042

Modified Files:
	install.php 
Log Message:
Some additional error checking in the install to make sure that the server's php configuration is going to work with phpBB2.. (two new lines in lang_admin.php sorry translators, & please don't shoot me Paul :D )


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** install.php	2002/01/28 02:36:14	1.30
--- install.php	2002/01/29 22:46:16	1.31
***************
*** 615,618 ****
--- 615,650 ----
  	else if( isset($dbms) )
  	{
+ 		switch( $dbms )
+ 		{
+ 			case 'msaccess':
+ 			case 'mssql-odbc':
+ 				$check_exts = 'odbc';
+ 				$check_other = 'odbc';
+ 				break;
+ 			case 'mssql':
+ 				$check_exts = 'mssql';
+ 				$check_other = 'sybase';
+ 				break;
+ 			case 'mysql':
+ 			case 'mysql4':
+ 				$check_exts = 'mysql';
+ 				$check_other = 'mysql';
+ 				break;
+ 			case 'postgres':
+ 				$check_exts = 'pgsql';
+ 				$check_other = 'pgsql';
+ 				break;
+ 		}
+ 		if( !extension_loaded( $check_exts ) && !extension_loaded( $check_other ) )
+ 		{	
+ 			$template->assign_block_vars("switch_error_install", array());
+ 
+ 			$template->assign_vars(array(
+ 				"L_ERROR_TITLE" => $lang['Installer_Error'],
+ 				"L_ERROR" => $lang['Install_No_Ext'])
+ 			);
+ 			$template->pparse('body');				
+ 			exit;
+ 		}
  		include($phpbb_root_path.'includes/db.'.$phpEx);
  	}

[Phpbb-checkins] CVS: phpBB2/admin admin_mass_email.php,1.11,1.12

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12751

Modified Files:
	admin_mass_email.php 
Log Message:
Hopefully some fixes for the mass email bugs on win32 Systems... We'll Know soon :D


Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** admin_mass_email.php	2002/01/24 02:51:00	1.11
--- admin_mass_email.php	2002/01/29 16:01:04	1.12
***************
*** 92,97 ****
  	{
  		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
  		$emailer = new emailer($board_config['smtp_delivery']);
! 
  		$email_headers = "From: " . $board_config['board_email'] . "\n";
  
--- 92,108 ----
  	{
  		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+ 		//
+ 		// Let's do some checking to make sure that mass mail functions
+ 		// are working in win32 versions of php.
+ 		//
+ 		if( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
+ 		{
+ 			// We are running on windows, force delivery to use
+ 			// our smtp functions since php's are broken by default
+ 			$board_config['smtp_delivery'] = 1;
+ 			$board_config['smtp_host'] = get_cfg_var('SMTP');
+ 		}
  		$emailer = new emailer($board_config['smtp_delivery']);
! 	
  		$email_headers = "From: " . $board_config['board_email'] . "\n";
  
***************
*** 182,184 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 193,195 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2 search.php,1.60,1.61

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv25883

Modified Files:
	search.php 
Log Message:
Fixed pagination bug on search results ( #509852 )

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** search.php	2002/01/27 02:24:05	1.60
--- search.php	2002/01/28 23:12:31	1.61
***************
*** 522,531 ****
  	// and run it ...
  	//
! 	if( !$total_match_count )
  	{
- 		message_die(GENERAL_MESSAGE, $lang['No_search_match']);
- 	}
- 	else if( $total_match_count )
- 	{
  		//
  		// Clean up search results table
--- 522,527 ----
  	// and run it ...
  	//
! 	if( $total_match_count )
  	{
  		//
  		// Clean up search results table
***************
*** 633,636 ****
--- 629,636 ----
  			header("Location: " . append_sid("search.$phpEx", true));
  		}
+ 	}
+ 	else
+ 	{
+ 		message_die(GENERAL_MESSAGE, $lang['No_search_match']);
  	}
  

[Phpbb-checkins] CVS: phpBB2/language/lang_hungarian lang_admin.php,1.2,1.3 lang_main.php,1.3,1.4

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/lang_hungarian
In directory usw-pr-cvs1:/tmp/cvs-serv2439/language/lang_hungarian

Modified Files:
	lang_admin.php lang_main.php 
Log Message:
Latest updates from mauzi

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/lang_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_admin.php	2002/01/23 19:09:34	1.2
--- lang_admin.php	2002/01/28 21:59:41	1.3
***************
*** 163,166 ****
--- 163,174 ----
  $lang['Hidden'] = "Rejtett";
  
+ // These are displayed in the drop down boxes for advanced
+ // mode forum auth, try and keep them short!
+ $lang['Forum_ALL'] = "MIND";
+ $lang['Forum_REG'] = "REG";
+ $lang['Forum_PRIVATE'] = "PRIVÁT";
+ $lang['Forum_MOD'] = "MOD";
+ $lang['Forum_ADMIN'] = "ADMIN";
+ 
  $lang['View'] = "Megtekintés";
  $lang['Read'] = "Olvasás";
***************
*** 522,527 ****
  $lang['Rank_image_explain'] = "Képet társíthat a ranghoz";
  
! $lang['Must_select_rank'] = "You must select a rank";
! $lang['No_assigned_rank'] = "No special rank assigned";
  
  $lang['Rank_updated'] = "Rang sikeresen frissítve";
--- 530,535 ----
  $lang['Rank_image_explain'] = "Képet társíthat a ranghoz";
  
! $lang['Must_select_rank'] = "Ki kell választania egy rangot";
! $lang['No_assigned_rank'] = "Nincs rang hozzárendelve";
  
  $lang['Rank_updated'] = "Rang sikeresen frissítve";

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_hungarian/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lang_main.php	2002/01/28 12:48:14	1.3
--- lang_main.php	2002/01/28 21:59:41	1.4
***************
*** 133,136 ****
--- 133,137 ----
  //
  $lang['Registered_users'] = "Regisztrált felhasználók:";
+ $lang['Browsing_forum'] = "A fórumot éppen böngészõ felhasználó:";
  $lang['Online_users_zero_total'] = "Összesen <b>0</b> felhasználó van online :: ";
  $lang['Online_users_total'] = "Összesen <b>%d</b> felhasználó van online - ";
***************
*** 145,148 ****
--- 146,150 ----
  $lang['Guest_users_total'] = "%d Vendég";
  $lang['Guest_user_total'] = "%d Vendég";
+ $lang['Record_online_users'] = "A legtöbb felhasználó egyszerre <b>%s</b> volt (%s)";
  
  $lang['Admin_online_color'] = "%sAdminisztrátor%s";
***************
*** 465,468 ****
--- 467,474 ----
  $lang['No_to_user'] = "Meg kell adnia a címzett felhasználó azonosítóját";
  $lang['No_such_user'] = "Pardon, ilyen felhasználó nem létezik";
+ 
+ $lang['Disable_HTML_pm'] = "HTML letiltása ebben az üzenetben";
+ $lang['Disable_BBCode_pm'] = "BBCode letiltása ebben az üzenetben";
+ $lang['Disable_Smilies_pm'] = "Emotikonok letiltása ebben az üzenetben";
  
  $lang['Message_sent'] = "Az üzenet elküldve.";

[Phpbb-checkins] CVS: phpBB2/includes smtp.php,1.7,1.8

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv1326

Modified Files:
	smtp.php 
Log Message:
This should fix bug #500134 and adds some additional error checking on smtp email sends...


Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** smtp.php	2002/01/28 21:03:25	1.7
--- smtp.php	2002/01/28 21:56:56	1.8
***************
*** 150,155 ****
  	while( list( , $mail_to_address ) = each( $mail_to_array ))
  	{
! 		fputs( $socket, "RCPT TO: $mail_to_address\r\n" );
! 		server_parse( $socket, "250" );
  		$to_header .= "<$mail_to_address>, ";
  	}
--- 150,162 ----
  	while( list( , $mail_to_address ) = each( $mail_to_array ))
  	{
! 		//
! 		// Add an additional bit of error checking to the To field.
! 		//
! 		$mail_to_address = trim($mail_to_address);
! 		if ( preg_match('/.+\@.+/', $mail_to_address) )
! 		{
! 			fputs( $socket, "RCPT TO: $mail_to_address\r\n" );
! 			server_parse( $socket, "250" );
! 		}
  		$to_header .= "<$mail_to_address>, ";
  	}
***************
*** 158,169 ****
  	while( list( , $bcc_address ) = each( $bcc ))
  	{
! 		fputs( $socket, "RCPT TO: $bcc_address\r\n" );
! 		server_parse( $socket, "250" );
  	}
  	@reset( $cc );
  	while( list( , $cc_address ) = each( $cc ))
  	{
! 		fputs($socket, "RCPT TO: $cc_address\r\n");
! 		server_parse($socket, "250");
  	}
  	// Ok now we tell the server we are ready to start sending data
--- 165,190 ----
  	while( list( , $bcc_address ) = each( $bcc ))
  	{
! 		//
! 		// Add an additional bit of error checking to bcc header...
! 		//
! 		$bcc_address = trim( $bcc_address );
! 		if ( preg_match('/.+\@.+/', $bcc_address) )
! 		{
! 			fputs( $socket, "RCPT TO: $bcc_address\r\n" );
! 			server_parse( $socket, "250" );
! 		}
  	}
  	@reset( $cc );
  	while( list( , $cc_address ) = each( $cc ))
  	{
! 		//
! 		// Add an additional bit of error checking to cc header
! 		//
! 		$cc_address = trim( $cc_address );
! 		if ( preg_match('/.+\@.+/', $cc_address) )
! 		{
! 			fputs($socket, "RCPT TO: $cc_address\r\n");
! 			server_parse($socket, "250");
! 		}
  	}
  	// Ok now we tell the server we are ready to start sending data

[Phpbb-checkins] CVS: phpBB2/includes emailer.php,1.9,1.10 smtp.php,1.6,1.7

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv18119

Modified Files:
	emailer.php smtp.php 
Log Message:
This should fix Bug #498451.. Keep it from including smtp.php more than once..


Index: emailer.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/emailer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** emailer.php	2001/11/26 00:50:03	1.9
--- emailer.php	2002/01/28 21:03:25	1.10
***************
*** 196,200 ****
  			if($this->use_smtp)
  			{
! 				include($phpbb_root_path . "includes/smtp.".$phpEx);
  				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
  				{
--- 196,203 ----
  			if($this->use_smtp)
  			{
! 				if(!defined('SMTP_INCLUDED')) 
! 				{
! 					include($phpbb_root_path . "includes/smtp.".$phpEx);
! 				}
  				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
  				{
***************
*** 315,317 ****
  } // class emailer
  
! ?>
\ No newline at end of file
--- 318,320 ----
  } // class emailer
  
! ?>

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/smtp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** smtp.php	2002/01/04 17:25:54	1.6
--- smtp.php	2002/01/28 21:03:25	1.7
***************
*** 34,37 ****
--- 34,38 ----
  *						response code you are looking for.
  ****************************************************************************/
+ define('SMTP_INCLUDED', 1);
  function server_parse($socket, $response)
  {

[Phpbb-checkins] CVS: phpBB2/includes template.php,1.6,1.7

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5814/includes

Modified Files:
	template.php 
Log Message:
Another warning fix ...

Index: template.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/template.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** template.php	2002/01/28 17:20:31	1.6
--- template.php	2002/01/28 19:12:37	1.7
***************
*** 433,439 ****
  		$varref = $this->generate_block_data_ref($namespace, true);
  		// Prepend the necessary code to stick this in an echo line.
! 		$varref = '\' . ' . $varref;
  		// Append the variable reference.
! 		$varref .= '[\'' . $varname . '\'] . \'';
  
  		return $varref;
--- 433,441 ----
  		$varref = $this->generate_block_data_ref($namespace, true);
  		// Prepend the necessary code to stick this in an echo line.
! 
  		// Append the variable reference.
! 		$varref .= '[\'' . $varname . '\']';
! 
! 		$varref = '\' . ( ( isset(' . $varref . ') ) ? ' . $varref . ' : \'\' ) . \'';
  
  		return $varref;

[Phpbb-checkins] CVS: phpBB2 posting.php,1.141,1.142

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30131

Modified Files:
	posting.php 
Log Message:
Initial warning fixes

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** posting.php	2002/01/28 12:05:00	1.141
--- posting.php	2002/01/28 18:47:41	1.142
***************
*** 69,73 ****
  		// Start session management
  		//
! 		$userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
  		init_userprefs($userdata);
  		//
--- 69,73 ----
  		// Start session management
  		//
! 		$userdata = session_pagestart($user_ip, $forum_id);
  		init_userprefs($userdata);
  		//
***************
*** 234,237 ****
--- 234,238 ----
  $html_entities_match = array("#&#", "#<#", "#>#", "#\"#");
  $html_entities_replace = array("&amp;", "&lt;", "&gt;", "&quot;");
+ $error = false;
  
  $submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0;
***************
*** 345,349 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_POSTING, $board_config['session_length']);
  init_userprefs($userdata);
  //
--- 346,350 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_POSTING);
  init_userprefs($userdata);
  //
***************
*** 559,573 ****
  		{
  			$is_auth_type = "auth_announce";
- 			$auth_string = $lang['can_post_announcements'];
  		}
  		else if( $topic_type == POST_STICKY )
  		{
  			$is_auth_type = "auth_sticky";
- 			$auth_string = $lang['can_post_sticky_topics'];
  		}
  		else
  		{
  			$is_auth_type = "auth_post";
- 			$auth_string = $lang['can_post_new_topics'];
  		}
  		break;
--- 560,571 ----
***************
*** 576,600 ****
  	case 'quote':
  		$is_auth_type = "auth_reply";
- 		$auth_string = $lang['can_reply_to_topics'];
  		break;
  
  	case 'editpost':
  		$is_auth_type = "auth_edit";
- 		$auth_string = $lang['can_edit_topics'];
  		break;
  
  	case 'delete':
  		$is_auth_type = "auth_delete";
- 		$auth_string = $lang['can_delete_topics'];
  		break;
  
  	case 'vote':
  		$is_auth_type = "auth_vote";
- 		$auth_string = $lang['can_vote'];
  		break;
  
  	case 'topicreview':
  		$is_auth_type = "auth_read";
- 		$auth_string = $lang['can_read'];
  		break;
  
--- 574,593 ----
***************
*** 700,706 ****
  if( $submit && $mode != "vote" )
  {
! 	$post_username = trim(strip_tags($HTTP_POST_VARS['username']));
! 	if( !empty($post_username) )
  	{
  		if( !validate_username(stripslashes($post_username)) )
  		{
--- 693,700 ----
  if( $submit && $mode != "vote" )
  {
! 	if( !empty($HTTP_POST_VARS['username']) )
  	{
+ 		$post_username = trim(strip_tags($HTTP_POST_VARS['username']));
+ 
  		if( !validate_username(stripslashes($post_username)) )
  		{
***************
*** 718,742 ****
  	}
  
! 	$post_subject = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['subject'])));
! 	if( ( $mode == "newtopic" || ( $mode == "editpost" && $is_first_post_topic ) ) && empty($post_subject) )
  	{
! 		$error = TRUE;
! 		if( !empty($error_msg) )
  		{
! 			$error_msg .= "<br />";
  		}
- 		$error_msg .= $lang['Empty_subject'];
  	}
  
! 	$post_message = trim($HTTP_POST_VARS['message']);
! 	if( !empty($post_message) )
  	{
  		if( !$error )
  		{
! 			if( $bbcode_on )
! 			{
! 				$bbcode_uid = make_bbcode_uid();
! 			}
! 
  			$post_message = prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
  		}
--- 712,740 ----
  	}
  
! 	if( !empty($HTTP_POST_VARS['subject']) )
  	{
! 		$post_subject = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['subject'])));
! 	}
! 	else
! 	{
! 		$post_subject = "";
! 		if( ( $mode == "newtopic" || ( $mode == "editpost" && $is_first_post_topic ) ) && empty($post_subject) )
  		{
! 			$error = TRUE;
! 			if( !empty($error_msg) )
! 			{
! 				$error_msg .= "<br />";
! 			}
! 			$error_msg .= $lang['Empty_subject'];
  		}
  	}
  
! 	if( !empty($HTTP_POST_VARS['message']) )
  	{
+ 		$post_message = trim($HTTP_POST_VARS['message']);
+ 
  		if( !$error )
  		{
! 			$bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : "";
  			$post_message = prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
  		}
***************
*** 2204,2214 ****
  	$replacement_word = array();
  	$result = obtain_word_list($orig_word, $replacement_word);
- 
- 	if( $bbcode_on )
- 	{
- 		$bbcode_uid = make_bbcode_uid();
- 	}
  
! 	$preview_subject = $post_subject;
  	$preview_message = stripslashes(prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid));
  
--- 2202,2207 ----
  	$replacement_word = array();
  	$result = obtain_word_list($orig_word, $replacement_word);
  
! 	$bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : "";
  	$preview_message = stripslashes(prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid));
  
***************
*** 2239,2246 ****
  	}
  
! 	if( count($orig_word) )
  	{
! 		$preview_subject = preg_replace($orig_word, $replacement_word, $preview_subject);
! 		$preview_message = preg_replace($orig_word, $replacement_word, $preview_message);
  	}
  
--- 2232,2240 ----
  	}
  
! 	if( !empty($orig_word) )
  	{
! 		$preview_username = ( !empty($post_username) ) ? preg_replace($orig_word, $replacement_word, $post_username) : "";
! 		$preview_subject = ( !empty($post_subject) ) ? preg_replace($orig_word, $replacement_word, $post_subject) : "";
! 		$preview_message = ( !empty($preview_message) ) ? preg_replace($orig_word, $replacement_word, $preview_message) : "";
  	}
  
***************
*** 2259,2263 ****
  		"TOPIC_TITLE" => $preview_subject,
  		"POST_SUBJECT" => $preview_subject,
! 		"POSTER_NAME" => $username,
  		"POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
  		"MESSAGE" => $preview_message,
--- 2253,2257 ----
  		"TOPIC_TITLE" => $preview_subject,
  		"POST_SUBJECT" => $preview_subject,
! 		"POSTER_NAME" => $preview_username,
  		"POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
  		"MESSAGE" => $preview_message,
***************
*** 2553,2557 ****
  	}
  
! 	if( is_array($poll_option_list) )
  	{
  		while( list($option_id, $option_text) = each($poll_option_list) )
--- 2547,2551 ----
  	}
  
! 	if( isset($poll_option_list) )
  	{
  		while( list($option_id, $option_text) = each($poll_option_list) )

[Phpbb-checkins] CVS: phpBB2/includes search.php,1.4,1.5

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv30091/includes

Modified Files:
	search.php 
Log Message:
Fix a couple of warning 'generators'

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/search.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** search.php	2002/01/25 13:36:50	1.4
--- search.php	2002/01/28 18:47:31	1.5
***************
*** 119,133 ****
  		$title_match = ( $word_in == 'title' ) ? 1 : 0;
  
! 		if( count($search_matches) )
  		{
- 			$word = array();
  			sort($search_matches);
  
  			$word_text_sql = "";
  			for ($i = 0; $i < count($search_matches); $i++)
  			{ 
  				$search_matches[$i] = trim($search_matches[$i]);
  
! 				if( $search_matches[$i] != "" && $search_matches[$i] != $search_matches[$i-1] ) 
  				{
  					$word[] = $search_matches[$i]; 
--- 119,135 ----
  		$title_match = ( $word_in == 'title' ) ? 1 : 0;
  
! 		if( !empty($search_matches) )
  		{
  			sort($search_matches);
  
+ 			$word = array();
+ 			$prev_word = "";
  			$word_text_sql = "";
+ 
  			for ($i = 0; $i < count($search_matches); $i++)
  			{ 
  				$search_matches[$i] = trim($search_matches[$i]);
  
! 				if( $search_matches[$i] != "" && $search_matches[$i] != $prev_word ) 
  				{
  					$word[] = $search_matches[$i]; 
***************
*** 140,143 ****
--- 142,147 ----
  					$word_text_sql .= "'" . $search_matches[$i] . "'";
  				} 
+ 
+ 				$prev_word = $search_matches[$i];
  			}
  
***************
*** 176,180 ****
  				}
  
! 				if( !$check_words[$word[$i]] )
  				{
  					$match_word[] = "'" . $word[$i] . "'";
--- 180,184 ----
  				}
  
! 				if( empty($check_words[$word[$i]]) )
  				{
  					$match_word[] = "'" . $word[$i] . "'";

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.168,1.169

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv29975

Modified Files:
	viewtopic.php 
Log Message:
Another warning fix ...

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -r1.168 -r1.169
*** viewtopic.php	2002/01/28 17:20:40	1.168
--- viewtopic.php	2002/01/28 18:47:14	1.169
***************
*** 785,789 ****
  			"POLL_QUESTION" => $vote_title,
  
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_VOTE_ACTION" => append_sid("posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id"))
  		);
--- 785,789 ----
  			"POLL_QUESTION" => $vote_title,
  
! 			"S_HIDDEN_FIELDS" => ( !empty($s_hidden_fields) ) ? $s_hidden_fields : "",
  			"S_VOTE_ACTION" => append_sid("posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id"))
  		);

[Phpbb-checkins] CVS: phpBB2 index.php,1.92,1.93

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv20595

Modified Files:
	index.php 
Log Message:
And another fix for warnings ...

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** index.php	2002/01/28 17:20:40	1.92
--- index.php	2002/01/28 18:13:56	1.93
***************
*** 68,73 ****
  //
  
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : "";
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : "";
  
  //
--- 68,73 ----
  //
  
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
  //

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.50,1.51

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv16211/includes

Modified Files:
	sessions.php 
Log Message:
Another warning related fix

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** sessions.php	2002/01/28 17:25:58	1.50
--- sessions.php	2002/01/28 17:57:55	1.51
***************
*** 27,31 ****
  // Returns the new session ID on success.
  //
! function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_create = 0, $enable_autologin = 0)
  {
  	global $db, $board_config;
--- 27,31 ----
  // Returns the new session ID on success.
  //
! function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0)
  {
  	global $db, $board_config;
***************
*** 53,57 ****
  
  	$current_time = time();
! 	$expiry_time = $current_time - $session_length;
  
  	//
--- 53,57 ----
  
  	$current_time = time();
! 	$expiry_time = $current_time - $board_config['session_length'];
  
  	//
***************
*** 314,318 ****
  	$user_id = ( isset($sessiondata['userid']) ) ? $sessiondata['userid'] : ANONYMOUS;
  
! 	$result_id = session_begin($user_id, $user_ip, $thispage_id, $board_config['session_length'], TRUE);
  	if( !$result_id )
  	{
--- 314,318 ----
  	$user_id = ( isset($sessiondata['userid']) ) ? $sessiondata['userid'] : ANONYMOUS;
  
! 	$result_id = session_begin($user_id, $user_ip, $thispage_id, TRUE);
  	if( !$result_id )
  	{

[Phpbb-checkins] CVS: phpBB2 login.php,1.39,1.40

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv16161

Modified Files:
	login.php 
Log Message:
Another fix

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** login.php	2002/01/28 17:40:38	1.39
--- login.php	2002/01/28 17:57:43	1.40
***************
*** 77,81 ****
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, $session_length, FALSE, $autologin);
  
  					if( $session_id )
--- 77,81 ----
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($rowresult['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin);
  
  					if( $session_id )

[Phpbb-checkins] CVS: phpBB2 login.php,1.38,1.39

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv10991

Modified Files:
	login.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** login.php	2002/01/27 15:16:08	1.38
--- login.php	2002/01/28 17:40:38	1.39
***************
*** 34,38 ****
  // Set page ID for session management
  //
! $userdata = session_pagestart($user_ip, PAGE_LOGIN, $session_length);
  init_userprefs($userdata);
  //
--- 34,38 ----
  // Set page ID for session management
  //
! $userdata = session_pagestart($user_ip, PAGE_LOGIN);
  init_userprefs($userdata);
  //
***************
*** 158,161 ****
--- 158,162 ----
  	if( !$userdata['session_logged_in'] )
  	{
+ 		$page_title = $lang['Login'];
  		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 170,174 ****
  			if( preg_match("/^redirect=(.*)$/si", $forward_to, $forward_matches) )
  			{
! 				$forward_to = ($forward_matches[3]) ? $forward_matches[3] : $forward_matches[1];
  
  				$forward_match = explode("&", $forward_to);
--- 171,175 ----
  			if( preg_match("/^redirect=(.*)$/si", $forward_to, $forward_matches) )
  			{
! 				$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
  
  				$forward_match = explode("&", $forward_to);

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.96,1.97 page_tail.php,1.23,1.24

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv9067/includes

Modified Files:
	page_header.php page_tail.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these


Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** page_header.php	2002/01/28 12:26:14	1.96
--- page_header.php	2002/01/28 17:33:51	1.97
***************
*** 21,25 ****
   ***************************************************************************/
  
! define(HEADER_INC, TRUE);
  
  //
--- 21,25 ----
   ***************************************************************************/
  
! define('HEADER_INC', TRUE);
  
  //
***************
*** 161,165 ****
  }
  
! if( $online_userlist == "" )
  {
  	$online_userlist = $lang['None'];
--- 161,165 ----
  }
  
! if( empty($online_userlist) )
  {
  	$online_userlist = $lang['None'];
***************
*** 298,301 ****
--- 298,302 ----
  else
  {
+ 	$icon_pm = $images['pm_no_new_msg'];
  	$l_privmsgs_text = $lang['Login_check_pm'];
  	$l_privmsgs_text_unread = "";
***************
*** 458,462 ****
  {
  	$template->assign_block_vars("switch_user_logged_out", array());
- 
  }
  else
--- 459,462 ----
***************
*** 464,472 ****
  	$template->assign_block_vars("switch_user_logged_in", array());
  
! 	if( $userdata['user_popup_pm'] )
  	{
  		$template->assign_block_vars("switch_enable_pm_popup", array());
  	}
- 
  }
  
--- 464,471 ----
  	$template->assign_block_vars("switch_user_logged_in", array());
  
! 	if( !empty($userdata['user_popup_pm']) )
  	{
  		$template->assign_block_vars("switch_enable_pm_popup", array());
  	}
  }
  
***************
*** 479,481 ****
  $template->pparse("overall_header");
  
! ?>
--- 478,480 ----
  $template->pparse("overall_header");
  
! ?>
\ No newline at end of file

Index: page_tail.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_tail.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** page_tail.php	2002/01/16 17:56:46	1.23
--- page_tail.php	2002/01/28 17:33:51	1.24
***************
*** 49,53 ****
  $template->assign_vars(array(
  	"PHPBB_VERSION" => "2.0 CVS",
! 	"TRANSLATION_INFO" => $lang['TRANSLATION_INFO'], 
  	"ADMIN_LINK" => $admin_link)
  );
--- 49,53 ----
  $template->assign_vars(array(
  	"PHPBB_VERSION" => "2.0 CVS",
! 	"TRANSLATION_INFO" => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : "", 
  	"ADMIN_LINK" => $admin_link)
  );

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.49,1.50

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv6906/includes

Modified Files:
	sessions.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** sessions.php	2002/01/25 02:22:48	1.49
--- sessions.php	2002/01/28 17:25:58	1.50
***************
*** 39,44 ****
  	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
- 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : "";
  		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 39,44 ----
  	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
  		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
+ 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 47,50 ****
--- 47,51 ----
  	{
  		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
+ 		$sessiondata = array();
  
  		$sessionmethod = SESSION_METHOD_GET;
***************
*** 202,206 ****
  // table and updates user sessions at each page refresh
  //
! function session_pagestart($user_ip, $thispage_id, $session_length)
  {
  	global $db, $lang, $board_config;
--- 203,207 ----
  // table and updates user sessions at each page refresh
  //
! function session_pagestart($user_ip, $thispage_id)
  {
  	global $db, $lang, $board_config;
***************
*** 225,228 ****
--- 226,230 ----
  	{
  		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
+ 		$session_data = array();
  
  		$sessionmethod = SESSION_METHOD_GET;

[Phpbb-checkins] CVS: phpBB2/db db2.php,1.1,1.2 msaccess.php,1.5,1.6 mssql-odbc.php,1.4,1.5 mssql.php,1.20,1.21 mysql.php,1.13,1.14 mysql4.php,1.1,1.2 oracle.php,1.17,1.18 postgres7.php,1.16,1.17

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv6525/db

Modified Files:
	db2.php msaccess.php mssql-odbc.php mssql.php mysql.php 
	mysql4.php oracle.php postgres7.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: db2.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/db2.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db2.php	2001/11/20 22:27:29	1.1
--- db2.php	2002/01/28 17:24:45	1.2
***************
*** 33,37 ****
  	var $query_numrows;
  	var $next_id;
! 	var $row;
  	var $row_index;
  	var $num_queries = 0;
--- 33,38 ----
  	var $query_numrows;
  	var $next_id;
! 	var $row = array();
! 	var $rowset = array();
  	var $row_index;
  	var $num_queries = 0;

Index: msaccess.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/msaccess.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** msaccess.php	2002/01/25 02:01:24	1.5
--- msaccess.php	2002/01/28 17:24:45	1.6
***************
*** 29,42 ****
  
  	var $db_connect_id;
! 	var $result_ids;
  	var $result;
  
  	var $next_id;
  
! 	var $num_rows;
! 	var $current_row;
! 	var $field_names;
! 	var $field_types;
! 	var $result_rowset;
  
  	var $num_queries = 0;
--- 29,42 ----
  
  	var $db_connect_id;
! 	var $result_ids = array();
  	var $result;
  
  	var $next_id;
  
! 	var $num_rows = array();
! 	var $current_row = array();
! 	var $field_names = array();
! 	var $field_types = array();
! 	var $result_rowset = array();
  
  	var $num_queries = 0;

Index: mssql-odbc.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql-odbc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mssql-odbc.php	2001/12/24 14:45:47	1.4
--- mssql-odbc.php	2002/01/28 17:24:45	1.5
***************
*** 33,41 ****
  	var $next_id;
  
! 	var $num_rows;
! 	var $current_row;
! 	var $field_names;
! 	var $field_types;
! 	var $result_rowset;
  
  	var $num_queries = 0;
--- 33,41 ----
  	var $next_id;
  
! 	var $num_rows = array();
! 	var $current_row = array();
! 	var $field_names = array();
! 	var $field_types = array();
! 	var $result_rowset = array();
  
  	var $num_queries = 0;

Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** mssql.php	2001/12/24 14:45:47	1.20
--- mssql.php	2002/01/28 17:24:45	1.21
***************
*** 34,38 ****
  	var $in_transaction = 0;
  
! 	var $row;
  	var $limit_offset;
  	var $query_limit_success;
--- 34,39 ----
  	var $in_transaction = 0;
  
! 	var $row = array();
! 	var $rowset = array();
  	var $limit_offset;
  	var $query_limit_success;

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mysql.php	2001/08/30 22:20:23	1.13
--- mysql.php	2002/01/28 17:24:45	1.14
***************
*** 30,34 ****
  	var $db_connect_id;
  	var $query_result;
! 	var $row;
  	var $num_queries = 0;
  
--- 30,35 ----
  	var $db_connect_id;
  	var $query_result;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  

Index: mysql4.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql4.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql4.php	2001/11/04 15:26:33	1.1
--- mysql4.php	2002/01/28 17:24:45	1.2
***************
*** 5,9 ****
   *   begin                : Saturday, Feb 13, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
   *
   *   $Id$
--- 5,9 ----
   *   begin                : Saturday, Feb 13, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : supportphpbb.com
   *
   *   $Id$
***************
*** 30,34 ****
  	var $db_connect_id;
  	var $query_result;
! 	var $row;
  	var $num_queries = 0;
  	var $in_transaction = 0;
--- 30,35 ----
  	var $db_connect_id;
  	var $query_result;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  	var $in_transaction = 0;
***************
*** 39,43 ****
  	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
  	{
- 
  		$this->persistency = $persistency;
  		$this->user = $sqluser;
--- 40,43 ----
***************
*** 46,69 ****
  		$this->dbname = $database;
  
! 		if($this->persistency)
! 		{
! 			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password);
! 		}
! 		else
! 		{
! 			$this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password);
! 		}
! 		if($this->db_connect_id)
  		{
! 			if($database != "")
  			{
  				$this->dbname = $database;
! 				$dbselect = @mysql_select_db($this->dbname);
! 				if(!$dbselect)
  				{
! 					@mysql_close($this->db_connect_id);
  					$this->db_connect_id = $dbselect;
  				}
  			}
  			return $this->db_connect_id;
  		}
--- 46,65 ----
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password);
! 
! 		if( $this->db_connect_id )
  		{
! 			if( $database != "" )
  			{
  				$this->dbname = $database;
! 				$dbselect = mysql_select_db($this->dbname);
! 
! 				if( !$dbselect )
  				{
! 					mysql_close($this->db_connect_id);
  					$this->db_connect_id = $dbselect;
  				}
  			}
+ 
  			return $this->db_connect_id;
  		}
***************
*** 79,83 ****
  	function sql_close()
  	{
! 		if($this->db_connect_id)
  		{
  			//
--- 75,79 ----
  	function sql_close()
  	{
! 		if( $this->db_connect_id )
  		{
  			//
***************
*** 86,93 ****
  			if( $this->in_transaction )
  			{
! 				@mysql_query("COMMIT", $this->db_connect_id);
  			}
! 			$result = @mysql_close($this->db_connect_id);
! 			return $result;
  		}
  		else
--- 82,89 ----
  			if( $this->in_transaction )
  			{
! 				mysql_query("COMMIT", $this->db_connect_id);
  			}
! 
! 			return mysql_close($this->db_connect_id);
  		}
  		else
***************
*** 109,116 ****
  		if( $query != "" )
  		{
! //			$this->num_queries++;
  			if( $transaction == BEGIN_TRANSACTION )
  			{
! 				$result = @mysql_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
--- 105,112 ----
  		if( $query != "" )
  		{
! 			$this->num_queries++;
  			if( $transaction == BEGIN_TRANSACTION )
  			{
! 				$result = mysql_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
***************
*** 120,124 ****
  			}
  
! 			$this->query_result = @mysql_query($query, $this->db_connect_id);
  		}
  
--- 116,120 ----
  			}
  
! 			$this->query_result = mysql_query($query, $this->db_connect_id);
  		}
  
***************
*** 130,134 ****
  			if( $transaction == END_TRANSACTION )
  			{
! 				$result = @mysql_query("COMMIT", $this->db_connect_id);
  			}
  			
--- 126,130 ----
  			if( $transaction == END_TRANSACTION )
  			{
! 				$result = mysql_query("COMMIT", $this->db_connect_id);
  			}
  			
***************
*** 137,143 ****
  		else
  		{
! 			if($this->in_transaction)
  			{
! 				@mysql_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
--- 133,139 ----
  		else
  		{
! 			if( $this->in_transaction )
  			{
! 				mysql_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
***************
*** 151,237 ****
  	function sql_numrows($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
! 		{
! 			$result = @mysql_num_rows($query_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_affectedrows()
  	{
! 		if($this->db_connect_id)
! 		{
! 			$result = @mysql_affected_rows($this->db_connect_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_numfields($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_num_fields($query_id);
- 			return $result;
- 		}
- 		else
- 		{
- 			return false;
  		}
  	}
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_field_name($query_id, $offset);
- 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fieldtype($offset, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
! 		{
! 			$result = @mysql_field_type($query_id, $offset);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fetchrow($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			$this->row[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC);
  			return $this->row[$query_id];
  		}
--- 147,203 ----
  	function sql_numrows($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_num_rows($query_id) : false;
  	}
+ 
  	function sql_affectedrows()
  	{
! 		return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
  	}
+ 
  	function sql_numfields($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
+ 
+ 		return ( $query_id ) ? mysql_num_fields($query_id) : false;
  	}
+ 
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
  	}
+ 
  	function sql_fieldtype($offset, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_field_type($query_id, $offset) : false;
  	}
+ 
  	function sql_fetchrow($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		if( $query_id )
  		{
! 			$this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC);
  			return $this->row[$query_id];
  		}
***************
*** 241,258 ****
  		}
  	}
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
  			unset($this->rowset[$query_id]);
  			unset($this->row[$query_id]);
! 			while($this->rowset[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC))
  			{
  				$result[] = $this->rowset[$query_id];
  			}
  			return $result;
  		}
--- 207,228 ----
  		}
  	}
+ 
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		if( $query_id )
  		{
  			unset($this->rowset[$query_id]);
  			unset($this->row[$query_id]);
! 
! 			while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC))
  			{
  				$result[] = $this->rowset[$query_id];
  			}
+ 
  			return $result;
  		}
***************
*** 262,282 ****
  		}
  	}
  	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			if($rownum > -1)
  			{
! 				$result = @mysql_result($query_id, $rownum, $field);
  			}
  			else
  			{
! 				if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
  				{
! 					if($this->sql_fetchrow())
  					{
  						$result = $this->row[$query_id][$field];
--- 232,254 ----
  		}
  	}
+ 
  	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		if( $query_id )
  		{
! 			if( $rownum > -1 )
  			{
! 				$result = mysql_result($query_id, $rownum, $field);
  			}
  			else
  			{
! 				if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) )
  				{
! 					if( $this->sql_fetchrow() )
  					{
  						$result = $this->row[$query_id][$field];
***************
*** 285,293 ****
  				else
  				{
! 					if($this->rowset[$query_id])
  					{
  						$result = $this->rowset[$query_id][$field];
  					}
! 					else if($this->row[$query_id])
  					{
  						$result = $this->row[$query_id][$field];
--- 257,265 ----
  				else
  				{
! 					if( $this->rowset[$query_id] )
  					{
  						$result = $this->rowset[$query_id][$field];
  					}
! 					else if( $this->row[$query_id] )
  					{
  						$result = $this->row[$query_id][$field];
***************
*** 295,298 ****
--- 267,271 ----
  				}
  			}
+ 
  			return $result;
  		}
***************
*** 302,350 ****
  		}
  	}
! 	function sql_rowseek($rownum, $query_id = 0){
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_data_seek($query_id, $rownum);
- 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
! 	function sql_nextid(){
! 		if($this->db_connect_id)
! 		{
! 			$result = @mysql_insert_id($this->db_connect_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
! 	function sql_freeresult($query_id = 0){
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_free_result($query_id);
- 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
! 	function sql_error($query_id = 0)
  	{
! 		$result["message"] = @mysql_error($this->db_connect_id);
! 		$result["code"] = @mysql_errno($this->db_connect_id);
  
  		return $result;
--- 275,308 ----
  		}
  	}
! 
! 	function sql_rowseek($rownum, $query_id = 0)
! 	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false;
  	}
! 
! 	function sql_nextid()
! 	{
! 		return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false;
  	}
! 
! 	function sql_freeresult($query_id = 0)
! 	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_free_result($query_id) : false;
  	}
! 
! 	function sql_error()
  	{
! 		$result['message'] = mysql_error($this->db_connect_id);
! 		$result['code'] = mysql_errno($this->db_connect_id);
  
  		return $result;

Index: oracle.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/oracle.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** oracle.php	2001/09/13 23:19:53	1.17
--- oracle.php	2002/01/28 17:24:45	1.18
***************
*** 31,35 ****
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row;
  	var $num_queries = 0;
  	var $last_query_text = "";
--- 31,36 ----
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  	var $last_query_text = "";

Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres7.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** postgres7.php	2002/01/01 14:35:33	1.16
--- postgres7.php	2002/01/28 17:24:45	1.17
***************
*** 31,35 ****
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row;
  	var $rownum = array();
  	var $num_queries = 0;
--- 31,36 ----
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row = array();
! 	var $rowset = array();
  	var $rownum = array();
  	var $num_queries = 0;

[Phpbb-checkins] CVS: phpBB2 index.php,1.91,1.92 viewforum.php,1.123,1.124 viewtopic.php,1.167,1.168

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5466

Modified Files:
	index.php viewforum.php viewtopic.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** index.php	2002/01/27 00:55:20	1.91
--- index.php	2002/01/28 17:20:40	1.92
***************
*** 28,32 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $board_config['session_length']);
  init_userprefs($userdata);
  //
--- 28,32 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, PAGE_INDEX);
  init_userprefs($userdata);
  //
***************
*** 195,198 ****
--- 195,199 ----
  		}
  
+ 		$new_topic_data = array();
  		while( $topic_data = $db->sql_fetchrow($result) )
  		{
***************
*** 325,329 ****
  								if( $userdata['session_logged_in'] )
  								{
! 									if( count($new_topic_data[$forum_id]) )
  									{
  										$forum_last_post_time = 0;
--- 326,330 ----
  								if( $userdata['session_logged_in'] )
  								{
! 									if( !empty($new_topic_data[$forum_id]) )
  									{
  										$forum_last_post_time = 0;

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** viewforum.php	2002/01/27 13:14:15	1.123
--- viewforum.php	2002/01/28 17:20:40	1.124
***************
*** 87,91 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
  init_userprefs($userdata);
  //
--- 87,91 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, $forum_id);
  init_userprefs($userdata);
  //
***************
*** 222,225 ****
--- 222,226 ----
  }
  	
+ $l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
  $forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None'];
  unset($moderators);
***************
*** 387,402 ****
  	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
  
! 	"L_MODERATOR" => ( $total_mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'], 
  	"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'], 
  	"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], 
  
! 	"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"),
! 
! 	"S_AUTH_LIST" => $s_auth_can,
! 	"S_AUTH_READ_IMG" => $s_auth_read_img,
! 	"S_AUTH_POST_IMG" => $s_auth_post_img,
! 	"S_AUTH_REPLY_IMG" => $s_auth_reply_img,
! 	"S_AUTH_EDIT_IMG" => $s_auth_edit_img,
! 	"S_AUTH_MOD_IMG" => $s_auth_mod_img)
  );
  //
--- 388,396 ----
  	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
  
! 	"L_MODERATOR" => $l_moderators, 
  	"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'], 
  	"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], 
  
! 	"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"))
  );
  //

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -r1.167 -r1.168
*** viewtopic.php	2002/01/27 22:13:17	1.167
--- viewtopic.php	2002/01/28 17:20:40	1.168
***************
*** 177,181 ****
  // Start session management
  //
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
  init_userprefs($userdata);
  //
--- 177,181 ----
  // Start session management
  //
! $userdata = session_pagestart($user_ip, $forum_id);
  init_userprefs($userdata);
  //
***************
*** 378,381 ****
--- 378,382 ----
  else
  {
+ 	$post_order = "asc";
  	$post_time_order = "ASC";
  }
***************
*** 418,426 ****
  	FROM " . RANKS_TABLE . "
  	ORDER BY rank_special, rank_min";
! if(!$ranks_result = $db->sql_query($sql))
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
  }
! $ranksrow = $db->sql_fetchrowset($ranksresult);
  
  //
--- 419,427 ----
  	FROM " . RANKS_TABLE . "
  	ORDER BY rank_special, rank_min";
! if( !($result = $db->sql_query($sql)) )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
  }
! $ranksrow = $db->sql_fetchrowset($result);
  
  //
***************
*** 507,535 ****
  // Set a cookie for this topic
  //
! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
! 
! if( !empty($tracking_topics['' . $topic_id . '']) && !empty($tracking_forums['' . $forum_id . '']) )
! {
! 	$topic_last_read = ( $tracking_topics['' . $topic_id . ''] > $tracking_forums['' . $forum_id . ''] ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
! }
! else if( !empty($tracking_topics['' . $topic_id . '']) || !empty($tracking_forums['' . $forum_id . '']) )
! {
! 	$topic_last_read = ( !empty($tracking_topics['' . $topic_id . '']) ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
! }
! else
  {
! 	$topic_last_read = $userdata['session_last_visit'];
! }
  
! if( count($tracking_topics) == 150 && empty($tracking_topics['' . $topic_id . '']) )
! {
! 	asort($tracking_topics);
! 	unset($tracking_topics[key($tracking_topics)]);
! }
  
! $tracking_topics['' . $topic_id . ''] = time();
  
! setcookie($board_config['cookie_name'] . "_t", serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  
  //
--- 508,539 ----
  // Set a cookie for this topic
  //
! if( $userdata['session_logged_in'] )
  {
! 	$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! 	$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
  
! 	if( !empty($tracking_topics['' . $topic_id . '']) && !empty($tracking_forums['' . $forum_id . '']) )
! 	{
! 		$topic_last_read = ( $tracking_topics['' . $topic_id . ''] > $tracking_forums['' . $forum_id . ''] ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
! 	}
! 	else if( !empty($tracking_topics['' . $topic_id . '']) || !empty($tracking_forums['' . $forum_id . '']) )
! 	{
! 		$topic_last_read = ( !empty($tracking_topics['' . $topic_id . '']) ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
! 	}
! 	else
! 	{
! 		$topic_last_read = $userdata['user_lastvisit'];
! 	}
  
! 	if( count($tracking_topics) == 150 && empty($tracking_topics['' . $topic_id . '']) )
! 	{
! 		asort($tracking_topics);
! 		unset($tracking_topics[key($tracking_topics)]);
! 	}
  
! 	$tracking_topics['' . $topic_id . ''] = time();
! 
! 	setcookie($board_config['cookie_name'] . "_t", serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! }
  
  //
***************
*** 596,605 ****
  	{
  		$s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start") . '">' . $lang['Stop_watching_topic'] . '</a>';
! 		$s_watching_topic_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start") . '"><img src="' . $images['Topic_un_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Stop_watching_topic'] . '" border="0"></a>';
  	}
  	else
  	{
  		$s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;watch=topic&amp;start=$start") . '">' . $lang['Start_watching_topic'] . '</a>';
! 		$s_watching_topic_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;watch=topic&amp;start=$start") . '"><img src="' . $images['Topic_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Start_watching_topic'] . '" border="0"></a>';
  	}
  }
--- 600,609 ----
  	{
  		$s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start") . '">' . $lang['Stop_watching_topic'] . '</a>';
! 		$s_watching_topic_img = ( isset($images['Topic_un_watch']) ) ? '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;unwatch=topic&amp;start=$start") . '"><img src="' . $images['Topic_un_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Stop_watching_topic'] . '" border="0"></a>' : '';
  	}
  	else
  	{
  		$s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;watch=topic&amp;start=$start") . '">' . $lang['Start_watching_topic'] . '</a>';
! 		$s_watching_topic_img = ( isset($images['Topic_watch']) ) ? '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;watch=topic&amp;start=$start") . '"><img src="' . $images['Topic_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Start_watching_topic'] . '" border="0"></a>' : '';
  	}
  }
***************
*** 1137,1141 ****
  		"EDIT_IMG" => $edit_img,
  		"QUOTE_IMG" => $quote_img,
- 		"PMSG_IMG" => $pmsg_img,
  		"IP_IMG" => $ip_img, 
  		"DELETE_IMG" => $delpost_img, 
--- 1141,1144 ----

[Phpbb-checkins] CVS: phpBB2/includes template.php,1.5,1.6

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5423/includes

Modified Files:
	template.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: template.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/template.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** template.php	2001/08/31 20:59:12	1.5
--- template.php	2002/01/28 17:20:31	1.6
***************
*** 145,148 ****
--- 145,149 ----
  
  		// Compile it, with the "no echo statements" option on.
+ 		$_str = "";
  		$code = $this->compile($this->uncompiled_code[$handle], true, '_str');
  
***************
*** 304,308 ****
  
  		// This will handle the remaining root-level varrefs
! 		$code = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '\' . $this->_tpldata[\'.\'][0][\'\1\'] . \'', $code);
  
  		// Break it up into lines.
--- 305,309 ----
  
  		// This will handle the remaining root-level varrefs
! 		$code = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '\' . ( ( isset($this->_tpldata[\'.\'][0][\'\1\']) ) ? $this->_tpldata[\'.\'][0][\'\1\'] : \'\' ) . \'', $code);
  
  		// Break it up into lines.
***************
*** 324,328 ****
  
  				// Added: dougk_ff7-Keeps templates from bombing if begin is on the same line as end.. I think. :)
! 				if (preg_match('#<!-- END (.*?) -->#', $code_lines[$i], $n))
  				{
  					$block_nesting_level++;
--- 325,329 ----
  
  				// Added: dougk_ff7-Keeps templates from bombing if begin is on the same line as end.. I think. :)
! 				if ( preg_match('#<!-- END (.*?) -->#', $code_lines[$i], $n) )
  				{
  					$block_nesting_level++;
***************
*** 331,335 ****
  					{
  						// Block is not nested.
! 						$code_lines[$i] = '$_' . $a[1] . '_count = sizeof($this->_tpldata[\'' . $n[1] . '.\']);';
  						$code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
--- 332,336 ----
  					{
  						// Block is not nested.
! 						$code_lines[$i] = '$_' . $a[1] . '_count = ( isset($this->_tpldata[\'' . $n[1] . '.\']) ) ?  sizeof($this->_tpldata[\'' . $n[1] . '.\']) : 0;';
  						$code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
***************
*** 347,351 ****
  						$varref = $this->generate_block_data_ref($namespace, false);
  						// Create the for loop code to iterate over this block.
! 						$code_lines[$i] = '$_' . $a[1] . '_count = sizeof(' . $varref . ');';
  						$code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
--- 348,352 ----
  						$varref = $this->generate_block_data_ref($namespace, false);
  						// Create the for loop code to iterate over this block.
! 						$code_lines[$i] = '$_' . $a[1] . '_count = ( isset(' . $varref . ') ) ? sizeof(' . $varref . ') : 0;';
  						$code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
***************
*** 367,371 ****
  					{
  						// Block is not nested.
! 						$code_lines[$i] = '$_' . $m[1] . '_count = sizeof($this->_tpldata[\'' . $m[1] . '.\']);';
  						$code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
--- 368,372 ----
  					{
  						// Block is not nested.
! 						$code_lines[$i] = '$_' . $m[1] . '_count = ( isset($this->_tpldata[\'' . $m[1] . '.\']) ) ? sizeof($this->_tpldata[\'' . $m[1] . '.\']) : 0;';
  						$code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
***************
*** 383,387 ****
  						$varref = $this->generate_block_data_ref($namespace, false);
  						// Create the for loop code to iterate over this block.
! 						$code_lines[$i] = '$_' . $m[1] . '_count = sizeof(' . $varref . ');';
  						$code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
--- 384,388 ----
  						$varref = $this->generate_block_data_ref($namespace, false);
  						// Create the for loop code to iterate over this block.
! 						$code_lines[$i] = '$_' . $m[1] . '_count = ( isset(' . $varref . ') ) ? sizeof(' . $varref . ') : 0;';
  						$code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)';
  						$code_lines[$i] .= "\n" . '{';
***************
*** 473,475 ****
  }
  
! ?>
--- 474,476 ----
  }
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.39,1.40

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17056

Modified Files:
	groupcp.php 
Log Message:
Fixed wrong var name preventing group listing ...

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** groupcp.php	2002/01/27 22:13:16	1.39
--- groupcp.php	2002/01/28 14:18:52	1.40
***************
*** 624,628 ****
  
  	$group_members = $db->sql_fetchrowset($result); 
! 	$modgroup_pending_count = count($group_members);
  	$db->sql_freeresult($result);
  
--- 624,628 ----
  
  	$group_members = $db->sql_fetchrowset($result); 
! 	$members_count = count($group_members);
  	$db->sql_freeresult($result);
  

[Phpbb-checkins] CVS: phpBB2/db/schemas oracle_basic.sql,1.2,1.3

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv8816

Modified Files:
	oracle_basic.sql 
Log Message:
Added 'most online user' config keys to Oracle basic.sql

Index: oracle_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/oracle_basic.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** oracle_basic.sql	2002/01/03 02:27:31	1.2
--- oracle_basic.sql	2002/01/28 13:44:05	1.3
***************
*** 52,55 ****
--- 52,57 ----
  INSERT INTO phpbb_config VALUES ('prune_enable','1');
  INSERT INTO phpbb_config VALUES ('gzip_compress','1');
+ INSERT INTO phpbb_config VALUES ('record_online_users','0');
+ INSERT INTO phpbb_config VALUES ('record_online_date','0');
  
  

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_basic.sql,1.7,1.8

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv8309

Modified Files:
	mssql_basic.sql 
Log Message:
Added 'most online user' config keys to MS-SQL basic.sql

Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mssql_basic.sql	2002/01/03 02:27:31	1.7
--- mssql_basic.sql	2002/01/28 13:41:31	1.8
***************
*** 61,64 ****
--- 61,66 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');