diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 18:07:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 18:07:12 +0000 |
| commit | 557d09bb72f7e9848b6fc50ed4e2ba651b89e743 (patch) | |
| tree | 9db78285f2e35af8f70dfbb240712164b45bcfd2 /phpBB | |
| parent | c9478353171267a3ebc5d87b43d759d22684b21e (diff) | |
| download | forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.gz forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.bz2 forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.xz forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.zip | |
- added updated coding guidelines
- introduced is_registered and is_bot flags for correct determinition of guest/registered/bot users
- changed bot code to act on useragent || ip
git-svn-id: file:///svn/phpbb/trunk@5117 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
30 files changed, 1233 insertions, 483 deletions
diff --git a/phpBB/adm/pagestart.php b/phpBB/adm/pagestart.php index 3567ec32a0..8d029c38c7 100644 --- a/phpBB/adm/pagestart.php +++ b/phpBB/adm/pagestart.php @@ -27,8 +27,13 @@ $user->setup('admin'); // End session management // Did user forget to login? Give 'em a chance to here ... -if ($user->data['user_id'] == ANONYMOUS) +if (!$user->data['is_registered']) { + if ($user->data['is_bot']) + { + redirect("../index.$phpEx$SID"); + } + login_box('', $user->lang['LOGIN_ADMIN'], $user->lang['LOGIN_ADMIN_SUCCESS'], true); } diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html new file mode 100644 index 0000000000..c6493066d3 --- /dev/null +++ b/phpBB/docs/coding-guidelines.html @@ -0,0 +1,1043 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<title>Coding Guidelines</title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<meta http-equiv="Content-Style-Type" content="text/css" /> +<meta name="resource-type" content="document" /> +<meta name="description" lang="en" content="Olympus coding guidelines document" /> +<meta name="keywords" lang="en" content="" /> +<meta name="author" content="phpBB Group" /> +<meta name="copyright" content="phpBB Group" /> +<meta name="MSSmartTagsPreventParsing" content="true" /> +<link rel="shortcut icon" href="" /> + +<style type="text/css"> +<!-- + +/* + The original "subSilver" theme for phpBB2 + Created by subBlue design :: http://www.subBlue.com +*/ + +body { + background-color: white; + font-family: Verdana, Arial, Helvetica, sans-serif; + margin: 0px; + border: 0px; + padding: 0px; +} + +img { + border: 0; +} + +p { + font-size: 8pt; +} + +hr { + height: 0px; + border: solid #D1D7DC 0px; + border-top-width: 1px; +} + +#title, h1 { + font: bold 18pt 'Trebuchet MS', Verdana, sans-serif; + text-decoration: none; + line-height: 120%; +} + +h2 { + font: bold 12pt Arial, Helvetica, sans-serif; + text-decoration: none; + line-height: 120%; +} + +h3 { + font: bold 10pt Arial, Helvetica, sans-serif; + text-decoration: none; + line-height: 120%; +} + +.paragraph { + margin-left: 20px; +} + +/* + Structure +*/ +#logo { + background: #fff url(header_bg.jpg) repeat-x top right; + height: 60px; +} + +#title { + color: #12749b; + float: right; + margin: 10px 10px 0; +} + +#main { + margin-left: 25px; + margin-right: 25px; +} + +.good { + color: green; +} + +.bad { + color: red; +} + +#footer { + margin-left: 75px; + font-size: 70%; + color: #006600; +} + +code { + color: #006600; + font-weight: normal; + font-family: 'Courier New', monospace; + border-color: #D1D7DC; + border-width: 1px; + border-style: solid; + background-color: #FAFAFA; +} + +.indent p { + padding-left: 20px; + font-size: 90%; +} + +/* + Anchors +*/ +a { + font-size: 70%; +} + +a:link, a:active, a:visited { + color: #006699; + text-decoration: none; +} + +a:hover { + color: #DD6900; + text-decoration: underline; +} + +a.nav { + color: #006699; + text-decoration: none; +} + +a.nav:hover { + text-decoration: underline; +} + +p a { + font-size: 100%; +} + +.menu { + font-size: 80%; +} + +.menu li a { + font-size: 100%; +} +//--> +</style> + +<!--[if IE]> +<style type="text/css"> +body { + scrollbar-face-color: #DEE3E7; + scrollbar-highlight-color: white; + scrollbar-shadow-color: #DEE3E7; + scrollbar-3dlight-color: #D1D7DC; + scrollbar-arrow-color: #006699; + scrollbar-track-color: #EFEFEF; + scrollbar-darkshadow-color: #98AAB1; +} +</style> +<![endif]--> + +</head> + +<body> + +<div id="logo"> + <div id="title">Coding Guidelines</div> + <a href="index.php"><img src="header_left.jpg" alt="phpBB Logo" /></a> +</div> + +<a name="top"></a><div id="main"> + +<p>This is the April, 2005 revision of the phpBB Coding Guidelines, all attempts should be made to follow it as closely as possible. This document is (c) 2005 phpBB Group, copying or redistribution is not allowed without permission.</p> + +<h1>Coding Guidelines</h1> + +<ol class="menu"> + <li><a href="#defaults">Defaults</a></li> + <ol type="i"> + <li><a href="#editorsettings">Editor Settings</a></li> + <li><a href="#fileheader">File Header</a></li> + <li><a href="#locations">File Locations</a></li> + </ol> + <li><a href="#code">Code Layout/Guidelines</a></li> + <ol type="i"> + <li><a href="#namingvars">Variable/Function Naming</a></li> + <li><a href="#codelayout">Code Layout</a></li> + <li><a href="#sql">SQL/SQL Layout</a></li> + <li><a href="#optimizing">Optimizations</a></li> + <li><a href="#general">General Guidelines</a></li> + </ol> + <li><a href="#styling">Styling</a></li> + <li><a href="#templating">Templating</a></li> +</ol> + +<hr /> + +<a name="defaults"></a><h1>1. Defaults</h1> + + <a name="editorsettings"></a><b>1.i. Editor Settings</b> + <br /><br /> + <div class="paragraph"> + + <h3>Tabs vs Spaces:</h3> + <p>In order to make this as simple as possible, we will be using tabs, not spaces. Feel free to set how many spaces your editor uses when it <b>displays</b> tabs, but make sure that when you <b>save</b> the file, it's saving tabs and not spaces. This way, we can each have the code be displayed the way we like it, without breaking the layout of the actual files.</p> + + <h3>Linefeeds:</h3> + <p>Ensure that your editor is saving files in the UNIX format. This means lines are terminated with a newline, not with a CR/LF combo as they are on Win32, or whatever the Mac uses. Any decent editor should be able to do this, but it might not always be the default. Know your editor. If you want advice on Windows text editors, just ask one of the developers. Some of them do their editing on Win32.</p> + + </div> + <a href="#top">Top</a> + <br /><br /> + + + <a name="fileheader"></a><b>1.ii. File Header</b> + <br /><br /> + <div class="paragraph"> + + <h3>Standard header for new files:</h3> + <p>This template of the header must be included at the start of all phpBB files: </p> + + <blockquote><pre> +/** +* +* @package {PACKAGENAME} +* @version $Id: $ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + </pre></blockquote> + + <p>Please see the <a href="#locations">File Locations section</a> for the correct package name.</p> + + <h3>Files containing inline code:</h3> + + <p>For those files you have to put an empty comment directly after the header to prevent the documentor assigning the header to the first code element found.</p> + + <blockquote><pre> +/** +* +* {HEADER} +* +*/ + +/** +*/ +{CODE} + </pre></blockquote> + + <h3>Files containing only functions:</h3> + + <p>Do not forget to comment the functions (especially the first function following the header). Each function should have at least a comment of what this function does. For more complex functions it is recommended to document the parameters too.</p> + + <h3>Files containing only classes:</h3> + + <p>Do not forget to comment the class. Classes need a seperate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.</p> + + <h3>Code following the header but only functions/classes file:</h3> + + <p>If this case is true, the best method to avoid documentation confusions is adding an ignore command, for example:</p> + + <blockquote><pre> +/** +* +* {HEADER} +* +*/ + +/** +* @ignore +*/ +Small code snipped, mostly one or two defines or an if statement + +/** +* {DOCUMENTATION} +*/ +class ... + </pre></blockquote> + + </div> + <a href="#top">Top</a> + <br /><br /> + + <a name="locations"></a><b>1.iii. File Locations</b> + <br /><br /> + <div class="paragraph"> + + <p>Functions used by more than one page should be placed in functions.php, functions specific to one page should be placed on that page (at the bottom) or within the relevant sections functions file.</p> + + <p>The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:</p> + + <ul class="menu"> + <li><b>phpBB3</b><br />Core files and all files not assigned to a seperate package</li> + <li><b>acm</b><br /><code>/includes/acm</code><br />Cache System, seperated because of equal class names + <ul> + <li><b>acm_db</b><br /><code>/includes/acm/acm_db.php</code><br />Database based caching</li> + <li><b>acm_file</b><br /><code>/includes/acm/acm_file.php</code><br />File based caching</li> + </ul> + </li> + <li><b>dbal</b><br /><code>/includes/db</code><br />Database Abstraction Layer, seperated because of equal class names.<br />Every database class is a seperate package preceeded by dbal_ + <ul> + <li><b>dbal_db2</b><br /><code>/includes/db/db2.php</code><br />DB2 Database Abstraction Layer</li> + <li><b>dbal_firebird</b><br /><code>/includes/db/firebird.php</code><br />Firebird/Interbase Database Abstraction Layer<br />Minimum Requirement is Firebird 1.5+/Interbase 7.1+</li> + <li><b>dbal_mssql</b><br /><code>/includes/db/msssql.php</code><br />MSSQL Database Abstraction Layer<br />Minimum Requirement is MSSQL 2000+</li> + <li><b>dbal_odbc_mssql</b><br /><code>/includes/db/mssql-odbc.php</code><br />MSSQL ODBC Database Abstraction Layer for MSSQL<br />Minimum Requirement is Version 2000+</li> + <li><b>dbal_mysql</b><br /><code>/includes/db/mysql.php</code><br />MySQL Database Abstraction Layer<br />Minimum Requirement is 3.23+/4.0+/4.1+</li> + <li><b>dbal_mysqli</b><br /><code>/includes/db/mysqli.php</code><br />MySQL4 Database Abstraction Layer<br />Minimum Requirement is MySQL 4.1+</li> + <li><b>dbal_oracle</b><br /><code>/includes/db/oracle.php</code><br />Oracle Database Abstraction Layer</li> + <li><b>dbal_postgres</b><br /><code>/includes/db/postgres.php</code><br />PostgreSQL Database Abstraction Layer<br />Minimum Requirement is Version 7.3+</li> + <li><b>dbal_sqlite</b><br /><code>/includes/db/sqlite.php</code><br />Sqlite Database Abstraction Layer</li> + </ul> + </li> + <li><b>login</b><br /><code>/includes/auth</code><br />Login Authentication Plugins</li> + <li><b>mcp</b><br /><code>mcp.php</code>, <code>/includes/mcp</code><br />Moderator Control Panel</li> + <li><b>ucp</b><br /><code>ucp.php</code>, <code>/includes/ucp</code><br />User Control Panel</li> + <li><b>search</b><br /><code>/includes/search</code><br />Search System</li> + <li><b>acp</b><br /><code>/adm</code><br />Administration Control Panel</li> + </ul> + + </div> + <a href="#top">Top</a> + <br /><br /> + +<hr /> + +<a name="code"></a><h1>2. Code Layout/Guidelines</h1> + + <a name="namingvars"></a><b>2.i. Variable/Function Naming</b> + <br /><br /> + <div class="paragraph"> + + <p>We will not be using any form of hungarian notation in our naming conventions. Many of us believe that hungarian naming is one of the primary code obfuscation techniques currently in use.</p> + + <h3>Variable Names:</h3> + <p>Variable names should be in all lowercase, with words separated by an underscore, example:</p> + + <div class="indent"> + <p><code>$current_user</code> is right, but <code>$currentuser</code> and <code> $currentUser</code> are not.</p> + </div> + + <p>Names should be descriptive, but concise. We don't want huge sentences as our variable names, but typing an extra couple of characters is always better than wondering what exactly a certain variable is for. </p> + + <h3>Loop Indices:</h3> + <p>The <em>only</em> situation where a one-character variable name is allowed is when it's the index for some looping construct. In this case, the index of the outer loop should always be $i. If there's a loop inside that loop, its index should be $j, followed by $k, and so on. If the loop is being indexed by some already-existing variable with a meaningful name, this guideline does not apply, example:</p> + <blockquote><pre> +for ($i = 0; $i < $outer_size; $i++) +{ + for ($j = 0; $j < $inner_size; $j++) + { + foo($i, $j); + } +} + </pre></blockquote> + + <h3>Function Names:</h3> + <p>Functions should also be named descriptively. We're not programming in C here, we don't want to write functions called things like "stristr()". Again, all lower-case names with words separated by a single underscore character. Function names should preferably have a verb in them somewhere. Good function names are <code>print_login_status()</code>, <code>get_user_data()</code>, etc. </p> + + <h3>Function Arguments:</h3> + <p>Arguments are subject to the same guidelines as variable names. We don't want a bunch of functions like: <code>do_stuff($a, $b, $c)</code>. In most cases, we'd like to be able to tell how to use a function by just looking at its declaration. </p> + + <h3>Summary:</h3> + <p>The basic philosophy here is to not hurt code clarity for the sake of laziness. This has to be balanced by a little bit of common sense, though; <code>print_login_status_for_a_given_user()</code> goes too far, for example -- that function would be better named <code>print_user_login_status()</code>, or just <code>print_login_status()</code>.</p> + + <h3>Special Namings: </h3> + <p>For all emoticons use the term <code>smiley</code> in singular and <code>smilies</code> in plural.</p> + + </div> + <a href="#top">Top</a> + <br /><br /> + + + <a name="codelayout"></a><b>2.ii. Code Layout</b> + <br /><br /> + <div class="paragraph"> + + <h3>Always include the braces:</h3> + <p>This is another case of being too lazy to type 2 extra characters causing problems with code clarity. Even if the body of some construct is only one line long, do <em>not</em> drop the braces. Just don't, examples:</p> + + <p class="bad">// These are all wrong. </p> + <blockquote><pre> +if (condition) do_stuff(); + +if (condition) + do_stuff(); + +while (condition) + do_stuff(); + +for ($i = 0; $i < size; $i++) + do_stuff($i); + </pre></blockquote> + + <p class="good">// These are all right. </p> + <blockquote><pre> +if (condition) +{ + do_stuff(); +} + +while (condition) +{ + do_stuff(); +} + +for ($i = 0; $i < size; $i++) +{ + do_stuff(); +} + </pre></blockquote> + + <h3>Where to put the braces:</h3> + <p>This one is a bit of a holy war, but we're going to use a style that can be summed up in one sentence: Braces always go on their own line. The closing brace should also always be at the same column as the corresponding opening brace, examples:</p> + + <blockquote><pre> +if (condition) +{ + while (condition2) + { + ... + } +} +else +{ + ... +} + +for ($i = 0; $i < $size; $i++) +{ + ... +} + +while (condition) +{ + ... +} + +function do_stuff() +{ + ... +} + </pre></blockquote> + + <h3>Use spaces between tokens:</h3> + <p>This is another simple, easy step that helps keep code readable without much effort. Whenever you write an assignment, expression, etc.. Always leave <em>one</em> space between the tokens. Basically, write code as if it was English. Put spaces between variable names and operators. Don't put spaces just after an opening bracket or before a closing bracket. Don't put spaces just before a comma or a semicolon. This is best shown with a few examples, examples:</p> + + <p>// Each pair shows the wrong way followed by the right way. </p> + <blockquote><pre> +$i=0; +$i = 0; + +if($i<7) ... +if ($i < 7) ... + +if ( ($i < 7)&&($j > 8) ) ... +if ($i < 7 && $j > 8) ... + +do_stuff( $i, "foo", $b ); +do_stuff($i, "foo", $b); + +for($i=0; $i<$size; $i++) ... +for($i = 0; $i < $size; $i++) ... + +$i=($j < $size)?0:1; +$i = ($j < $size) ? 0 : 1; + </pre></blockquote> + + <h3>Operator precedence:</h3> + <p>Do you know the exact precedence of all the operators in PHP? Neither do I. Don't guess. Always make it obvious by using brackets to force the precedence of an equation so you know what it does. Remember to not over-use this, as it may harden the readability. Basically, do not enclose single expressions. Examples:</p> + + <p class="bad">// what's the result? who knows. </p> + <blockquote><pre> +$bool = ($i < 7 && $j > 8 || $k == 4); + </pre></blockquote> + + <p class="bad">// now you can be certain what I'm doing here.</p> + <blockquote><pre> +$bool = (($i < 7) && (($j < 8) || ($k == 4))) + </pre></blockquote> + + <p class="good">// But this one is even better, because it is easier on the eye but the intention is preserved</p> + <blockquote><pre> +$bool = ($i < 7 && ($j < 8 || $k == 4)) + </pre></blockquote> + + <h3>Quoting strings:</h3> + <p>There are two different ways to quote strings in PHP - either with single quotes or with double quotes. The main difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. Because of this, you should <em>always</em> use single quotes <em>unless</em> you specifically need variable interpolation to be done on that string. This way, we can save the parser the trouble of parsing a bunch of strings where no interpolation needs to be done.</p> + <p>Also, if you are using a string variable as part of a function call, you do not need to enclose that variable in quotes. Again, this will just make unnecessary work for the parser. Note, however, that nearly all of the escape sequences that exist for double-quoted strings will not work with single-quoted strings. Be careful, and feel free to break this guideline if it's making your code easier to read, examples:</p> + + <p class="bad">// wrong </p> + <blockquote><pre> +$str = "This is a really long string with no variables for the parser to find."; + +do_stuff("$str"); + </pre></blockquote> + + <p class="good">// right</p> + <blockquote><pre> +$str = 'This is a really long string with no variables for the parser to find.'; + +do_stuff($str); + </pre></blockquote> + + <p class="bad">// Sometimes single quotes are just not right</p> + <blockquote><pre> +$post_url = $phpbb_root_path . 'posting.' . $phpEx . '?mode=' . $mode . '&amp;start=' . $start; + </pre></blockquote> + + <p class="good">// Double quotes are sometimes needed to not overcroud the line with concentinations</p> + <blockquote><pre> +$post_url = "{$phpbb_root_path}posting.$phpEx?mode=$mode&amp;start=$start"; + </pre></blockquote> + + <p>In SQL Statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL Formatting), else it should be tryed to only use one method - mostly single quotes.</p> + + <h3>Associative array keys:</h3> + <p>In PHP, it's legal to use a literal string as a key to an associative array without quoting that string. We don't want to do this -- the string should always be quoted to avoid confusion. Note that this is only when we're using a literal, not when we're using a variable, examples:</p> + + <p class="bad">// wrong</p> + <blockquote><pre> +$foo = $assoc_array[blah]; + </pre></blockquote> + + <p class="good">// right </p> + <blockquote><pre> +$foo = $assoc_array['blah']; + </pre></blockquote> + + <h3>Comments:</h3> + <p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present.<br /><br />Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time. Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p> + + <h3>Magic numbers:</h3> + <p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not have a very close eye to it).</p> + + <h3>Shortcut operators:</h3> + <p>The only shortcut operators that cause readability problems are the shortcut increment <code>$i++</code> and decrement <code>$j--</code> operators. These operators should not be used as part of an expression. They can, however, be used on their own line. Using them in expressions is just not worth the headaches when debugging, examples:</p> + + <p class="bad">// wrong </p> + <blockquote><pre> +$array[++$i] = $j; +$array[$i++] = $k; + </pre></blockquote> + + <p class="good">// right </p> + <blockquote><pre> +$i++; +$array[$i] = $j; + +$array[$i] = $k; +$i++; + </pre></blockquote> + + <h3>Inline conditionals:</h3> + <p>Inline conditionals should only be used to do very simple things. Preferably, they will only be used to do assignments, and not for function calls or anything complex at all. They can be harmful to readability if used incorrectly, so don't fall in love with saving typing by using them, examples:</p> + + <p class="bad">// Bad place to use them</p> + <blockquote><pre> +($i < $size && $j > $size) ? do_stuff($foo) : do_stuff($bar); + </pre></blockquote> + + <p class="good">// OK place to use them </p> + <blockquote><pre> +$min = ($i < $j) ? $i : $j; + </pre></blockquote> + + <h3>Don't use uninitialized variables.</h3> + <p>For phpBB3, we intend to use a higher level of run-time error reporting. This will mean that the use of an uninitialized variable will be reported as a warning. These warnings can be avoided by using the built-in isset() function to check whether a variable has been set, examples:</p> + + <p class="bad">// Wrong </p> + <blockquote><pre> +if ($forum) ... + </pre></blockquote> + + <p class="good">// Right </p> + <blockquote><pre> +if (isset($forum)) ... + </pre></blockquote> + + <p class="good">// Also possible</p> + <blockquote><pre> +if (isset($forum) && $forum == 5) + </pre></blockquote> + + </div> + <a href="#top">Top</a> + <br /><br /> + + + <a name="sql"></a><b>2.iii. SQL/SQL Layout</b> + <br /><br /> + <div class="paragraph"> + + <h3>Common SQL Guidelines: </h3> + <p>All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL3/4/5, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Firebird, SQLite, Oracle8, ODBC (generalised if possible, otherwise DB2)).</p> + <p>All SQL commands should utilise the DataBase Abstraction Layer (DBAL)</p> + + <h3>SQL code layout:</h3> + <p>SQL Statements are often unreadable without some formatting, since they tend to be big at times. Though the formatting of sql statements adds a lot to the readability of code. SQL statements should be formatted in the following way, basically writing keywords :</p> + + <blockquote><pre> +$sql = 'SELECT * +<-one tab->FROM ' . SOME_TABLE . ' +<-one tab->WHERE a = 1 +<-two tabs->AND (b = 2 +<-three tabs->OR b = 3) +<-one tab->ORDER BY b'; + </pre></blockquote> + + <p>Here the example with the tabs applied:</p> + + <blockquote><pre> +$sql = 'SELECT * + FROM ' . SOME_TABLE . ' + WHERE a = 1 + AND (b = 2 + OR b = 3) + ORDER BY b'; + </pre></blockquote> + + <h3>SQL Quotes: </h3> + <p>Double quotes where applicable ... examples: </p> + + <p class="bad">// These are wrong.</p> + <blockquote><pre> +"UPDATE " . SOME_TABLE . " SET something = something_else WHERE a = $b"; + +'UPDATE ' . SOME_TABLE . ' SET something = ' . $user_id . ' WHERE a = ' . $something; + </pre></blockquote> + + <p class="good">// These are right. </p> + + <blockquote><pre> +'UPDATE ' . SOME_TABLE . " SET something = something_else WHERE a = $b"; + +'UPDATE ' . SOME_TABLE . " SET something = $user_id WHERE a = $something"; + </pre></blockquote> + + <p>In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.</p> + + <h3>Common DBAL methods: </h3> + + <p>Always use <code>$db->sql_escape()</code> if you need to check for a string within an SQL statement, for example:</p> + + <blockquote><pre> +$sql = 'SELECT * + FROM ' . SOME_TABLE . " + WHERE username = '" . $db->sql_escape($username) . "'"; + </pre></blockquote> + + <p>If you need to UPDATE or INSERT data, make use of the <code>$db->sql_build_array()</code> function. This function already escapes strings and checkes other types, so there is no need to do this here. The data to be inserted should go into an array - <code>$sql_ary</code> - or directly within the statement if one one or two variables needs to be inserted/updated. An example of an insert statement would be:</p> + + <blockquote><pre> +$sql_ary = array( + 'somedata' => $my_string, + 'otherdata' => $an_int, + 'moredata' => $another_int +); + +$db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); + </pre></blockquote> + + <p>To complete the example, this is how an update statement would look like:</p> + + <blockquote><pre> +$sql_ary = array( + 'somedata' => $my_string, + 'otherdata' => $an_int, + 'moredata' => $another_int +); + +$sql = 'UPDATE ' . SOME_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " + WHERE user_id = $user_id"; +$db->sql_query($sql); + </pre></blockquote> + + </div> + <a href="#top">Top</a> + <br /><br /> + + + <a name="optimizing"></a><b>2.iv. Optimizations</b> + <br /><br /> + <div class="paragraph"> + + <h3>Operations in loop definition: </h3> + <p>Always try to optimize your loops if operations are going on at the comparing part, since this part is executed every time the loop is parsed through. For assignments a descriptive name should be chosen. Example:</p> + + <p class="bad">// On every iteration the sizeof function is called</p> + <blockquote><pre> +for ($i = 0; $i < sizeof($post_data); $i++) +{ + do_something(); +} + </pre></blockquote> + + <p class="good">// You are able to assign the (not changing) result within the loop itself</p> + <blockquote><pre> +for ($i = 0, $size = sizeof($post_data); $i < $size; $i++) +{ + do_something(); +} + </pre></blockquote> + + <h3>Use of in_array(): </h3> + <p>Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticable, but if checked against a huge array within a loop those checks alone can be a bunch of seconds.</p> + + </div> + <a href="#top">Top</a> + <br /><br /> + + + <a name="general"></a><b>2.v. General Guidelines</b> + <br /><br /> + <div class="paragraph"> + + <h3>General things:</h3> + <p>Never trust user input.</p> + <p>The auth class should be used for all authorisation checking</p> + <p>No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to)</p> + + <h3>Variables: </h3> + <p>Make use of the <code>request_var()</code> function for anything except for submit or single checking params. Example:</p> + + <p class="bad">// Old method, do not use it</p> + <blockquote><pre> +$start = (isset($HTTP_GET_VARS['start'])) ? intval($HTTP_GET_VARS['start']) : intval($HTTP_POST_VARS['start']); +$submit = (isset($HTTP_POST_VARS['submit'])) ? true : false; + </pre></blockquote> + + <p class="good">// Use request var and define a default variable (use the correct type)</p> + <blockquote><pre> +$start = request_var('start', 0); +$submit = (isset($_POST['submit'])) ? true : false; + </pre></blockquote> + + <p class="bad">// $start is an int, the following use of request_var therefore is not allowed</p> + <blockquote><pre> +$start = request_var('start', '0'); + </pre></blockquote> + + <h3>Login checks/redirection: </h3> + <p>To show a forum login box use <code>login_forum_box($forum_data)</code>, else use the <code>login_box()</code> function.</p> + + <h3>Sensitive Operatiosn: </h3> + <p>For sensitive operations always let the user confirm the action. For the confirmation screens, make use of the <code>confirm_box()</code> function.</p> + + <h3>Sessions: </h3> + <p>Sessions should be initiated on each page, as near the top as possible using the following code:</p> + + <blockquote><pre> +$user->start(); +$auth->acl($user->data); +$user->setup(); + </pre></blockquote> + + <p>The <code>$user->setup()</code> call can be used to pass on additional language definitions and a custom style (used in viewforum).</p> + + <h3>Errors and messages: </h3> + <p>All messages/errors should be output by calling <code>trigger_error()</code> using the appropriate message type and language string. Example:</p> + + <blockquote><pre> +trigger_error('NO_FORUM'); + </pre></blockquote> + + <h3>General Functions: </h3> + <p>Use <code>sizeof</code> instead of <code>count</code>, this is just a general preference and guideline and has no other benefit.</p> + + <p>Use <code>strpos</code> instead of <code>strstr</code>.</p> + + </div> + <a href="#top">Top</a> + <br /><br /> + +<hr /> + +<a name="styling"></a><h1>3. Styling</h1> +<div class="paragraph"> + +<a name="styling"></a> +<h3>General things</h3> +<p>Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms).</p> + +<p>The outer table class <code>forumline</code> has gone and is replaced with <code>tablebg</code>.</p> +<p>When writing <code><table></code> the order <code><table class="" cellspacing="" cellpadding="" border="" align=""></code> creates consistency and allows everyone to easily see which table produces which "look". The same applies to most other tags for which additional parameters can be set, consistency is the major aim here.</p> +<p>Each block level element should be indented by one tab, same for tabular elements, e.g. <code><tr></code> <code><td></code> etc., whereby the intendiation of <code><table></code> and the following/ending <code><tr></code> should be on the same line. This applies not to div elements of course.</p> +<p>Don't use <code><span></code> more than is essential ... the CSS is such that text sizes are dependent on the parent class. So writing <code><span class="gensmall"><span class="gensmall">TEST</span></span></code> will result in very very small text. Similarly don't use span at all if another element can contain the class definition, e.g.</p> + +<blockquote><pre> +<td><span class="gensmall">TEST</span></td> +</pre></blockquote> + +<p>can just as well become:</p> +<blockquote><pre> +<td class="gensmall">TEST</td> +</pre></blockquote> + +<p>Try to match text class types with existing useage, e.g. don't use the nav class where viewtopic uses gensmall for example.</p> + +<p>Row colours/classes are now defined by the template, use an <code>IF S_ROW_COUNT</code> switch, see viewtopic or viewforum for an example.</p> + +<p>Remember block level ordering is important ... while not all pages validate as XHTML 1.0 Strict compliant it is something we're trying to work too.</p> + +<p>Use a standard cellpadding of 2 and cellspacing of 0 on outer tables. Inner tables can vary from 0 to 3 or even 4 depending on the need.</p> + +<p>Use div container for styling and table for data representation</p> + +<p>The seperate catXXXX and thXXX classes are gone. When defining a header cell just use <code><th></code> rather than <code><th class="thHead"></code> etc. Similarly for cat, don't use <code><td class="catLeft"></code> use <code><td class="cat"></code> etc.</p> + +<p>Try to retain consistency of basic layout and class useage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. <code>{L_POST_USERNAME}<br /><span class="gensmall">{L_POST_USERNAME_EXPLAIN}</span></code> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule</p> + +<p>Try to keep template conditional and other statements tabbed in line with the block to which they refer.</p> + +<p class="bad">this is incorrect</p> +<blockquote><pre> +<!-- BEGIN test --> + <tr> + <td>{test.TEXT}</td> + </tr> +<!-- END test --> +</pre></blockquote> + +<p class="good">this is correct:</p> +<blockquote><pre> +<!-- BEGIN test --> +<tr> + <td>{test.TEXT}</td> +</tr> +<!-- END test --> +</pre></blockquote> + +<p>it gives immediate feedback on exactly what is looping.</p> + +</div> +<a href="#top">Top</a> +<br /><br /> + +<hr /> + +<a name="templating"></a><h1>4. Templating</h1> +<div class="paragraph"> + +<h3>File naming</h3> +<p>Firstly templates now take the suffix ".html" rather than ".tpl". This was done simply to make the lifes of some people easier wrt syntax highlighting, etc.</p> + +<h3>Variables</h3> +<p>All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, all other variables should be presented 'as is'.</p> + +<p>Note that unlike 2.0.x most language strings are not assigned from the source. When a language variable is found {L_YYYYYY} phpBB first looks if an assigned variable exists with that name. If it does, it uses that. If not it looks if an exsting string defined in the language file exists. This should reduce the need to assign loads of new lang vars in Mods.</p> + +<h3>Blocks</h3> +<p>The basic block level loop remains and takes the form:</p> +<blockquote><pre> +<!-- BEGIN loopname --> +markup, {loopname.X_YYYYY}, etc. +<!-- END loopname --> +</pre></blockquote> + +<p>However this has now been extended with the following additions. Firstly you can set the start and end points of the loop. For example:</p> + +<blockquote><pre> +<!-- BEGIN loopname(2) --> +markup +<!-- END loopname --> +</pre></blockquote> + +<p>Will start the loop on the third entry (note that indexes start at zero). Extensions of this are: +<br /><br /> +<code>loopname(2,4)</code>: Starts loop on third values, ends on fourth<br /> +<code>loopname(-4)</code>: Starts loop fourth from last value<br /> +<code>loopname(2, -4)</code>: Starts loop on third value, ends four from end<br /> +<br />Note that the indexing method may change since it's not really consistent at this time :)</p> + +<p>A further extension to begin is BEGINELSE:</p> + +<blockquote><pre> +<!-- BEGIN loop --> +markup +<!-- BEGINELSE --> +markup +<!-- END loop --> +</pre></blockquote> + +<p>This will cause the markup between <code>BEGINELSE</code> and <code>END</code> to be output if the loop contains no values. This is useful for forums with no topics (for example) ... in some ways it replaces "bits of" the existing "switch_" type control (the rest being replaced by conditionals, see below).</p> + +<h3>Including files</h3> +<p>Something that existed in 2.0.x which no longer exists in 3.0.x is the ability to assign a template to a variable. This was used (for example) to output the jumpbox. Instead (perhaps better, perhaps not but certainly more flexible) we now have INCLUDE. This takes the simple form:</p> + +<blockquote><pre> +<!-- INCLUDE filename --> +</pre></blockquote> + +<p>You will note in the 3.0 templates the major sources start with <code><!-- INCLUDE overall_header.html --></code> or <code><!-- INCLUDE simple_header.html --></code>, etc. In 2.0.x control of "which" header to use was defined entirely within the code. In 3.0.x the template designer can output what they like. Note that you can introduce new templates (i.e. other than those in the default set) using this system and include them as you wish ... perhaps useful for a common "menu" bar or some such. No need to modify loads of files as with 2.0.x.</p> + +<h3>PHP</h3> +<p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p> + +<blockquote><pre> +<!-- PHP --> +echo "hello!"; +<!-- ENDPHP --> +</pre></blockquote> + +<p>You may also include PHP from an external file using:</p> + +<blockquote><pre> +<!-- INCLUDEPHP somefile.php --> +</pre></blockquote> + +<p>it will be included and executed inline.<br /><br />A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="http://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p> + +<h3>Conditionals/Control structures</h3> +<p>The most significant addition to 3.0.x are conditions or control structures, "if something then do this else do that". The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:</p> + +<blockquote><pre> +<!-- IF expr --><br />markup<br /><!-- ENDIF --> +</pre></blockquote> + +<p>expr can take many forms, for example:</p> + +<blockquote><pre> +<!-- IF loop.S_ROW_COUNT is even --> +markup +<!-- ENDIF --> +</pre></blockquote> + +<p>This will output the markup if the S_ROW_COUNT variable in the current iteration of loop is an even value (i.e. the expr is TRUE). You can use various comparison methods (standard as well as equivalent textual versions noted in square brackets) including:</p> + +<blockquote><pre> +== [eq] +!= [neq, ne] +<> (same as !=) +!== (not equivalent in value and type) +=== (equivalent in value and type) +> [gt] +< [lt] +>= [gte] +<= [lte] +&& [and] +|| [or] +% [mod] +! [not] ++ +- +* +/ +<< (bitwise shift left) +>> (bitwise shift right) +| (bitwise or) +^ (bitwise xor) +& (bitwise and) +~ (bitwise not) +is (can be used to join comparison operations) +</pre></blockquote> + +<p>Basic parenthesis can also be used to enforce good old BODMAS rules. Additionally some basic comparison types are defined:</p> + +<blockquote><pre> +even +odd +div +</pre></blockquote> + +<p>Beyond the simple use of IF you can also do a sequence of comparisons using the following:</p> + +<blockquote><pre> +<!-- IF expr1 --> +markup +<!-- ELSEIF expr2 --> +markup +. +. +. +<!-- ELSEIF exprN --> +markup +<!-- ELSE --> +markup +<!-- ENDIF --> +</pre></blockquote> + +<p>Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match "everything else".<br /><br />So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.0.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:</p> + +<blockquote><pre> +<table> + <!-- IF loop.S_ROW_COUNT is even --> + <tr class="row1"> + <!-- ELSE --> + <tr class="row2"> + <!-- ENDIF --> + <td>HELLO!</td> +</tr> +</table> +</pre></blockquote> + +<p>This will cause the row cell to be output using class row1 when the row count is even, and class row2 otherwise. The S_ROW_COUNT parameter gets assigned to loops by default. Another example would be the following: </p> + +<blockquote><pre> +<table> + <!-- IF loop.S_ROW_COUNT > 10 --> + <tr bgcolor="#FF0000"> + <!-- ELSEIF loop.S_ROW_COUNT > 5 --> + <tr bgcolor="#00FF00"> + <!-- ELSEIF loop.S_ROW_COUNT > 2 --> + <tr bgcolor="#0000FF"> + <!-- ELSE --> + <tr bgcolor="#FF00FF"> + <!-- ENDIF --> + <td>hello!</td> +</tr> +</table> +</pre></blockquote> + +<p>This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a "nice" gradient effect, for example.<br /><br />What else can you do? Well, you could use IF to do common checks on for example the login state of a user:</p> + +<blockquote><pre> +<!-- IF S_USER_LOGGED_IN --> +markup +<!-- ENDIF --> +</pre></blockquote> + +<p>This replaces the existing (fudged) method in 2.0.x using a zero length array and BEGIN/END.</p> + +</div> +<a href="#top">Top</a> + +<hr /> +</div> + +<div id="footer"> $Id$ +<br /><br /> +</div> + +</body> +</html>
\ No newline at end of file diff --git a/phpBB/docs/coding-guidelines.txt b/phpBB/docs/coding-guidelines.txt deleted file mode 100644 index 700c9d0ea9..0000000000 --- a/phpBB/docs/coding-guidelines.txt +++ /dev/null @@ -1,26 +0,0 @@ -CODING GUIDELINES : Initials by psoTFX (July 2001) ------------------ - -* The coding style is defined in the codingstandards.html file, all attempts should be made to follow it as closely as possible - -* All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Oracle8, ODBC (generalised if possible, otherwise MS Access, DB2)) - -* All SQL commands should utilise the DataBase Abstraction Layer (DBAL) - -* All URL's (and form actions) _must_ be wrapped in append_sid, this ensures the session_id is propagated when cookies aren't available - -* The minimum amount of data should be passed via GET or POST, checking should occur within individual scripts (to prevent spoofing of information) - -* The auth function should be used for all authorisation checking - -* Sessions should be initiated on each page, as near the top as possible using the session_pagestart function (userdata should be obtained by calling the init_userprefs immediately after session initialisation) - -* Login checks should be forwarded to the login page (supplying a page to forward onto once check is complete if required) - -* All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, all other variables should be presented 'as is'. - -* Functions used by more than page should be placed in functions.php, functions specific to one page should be placed on that page (at the top to maintain compatibility with PHP3) surrounded by comments indicating the start and end of the function block - -* All messages/errors should be output by the message_die function using the appropriate message type (see function for details) - -* No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to) diff --git a/phpBB/docs/codingstandards.htm b/phpBB/docs/codingstandards.htm deleted file mode 100644 index 1cb7f3c57d..0000000000 --- a/phpBB/docs/codingstandards.htm +++ /dev/null @@ -1,327 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- saved from url=(0044) --> -<HTML><HEAD><TITLE>phpBB Coding Standard Guidelines</TITLE> -<META content="text/html; charset=windows-1252" http-equiv=Content-Type> -<META content="MSHTML 5.00.2920.0" name=GENERATOR></HEAD> -<BODY aLink=#cccccc bgColor=#ffffff link=#0000ff text=#000000 -vLink=#0000ff><FONT face=verdana,arial,tahoma size=-1><A name=top></A> -<H2>phpBB Coding Standard Guidelines</H2>Comments or suggestions? email <A -href="mailto:nate@phpbb.com">nate@phpbb.com</A><BR><BR><A -href="#editor">Editor -Settings</A><BR><A -href="#naming">Naming -Conventions</A><BR><A -href="#layout">Code Layout</A><BR><A -href="#general">General -Guidelines</A><BR><BR><BR><A name=editor></A><A -href="#top">top</A> -<H3>Editor Settings</H3> -<P><B>Tabs vs Spaces:</B> In order to make this as simple as possible, we will -be using tabs, not spaces. Feel free to set how many spaces your editor uses -when it <B>displays</B> tabs, but make sure that when you <B>save</B> the file, -it's saving tabs and not spaces. This way, we can each have the code be -displayed the way we like it, without breaking the layout of the actual files. -</P> -<P><B>Linefeeds:</B> Ensure that your editor is saving files in the UNIX format. -This means lines are terminated with a newline, not with a CR/LF combo as they -are on Win32, or whatever the Mac uses. Any decent Win32 editor should be able -to do this, but it might not always be the default. Know your editor. If you -want advice on Windows text editors, just ask one of the developers. Some of -them do their editing on Win32. </P><BR><BR><A name=naming></A><A -href="#top">top</A> -<H3>Naming Conventions</H3> -<P>We will not be using any form of hungarian notation in our naming -conventions. Many of us believe that hungarian naming is one of the primary code -obfuscation techniques currently in use. </P> -<P><B>Variable Names:</B> Variable names should be in all lowercase, with words -separated by an underscore. <BR><BR> Example: <CODE><FONT -size=+1>$current_user</FONT></CODE> is right, but <CODE><FONT -size=+1>$currentuser</FONT></CODE> and <CODE><FONT -size=+1>$currentUser</FONT></CODE> are not. <BR><BR>Names should be descriptive, -but concise. We don't want huge sentences as our variable names, but typing an -extra couple of characters is always better than wondering what exactly a -certain variable is for. </P> -<P><B>Loop Indices:</B> The <I>only</I> situation where a one-character variable -name is allowed is when it's the index for some looping construct. In this case, -the index of the outer loop should always be $i. If there's a loop inside that -loop, its index should be $j, followed by $k, and so on. If the loop is being -indexed by some already-existing variable with a meaningful name, this guideline -does not apply. <BR><BR> Example: <PRE><FONT size=+1> - for ($i = 0; $i < $outer_size; $i++) - { - for ($j = 0; $j < $inner_size; $j++) - { - foo($i, $j); - } - } </FONT></PRE> -<P></P> -<P><B>Function Names:</B> Functions should also be named descriptively. We're -not programming in C here, we don't want to write functions called things like -"stristr()". Again, all lower-case names with words separated by a single -underscore character. Function names should preferably have a verb in them -somewhere. Good function names are <CODE><FONT -size=+1>print_login_status()</FONT></CODE>, <CODE><FONT -size=+1>get_user_data()</FONT></CODE>, etc.. </P> -<P><B>Function Arguments:</B> Arguments are subject to the same guidelines as -variable names. We don't want a bunch of functions like: <CODE><FONT -size=+1>do_stuff($a, $b, $c)</FONT></CODE>. In most cases, we'd like to be able -to tell how to use a function by just looking at its declaration. </P> -<P><B>Summary:</B> The basic philosophy here is to not hurt code clarity for the -sake of laziness. This has to be balanced by a little bit of common sense, -though; <CODE><FONT size=+1>print_login_status_for_a_given_user()</FONT></CODE> -goes too far, for example -- that function would be better named <CODE><FONT -size=+1>print_user_login_status()</FONT></CODE> , or just <CODE><FONT -size=+1>print_login_status()</FONT></CODE>. </P><BR><BR><A name=layout></A><A -href="#top">top</A> -<H3>Code Layout</H3> -<P><B>Standard header for new files:</B> Here a template of the header that must -be included at the start of all phpBB files: <PRE><FONT size=+1> - /*************************************************************************** - filename.php - ------------------- - begin : Sat June 17 2000 - copyright : (C) 2000 The phpBB Group - email : support@phpBB.com - - $Id$ - - ***************************************************************************/ - - /*************************************************************************** - * - * 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. - * - ***************************************************************************/ - </FONT></PRE> -<P></P> -<P><B>Always include the braces:</B> This is another case of being too lazy to -type 2 extra characters causing problems with code clarity. Even if the body of -some construct is only one line long, do <I>not</I> drop the braces. Just don't. -<BR><BR> Examples:<PRE><FONT size=+1> - /* These are all wrong. */ - if (condition) do_stuff(); - if (condition) - do_stuff(); - while (condition) - do_stuff(); - for ($i = 0; $i < size; $i++) - do_stuff($i); - - /* These are right. */ - if (condition) - { - do_stuff(); - } - while (condition) - { - do_stuff(); - } - for ($i = 0; $i < size; $i++) - { - do_stuff(); - } - </FONT></PRE> -<P></P> -<P><B>Where to put the braces:</B> This one is a bit of a holy war, but we're -going to use a style that can be summed up in one sentence: Braces always go on -their own line. The closing brace should also always be at the same column as -the corresponding opening brace. <BR><BR> Examples:<PRE><FONT size=+1> - if (condition) - { - while (condition2) - { - ... - } - } - else - { - ... - } - - for ($i = 0; $i < $size; $i++) - { - ... - } - - while (condition) - { - ... - } - - function do_stuff() - { - ... - } - </FONT></PRE> -<P></P> -<P><B>Use spaces between tokens:</B> This is another simple, easy step that -helps keep code readable without much effort. Whenever you write an assignment, -expression, etc.. Always leave <I>one</I> space between the tokens. Basically, -write code as if it was English. Put spaces between variable names and -operators. Don't put spaces just after an opening bracket or before a closing -bracket. Don't put spaces just before a comma or a semicolon. This is best shown -with a few examples. <BR><BR> Examples:<PRE><FONT size=+1> - /* Each pair shows the wrong way followed by the right way. */ - - $i=0; - $i = 0; - - if($i<7) ... - if ($i < 7) ... - - if ( ($i < 7)&&($j > 8) ) ... - if (($i < 7) && ($j > 8)) ... - - do_stuff( $i, "foo", $b ); - do_stuff($i, "foo", $b); - - for($i=0; $i<$size; $i++) ... - for($i = 0; $i < $size; $i++) ... - - $i=($j < $size)?0:1; - $i = ($j < $size) ? 0 : 1; - </FONT></PRE> -<P></P> -<P><B>Operator precedence:</B> Do you know the exact precedence of all the -operators in PHP? Neither do I. Don't guess. Always make it obvious by using -brackets to force the precedence of an equation so you know what it does. -<BR><BR> Examples:<PRE><FONT size=+1> - /* what's the result? who knows. */ - $bool = ($i < 7 && $j > 8 || $k == 4); - - /* now you can be certain what I'm doing here. */ - $bool = (($i < 7) && (($j < 8) || ($k == 4))) - </FONT></PRE> -<P></P> -<P><B>SQL code layout:</B> Since we'll all be using different editor settings, -don't try to do anything complex like aligning columns in SQL code. Do, however, -break statements onto their own lines. Here's a sample of how SQL code should -look. Note where the lines break, the capitalization, and the use of brackets. -<BR><BR> Examples:<PRE><FONT size=+1> - SELECT field1 AS something, field2, field3 - FROM table a, table b - WHERE (this = that) AND (this2 = that2) - </FONT></PRE> -<P></P> -<P><B>SQL insert statements:</B> SQL INSERT statements can be written in two -different ways. Either you specify explicitly the columns being inserted, or -you rely on knowing the order of the columns in the database and do not -specify them. We want to use the former approach, where it is explicitly -stated whcih columns are being inserted. This means our application-level code -will not depend on the order of the fields in the database, and will not be broken -if we add additional fields (unless they're specified as NOT NULL, of course). -<BR><BR> Examples:<PRE><FONT size=+1> - # This is not what we want. - INSERT INTO mytable - VALUES ('something', 1, 'else') - - # This is correct. - INSERT INTO mytable (column1, column2, column3) - VALUES ('something', 1, 'else') - </FONT></PRE> -<P></P><BR><BR><A name=general></A><A -href="#top">top</A> -<H3>General Guidelines</H3> -<P><B>Quoting strings:</B> There are two different ways to quote strings in PHP -- either with single quotes or with double quotes. The main difference is that -the parser does variable interpolation in double-quoted strings, but not in -single quoted strings. Because of this, you should <I>always</I> use single -quotes <I>unless</I> you specifically need variable interpolation to be done on -that string. This way, we can save the parser the trouble of parsing a bunch of -strings where no interpolation needs to be done. Also, if you are using a string -variable as part of a function call, you do not need to enclose that variable in -quotes. Again, this will just make unnecessary work for the parser. Note, -however, that nearly all of the escape sequences that exist for double-quoted -strings will not work with single-quoted strings. Be careful, and feel free to -break this guideline if it's making your code harder to read. -<BR><BR> Examples:<PRE><FONT size=+1> - /* wrong */ - $str = "This is a really long string with no variables for the parser to find."; - do_stuff("$str"); - - /* right */ - $str = 'This is a really long string with no variables for the parser to find.'; - do_stuff($str); - </FONT></PRE> -<P></P> -<P><B>Associative array keys:</B> In PHP, it's legal to use a literal string as -a key to an associative array without quoting that string. We don't want to do -this -- the string should always be quoted to avoid confusion. Note that this is -only when we're using a literal, not when we're using a variable. -<BR><BR> Examples:<PRE><FONT size=+1> - /* wrong */ - $foo = $assoc_array[blah]; - - /* right */ - $foo = $assoc_array['blah']; - </FONT></PRE> -<P></P> -<P><B>Comments:</B> Each function should be preceded by a comment that tells a -programmer everything they need to know to use that function. The meaning of -every parameter, the expected input, and the output are required as a minimal -comment. The function's behaviour in error conditions (and what those error -conditions are) should also be present. Nobody should have to look at the actual -source of a function in order to be able to call it with confidence in their own -code. <BR><BR>In addition, commenting any tricky, obscure, or otherwise -not-immediately-obvious code is clearly something we should be doing. Especially -important to document are any assumptions your code makes, or preconditions for -its proper operation. Any one of the developers should be able to look at any -part of the application and figure out what's going on in a reasonable amount of -time. </P> -<P><B>Magic numbers:</B> Don't use them. Use named constants for any literal -value other than obvious special cases. Basically, it's OK to check if an array -has 0 elements by using the literal 0. It's not OK to assign some special -meaning to a number and then use it everywhere as a literal. This hurts -readability AND maintainability. Included in this guideline is that we should be -using the constants TRUE and FALSE in place of the literals 1 and 0 -- even -though they have the same values, it's more obvious what the actual logic is -when you use the named constants. </P> -<P><B>Shortcut operators:</B> The only shortcut operators that cause readability -problems are the shortcut increment ($i++) and decrement ($j--) operators. These -operators should not be used as part of an expression. They can, however, be -used on their own line. Using them in expressions is just not worth the -headaches when debugging. <BR><BR> Examples:<PRE><FONT size=+1> - /* wrong */ - $array[++$i] = $j; - $array[$i++] = $k; - - - /* right */ - $i++; - $array[$i] = $j; - - $array[$i] = $k; - $i++; - </FONT></PRE> -<P></P> -<P><B>Inline conditionals:</B> Inline conditionals should only be used to do -very simple things. Preferably, they will only be used to do assignments, and -not for function calls or anything complex at all. They can be harmful to -readability if used incorrectly, so don't fall in love with saving typing by -using them. <BR><BR> Examples:<PRE><FONT size=+1> - /* Bad place to use them */ - (($i < $size) && ($j > $size)) ? do_stuff($foo) : do_stuff($bar); - - - /* OK place to use them */ - $min = ($i < $j) ? $i : $j; - </FONT></PRE> -<P></P> -<P><B>Don't use uninitialized variables.</B> for phpBB 2, we intend to use a -higher level of run-time error reporting. This will mean that the use of an -uninitialized variable will be reported as an error. This will come up most -often when checking which HTML form variables were passed. These errors can be -avoided by using the built-in isset() function to check whether a variable has -been set. <BR><BR> Examples:<PRE><FONT size=+1> - /* Old way */ - if ($forum) ... - - - /* New way */ - if (isset($forum)) ... - </FONT></PRE> -<P></P><BR><BR><A href="#top">Return -to top</A> </FONT></BODY></HTML> diff --git a/phpBB/docs/header_bg.jpg b/phpBB/docs/header_bg.jpg Binary files differnew file mode 100644 index 0000000000..5ecec5360b --- /dev/null +++ b/phpBB/docs/header_bg.jpg diff --git a/phpBB/docs/header_left.jpg b/phpBB/docs/header_left.jpg Binary files differnew file mode 100644 index 0000000000..aaebf33c7a --- /dev/null +++ b/phpBB/docs/header_left.jpg diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php index 4b0cf6486c..e4d6e2b527 100644 --- a/phpBB/includes/acm/acm_db.php +++ b/phpBB/includes/acm/acm_db.php @@ -87,13 +87,14 @@ class acm } $this->var_expires = array(); - if (count($delete)) + if (sizeof($delete)) { $sql = 'DELETE FROM ' . CACHE_TABLE . " WHERE var_name IN ('" . implode("', '", $delete) . "')"; $db->sql_query($sql); } - if (count($insert)) + + if (sizeof($insert)) { switch (SQL_LAYER) { diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index 6ab8b53668..da04c881d1 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -236,7 +236,7 @@ class acm // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = 'Cache id #' . count($this->sql_rowset); + $query_id = 'Cache id #' . sizeof($this->sql_rowset); if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx")) { diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index a7c229932b..4a3293648e 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -39,7 +39,7 @@ function login_ldap(&$username, &$password) $search = @ldap_search($ldap, $config['ldap_base_dn'], $config['ldap_uid'] . '=' . $username, array($config['ldap_uid'])); $result = @ldap_get_entries($ldap, $search); - if (is_array($result) && count($result) > 1) + if (is_array($result) && sizeof($result) > 1) { if (@ldap_bind($ldap, $result[0]['dn'], $password)) { diff --git a/phpBB/includes/db/mssql-odbc.php b/phpBB/includes/db/mssql-odbc.php index a0a6125aa3..bd33bc63cb 100644 --- a/phpBB/includes/db/mssql-odbc.php +++ b/phpBB/includes/db/mssql-odbc.php @@ -558,7 +558,7 @@ class sql_db { while ($row = $this->sql_fetchrow($result)) { - if (!$html_table && count($row)) + if (!$html_table && sizeof($row)) { $html_table = TRUE; $html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>'; diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 14778a7e66..b1aefc66ca 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -454,7 +454,7 @@ class sql_db { while ($row = mysql_fetch_assoc($result)) { - if (!$html_table && count($row)) + if (!$html_table && sizeof($row)) { $html_table = TRUE; $html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>'; diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index abeee3a358..f64e22eab1 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -148,7 +148,7 @@ class sql_db { while ($row = @sqlite_fetch_array($result, @sqlite_ASSOC)) { - if (!$html_table && count($row)) + if (!$html_table && sizeof($row)) { $html_table = TRUE; $this->sql_report .= "<table width=100% border=1 cellpadding=2 cellspacing=1>\n"; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7eacbe91fd..848e97d935 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -110,7 +110,7 @@ function gen_rand_string($num_chars) list($usec, $sec) = explode(' ', microtime()); mt_srand($sec * $usec); - $max_chars = count($chars) - 1; + $max_chars = sizeof($chars) - 1; $rand_str = ''; for ($i = 0; $i < $num_chars; $i++) { @@ -505,7 +505,7 @@ function tz_select($default = '') global $sys_timezone, $user; $tz_select = ''; - foreach ($user->lang['tz'] as $offset => $zone) + foreach ($user->lang['tz']['zones'] as $offset => $zone) { if (is_numeric($offset)) { @@ -631,7 +631,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false) { global $config, $db, $user; - if ($user->data['user_id'] == ANONYMOUS) + if (!$user->data['is_registered']) { return; } @@ -1804,7 +1804,7 @@ function page_header($page_title = '') $s_privmsg_new = false; // Obtain number of new private messages if user is logged in - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { if ($user->data['user_new_privmsg']) { @@ -1842,7 +1842,7 @@ function page_header($page_title = '') // Which timezone? $tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone'])); - + // The following assigns all _common_ variables that may be used at any point // in a template. $template->assign_vars(array( @@ -1889,10 +1889,10 @@ function page_header($page_title = '') 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], - 'S_TIMEZONE' => ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], (($tz >= 0) ? '+' . $tz : $tz), $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], (($tz >= 0) ? '+' . $tz : $tz), ''), - 'S_DISPLAY_ONLINE_LIST' => (!empty($config['load_online'])) ? 1 : 0, - 'S_DISPLAY_SEARCH' => (!empty($config['load_search'])) ? 1 : 0, - 'S_DISPLAY_PM' => (!empty($config['allow_privmsg'])) ? 1 : 0, + 'S_TIMEZONE' => ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], ''), + 'S_DISPLAY_ONLINE_LIST' => ($config['load_online']) ? 1 : 0, + 'S_DISPLAY_SEARCH' => ($config['load_search']) ? 1 : 0, + 'S_DISPLAY_PM' => ($config['allow_privmsg'] && $user->data['is_registered']) ? 1 : 0, 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, 'S_NEW_PM' => ($s_privmsg_new) ? 1 : 0, @@ -1957,7 +1957,7 @@ function page_footer() $template->assign_vars(array( 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', - 'U_ACP' => ($auth->acl_get('a_') && $user->data['user_id'] != ANONYMOUS) ? "adm/index.$phpEx?sid=" . $user->data['session_id'] : '') + 'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? "adm/index.$phpEx?sid=" . $user->data['session_id'] : '') ); $template->display('body'); diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 3d5f7c3391..190d07015e 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -34,7 +34,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) // Display list of active topics for this category? $show_active = (isset($root_data['forum_flags']) && $root_data['forum_flags'] & 16) ? true : false; - if ($config['load_db_lastread'] && $user->data['user_id'] != ANONYMOUS) + if ($config['load_db_lastread'] && $user->data['is_registered']) { switch (SQL_LAYER) { @@ -65,7 +65,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $forum_ids = array($root_data['forum_id']); while ($row = $db->sql_fetchrow($result)) { - if ($mark_read == 'forums' && $user->data['user_id'] != ANONYMOUS) + if ($mark_read == 'forums' && $user->data['is_registered']) { if ($auth->acl_get('f_list', $row['forum_id'])) { @@ -157,7 +157,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $mark_time_forum = ($config['load_db_lastread']) ? $row['mark_time'] : ((isset($tracking_topics[$forum_id][0])) ? base_convert($tracking_topics[$forum_id][0], 36, 10) + $config['board_startdate'] : 0); - if ($mark_time_forum < $row['forum_last_post_time'] && $user->data['user_id'] != ANONYMOUS) + if ($mark_time_forum < $row['forum_last_post_time'] && $user->data['is_registered']) { $forum_unread[$parent_id] = true; } @@ -240,7 +240,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) } $subforums_list = implode(', ', $links); - $l_subforums = (count($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': '; + $l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': '; } } @@ -290,7 +290,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $l_moderator = $moderators_list = ''; if ($display_moderators && !empty($forum_moderators[$forum_id])) { - $l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS']; + $l_moderator = (sizeof($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS']; $moderators_list = implode(', ', $forum_moderators[$forum_id]); } @@ -440,7 +440,7 @@ function topic_status(&$topic_row, $replies, $mark_time_topic, $mark_time_forum, $folder_new = 'folder_locked_new'; } - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { $unread_topic = $new_votes = true; diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index a679b1508a..f1e7b130f0 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -389,7 +389,7 @@ class jabber { $temp = $this->_split_incoming($incoming); - for ($a = 0; $a < count($temp); $a++) + for ($a = 0, $size = sizeof($temp); $a < $size; $a++) { $this->packet_queue[] = $this->xmlize($temp[$a]); } @@ -957,7 +957,7 @@ class make_xml extends jabber $temp = @explode('/', $string); - for ($a = 0; $a < count($temp); $a++) + for ($a = 0, $size = sizeof($temp); $a < $size; $a++) { $temp[$a] = preg_replace('#^[@]{1}([a-z0-9_]*)$#i', '["@"]["\1"]', $temp[$a]); $temp[$a] = preg_replace('#^([a-z0-9_]*)\(([0-9]*)\)$/i', '["\1"][\2]', $temp[$a]); @@ -1001,7 +1001,7 @@ class make_xml extends jabber } elseif (is_array($value)) { - for ($a = 0; $a < count($value); $a++) + for ($a = 0, $size = sizeof($value); $a < $size; $a++) { $text .= "<$key"; diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index fdcbf74ab5..afcfd86a38 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -473,7 +473,7 @@ class queue @set_time_limit(60); $package_size = $data_ary['package_size']; - $num_items = (count($data_ary['data']) < $package_size) ? count($data_ary['data']) : $package_size; + $num_items = (sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size; switch ($object) { @@ -552,7 +552,7 @@ class queue } // No more data for this object? Unset it - if (!count($this->queue_data[$object]['data'])) + if (!sizeof($this->queue_data[$object]['data'])) { unset($this->queue_data[$object]); } @@ -602,10 +602,14 @@ class queue foreach ($this->queue_data as $object => $data_ary) { - if (count($this->data[$object])) + if (isset($this->data[$object]) && sizeof($this->data[$object])) { $this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']); } + else + { + $this->data[$object]['data'] = $data_ary['data']; + } } } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 352b7a4e4a..c43c809562 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -868,7 +868,8 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . " AND w.user_id NOT IN ($sql_ignore_users) AND w.notify_status = 0 - AND u.user_id = w.user_id"; + AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ') + AND u.user_id = w.user_id'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -900,7 +901,8 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id WHERE fw.forum_id = $forum_id AND fw.user_id NOT IN ($sql_ignore_users) AND fw.notify_status = 0 - AND u.user_id = fw.user_id"; + AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ') + AND u.user_id = fw.user_id'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index e73ddb51ad..7d0a0d9cd4 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -133,7 +133,7 @@ function mcp_topic_view($id, $mode, $action, $url) 'MESSAGE' => $message, 'POST_ID' => $row['post_id'], - 'POST_ICON_IMG' => ($row['post_time'] > $user->data['user_lastvisit'] && $user->data['user_id'] != ANONYMOUS) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']), + 'POST_ICON_IMG' => ($row['post_time'] > $user->data['user_lastvisit'] && $user->data['is_registered']) ? $user->img('icon_post_new', $user->lang['NEW_POST']) : $user->img('icon_post', $user->lang['POST']), 'S_CHECKBOX' => $s_checkbox, 'S_POST_REPORTED' => ($row['post_reported']) ? true : false, diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 28d46dd5d6..8f7963f616 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -110,6 +110,9 @@ class session WHERE session_id = '" . $db->sql_escape($this->session_id) . "'"; $db->sql_query($sql); } + + $this->data['is_registered'] = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false; + $this->data['is_bot'] = (!$this->data['is_registered'] && $this->data['user_id'] != ANONYMOUS) ? true : false; return true; } @@ -135,7 +138,7 @@ class session $bot = false; // Pull bot information from DB and loop through it - $sql = 'SELECT user_id, bot_agent, bot_ip + $sql = 'SELECT user_id, bot_agent, bot_ip FROM ' . BOTS_TABLE . ' WHERE bot_active = 1'; $result = $db->sql_query($sql); @@ -146,8 +149,8 @@ class session { $bot = $row['user_id']; } - - if ($row['bot_ip'] && (!$row['bot_agent'] || $bot)) + + if ($row['bot_ip'] && (!$row['bot_agent'] || !$bot)) { foreach (explode(',', $row['bot_ip']) as $bot_ip) { @@ -276,6 +279,8 @@ class session // Is there an existing session? If so, grab last visit time from that $this->data['session_last_visit'] = ($this->data['session_time']) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : time()); + $this->data['is_registered'] = (!$bot && $user_id != ANONYMOUS) ? true : false; + $this->data['is_bot'] = ($bot) ? true : false; // Create or update the session $db->sql_return_on_error(true); @@ -358,9 +363,18 @@ class session $db->sql_query($sql); // Reset some basic data immediately - $this->session_id = $this->data['username'] = $this->data['user_permissions'] = ''; $this->data['user_id'] = ANONYMOUS; - $this->data['session_admin'] = 0; + + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . ANONYMOUS; + $result = $db->sql_query($sql); + + $this->data = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $this->session_id = $this->data['session_id'] = ''; + $this->data['session_time'] = $this->data['session_admin'] = 0; // Trigger EVENT_END_SESSION diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index d7a2bfa5f8..3d9e0d605a 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -763,7 +763,7 @@ class template $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1)); - array_splice($tokens, $is_arg_start, count($tokens), $new_tokens); + array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens); $i = $is_arg_start; diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 1c7752cda8..692d1a53ea 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -441,7 +441,7 @@ class ucp_main extends module if ($config['load_db_lastread']) { - $mark_time_topic = ($user->data['user_id'] != ANONYMOUS) ? $row['mark_time'] : 0; + $mark_time_topic = ($user->data['is_registered']) ? $row['mark_time'] : 0; $mark_time_forum = $row['forum_mark_time']; } else diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 0ec90c3886..ee67746592 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -45,7 +45,7 @@ class ucp_pm extends module { global $user, $template, $phpbb_root_path, $auth, $phpEx, $db, $SID, $config; - if ($user->data['user_id'] == ANONYMOUS) + if (!$user->data['is_registered']) { trigger_error('NO_MESSAGE'); } @@ -89,7 +89,7 @@ class ucp_pm extends module case 'popup': $l_new_message = ''; - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { if ($user->data['user_new_privmsg']) { diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 2a4505956a..b6e98a0892 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -52,7 +52,7 @@ $lang += array( 'ALL_FORUMS' => 'All Forums', 'ALL_MESSAGES' => 'All Messages', 'ALL_POSTS' => 'All Posts', - 'ALL_TIMES' => 'All times are GMT%1$s %2$s', + 'ALL_TIMES' => 'All times are %1$s %2$s', 'ALL_TOPICS' => 'All Topics', 'AND' => 'And', 'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum', @@ -484,38 +484,72 @@ $lang += array( ), 'tz' => array( - '-12' => '[GMT-12] Eniwetok, Kwaialein', - '-11' => '[GMT-11] Midway Island, Samoa', - '-10' => '[GMT-10] Hawaii, Honolulu', - '-9' => '[GMT-9] Alaska', - '-8' => '[GMT-8] Anchorage, Los Angeles, San Francisco, Seattle', - '-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe', - '-6' => '[GMT-6] Chicago, Guatamala, Mexico City, Saskatchewan East', - '-5' => '[GMT-5] Bogota, Kingston, Lima, New York', - '-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago', - '-3.5' => '[GMT-3.5] Standard Time [Canada], Newfoundland', - '-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero', - '-2' => '[GMT-2] Mid-Atlantic', - '-1' => '[GMT-1] Azores, Cape Verde Is.', - '0' => '[GMT] Dublin, Edinburgh, Iceland, Lisbon, London, Casablanca', - '1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna', - '2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul', - '3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh', - '3.5' => '[GMT+3.5] Iran', - '4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd', - '4.5' => '[GMT+4.5] Afghanistan', - '5' => '[GMT+5] Calcutta, Madras, New Dehli', - '5.5' => '[GMT+5.5] India', - '6' => '[GMT+6] Almaty, Dhakar, Kathmandu', - '6.5' => '[GMT+6.5] Rangoon', - '7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh', - '8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei', - '9' => '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk', - '9.5' => '[GMT+9.5] Adelaide, Darwin', - '10' => '[GMT+10) Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney', - '11' => '[GMT+11] Magadan, New Caledonia, Solomon Is.', - '12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington', - 'dst' => '[DST]' + '-12' => 'GMT - 12 Hours', + '-11' => 'GMT - 11 Hours', + '-10' => 'GMT - 10 Hours', + '-9' => 'GMT - 9 Hours', + '-8' => 'GMT - 8 Hours', + '-7' => 'GMT - 7 Hours', + '-6' => 'GMT - 6 Hours', + '-5' => 'GMT - 5 Hours', + '-4' => 'GMT - 4 Hours', + '-3.5' => 'GMT - 3.5 Hours', + '-3' => 'GMT - 3 Hours', + '-2' => 'GMT - 2 Hours', + '-1' => 'GMT - 1 Hour', + '0' => 'GMT', + '1' => 'GMT + 1 Hour', + '2' => 'GMT + 2 Hours', + '3' => 'GMT + 3 Hours', + '3.5' => 'GMT + 3.5 Hours', + '4' => 'GMT + 4 Hours', + '4.5' => 'GMT + 4.5 Hours', + '5' => 'GMT + 5 Hours', + '5.5' => 'GMT + 5.5 Hours', + '6' => 'GMT + 6 Hours', + '6.5' => 'GMT + 6.5 Hours', + '7' => 'GMT + 7 Hours', + '8' => 'GMT + 8 Hours', + '9' => 'GMT + 9 Hours', + '9.5' => 'GMT + 9.5 Hours', + '10' => 'GMT + 10 Hours', + '11' => 'GMT + 11 Hours', + '12' => 'GMT + 12 Hours', + 'dst' => '[ DST ]', + + 'zones' => array( + '-12' => '[GMT-12] Eniwetok, Kwaialein', + '-11' => '[GMT-11] Midway Island, Samoa', + '-10' => '[GMT-10] Hawaii, Honolulu', + '-9' => '[GMT-9] Alaska', + '-8' => '[GMT-8] Anchorage, Los Angeles, San Francisco, Seattle', + '-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe', + '-6' => '[GMT-6] Chicago, Guatamala, Mexico City, Saskatchewan East', + '-5' => '[GMT-5] Bogota, Kingston, Lima, New York', + '-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago', + '-3.5' => '[GMT-3.5] Standard Time [Canada], Newfoundland', + '-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero', + '-2' => '[GMT-2] Mid-Atlantic', + '-1' => '[GMT-1] Azores, Cape Verde Is.', + '0' => '[GMT] Dublin, Edinburgh, Iceland, Lisbon, London, Casablanca', + '1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna', + '2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul', + '3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh', + '3.5' => '[GMT+3.5] Iran', + '4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd', + '4.5' => '[GMT+4.5] Afghanistan', + '5' => '[GMT+5] Calcutta, Madras, New Dehli', + '5.5' => '[GMT+5.5] India', + '6' => '[GMT+6] Almaty, Dhakar, Kathmandu', + '6.5' => '[GMT+6.5] Rangoon', + '7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh', + '8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei', + '9' => '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk', + '9.5' => '[GMT+9.5] Adelaide, Darwin', + '10' => '[GMT+10] Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney', + '11' => '[GMT+11] Magadan, New Caledonia, Solomon Is.', + '12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington' + ), ), ); diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 360648457f..f5ce9ea16c 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -314,14 +314,14 @@ if ($mode == 'approve' || $mode == 'disapprove') } // Only Moderators can go beyond this point -if ($user->data['user_id'] == ANONYMOUS) +if (!$user->data['is_registered']) { - login_box('', $user->lang['LOGIN_EXPLAIN_MCP']); - - if ($user->data['user_id'] == ANONYMOUS) + if ($user->data['is_bot']) { redirect("index.$phpEx$SID"); } + + login_box('', $user->lang['LOGIN_EXPLAIN_MCP']); } $quickmod = (isset($_REQUEST['quickmod'])) ? true : false; diff --git a/phpBB/posting.php b/phpBB/posting.php index 4a6a8b91c1..8a4a176d3f 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -245,7 +245,7 @@ if ($sql) $enable_magic_url = $drafts = false; // User own some drafts? - if ($user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts') && $mode != 'delete') + if ($user->data['is_registered'] && $auth->acl_get('u_savedrafts') && $mode != 'delete') { $sql = 'SELECT draft_id FROM ' . DRAFTS_TABLE . ' @@ -265,7 +265,7 @@ if ($sql) } // Notify user checkbox -if ($mode != 'post' && $user->data['user_id'] != ANONYMOUS) +if ($mode != 'post' && $user->data['is_registered']) { $sql = 'SELECT topic_id FROM ' . TOPICS_WATCH_TABLE . ' @@ -282,7 +282,7 @@ else if (!$auth->acl_get('f_' . $mode, $forum_id) && $forum_type == FORUM_POST) { - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { trigger_error('USER_CANNOT_' . strtoupper($mode)); } @@ -328,7 +328,7 @@ if ($mode == 'edit') // Delete triggered ? -if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('f_delete', $forum_id) && $post_id == $topic_last_post_id) || $auth->acl_get('m_delete', $forum_id))) +if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $topic_last_post_id) || $auth->acl_get('m_delete', $forum_id))) { $s_hidden_fields = '<input type="hidden" name="p" value="' . $post_id . '" /><input type="hidden" name="f" value="' . $forum_id . '" /><input type="hidden" name="mode" value="delete" />'; @@ -434,7 +434,7 @@ else if ($mode == 'bump') } // Save Draft -if ($save && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts')) +if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts')) { $subject = request_var('subject', '', true); $subject = (!$subject && $mode != 'post') ? $topic_title : $subject; @@ -467,7 +467,7 @@ if ($save && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts } // Load Draft -if ($draft_id && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('u_savedrafts')) +if ($draft_id && $user->data['is_registered'] && $auth->acl_get('u_savedrafts')) { $sql = 'SELECT draft_subject, draft_message FROM ' . DRAFTS_TABLE . " @@ -517,7 +517,7 @@ if ($submit || $preview || $refresh) $enable_bbcode = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true; $enable_smilies = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true; $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; - $enable_sig = (!$config['allow_sig']) ? false : ((isset($_POST['attach_sig']) && $user->data['user_id'] != ANONYMOUS) ? true : false); + $enable_sig = (!$config['allow_sig']) ? false : ((isset($_POST['attach_sig']) && $user->data['is_registered']) ? true : false); $notify = (isset($_POST['notify'])); $topic_lock = (isset($_POST['lock_topic'])); @@ -620,7 +620,7 @@ if ($submit || $preview || $refresh) // Flood check $last_post_time = 0; - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { $last_post_time = $user->data['user_lastpost_time']; } @@ -648,7 +648,7 @@ if ($submit || $preview || $refresh) } // Validate username - if (($username && $user->data['user_id'] == ANONYMOUS) || ($mode == 'edit' && $post_username)) + if (($username && !$user->data['is_registered']) || ($mode == 'edit' && $post_username)) { include($phpbb_root_path . 'includes/functions_user.' . $phpEx); @@ -765,7 +765,7 @@ if ($submit || $preview || $refresh) { // Lock/Unlock Topic $change_topic_status = $topic_status; - $perm_lock_unlock = ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['user_id'] != ANONYMOUS && $user->data['user_id'] == $topic_poster)); + $perm_lock_unlock = ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_poster)); if ($topic_status == ITEM_LOCKED && !$topic_lock && $perm_lock_unlock) { @@ -784,7 +784,7 @@ if ($submit || $preview || $refresh) AND topic_moved_id = 0"; $db->sql_query($sql); - $user_lock = ($auth->acl_get('f_user_lock', $forum_id) && $user->data['user_id'] != ANONYMOUS && $user->data['user_id'] == $topic_poster) ? 'USER_' : ''; + $user_lock = ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_poster) ? 'USER_' : ''; add_log('mod', $forum_id, $topic_id, 'LOG_' . $user_lock . (($change_topic_status == ITEM_LOCKED) ? 'LOCK' : 'UNLOCK'), $topic_title); } @@ -1005,7 +1005,7 @@ $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_ $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1); $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; $sig_checked = $enable_sig; -$notify_checked = (isset($notify)) ? $notify : ((!$notify_set) ? (($user->data['user_id'] != ANONYMOUS) ? $user->data['user_notify'] : 0) : 1); +$notify_checked = (isset($notify)) ? $notify : ((!$notify_set) ? (($user->data['is_registered']) ? $user->data['user_notify'] : 0) : 1); $lock_topic_checked = (isset($topic_lock)) ? $topic_lock : (($topic_status == ITEM_LOCKED) ? 1 : 0); $lock_post_checked = (isset($post_lock)) ? $post_lock : $post_edit_locked; @@ -1090,7 +1090,7 @@ $template->assign_vars(array( 'S_CLOSE_PROGRESS_WINDOW' => isset($_POST['add_file']), 'S_EDIT_POST' => ($mode == 'edit'), 'S_EDIT_REASON' => ($mode == 'edit' && $user->data['user_id'] != $poster_id), - 'S_DISPLAY_USERNAME' => ($user->data['user_id'] == ANONYMOUS || ($mode == 'edit' && $post_username)), + 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_username)), 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $topic_last_post_id && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))), 'S_HTML_ALLOWED' => $html_status, @@ -1099,18 +1099,18 @@ $template->assign_vars(array( 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', - 'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['user_id'] != ANONYMOUS), + 'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']), 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', - 'S_NOTIFY_ALLOWED' => ($user->data['user_id'] != ANONYMOUS), + 'S_NOTIFY_ALLOWED' => ($user->data['is_registered']), 'S_NOTIFY_CHECKED' => ($notify_checked) ? ' checked="checked"' : '', - 'S_LOCK_TOPIC_ALLOWED' => (($mode == 'edit' || $mode == 'reply' || $mode == 'quote') && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['user_id'] != ANONYMOUS && $user->data['user_id'] == $topic_poster))), + 'S_LOCK_TOPIC_ALLOWED' => (($mode == 'edit' || $mode == 'reply' || $mode == 'quote') && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_poster))), 'S_LOCK_TOPIC_CHECKED' => ($lock_topic_checked) ? ' checked="checked"' : '', 'S_LOCK_POST_ALLOWED' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)), 'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '', 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', 'S_TYPE_TOGGLE' => $topic_type_toggle, - 'S_SAVE_ALLOWED' => ($auth->acl_get('u_savedrafts') && $user->data['user_id'] != ANONYMOUS), - 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $user->data['user_id'] != ANONYMOUS && $drafts), + 'S_SAVE_ALLOWED' => ($auth->acl_get('u_savedrafts') && $user->data['is_registered']), + 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $user->data['is_registered'] && $drafts), 'S_FORM_ENCTYPE' => $form_enctype, 'S_POST_ACTION' => $s_action, @@ -1355,7 +1355,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'enable_smilies' => $data['enable_smilies'], 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], - 'post_username' => ($user->data['user_id'] == ANONYMOUS) ? stripslashes($username) : '', + 'post_username' => (!$user->data['is_registered']) ? stripslashes($username) : '', 'post_subject' => $subject, 'post_text' => $data['message'], 'post_checksum' => $data['message_md5'], @@ -1437,7 +1437,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'icon_id' => $data['icon_id'], 'topic_approved' => ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('m_approve')) ? 0 : 1, 'topic_title' => $subject, - 'topic_first_poster_name' => ($user->data['user_id'] == ANONYMOUS && $username) ? stripslashes($username) : $user->data['username'], + 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? stripslashes($username) : $user->data['username'], 'topic_type' => $topic_type, 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, 'topic_attachment' => (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0 @@ -1537,7 +1537,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'topic_last_post_id' => $data['post_id'], 'topic_last_post_time' => $current_time, 'topic_last_poster_id' => (int) $user->data['user_id'], - 'topic_last_poster_name'=> ($user->data['user_id'] == ANONYMOUS && $username) ? stripslashes($username) : $user->data['username'] + 'topic_last_poster_name'=> (!$user->data['is_registered'] && $username) ? stripslashes($username) : $user->data['username'] ); } diff --git a/phpBB/report.php b/phpBB/report.php index d97cf4c755..19317afc78 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -24,7 +24,7 @@ $user->setup('mcp'); $id = request_var('p', request_var('pm', 0)); $report_post = (request_var('p', 0)) ? true : false; $reason_id = request_var('reason_id', 0); -$user_notify = (!empty($_REQUEST['notify']) && $user->data['user_id'] != ANONYMOUS) ? true : false; +$user_notify = (!empty($_REQUEST['notify']) && $user->data['is_registered']) ? true : false; $report_text = request_var('report_text', ''); if (!$id) @@ -100,7 +100,7 @@ $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) { - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { // A report exists, extract $row if we're going to display the form if ($reason_id) @@ -295,7 +295,7 @@ $template->assign_vars(array( 'S_REPORT_ACTION' => "{$phpbb_root_path}report.$phpEx$SID&$u_report" . (($report_id) ? "&report_id=$report_id" : ''), 'S_NOTIFY' => (!empty($user_notify)) ? true : false, - 'S_CAN_NOTIFY' => ($user->data['user_id'] == ANONYMOUS) ? false : true, + 'S_CAN_NOTIFY' => ($user->data['is_registered']) ? true : false, 'S_REPORT_POST' => $report_post) ); diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 515d36579e..c3cc7aeff7 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -248,7 +248,7 @@ switch ($mode) break; case 'register': - if ($user->data['user_id'] != ANONYMOUS || isset($_REQUEST['not_agreed'])) + if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) { redirect("index.$phpEx$SID"); } @@ -263,7 +263,7 @@ switch ($mode) break; case 'login': - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { redirect("index.$phpEx$SID"); } @@ -322,9 +322,9 @@ switch ($mode) // Only registered users can go beyond this point -if ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_INACTIVE || $user->data['user_type'] == USER_IGNORE) +if (!$user->data['is_registered']) { - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_bot']) { redirect("index.$phpEx$SID"); } diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1a9a91420b..14cae34d18 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -37,7 +37,7 @@ if (!$forum_id) } // Grab appropriate forum data -if ($user->data['user_id'] == ANONYMOUS) +if (!$user->data['is_registered']) { $sql = 'SELECT * FROM ' . FORUMS_TABLE . ' @@ -85,7 +85,7 @@ if (!($forum_data = $db->sql_fetchrow($result))) } $db->sql_freeresult($result); -if ($user->data['user_id'] == ANONYMOUS && $config['load_db_lastread']) +if (!$user->data['is_registered'] && $config['load_db_lastread']) { $forum_data['mark_time'] = 0; } @@ -117,7 +117,7 @@ if ($forum_data['forum_password']) } // Redirect to login upon emailed notification links -if (isset($_GET['e']) && $user->data['user_id'] == ANONYMOUS) +if (isset($_GET['e']) && !$user->data['is_registered']) { login_box('', $user->lang['LOGIN_NOTIFY_FORUM']); } @@ -158,7 +158,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16) // Handle marking posts if ($mark_read == 'topics') { - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { markread('mark', $forum_id); } @@ -307,11 +307,11 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16) break; default: - $sql_from = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t '; + $sql_from = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['is_registered']) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t '; } $sql_approved = ($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1'; - $sql_select = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? ', tt.mark_type, tt.mark_time' : ''; + $sql_select = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['is_registered']) ? ', tt.mark_type, tt.mark_time' : ''; if ($forum_data['forum_type'] == FORUM_POST) { @@ -397,7 +397,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16) if ($config['load_db_lastread']) { - $mark_time_topic = ($user->data['user_id'] != ANONYMOUS) ? $row['mark_time'] : 0; + $mark_time_topic = ($user->data['is_registered']) ? $row['mark_time'] : 0; } else { @@ -480,7 +480,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16) // on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find // any it updates the forum last read cookie. This requires that the user visit the forum // after reading a topic - if ($forum_data['forum_type'] == FORUM_POST && $user->data['user_id'] != ANONYMOUS && count($topic_list) && $mark_forum_read) + if ($forum_data['forum_type'] == FORUM_POST && $user->data['is_registered'] && sizeof($topic_list) && $mark_forum_read) { markread('mark', $forum_id); } diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 21a6f35f55..64e86d6417 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -252,7 +252,7 @@ while ($row = $db->sql_fetchrow($result)) 'FORUM_LOCATION'=> $location, 'USER_IP' => ($auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '', - 'U_USER_PROFILE' => ($row['user_type'] != USER_IGNORE && $row['user_id'] != ANONYMOUS) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] : '', + 'U_USER_PROFILE' => (($row['user_type'] == USER_NORMAL || $row['user_type'] == USER_FOUNDER) && $row['user_id'] != ANONYMOUS) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] : '', 'U_USER_IP' => "{$phpbb_root_path}viewonline.$phpEx$SID" . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&mode=lookup&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir", 'U_WHOIS' => "{$phpbb_root_path}viewonline.$phpEx$SID&mode=whois&s=" . $row['session_id'], 'U_FORUM_LOCATION' => $phpbb_root_path . $location_url, diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7f82e55074..cc0d2a7733 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -49,7 +49,7 @@ if ($view && !$post_id) { if ($view == 'unread') { - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { if ($config['load_db_lastread']) { @@ -152,7 +152,7 @@ else $extra_fields = (!$post_id) ? '' : ', COUNT(p2.post_id) AS prev_posts'; $order_sql = (!$post_id) ? '' : 'GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.poll_max_options, t.poll_start, t.poll_length, t.poll_title, f.forum_name, f.forum_desc, f.forum_parents, f.parent_id, f.left_id, f.right_id, f.forum_status, f.forum_id, f.forum_style, f.forum_password ORDER BY p.post_id ASC'; -if ($user->data['user_id'] != ANONYMOUS) +if ($user->data['is_registered']) { switch (SQL_LAYER) { @@ -199,7 +199,7 @@ extract($topic_data); $topic_replies = ($auth->acl_get('m_approve', $forum_id)) ? $topic_replies_real : $topic_replies; unset($topic_replies_real); -if ($user->data['user_id'] != ANONYMOUS) +if ($user->data['is_registered']) { if ($config['load_db_lastread']) { @@ -351,13 +351,13 @@ $viewtopic_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&f=$forum_id&t=$ // Are we watching this topic? $s_watching_topic = $s_watching_topic_img = array(); $s_watching_topic['link'] = $s_watching_topic['title'] = ''; -if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['user_id'] != ANONYMOUS) +if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) { watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $topic_id, $notify_status, $start); } // Bookmarks -if ($config['allow_bookmarks'] && $user->data['user_id'] != ANONYMOUS && request_var('bookmark', 0)) +if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('bookmark', 0)) { if (!$bookmarked) { @@ -417,7 +417,7 @@ gen_forum_auth_level('topic', $forum_id); // Quick mod tools $topic_mod = ''; -$topic_mod .= ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['user_id'] != ANONYMOUS && $user->data['user_id'] == $topic_poster)) ? (($topic_status == ITEM_UNLOCKED) ? '<option value="lock">' . $user->lang['LOCK_TOPIC'] . '</option>' : '<option value="unlock">' . $user->lang['UNLOCK_TOPIC'] . '</option>') : ''; +$topic_mod .= ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_poster)) ? (($topic_status == ITEM_UNLOCKED) ? '<option value="lock">' . $user->lang['LOCK_TOPIC'] . '</option>' : '<option value="unlock">' . $user->lang['UNLOCK_TOPIC'] . '</option>') : ''; $topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '<option value="delete_topic">' . $user->lang['DELETE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : ''; @@ -504,8 +504,8 @@ $template->assign_vars(array( 'U_WATCH_TOPIC' => $s_watching_topic['link'], 'L_WATCH_TOPIC' => $s_watching_topic['title'], - 'U_BOOKMARK_TOPIC' => ($user->data['user_id'] != ANONYMOUS && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', - 'L_BOOKMARK_TOPIC' => ($user->data['user_id'] != ANONYMOUS && $config['allow_bookmarks'] && $bookmarked) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'], + 'U_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', + 'L_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks'] && $bookmarked) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'], 'U_POST_NEW_TOPIC' => "posting.$phpEx$SID&mode=post&f=$forum_id", 'U_POST_REPLY_TOPIC' => "posting.$phpEx$SID&mode=reply&f=$forum_id&t=$topic_id", @@ -531,7 +531,7 @@ if (!empty($poll_start)) $db->sql_freeresult($result); $cur_voted_id = array(); - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { $sql = 'SELECT poll_option_id FROM ' . POLL_VOTES_TABLE . ' @@ -587,7 +587,7 @@ if (!empty($poll_start)) AND topic_id = $topic_id"; $db->sql_query($sql); - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . " (topic_id, poll_option_id, vote_user_id, vote_user_ip) VALUES ($topic_id, $option, " . $user->data['user_id'] . ", '$user->ip')"; @@ -605,7 +605,7 @@ if (!empty($poll_start)) AND topic_id = $topic_id"; $db->sql_query($sql); - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . " WHERE topic_id = $topic_id @@ -616,7 +616,7 @@ if (!empty($poll_start)) } } - if ($user->data['user_id'] == ANONYMOUS) + if ($user->data['user_id'] == ANONYMOUS && !$user->data['is_bot']) { $user->set_cookie('poll_' . $topic_id, implode(',', $voted_id), time() + 31536000); } @@ -1251,7 +1251,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'EDIT_REASON' => $row['post_edit_reason'], 'BUMPED_MESSAGE'=> $l_bumped_by, - 'MINI_POST_IMG' => ($user->data['user_id'] != ANONYMOUS && $row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('icon_post_new', 'NEW_POST') : $user->img('icon_post', 'POST'), + 'MINI_POST_IMG' => ($user->data['is_registered'] && $row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('icon_post_new', 'NEW_POST') : $user->img('icon_post', 'POST'), 'POST_ICON_IMG' => (!empty($row['icon_id'])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '', 'ICQ_STATUS_IMG' => $user_cache[$poster_id]['icq_status_img'], 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), @@ -1286,7 +1286,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_get('m_', $forum_id)) ? TRUE : FALSE, 'S_DISPLAY_NOTICE' => $display_notice && $row['post_attachment'], 'S_FRIEND' => ($row['friend']) ? true : false, - 'S_UNREAD_POST' => ($user->data['user_id'] != ANONYMOUS && $row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? true : false, + 'S_UNREAD_POST' => ($user->data['is_registered'] && $row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? true : false, 'S_FIRST_UNREAD' => ($unread_post_id == $row['post_id']) ? true : false, 'S_CUSTOM_FIELDS' => (sizeof($cp_row)) ? true : false ); |
