From 77c942263062fbb417630a037abbc34b57d1f690 Mon Sep 17 00:00:00 2001 From: Sam Thompson Date: Mon, 4 Jul 2011 17:10:34 -0700 Subject: [PATCH 1/4] [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol PHPBB3-10250 --- phpBB/styles/prosilver/imageset/site_logo.gif | Bin 3430 -> 5070 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/phpBB/styles/prosilver/imageset/site_logo.gif b/phpBB/styles/prosilver/imageset/site_logo.gif index 909114c377af79f664b81c34723f808116d1497f..2517fbedd691d93bebf31860a8b75b8de8b450f1 100644 GIT binary patch literal 5070 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 Id4T``JL>F2ivR!s From f610f44a4e23eef8ed7698a32b10bc28789bdf00 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 5 Jul 2011 19:09:09 -0400 Subject: [PATCH 2/4] [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used The new logo is slightly wider than the old logo. If we changed the size in the imageset.cfg we would cause a conflict for everyone who replaced the logo with their own and modified the size. Instead we overwrite the width and height in the img() function in session.php only if its contents are that of the stock phpbb logo. PHPBB3-10250 --- phpBB/includes/session.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 7ef6e02a8d..f509957f96 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -2272,9 +2272,36 @@ class user extends session // Use URL if told so $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; - $img_data['src'] = $root_path . 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename']; + $path = 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename']; + + $img_data['src'] = $root_path . $path; $img_data['width'] = $this->img_array[$img]['image_width']; $img_data['height'] = $this->img_array[$img]['image_height']; + + // We overwrite the width and height to the phpbb logo's width + // and height here if the contents of the site_logo file are + // really equal to the phpbb_logo + // This allows us to change the dimensions of the phpbb_logo without + // modifying the imageset.cfg and causing a conflict for everyone + // who modified it for their custom logo on updating + if ($img == 'site_logo' && file_exists($phpbb_root_path . $path)) + { + global $cache; + + if (($img_file_hash = $cache->get('imageset_site_logo_md5')) === false) + { + $img_file_hash = md5(file_get_contents($phpbb_root_path . $path)); + $cache->put('imageset_site_logo_md5', $img_file_hash); + } + + $phpbb_logo_hash = '0c461a32cd3621643105f0d02a772c10'; + + if ($phpbb_logo_hash == $img_file_hash) + { + $img_data['width'] = '149'; + $img_data['height'] = '52'; + } + } } $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; From 8ec737e9c4d36711b09250df72492a8f89e7bfb1 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 5 Jul 2011 19:38:15 -0400 Subject: [PATCH 3/4] [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset PHPBB3-10250 --- phpBB/includes/acp/acp_styles.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 37cf8d1f72..3bc8c86500 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -510,6 +510,7 @@ parse_css_file = {PARSE_CSS_FILE} $db->sql_transaction('commit'); $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); + $cache->destroy('imageset_site_logo_md5'); add_log('admin', 'LOG_IMAGESET_REFRESHED', $imageset_row['imageset_name']); trigger_error($user->lang['IMAGESET_REFRESHED'] . adm_back_link($this->u_action)); From b261a1a31ae8500cc090d412ed569123ae3cb9ca Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 6 Jul 2011 17:53:57 -0400 Subject: [PATCH 4/4] [ticket/10250] The site_logo hash is different depending on imageset & language PHPBB3-10250 --- phpBB/includes/session.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index f509957f96..e9e706e2b8 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -2288,15 +2288,23 @@ class user extends session { global $cache; - if (($img_file_hash = $cache->get('imageset_site_logo_md5')) === false) + $img_file_hashes = $cache->get('imageset_site_logo_md5'); + + if ($img_file_hashes === false) { - $img_file_hash = md5(file_get_contents($phpbb_root_path . $path)); - $cache->put('imageset_site_logo_md5', $img_file_hash); + $img_file_hashes = array(); + } + + $key = $this->theme['imageset_path'] . '::' . $this->img_array[$img]['image_lang']; + if (!isset($img_file_hashes[$key])) + { + $img_file_hashes[$key] = md5(file_get_contents($phpbb_root_path . $path)); + $cache->put('imageset_site_logo_md5', $img_file_hashes); } $phpbb_logo_hash = '0c461a32cd3621643105f0d02a772c10'; - if ($phpbb_logo_hash == $img_file_hash) + if ($phpbb_logo_hash == $img_file_hashes[$key]) { $img_data['width'] = '149'; $img_data['height'] = '52';