From aa22a5a5b655df0cd5b79d849c76551982a9854f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 9 Jun 2016 17:58:48 +0200
Subject: Fix some translations and page titles

---
 modules-available/adduser/page.inc.php                 | 2 --
 modules-available/backup/page.inc.php                  | 1 -
 modules-available/eventlog/page.inc.php                | 1 -
 modules-available/locations/page.inc.php               | 8 +++-----
 modules-available/session/page.inc.php                 | 1 -
 modules-available/statistics/page.inc.php              | 1 -
 modules-available/sysconfig/addmodule_adauth.inc.php   | 2 +-
 modules-available/sysconfig/addmodule_ldapauth.inc.php | 2 +-
 modules-available/sysconfig/page.inc.php               | 2 --
 9 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php
index cb2987bd..87aaeef1 100644
--- a/modules-available/adduser/page.inc.php
+++ b/modules-available/adduser/page.inc.php
@@ -51,8 +51,6 @@ class Page_AddUser extends Page
 		if (!User::hasPermission('superadmin') && Database::queryFirst('SELECT userid FROM user LIMIT 1') !== false) {
 			Message::addError('adduser-disabled');
 		} else {
-
-			Render::setTitle(Dictionary::translate('lang_createUser'));
 			Render::addTemplate('page-adduser', $_POST);
 		}
 	}
diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php
index 3f2388a5..6cd3168f 100644
--- a/modules-available/backup/page.inc.php
+++ b/modules-available/backup/page.inc.php
@@ -23,7 +23,6 @@ class Page_Backup extends Page
 
 	protected function doRender()
 	{
-		Render::setTitle(Dictionary::translate('lang_titleBackup'));
 		if ($this->action === 'restore') {
 			Render::addTemplate('restore', $this->templateData);
 		} else {
diff --git a/modules-available/eventlog/page.inc.php b/modules-available/eventlog/page.inc.php
index 0e56c82d..87957479 100644
--- a/modules-available/eventlog/page.inc.php
+++ b/modules-available/eventlog/page.inc.php
@@ -15,7 +15,6 @@ class Page_EventLog extends Page
 
 	protected function doRender()
 	{
-		Render::setTitle(Dictionary::translate('lang_titleEventLog'));
 		$today = date('d.m.Y');
 		$yesterday = date('d.m.Y', time() - 86400);
 		$lines = array();
diff --git a/modules-available/locations/page.inc.php b/modules-available/locations/page.inc.php
index 9de5e521..84bc11a9 100644
--- a/modules-available/locations/page.inc.php
+++ b/modules-available/locations/page.inc.php
@@ -80,9 +80,9 @@ class Page_Locations extends Page
 			$this->deleteLocation($location);
 		}
 		// Update subnets
-		$this->updateLocationSubnets($location);
+		$this->updateLocationSubnets();
 		// Insert subnets
-		$this->addNewLocationSubnets($location); // TODO
+		$this->addNewLocationSubnets($location);
 		// Update location!
 		$this->updateLocationData($location);
 		Util::redirect('?do=Locations');
@@ -148,9 +148,8 @@ class Page_Locations extends Page
 		}
 	}
 	
-	private function updateLocationSubnets($location)
+	private function updateLocationSubnets()
 	{
-		$locationId = (int)$location['locationid'];
 		// Deletion first
 		$dels = Request::post('deletesubnet', false);
 		if (is_array($dels)) {
@@ -240,7 +239,6 @@ class Page_Locations extends Page
 
 	protected function doRender()
 	{
-		//Render::setTitle(Dictionary::translate('lang_titleBackup'));
 		$getAction = Request::get('action');
 		if (empty($getAction)) {
 			// Until we have a main landing page?
diff --git a/modules-available/session/page.inc.php b/modules-available/session/page.inc.php
index ef135f9d..853f20e4 100644
--- a/modules-available/session/page.inc.php
+++ b/modules-available/session/page.inc.php
@@ -29,7 +29,6 @@ class Page_Session extends Page
 
 	protected function doRender()
 	{
-		Render::setTitle(Dictionary::translate('lang_login'));
 		Render::addTemplate('page-login');
 	}
 
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index 266c4277..1e6f7400 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -37,7 +37,6 @@ class Page_Statistics extends Page
 
 	protected function doRender()
 	{
-		Render::setTitle(Dictionary::translate('lang_titleClientStatistics'));
 		$uuid = Request::get('uuid', false, 'string');
 		if ($uuid !== false) {
 			$this->showMachine($uuid);
diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php
index b855761a..2949928b 100644
--- a/modules-available/sysconfig/addmodule_adauth.inc.php
+++ b/modules-available/sysconfig/addmodule_adauth.inc.php
@@ -108,7 +108,7 @@ class AdAuth_SelfSearch extends AddModule_Base
 		$bindpw = Request::post('bindpw');
 		$ssl = Request::post('ssl', 'off') === 'on';
 		if ($ssl && !Request::post('fingerprint')) {
-			Message::addError('error-read', 'fingerprint');
+			Message::addError('main.error-read', 'fingerprint');
 			AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
 			return;
 		}
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index a6ac145c..d7122001 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -96,7 +96,7 @@ class LdapAuth_CheckCredentials extends AddModule_Base
 		$bindpw = Request::post('bindpw');
 		$ssl = Request::post('ssl', 'off') === 'on';
 		if ($ssl && !Request::post('fingerprint')) {
-			Message::addError('error-read', 'fingerprint');
+			Message::addError('main.error-read', 'fingerprint');
 			AddModule_Base::setStep('LdapAuth_Start'); // Continues with LdapAuth_Start for render()
 			return;
 		}
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index efe34136..121e4cee 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -106,8 +106,6 @@ class Page_SysConfig extends Page
 	 */
 	protected function doRender()
 	{
-		Render::setTitle(Dictionary::translate('lang_location'));
-
 		$action = Request::any('action', 'list');
 		switch ($action) {
 			case 'addmodule':
-- 
cgit v1.2.3-55-g7522