Merge branch 'master' into permissions

application/controllers/jobs/AmpelMail.php

@@ -16,10 +16,7 @@ if (! defined('BASEPATH'))
 
 class AmpelMail extends FHC_Controller
 {
-	const CIS_AMPELVERWALTUNG_URL =
-		CIS_ROOT. "cis/index.php?menu=".
-		CIS_ROOT. "cis/menu.php?content_id=&content=".
-		CIS_ROOT. "cis/private/tools/ampelverwaltung.php";
+	private $CIS_AMPELVERWALTUNG_URL;
 
 	/**
 	 * Constructor
@@ -39,7 +36,9 @@ class AmpelMail extends FHC_Controller
 			echo "Jobs must be run from the CLI";
 			exit;
 		}
-
+		$this->CIS_AMPELVERWALTUNG_URL = CIS_ROOT. "cis/index.php?menu=".
+			CIS_ROOT. "cis/menu.php?content_id=&content=".
+			CIS_ROOT. "cis/private/tools/ampelverwaltung.php";
 		// Load models
 		$this->load->model('content/Ampel_model', 'AmpelModel');
 		$this->load->model('person/Person_model', 'PersonModel');
@@ -206,7 +205,7 @@ class AmpelMail extends FHC_Controller
 				'uid' => $uid,
 				'firstName' => $firstName,
 				'ampel_list' => $html_text,
-				'link' => self::CIS_AMPELVERWALTUNG_URL
+				'link' => $this->CIS_AMPELVERWALTUNG_URL
 			);
 		}
 		return $ampel_data_arr;

application/libraries/NavigationLib.php

@@ -234,7 +234,7 @@ class NavigationLib
 						if (isset($config[$configName]) && is_array($config[$configName]))
 						{
 							$extensionArray = array_merge_recursive(
-								$json_extension,
+								$extensionArray,
 								$this->_wildcardsearch($config[$configName],
 								$navigationPage)
 							);

application/models/content/Ampel_model.php

@@ -50,7 +50,8 @@ class Ampel_model extends DB_Model
 	 */
 	public function execBenutzerSelect($benutzer_select)
 	{
-		if (isset($benutzer_select) && !empty(trim($benutzer_select)))
+		$trimed = trim($benutzer_select);
+		if (isset($benutzer_select) && !empty($trimed))
 		{
 			return $this->execQuery($benutzer_select);
 		}