mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kill a whole bunch of trailing spaces

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2516 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-20 09:55:11 +00:00
parent 9b270dd1e5
commit d864ce234f
103 changed files with 326 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
upgrade-scripts/fix-port-rrd.php
View File

@@ -23,20 +23,20 @@
echo(round(($i / $count) * 100, 2) . "% \r");
}
function getDirectoryTree( $outerDir, &$files = array()){
function getDirectoryTree( $outerDir, &$files = array()){
$dirs = array_diff( scandir( $outerDir ), Array( ".", ".." ) );
foreach ( $dirs as $d ){
if (is_dir($outerDir."/".$d) ){
$dirs = array_diff( scandir( $outerDir ), Array( ".", ".." ) );
foreach ( $dirs as $d ){
if (is_dir($outerDir."/".$d) ){
getDirectoryTree($outerDir.'/'. $d, $files);
}else{
}else{
if (preg_match('/^[\d]+.rrd$/', $d))
array_push($files, preg_replace('/\/+/', '/', $outerDir.'/'. $d));
}
}
return $files;
}
}
return $files;
}
function fixRdd($file){
@@ -44,7 +44,7 @@
global $rrdcached;
$fileC = shell_exec( "{$config['rrdtool']} dump $file $rrdcached" );
#---------------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------------
$first = <<<FIRST
<ds>
@@ -125,7 +125,7 @@ $first = <<<FIRST
<unknown_sec> 0 </unknown_sec>
</ds>
<!-- Round Robin Archives -->
<!-- Round Robin Archives -->
FIRST;
@@ -185,9 +185,9 @@ THIRD;
#---------------------------------------------------------------------------------------------------------
if (!preg_match('/DISCARDS/', $fileC)){
$fileC = str_replace('<!-- Round Robin Archives -->', $first, $fileC);
$fileC = str_replace('</cdp_prep>', $second, $fileC);
$fileC = str_replace('</row>', $third, $fileC);
$fileC = str_replace('<!-- Round Robin Archives -->', $first, $fileC);
$fileC = str_replace('</cdp_prep>', $second, $fileC);
$fileC = str_replace('</row>', $third, $fileC);
$tmpfname = tempnam("/tmp", "OBS");
file_put_contents($tmpfname, $fileC);
@unlink($file);
@@ -198,9 +198,9 @@ THIRD;
}
}
echo("\n");
?>

18
upgrade-scripts/fix-sensor-rrd.php
View File

@@ -18,13 +18,13 @@
echo(round(($i / $count) * 100, 2) . "% \r");
}
function sensor_getDirectoryTree( $outerDir, &$files = array()){
function sensor_getDirectoryTree( $outerDir, &$files = array()){
$dirs = array_diff( scandir( $outerDir ), Array( ".", ".." ) );
foreach ( $dirs as $d ){
if (is_dir($outerDir."/".$d) ){
$dirs = array_diff( scandir( $outerDir ), Array( ".", ".." ) );
foreach ( $dirs as $d ){
if (is_dir($outerDir."/".$d) ){
sensor_getDirectoryTree($outerDir.'/'. $d, $files);
} else {
} else {
if ((preg_match('/^fan-.*.rrd$/', $d)) ||
(preg_match('/^current-.*.rrd$/', $d)) ||
(preg_match('/^freq-.*.rrd$/', $d)) ||
@@ -34,9 +34,9 @@
array_push($files, preg_replace('/\/+/', '/', $outerDir.'/'. $d));
}
}
return $files;
}
}
return $files;
}
function sensor_fixRdd($file){
@@ -72,7 +72,7 @@
rename($file,str_replace('/temp-','/temperature-',$file));
}
}
echo("\n");
?>