makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use acl_m_ instead of acl_m

Browse source 
- some reference fixes


git-svn-id: file:///svn/phpbb/trunk@5307 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-11-19 16:16:52 +00:00
parent 68e80ad2df
commit 318e561cb2
4 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/functions_upload.php
View file

@ -62,7 +62,7 @@ class filespec
$this->mimetype = 'application/octetstream'; $this->mimetype = 'application/octetstream';
} }
$this->extension = array_pop(explode('.', strtolower($this->realname))); $this->extension = strtolower($this->get_extension($this->realname));
// Try to get real filesize from temporary folder (not always working) ;) // Try to get real filesize from temporary folder (not always working) ;)
$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize; $this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
@ -144,6 +144,20 @@ class filespec
} }
} }
/**
* Get file extension
*/
function get_extension($filename)
{
if (strpos($filename, '.') === false)
{
return '';
}
$filename = explode('.', $filename);
return array_pop($filename);
}
/** /**
* Move file to destination folder * Move file to destination folder
* *
@ -508,7 +522,11 @@ class fileupload
$port = (!empty($url['port'])) ? (int) $url['port'] : 80; $port = (!empty($url['port'])) ? (int) $url['port'] : 80;
$upload_ary['type'] = 'application/octet-stream'; $upload_ary['type'] = 'application/octet-stream';
$upload_ary['name'] = basename($url['path']) . '.' . array_pop(explode('.', $url['path']));
$url['path'] = explode('.', $url['path']);
$ext = array_pop($url['path']);
$upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : '');
$filename = $url['path']; $filename = $url['path'];
$filesize = 0; $filesize = 0;

13
phpBB/includes/mcp/mcp_main.php
View file

@ -812,7 +812,10 @@ function mcp_fork_topic($topic_ids)
$new_topic_id = $db->sql_nextid(); $new_topic_id = $db->sql_nextid();
$new_topic_id_list[$topic_id] = $new_topic_id; $new_topic_id_list[$topic_id] = $new_topic_id;
markread('topic', $to_forum_id, $new_topic_id); /**
* @todo enable
* markread('topic', $to_forum_id, $new_topic_id);
*/
if ($topic_row['poll_start']) if ($topic_row['poll_start'])
{ {
@ -979,10 +982,10 @@ class mcp_main_info
'title' => 'MCP_MAIN', 'title' => 'MCP_MAIN',
'version' => '1.0.0', 'version' => '1.0.0',
'modes' => array( 'modes' => array(
'front' => array('title' => 'MCP_MAIN_FRONT', 'auth' => 'acl_m'), 'front' => array('title' => 'MCP_MAIN_FRONT', 'auth' => 'acl_m_'),
'forum_view' => array('title' => 'MCP_MAIN_FORUM_VIEW', 'auth' => 'acl_m'), 'forum_view' => array('title' => 'MCP_MAIN_FORUM_VIEW', 'auth' => 'acl_m_'),
'topic_view' => array('title' => 'MCP_MAIN_TOPIC_VIEW', 'auth' => 'acl_m'), 'topic_view' => array('title' => 'MCP_MAIN_TOPIC_VIEW', 'auth' => 'acl_m_'),
'post_details' => array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m'), 'post_details' => array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m_'),
), ),
); );
} }

8
phpBB/language/en/acp/common.php
View file

@ -147,6 +147,14 @@ $lang += array(
// Log // Log
$lang += array( $lang += array(
'LOG_BOT_ADDED' => '<b>New bot added</b><br />&#187; %s',
'LOG_BOT_DELETE' => '<b>Deleted bot</b><br />&#187; %s',
'LOG_BOT_UPDATED' => '<b>Existing bot updated</b><br />&#187; %s',
'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>',
'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>',
'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>',
'LOG_MODULE_DISABLE' => '<b>Module disabled</b>', 'LOG_MODULE_DISABLE' => '<b>Module disabled</b>',
'LOG_MODULE_ENABLE' => '<b>Module enabled</b>', 'LOG_MODULE_ENABLE' => '<b>Module enabled</b>',
'LOG_MODULE_MOVE_DOWN' => '<b>Module moved down</b><br />&#187; %s', 'LOG_MODULE_MOVE_DOWN' => '<b>Module moved down</b><br />&#187; %s',

15
phpBB/mcp.php
View file

@ -29,20 +29,21 @@ $user->setup('mcp');
$module = new p_master(); $module = new p_master();
// Basic parameter data // Basic parameter data
$mode = request_var('mode', '');
$mode2 = (isset($_REQUEST['quick'])) ? request_var('mode2', '') : '';
$id = request_var('i', ''); $id = request_var('i', '');
if (is_array($mode)) if (is_array($_REQUEST['mode']))
{ {
list($mode, ) = each($mode); list($mode, ) = each(request_var('mode', array(''));
}
else
{
$mode = request_var('mode', '');
} }
if ($mode2) if (isset($_REQUEST['quick']))
{ {
$mode = $mode2; $mode = request_var('mode2', '');
$action = ''; $action = '';
unset($mode2);
} }
// Make sure we are using the correct module // Make sure we are using the correct module