diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-30 15:04:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-30 15:04:49 +0000 |
| commit | 5634fad4ae67fd6fa9251ff4aa50cc8553e826a4 (patch) | |
| tree | d498a39d667e8afa273029c2210783af0eb8fbd0 /phpBB/includes | |
| parent | b1b542f69b3fd2f5fad3f2b757bc9a1593628c8d (diff) | |
| download | forums-5634fad4ae67fd6fa9251ff4aa50cc8553e826a4.tar forums-5634fad4ae67fd6fa9251ff4aa50cc8553e826a4.tar.gz forums-5634fad4ae67fd6fa9251ff4aa50cc8553e826a4.tar.bz2 forums-5634fad4ae67fd6fa9251ff4aa50cc8553e826a4.tar.xz forums-5634fad4ae67fd6fa9251ff4aa50cc8553e826a4.zip | |
some fixes...
git-svn-id: file:///svn/phpbb/trunk@7813 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acm/acm_file.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 13 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_template.php | 3 |
5 files changed, 29 insertions, 5 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index f98873fdbf..faa6403a2e 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -79,6 +79,8 @@ class acm fwrite($fp, "<?php\n\$this->vars = " . var_export($this->vars, true) . ";\n\n\$this->var_expires = " . var_export($this->var_expires, true) . "\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_dir . 'data_global.' . $phpEx, 0666); } else { @@ -181,6 +183,8 @@ class acm fwrite($fp, "<?php\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\n\$data = " . var_export($var, true) . ";\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_dir . "data{$var_name}.$phpEx", 0666); } } else @@ -365,8 +369,9 @@ class acm // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); + $filename = $this->cache_dir . 'sql_' . md5($query) . '.' . $phpEx; - if ($fp = @fopen($this->cache_dir . 'sql_' . md5($query) . '.' . $phpEx, 'wb')) + if ($fp = @fopen($filename, 'wb')) { @flock($fp, LOCK_EX); @@ -387,6 +392,8 @@ class acm @flock($fp, LOCK_UN); fclose($fp); + @chmod($filename, 0666); + $query_result = $query_id; } } diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 9f2b3579e8..4ab4420e6f 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -258,7 +258,7 @@ parse_css_file = {PARSE_CSS_FILE} } else { - $filelist[substr($row['template_filename'], 0, $slash_pos + 1)] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1); + $filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1); } } } @@ -779,7 +779,7 @@ parse_css_file = {PARSE_CSS_FILE} } else { - $filelist[$file_info['dirname'] . '/'][] = "{$file_info['basename']}.{$file_info['extension']}"; + $filelist[$file_info['dirname'] . '/'][] = $file_info['basename']; } } diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 02d4c6bb3c..03f2db7d15 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -42,15 +42,28 @@ class acp_update $announcement_url = trim($info[1]); $update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update'); + // Determine automatic update... + $sql = 'SELECT config_value + FROM ' . CONFIG_TABLE . " + WHERE config_name = 'version_update_from'"; + $result = $db->sql_query($sql); + $version_update_from = (string) $db->sql_fetchfield('config_value'); + $db->sql_freeresult($result); + + $current_version = (!empty($version_update_from)) ? $version_update_from : $config['version']; + + $up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; $up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; $template->assign_vars(array( 'S_UP_TO_DATE' => $up_to_date, + 'S_UP_TO_DATE_AUTO' => $up_to_date_automatic, 'S_VERSION_CHECK' => true, 'U_ACTION' => $this->u_action, 'LATEST_VERSION' => $latest_version, 'CURRENT_VERSION' => $config['version'], + 'AUTO_VERSION' => $version_update_from, 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $announcement_url, $update_link), )); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 26ff1491fb..6497bfb392 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -556,6 +556,7 @@ class queue $fp = @fopen($this->cache_file . '.lock', 'wb'); fclose($fp); + @chmod($this->cache_file . '.lock', 0666); include($this->cache_file); @@ -683,6 +684,8 @@ class queue fwrite($fp, "<?php\n\$this->queue_data = " . var_export($this->queue_data, true) . ";\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_file, 0666); } } @@ -722,6 +725,8 @@ class queue fwrite($fp, "<?php\n\$this->queue_data = " . var_export($this->data, true) . ";\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_file, 0666); } } } diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index aacb4c6ddb..0d8a39eaee 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -752,8 +752,7 @@ class template_compile @flock($fp, LOCK_UN); @fclose($fp); - @umask(0); - @chmod($filename, 0644); + @chmod($filename, 0666); } return; |