Indefero Commit Details

Date:

2011-07-05 04:30:23 (13 years 5 months ago)

Author:

William MARTIN

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

f2b1ce795cff8363e0df3628a9c31bdff72bccbc

Parents:

9bbcd571ecf5896ff0985678a1ab1cc6aac6df83

Message:

Fix issue 247 : cron overwrites authorized_keys during cron run

Changes:

File differences

-59
60 60
61 61
62
63
64
65
66
67
68
69
70
71
62 72
63 73
64 74
+                $out .= sprintf($template, $cmd, $key->login, $content)."\n";␊
            }␊
        }␊
        $out = "# indefero start" . PHP_EOL . $out . "# indefero end" . PHP_EOL;␊
        ␊
        // We update only the part of the file between IDF_START / IDF_END comment␊
        $original_keys = file_get_contents($authorized_keys);␊
        if (strstr($original_keys, "# indefero start") && strstr($original_keys, "# indefero end")) {␊
            $out = preg_replace('/(#\sindefero\sstart).+(#\sindefero\send\s\s?)/isU', ␊
                                $out, $original_keys);␊
        } else {␊
             $out .= $original_keys;   ␊
        }␊
        file_put_contents($authorized_keys, $out, LOCK_EX);␊
    }␊
␊
                 $out .= sprintf($template, $cmd, $key->login, $content)."\n";␊
             }␊
         }␊
+        $out = "# indefero start" . PHP_EOL . $out . "# indefero end" . PHP_EOL;␊
+        ␊
+        // We update only the part of the file between IDF_START / IDF_END comment␊
+        $original_keys = file_get_contents($authorized_keys);␊
+        if (strstr($original_keys, "# indefero start") && strstr($original_keys, "# indefero end")) {␊
+            $out = preg_replace('/(#\sindefero\sstart).+(#\sindefero\send\s\s?)/isU', ␊
+                                $out, $original_keys);␊
+        } else {␊
+             $out .= $original_keys;   ␊
+        }␊
         file_put_contents($authorized_keys, $out, LOCK_EX);␊
     }␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags