Merge pull request #454 from teiling88/misc/fix-some-deployment-issues

Misc/fix some deployment issues
OpencachingDeutschland · Jan 26, 2017 · c1e9f6e · c1e9f6e
2 parents 87f3357 + f006e92
commit c1e9f6e
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 5 deletions.
diff --git a/ChangeLog-3.1.md b/ChangeLog-3.1.md
@@ -2,17 +2,28 @@ Changes in oc-server 3.1
 
 All notable changes of the oc-server 3.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## unreleased [3.1.1...development](https://github.com/OpencachingDeutschland/oc-server3/compare/3.1.1...development)
+## unreleased [3.1.2...development](https://github.com/OpencachingDeutschland/oc-server3/compare/3.1.2...development)
+
+### Added
+
+### Changed
+
+### Removed
+
+## unreleased [3.1.1...3.1.2](https://github.com/OpencachingDeutschland/oc-server3/compare/3.1.1...3.1.2)
 
 ### Added
 * user search [#1015](http://redmine.opencaching.de/issues/1015)
+* recommendation star [#1013](http://redmine.opencaching.de/issues/1013)
+* hidden caches [#1001](http://redmine.opencaching.de/issues/1001)
 * adding psh.phar
 * adding more UnitTests
 
 ### Changed
 * fix login issue with lib and lib2 components
 * code style improvements based on scrutinizer patches
-* fixing language links #1022
+* fixing language links [#1022](http://redmine.opencaching.de/issues/1022)
+* fixing language switch [#995](http://redmine.opencaching.de/issues/995)
 
 ### Removed
 * not needed sql debug functions

diff --git a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
@@ -37,6 +37,32 @@
         </ul>
         <br />
 
+        <p id="v3.1.2"><strong>OC 3.1 Version 2</strong> &ndash; 27. Januar 2017</p>
+        <p>neu:</p>
+        <ul>
+            <li>Benutzer Suche <a href="http://redmine.opencaching.de/issues/1015" target="_blank">#1015</a></li>
+            <li>Empfehlungsstern verschwindet <a href="http://redmine.opencaching.de/issues/1013" target="_blank">#1013</a></li>
+            <li>Versteckte Caches nach Cachetype im Profil... <a href="http://redmine.opencaching.de/issues/1001" target="_blank">#1001</a></li>
+        </ul>
+        <p>Geändert / verbessert:</p>
+        <ul>
+            <li>Login Probleme zwischen lib und lib2 Code behoben</li>
+            <li>Scrutinizer Patches eingespielt</li>
+            <li>Sprach Links <a href="http://redmine.opencaching.de/issues/1022" target="_blank">#1022</a></li>
+            <li>Sprach Umschaltung <a href="http://redmine.opencaching.de/issues/995" target="_blank">#995</a></li>
+        </ul>
+        <br />
+
+        <p>Korrigiert (Bugfixes):</p>
+        <ul>
+            <li>nicht benötigte sql debug Funktionen</li>
+            <li>htdocs/lib/logic.inc.php</li>
+            <li>htdocs/lib/eventhandler.inc.php</li>
+            <li>htdocs/lib/tinymce</li>
+            <li>nicht mehr unterstütztes garmin Modul</li>
+        </ul>
+        <br />
+
         <p id="v3.1.1"><strong>OC 3.1 Version 1</strong> &ndash; 24. Oktober 2016</p>
         <p>neu:</p>
         <ul>

diff --git a/htdocs/util/watchlist/runwatch.php b/htdocs/util/watchlist/runwatch.php
@@ -593,7 +593,7 @@ function CreatePidFile($PidFile)
 //
 function CheckDaemon($PidFile)
 {
-    if ($pidfile = @fopen($PidFile, "r")) {
+    if ($pidfile = @fopen($PidFile, 'rb')) {
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
@@ -606,7 +606,7 @@ function CheckDaemon($PidFile)
             false;
         } else {
             // no, remove pid_file
-            echo "process not running, removing old pid_file (" . $PidFile . ")\n";
+            echo 'process not running, removing old pid_file (' . $PidFile . ")\n";
             unlink($PidFile);
 
             return true;
@@ -621,7 +621,7 @@ function CheckDaemon($PidFile)
 //
 function CleanupAndExit($PidFile, $message = false)
 {
-    if ($pidfile = @fopen($PidFile, "r")) {
+    if ($pidfile = @fopen($PidFile, 'rb')) {
         $pid = fgets($pidfile, 20);
         fclose($pidfile);
         if ($pid == posix_getpid()) {
@@ -635,3 +635,17 @@ function CleanupAndExit($PidFile, $message = false)
         echo $message . "\n";
     }
 }
+
+if (!function_exists('get_logtype_name')) {
+    function get_logtype_name($logtype, $language)
+    {
+        return sqlValue(
+            "SELECT IFNULL(`stt`.`text`, `log_types`.`en`)
+         FROM `log_types`
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id`
+         AND `stt`.`lang`='" . sql_escape($language) . "'
+         WHERE `log_types`.`id`='" . sql_escape($logtype) . "'",
+            ''
+        );
+    }
+}