diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 907fed3681..e441b9ff7f 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -150,14 +150,11 @@ function adm_page_header($page_title) 'S_USER_LANG' => $user->lang['USER_LANG'], 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => 'UTF-8', - 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], - 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT']) - ); + )); + + // application/xhtml+xml not used because of IE + header('Content-type: text/html; charset=UTF-8'); - if ($config['send_encoding']) - { - header('Content-type: text/html; charset=UTF-8'); - } header('Cache-Control: private, no-cache="set-cookie"'); header('Expires: 0'); header('Pragma: no-cache'); @@ -184,7 +181,7 @@ function adm_page_footer($copyright_html = true) $db->sql_report('display'); } - $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); + $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) { @@ -408,6 +405,35 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) $cfg_array[$config_name] = (int) $cfg_array[$config_name]; break; + // Absolute path + case 'script_path': + if (!$cfg_array[$config_name]) + { + break; + } + + $destination = str_replace('\\', '/', $cfg_array[$config_name]); + + if ($destination !== '/') + { + // Adjust destination path (no trailing slash) + if (substr($destination, -1, 1) == '/') + { + $destination = substr($destination, 0, -1); + } + + $destination = str_replace(array('../', './'), '', $destination); + + if ($destination[0] != '/') + { + $destination = '/' . $destination; + } + } + + $cfg_array[$config_name] = trim($destination); + + break; + // Relative path (appended $phpbb_root_path) case 'rpath': case 'rwpath': @@ -419,9 +445,9 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) $destination = $cfg_array[$config_name]; // Adjust destination path (no trailing slash) - if ($destination{(sizeof($destination)-1)} == '/' || $destination{(sizeof($destination)-1)} == '\\') + if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\') { - $destination = substr($destination, 0, sizeof($destination)-2); + $destination = substr($destination, 0, -1); } $destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination); diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 698ea77f01..04535719b4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -2,6 +2,10 @@ + + « {L_BACK} + +

{L_TITLE}

{L_TITLE_EXPLAIN}

@@ -183,10 +187,6 @@
checked="checked" />
-
-

{L_DOWNLOAD_MODE_EXPLAIN}
-
{S_DOWNLOAD_SELECT}
-
{S_BAN_END_OPTIONS}
-
(YYYY-MM-DD)
+
(YYYY-MM-DD)

{L_BAN_EXCLUDE_EXPLAIN}
@@ -59,11 +59,11 @@
-
+
-
+

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 0c4e718353..6b531f545e 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -23,7 +23,7 @@ {L_TITLE}


{L_BOT_NAME_EXPLAIN}
-
+

{L_BOT_STYLE_EXPLAIN}
@@ -39,11 +39,11 @@

{L_BOT_AGENT_EXPLAIN}
-
+

{L_BOT_IP_EXPLAIN}
-
+

diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 2b141c0b37..3ffdda4eb3 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -29,10 +29,11 @@ -

+ +

+ {L_SUBMIT}   -

diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index c73670d9a8..8341d36c70 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -12,11 +12,11 @@
{L_RESTORE_OPTIONS}
-
+
- +

    @@ -53,26 +53,27 @@

{L_BACKUP_OPTIONS}
-
-
 {L_FULL_BACKUP}   {L_STRUCTURE_ONLY}   {L_DATA_ONLY}
+
+
 {L_FULL_BACKUP}   {L_STRUCTURE_ONLY}   {L_DATA_ONLY}
-
+
- checked="checked" /> {methods.TYPE} + id="method" checked="checked" type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}
-
-
 {L_STORE_AND_DOWNLOAD}   {L_STORE_LOCAL}   {L_DOWNLOAD}
+
+
 {L_STORE_AND_DOWNLOAD}   {L_STORE_LOCAL}   {L_DOWNLOAD}
-
-
-

{L_SELECT_ALL}
{L_DESELECT_ALL}
+ +
{L_SELECT_ALL} :: {L_DESELECT_ALL}

diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index 14e7c392c2..6486f66c32 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -12,7 +12,7 @@ {L_ADD_DISALLOW_TITLE}


{L_ADD_DISALLOW_EXPLAIN}
-
+

diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index a44b276bee..5744136230 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -39,8 +39,8 @@

-
-
+
+

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 427a1f07a4..5bbd235c04 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -143,23 +143,23 @@

-
+

{L_FORUM_DESC_EXPLAIN}
-
+
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}

{L_FORUM_IMAGE_EXPLAIN}
-
+
{L_FORUM_IMAGE}

{L_FORUM_PASSWORD_EXPLAIN}
-
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
@@ -192,12 +192,10 @@
-

{L_LIST_INDEX_EXPLAIN}
id="display_on_index" checked="checked" /> {L_YES}   id="display_on_index" checked="checked" /> {L_NO}
-

{L_ENABLE_POST_REVIEW_EXPLAIN}
id="enable_post_review" checked="checked" /> {L_YES}   id="enable_post_review" checked="checked" /> {L_NO}
@@ -216,7 +214,7 @@

{L_FORUM_TOPICS_PAGE_EXPLAIN}
-
+
@@ -228,15 +226,15 @@

{L_AUTO_PRUNE_FREQ_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_AUTO_PRUNE_DAYS_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
-
{L_DAYS}
+
{L_DAYS}

{L_PRUNE_OLD_POLLS_EXPLAIN}
@@ -256,9 +254,13 @@
@@ -190,11 +161,11 @@ {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} + {ICON_MOVE_DOWN} {ICON_MOVE_UP} {ICON_MOVE_DOWN} - + {ICON_MOVE_UP} {ICON_MOVE_DOWN_DISABLED} @@ -210,13 +181,13 @@
- {L_CREATE_ROLE}:
+ {L_CREATE_ROLE}:
- +

{L_ROLE_ASSIGNED_TO}

@@ -225,8 +196,6 @@ - - - + \ No newline at end of file diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 9e305e525c..f5a5f78c6b 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -261,8 +261,8 @@
{L_LOOK_UP_GROUP}
-
-
+
+
 
@@ -337,14 +337,9 @@

-
- {L_PERMISSION_APPLIED_TO_ALL}
- {L_MARK_ALL} • {L_UNMARK_ALL} -
-
- +


diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 1926af18a2..e316c35b2a 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -26,7 +26,7 @@ {L_ACP_RANKS}
-
+
diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 4aaf7328e7..e10cc1d1ca 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -30,7 +30,7 @@

{L_IS_TRANSLATED_EXPLAIN}{L_IS_NOT_TRANSLATED_EXPLAIN}

-
+
@@ -64,7 +64,7 @@

{L_ACP_REASONS_EXPLAIN}

-
+
{L_ACP_REASONS} diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 7a712892e8..b63226f4e1 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -17,11 +17,11 @@

{L_SEARCH_INTERVAL_EXPLAIN}
-
+
{L_SECONDS}

{L_SEARCH_GUEST_INTERVAL_EXPLAIN}
-
+
{L_SECONDS}

{L_LIMIT_SEARCH_LOAD_EXPLAIN}
@@ -33,7 +33,7 @@

{L_SEARCH_STORE_RESULTS_EXPLAIN}
-
+
{L_SECONDS}
@@ -91,10 +91,13 @@ - + + +
+ {backend.S_HIDDEN_FIELDS} -
+ {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE}) @@ -130,7 +133,7 @@

- + diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 6ee90b7d3d..efdaf1980a 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -322,15 +322,15 @@
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
@@ -516,7 +516,7 @@
- + diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 7bc81434d0..d44832b9b7 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -111,6 +111,10 @@
{USER_POSTS}
+
+
+
{USER_WARNINGS}
+

{L_FOUNDER_EXPLAIN}
id="user_founder" checked="checked" disabled="disabled" /> {L_YES}  id="user_founder" checked="checked" disabled="disabled" /> {L_NO} 
@@ -136,10 +140,6 @@
{L_USER_TOOLS} -
-

{L_WARNINGS_EXPLAIN}
-
-
@@ -164,20 +164,9 @@
-
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - -
- -
- @@ -188,7 +177,7 @@
- + @@ -213,12 +202,23 @@

{L_NO_ENTRIES}

+ +
+ {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + +
+
+ + +
- {L_MARK_ALL} :: {L_UNMARK_ALL}
  -   + +

{L_MARK_ALL} • {L_UNMARK_ALL}

@@ -548,31 +548,31 @@ var text_name = 'signature'; // Define the bbCode tags -bbcode = new Array(); -bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]', {custom_tags.BBCODE_NAME}); -imageTag = false; + bbcode = new Array(); + bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]', {custom_tags.BBCODE_NAME}); + imageTag = false; -// Helpline messages -var help_line = { - b: '{LA_BBCODE_B_HELP}', - i: '{LA_BBCODE_I_HELP}', - u: '{LA_BBCODE_U_HELP}', - q: '{LA_BBCODE_Q_HELP}', - c: '{LA_BBCODE_C_HELP}', - l: '{LA_BBCODE_L_HELP}', - o: '{LA_BBCODE_O_HELP}', - p: '{LA_BBCODE_P_HELP}', - w: '{LA_BBCODE_W_HELP}', - s: '{LA_BBCODE_S_HELP}', - f: '{LA_BBCODE_F_HELP}', - e: '{LA_BBCODE_E_HELP}', - d: '{LA_BBCODE_D_HELP}', - t: '{LA_BBCODE_T_HELP}', - tip: '{L_STYLES_TIP}' - - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' - -} + // Helpline messages + var help_line = { + b: '{LA_BBCODE_B_HELP}', + i: '{LA_BBCODE_I_HELP}', + u: '{LA_BBCODE_U_HELP}', + q: '{LA_BBCODE_Q_HELP}', + c: '{LA_BBCODE_C_HELP}', + l: '{LA_BBCODE_L_HELP}', + o: '{LA_BBCODE_O_HELP}', + p: '{LA_BBCODE_P_HELP}', + w: '{LA_BBCODE_W_HELP}', + s: '{LA_BBCODE_S_HELP}', + f: '{LA_BBCODE_F_HELP}', + e: '{LA_BBCODE_E_HELP}', + d: '{LA_BBCODE_D_HELP}', + t: '{LA_BBCODE_T_HELP}', + tip: '{L_STYLES_TIP}' + + ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' + + } //--> @@ -600,7 +600,7 @@ var help_line = { - + @@ -609,12 +609,12 @@ var help_line = { - {L_FONT_SIZE}: - +

@@ -625,8 +625,10 @@ var help_line = {

-
-
+
+ +
+   {L_DISABLE_BBCODE}   @@ -636,7 +638,7 @@ var help_line = {   {L_DISABLE_MAGIC_URL}  

{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS} -
+
@@ -678,20 +680,12 @@ var help_line = { -
- {L_SORT_BY}: - -
-
{installed.NAME} *{installed.NAME} * {installed.STYLE_COUNT} {L_REPORT_BY} {L_IP} {L_TIME}{L_ACTION}{L_FEEDBACK} {L_MARK}
@@ -701,17 +695,17 @@ var help_line = { - + - - - - + + + + @@ -721,20 +715,41 @@ var help_line = {

{L_NO_ENTRIES}

- +
+ {L_SORT_BY}: + +
+
+ + + +
- {L_MARK_ALL} :: {L_UNMARK_ALL}
+

{L_MARK_ALL} • {L_UNMARK_ALL}

-
+
» {L_SET_USERS_PERMISSIONS}
» {L_SET_USERS_FORUM_PERMISSIONS} -
+ + + + +
+ {L_SELECT_FORUM}: + +
+ + + +
diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 17f734c29f..fa85669595 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -16,11 +16,11 @@ {L_EDIT_WORD}
-
+
-
+
{S_HIDDEN_FIELDS} @@ -52,7 +52,7 @@ - + @@ -60,8 +60,7 @@ - - + diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index bedb045397..3f655663a0 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -48,6 +48,17 @@ h2, caption { margin-top: 25px; } +.rtl h2, .rtl caption { + text-align: right; +} + +h3, h4 { + font: bold 1.2em "Lucida Grande", Arial, Helvetica, sans-serif; + text-decoration: none; + line-height: 120%; + margin-top: 25px; +} + p { margin-bottom: 0.7em; line-height: 1.4em; @@ -56,8 +67,11 @@ p { ul { list-style: disc; - margin-left: 2em; - margin-bottom: 1em; + margin: 0 0 1em 2em; +} + +.rtl ul { + margin: 0 2em 1em 0; } hr { @@ -98,6 +112,10 @@ a:hover { height: 84px; } +.rtl #page-header { + text-align: left; +} + #page-header h1 { font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; font-size: 1.5em; @@ -129,12 +147,17 @@ a:hover { } #main { - float:left; + float: left; width: 76%; - margin-left: 3%; + margin: 0 0 0 3%; min-height: 350px; } +.rtl #main { + float: right; + margin: 0 3% 0 0; +} + * html #main { height: 350px; } @@ -149,6 +172,10 @@ a:hover { min-width: 570px; } +.rtl #tabs { + margin: 0 7px -6px 0; +} + #tabs ul { margin:0; padding: 0; @@ -164,7 +191,7 @@ a:hover { } #tabs a { - float:left; + float: left; background:url("../images/bg_tabs1.gif") no-repeat 0% -35px; margin: 0 1px 0 0; padding: 0 0 0 6px; @@ -172,6 +199,12 @@ a:hover { position: relative; } +.rtl #tabs a { + float: right; + margin: 0 0 0 1px; + padding: 0 6px 0 0; +} + #tabs a span { float: left; display: block; @@ -182,8 +215,13 @@ a:hover { text-transform: uppercase; } +.rtl #tabs a span { + float: left; + padding: 7px 6px 6px 12px; +} + /* Commented Backslash Hack hides rule from IE5-Mac \*/ -#tabs a span { float:none; } +#tabs a span, .rtl #tabs a span { float:none;} /* End hack */ #tabs a:hover span { @@ -237,6 +275,10 @@ span.corners-top span, span.corners-bottom span { padding: 0; } +.rtl #menu { + float: right; +} + #menu p { font-size: 1em; } @@ -316,11 +358,16 @@ th, td { text-align: left; } +.rtl th, .rtl td { + text-align: right; +} + th { padding: 6px 4px; color: #FFA34F; font-weight: bold; background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x; + white-space: nowrap; } td { @@ -328,12 +375,12 @@ td { line-height: 1.2em; } -.row1 { background-color: #EFEFEF; } -.row2 { background-color: #DEE3E7; } -.row3 { background-color: #D1D7DC; } -.row4 { background-color: #E4E8EB; } -.col1 { background-color: #DEE3E7; } -.col2 { background-color: #EFEFEF; } +.row1 { background-color: #EFEFEF;} +.row2 { background-color: #DEE3E7;} +.row3 { background-color: #D1D7DC;} +.row4 { background-color: #E4E8EB;} +.col1 { background-color: #DEE3E7;} +.col2 { background-color: #EFEFEF;} .spacer { background-color: #D1D7DC; @@ -363,44 +410,40 @@ table.type2 td { /* General form styles ----------------------------------------*/ -fieldset { +fieldset { + background-color: #DDD; + padding: 10px; margin: 15px 0; - padding: 10px; border-right: 1px solid #AFAEAA; border-bottom: 1px solid #AFAEAA; border-left: 1px solid #D5D5C8; border-top: 1px solid #D5D5C8; - background-color: #ECECEC; + background-color: #ECECEC; position: relative; } -* html fieldset { - padding: 0 10px 5px 10px; +.rtl fieldset { + border-right: 1px solid #D5D5C8; + border-bottom: 1px solid #AFAEAA; + border-left: 1px solid #AFAEAA; + border-top: 1px solid #D5D5C8; +} + +legend { + position: absolute; + top: -0.5em; + font-size: 1.1em; + color:#006699; + font-family: "Lucida Grande",Arial,Verdana,Sans-serif; + font-weight: bold; + line-height: 100%; + text-transform: uppercase; } fieldset p { font-size: 1.1em; } -legend { - padding: 1px 0; - font-family: "Lucida Grande", Arial, Verdana,Sans-serif; - font-size: 1.1em; - font-weight: bold; - color: #006699; - position: relative; - text-transform: uppercase; - line-height: 100%; - top: 0em; - vertical-align:middle; -} - -* html legend { - margin-bottom: -10px; - margin-left: -7px; - top: -1.2em; -} - input { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -416,6 +459,17 @@ input { vertical-align: middle; } +.rtl input { + border-left: 1px solid #D5D5C8; + border-top: 1px solid #AFAEAA; + border-right: 1px solid #AFAEAA; + border-bottom: 1px solid #D5D5C8; +} + +input.langvalue, textarea.langvalue { + width: 90%; +} + select { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-size: 100%; @@ -434,12 +488,16 @@ optgroup { } option { - padding-right: 1em; + padding: 0 1em 0 0; +} + +.rtl option { + padding: 0 0 0 1em; } .sep { color: black; - background-color: #FFA34F; + font-weight: bold; } textarea { @@ -455,10 +513,21 @@ textarea { cursor: text; } +.rtl textarea { + border-left: 1px solid #D5D5C8; + border-top: 1px solid #AFAEAA; + border-right: 1px solid #AFAEAA; + border-bottom: 1px solid #D5D5C8; +} + label { - cursor:pointer; + cursor: pointer; font-size: 1.1em; - padding-right: 5px; + padding: 0 5px 0 0; +} + +.rtl label { + padding: 0 0 0 5px; } label input { @@ -471,20 +540,33 @@ label img { } fieldset.quick, p.quick { - margin: 0 0 5px 0; - padding: 5px 0 0 0; + margin: 0 0 5px; + padding: 5px 0 0; border: none; background-color: transparent; text-align: right; font-size: 1.1em; } +.rtl fieldset.quick, .rtl p.quick { + text-align: left; +} + fieldset.quick legend { display: none; } fieldset.tabulated { - background-color: #DADFE4; +/* background-color: #DADFE4;*/ + background: none; + margin: 0; + padding: 0; + padding-top: 5px; + border: 0; +} + +fieldset.tabulated legend { + display: none; } fieldset.nobg { @@ -533,11 +615,16 @@ dt { width: auto; } -dd { color: #000; } -dd + dd { padding-top: 5px; } -dt span { padding-right: 5px; } +.rtl dt { + float: right; +} -dt .explain { font-style: italic; } +dd { color: #000;} +dd + dd { padding-top: 5px;} +dt span { padding: 0 5px 0 0;} +.rtl dt span { padding: 0 0 0 5px;} + +dt .explain { font-style: italic;} dt label { font-size: 100%; @@ -545,12 +632,20 @@ dt label { font-weight: bold; } -dd label { - white-space: nowrap; - margin-right: 10px; +.rtl dt label { + text-align: right; } -html>body dd label input { vertical-align: text-bottom; } /* Tweak for Moz to align checkboxes/radio buttons nicely */ +dd label { + white-space: nowrap; + margin: 0 10px 0 0; +} + +.rtl dd label { + margin: 0 0 0 10px; +} + +html>body dd label input { vertical-align: text-bottom;} /* Tweak for Moz to align checkboxes/radio buttons nicely */ dd input, dd select { @@ -561,7 +656,7 @@ dd textarea { width: 100%; } -input.radio { +input.radio, input.perm_cb { width: auto !important; background-color: transparent; border: none; @@ -581,21 +676,36 @@ fieldset dl { fieldset dt { width: 45%; text-align: left; + border: none; border-right: 1px solid #CCC; padding-top: 3px; } +.rtl fieldset dt { + text-align: right; + border: none; + border-left: 1px solid #CCC; +} + fieldset dd { - margin-left: 45%; - padding-left: 5px; + margin: 0 0 0 45%; + padding: 0 0 0 5px; + border: none; border-left: 1px solid #CCC; vertical-align: top; } +.rtl fieldset dd { + margin: 0 45% 0 0; + padding: 0 5px 0 0; + border: none; + border-right: 1px solid #CCC; +} + dd.full { - margin-left: 0; + margin: 0; border: 0; - padding-left: 0; + padding: 0; padding-top: 3px; text-align: center; width: 95%; @@ -652,6 +762,13 @@ fieldset.submit-buttons legend { width: 75%; } +.rtl .inputbox { + border-left: 1px solid #D5D5C8; + border-top: 1px solid #AFAEAA; + border-right: 1px solid #AFAEAA; + border-bottom: 1px solid #D5D5C8; +} + select.inputbox { cursor: pointer; padding: 0; @@ -659,10 +776,7 @@ select.inputbox { } .inputbox:hover { - border-left: 1px solid #AFAEAA; - border-top: 1px solid #AFAEAA; - border-right: 1px solid #AFAEAA; - border-bottom: 1px solid #AFAEAA; + border: 1px solid #AFAEAA; background-color: #E9E9E2; } @@ -677,12 +791,12 @@ textarea.full { width: 99%; } -* html input.full, * html textarea.full { width: 95%; } -input.medium { width: 50%; } -input.narrow { width: 25%; } -input.tiny { width: 10%; } -input.autowidth { width: auto !important; } -.box2 .inputbox { background-color: #E9E9E9; } +* html input.full, * html textarea.full { width: 95%;} +input.medium { width: 50%;} +input.narrow { width: 25%;} +input.tiny { width: 10%;} +input.autowidth { width: auto !important;} +.box2 .inputbox { background-color: #E9E9E9;} /* Pagination @@ -696,6 +810,10 @@ input.autowidth { width: auto !important; } padding-bottom: 2px; } +.rtl .pagination { + text-align: left; +} + .pagination strong, .pagination b { font-weight: normal; @@ -761,167 +879,9 @@ a.button2, a.button2:link, a.button2:visited, a.button2:active { padding: 4px 8px; } -/* Permission related ----------------------------------------- */ - -.permissions { - margin: 15px 0 0 0; - padding: 0; - border: none; - background-color: transparent; -} - -.permissions table { - width: 100%; - /*empty-cells: hide;*/ - border: 1px solid #CCCFD3; - background-color: #FFFFFF; - padding: 1px; -} - -.permissions th { - padding: 3px 4px; - color: #FFFFFF; - background: #DDE1E4 url("../images/gradient2b.gif") bottom left repeat-x; - border-top: 1px solid #6DACD2; - border-bottom: 1px solid #327AA5; - text-align: left; - font-size: .85em; - text-transform: uppercase; -} - -.permissions td { - text-align: left; - font-size: 1.1em; - padding: 4px; - line-height: 120%; -} - -table.pmask { - border: none; - background: none; - padding: 0; -} - -table.pmask th { - background: none; - border-top: none; - text-align: center; - vertical-align: bottom; - color: #115098; - padding: 2px 0; -} - -table.pmask td { - padding: 0px; -} - -table.pmask td.name { - padding: 2px; - vertical-align: middle; -} - -.permissions th.name { - text-align: left; - width: auto; - padding-left: 4px; -} - -.permissions .entry { - text-align: left; +input.disabled { font-weight: normal; -} - -.permissions td.name { - text-align: left; - font-weight: bold; -} - -.permissions table.type3 { - float: right; - width: 350px; /* Setting the length of the permission view box */ - border: none; - background-color: transparent; - padding: 0; -} - -.permissions table.type3 thead th { - background-color: transparent; - border-top: none; - text-align: center; - color: #115098; - padding: 0 3px; - font-size: .9em; - font-weight: normal; - text-transform: none; -} - -.permissions table.type3 tbody th { - border-top: none; - text-align: left; - text-transform: none; - padding: 0; - border: none; - font-size: 1em; - font-weight: normal; - width: 100%; - vertical-align: middle; -} - -.permissions table.type3 td { - text-align: center; - padding: 1px; -} - -.permissions td.yes { - width: 20px; - background-color: #40C53D; -} - -.permissions td.never { - width: 20px; - background-color: #EC7181; -} - -.permissions td.no { - width: 20px; - background-color: transparent; -} - -/* Preset Styles ----------------------------------------- */ -.preset { - width: 60px; -} - -.preset a { - float: left; - display: block; - width: 100%; - height: 20px; - cursor: pointer; - background: transparent; -} - -.preset a:hover { - background: url("../images/arrow_down.gif") no-repeat 50% 50%; - text-decoration: none; -} - -.preset_yes { - background: #D3F3D2 url("../images/bg_hash1.gif") repeat; -} - -.preset_custom { - background: #DAE4EC url("../images/bg_hash2.gif") repeat; -} - -.preset_never { - background: #ECD7DA url("../images/bg_hash3.gif") repeat; -} - -.preset_no { - background: #ECD7DA url("../images/bg_hash4.gif") repeat; + color: #666; } /* Action Highlighting @@ -1046,6 +1006,10 @@ table.pmask td.name { padding: 0px; } +.rtl .sourcenum { + text-align: left; +} + .source { font-family: Monaco, 'Courier New', monospace; font-size: 125%; @@ -1076,3 +1040,307 @@ table.pmask td.name { .syntaxstring { color: #DD0000; } + +/* Permission interface +---------------------------------------- */ + +fieldset.perm legend { + text-transform: none; +} +fieldset.perm legend input{ + height: 1.1em; +} + +/* Permission sections */ +fieldset.perm .perm_simple { + text-align: left; + padding-top: 3px; +} + +.rtl fieldset.perm .perm_simple { + text-align: right; +} + +fieldset.perm .perm_advanced { + padding: 10px 0 0 5px; + vertical-align: top; + clear: right; +} + +.rtl fieldset.perm .perm_advanced { + padding: 10px 5px 0 0; + clear: left; +} + +fieldset.perm .perm_switch { + float: right; + font-size: 1.1em; +} + +.rtl fieldset.perm .perm_switch { + float: left; +} + +.perm_switch a { + text-decoration: underline; +} + +/* Tabbed menu */ +.perm_cat { + line-height: normal; + margin: 0 0 0 7px; + min-width: 570px; + font-size: 1em; +} + +.rtl .perm_cat { + margin: 0 7px 0 0; +} + +.perm_cat ul { + margin: 0; + padding: 0; + list-style: none; +} + +.perm_cat li { + display: inline; + margin: 0; + padding: 0; + font-size: 1em; + font-weight: bold; +} + +.perm_cat a { + float: left; + background: url("../images/bg_tabs1.gif") no-repeat 0% -35px; + margin: 0 1px 0 0; + padding: 0 0 0 6px; + text-decoration: none; + position: relative; +} + +.rtl .perm_cat a { + float: right; + margin: 0 0 0 1px; + padding: 0 6px 0 0; +} + +.perm_cat a span.tabbg { + float: left; + display: block; + background: url("../images/bg_tabs2.gif") no-repeat 100% -35px; + padding: 7px 12px 6px 6px; + color: #536482; + white-space: nowrap; +} + +.rtl .perm_cat a span.tabbg { + float: left; + padding: 7px 6px 6px 12px; +} + +/* Commented Backslash Hack hides rule from IE5-Mac \*/ +.perm_cat a span.tabbg, .rtl .perm_cat a span.tabbg { float: none;} +/* End hack */ + +.perm_cat a:hover span.tabbg { + color: #DD6900; +} + +.perm_cat .activetab a { + background-position: 0 0px; +} + +.perm_cat .activetab a span.tabbg { + background-position: 100% 0px; + padding-bottom: 7px; + color: #333333; +} + +.perm_cat a:hover { + background-position: 0 -70px; +} + +.perm_cat a:hover span.tabbg { + background-position: 100% -70px; +} + +.perm_cat .activetab a:hover span.tabbg { + color: #333333; + background-position: 100% 0px; +} + +.perm_cat .activetab a:hover { + background-position: 0 0px; +} + +.perm_cat a span.colour { + border: 1px solid #536482; + display: block; + float: left; + width: 10px; + height: 10px; + margin: 0 5px 0 0; +} + +.rtl .perm_cat a span.colour { + float: right; + margin: 0 0 0 5px; +} + +.perm_cat .activetab span.colour { + border-color: #333333; +} + +.perm_cat a:hover span.colour { + border-color: #DD6900; +} + +.perm_cat .activetab a:hover span.colour { + border-color: #333333; +} + +/* Permission preset colours */ +.perm_preset_yes span.colour, +.yes { + background-color: #86F786; +} + +.perm_preset_custom span.colour { + background-color: #B2BBDD; +} + +.perm_preset_never span.colour { + background-color: #DD0000; +} + +.perm_preset_no span.colour, +.never { + background-color: #EFB0B2; +} + +/* Pemrission panel +---------------------------------------- */ +.perm_panel { + float: left; + background-color: #FFF; + width: 100%; + border: 1px solid #A9B8C2; + margin-top: -1px; +} + +.rtl .perm_panel { + float: right; +} + +.perm_panel span.corners-top { + background-image: url("../images/corners_left2.gif"); +} + +.perm_panel span.corners-top span { + background-image: url("../images/corners_right2.gif"); +} + +.perm_panel span.corners-bottom { + background-image: url("../images/corners_left2.gif"); +} + +.perm_panel span.corners-bottom span { + background-image: url("../images/corners_right2.gif"); +} + +.perm_panel span.corners-top, .perm_panel span.corners-bottom, +.perm_panel span.corners-top span, .perm_panel span.corners-bottom span { + font-size: 1px; + line-height: 1px; + display: block; + height: 5px; + background-repeat: no-repeat; +} + +.perm_panel span.corners-top { + background-image: url("../images/corners_left2.gif"); + background-position: 0 0; + margin: 0 0; +} + +.perm_panel span.corners-top span { + background-image: url("../images/corners_right2.gif"); + background-position: 100% 0; +} + +.perm_panel span.corners-bottom { + background-image: url("../images/corners_left2.gif"); + background-position: 0 100%; + margin: 0 0; + clear: both; +} + +.perm_panel span.corners-bottom span { + background-image: url("../images/corners_right2.gif"); + background-position: 100% 100%; +} + +/* Permission table +---------------------------------------- */ +.perm_panel .tablewrap { + margin: 0 10px; +} + +.perm_panel table { + width: 100%; +} + +.perm_panel th { + text-transform: none; +} + +.perm_panel th.value { + text-align: center; +} + +.perm_panel th.name { + text-align: left; + width: auto; + text-transform: none; +} + +.rtl .perm_panel th.name { + text-align: right; +} + +.perm_panel th.permission_name { + border: none; + color: #536482; + font-weight: normal; +} + +.perm_panel th.permission_name a.trace { + display: inline; +} + +.perm_panel th.row3 { + background-image: none; + background-color: #D1D7DC; +} + +.perm_panel th.row4 { + background-image: none; + background-color: #E4E8EB; +} + +.perm_panel th a:link, .perm_panel th a:hover, .perm_panel th a:visited { + display: block; + color: #FFA34F; + text-decoration: underline; +} + +.perm_panel td { + padding: 0; + text-align: center; +} + +.perm_panel td label { + display: block; +} diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 54e7e61f3a..2ef2853ed3 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -13,10 +13,10 @@ var clientPC = navigator.userAgent.toLowerCase(); // Get client info var clientVer = parseInt(navigator.appVersion); // Get browser version var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_nav = ((clientPC.indexOf('mozilla') != -1) && (clientPC.indexOf('spoofer') == -1) && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera') == -1) && (clientPC.indexOf('webtv') == -1) && (clientPC.indexOf('hotjava') == -1)); - var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); -var is_mac = (clientPC.indexOf('mac') != -1); + +var baseHeight; +window.onload = initInsertions; /** * Shows the help messages in the helpline window @@ -27,44 +27,19 @@ function helpline(help) } /** -* Replacement for arrayname.length property -*/ -function getarraysize(thearray) +* Fix a bug involving the TextRange object. From +* http://www.frostjedi.com/terra/scripts/demo/caretBug.html +*/ +function initInsertions() { - for (i = 0; i < thearray.length; i++) + var textarea = document.forms[form_name].elements[text_name]; + textarea.focus(); + if (is_ie && typeof(baseHeight) != 'number') { - if (typeof thearray[i] == 'undefined' || thearray[i] == '' || thearray[i] == null) - { - return i; - } + baseHeight = document.selection.createRange().duplicate().boundingHeight; } - - return thearray.length; } -/** -* Replacement for arrayname.push(value) not implemented in IE until version 5.5 -* Appends element to the array -*/ -function arraypush(thearray,value) -{ - thearray[getarraysize(thearray)] = value; -} - -/** -* Replacement for arrayname.pop() not implemented in IE until version 5.5 -* Removes and returns the last element of an array -*/ -function arraypop(thearray) -{ - thearraysize = getarraysize(thearray); - retval = thearray[thearraysize - 1]; - delete thearray[thearraysize - 1]; - - return retval; -} - - /** * bbstyle */ @@ -168,6 +143,11 @@ function insert_text(text, spaces, popup) else if (textarea.createTextRange && textarea.caretPos) { + if (baseHeight != textarea.caretPos.boundingHeight) + { + textarea.focus(); + storeCaret(textarea); + } var caret_pos = textarea.caretPos; caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 0e3da86ae5..068a8f230e 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -1,100 +1,125 @@ - + -

{TITLE}

-

{BODY}

+

{TITLE}

- -
{L_POST_TIME} {L_FILESIZE} {L_DOWNLOADS}{L_DELETE}{L_MARK}
{attach.REAL_FILENAME}
{L_PM}: {L_TOPIC}: {attach.TOPIC_TITLE}		{attach.POST_TIME}{attach.SIZE}{attach.DOWNLOAD_COUNT}{attach.POST_TIME}{attach.SIZE}{attach.DOWNLOAD_COUNT}
{L_WORD} {L_REPLACEMENT}{L_ACTION}{L_ACTION}
{words.WORD} {words.REPLACEMENT} {L_EDIT}  {L_DELETE}  {ICON_EDIT}  {ICON_DELETE} 
- - - - - - - - - - - - - +

{BODY}

+ + + + + +

{TITLE}

+

{BODY}

+ + +
{L_AVAILABLE_CONVERTORS}
{L_SOFTWARE}{L_VERSION}{L_AUTHOR}{L_OPTIONS}
+ + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
{L_AVAILABLE_CONVERTORS}
{convertors.SOFTWARE}{convertors.VERSION}{convertors.AUTHOR}{L_CONVERT}
{L_NO_CONVERTORS}---{L_SOFTWARE}{L_VERSION}{L_AUTHOR}{L_OPTIONS}
{convertors.SOFTWARE}{convertors.VERSION}{convertors.AUTHOR}{L_CONVERT}
{L_NO_CONVERTORS}---
- - - - -
+ + - - - -
+
+
+ +
+
+
+ +
+
-
- - {checks.LEGEND} -

{checks.LEGEND_EXPLAIN}

- +
+ -
-
{checks.TITLE}:
{checks.TITLE_EXPLAIN}
-
{checks.RESULT}
-
- - + +
-
- - - -
- - - - + + +
- +
+ + {checks.LEGEND} +

{checks.LEGEND_EXPLAIN}

+ + +
+
{checks.TITLE}:
{checks.TITLE_EXPLAIN}
+
{checks.RESULT}
+
- {options.LEGEND} - + -
-

{options.TITLE_EXPLAIN}
-
{options.CONTENT}
-
+
+ - - + +
-
+ + + +
+ +
+ + {options.LEGEND} + + +
+

{options.TITLE_EXPLAIN}
+
{options.CONTENT}
+
+ + + + +
+ + + +
+

{L_MESSAGE}

+ {S_HIDDEN} + disabled="disabled" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" /> +
+ + + - -
-

{L_MESSAGE}

- {S_HIDDEN} - -
- - - - \ No newline at end of file diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 91a7f25480..075d026d95 100755 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -2,7 +2,7 @@
-

{TITLE}

+

{TITLE}

{BODY}

@@ -54,7 +54,7 @@ -

{L_DL_CONFIG}

+

{L_DL_CONFIG}

{L_DL_CONFIG_EXPLAIN}

@@ -68,7 +68,7 @@
{L_SUBMIT} {S_HIDDEN} - +
diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html index 9d125a42eb..2c318bfd65 100755 --- a/phpBB/adm/style/install_main.html +++ b/phpBB/adm/style/install_main.html @@ -1,6 +1,6 @@ -

{TITLE}

+

{TITLE}

{BODY}

\ No newline at end of file diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 5cdf2eeea0..a948ceb3fc 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -2,11 +2,11 @@ @@ -71,14 +71,16 @@ function popup(url, width, height)
- + +
-

{L_CHECK_FILES_EXPLAIN}

- +

{L_UPDATE_DATABASE_EXPLAIN}

+
+
@@ -90,90 +92,147 @@ function popup(url, width, height)
- + -

{L_COLLECTED_INFORMATION}

+ -

{L_COLLECTED_INFORMATION_EXPLAIN}

+

{L_PERFORM_DATABASE_UPDATE}

- -
-

{L_NO_UPDATE_FILES}

+

+ {L_PERFORM_DATABASE_UPDATE_EXPLAIN}
+
+ » {L_RUN_DATABASE_SCRIPT} « +

-

{L_NO_UPDATE_FILES_EXPLAIN}


+

- {NO_UPDATE_FILES} - -
- - -
- - - - - -
- - -

{files.TITLE}

- -

{files.EXPLAIN}

- -
- {files.L_STATUS} - -
- -
{files.FILENAME}
- -
- {files.FILENAME} - -
{L_FILE_USED}: {files.CUSTOM_ORIGINAL} - - -
{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS} - -
-
[ {files.L_SHOW_DIFF} ]
- -
  {L_DO_NOT_UPDATE}
- - -
  {L_MERGE_NEW_FILE_OPTION}
  {L_MERGE_MOD_FILE_OPTION}
- - -
- - + +
+
- -
- -
- -
- -
- - - -

{L_NO_DATABASE_UPDATE_NEEDED}

- -
+ + +

{L_UPDATE_DB_SUCCESS}

+ +

+ + + +
+

{L_CHECK_FILES_EXPLAIN}

+ +
+ +
+ + + + + + + +
+

{L_UPDATE_SUCCESS}

+

{L_ALL_FILES_UP_TO_DATE}

+
+ + +

{L_COLLECTED_INFORMATION}

+ +

{L_COLLECTED_INFORMATION_EXPLAIN}

+ + +
+

{L_NO_UPDATE_FILES}

+ +

{L_NO_UPDATE_FILES_EXPLAIN}


+ + {NO_UPDATE_FILES} + +
+ + +
+ + + + + +
+ + +

{files.TITLE}

+ +

{files.EXPLAIN}

+ +
+ {files.L_STATUS} + +
+ +
{files.FILENAME}
+ +
+ {files.DIR_PART}
{files.FILE_PART} + +
{L_FILE_USED}: {files.CUSTOM_ORIGINAL} + + +
{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS} + +
+
[ {files.L_SHOW_DIFF} ]{L_BINARY_FILE}
+ +
  {L_DO_NOT_UPDATE}
+ + +
+
+
  {L_MERGE_NO_MERGE_NEW_OPTION}
+
[{L_SHOW_DIFF_FINAL}]
+
+
+
  {L_MERGE_NO_MERGE_MOD_OPTION}
+
[{L_SHOW_DIFF_FINAL}]
+
+ +
+
  {L_MERGE_NEW_FILE_OPTION}
+
[{L_SHOW_DIFF_FINAL}]
+
+
+
  {L_MERGE_MOD_FILE_OPTION}
+
[{L_SHOW_DIFF_FINAL}]
+
+ + +
+ +
+ {files.L_STATUS} + + + + +
+ + -
-

{L_ALL_FILES_UP_TO_DATE}

-
- +
+ +
+ +
+ +
+

{L_UPDATE_METHOD}

{L_UPDATE_METHOD_EXPLAIN}

@@ -182,9 +241,9 @@ function popup(url, width, height)     - + - + @@ -258,7 +317,7 @@ function popup(url, width, height)

{data.EXPLAIN}
-
+
@@ -272,16 +331,6 @@ function popup(url, width, height) - - -

{L_PERFORM_DATABASE_UPDATE}

- -

- {L_PERFORM_DATABASE_UPDATE_EXPLAIN}
-
- » {L_RUN_DATABASE_SCRIPT} « -

- diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index cdc0d8cc21..58b9aa833f 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -11,6 +11,26 @@ + + + + + + + + + +
+ + + +

This is a non-exhaustive (but still near complete) changelog for phpBB 3.0.x including release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.

+ +

Changelog

+ +
    +
  1. Changelog +
      +
    1. Changes since RC-1
      2. +
    +
    2. +
  2. Copyright and disclaimer
    3. +
+ +
+ +

1. Changelog

+ + 1.i. Changes since 3.0.RC1 +

+
+ + + +
+ Top +

+ +
+ +

2. Copyright and disclaimer

+ +
+ +

This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

+ +
+Top + + + +
+ +

+ + + + + diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html new file mode 100644 index 0000000000..6a010dc5ec --- /dev/null +++ b/phpBB/docs/FAQ.html @@ -0,0 +1,380 @@ + + + + +phpBB 3.0.x FAQ + + + + + + + + + + + + + + + + + +
+ + + +

This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the more commonly asked questions. It is by no means exhaustive and should be used in combination with the 'built-in' User FAQ within phpBB3, the community forums and our IRC channel (see README for details).

+ +

FAQ

+ + + + +
+ +

I cannot install this it is too difficult! Will you do it?

+ +
+ +

Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying INSTALL.html documentation. If you cannot install phpBB3 the chances are you will be unable to administer or update it.

+ +

There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!

+ +

We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at www.phpbb.com and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.

+ +
+Top +

+ +
+ + +

I am having problems with the admin at a certain board, help!

+

A board has ripped off my graphics/software/etc., stop them!

+

A board is dealing in warez/porn/etc., you need to prevent them doing this!

+

I want to sue you because i think you host an illegal board!

+ +
+ +

We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.

+ +

If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do not track the use of phpBB software in any way. So please do not ask us for details on a "given" board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...

+ +
+Top +

+ +
+ +

According to viewonline a user is doing/reading something they should not be able to!

+ +
+ +

No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a "You are not permitted to do this" type message. The session data has simply been updated before we were able to determine what the user could or could not do.

+ +

Of course this only applies where permissions have been set correctly!

+ +
+Top +

+ +
+ +

I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!

+ +
+ +

This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP mail() function or directly via SMTP. Some hosting providers limit the mail() function to prevent its use in spamming, others may rename it or limit its functionality. If the mail() function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see www.phpbb.com for additional help on this matter.

+ +

If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.

+ +
+Top +

+ +
+ +

My users are complaining that emails are not in their selected language!

+ +
+ +

You must have deleted a language pack or the language pack is incomplete. phpBB will try to send emails in the users selected language. If it cannot find a suitable email template it will switch to the boards default language.

+ + + +
+Top +

+ +
+ +

My AOL based users keep getting logged out!

+ +
+ +

phpBB uses sessions to keep track of users as they browse the board. These sessions use a combination of a unique session id, the users IP and if specified the users browser and/or the users x-forwarded-for header to identify each user. We make use of all of this as an extra safe-guard to help prevent sessions being hijacked (by discovering the unique session id).

+ +

Unfortunately this only works when the users IP is constant as they browse the board. For most users this will be the case. However certain providers route their users via a cluster of proxys. In some cases, particularly the AOL browser, this results in different IPs being forwarded as the user moves between pages. We take account of this by not checking the entire IP by default but only the first "three quads" (A.B.C). Again in most cases this will be fine. However again AOL uses IPs which can vary so much that checking only the first two quads results in a fairly static IP being available for session validation.

+ +

If you are experiencing problems related to this you can set the Session IP validation parameter found in Admin->General->Server Configuration->Security Settings to A.B. Please note that reducing the IP validation length does potentially increase the risk of sessions being hijacked (this is something for you to consider, phpBB Group takes no responsibility should anything happen!). We suggest to at least additionally enable the browser validation.

+ +
+Top +

+ +
+ +

No matter what I set the uploadable avatars to I cannot upload one from my computer!

+ +
+ +

There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the Admin -> General -> Board Configuration -> Avatar settings section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).

+ +

The second possibility is that your provider has disabled file_upload support. You should contact your provider and ask them if this is the case. There is not a lot you can do, there are still three other avatar settings left to choose from including uploading via an URL which will work fine.

+ +
+Top +

+ +
+ +

I just cannot get gallery avatars to appear!

+ +
+ +

phpBB categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to images/avatars/gallery phpBB will expect to find a series of folders within that path, eg. images/avatars/gallery/moviestars, images/avatars/gallery/cartoons, images/avatars/gallery/misc, etc. Placing images directly in images/avatars/gallery/ will result in nothing being listed in your gallery.

+ +
+Top +

+ +
+ +

How do I use/set permissions?

+ +
+ +

Please read our documentation about permissions.

+ +
+Top +

+ +
+ +

I (or my users) cannot stay logged in to the forum!

+ +
+ +

If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, name, path and secure settings must be correct. You can check this in Admin->General->Server Configuration->Cookie Settings. Typically the cookie domain can be left blank and the cookie path set to / (a single forward slash). Do not set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://

+ +

If you still have problems try setting the cookie domain to your full domain name, eg. www.mysystem.tld, www.something.mydomain.tld. You must ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, eg. .mydomain.com, mydomain.com. Do not add http:// or anything else to the domain name!

+ +
+Top +

+ +
+ +

My users are complaining about being logged out too quickly!

+ +
+ +

You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in Admin->General->Server Configuration->Load Settings. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).

+ +
+Top +

+ +
+ +

My question isn't answered here!

+ +
+ +

Please read our extensive user documentation first, it may just explain what you want to know.

+ +

Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

+ +

www.phpbb.com

+ +
+Top +

+ +
+ +

Copyright and disclaimer

+ +
+ +

This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

+ +
+Top + + + +
+ + + + + diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html new file mode 100644 index 0000000000..555ad399ec --- /dev/null +++ b/phpBB/docs/INSTALL.html @@ -0,0 +1,519 @@ + + + + +phpBB 3.0.x Install + + + + + + + + + + + + + + + + + +
+ + + +

Please read this document completely before proceeding with installation, updating or converting.

+ +

Please note these instructions are not fully comprehensive, a more thorough userguide will be available on the phpBB website in the near future. However, this document will walk you through the basics on installing, updating and converting the forum software.

+ +

A basic overview of running phpBB3 can be found in the accompanying README documentation. Please ensure you read that document in addition to this! For more detailed information on using phpBB3 you should read the documentation available online.

+ +

Install

+ +
    +
  1. Quick install
    2. +
  2. Requirements
    3. +
  3. New installation
    4. +
  4. Updating from stable releases of phpBB 3.0.x +
      +
    1. Full package
      2. +
    2. Changed files only
      3. +
    3. Patch file
      4. +
    4. Automatic update package
      5. +
    5. All package types
      6. +
    +
    5. +
  5. Conversion from phpBB 2.0.x to phpBB 3.0.x +
      +
    1. Requirements before converting
      2. +
    2. Converting
      3. +
    3. Things to do after conversion
      4. +
    +
    6. +
  6. Important (security related) post-Install tasks for all installation methods +
      +
    1. Uploadable avatars
      2. +
    +
    7. +
  7. Disclaimer
    8. +
+ +
+ +

1. Quick install

+ +
+

If you have basic knowledge of using FTP and are sure your hosting service or server will run phpBB3 you can use these steps to quickly get started. For a more detailed explanation you should skip this and go to section 2 below.

+ +
    +
  1. Decompress the phpBB3 archive to a local directory on your system.
    2. +
  2. Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account.
    3. +
  3. Change the permissions on config.php to be writeable by all (666 or -rw-rw-rw- within your FTP Client)
    4. +
  4. Change the permissions on the following directories to be writeable by all (777 or -rwxrwxrwx within your FTP Client):
    + store/, cache/, files/ and images/avatars/upload/.
    5. +
  5. Using your web browser visit the location you placed phpBB3 with the addition of install/index.php or pointing directly to install/, e.g. http://www.mydomain.com/phpBB2/install/, http://www.mydomain.com/forum/install/ etc.
    6. +
  6. Click the INSTALL tab, follow the steps and fill out all the requested information.
    7. +
  7. Change the permissions on config.php to be writeable only by yourself (644 or -rw-r--r-- within your FTP Client)
    8. +
  8. phpBB3 should now be available, please MAKE SURE you read at least Section 6 below for important, security related post-installation instructions.
    9. +
+ +

If you experienced problems or do not know how to proceed with any of the steps above please read the rest of this document.

+
+Top +

+ +
+ +

2. Requirements

+ +
+

phpBB3 has a few requirements which must be met before you are able to install and use it.

+ + + +

If your server or hosting account does not meet the requirements above we are afraid phpBB3 is not for you.

+
+Top +

+ +
+ +

3. New installation

+ +
+ +

Installation of phpBB3 will vary according to your server and database. If you have shell access to your account (via telnet or ssh for example) you may want to upload the entire phpBB3 archive (in binary mode!) to a directory on your host and unarchive it there.

+ +

If you do not have shell access or do not wish to use it you will need to decompress the phpBB3 archive to a local directory on your system using your favourite compression program, e.g. winzip, rar, zip, etc. From there you must FTP ALL the files it contains (being sure to retain the directory structure and filenames) to your host. Please ensure that the cases of filenames are retained, do NOT force filenames to all lower or upper case doing so will cause errors later.

+ +

All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in ASCII mode, while all graphics should be uploaded in BINARY mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.

+ +

phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the README.

+ +

Once all the files have been uploaded to your site you should point your browser at this location with the addition of install/. For example if your domain name is www.mydomain.tld and you placed phpBB3 in a directory /phpBB3 off your web root you would enter http://www.mydomain.tld/phpBB3/install/ or (alternatively) http://www.mydomain.tld/phpBB3/install/index.php into your browser. When you have done this you should see the phpBB3 Installation screen appear.

+ +

Introduction:

+ +

The installation screen gives you a short introduction into phpBB. It allows you to read the license phpBB3 is released under (General Public License) and provides information about how you can receive support. To start the installation, use the Install button.

+ +

Requirements

+ +

The first page you will see after starting the installation is the Requirements list. phpBB3 checks automatically whether everything that it needs to run properly is installed on your server. You need to have at least the minimum PHP version installed, and at least one database available to continue the installation. Also important, is that all shown folders are available and do have the correct permissions. Please see the description of each section to find out whether they are optional or required for phpBB3 to run. If everything is in order, you can continue the installation with Start Install.

+ +

Database settings

+ +

You now have to decide which database to use. See the Requirements section for information on which databases are supported. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

+ + + +
+

Note: if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.

+
+ +

You don't need to change the Prefix for tables in database setting, unless you plan on using multipe phpBB installations on one database. In this case you can use a different prefix for each installation to make it work.

+ +

After you entered your details, you can continue with the Proceed to next step button. Now phpBB3 will check whether the data you entered will lead to a successful database connection and whether tables with the same prefix already exist.

+ +

A Could not connect to the database error means that you didn't enter the database data correctly and it is not possible for phpBB to connect. Make sure that everything you entered is in order and try again. Again, if you are unsure about your database settings, please contact your host.

+ +

If you installed another version of phpBB before on the same database with the same prefix, phpBB will inform you and you just need to enter a different database prefix.

+ +

If you see the Successful Connection message, you can continue to the next step.

+ +

Administrator details

+ +

Now you have to create your administration user. This user will have full administration access and he will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English [GB]. You can download further languages from www.phpbb.com, and add them before installing or later.

+ +

Configuration file

+ +

In this step, phpBB will try to write the configuration file automatically. The forum needs the configuration to run properly. It contains all database settings, so without it, phpBB will not be able to access the database.

+ +

Usually writing the configuration file automatically works fine. But in some cases it can fail due to wrong file permissions, for instance. In this case, you need to upload the file manually. phpBB asks you to download the config.php file and tells you what to do with it. Please read the instructions carefully. After you have uploaded the file, use Done to get to the last step. If Done returns you to the same page as before, and does not return a success message, you did not upload the file correctly.

+ +

Advanced settings

+ +

The Advanced settings allow you to set some parameters of the board configuration. They are optional, and you can always change them later. So if you are not sure what these settings mean, proceed to the final step and finish the installation.

+ +

If the installation was successful, you can now use the Login button to visit the Administration Control Panel. Congratulations, you have installed phpBB3 successfully. But there is still work ahead!

+ +

If you are unable to get phpBB3 installed even after reading this guide, please look at the support section to find out where you can ask for further assistance.

+ +

At this point if you are converting from phpBB 2.0.x, you should refer to the conversion steps for further information. If not, you should remove the install directory from your server as you will only be able to access the Administration Control Panel whilst it is present.

+ +
+Top +

+ +
+ +

4. Updating from stable releases of phpBB 3.0.x

+ +

If you are currently using a stable release of phpBB3 updating to this version is straightforward. You would have downloaded one of four packages and your choice determines what you need to do. Please Note: That before updating we heavily recommend you do a full backup of your database and existing phpBB3 files! If you are unsure how to achieve this please ask your hosting provider for advice.

+ +

Please make sure you update your phpBB3 source files too, even if you run the database_update.php file.

+ +4.i. Full package +

+
+ +

The full package is normally meant for new installations, but if you want to replace all source files this package comes in handy.

+ +

First you should make a copy of your existing config.php file, keep it in a safe place! Next delete all the existing phpBB3 files, you may want to leave your files/ and images/ directory in place. You can leave alternative styles in-place too. With this complete you can upload the new phpBB3 files (see New installation for details if necessary). Once complete copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

+ +

You should now run install/database_update.php which, depending on your previous version, will make a number of database changes. You may receive FAILURES during this procedure, they should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker).

+ +

Once the install/database_update.php has completed you may proceed to the Administration Control Panel and check remove the install directory as advised.

+
+Top +

+ +4.ii. Changed files only +

+
+ +

This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.0 you should select the phpBB-3.0.0_to_3.0.1.zip/tar.gz file.

+ +

The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any Mods these files will overwrite the originals possibly destroying them in the process. You will need to re-add Mods to any affected file before uploading.

+ +

As for the other update procedures you should run install/database_update.php after you have finished updating the files. This will update your database schema and increment the version number.

+
+Top +

+ +4.iii. Patch file +

+ +
+ +

The patch file is probably the best solution for those with many Mods or other changes who do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach we recommend the Automatic update package explained below.

+ +

A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.0 you need the phpBB-3.0.0_to_3.0.1.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

+ +

If you do get failures you should look at using the Changed files only package to replace the files which failed to patch, please note that you will need to manually re-add any Mods to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

+ +

You should of course delete the patch file (or files) after use. As for the other update procedures you should run install/database_update.php after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number.

+
+Top +

+ +4.iv. Automatic update package +

+ +
+ +

The automatic update package is holding - contrary to the others - only the update informations for updating the last released version to the latest available version. These package is meant for use with the automatic update tool.

+ +

To perform the update, either follow the instructions from the Administration Control Panel -> System Tab - this should point out that you are running an outdated version and will guide you through the update - or following the instructions listed below.

+ + + +
+Top +

+ +4.v. All package types +

+ +
+ +

If you have non-English language packs installed you may want to see if a new version has been made available. A number of missing strings may have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.

+ +
+Top +

+ +
+ +

5. Conversion from phpBB 2.0.x to phpBB 3.0.x

+ +

This paragraph explains the steps necessary to convert your existing phpBB2 installation to phpBB3.

+ +5.i. Requirements before converting +

+ +
+

Before converting we heavily recommend you do a full backup of your database and files! If you are unsure how to achieve this please ask your hosting provider for advice. In order to convert, you need to have a new phpBB3 installation within the same database (but with a different prefix) as your old 2.0.x installation. You basically need to follow the basic instructions given for New installations. Please do not overwrite any old files - install phpBB3 at a different location.

+ +

Once you made a backup of everything and also have a brand new phpBB3 installation, you can now begin the conversion.

+
+Top +

+ +5.ii. Converting +

+ +
+ +

To begin the conversion visit the install folder of your phpBB3 installation (the same as you have done for installing). Now you will see a new tab Convert. Click this tab.

+ +

As with install the conversion is automated. Your previous 2.0.x database tables will not be touched as well as the original 2.0.x files remaining untouched. The conversion is actually only filling your phpBB3 database tables and copying additional data over to your phpBB3 installation. This has the benefit that if something goes wrong you are able to either re-run the conversion or continue a conversion, while your old board is still accessible. We really recommend you disable your old installation while converting, else you may have inconsistent data after the conversion.

+ +

Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server or other timeout issues). If this is the case you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful).

+ +

Once completed your board should be immediately available. If you encountered errors you should report the problems to our bug tracker or seek help via our forums (see README for details).

+
+Top +

+ +5.iii. Things to do after conversion +

+ +
+ +

After successful conversion there may be a few items you need to do - apart from checking if the installation is accessible and everything displayed correctly.

+ +

The first thing you may want to do is going to the administration control panel and checking every configuration item within the general tab. Thereafter you may want to adjust the forum descriptions/names if you entered HTML there. You also may want to access the other administrative sections, e.g. adjusting permissions, smilies, icons, ranks, etc.

+ +

Within the conversion the search index has not been created or transferred. This means after conversion you are not able to find any matches if you want to search for something. We recommend you rebuild your search index within Admin -> Maintenance -> Database -> Search Index.

+ +

Once you are pleased with your new installation you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems - but you may still want to check your cookie settings within the administration panel, if the cookie path need to be adjusted prior to renaming.

+ +
+Top +

+ +
+ +

6. Important (security related) post-Install tasks for all installation methods

+ +
+ +

Once you have succssfully installed phpBB3 you MUST ensure you remove the entire install/ directory. Leaving the install directory in place is a very serious potential security issue which may lead to deletion or alteration of files, etc. Please note that until this directory is not removed phpBB3 will not operate and a warning message will be displayed. Beyond this essential deletion you may also wish to delete the docs/ directories if you wish.

+ +

With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/conversion and click the Administration Panel link at the bottom of any page. Ensure that details specified in Admin -> General are correct!

+
+Top +

+ +6.i. Uploadable avatars +

+
+ +

phpBB3 supports several methods for allowing users to select their own avatar (an avatar is a small image generally unique to a user and displayed just below their username in posts).

+ +

Two of these options allow users to upload an avatar from their machine or a remote location (via a URL). If you wish to enable this function you should first ensure the correct paths for uploadeable avatars is set in Admin -> General -> Board Configuration -> Avatar settings. By default this is images/avatars/uploads but you can set it to whatever you like, just ensure the configuration setting is updated. You must also ensure this directory can be written to by the webserver. Usually this means you have to alter its permissions to allow anyone to read and write to. Exactly how you should do this depends on your ftp client or server operating system.

+ +

On UNIX systems for example you set the directory to a+rwx (or ugo+rwx or even 777). This can be done from a command line on your server using chmod or via your FTP client (using the Change Permissions, chmod or other Permissions dialoge box, see your FTP clients documentation for help). Most FTP clients list permissions in the form of User (Read, Write, Execute), Group (Read, Write, Execute) and Other (Read, Write, Execute). You need to tick all of these boxes to set correct permissions.

+ +

On Windows system you need to ensure the directory is not write-protected and that it has global write permissions (see your servers documentation or contact your hosting provider if you are unsure on how to achieve this).

+ +

Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there to cause trouble. Therefore you should monitor this directory and if possible make regular backups.

+
+ +Top +

+ +
+ +

7. Copyright and disclaimer

+ +
+ +

This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

+ +
+Top + + + +
+ + + + + diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html new file mode 100644 index 0000000000..196a0f2de4 --- /dev/null +++ b/phpBB/docs/README.html @@ -0,0 +1,432 @@ + + + + +phpBB 3.0.x Readme + + + + + + + + + + + + + + + + + +
+ + + +

Thank you for downloading phpBB3. This README will guide through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully before proceeding with the installation.

+ +

Readme

+ +
    +
  1. Installing phpBB3
    2. +
  2. Running phpBB3 +
      +
    1. Internationalisation (i18n)
      2. +
    2. Styles
      3. +
    3. Mods
      4. +
    +
    3. +
  3. Getting help with phpBB3 +
      +
    1. Userguide
      2. +
    2. Community Forums
      3. +
    3. Internet Relay Chat
      4. +
    +
    4. +
  4. Status of this version
    5. +
  5. Reporting Bugs +
      +
    1. Security related bugs
      2. +
    +
    6. +
  6. Overview of current bug list
    7. +
  7. PHP compatibility issues
    8. +
  8. Disclaimer
    9. +
+ +
+ +

1. Installing phpBB3

+ +
+ +

Installation and update/conversion instructions can be found in the INSTALL document contained in this distribution. If you are intending to convert from a previous phpBB 2.0.x installation we highly recommend you backup any existing data before proceeding!

+ +

Users of phpBB3 Beta versions cannot directly update or convert.

+ +
+Top +

+ +
+ +

2. Running phpBB3

+ +

Once installed phpBB is easily managed by both admin and moderator control panels. If you need help or advice with phpBB please see Section 3 below.

+ + 2.i. Internationalisation (i18n) +

+
+ +

A number of language packs and style localisations are available. You can find them on our official download page:

+ +

http://www.phpbb.com/downloads/

+ +

This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!

+ +

Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the now appeared new language pack. To install the style image packs you should unarchive the file/s into the styles/subSilver/imageset directory, again you must retain the directory structure. Once installed the languages will become immediately available.

+ +

If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed

+ +
+ Top +

+ + 2.ii. Styles +

+
+ +

Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at

+ +

http://www.phpbb.com/styles/

+ +

Please note that 3rd party styles downloaded for versions of phpBB2 will not work in phpBB3.

+ +

Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles, you should see the new style available, click install and it will become available for all your users.

+ +
+ Top +

+ + 2.iii. Mods +

+
+ +

Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:

+ +

http://www.phpbb.com/mods

+ +

Please remember that any bugs or other issues that occur after you have added any modification should NOT be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.

+ +

Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.

+ +
+ Top +

+ +
+ +

3. Getting help with phpBB3

+ +

phpBB3 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the FAQ which covers a few basic getting started questions. If you need additional help there are several places you should look.

+ + 3.i. phpBB3 Userguide +

+
+ +

A comprehensive userguide is now available online and can be accessed from the following location:

+ +

http://www.phpbb.com/support/documentation/

+ +

This covers everything from installation through setting permissions and managing users.

+ +
+ Top +

+ + 3.ii. Community Forums +

+ +
+ +

phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:

+ +

http://www.phpbb.com/

+ +

If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.

+ +
+ Top +

+ + 3.iii Internet Relay Chat +

+
+ +

Another place you may find help is our IRC channel. This operates on the Freenode IRC network, irc.freenode.net and the channel is #phpbb and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

+ +
+ Top +

+ +
+ +

4. Status of this version

+ +
+

This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, point releases will see only bugs and such like fixed, though feature alterations and minor feature additions may be done. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.

+ +

For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:

+ +

http://area51.phpbb.com/phpBB/

+ +

Please note that this forum should NOT be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.

+
+Top +

+ +
+ +

5. Reporting Bugs

+ +
+

The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please DO NOT post bug reports to our forums, they will be locked. In addition please DO NOT use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).

+ +

http://www.phpbb.com/bugs/

+ +

While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:

+ + + +

If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:

+ + + +

The relevant database type/version is listed within the administration control panel

+ +

Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a fix which you are VERY SURE works (and is consistent with our coding guidelines) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.

+ +

Once a bug has been submitted you will be emailed any follow up comments added to it. Please if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.

+ +
+Top +

+ +5.i. Security related bugs +

+
+

If you find a potential security related vulnerability in phpBB please DO NOT post it to the bug tracker, public forums, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:

+ +

http://www.phpbb.com/security/

+ +
+Top +

+ +
+ +

6. Overview of current bug list

+ +
+

This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation/upgrade.

+ + + +
+Top +

+ +
+ +

7. PHP compatibility issues

+ +
+

phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3.

+ +

Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.

+ +

This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem.

+
+Top +

+ +7.i. Notice on PHP security issues + +

+
+

Currently there are no known issues regarding PHP security.

+
+Top +

+ +
+ +

8. Copyright and disclaimer

+ +
+ +

This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

+ +
+Top + + + +
+ + + + + diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index edf23350ae..8e624eae83 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -216,7 +216,7 @@ body { $auth = new auth(); -

Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this seperately but in the same way.

+

Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this separately but in the same way.

Top @@ -349,9 +349,9 @@ $result = acl_getf_global(option)
-

A number of additional methods are available related to auth. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a seperate class, auth_admin. This can be found in includes/acp/auth.php.

+

A number of additional methods are available related to auth. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, auth_admin. This can be found in includes/acp/auth.php.

-

To use any methods this class contains it first needs to be instantiated seperately from auth. This is achieved in the same way as auth:

+

To use any methods this class contains it first needs to be instantiated separately from auth. This is achieved in the same way as auth:

 $auth_admin = new auth_admin();
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 69e51a1059..63d83a7c20 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -16,17 +16,13 @@
 
 
-
-
 
 
 
 
 
 
 

 
+
+
 
These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow it as closely as possible.
This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.

 
 
Coding Guidelines

@@ -275,7 +256,7 @@ body {
 
 	
Files containing only classes:

 	
-	
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.

+	
Do not forget to comment the class. Classes need a separate @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.

 
 	
Code following the header but only functions/classes file:

 
@@ -310,7 +291,7 @@ class ...
 	
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:

 
 	
    
-		
  • phpBB3
    Core files and all files not assigned to a seperate package
    • 
+		
  • phpBB3
    Core files and all files not assigned to a separate package
    • 
 		
  • acm
    /includes/acm, /includes/cache.php
    Cache System
    • 
 		
  • acp
    /adm, /includes/acp, /includes/functions_admin.php
    Administration Control Panel
    • 
 		
  • dbal
    /includes/db
    Database Abstraction Layer.
    Base class is dbal
@@ -881,7 +862,7 @@ $sql_array = array(
 			'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
 			'ON'	=> 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
 		)
-	);
+	),
 
 	'WHERE'		=> 'fw.user_id = ' . $user->data['user_id'] . ' 
 		AND f.forum_id = fw.forum_id',
@@ -1037,7 +1018,7 @@ trigger_error($user->lang['NO_FORUM']);
 	
-trigger_error('NO_APPROPIATE_MODE', E_USER_ERROR);
+trigger_error('NO_APPROPRIATE_MODE', E_USER_ERROR);

Url formatting

@@ -1108,7 +1089,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;

Use div container/css for styling and table for data representation.

-

The seperate catXXXX and thXXX classes are gone. When defining a header cell just use <th> rather than <th class="thHead"> etc. Similarly for cat, don't use <td class="catLeft"> use <td class="cat"> etc.

+

The separate catXXXX and thXXX classes are gone. When defining a header cell just use <th> rather than <th class="thHead"> etc. Similarly for cat, don't use <td class="catLeft"> use <td class="cat"> etc.

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. {L_POST_USERNAME}<br /><span class="gensmall">{L_POST_USERNAME_EXPLAIN}</span> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.

@@ -1212,7 +1193,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp; != [neq, ne] <> (same as !=) !== (not equivalent in value and type) -=== (equivalent in value and type) +=== (equivalent in value and type) > [gt] < [lt] >= [gte] @@ -1554,6 +1535,8 @@ div
Top + + diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index 6510b8f706..e9de2e7516 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -30,7 +30,7 @@ {L_FILENAME} - + {L_FILE_COMMENT} @@ -68,9 +68,6 @@   - - - diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index f0ebd9f3b1..f3eb6ad32e 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -121,13 +121,13 @@ - + @@ -147,24 +147,28 @@ + + @@ -196,7 +200,7 @@ + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + {L_FONT_SIZE}: + + + + + + + + + colspan="2"> + + + + diff --git a/phpBB/styles/subSilver/template/posting_progress_bar.html b/phpBB/styles/subSilver/template/posting_progress_bar.html index 7a1489b6ec..9a7daede6d 100644 --- a/phpBB/styles/subSilver/template/posting_progress_bar.html +++ b/phpBB/styles/subSilver/template/posting_progress_bar.html @@ -1,4 +1,5 @@ - - -
{L_ICON}: - +
{L_NO_TOPIC_ICON} {L_NO_TOPIC_ICON}{L_NO_PM_ICON}
{S_HIDDEN_ADDRESS_FIELD} - - {to_recipient.NAME}{to_recipient.NAME_FULL}   + + {to_recipient.NAME}{to_recipient.NAME_FULL}   + {L_NO_TO_RECIPIENT}
{L_BCC}: - - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}   + + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}   + {L_NO_BCC_RECIPIENT}
- - +
+ + - - - - - - - - - - - - - - - - - - - - - {L_FONT_SIZE}: -
- - onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')" /> - -
{L_FONT_COLOR}
+ + onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')" /> + +
{L_FONT_COLOR}
@@ -37,10 +36,9 @@
- - - + diff --git a/phpBB/styles/subSilver/template/posting_review.html b/phpBB/styles/subSilver/template/posting_review.html index 0d4d5cd71d..5dae2a6c82 100644 --- a/phpBB/styles/subSilver/template/posting_review.html +++ b/phpBB/styles/subSilver/template/posting_review.html @@ -57,7 +57,7 @@ - +
 {post_review_row.MINI_POST_IMG}{post_review_row.MINI_POST_IMG} {L_POSTED}: {post_review_row.POST_DATE}
diff --git a/phpBB/styles/subSilver/template/posting_smilies.html b/phpBB/styles/subSilver/template/posting_smilies.html index 42a58d1153..960e6a23b4 100644 --- a/phpBB/styles/subSilver/template/posting_smilies.html +++ b/phpBB/styles/subSilver/template/posting_smilies.html @@ -1,13 +1,13 @@ - - + diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index 7065f0f35d..59072606cc 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -23,10 +23,10 @@ - + - +
{L_MORE_INFO}:
{L_CAN_LEAVE_BLANK}
  
diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html index 70952041e0..20385ef753 100644 --- a/phpBB/styles/subSilver/template/search_body.html +++ b/phpBB/styles/subSilver/template/search_body.html @@ -71,14 +71,7 @@ - - - - -
-

{L_INDEX}

-

{S_TIMEZONE}

-
+
diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html index ab0764254c..79853b83af 100644 --- a/phpBB/styles/subSilver/template/search_results.html +++ b/phpBB/styles/subSilver/template/search_results.html @@ -4,7 +4,7 @@ - + @@ -84,14 +84,23 @@ - + @@ -123,7 +132,8 @@ -
+
{PAGE_NUMBER} [ {SEARCH_MATCHES} ]
+


diff --git a/phpBB/styles/subSilver/template/simple_footer.html b/phpBB/styles/subSilver/template/simple_footer.html index 1d627c1dda..b8f1cc865b 100644 --- a/phpBB/styles/subSilver/template/simple_footer.html +++ b/phpBB/styles/subSilver/template/simple_footer.html @@ -10,10 +10,10 @@ forums may be affected. The phpBB Group : 2006 -// --> +//-->
- Powered by phpBB © 2002, 2006 phpBB Group + Powered by phpBB © 2002, 2006 phpBB Group
diff --git a/phpBB/styles/subSilver/template/simple_header.html b/phpBB/styles/subSilver/template/simple_header.html index eab8b10dca..3b97809f50 100644 --- a/phpBB/styles/subSilver/template/simple_header.html +++ b/phpBB/styles/subSilver/template/simple_header.html @@ -17,6 +17,6 @@ - +
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_attachments.html b/phpBB/styles/subSilver/template/ucp_attachments.html index 4e3a12cb3b..f4e4fb9815 100644 --- a/phpBB/styles/subSilver/template/ucp_attachments.html +++ b/phpBB/styles/subSilver/template/ucp_attachments.html @@ -28,7 +28,7 @@
- + @@ -40,7 +40,7 @@
{SEARCH_MATCHES}
{SEARCH_TITLE}{SEARCH_MATCHES}
{L_SEARCHED_TOPIC}: {SEARCH_TOPIC}
{L_SEARCHED_FOR}: {SEARCH_WORDS} {L_IGNORED_TERMS}: {IGNORED_WORDS}		 {searchresults.L_IGNORE_POST}

 {L_FORUM}: {searchresults.FORUM_TITLE}{L_GLOBAL}   {L_TOPIC}: {searchresults.TOPIC_TITLE}

 {L_FORUM}: {searchresults.FORUM_TITLE}{L_GLOBAL}   {L_TOPIC}: {searchresults.TOPIC_TITLE}

{searchresults.POST_AUTHOR_FULL} - +
 {L_POST_SUBJECT}: {searchresults.POST_SUBJECT}
{searchresults.MINI_POST_IMG}{L_POSTED}: {searchresults.POST_DATE} 
 +
+ +  {L_POST_SUBJECT}: {searchresults.POST_SUBJECT} + + [ {L_JUMP_TO_POST} ] + +
+
{L_POSTED}: {searchresults.POST_DATE} 
+
 {attachrow.ROW_NUMBER} {attachrow.FILENAME}
{L_PM}: {L_TOPIC}: {attachrow.TOPIC_TITLE}		{attachrow.FILENAME}
{L_PM}: {L_TOPIC}: {attachrow.TOPIC_TITLE}		  {attachrow.POST_TIME}  {attachrow.SIZE} {attachrow.DOWNLOAD_COUNT}
-
{L_MARK_ALL} :: {L_UNMARK_ALL}
+
{L_MARK_ALL} :: {L_UNMARK_ALL}
diff --git a/phpBB/styles/subSilver/template/ucp_footer.html b/phpBB/styles/subSilver/template/ucp_footer.html index 2160717aba..3b40f90852 100644 --- a/phpBB/styles/subSilver/template/ucp_footer.html +++ b/phpBB/styles/subSilver/template/ucp_footer.html @@ -6,11 +6,7 @@
- - - - -
{L_INDEX}
{S_TIMEZONE}
+
diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index 80113b08ad..d42a4b7fc6 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -227,18 +227,18 @@ - + - + - + - + @@ -250,12 +250,12 @@ - + - +
{L_USERGROUPS}{L_USERGROUPS}
{L_GROUPS_EXPLAIN}{L_GROUPS_EXPLAIN}
{L_GROUP_DETAILS}{L_OPTIONS}{L_OPTIONS}
{L_GROUP_LEADER}{L_GROUP_LEADER}
{L_NO_LEADERS}{L_NO_LEADERS}
  
diff --git a/phpBB/styles/subSilver/template/ucp_header.html b/phpBB/styles/subSilver/template/ucp_header.html index c1eee778ee..72d96c8a9d 100644 --- a/phpBB/styles/subSilver/template/ucp_header.html +++ b/phpBB/styles/subSilver/template/ucp_header.html @@ -13,21 +13,21 @@ {L_PM_TO} + - {L_USERNAME}: + {L_USERNAME}:
[ {L_FIND_USERNAME} ] + -   +   - + {L_USERNAMES}:
- + [ {L_FIND_USERNAME} ] diff --git a/phpBB/styles/subSilver/template/ucp_main_drafts.html b/phpBB/styles/subSilver/template/ucp_main_drafts.html index 4e820acd0d..05c72a4181 100644 --- a/phpBB/styles/subSilver/template/ucp_main_drafts.html +++ b/phpBB/styles/subSilver/template/ucp_main_drafts.html @@ -60,7 +60,7 @@ {L_MESSAGE}:
{L_EDIT_DRAFT_EXPLAIN} - - +
- - + - - + diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html index d357f45279..d49feb9780 100644 --- a/phpBB/styles/subSilver/template/viewforum_body.html +++ b/phpBB/styles/subSilver/template/viewforum_body.html @@ -41,7 +41,7 @@ - + - +
+ - + @@ -47,10 +47,10 @@ - + - + @@ -87,8 +87,8 @@ - - + + diff --git a/phpBB/styles/subSilver/template/ucp_zebra_foes.html b/phpBB/styles/subSilver/template/ucp_zebra_foes.html index 7ff375ce79..d87eed567c 100644 --- a/phpBB/styles/subSilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/subSilver/template/ucp_zebra_foes.html @@ -17,12 +17,14 @@ - +
diff --git a/phpBB/styles/subSilver/template/ucp_register.html b/phpBB/styles/subSilver/template/ucp_register.html index ccbcb4505f..870c2ae1c7 100644 --- a/phpBB/styles/subSilver/template/ucp_register.html +++ b/phpBB/styles/subSilver/template/ucp_register.html @@ -39,7 +39,7 @@
{L_USERNAME}:
{L_USERNAME_EXPLAIN}
{L_EMAIL_ADDRESS}:
{L_CONFIRM_EMAIL}:
{L_NEW_PASSWORD}:
{L_NEW_PASSWORD_EXPLAIN}		{L_PASSWORD}:
{L_PASSWORD_EXPLAIN}
{CONFIRM_IMG}
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}		{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}
{L_NO_FOES}
{L_ADD_FOES}:
{L_ADD_FOES_EXPLAIN} [ {L_FIND_USERNAME} ]		{L_ADD_FOES}:
{L_ADD_FOES_EXPLAIN} [ {L_FIND_USERNAME} ]
{S_HIDDEN_FIELDS}  
+ + \ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_zebra_friends.html b/phpBB/styles/subSilver/template/ucp_zebra_friends.html index fa0403002f..4be2b8838f 100644 --- a/phpBB/styles/subSilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/subSilver/template/ucp_zebra_friends.html @@ -17,7 +17,7 @@ 		{L_NO_FRIENDS}
{L_ADD_FRIENDS}:
{L_ADD_FRIENDS_EXPLAIN} [ {L_FIND_USERNAME} ]		{L_ADD_FRIENDS}:
{L_ADD_FRIENDS_EXPLAIN} [ {L_FIND_USERNAME} ]
{NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} + {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} {UNAPPROVED_IMG}  @@ -52,7 +52,7 @@

[ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

{topicrow.TOPIC_AUTHOR_FULL}

{topicrow.TOPIC_AUTHOR_FULL}

{topicrow.REPLIES}

{topicrow.VIEWS}

 @@ -75,7 +75,7 @@
  
@@ -116,7 +116,7 @@

- + @@ -136,7 +136,7 @@

{L_LOGIN_LOGOUT}
- + @@ -154,8 +154,8 @@ @@ -192,7 +192,7 @@ - + - @@ -238,7 +238,7 @@
{POST_IMG} - - + +
 {S_WATCH_FORUM_TITLE}{L_MARK_TOPICS_READ}  {S_WATCH_FORUM_TITLE}{L_MARK_TOPICS_READ} 
{NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} + {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG}  @@ -203,7 +203,7 @@

[ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

{topicrow.TOPIC_AUTHOR_FULL}

{topicrow.TOPIC_AUTHOR_FULL}

{topicrow.REPLIES}

{topicrow.VIEWS}

 @@ -227,9 +227,9 @@
- + + {L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
- + @@ -273,33 +273,33 @@ - + @@ -284,13 +288,13 @@
{POST_IMG}{POST_IMG}  {PAGE_NUMBER}  [ {TOTAL_TOPICS} ] - + - + - + - + - + - + - + - + - +
{FOLDER_NEW_IMG}{FOLDER_NEW_IMG} {L_NEW_POSTS}   {FOLDER_IMG}{FOLDER_IMG} {L_NO_NEW_POSTS}   {FOLDER_ANNOUNCE_IMG}{FOLDER_ANNOUNCE_IMG} {L_ICON_ANNOUNCEMENT}
{FOLDER_HOT_NEW_IMG}{FOLDER_HOT_NEW_IMG} {L_NEW_POSTS_HOT}   {FOLDER_HOT_IMG}{FOLDER_HOT_IMG} {L_NO_NEW_POSTS_HOT}   {FOLDER_STICKY_IMG}{FOLDER_STICKY_IMG} {L_ICON_STICKY}
{FOLDER_LOCKED_NEW_IMG}{FOLDER_LOCKED_NEW_IMG} {L_NEW_POSTS_LOCKED}   {FOLDER_LOCKED_IMG}{FOLDER_LOCKED_IMG} {L_NO_NEW_POSTS_LOCKED}   {FOLDER_MOVED_IMG}{FOLDER_MOVED_IMG} {L_MOVED_TOPIC}
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index bee02f94ee..e3bb8c2fa2 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -31,7 +31,7 @@ - + @@ -42,17 +42,19 @@
{POST_IMG} {REPLY_IMG}{POST_IMG} {REPLY_IMG}  {PAGE_NUMBER}
  [ {TOTAL_POSTS} ] 
- @@ -158,14 +160,14 @@ - + - + - + - + @@ -255,10 +257,12 @@
+ - +
  - {L_WATCH_TOPIC} | - {L_BOOKMARK_TOPIC} | - {L_PRINT_TOPIC} | - {L_EMAIL_TOPIC} | - {L_BUMP_TOPIC} + + {L_WATCH_TOPIC} | + {L_BOOKMARK_TOPIC} | + {L_PRINT_TOPIC} | + {L_EMAIL_TOPIC} | + {L_BUMP_TOPIC} + {L_VIEW_PREVIOUS_TOPIC} | {L_VIEW_UNREAD_POST} | {L_VIEW_NEXT_TOPIC} {L_VIEW_PREVIOUS_TOPIC} | {L_VIEW_UNREAD_POST} | {L_VIEW_NEXT_TOPIC} 
{postrow.ONLINE_IMG}
{postrow.POSTER_RANK}{postrow.RANK_TITLE}
{postrow.RANK_IMAGE}{postrow.RANK_IMG}
+ {REPORT_IMG} {INFO_IMG} {WARN_IMG} {DELETE_IMG} +
@@ -271,7 +275,7 @@
 
 {PROFILE_IMG} {PM_IMG} {EMAIL_IMG}  
{EDIT_IMG} {QUOTE_IMG}  
 {PROFILE_IMG} {PM_IMG} {EMAIL_IMG}  
{EDIT_IMG} {QUOTE_IMG}  
- +
{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
- + diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css index 066b051cc5..93ae44a542 100644 --- a/phpBB/styles/subSilver/theme/stylesheet.css +++ b/phpBB/styles/subSilver/theme/stylesheet.css @@ -12,8 +12,6 @@ -------------------------------------------------------------- */ - - /* Layout ------------ */ * { @@ -143,12 +141,20 @@ p.moderators { font-weight: bold; } +.rtl p.moderators { + float: right; +} + p.linkmcp { margin: 0px; float: right; white-space: nowrap; } +.rtl p.linkmcp { + float: left; +} + p.breadcrumbs { margin: 0px; float: left; @@ -158,6 +164,10 @@ p.breadcrumbs { font-size: 1em; } +.rtl p.breadcrumbs { + float: right; +} + p.datetime { margin: 0px; float: right; @@ -165,6 +175,10 @@ p.datetime { font-size: 1em; } +.rtl p.datetime { + float: left; +} + p.searchbar { padding: 2px 0; white-space: nowrap; @@ -176,6 +190,10 @@ p.searchbarreg { white-space: nowrap; } +.rtl p.searchbarreg { + float: left; +} + p.forumdesc { padding-bottom: 4px; } @@ -218,7 +236,11 @@ p.topicdetails { } .postbody li, ol, ul { - margin-left: 1.5em; + margin: 0 0 0 1.5em; +} + +.rtl .postbody li, .rtl ol, .rtl ul { + margin: 0 1.5em 0 0; } .posthilit { @@ -300,12 +322,10 @@ td { margin: 0px; padding: 0px; border: 0px; - background-color: white; - background-image: url('./images/cellpic2.jpg'); - background-repeat: repeat-y; + background: white url('./images/cellpic2.jpg') repeat-y scroll top left; } .rtl .catdiv { - background-image: url('./images/cellpic2_rtl.jpg'); + background: white url('./images/cellpic2_rtl.jpg') repeat-y scroll top right; } .cat { @@ -452,7 +472,11 @@ select { } option { - padding-right: 1em; + padding: 0 1em 0 0; +} + +.rtl option { + padding: 0 0 0 1em; } input.radio { @@ -493,6 +517,14 @@ input.radio { font-size: 1.1em; } +.btnfile { + font-weight: normal; + background-color: #ECECEC; + border: 1px solid #A9B8C2; + padding: 1px 5px; + font-size: 1.1em; +} + .helpline { background-color: #DEE3E7; border-style: none; @@ -606,7 +638,7 @@ input.radio { /* Misc ------------ */ - img { +img { border: none; } @@ -627,3 +659,7 @@ pre { font-size: 1.1em; font-family: Monaco, 'Courier New', monospace; } + +.nowrap { + white-space: nowrap; +} \ No newline at end of file diff --git a/phpBB/styles/subSilver/theme/theme.cfg b/phpBB/styles/subSilver/theme/theme.cfg index 695e0e8213..09d5d0d50c 100644 --- a/phpBB/styles/subSilver/theme/theme.cfg +++ b/phpBB/styles/subSilver/theme/theme.cfg @@ -15,7 +15,7 @@ # Single and double quotes do not need to be escaped. # # Available and used values: -# parse_css_file, pagination_sep +# parse_css_file # # General Information about this theme @@ -33,9 +33,3 @@ version = 2.1.1 # images within your css file. # parse_css_file = off - -# -# This option defines the pagination seperator in templates. -# -pagination_sep = ', ' - diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d1461c1764..2713f794eb 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -22,7 +22,7 @@ require($phpbb_root_path . 'includes/functions_module.' . $phpEx); $id = request_var('i', ''); $mode = request_var('mode', ''); -if ($mode == 'login' || $mode == 'logout') +if ($mode == 'login' || $mode == 'logout' || $mode == 'confirm') { define('IN_LOGIN', true); } @@ -78,7 +78,7 @@ switch ($mode) redirect(append_sid("{$phpbb_root_path}index.$phpEx")); } - login_box("index.$phpEx"); + login_box(request_var('redirect', "index.$phpEx")); break; case 'logout': @@ -139,7 +139,9 @@ switch ($mode) foreach ($_COOKIE as $cookie_name => $cookie_data) { $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); - if (strpos($cookie_name, '_poll') === false) + + // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ + if (strpos($cookie_name, 'poll_') !== 0) { $user->set_cookie($cookie_name, '', $set_time); } @@ -194,7 +196,7 @@ switch ($mode) add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); - $message = sprintf($user->lang['PERMISSIONS_TRANSFERED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); trigger_error($message); break; @@ -244,7 +246,7 @@ if (!$user->data['is_registered']) $update_time = $config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( - 'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( USERS_TABLE => 'u', @@ -262,7 +264,7 @@ $sql = $db->sql_build_query('SELECT_DISTINCT', array( AND z.friend = 1 AND u.user_id = z.zebra_id', - 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username, u.user_allow_viewonline, u.user_colour', + 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_allow_viewonline, u.user_colour, u.username', 'ORDER_BY' => 'u.username_clean ASC', )); diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 9d6da5c31c..990a635c7a 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -152,9 +152,11 @@ if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] & if (!$auth->acl_get('f_read', $forum_id)) { $template->assign_vars(array( + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), + 'S_NO_READ_ACCESS' => true, 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, - 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login&redirect=' . urlencode(build_url(array('_f_')))) + 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', build_url(array('_f_')))), )); page_footer(); @@ -241,9 +243,6 @@ $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LO $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; $template->assign_vars(array( - 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param"), $topics_count, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), - 'TOTAL_TOPICS' => ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count)), 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', 'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt), @@ -441,6 +440,17 @@ if (sizeof($shadow_topic_list)) { $orig_topic_id = $shadow_topic_list[$row['topic_id']]; + // Do not include those topics the user has no permission to access + if (!$auth->acl_get('f_read', $row['forum_id'])) + { + // We need to remove any trace regarding this topic. :) + unset($rowset[$orig_topic_id]); + unset($topic_list[array_search($orig_topic_id, $topic_list)]); + $topics_count--; + + continue; + } + // We want to retain some values $row = array_merge($row, array( 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], @@ -453,6 +463,12 @@ if (sizeof($shadow_topic_list)) } unset($shadow_topic_list); +$template->assign_vars(array( + 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param"), $topics_count, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), + 'TOTAL_TOPICS' => ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count))) +); + $topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list); $topic_tracking_info = $tracking_topics = array(); @@ -515,7 +531,7 @@ if (sizeof($topic_list)) $row = &$rowset[$topic_id]; // This will allow the style designer to output a different header - // or even seperate the list of announcements from sticky and normal topics + // or even separate the list of announcements from sticky and normal topics $s_type_switch_test = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; // Replies diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 8d5f73f0ef..f202dceb5b 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -83,7 +83,7 @@ $result = $db->sql_query($sql, 600); while ($row = $db->sql_fetchrow($result)) { - $forum_data[$row['forum_id']] = $row['forum_name']; + $forum_data[$row['forum_id']] = $row; } $db->sql_freeresult($result); @@ -117,7 +117,7 @@ if (!$show_guests) } // Get user list -$sql = 'SELECT u.user_id, u.username, u.user_type, u.user_allow_viewonline, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_viewonline +$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_type, u.user_allow_viewonline, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_viewonline FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s WHERE u.user_id = s.session_user_id AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . @@ -209,6 +209,14 @@ while ($row = $db->sql_fetchrow($result)) if ($forum_id && $auth->acl_get('f_list', $forum_id)) { $location = ''; + $location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); + + if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK) + { + $location = sprintf($user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']); + break; + } + switch ($on_page[1]) { case 'posting': @@ -217,25 +225,24 @@ while ($row = $db->sql_fetchrow($result)) switch ($on_page[1]) { case 'reply': - $location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]); + case 'quote': + $location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']); break; default: - $location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]); + $location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']); break; } break; case 'viewtopic': - $location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]); + $location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']); break; case 'viewforum': - $location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]); + $location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']); break; } - - $location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); } else { @@ -265,16 +272,30 @@ while ($row = $db->sql_fetchrow($result)) break; case 'mcp': + $location = $user->lang['VIEWING_MCP']; + $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); + break; + case 'ucp': $location = $user->lang['VIEWING_UCP']; - /** - * @todo getting module/mode for ucp and mcp - */ -/* if (strpos($row['session_page'], 'i=pm&mode=compose') !== false) + // Grab some common modules + $url_params = array( + 'mode=register' => 'VIEWING_REGISTER', + 'i=pm&mode=compose' => 'POSTING_PRIVATE_MESSAGE', + 'i=pm&' => 'VIEWING_PRIVATE_MESSAGES', + 'i=profile&' => 'CHANGING_PROFILE', + 'i=prefs&' => 'CHANGING_PREFERENCES', + ); + + foreach ($url_params as $param => $lang) { - $location = 'Composing PM'; - }*/ + if (strpos($row['session_page'], $param) !== false) + { + $location = $user->lang[$lang]; + break; + } + } $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); break; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index d7ef0697c1..4ef45eddc0 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -480,7 +480,7 @@ $icons = $cache->obtain_icons(); $extensions = array(); if ($topic_data['topic_attachment']) { - $extensions = $cache->obtain_attach_extensions(); + $extensions = $cache->obtain_attach_extensions($forum_id); } // Forum rules listing @@ -493,7 +493,7 @@ $allow_change_type = ($auth->acl_get('m_', $forum_id) || ($user->data['is_regist $topic_mod = ''; $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_data['topic_poster'] && $topic_data['topic_status'] == ITEM_UNLOCKED)) ? (($topic_data['topic_status'] == ITEM_UNLOCKED) ? '' : '') : ''; $topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '' : ''; +$topic_mod .= ($auth->acl_get('m_move', $forum_id) && $topic_data['topic_status'] != ITEM_MOVED) ? '' : ''; $topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '' : ''; $topic_mod .= ($auth->acl_get('m_merge', $forum_id)) ? '' : ''; $topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '' : ''; @@ -674,7 +674,7 @@ if (!empty($topic_data['poll_start'])) 'vote_user_ip' => (string) $user->ip, ); - $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); + $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); } } @@ -880,7 +880,7 @@ $sql = $db->sql_build_query('SELECT', array( $result = $db->sql_query($sql); -$now = getdate(time() + $user->timezone + $user->dst - (date('H', time()) - gmdate('H', time())) * 3600); +$now = getdate(time() + $user->timezone + $user->dst - date('Z')); // Posts are stored in the $rowset array while $attach_list, $user_cache // and the global bbcode_bitfield are built @@ -1005,8 +1005,8 @@ while ($row = $db->sql_fetchrow($result)) 'from' => (!empty($row['user_from'])) ? $row['user_from'] : '', 'sig' => $user_sig, - 'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '', - 'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '', + 'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '', + 'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '', 'viewonline' => $row['user_allow_viewonline'], 'allow_pm' => $row['user_allow_pm'], @@ -1050,28 +1050,7 @@ while ($row = $db->sql_fetchrow($result)) $user_cache[$poster_id]['avatar'] = ''; } - if (!empty($row['user_rank'])) - { - $user_cache[$poster_id]['rank_title'] = (isset($ranks['special'][$row['user_rank']])) ? $ranks['special'][$row['user_rank']]['rank_title'] : ''; - $user_cache[$poster_id]['rank_image'] = (!empty($ranks['special'][$row['user_rank']]['rank_image'])) ? '' . $ranks['special'][$row['user_rank']]['rank_title'] . '
' : ''; - $user_cache[$poster_id]['rank_image_src'] = (!empty($ranks['special'][$row['user_rank']]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$row['user_rank']]['rank_image'] : ''; - } - else - { - if (isset($ranks['normal']) && sizeof($ranks['normal'])) - { - foreach ($ranks['normal'] as $rank) - { - if ($row['user_posts'] >= $rank['rank_min']) - { - $user_cache[$poster_id]['rank_title'] = $rank['rank_title']; - $user_cache[$poster_id]['rank_image'] = (!empty($rank['rank_image'])) ? '' . $rank['rank_title'] . '
' : ''; - $user_cache[$poster_id]['rank_image_src'] = (!empty($rank['rank_image'])) ? $config['ranks_path'] . '/' . $rank['rank_image'] : ''; - break; - } - } - } - } + get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']); if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email')) { @@ -1255,7 +1234,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Parse the message and subject $message = censor_text($row['post_text']); - $message = str_replace("\n", '
', $message); // Second parse bbcode here if ($row['bbcode_bitfield']) @@ -1263,18 +1241,14 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } + $message = str_replace("\n", '
', $message); + // Always process smilies after parsing bbcodes $message = smiley_text($message); - if (isset($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']])) + if (!empty($attachments[$row['post_id']])) { - $unset_attachments = parse_inline_attachments($message, $attachments[$row['post_id']], $update_count, $forum_id); - - // Needed to let not display the inlined attachments at the end of the post again - foreach ($unset_attachments as $index) - { - unset($attachments[$row['post_id']][$index]); - } + parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); } // Highlight active words (primarily for search) @@ -1388,9 +1362,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'POSTER_RANK' => $user_cache[$poster_id]['rank_title'], - 'RANK_IMAGE' => $user_cache[$poster_id]['rank_image'], - 'RANK_IMAGE_SRC' => $user_cache[$poster_id]['rank_image_src'], + 'RANK_TITLE' => $user_cache[$poster_id]['rank_title'], + 'RANK_IMG' => $user_cache[$poster_id]['rank_image'], + 'RANK_IMG_SRC' => $user_cache[$poster_id]['rank_image_src'], 'POSTER_JOINED' => $user_cache[$poster_id]['joined'], 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], 'POSTER_FROM' => $user_cache[$poster_id]['from'],
{POST_IMG} {REPLY_IMG}{POST_IMG} {REPLY_IMG}  {PAGE_NUMBER}
  [ {TOTAL_POSTS} ]