From 6250b7ea002fd99e40d0170d31e7e19e69f97ccd Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:53:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'

---
 interface/web/admin/remote_user_edit.php |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/interface/web/admin/remote_user_edit.php b/interface/web/admin/remote_user_edit.php
index 73b679f..962aa57 100644
--- a/interface/web/admin/remote_user_edit.php
+++ b/interface/web/admin/remote_user_edit.php
@@ -4,14 +4,17 @@
 $tform_def_file = 'form/remote_user.tform.php';
 
 // include the core configuration and application classes
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
 
 // Check the  module permissions and redirect if not allowed.
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
-    header('Location: ../index.php');
-    die;
+if(!stristr($_SESSION['s']['user']['modules'], 'admin')) {
+	header('Location: ../index.php');
+	die;
 }
+
+// Disable this function in demo mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
 
 // Load the templating and form classes
 $app->uses('tpl,tform,tform_actions');
@@ -20,7 +23,17 @@
 // Create a class page_action that extends the tform_actions base class
 class page_action extends tform_actions {
 
-    //* Customisations for the page actions will be defined here
+	//* Customisations for the page actions will be defined here
+	function onShow() {
+		global $app;
+
+		// Translate the items, very bad trick... :( because the language file is not loaded yet when the form file gets parsed
+		foreach($app->tform->formDef["tabs"]['remote_user']['fields']['remote_functions']['value'] as $key => $val) {
+			$app->tform->formDef["tabs"]['remote_user']['fields']['remote_functions']['value'][$key] = $app->tform->lng($val).'<br>';
+		}
+
+		parent::onShow();
+	}
 
 }
 

--
Gitblit v1.9.1