projects
/
core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6fa5ae
)
Removed some anoying HTML code
author
Roland Häder
<roland@mxchange.org>
Sun, 20 May 2012 20:53:27 +0000
(20:53 +0000)
committer
Roland Häder
<roland@mxchange.org>
Sun, 20 May 2012 20:53:27 +0000
(20:53 +0000)
inc/classes/main/class_BaseFrameworkSystem.php
patch
|
blob
|
history
inc/classes/main/console/class_ConsoleTools.php
patch
|
blob
|
history
inc/classes/main/io/class_FileIoStream.php
patch
|
blob
|
history
diff --git
a/inc/classes/main/class_BaseFrameworkSystem.php
b/inc/classes/main/class_BaseFrameworkSystem.php
index df2e5a2f880c99ad0c24b9ad5c87d5ca2ff5c9b6..63ba260e0abee10cbdd9861196d86455a0252d8b 100644
(file)
--- a/
inc/classes/main/class_BaseFrameworkSystem.php
+++ b/
inc/classes/main/class_BaseFrameworkSystem.php
@@
-1355,7
+1355,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
// Is the extra message given?
if (!empty($message)) {
// Then add it as well
// Is the extra message given?
if (!empty($message)) {
// Then add it as well
- $stubMessage .=
sprintf(' Message: <span id="stub_message">%s</span>', $message)
;
+ $stubMessage .=
' Message: ' . $message
;
} // END - if
// Debug instance is there?
} // END - if
// Debug instance is there?
@@
-1364,7
+1364,7
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
$this->debugOutput($stubMessage);
} else {
// Trigger an error
$this->debugOutput($stubMessage);
} else {
// Trigger an error
- trigger_error($stubMessage
. '<br />' . chr(10)
);
+ trigger_error($stubMessage);
}
}
}
}
diff --git
a/inc/classes/main/console/class_ConsoleTools.php
b/inc/classes/main/console/class_ConsoleTools.php
index 60476a1e96526bbc7099336ac2651182fced256d..e4a615a0e98c794bcfec28bd2def80e55affb1b3 100644
(file)
--- a/
inc/classes/main/console/class_ConsoleTools.php
+++ b/
inc/classes/main/console/class_ConsoleTools.php
@@
-46,7
+46,7
@@
class ConsoleTools extends BaseFrameworkSystem {
*/
protected function resolveIpAddress ($hostname) {
// Debug message
*/
protected function resolveIpAddress ($hostname) {
// Debug message
- $this->debugOutput(sprintf(
"[%s:] Our host name is: <span class=\"data\">%s</span>"
,
+ $this->debugOutput(sprintf(
'[%s:] Our host name is: %s'
,
$this->__toString(),
$hostname
));
$this->__toString(),
$hostname
));
@@
-64,13
+64,13
@@
class ConsoleTools extends BaseFrameworkSystem {
$ip = $ipResolved;
// Debug message
$ip = $ipResolved;
// Debug message
- $this->debugOutput(sprintf(
"[%s:] Resolved IP address is: <span class=\"data\">%s</span>\n"
,
+ $this->debugOutput(sprintf(
'[%s:] Resolved IP address is: %s'
,
$this->__toString(),
$ip
));
} else {
// Problem while resolving IP address
$this->__toString(),
$ip
));
} else {
// Problem while resolving IP address
- $this->debugOutput(sprintf(
"[%s:] Problem resolving IP address for host <span class=\"data\">%s</span>. Please check your /etc/hosts file."
,
+ $this->debugOutput(sprintf(
'[%s:] Problem resolving IP address for host %s. Please check your /etc/hosts file.'
,
$this->__toString(),
$hostname
));
$this->__toString(),
$hostname
));
@@
-115,13
+115,13
@@
class ConsoleTools extends BaseFrameworkSystem {
$ip = $helperInstance->resolveIpAddress($_SERVER['COMPUTERNAME']);
} else {
// Could not find our hostname
$ip = $helperInstance->resolveIpAddress($_SERVER['COMPUTERNAME']);
} else {
// Could not find our hostname
- $helperInstance->debugOutput(sprintf(
"[%s:] WARNING: Cannot resolve my own IP address."
,
+ $helperInstance->debugOutput(sprintf(
'[%s:] WARNING: Cannot resolve my own IP address.'
,
$helperInstance->__toString()
));
}
} catch (FrameworkException $e) {
// Output debug message
$helperInstance->__toString()
));
}
} catch (FrameworkException $e) {
// Output debug message
- $helperInstance->debugOutput(sprintf(
"[%s:] Problem while resolving own IP address: [%s|%s]:%s"
,
+ $helperInstance->debugOutput(sprintf(
'[%s:] Problem while resolving own IP address: [%s|%s]:%s'
,
$helperInstance->__toString(),
$e->__toString(),
$e->getHexCode(),
$helperInstance->__toString(),
$e->__toString(),
$e->getHexCode(),
diff --git
a/inc/classes/main/io/class_FileIoStream.php
b/inc/classes/main/io/class_FileIoStream.php
index 338cb429c614221ef0e360dcde08a68d935e5efe..2ce19c611a7f6eaa1612200cc4e5f761c92fa624 100644
(file)
--- a/
inc/classes/main/io/class_FileIoStream.php
+++ b/
inc/classes/main/io/class_FileIoStream.php
@@
-202,7
+202,7
@@
class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
} // END - if
} else {
// Invalid count!
} // END - if
} else {
// Invalid count!
- throw new InvalidArrayCountException(array($this,
"data"
, count($data), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+ throw new InvalidArrayCountException(array($this,
'data'
, count($data), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
}
// Add this to the readData string
}
// Add this to the readData string