diff --git a/.gitignore b/.gitignore index d7c7bbf2..6725ff61 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ d_pic/uploaded_image d_setting/*.php */d_setting/*.php */d_setting/templates/*.php +!*.orig.php */data/file_cache diff --git a/hwe/d_setting/VersionGit.dynamic.orig.php b/hwe/d_setting/VersionGit.dynamic.orig.php new file mode 100644 index 00000000..02186907 --- /dev/null +++ b/hwe/d_setting/VersionGit.dynamic.orig.php @@ -0,0 +1,5 @@ +setReadOnly(); $request = $_POST + $_GET; @@ -142,15 +152,25 @@ if ($server == $baseServerName) { ]); } - $version = getVersion(); - $result = Util::generateFileUsingSimpleTemplate( - __DIR__ . '/' . $server . '/d_setting/VersionGit.orig.php', - __DIR__ . '/' . $server . '/d_setting/VersionGit.php', - [ - 'verionGit' => $version - ], - true - ); + + if ( + hash_file("sha256", __DIR__ . '/' . $server . '/d_setting/VersionGit.dynamic.orig.php') == + hash_file("sha256", __DIR__ . '/' . $server . '/d_setting/VersionGit.php')) { + $result = true; + } + else{ + $version = getVersion(); + $hash = getHash(); + $result = Util::generateFileUsingSimpleTemplate( + __DIR__ . '/' . $server . '/d_setting/VersionGit.orig.php', + __DIR__ . '/' . $server . '/d_setting/VersionGit.php', + [ + 'verionGit' => $version, + 'hash' => $hash + ], + true + ); + } if (ServConfig::$imageRequestKey) { try { @@ -218,11 +238,13 @@ $zip->close(); @unlink($tmpFile); $version = getVersion($target); +$gitHash = getHash($target); $result = Util::generateFileUsingSimpleTemplate( __DIR__ . '/' . $server . '/d_setting/VersionGit.orig.php', __DIR__ . '/' . $server . '/d_setting/VersionGit.php', [ - 'verionGit' => $version + 'verionGit' => $version, + 'hash' => $gitHash ], true );