diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-12 13:20:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-12 13:20:38 +0000 |
| commit | 599d8496bf328981a5c789eed2bb74af8115367e (patch) | |
| tree | e43c1653d936e607421430484582e8caf4c9b5b2 | |
| parent | 841f5d82f6a33c390ad02c543e7231361dd5e396 (diff) | |
| download | forums-599d8496bf328981a5c789eed2bb74af8115367e.tar forums-599d8496bf328981a5c789eed2bb74af8115367e.tar.gz forums-599d8496bf328981a5c789eed2bb74af8115367e.tar.bz2 forums-599d8496bf328981a5c789eed2bb74af8115367e.tar.xz forums-599d8496bf328981a5c789eed2bb74af8115367e.zip | |
informational change for orphaned attachments - they only list already uploaded files not assigned to posts (orphaned attachments).
add index.htm files to cache and files directory.
git-svn-id: file:///svn/phpbb/trunk@7547 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/cache/index.htm | 10 | ||||
| -rw-r--r-- | phpBB/files/index.htm | 10 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 |
6 files changed, 24 insertions, 4 deletions
diff --git a/phpBB/cache/index.htm b/phpBB/cache/index.htm new file mode 100644 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/cache/index.htm @@ -0,0 +1,10 @@ +<html> +<head> +<title></title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +</head> + +<body bgcolor="#FFFFFF" text="#000000"> + +</body> +</html> diff --git a/phpBB/files/index.htm b/phpBB/files/index.htm new file mode 100644 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/files/index.htm @@ -0,0 +1,10 @@ +<html> +<head> +<title></title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +</head> + +<body bgcolor="#FFFFFF" text="#000000"> + +</body> +</html> diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 4dfa617caf..669613c589 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -430,7 +430,7 @@ class auth_admin extends auth // If we only have one forum id to display or being in local mode and more than one user/group to display, // we switch the complete interface to group by user/usergroup instead of grouping by forum - // To achive this, we need to switch the array a bit + // To achieve this, we need to switch the array a bit if (sizeof($forum_ids) == 1 || ($local && sizeof($ug_names_ary) > 1)) { $hold_ary_temp = $hold_ary; diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 3b0da3d63b..2cbfd56adc 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1436,7 +1436,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u } // First of all make sure the subject and topic title are having the correct length. - // To achive this without cutting off between special chars we convert to an array and then count the elements. + // To achieve this without cutting off between special chars we convert to an array and then count the elements. $subject = truncate_string($subject); $data['topic_title'] = truncate_string($data['topic_title']); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 6582131a50..08ef23aaab 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -34,7 +34,7 @@ $lang = array_merge($lang, array( 'ACP_ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the main settings for attachments and the associated special categories.', 'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.', 'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…).', - 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see files within the attachments upload directory but not assigned to posts. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself, this feature is mainly for those people wanting to upload files with another program and assigning those (mostly large) files to an existing post.', + 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see orphaned files. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself. This will assign the already uploaded attachment to the post you entered.', 'ADD_EXTENSION' => 'Add extension', 'ADD_EXTENSION_GROUP' => 'Add extension group', 'ADMIN_UPLOAD_ERROR' => 'Errors while trying to attach file: “%s”.', diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 0de1e43660..5404d8b4ff 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -110,7 +110,7 @@ <div id="search-box"> <form action="{U_SEARCH}" method="get" id="search"> <fieldset> - <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" accesskey="s" /> + <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> <input class="button2" value="{L_SEARCH}" type="submit" /><br /> <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_HIDDEN_FIELDS} </fieldset> |