From a267c6ccd20ea835a398211063b550ef49591b82 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 28 Dec 2011 04:21:21 -0500
Subject: [PATCH] - PHPCS
---
program/include/rcube_html_page.php | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 7d48168..ac4fc0b 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -52,9 +52,13 @@
public function include_script($file, $position='head')
{
static $sa_files = array();
-
- if (!preg_match('|^https?://|i', $file) && $file[0] != '/')
- $file = $this->scripts_path . $file . (($fs = @filemtime($this->scripts_path . $file)) ? '?s='.$fs : '');
+
+ if (!preg_match('|^https?://|i', $file) && $file[0] != '/') {
+ $file = $this->scripts_path . $file;
+ if ($fs = @filemtime($file)) {
+ $file .= '?s=' . $fs;
+ }
+ }
if (in_array($file, $sa_files)) {
return;
@@ -65,6 +69,7 @@
if (!is_array($this->script_files[$position])) {
$this->script_files[$position] = array();
}
+
$this->script_files[$position][] = $file;
}
@@ -77,9 +82,10 @@
public function add_script($script, $position='head')
{
if (!isset($this->scripts[$position])) {
- $this->scripts[$position] = "\n".rtrim($script);
- } else {
- $this->scripts[$position] .= "\n".rtrim($script);
+ $this->scripts[$position] = "\n" . rtrim($script);
+ }
+ else {
+ $this->scripts[$position] .= "\n" . rtrim($script);
}
}
@@ -100,7 +106,7 @@
*/
public function add_header($str)
{
- $this->header .= "\n".$str;
+ $this->header .= "\n" . $str;
}
/**
@@ -111,7 +117,7 @@
*/
public function add_footer($str)
{
- $this->footer .= "\n".$str;
+ $this->footer .= "\n" . $str;
}
/**
@@ -262,7 +268,8 @@
) {
$css = '';
foreach ($this->css_files as $file) {
- $css .= html::tag('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $file, 'nl' => true));
+ $css .= html::tag('link', array('rel' => 'stylesheet',
+ 'type' => 'text/css', 'href' => $file, 'nl' => true));
}
$output = substr_replace($output, $css, $pos, 0);
}
@@ -279,10 +286,12 @@
// trigger hook with final HTML content to be sent
$hook = rcmail::get_instance()->plugins->exec_hook("send_page", array('content' => $output));
if (!$hook['abort']) {
- if ($this->charset != RCMAIL_CHARSET)
+ if ($this->charset != RCMAIL_CHARSET) {
echo rcube_charset_convert($hook['content'], RCMAIL_CHARSET, $this->charset);
- else
+ }
+ else {
echo $hook['content'];
+ }
}
}
@@ -296,14 +305,17 @@
$file = $matches[3];
// correct absolute paths
- if ($file[0] == '/')
+ if ($file[0] == '/') {
$file = $this->base_path . $file;
+ }
// add file modification timestamp
- if (preg_match('/\.(js|css)$/', $file))
- $file .= '?s=' . @filemtime($file);
+ if (preg_match('/\.(js|css)$/', $file)) {
+ if ($fs = @filemtime($file)) {
+ $file .= '?s=' . $fs;
+ }
+ }
- return sprintf("%s=%s%s%s", $matches[1], $matches[2], $file, $matches[4]);
+ return $matches[1] . '=' . $matches[2] . $file . $matches[4];
}
}
-
--
Gitblit v1.9.1