Merge branch 'fronkdev' into 'master'

Added git post hook handler

See merge request fronk/thetool!191

application/Init/Init.php

@@ -1,2 +1,10 @@
 <?php
 
+/*
+ * will be called in mfBaseController after initializing Controller, before
+ * running requested action
+ */
+
+/* Get last git merge timestamp */
+$last_merge_ts = new mfConfig("git.merge.ts");
+$this->layout()->set("git_merge_ts", $last_merge_ts->value());

bin/post_merge_hook.php

@@ -0,0 +1,41 @@
+#!/usr/bin/php
+<?php
+
+/*
+ * Run this script via git post-merge hook
+ */
+
+//require 'vendor/autoload.php';
+require(dirname(__FILE__)."/../config/config.php");
+
+define('FRONKDB_SQLDEBUG',false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$me = new User(1);
+
+define("INTERNAL_USER_ID", $me->id);
+define("INTERNAL_USER_USERNAME", $me->username);
+
+$now = date("U");
+
+// update last merge timestamp
+$merge_ts = new mfConfig("git.merge.ts");
+$merge_ts->type("int");
+$merge_ts->value($now);
+$merge_ts->save();
+
+
+// update git commit ref
+$git_ref = new mfConfig("git.lastref");
+
+$sc = new SystemController();
+$commitid = $sc->getLastCommit();
+
+if($commitid) {
+  $git_ref->value($commitid);
+  $git_ref->save();
+}