Merge pull request #268 in ZP/z-push from feature/ZP-950-improve-git-version-logging to develop

* commit '1ee21f08':
  ZP-950 Changed method to determine ZP_VERSION so it contains the branch, tag, offset and commit id, fixed access description.

src/lib/utils/timezoneutil.php

@@ -1237,7 +1237,7 @@ class TimezoneUtil {
         // That's ugly and needs a proper fix. But for now this method can convert
         // - Europe/Berlin
         // - W Europe Standard Time
-        // to "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" 
+        // to "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"
         // which is more correct than the hardcoded default of (GMT+00:00...)
         $tzName = '';
         foreach (self::$phptimezones as $tzn => $phptzs) {
@@ -1296,11 +1296,11 @@ class TimezoneUtil {
     }
 
     /**
-     * Pack timezone info for Sync
+     * Pack timezone info for Sync.
      *
      * @param array     $tz
      *
-     * @access private
+     * @access public
      * @return string
      */
     static public function GetSyncBlobFromTZ($tz) {

src/version.php

@@ -42,11 +42,13 @@
 ************************************************/
 
 if (!defined("ZPUSH_VERSION")) {
-	$commit = exec("type git && git log --date=short --pretty=format:'%h/%ad' -1");
-	if(preg_match("/^[\da-f]+\/\d{4}-\d{2}-\d{2}$/i", $commit)) {
-        define("ZPUSH_VERSION", "GIT " . $commit);
+    $path = escapeshellarg(dirname(realpath($_SERVER['SCRIPT_FILENAME'])));
+    $branch = trim(exec("hash git && cd $path >/dev/null 2>&1 && git branch --no-color  2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \(.*\)/\\1/\""));
+    $version = exec("hash git && cd $path >/dev/null 2>&1 && git describe  --always &2>/dev/null");
+    if ($branch && $version) {
+        define("ZPUSH_VERSION", $branch .'-'. $version);
     }
     else {
         define("ZPUSH_VERSION", "GIT");
     }
-}
+}
\ No newline at end of file