From 75475b1684fbb72f9e5fc1e5d23ba0fd99fe6cb8 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 12 Nov 2014 17:14:09 +0100 Subject: [PATCH] Rename getBootstrapDirecory() to getBootstrapDirectory() --- library/Icinga/Application/ApplicationBootstrap.php | 6 +++--- library/Icinga/File/Pdf.php | 2 +- library/Icinga/Web/JavaScript.php | 2 +- library/Icinga/Web/StyleSheet.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 92fe9b660..13a36d185 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -114,11 +114,11 @@ abstract class ApplicationBootstrap protected function __construct($baseDir = null, $configDir = null) { if ($baseDir === null) { - $baseDir = dirname($this->getBootstrapDirecory()); + $baseDir = dirname($this->getBootstrapDirectory()); } $this->baseDir = $baseDir; if (! defined('ICINGAWEB_BASEDIR')) { - define('ICINGAWEB_BASEDIR', dirname($this->getBootstrapDirecory())); + define('ICINGAWEB_BASEDIR', dirname($this->getBootstrapDirectory())); } define('ICINGAWEB_VENDORS', ICINGAWEB_BASEDIR . '/library/vendor'); define('ICINGAWEB_APPDIR', ICINGAWEB_BASEDIR . '/application'); @@ -265,7 +265,7 @@ abstract class ApplicationBootstrap * * @return string */ - public function getBootstrapDirecory() + public function getBootstrapDirectory() { return dirname(realpath($_SERVER['SCRIPT_FILENAME'])); } diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php index 2e8a97887..6f4102129 100644 --- a/library/Icinga/File/Pdf.php +++ b/library/Icinga/File/Pdf.php @@ -49,7 +49,7 @@ class Pdf extends DOMPDF $layout->content = $controller->getResponse(); $html = $layout->render(); $imgDir = Url::fromPath('img'); - $html = preg_replace('~src="' . $imgDir . '/~', 'src="' . Icinga::app()->getBootstrapDirecory() . '/img/', $html); + $html = preg_replace('~src="' . $imgDir . '/~', 'src="' . Icinga::app()->getBootstrapDirectory() . '/img/', $html); $html = preg_replace('~src="/svg/chart.php(.*)"~', 'class="icon" src="http://master1.com/png/chart.php$1"', $html); $this->load_html($html); $this->render(); diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php index 6224b5b82..0b64a394b 100644 --- a/library/Icinga/Web/JavaScript.php +++ b/library/Icinga/Web/JavaScript.php @@ -67,7 +67,7 @@ class JavaScript public static function send($minified = false) { header('Content-Type: application/javascript'); - $basedir = Icinga::app()->getBootstrapDirecory(); + $basedir = Icinga::app()->getBootstrapDirectory(); $js = $out = ''; $min = $minified ? '.min' : ''; diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php index 87cd1b3c0..062b7d86f 100644 --- a/library/Icinga/Web/StyleSheet.php +++ b/library/Icinga/Web/StyleSheet.php @@ -31,7 +31,7 @@ class StyleSheet public static function compileForPdf() { $less = new LessCompiler(); - $basedir = Icinga::app()->getBootstrapDirecory(); + $basedir = Icinga::app()->getBootstrapDirectory(); foreach (self::$lessFiles as $file) { $less->addFile($basedir . '/' . $file); } @@ -57,7 +57,7 @@ class StyleSheet public static function send($minified = false) { $app = Icinga::app(); - $basedir = $app->getBootstrapDirecory(); + $basedir = $app->getBootstrapDirectory(); foreach (self::$lessFiles as $file) { $lessFiles[] = $basedir . '/' . $file; }