mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)

Browse Source 
- use getenv instead of $_ENV (with $_ENV the case could be wrong)
- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)
- implemented max login attempts
- changed the expected return parameters for logins/sessions
- added acp page for editing report/denial reasons
- other fixes here and there


git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-12 23:19:55 +00:00
parent f4cfd3665f
commit 9988679d56
58 changed files with 1117 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/install/install.php
View File

@@ -418,10 +418,10 @@ if ($stage == 0)
// Imagemagick are you there? Give me a sign or a path ...
$img_imagick = '';
if (empty($_ENV['MAGICK_HOME']))
if (empty(getenv('MAGICK_HOME')))
{
$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', $_ENV['PATH'])));
$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
$locations = array_merge($path_locations, $locations);
foreach ($locations as $location)
@@ -441,7 +441,7 @@ if ($stage == 0)
}
else
{
$img_imagick = str_replace('\\', '/', $_ENV['MAGICK_HOME']);
$img_imagick = str_replace('\\', '/', getenv('MAGICK_HOME'));
}
?>
@@ -880,7 +880,7 @@ if ($stage == 2)
// Write out a temp file ... if safe mode is on we'll write it to our
// local cache/tmp directory
$tmp_path = (!@ini_get('safe_mode')) ? false : $phpbb_root_path . 'cache/tmp';
$filename = tempnam($tmp_path, uniqid(rand()) . 'cfg');
$filename = tempnam($tmp_path, unique_id() . 'cfg');
$fp = @fopen($filename, 'w');
@fwrite($fp, $config_data);