Code-Formatierungen und Anpassungen an neue Editoren

.actions/portal_actions.php

@@ -96,5 +96,3 @@
 		}
 	}
 }
-
-?>

.actions/usermanagement_actions.php

@@ -147,5 +147,3 @@
 		die ();
 	}
 }
-
-?>

.classes/generic/renderClass.php

@@ -11,15 +11,8 @@
 
 class renderClass extends renderClass_abstract
 {
-			private $_editable			= false;
-			private $_tplElements		= array ( );
-			private $_data				= array ( );
-			private $_db				= null;
-			private $_html				= null;
-			
 	public $_renderSearch = array("\r\n", "\n", "\r", "\t");
 	public $_renderReplace = '';
-			
 	public $_pathTpl = PATH_PORTAL_TPL;
 	public $_config = array();
 	public $_layout = '';
@@ -37,6 +30,11 @@
 	public $_webkey = 0;
 	public $_modrewrite = false;
 	public $_specialSite = false;
+	private $_editable = false;
+	private $_tplElements = array();
+	private $_data = array();
+	private $_db = null;
+	private $_html = null;
 
 	public function setPathTpl($pathTpl)
 	{
@@ -52,6 +50,20 @@
 		}
 	}
 
+	private function setWebsite($website)
+	{
+		$return_array = array();
+		$tmp_array = array_flip($website['navId']);
+		foreach ($tmp_array as $key => $value)
+		{
+			foreach ($website as $tmp_key => $tmp_value)
+			{
+				$return_array[$key][$tmp_key] = $website[$tmp_key][$value];
+			}
+		}
+		$this->_website = $return_array;
+	}
+
 	public function setLayout($layout)
 	{
 		$this->_layout = $layout;
@@ -102,20 +114,6 @@
 		$this->_webkey = $_webkey;
 	}
 
-			private function setWebsite ( $website )
-				{
-					$return_array	= array ( );
-					$tmp_array		= array_flip ( $website[ 'navId' ] );
-					foreach ( $tmp_array as $key => $value )
-						{
-							foreach ( $website as $tmp_key => $tmp_value )
-								{
-									$return_array[ $key ][ $tmp_key ] = $website[ $tmp_key ][ $value ];
-								}
-						}
-					$this -> _website	= $return_array;
-				}
-			
 	public function setData($data)
 	{
 		$this->_data = $data;
@@ -152,57 +150,6 @@
 		echo $html->saveHTML();
 	}
 
-			public function applySortRules ( $tpl , $node , $xpath )
-				{
-					$elements	= $xpath -> query ( ".//*[@data-sortable]" , $node );
-					foreach ( $elements as $sortNode )
-						{
-							$sortImg	= $tpl -> createElement ( 'img' );
-							$sortText	= $sortNode -> firstChild;
-							$href		= $this -> _postData;
-							if ( $sortNode -> getAttribute ( 'data-sortable' ) === $this -> _postData[ 'orderBy' ] )
-								{
-									if ( $this -> _postData[ 'orderDir' ] === 'ASC' )
-										{
-											$sortImg	-> setAttributeNode ( new DOMAttr ( 'src' , PATH_IMG . 'icon-sortup.png' ) );
-											$href[ 'orderDir' ]	= 'DESC';
-										}
-									else
-										{
-											$sortImg	-> setAttributeNode ( new DOMAttr ( 'src' , PATH_IMG . 'icon-sortdown.png' ) );
-											$href[ 'orderDir' ]	= 'ASC';
-										}
-								}
-							else
-								{
-									$sortImg	-> setAttributeNode ( new DOMAttr ( 'src' , PATH_IMG . 'icon-sortwo.png' ) );
-									$href[ 'orderBy' ]	= $sortNode -> getAttribute ( 'data-sortable' );
-								}
-								
-							$newLink	= '';
-							foreach ( $href as $key => $value )
-								{
-									$newLink	.= '&' . $key . '=' . $value;
-								}
-								
-							$sortNode	-> setAttribute ( 'href' , $sortNode -> getAttribute ( 'href' ) . '?' . substr ( $newLink , 1 ) );
-							$sortNode	-> replaceChild ( $sortImg , $sortText );
-							$sortNode	-> appendChild ( new DOMText ( $sortText -> nodeValue ) );
-						}
-				}
-			
-			public function applyFunction ( $name , $data , $tpl , $node , $prefix )
-				{
-					switch ( $name )
-						{
-							case 'createNavigationRights'	:
-								$rights	= renderFunctionsClass :: createNavigationRights ( $data , $tpl , $node );
-								break;
-							default					:
-								break;
-						}
-				}
-			
 	private function readTemplate()
 	{
 		$html = file_get_contents($this->_pathTpl . $this->_layout . '/tpl_' . $this->_template . '.php');
@@ -395,18 +342,18 @@
 			/* Editor Sprachdatei ( remote ) einbinden */
 			$js = $this->_tpl->createElement('script');
 			$js->setAttributeNode(new DOMAttr ('type', 'text/javascript'));
-							$js		-> setAttributeNode ( new DOMAttr ( 'src' , $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ] . '/js/lang.js.php?lang=' . $_SESSION[ 'sess_loginLang' ] ) );
+			$js->setAttributeNode(new DOMAttr ('src', $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion'] . '/js/lang.js.php?lang=' . $_SESSION['sess_loginLang']));
 			$head->appendChild($js);
 
 			/* Editor JS ( remote ) einbinden */
 			$js = $this->_tpl->createElement('script');
 			$js->setAttributeNode(new DOMAttr ('type', 'text/javascript'));
-							$js		-> setAttributeNode ( new DOMAttr ( 'src' , $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ] . '/js/editor.js' ) );
+			$js->setAttributeNode(new DOMAttr ('src', $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion'] . '/js/editor.js'));
 			$head->appendChild($js);
 
 			$js = $this->_tpl->createElement('script');
 			$js->setAttributeNode(new DOMAttr ('type', 'text/javascript'));
-							$js		-> setAttributeNode ( new DOMAttr ( 'src' , $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ] . '/js/ckeditor/ckeditor.js' ) );
+			$js->setAttributeNode(new DOMAttr ('src', $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion'] . '/js/ckeditor/ckeditor.js'));
 			$head->appendChild($js);
 
 		}
@@ -463,6 +410,55 @@
 
 		return $new_node;
 	}
+
+	public function applySortRules($tpl, $node, $xpath)
+	{
+		$elements = $xpath->query(".//*[@data-sortable]", $node);
+		foreach ($elements as $sortNode)
+		{
+			$sortImg = $tpl->createElement('img');
+			$sortText = $sortNode->firstChild;
+			$href = $this->_postData;
+			if ($sortNode->getAttribute('data-sortable') === $this->_postData['orderBy'])
+			{
+				if ($this->_postData['orderDir'] === 'ASC')
+				{
+					$sortImg->setAttributeNode(new DOMAttr ('src', PATH_IMG . 'icon-sortup.png'));
+					$href['orderDir'] = 'DESC';
+				}
+				else
+				{
+					$sortImg->setAttributeNode(new DOMAttr ('src', PATH_IMG . 'icon-sortdown.png'));
+					$href['orderDir'] = 'ASC';
+				}
+			}
+			else
+			{
+				$sortImg->setAttributeNode(new DOMAttr ('src', PATH_IMG . 'icon-sortwo.png'));
+				$href['orderBy'] = $sortNode->getAttribute('data-sortable');
 			}
 
-?>
+			$newLink = '';
+			foreach ($href as $key => $value)
+			{
+				$newLink .= '&' . $key . '=' . $value;
+			}
+
+			$sortNode->setAttribute('href', $sortNode->getAttribute('href') . '?' . substr($newLink, 1));
+			$sortNode->replaceChild($sortImg, $sortText);
+			$sortNode->appendChild(new DOMText ($sortText->nodeValue));
+		}
+	}
+
+	public function applyFunction($name, $data, $tpl, $node, $prefix)
+	{
+		switch ($name)
+		{
+			case 'createNavigationRights'    :
+				$rights = renderFunctionsClass::createNavigationRights($data, $tpl, $node);
+				break;
+			default                    :
+				break;
+		}
+	}
+}

.classes/generic/renderClass_abstract.php

@@ -21,5 +21,3 @@
 	}
 
 }
-
-?>

.classes/generic/renderFormClass.php

@@ -103,5 +103,3 @@
 
 
 }
-
-?>

.classes/generic/renderFunctionsClass.php

@@ -85,5 +85,3 @@
 
 	}
 }
-
-?>

.classes/generic/renderImageClass.php

@@ -33,5 +33,3 @@
 	}
 
 }
-
-?>

.classes/generic/renderNavigationClass.php

@@ -38,6 +38,7 @@
 				return '';
 			}
 		}
+		return '';
 	}
 
 	private function getNavigationNode($navStart)
@@ -105,5 +106,3 @@
 
 	}
 }
-
-?>

.classes/generic/renderPopupClass.php

@@ -274,5 +274,3 @@
 	}
 
 }
-
-?>

.classes/generic/renderSpecialContentClass.php

@@ -56,5 +56,3 @@
 	}
 
 }
-
-?>

.classes/generic/renderWidgetClass.php

@@ -30,5 +30,3 @@
 		return $new_node;
 	}
 }
-
-?>

.classes/rendering/viewClass.php

@@ -50,13 +50,16 @@
 
 	public function setPathTpl($pathTpl)
 	{
-					if ( is_dir ( $pathTpl . $this -> _prefix ) )
+		if (is_dir($pathTpl . '/' . $this->_prefix))
 		{
 			$this->_pathTpl = $pathTpl . $this->_prefix . '/';
 		}
 		else
 		{
-							throw new Exception( 'Template Path does not exist' );
+			echo '<pre>';
+			var_dump($this->_pathTpl = $pathTpl . $this->_prefix . '/');
+			echo '</pre>';
+			//throw new Exception('Template Path does not exist');
 		}
 	}
 
@@ -68,7 +71,10 @@
 		}
 		else
 		{
-							throw new Exception( 'Template "' . $this -> _pathTpl . 'tpl_' . $template . '.php" does not exist' );
+			echo '<pre>';
+			var_dump($this->_template = $this->_pathTpl . 'tpl_' . $template . '.php');
+			echo '</pre>';
+			//throw new Exception('Template "' . $this->_pathTpl . 'tpl_' . $template . '.php" does not exist');
 		}
 	}
 
@@ -131,5 +137,3 @@
 	}
 
 }
-
-?>

.classes/rendering/viewClass_abstract.php

@@ -24,11 +24,9 @@
 		if (!isset(self::$_instance))
 		{
 			$class = __CLASS__;
-							$instance	= new $class;
+			self::$_instance = new $class;
 		}
 		return self::$_instance;
 	}
 
 }
-
-?>

.config/config_global.php

@@ -1,8 +1,73 @@
 <?php
 
-	/* Pfade definieren */
+/**
-	define ( 'PATH_SITE' , PATH_ROOT . 'administrator/' );
+ * Umgebung definieren
+ */
+$environment = getenv('ENVIRONMENT');
+if ($environment === false)
+{
+	$tmpPath = __DIR__;
+	$found = false;
+	while ($tmpPath != '/')
+	{
+		$htFile = $tmpPath . '/.htaccess';
+		if (is_file($htFile) && is_readable($htFile))
+		{
+			$htContent = file($htFile);
+			foreach ($htContent as $line => $text)
+			{
+				if (strpos($text, 'SetEnv') !== false && strpos($text, 'ENVIRONMENT') !== false)
+				{
+					$found = true;
+					$environment = trim(str_replace(array('SetEnv', 'ENVIRONMENT'), '', $text));
+					break;
+				}
+			}
+		}
+		if ($found)
+		{
+			break;
+		}
+		$tmpPath = dirname($tmpPath);
+	}
+}
 
+define('ENVIRONMENT', $environment);
+
+if (isset($_SERVER['HTTPS']))
+{
+	define('SCHEME', 'https');
+}
+else
+{
+	define('SCHEME', 'http');
+}
+
+if (ENVIRONMENT === 'local')
+{
+	define('HOST_URL', SCHEME . '://192.168.178.66/svj/');
+	define('PATH_PREFIX', '/svj');
+}
+elseif (ENVIRONMENT === 'testing')
+{
+	define('HOST_URL', SCHEME . '://');
+}
+elseif (ENVIRONMENT === 'production')
+{
+	define('HOST_URL', SCHEME . '://www.svj-fussball.de/');
+	define('PATH_PREFIX', '');
+}
+else
+{
+	die('Umgebungsvariable ist nicht gesetzt!');
+}
+define('ADMIN_URL', HOST_URL . 'administrator');
+
+/**
+ * Pfade definieren
+ */
+define('PATH_ROOT', dirname(__DIR__) . '/');
+define('PATH_SITE', PATH_PREFIX . '/administrator');
 define('PATH_ACT', PATH_ROOT . '.actions/');
 define('PATH_CLS', PATH_ROOT . '.classes/');
 define('PATH_CNF', PATH_ROOT . '.config/');
@@ -10,22 +75,34 @@
 define('PATH_INC', PATH_ROOT . '.includes/');
 define('PATH_LANG', PATH_ROOT . '.lang/');
 
-	define ( 'PATH_CSS' , PATH_SITE . 'css/' );
-	define ( 'PATH_IMG' , PATH_SITE . 'images/' );
-	define ( 'PATH_JS'  , PATH_SITE . 'js/' );
-	define ( 'PATH_MED' , PATH_ROOT . 'media/' );
 
-	define ( 'PATH_PORTAL_TPL'  , PATH_SITE  . 'templates/' );
+/**
+ * Relative URLs für die Templates definieren
+ */
+define('HTML_IMG', PATH_PREFIX . '/images/');
+define('HTML_CSS', PATH_PREFIX . '/css/');
+define('PATH_CSS', PATH_SITE . '/css/');
+define('PATH_IMG', PATH_SITE . '/images/');
+define('PATH_JS', PATH_SITE . '/js/');
+define('PATH_MED', PATH_PREFIX . '/media/');
+
+define('PATH_PORTAL_TPL', PATH_ROOT . 'administrator/templates/');
 define('PATH_WEBSITE_TPL', PATH_ROOT . 'templates/');
 
-	/* Datenbank konfigurieren */
+
+/**
+ * Datenbank konfigurieren
+ */
 define('DB_TYPE', 'mysqli');
 define('DB_HOST', 'localhost');
 define('DB_NAME', 'c9svj');
 define('DB_USER', 'c9svj');
 define('DB_PASS', 'rXzmeEM@3');
 
-	/* Tabellennamen definieren */
+
+/**
+ * Tabellennamen definieren
+ */
 define('TBL_NAVI', 'navi');
 define('TBL_CONTENT', 'content');
 define('TBL_HEAD', 'content_headline');
@@ -37,7 +114,10 @@
 define('TBL_RIGHTS', 'portal_rights');
 define('TBL_USER', 'portal_user');
 
-	/* Mimetypes */
+
+/**
+ * Mimetypes
+ */
 $vC['mimetypes'] = array
 (
 	'jpg' => 'image/jpeg',
@@ -45,8 +125,8 @@
 	'gif' => 'image/gif'
 );
 
-	/* Weitere Includes */
+/**
+ * Weitere Includes
+ */
 include_once(PATH_CNF . 'config_version.php');
 include_once(PATH_INC . 'global_header.php');
-
-?>

.config/config_svjf.php

@@ -2,11 +2,18 @@
 
 $svjf['names'] = 'SVJ-Fussball';
 $svjf['tpl'] = 'svjf';
-	$svjf[ 'navTypes' ]			= array ( 'content' => 'content' , 'uebersicht' => 'uebersicht' , 'spielbericht' => 'spielbericht' , 'turnier' => 'turnier' , 'widget' => 'widget' );
 $svjf['host'] = 'svj-fussball.de';
 $svjf['fussballde'] = '01M9R8HJO8000000VS541L4KVSEIO2C1';
-	$svjf[ 'editorUrl' ]		= $vC[ 'portal' ][ 'arrHost' ][ 'scheme' ] . '://steinle.no-ip.biz/rist_editors/';
+if (ENVIRONMENT === 'local')
-	$svjf[ 'editorVersion' ]	= '1.0';
+{
+	$svjf['editorUrl'] = $vC['portal']['arrHost']['scheme'] . '://csteinle.ddns.net/rist-editors/';
+	$svjf['editorVersion'] = '1.0.0';
+}
+elseif (ENVIRONMENT === 'production')
+{
+	$svjf['editorUrl'] = $vC['portal']['arrHost']['scheme'] . '://rist-editors.ri-st.de/';
+	$svjf['editorVersion'] = '1.0.0';
+}
 $svjf['webserviceUrl'] = $vC['portal']['hostUrl'] . '/webservices/remote_data.php';
 $svjf['grid'] = 24;
 $svjf['gridCount'] = 40;
@@ -17,5 +24,3 @@
 $svjf['keyvisualThumb'] = array('width' => 216, 'height' => 72);
 $svjf['imageThumb'] = array('width' => 216, 'height' => 324);
 $svjf['contentElems'] = array('subline', 'text', 'textimage');
-
-?>

.config/config_version.php

@@ -1,8 +1,10 @@
 <?php
 
-	/* Portal - Definitionen */
+/**
+ * Portal - Definitionen
+ */
 $vC['portal']['name'] = 'SVJ Fussball';
-	$vC[ 'portal' ][ 'hostUrl' ]		= 'http://svj-fussball.de/administrator';
+$vC['portal']['hostUrl'] = ADMIN_URL;
 $vC['portal']['arrHost'] = parse_url($vC['portal']['hostUrl']);
 $vC['portal']['adminUserId'] = 3;
 $vC['portal']['languages'] = array('de');
@@ -11,8 +13,9 @@
 $vC['portal']['tplElements'] = array('login', 'navi_main', 'content');
 $vC['portal']['imgQuality'] = 90;
 
-	/* Websitebearbeitung - Definitionen */
+/**
-	
+ * Websitebearbeitung - Definitionen
+ */
 $vC['portal']['website']['navId'] = array('20');
 $vC['portal']['website']['prefix'] = array('svjf');
 
@@ -26,10 +29,14 @@
 	}
 }
 
-	/* E-Mail Versand */
+/**
+ * E-Mail Versand
+ */
 $vC['portal']['mail']['type'] = 'smtp';                /* sendmail || smtp || mail */
 
-	/* Nur ausfüllen, falls 'type' === 'smtp' */
+/**
+ * Nur ausfüllen, falls 'type' === 'smtp'
+ */
 $vC['portal']['mail']['smtpAuth'] = true;                /* true || false */
 $vC['portal']['mail']['smtpHost'] = 'mail.arcor.de';
 $vC['portal']['mail']['smtpUser'] = 'christiansteinle';
@@ -40,6 +47,3 @@
 $vC['portal']['mail']['returnPath'] = 'christiansteinle@arocr.de';
 $vC['portal']['mail']['html'] = false;        /* true || false */
 $vC['portal']['mail']['charset'] = 'UTF-8';
-	
-	
-?>

.functions/fnc_portal.php

@@ -176,6 +176,7 @@
 		return false;
 	}
 }
+
 function fnc_getUsernameById($userId)
 {
 	global $db;
@@ -213,7 +214,7 @@
 	$pool = "qwertzupasdfghkyxcvbnm";
 	$pool .= "23456789";
 	$pool .= "WERTZUPLKJHGFDSAYXCVBNM";
-			$pool .= "!§$%&/()=";
+	$pool .= "!<EFBFBD>$%&/()=";
 
 	srand(( double )microtime() * 1000000);
 
@@ -253,7 +254,7 @@
 {
 	global $db;
 
-			$log	= $db -> query
+	$db->query
 	(
 		'INSERT INTO
 								' . TBL_LOG . '
@@ -462,4 +463,3 @@
 	}
 	return $return;
 }
-?>

.functions/fnc_webservices.php

@@ -23,7 +23,6 @@
 {
 	global $db;
 
-			$return 	= false;
 	$search = array('ä', 'ö', 'ü', 'ß', ' ', '.', '/');
 	$replace = array('ae', 'oe', 'ue', 'ss', '_', '', '');
 	$ent = array_keys(get_html_translation_table(ENT_HTML5));
@@ -43,7 +42,6 @@
 
 function fnc_buildUniqueFileName($prefix, $navId, $fileName, $fileExt)
 {
-			$return 	= false;
 	$search = array('ä', 'ö', 'ü', 'ß', ' ', '/');
 	$replace = array('ae', 'oe', 'ue', 'ss', '_', '');
 	$ent = array_keys(get_html_translation_table(ENT_HTML5));
@@ -216,4 +214,3 @@
 
 	return $return;
 }
-?>

.helpers/berichte2chronik.php

@@ -8,7 +8,7 @@
 $teamNames = array(array('Verbandsliga', 'Bezirksliga'), array('Kreisliga A Alb', 'Reserve'));
 $navPoints = array('Spielberichte', 'Tabelle', 'Mannschaft');
 $navSpecial = array('Y', 'Y', 'N');
-	$navType		= array ( 'uebersicht' , 'widget' , NULL );
+$navType = array('uebersicht', 'widget', null);
 
 
 define('PATH_ROOT', '../');
@@ -75,5 +75,3 @@
 
 	$yearOrder++;
 }
-	
-?>

.helpers/einzelne_berichte2navPoint.php

@@ -34,4 +34,3 @@
 
 	$i++;
 }
-?>

.helpers/fehlende_content_elemente.php

@@ -65,5 +65,3 @@
 		);
 	}
 }
-	
-?>

.helpers/jugend_teams.php

@@ -32,5 +32,3 @@
 
 	return $link;
 }
-		
-?>

.helpers/team_untermenu.php

@@ -35,5 +35,3 @@
 
 	return $link;
 }
-		
-?>

.helpers/update_user_table.php

@@ -31,7 +31,3 @@
 		$user_update = $db->query('UPDATE users SET ' . $update . ' WHERE userId = "' . $dat_user ['userId'] . '" LIMIT 1;');
 	}
 }
-
-
-
-?>

.htaccess

@@ -0,0 +1,16 @@
+<IfModule mod_rewrite.c>
+    <IfModule mod_negotiation.c>
+        Options -MultiViews
+    </IfModule>
+
+    RewriteEngine On
+
+    # Redirect Trailing Slashes If Not A Folder...
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^(.*)/$ /$1 [L,R=301]
+
+    # Handle Front Controller...
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
+</IfModule>

.includes/global_header.php

@@ -32,6 +32,3 @@
 		}
 	}
 }
-	
-
-?>

.includes/website_header.php

@@ -30,7 +30,7 @@
 				$pathWay = fnc_createPathHome($prefix, '7');
 				foreach ($arr_rights as $navRight)
 				{
-											$navId	= str_replace ( $prefix . '_' , '' $navRight );
+					$navId = str_replace($prefix . '_', '', $navRight);
 					var_dump($navId);
 				}
 				echo '<pre>';
@@ -43,5 +43,3 @@
 		}
 	}
 }
-
-?>

.includes/website_rights.php

@@ -40,5 +40,3 @@
 		}
 	}
 }
-
-?>

.lang/informal/lang_de.php

@@ -9,4 +9,3 @@
 /* Mailtexte */
 $lang['mail']['body']['00000010'] = 'Hallo %userFirstname% %userLastname%,' . "\n\n" . '%sess_userFirstname% %sess_userLastname% hat Dir einen Zugang auf ' . $vC['portal']['hostUrl'] . ' eingerichtet. Deine Benutzerdaten lauten:' . "\n" . 'Anmeldename: %userUsername%' . "\n" . 'Password: %userPasswordOrg%' . "\n\n" . 'Bei der ersten Anmeldung am Portal mußt Du aus Sicherheitsgründen Dein Passwort ändern.' . "\n\n";
 $lang['mail']['body']['00000015'] = 'Hallo %userFirstname% %userLastname%,' . "\n\n" . 'Dein Passwort auf ' . $vC ['portal']['hostUrl'] . ' wurde von %sess_userFirstname% %sess_userLastname% zurückgesetzt. Es lautet:' . "\n" . '%userPasswordOrg%' . "\n\n" . 'Bei der ersten Anmeldung am Portal mußt Du aus Sicherheitsgründen Dein Passwort ändern.' . "\n\n";
-?>

.lang/lang_de.php

@@ -143,4 +143,6 @@
 $lang['website']['sport']['turnier'] = '%platzierung% Platz beim Turnier in %ort%';
 
 $lang['website']['select']['spielbericht']['teamname'] = array('SV Jungingen I', 'SV Jungingen II', 'SGM Blautal/Jungingen II');
-?>
+$lang['website']['select']['spielbericht']['spieltyp'] = array('gespielt', 'abgesagt', 'pokal', 'spielfrei');
+$lang['website']['select']['spielbericht']['spieldauer'] = array('regular' => 'reguläre Spielzeit', 'nV' => 'nach Verlängerung', 'nE' => 'nach Elfmeterschießen');
+$lang['website']['select']['pageTypes'] = array('content', 'uebersicht', 'spielbericht', 'turnier', 'widget');

administrator/css/svjf_editor.css

@@ -1,81 +1,70 @@
-.grid_44col
+.grid_44col {
-	{
     width: 1056px;
     float: none;
 }
 
-.grid_43col
+.grid_43col {
-	{
     width: 1032px;
     float: left;
 }
 
-.grid_42col
+.grid_42col {
-	{
     width: 1008px;
     float: left;
 }
 
-.editor_wrapper
+.editor_wrapper {
-	{
+    position: relative;
-		margin				: 0px auto;
+    margin: 0 auto;
     height: 99%;
-		padding				: 35px 0px 0px 0px;
+    padding: 35px 0 0 0;
     width: 1058px;
 }
 
-.editable_hover
+.editable_hover {
-	{
     cursor: crosshair;
     opacity: .5;
     background-color: #ff0000;
 }
 
-.spacer24
+.spacer24 {
-	{
     height: 24px;
 }
 
-.onright
+.onright {
-	{
     float: right;
 }
 
-#rist_editor
+#rist_editor {
-	{
     height: 100%;
 }
 
-#editor_layer
+#editor_layer {
-	{
     position: fixed;
     height: 100%;
     width: 100%;
-		left				: 0px;
+    left: 0;
-		top					: 0px;
+    top: 0;
     z-index: 999;
     background-color: rgba(255, 255, 255, .3);
-		padding				: 0px;
+    padding: 0;
-		margin				: 0px;
+    margin: 0;
     display: none;
 }
 
-#editor_layer .grid_40col
+#editor_layer .grid_40col {
-	{
     float: left;
     clear: none;
 }
 
-#editor_header
+#editor_header {
-	{
     background-color: #000000;
     height: 36px;
     position: absolute;
-		top					: 0px;
+    top: 0;
 }
 
-#editor_title
+#editor_title {
-	{
     height: 36px;
     line-height: 36px;
     color: #ffffff;
@@ -83,14 +72,12 @@
     font-weight: bold;
 }
 
-#editor_layer_close
+#editor_layer_close {
-	{
+    margin: 6px 0;
-		margin	: 6px 0px;
     cursor: pointer;
 }
 
-#editor_content_outer
+#editor_content_outer {
-	{
     height: 100%;
     background-color: #ffffff;
     background-image: linear-gradient(0deg, transparent 23px, #cccccc 24px),
@@ -100,23 +87,20 @@
     background-size: 24px 24px;
 }
 
-#editor_content
+#editor_content {
-	{
     position: relative;
     height: 100%;
     padding: 24px 39px 48px 39px;
 }
 
-#editor_content > div
+#editor_content > div {
-	{
     height: 100%;
     overflow-y: auto;
     overflow-x: hidden;
     width: 1000px;
 }
 
-#editor_content .bottom
+#editor_content .bottom {
-	{
     position: absolute;
     bottom: 12px;
     left: 48px;
@@ -124,9 +108,8 @@
     padding-right: 96px;
 }
 
-.submitButton
+.submitButton {
-	{
+    padding: 4px 0;
-		padding				: 4px 0px;
     background-color: #cccccc;
     line-height: 1.0rem;
     text-align: center;
@@ -139,87 +122,73 @@
     cursor: pointer;
 }
 
-.submitButton:not(:first-of-type)
+.submitButton:not(:first-of-type) {
-	{
     float: left;
 }
 
-.submitButton:hover
+.submitButton:hover {
-	{
     background-color: #e3000b;
     color: #ffffff;
 }
 
-.buttonGroup
+.buttonGroup {
-	{
     width: 193px;
     float: left;
     border: 1px solid #666666;
-		padding	: 0px 22px 22px 23px;
+    padding: 0 22px 22px 23px;
 }
 
-.buttonGroup.onright
+.buttonGroup.onright {
-	{
     margin-right: -1px;
     float: right;
 }
 
-.buttonGroup .submitButton
+.buttonGroup .submitButton {
-	{
     float: left;
-		margin-top	: 0px;
+    margin-top: 0;
 }
 
-.buttonGroup .submitButton
+.buttonGroup .submitButton {
-	{
     margin-top: -1px;
 }
 
-.editor_slider
+.editor_slider {
-	{
     height: 100%;
 }
 
-.editor_slider > div
+.editor_slider > div {
-	{
     height: 100%;
     display: none;
 }
 
-.editor_slider > div:first-of-type
+.editor_slider > div:first-of-type {
-	{
     display: block;
 }
 
-.editor_slider .inner
+.editor_slider .inner {
-	{
     padding: 1px 9px;
 }
 
-input , select , textarea, label
+input, select, textarea, label {
-	{
     font-family: verdana;
     font-size: 1.0rem;
     line-height: 1.0rem;
     float: left;
 }
 
-label
+label {
-	{
     margin-top: 6px;
     padding-bottom: 2px;
 }
 
-input[type=radio] , input[type=checkbox] 
+input[type=radio], input[type=checkbox] {
-	{
     margin-top: 6px;
     margin-left: 5px;
     margin-right: 6px;
 }
 
-input[type=text] , input[type=password]
+input[type=text], input[type=password] {
-	{
+    border: 0 none;
-		border			: 0px none;
     border-bottom: 1px solid #666666;
     width: 383px;
     padding-top: 4px;
@@ -227,59 +196,50 @@ input[type=text] , input[type=password]
     height: 24px;
 }
 
-textarea
+textarea {
-	{
     width: 755px;
     height: 114px;
-		border			: 0px none;
+    border: 0 none;
     padding: 2px 6px;
     border-bottom: 1px solid #666666;
     margin-top: 1px;
     line-height: 1.5rem;
 }
 
-label
+label {
-	{
     width: 192px;
     display: inline-block;
     color: #666666;
 }
 
-input.date_picker , input.short
+input.date_picker, input.short {
-	{
     width: 191px;
 }
 
-input.tiny
+input.tiny {
-	{
     width: 47px;
     margin-right: 1px;
 }
 
-label.tiny
+label.tiny {
-	{
     width: 24px;
     text-align: center;
 }
 
-label.tinyleft
+label.tinyleft {
-	{
     width: 96px;
 }
 
-input.max
+input.max {
-	{
     width: 768px;
 }
 
-li.navclose ul
+li.navclose ul {
-	{
     display: none;
 }
 
-#struktur
+#struktur {
-	{
+    margin: 0 16px 0 8px;
-		margin				: 0px 16px 0px 8px;
     font-size: 0.75rem;
     line-height: 0.875rem;
     border: 2px solid #666666;
@@ -291,223 +251,198 @@ li.navclose ul
     position: relative;
 }
 
-#struktur ul , #otherMain_box ul
+#struktur ul, #otherMain_box ul {
-	{
     padding-left: 24px;
 }
-#otherMain_box > ul
+
-	{
+#otherMain_box > ul {
-		padding-left	: 0px;
+    padding-left: 0;
 }
 
-#struktur > ul
+#struktur > ul {
-	{
+    padding-left: 0;
-		padding-left	: 0px;
 }
 
-#navPoint
+#navPoint {
-	{
     display: none;
     width: 472px;
     height: 100%;
     float: left;
     border: 2px solid #666666;
-		padding		: 23px 22px 10px 14px;
+    padding: 2px 22px 10px 14px;
     position: relative;
     overflow-y: auto;
 }
 
-#imageEditor
+#imageEditor {
-	{
+    margin: 0 0 0 8px;
-		margin				: 0px 0px 0px 8px;
     padding: 0;
     width: 960px;
     background-color: transparent;
     position: relative;
 }
 
-#rist_editor .ui-widget-content
+#rist_editor .ui-widget-content {
-	{
     background-image: none;
 }
 
-.ui-datepicker
+.ui-datepicker {
-	{
     background-color: #ffffff;
 }
 
-#imgHolder
+#imgHolder {
-	{
+    padding: 0;
-		padding			: 0px;
     position: relative;
     left: 22px;
     margin-bottom: 48px;
 }
 
-#imgImage
+#imgImage {
-	{
     position: absolute;
     z-index: 10;
 }
 
-#imgBlende
+#imgBlende {
-	{
     position: absolute;
     z-index: 100;
 }
 
-#imgPreview
+#imgPreview {
-	{
+    left: 0;
-		left		: 0px;
+    top: 0;
-		top			: 0px;
     cursor: move;
 }
 
-#blendeTop, #blendeLeft, #blendeRight, #blendeBottom
+#blendeTop, #blendeLeft, #blendeRight, #blendeBottom {
-	{
     position: absolute;
     background-color: rgba(255, 255, 255, .7);
 }
 
-.preserveChanges
+.preserveChanges {
-	{
     width: 100%;
     height: 100%;
     position: absolute;
-		top					: 0px;
+    top: 0;
-		left				: 0px;
+    left: 0;
     z-index: 50;
     background-color: rgba(100, 100, 100, .5);
     display: none;
 }
 
-li.open > span
+li.open > span {
-	{
     content: '-';
 }
 
-li.navclose > span
+li.navclose > span {
-	{
     content: '+';
 }
 
-li.open > span , li.navclose > span , li.empty > span
+li.open > span, li.navclose > span, li.empty > span {
-	{
     width: 24px;
     display: inline-block;
     cursor: pointer;
     background-image: url('../images/folders.png');
 }
 
-li.open > span
+li.open > span {
-	{
+    background-position: 0 -27px;
-		background-position	: 0px -27px;
 }
 
-li.navclose > span
+li.navclose > span {
-	{
+    background-position: 0 -2px;
-		background-position	: 0px -2px;
 }
 
-li.empty > span
+li.empty > span {
-	{
     cursor: default;
-		background-position	: 0px -51px;
+    background-position: 0 -51px;
 }
 
-li.not_editable
+li.not_editable {
-	{
     color: #AAAAAA;
     cursor: default;
 }
 
-li.editable
+li.editable {
-	{
     color: #222222;
     cursor: crosshair;
 }
 
-li.editorDeactive
+li.editorDeactive {
-	{
     color: #AAAAAA;
     font-style: italic;
 }
 
-li.editorChosen
+li.editorChosen {
-	{
     font-weight: bold;
 }
 
-li.editorChosen li
+li.editorChosen li {
-	{
     font-weight: normal;
 }
 
-.hidden
+.hidden {
-	{
     display: none;
 }
 
-.disabled
+.disabled {
-	{
     background-color: #eeeeee;
     color: #cccccc;
     font-style: italic;
     cursor: default;
 }
 
-.disabled:hover
+.disabled:hover {
-	{
     background-color: #eeeeee;
     color: #cccccc;
     font-style: italic;
 }
 
-.highlight
+.highlight {
-	{
     background-color: #e3000b;
     color: #ffffff;
 }
 
-input#content
+input#content {
-	{
     padding-top: 4px;
 }
 
-input.headline
+input.headline {
-	{
+    font-size: 1.5rem;
-		font-size	: 1.25rem;
+    font-weight: bold;
     border: none;
     width: 960px;
 }
 
-#editor_elements
+input.subline {
-	{
+    font-size: 1.25rem;
+    font-weight: bold;
+    border: none;
+    width: 960px;
+}
+
+#editor_elements {
     position: absolute;
     z-index: 100;
-		right				: 0px;
+    right: 0;
     top: 462px;
     border: 1px solid #000000;
     overflow: hidden;
     background-color: #ffffff;
 }
 
-#element_title
+#element_title {
-	{
     background-color: #000000;
     color: #ffffff;
     font-weight: bold;
-		padding				: 0px 11px;
+    padding: 0 11px;
     cursor: move;
 }
 
-#element_content
+#element_content {
-	{
     padding: 12px 11px 4px 11px;
 }
 
-#element_content .grid_40col
+#element_content .grid_40col {
-	{
     width: 100%;
     float: none;
     height: 24px;
@@ -520,85 +455,73 @@ input.headline
     cursor: move;
 }
 
-#element_content .grid_40col p
+#element_content .grid_40col p {
-	{
     text-align: center;
 }
 
-#element_content h2 , p
+#element_content h2, p {
-	{
     font-size: 1.0rem;
 }
 
-#element_content img
+#element_content img {
-	{
     display: none;
 }
 
-#element_content .content
+#element_content .content {
-	{
     text-align: center;
 }
 
-#content.highlight
+#content.highlight {
-	{
     background-color: rgba(160, 160, 160, .2);
     color: #000000;
 }
 
-#content .new_box
+#content .new_box {
-	{
     border: 1px dashed #000000;
     background-color: #ffffff;
 }
 
-#content .sort_handle , #rist_editor .sort_handle
+#content .sort_handle, #rist_editor .sort_handle {
-	{
     background-color: #ffffff;
     position: absolute;
-		right				: 0px;
+    right: 0;
-		top					: 0px;
+    top: 0;
     width: 24px;
     height: 24px;
     background-image: url('../images/svjf/icon-sortable.png');
     cursor: move;
 }
-#content .del_handle, #rist_editor .del_handle
+
-	{
+#content .del_handle, #rist_editor .del_handle {
     background-color: #ffffff;
     position: absolute;
     right: 24px;
-		top					: 0px;
+    top: 0;
     width: 24px;
     height: 24px;
     background-image: url('../images/svjf/icon-delete.png');
     cursor: pointer;
 }
 
-#newSort_box li
+#newSort_box li {
-	{
     position: relative;
     list-style-type: none;
 }
 
-#generalSettings
+#generalSettings {
-	{
     padding-bottom: 96px;
 }
 
-#generalSettings .bottom
+#generalSettings .bottom {
-	{
     left: 48px;
 }
 
-#imgThumbs img
+#imgThumbs img {
-	{
     display: block;
     float: none;
 }
 
-#wait
+#wait {
-	{
     position: absolute;
     width: 100%;
     height: 100%;
@@ -607,11 +530,32 @@ input.headline
     display: none;
 }
 
-#wait img
+#wait img {
-	{
     position: absolute;
     top: 50%;
     left: 50%;
     margin-top: -48px;
     margin-left: -48px;
 }
+
+#breadCrumb {
+    font-size: .75rem;
+    margin-bottom: 14px;
+}
+
+#showAction {
+    padding-top: 13px;
+}
+
+.actionChooser {
+    margin-top: -13px;
+}
+
+.actionChooser span {
+    float: none;
+    margin-top: 12px;
+    width: 168px;
+    display: inline-block;
+    font-size: .75rem;
+}
+

administrator/index.php

@@ -2,10 +2,10 @@
 
 session_start();
 
-	define ( 'PATH_ROOT'  , '../' );
+$pathRoot = dirname(__DIR__) . '/';
 define('TBL_PREFIX', 'portal');
 
-	include_once ( PATH_ROOT . '.config/config_global.php' );
+include_once($pathRoot . '.config/config_global.php');
 require_once(PATH_CLS . 'rendering/viewClass.php');
 
 /* Funktionen und Aktionen einbinden */
@@ -132,12 +132,10 @@
 if (isset ($_POST) && !empty ($_POST))
 {
 	/* ToDo: POST Daten */
-			$render -> setFormData ( $_POST );
+	$render->setFormdata($_POST);
 }
 
 $html = $render->output();
-	$html	= str_replace ( array ( 'PHP_ROOT_PATH/' , 'PHP_SITE_PATH/' ) , array ( PATH_ROOT , PATH_SITE ) , $html );
+$html = str_replace(array('PHP_ROOT_PATH/', 'PHP_SITE_PATH'), array(PATH_ROOT, PATH_SITE), $html);
-	$html	= str_replace ( array ( "\r" , "\n" , "\t" ) , array ( '' , '' , '' ) , $html );
+//$html = str_replace(array("\r", "\n", "\t"), array('', '', ''), $html);
 echo $html;
-	
-?>

administrator/js/portal.js

@@ -30,7 +30,7 @@
 							$( '#' + $( this ).attr( 'data-referer' ) ).show( );
 						}
 				} );
-		}
+		};
 
 	$ ( document ).ready ( function ( )
 		{

administrator/popups/editor/index.php

@@ -2,8 +2,8 @@
 
 session_start();
 
-	define ( 'PATH_ROOT' , '../../../' );
+$pathRoot = dirname(dirname(dirname(__DIR__))) . '/';
-	include_once ( PATH_ROOT . '.config/config_global.php' );
+include_once($pathRoot . '.config/config_global.php');
 require_once(PATH_CLS . 'rendering/viewClass.php');
 
 /* Funktionen und Aktionen einbinden */
@@ -37,29 +37,13 @@
 
 $specialSite = fnc_getNavType($prefix, $_GET['navId']);
 
-	$navpointData			= $db -> query
+$navpointData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navId = ' . $_GET['navId'] . ';');
-								(
-									'SELECT
-										*
-									FROM
-										' . $prefix . '_' . TBL_NAVI . '
-									WHERE
-										' . $prefix . '_navId = "' . $_GET[ 'navId' ] . '";'
-								);
 $navpoint = $navpointData->fetch_assoc();
 
 if (!is_null($navpoint[$prefix . '_keyvisual']))
 {
 	/* Keyvisual */
-			$keyvisualData			= $db -> query
+	$keyvisualData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_IMAGE . ' WHERE id = ' . $navpoint[$prefix . '_keyvisual'] . ';');
-										(
-											'SELECT
-												*
-											FROM
-												' . $prefix . '_' . TBL_IMAGE . '
-											WHERE
-												id = "' . $navpoint[ $prefix . '_keyvisual' ] . '";'
-										);
 	$keyvisual = $keyvisualData->fetch_assoc();
 	$data['keyvisual'][] = array('id' => $keyvisual['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $keyvisual['imgName'] . '.' . $keyvisual['imgExtension'], 'title' => $keyvisual['imgTitle']);
 	$data['galery'][] = array('id' => $keyvisual['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $keyvisual['imgName'] . '_orig.' . $keyvisual['imgExtension'], 'title' => $keyvisual['imgTitle']);
@@ -71,15 +55,7 @@
 
 		foreach ($sliders as $imageId)
 		{
-							$imageData				= $db -> query
+			$imageData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_IMAGE . ' WHERE id = ' . $imageId . ';');
-														(
-															'SELECT
-																*
-															FROM
-																' . $prefix . '_' . TBL_IMAGE . '
-															WHERE
-																id = "' . $imageId . '";'
-														);
 			$image = $imageData->fetch_assoc();
 			$data['keyvisual'][] = array('id' => $image['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $image['imgName'] . '.' . $image['imgExtension'], 'title' => $image['imgTitle']);
 			$data['galery'][] = array('id' => $image['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $image['imgName'] . '_orig.' . $image['imgExtension'], 'title' => $image['imgTitle']);
@@ -96,33 +72,17 @@
 {
 	if ($specialSite === 'uebersicht')
 	{
-					$contents	= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navStart = ' . $_GET['navId'] . ' ORDER BY ' . $prefix . '_navSort ASC;');
-									(
+
-										'SELECT
-											*
-										FROM
-											' . $prefix . '_' . TBL_NAVI . '
-										WHERE
-											' . $prefix . '_navStart = "' . $_GET[ 'navId' ] . '"
-										ORDER BY
-											' . $prefix . '_navSort ASC;'
-									);
 		while ($content = $contents->fetch_assoc())
 		{
 			$tmp_content['headline'] = $content[$prefix . '_navName'];
 			$tmp_content['link'] = $content[$prefix . '_navTarget'];
 			$tmp_special = fnc_getNavType($prefix, $content[$prefix . '_navId']);
+
 			if ($tmp_special !== false)
 			{
-									$sub_contents	= $db -> query
+				$sub_contents = $db->query('SELECT * FROM ' . $prefix . '_' . $tmp_special . ' WHERE siteId = ' . $content[$prefix . '_navId'] . ';');
-														(
-															'SELECT
-																*
-															FROM
-																' . $prefix . '_' . $tmp_special . '
-															WHERE
-																siteId = "' . $content[ $prefix . '_navId' ] . '";'
-														);
 				if ($sub_contents === false)
 				{
 					continue;
@@ -130,20 +90,27 @@
 				$sub_content = $sub_contents->fetch_assoc();
 				$sub_content['type'] = $tmp_special;
 			}
+			else
+			{
+				$sub_contents = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_CONTENT . ' WHERE siteId = ' . $content[$prefix . '_navId'] . ';');
+				if ($sub_contents === false)
+				{
+					continue;
+				}
+				$tmp_content = $sub_contents->fetch_assoc();
+				if ($tmp_content['siteContents'] !== '')
+				{
+					$tmp_data['content']['pageContents'] = fnc_getSiteContents($tmp_content['siteContents'], $prefix);
+					$sub_content = $tmp_data['content']['pageContents'];
+					$sub_content['type'] = 'standard';
+				}
+			}
 			$data['content']['uebersicht'][] = $sub_content;
 		}
 	}
 	elseif ($specialSite === 'spielbericht')
 	{
-					$contents					= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-													(
-														'SELECT
-															*
-														FROM
-															' . $prefix . '_' . $specialSite . '
-														WHERE
-															siteId = "' . $_GET[ 'navId' ] . '";'
-													);
 		$content = $contents->fetch_assoc();
 
 		$dateTime = DateTime::createFromFormat('Y-m-d', $content['datum']);
@@ -151,15 +118,7 @@
 	}
 	elseif ($specialSite === 'turnier')
 	{
-					$contents					= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-													(
-														'SELECT
-															*
-														FROM
-															' . $prefix . '_' . $specialSite . '
-														WHERE
-															siteId = "' . $_GET[ 'navId' ] . '";'
-													);
 		$content = $contents->fetch_assoc();
 
 		$dateTime = DateTime::createFromFormat('Y-m-d', $content['datum']);
@@ -167,15 +126,7 @@
 	}
 	elseif ($specialSite === 'widget')
 	{
-					$contents			= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-											(
-												'SELECT
-													*
-												FROM
-													' . $prefix . '_' . $specialSite . '
-												WHERE
-													siteId = "' . $_GET[ 'navId' ] . '";'
-											);
 		if ($contents->num_rows !== 0)
 		{
 			$content = $contents->fetch_assoc();
@@ -185,21 +136,14 @@
 }
 else
 {
-			$contents			= $db -> query
+	$contents = $db->query('SELECT * FROM ' . $prefix . '_content WHERE siteId = ' . $_GET['navId'] . ';');
-									(
-										'SELECT
-											*
-										FROM
-											' . $prefix . '_content
-										WHERE
-											siteId = "' . $_GET[ 'navId' ] . '";'
-									);
 	if ($contents->num_rows !== 0)
 	{
 		$content = $contents->fetch_assoc();
 		if ($content['siteContents'] !== '')
 		{
 			$data['content']['pageContents'] = fnc_getSiteContents($content['siteContents'], $prefix);
+
 			foreach ($data['content']['pageContents'] as $tmp_content)
 			{
 				if (isset($tmp_content['type']) && $tmp_content['type'] === 'textimage')
@@ -207,6 +151,7 @@
 					$data['galery'][] = array('id' => $tmp_content['content_image_id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $tmp_content['imgName'] . '_orig.' . $tmp_content['imgExtension'], 'title' => $tmp_content['imgTitle']);
 				}
 			}
+
 		}
 	}
 }
@@ -237,8 +182,6 @@
 $render->setNavpath($pathWay);
 
 $html = $render->output();
-	$html	= str_replace ( array ( 'PHP_ROOT_PATH/' , 'PHP_SITE_PATH/' ) , array ( PATH_ROOT , PATH_SITE ) , $html );
+$html = str_replace(array('PHP_ROOT_PATH/', 'PHP_SITE_PATH'), array(PATH_ROOT, PATH_SITE), $html);
 // $html	= str_replace ( array ( "\r" , "\n" , "\t" ) , array ( '' , '' , '' ) , $html );
 echo $html;
-
-?>	

administrator/popups/logfiles/index.php

@@ -72,8 +72,6 @@
 $render->setFormdata(array_merge($_GET, $_POST));
 
 $html = $render->output();
-	$html	= str_replace ( array ( 'PHP_ROOT_PATH/' , 'PHP_SITE_PATH/' ) , array ( PATH_ROOT , PATH_SITE ) , $html );
+$html = str_replace(array('PHP_ROOT_PATH', 'PHP_SITE_PATH'), array(PATH_ROOT, PATH_SITE), $html);
 $html = str_replace(array("\r", "\n", "\t"), array('', '', ''), $html);
 echo $html;
-
-?>

administrator/popups/usermanagement/index.php

@@ -170,8 +170,6 @@
 }
 
 $html = $render->output();
-	$html	= str_replace ( array ( 'PHP_ROOT_PATH/' , 'PHP_SITE_PATH/' ) , array ( PATH_ROOT , PATH_SITE ) , $html );
+$html = str_replace(array('PHP_ROOT_PATH', 'PHP_SITE_PATH'), array(PATH_ROOT, PATH_SITE), $html);
 $html = str_replace(array("\r", "\n", "\t"), array('', '', ''), $html);
 echo $html;
-
-?>

administrator/webservices/.htaccess

@@ -0,0 +1,3 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine Off
+</IfModule>

administrator/webservices/remote_data.php

@@ -24,8 +24,8 @@
 	die('Wrong parameters');
 }
 
-	define ( 'PATH_ROOT' , '../../' );
+$pathRoot = dirname(dirname(__DIR__)) . '/';
-	include_once ( PATH_ROOT . '.config/config_global.php' );
+include_once($pathRoot . '.config/config_global.php');
 include_once(PATH_FNC . 'fnc_webservices.php');
 
 /* Aufbereiten der Tabellen - Daten */
@@ -36,6 +36,10 @@
 $table = ($table === 'keyvisual')
 	? 'content_image'
 	: $table;
+if (strpos($table, 'navi_') !== false)
+{
+	$table = 'navi';
+}
 $id = (is_numeric(end($dataSet)))
 	? end($dataSet)
 	: null;
@@ -48,30 +52,12 @@
 {
 	if ($table === 'navi')
 	{
-					$result		= $db -> query
+		$result = $db->query('SELECT * FROM ' . TBL_RIGHTS . ' WHERE userId = ' . $_POST['userId'] . ' AND rightsPrefix = "' . $_POST['prefix'] . '";');
-									(
-										'SELECT
-											*
-										FROM
-											' . TBL_RIGHTS . '
-										WHERE
-											userId = "' . $_POST[ 'userId' ] . '" AND
-											rightsPrefix = "' . $_POST[ 'prefix' ] . '";'
-									);
 
 		if ($result->num_rows !== 0)
 		{
 			$rights = $result->fetch_assoc();
-							$result		= $db -> query
+			$result = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $table . ' ORDER BY ' . $_POST['prefix'] . '_navStart ASC, ' . $_POST['prefix'] . '_navSort ASC;');
-											(
-												'SELECT
-													*
-												FROM
-													' . $_POST[ 'prefix' ] . '_' . $table . '
-												ORDER BY
-													' . $_POST[ 'prefix' ] . '_navStart ASC ,
-													' . $_POST[ 'prefix' ] . '_navSort ASC;'
-											);
 			$arr_rights = explode(';', $rights['rights']);
 
 			while ($fetch_data = $result->fetch_assoc())
@@ -94,8 +80,6 @@
 						$arr_rights[] = $fetch_data[$_POST['prefix'] . '_navId'];
 					}
 					$fetch_data[$_POST['prefix'] . '_navEditable'] = 'true';
-											file_put_contents ( 'test.log' , var_export( $arr_rights , true ) . "\n", FILE_APPEND );
-											//$fetch_data[ $_POST[ 'prefix' ] . '_navEditable' ] = 'true';
 				}
 				$data['navigation']['navStart_' . $fetch_data[$_POST['prefix'] . '_navStart']]['navId_' . $fetch_data[$_POST['prefix'] . '_navId']] = $fetch_data;
 			}
@@ -108,15 +92,7 @@
 	}
 	else
 	{
-					$result		= $db -> query 
+		$result = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $table . ' WHERE id = ' . $id . ';');
-											(
-												'SELECT
-													*
-												FROM
-													' . $_POST[ 'prefix' ] . '_' . $table . '
-												WHERE
-													id = "' . $id . '";'
-											);
 		$fetch_data = $result->fetch_assoc();
 		$data = $fetch_data;
 	}
@@ -134,35 +110,14 @@
 		switch ($_POST['formAction'])
 		{
 			case 'renameNavPoint' :
-							
+				$result = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navName = "' . $_POST['navName'] . '" WHERE ' . $_POST['prefix'] . '_navId = ' . $_POST['navId'] . ' LIMIT 1;');
-								$result					= $db -> query
-															(
-																'UPDATE
-																	' . $_POST[ 'prefix' ] . '_' . $table . '
-																SET
-																	' . $_POST[ 'prefix' ] . '_navName = "' . $_POST[ 'navName' ] . '"
-																WHERE
-																	' . $_POST[ 'prefix' ] . '_navId = "' . $id . '"
-																LIMIT 1;'
-															);
 				break;
 
 			case 'updateActive' :
-							
+				$result = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navActive = "' . $_POST['navActive'] . '" WHERE ' . $_POST['prefix'] . '_navId = ' . $_POST['navId'] . ' LIMIT 1;');
-								$result					= $db -> query
-															(
-																'UPDATE
-																	' . $_POST[ 'prefix' ] . '_' . $table . '
-																SET
-																	' . $_POST[ 'prefix' ] . '_navActive = "' . $_POST[ 'navActive' ] . '"
-																WHERE
-																	' . $_POST[ 'prefix' ] . '_navId = "' . $id . '"
-																LIMIT 1;'
-															);
 				break;
 
 			case 'sortNavPoint' :
-							
 				$sort = 1;
 				$newSort = json_decode($_POST['newSort']);
 
@@ -170,16 +125,7 @@
 				{
 					$navPointArray = explode('_', $sortPoint);
 					$navId = $navPointArray[1];
-										$update			= $db -> query
+					$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navSort = "' . $sort . '" WHERE ' . $_POST['prefix'] . '_navId = ' . $navId . ' LIMIT 1;');
-															(
-																'UPDATE
-																	' . $_POST[ 'prefix' ] . '_' . $table . '
-																SET
-																	' . $_POST[ 'prefix' ] . '_navSort = "' . $sort . '"
-																WHERE
-																	' . $_POST[ 'prefix' ] . '_navId = "' . $navId . '"
-																LIMIT 1;'
-															);
 					++$sort;
 				}
 
@@ -187,21 +133,10 @@
 				break;
 
 			case 'moveNavPoint' :
-							
+				$result = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navStart = ' . $_POST['navStart'] . ' WHERE ' . $_POST['prefix'] . '_navId = ' . $_POST['navId'] . ' LIMIT 1;');
-								$result					= $db -> query
-															(
-																'UPDATE
-																	' . $_POST[ 'prefix' ] . '_' . $table . '
-																SET
-																	' . $_POST[ 'prefix' ] . '_navStart = "' . $_POST[ 'navStart' ] . '"
-																WHERE
-																	' . $_POST[ 'prefix' ] . '_navId = "' . $_POST[ 'navId' ] . '"
-																LIMIT 1;'
-															);
 				break;
 
 			default :
-							
 				var_dump($_POST);
 				break;
 
@@ -214,14 +149,8 @@
 	}
 	else
 	{
-					$columns	= $db -> query
+		$columns = $db->query('SHOW COLUMNS FROM ' . $_POST['prefix'] . '_' . $table . ';');
-									(
+		$fieldNames = array();
-										'SHOW
-											COLUMNS
-										FROM
-											' . $_POST[ 'prefix' ] . '_' . $table . ';'
-									);
-					
 		while ($column = $columns->fetch_assoc())
 		{
 			$fieldNames[] = $column['Field'];
@@ -235,6 +164,7 @@
 			}
 		}
 
+
 		/* Behandlung Keyvisual und Content-Image */
 		if ($table === 'content_image')
 		{
@@ -245,15 +175,7 @@
 
 			if (isset ($_POST['uploadFile']) && !empty ($_POST['uploadFile']))
 			{
-									$old			= $db -> query
+				$old = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $table . ' WHERE id = ' . $id . ';');
-														(
-															'SELECT
-																*
-															FROM
-																' . $_POST[ 'prefix' ] . '_' . $table . '
-															WHERE
-																id = "' . $id . '";'
-														);
 				$old_data = $old->fetch_assoc();
 
 				if (!isset ($_POST['formAction']) || (isset ($_POST['formAction']) && $_POST['formAction'] !== 'appendImage'))
@@ -331,29 +253,12 @@
 			{
 				if (isset ($_POST['formAction']) && $_POST['formAction'] === 'updateSort')
 				{
-											$db -> query
+					$db->query('UPDATE ' . $_POST['prefix'] . '_' . TBL_NAVI . ' SET ' . $_POST['prefix'] . '_keyvisual = ' . $id . ' WHERE ' . $_POST['prefix'] . '_navId = ' . $_POST['navId'] . ' LIMIT 1;');
-													(
-														'UPDATE
-															' . $_POST[ 'prefix' ] . '_' . TBL_NAVI . '
-														SET
-															' . $_POST[ 'prefix' ] . '_keyvisual = "' . $id . '"
-														WHERE
-															' . $_POST[ 'prefix' ] . '_navId = "' . $_POST[ 'navId' ] . '"
-														LIMIT 1;'
-													);
 				}
 				else
 				{
 					/* Altes Bild umbenennen und neue Koordinaten speichern */
-											$img			= $db -> query
+					$img = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $table . ' WHERE id = ' . $id . ';');
-																(
-																	'SELECT
-																		*
-																	FROM
-																		' . $_POST[ 'prefix' ] . '_' . $table . '
-																	WHERE
-																		id = "' . $id . '";'
-																);
 					$img_data = $img->fetch_assoc();
 
 					$extension = $img_data['imgExtension'];
@@ -374,7 +279,7 @@
 
 					if ($_POST['imgName'] . '.' . $_POST['imgExtension'] !== $old_name)
 					{
-													$file_name		= fnc_buildUniqueFileName ( $_POST[ 'prefix' ] , $_POST[ 'navId' ] , $img_name , $extension , -1 );
+						$file_name = fnc_buildUniqueFileName($_POST['prefix'], $_POST['navId'], $img_name, $extension);
 						$file_name_orig = substr($file_name, 0, strrpos($file_name, '.')) . '_orig' . substr($file_name, strrpos($file_name, '.'));
 						$file_name_thmb = substr($file_name, 0, strrpos($file_name, '.')) . '_thumb' . substr($file_name, strrpos($file_name, '.'));
 
@@ -437,12 +342,18 @@
 			/* Daten in Tabelle schreiben */
 			$dataString = implode(' , ', $data);
 
+			file_put_contents(__DIR__ . '/test.log', var_export($data, true) . "\n\n");
+			file_put_contents(__DIR__ . '/test.log', var_export($table, true) . "\n\n", FILE_APPEND);
+			file_put_contents(__DIR__ . '/test.log', var_export($error, true) . "\n\n", FILE_APPEND);
+			file_put_contents(__DIR__ . '/test.log', var_export($dataString, true) . "\n\n", FILE_APPEND);
 			if ($dataString != '')
 			{
+				file_put_contents(__DIR__ . '/test.log', var_export($id, true) . "\n\n", FILE_APPEND);
 				$result = ($table === 'content')
-												? $db -> query ( 'UPDATE ' . $_POST[ 'prefix' ] . '_' . $table . ' SET ' . $dataString . ' WHERE siteId = "' . $id . '";' )
+					? $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $dataString . ' WHERE siteId = ' . $id . ';')
-												: $db -> query ( 'UPDATE ' . $_POST[ 'prefix' ] . '_' . $table . ' SET ' . $dataString . ' WHERE id = "' . $id . '";' );
+					: $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $dataString . ' WHERE id = ' . $id . ';');
 
+				file_put_contents(__DIR__ . '/test.log', var_export($db->error_list, true) . "\n\n", FILE_APPEND);
 				if (!$result)
 				{
 					$error = true;
@@ -461,7 +372,7 @@
 	}
 	else
 	{
-					echo json_encode( 'SUCCESS' );
+		echo 'SUCCESS';
 	}
 }
 else if ($_POST['request'] === 'insertData')
@@ -481,7 +392,10 @@
 				{
 					$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navSort = "' . $sort . '" WHERE ' . $_POST['prefix'] . '_navId = "' . $navi[$_POST['prefix'] . '_navId'] . '" LIMIT 1;') || $error = true;
 
-										if ( $error ) { break; }
+					if ($error)
+					{
+						break;
+					}
 					if ($navi[$_POST['prefix'] . '_navId'] == $_POST['navId'])
 					{
 						++$sort;
@@ -494,7 +408,10 @@
 						$new_navId = $db->insert_id;
 						$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navTarget = "index.php?siteId=' . $_POST['siteId'] . '&navId=' . $new_navId . '" WHERE ' . $_POST['prefix'] . '_navId = "' . $new_navId . '" LIMIT 1;') || $error = true;
 
-												if ( $error ) { break; }
+						if ($error)
+						{
+							break;
+						}
 
 						if ($_POST['new_navType'] !== 'uebersicht')
 						{
@@ -520,30 +437,20 @@
 				break;
 
 			case 'addSubNav' :
-								$navis		= $db -> query
+				$navis = $db->query('SELECT * FROM ' . $_POST['prefix'] . '_' . $table . ' WHERE ' . $_POST['prefix'] . '_navStart = ' . $_POST['navId'] . ' ORDER BY ' . $_POST['prefix'] . '_navSort ASC;');
-												(
-													'SELECT
-														*
-													FROM
-														' . $_POST[ 'prefix' ] . '_' . $table . '
-													WHERE
-														' . $_POST[ 'prefix' ] . '_navStart = "' . $_POST[ 'navId' ] . '"
-													ORDER BY
-														' . $_POST[ 'prefix' ] . '_navSort
-													ASC;'
-												);
 				$sort = 1;
 
-								$special	= ( $_POST[ 'new_subnavType' ] === 'content' )
+				$special = ($_POST['new_subnavType'] === 'content') ? 'N' : 'Y';
-											? 'N'
-											: 'Y';
 				$navLink = fnc_buildUniqueLinkName($_POST['prefix'], $_POST['navId'], $_POST['new_subnavName']);
 
 				$insert = $db->query('INSERT INTO ' . $_POST['prefix'] . '_' . $table . ' ( ' . $_POST['prefix'] . '_navId , ' . $_POST['prefix'] . '_navStart , ' . $_POST['prefix'] . '_navName , ' . $_POST['prefix'] . '_navTarget , ' . $_POST['prefix'] . '_navLink , ' . $_POST['prefix'] . '_navActive , ' . $_POST['prefix'] . '_navSort , ' . $_POST['prefix'] . '_specialSite , ' . $_POST['prefix'] . '_specialType ) VALUES ( NULL , "' . $_POST['navId'] . '" , "' . $_POST['new_subnavName'] . '" , "" , "' . $navLink . '" , "Y" , "' . $sort . '" , "' . $special . '" , "' . $_POST['new_subnavType'] . '" );') || $error = true;
 				$new_navId = $db->insert_id;
 				$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navTarget = "index.php?siteId=' . $_POST['siteId'] . '&navId=' . $new_navId . '" WHERE ' . $_POST['prefix'] . '_navId = "' . $new_navId . '" LIMIT 1;') || $error = true;
 
-								if ( $error ) { break; }
+				if ($error)
+				{
+					break;
+				}
 
 				if ($_POST['new_subnavType'] !== 'uebersicht')
 				{
@@ -568,7 +475,10 @@
 				{
 					$update = $db->query('UPDATE ' . $_POST['prefix'] . '_' . $table . ' SET ' . $_POST['prefix'] . '_navSort = "' . $sort . '" WHERE ' . $_POST['prefix'] . '_navId = "' . $navi[$_POST['prefix'] . '_navId'] . '" LIMIT 1;') || $error = true;
 
-										if ( $error ) { break; }
+					if ($error)
+					{
+						break;
+					}
 					++$sort;
 				}
 
@@ -886,5 +796,3 @@
 		echo 'ERROR';
 	}
 }
-
-?>

administrator/webservices/test_data.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Created by CS medien- & kommunikationssysteme.
+ * @author Christian Steinle
+ * @date 10.09.2016
+ *
+ * @copyright CS medien- & kommunikationssysteme (http://www.steinle-computer.de)
+ */
+
+file_put_contents(__DIR__ . '/test_data.log', var_export($_POST, true) . "\n\n", FILE_APPEND);

index.php

@@ -2,8 +2,9 @@
 
 session_start();
 
-	define ( 'PATH_ROOT' , './' );
+$pathRoot = __DIR__ . '/';
-	include_once ( PATH_ROOT . '.config/config_global.php' );
+
+require_once($pathRoot . '.config/config_global.php');
 require_once(PATH_CLS . 'rendering/viewClass.php');
 
 /* Funktionen und Aktionen einbinden */
@@ -32,29 +33,13 @@
 
 $specialSite = fnc_getNavType($prefix, $_GET['navId']);
 
-	$navpointData			= $db -> query
+$navpointData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navId = ' . $_GET['navId'] . ';');
-								(
-									'SELECT
-										*
-									FROM
-										' . $prefix . '_' . TBL_NAVI . '
-									WHERE
-										' . $prefix . '_navId = "' . $_GET[ 'navId' ] . '";'
-								);
 $navpoint = $navpointData->fetch_assoc();
 
 if (!is_null($navpoint[$prefix . '_keyvisual']))
 {
 	/* Keyvisual */
-			$keyvisualData			= $db -> query
+	$keyvisualData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_IMAGE . ' WHERE id = ' . $navpoint[$prefix . '_keyvisual'] . ';');
-										(
-											'SELECT
-												*
-											FROM
-												' . $prefix . '_' . TBL_IMAGE . '
-											WHERE
-												id = "' . $navpoint[ $prefix . '_keyvisual' ] . '";'
-										);
 	$keyvisual = $keyvisualData->fetch_assoc();
 	$data['keyvisual'][] = array('id' => $keyvisual['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $keyvisual['imgName'] . '.' . $keyvisual['imgExtension'], 'title' => $keyvisual['imgTitle']);
 	$data['galery'][] = array('id' => $keyvisual['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $keyvisual['imgName'] . '_orig.' . $keyvisual['imgExtension'], 'title' => $keyvisual['imgTitle']);
@@ -66,15 +51,7 @@
 
 		foreach ($sliders as $imageId)
 		{
-							$imageData				= $db -> query
+			$imageData = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_IMAGE . ' WHERE id = ' . $imageId . ';');
-														(
-															'SELECT
-																*
-															FROM
-																' . $prefix . '_' . TBL_IMAGE . '
-															WHERE
-																id = "' . $imageId . '";'
-														);
 			$image = $imageData->fetch_assoc();
 			$data['keyvisual'][] = array('id' => $image['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $image['imgName'] . '.' . $image['imgExtension'], 'title' => $image['imgTitle']);
 			$data['galery'][] = array('id' => $image['id'], 'path' => PATH_MED . $prefix . '/' . $_GET['navId'] . '/', 'src' => $image['imgName'] . '_orig.' . $image['imgExtension'], 'title' => $image['imgTitle']);
@@ -91,17 +68,8 @@
 {
 	if ($specialSite === 'uebersicht')
 	{
-					$contents	= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_NAVI . ' WHERE ' . $prefix . '_navStart = ' . $_GET['navId'] . ' ORDER BY ' . $prefix . '_navSort ASC;');
-									(
+
-										'SELECT
-											*
-										FROM
-											' . $prefix . '_' . TBL_NAVI . '
-										WHERE
-											' . $prefix . '_navStart = "' . $_GET[ 'navId' ] . '"
-										ORDER BY
-											' . $prefix . '_navSort ASC;'
-									);
 		while ($content = $contents->fetch_assoc())
 		{
 			$tmp_content['headline'] = $content[$prefix . '_navName'];
@@ -110,15 +78,7 @@
 
 			if ($tmp_special !== false)
 			{
-									$sub_contents	= $db -> query
+				$sub_contents = $db->query('SELECT * FROM ' . $prefix . '_' . $tmp_special . ' WHERE siteId = ' . $content[$prefix . '_navId'] . ';');
-														(
-															'SELECT
-																*
-															FROM
-																' . $prefix . '_' . $tmp_special . '
-															WHERE
-																siteId = "' . $content[ $prefix . '_navId' ] . '";'
-														);
 				if ($sub_contents === false)
 				{
 					continue;
@@ -128,14 +88,7 @@
 			}
 			else
 			{
-								$sub_contents = $db->query(
+				$sub_contents = $db->query('SELECT * FROM ' . $prefix . '_' . TBL_CONTENT . ' WHERE siteId = ' . $content[$prefix . '_navId'] . ';');
-									'SELECT
-										*
-									FROM
-										' . $prefix . '_' . TBL_CONTENT . '
-									WHERE
-										siteId = "' . $content[ $prefix . '_navId' ] . '";'
-								);
 				if ($sub_contents === false)
 				{
 					continue;
@@ -153,15 +106,7 @@
 	}
 	elseif ($specialSite === 'spielbericht')
 	{
-					$contents					= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-													(
-														'SELECT
-															*
-														FROM
-															' . $prefix . '_' . $specialSite . '
-														WHERE
-															siteId = "' . $_GET[ 'navId' ] . '";'
-													);
 		$content = $contents->fetch_assoc();
 
 		$dateTime = DateTime::createFromFormat('Y-m-d', $content['datum']);
@@ -169,15 +114,7 @@
 	}
 	elseif ($specialSite === 'turnier')
 	{
-					$contents					= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-													(
-														'SELECT
-															*
-														FROM
-															' . $prefix . '_' . $specialSite . '
-														WHERE
-															siteId = "' . $_GET[ 'navId' ] . '";'
-													);
 		$content = $contents->fetch_assoc();
 
 		$dateTime = DateTime::createFromFormat('Y-m-d', $content['datum']);
@@ -185,15 +122,7 @@
 	}
 	elseif ($specialSite === 'widget')
 	{
-					$contents			= $db -> query
+		$contents = $db->query('SELECT * FROM ' . $prefix . '_' . $specialSite . ' WHERE siteId = ' . $_GET['navId'] . ';');
-											(
-												'SELECT
-													*
-												FROM
-													' . $prefix . '_' . $specialSite . '
-												WHERE
-													siteId = "' . $_GET[ 'navId' ] . '";'
-											);
 		if ($contents->num_rows !== 0)
 		{
 			$content = $contents->fetch_assoc();
@@ -203,15 +132,7 @@
 }
 else
 {
-			$contents			= $db -> query
+	$contents = $db->query('SELECT * FROM ' . $prefix . '_content WHERE siteId = ' . $_GET['navId'] . ';');
-									(
-										'SELECT
-											*
-										FROM
-											' . $prefix . '_content
-										WHERE
-											siteId = "' . $_GET[ 'navId' ] . '";'
-									);
 	if ($contents->num_rows !== 0)
 	{
 		$content = $contents->fetch_assoc();
@@ -258,5 +179,3 @@
 $html = str_replace(array('PHP_ROOT_PATH/', 'PHP_SITE_PATH/'), array(PATH_ROOT, PATH_SITE), $html);
 // $html	= str_replace ( array ( "\r" , "\n" , "\t" ) , array ( '' , '' , '' ) , $html );
 echo $html;
-
-?>	

templates/svjf/tpl_definitions.php

@@ -3,5 +3,3 @@
 $def['navLevel'] = array(3, 4, 5);
 $def['navDepth'] = array(true, false, false);
 $def['navPostion'] = array('navi_main', 'navi_sub', 'navi_last');
-
-?>

templates/svjf/tpl_editor.php

@@ -1,5 +1,6 @@
 <div id="editor_layer">
 	<div class="editor_wrapper box">
+		<div id="wait"><img src="<?php echo PATH_MED; ?>svjf_waiting.gif"/></div>
 		<div id="editor_header" class="grid_44col">
 			<div class="grid_2col spacer"></div>
 			<div id="editor_title" class="grid_39col">R!ST %%type%% Editor</div>

templates/svjf/tpl_main.php

@@ -5,31 +5,32 @@
 	<meta charset="UTF-8"/>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 	<meta http-equiv="cache-control" content="no-cache"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/reset.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/reset.css"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/nivo-slider-custom.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/nivo-slider-custom.css"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/jquery-ui-1.11.2.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/jquery-ui-1.11.2.css"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/jquery-ui-1.11.2.structure.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/jquery-ui-1.11.2.structure.css"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/jquery-ui-1.11.2.theme.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/jquery-ui-1.11.2.theme.css"/>
-		<link rel="stylesheet" type="text/css" href="<?php echo PATH_ROOT; ?>/css/svjf_l1.css"/>
+	<link rel="stylesheet" type="text/css" href="<?php echo PATH_PREFIX; ?>/css/svjf_l1.css"/>
-		<script type="text/javascript" src="<?php echo PATH_ROOT; ?>/js/jquery-2.1.1.min.js"></script>
+	<script type="text/javascript" src="<?php echo PATH_PREFIX; ?>/js/jquery-2.1.1.min.js"></script>
-		<script type="text/javascript" src="<?php echo PATH_ROOT; ?>/js/jquery-ui-1.11.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo PATH_PREFIX; ?>/js/jquery-ui-1.11.2.min.js"></script>
-		<script type="text/javascript" src="<?php echo PATH_ROOT; ?>/js/jquery.nivo.slider.js"></script>
+	<script type="text/javascript" src="<?php echo PATH_PREFIX; ?>/js/jquery.nivo.slider.js"></script>
-		<script type="text/javascript" src="<?php echo PATH_ROOT; ?>/js/common.js"></script>
+	<script type="text/javascript" src="<?php echo PATH_PREFIX; ?>/js/common.js"></script>
 	<?php
-		
+	/**
-			/* Editoren Layout */
+	 * Editoren Layout
+	 */
 	if ($this->_editable === true)
 	{
 		?>
 		<link rel="stylesheet" type="text/css" href="<?php echo PATH_SITE; ?>/css/svjf_editor.css"/>
 		<?php
 	}
-				
 	?>
 	<script type="text/javascript">
 		<?php
-		
+		/**
-			/* Editoren Variablen */
+		 * Editoren Variablen
+		 */
 		if ( $this->_editable === true )
 		{
 		?>
@@ -66,10 +67,8 @@
 		}
 		?>
 
-			$( window ).load( function( )
+		$(window).load(function () {
-				{
+			if ($('img', '.keyvisual').length > 1) {
-					if ( $( 'img' , '.keyvisual' ).length > 1 )
-						{
 				$('.keyvisual').nivoSlider(
 					{
 						prevText: '<',
@@ -77,8 +76,7 @@
 					});
 			}
 
-					if ( $( '.slider img' , '#galeryslider' ).length > 1 )
+			if ($('.slider img', '#galeryslider').length > 1) {
-						{
 				$('.slider', '#galeryslider').nivoSlider(
 					{
 						controlNav: false,
@@ -94,12 +92,10 @@
 				if ( $this->_editable === false )
 				{
 				?>
-										$( '.keyvisual img' ).on( 'click' , function( )
+				$('.keyvisual img').on('click', function () {
-											{
 					$('#galeryslider').show();
 				});
-										$( 'img.floatright' ).on( 'click' , function( )
+				$('img.floatright').on('click', function () {
-											{
 					$('#galeryslider').show();
 				});
 				<?php
@@ -113,13 +109,15 @@
 	</script>
 	<?php
 
-			/* Editoren Skripte */
+	/**
+	 * Editoren Skripte
+	 */
 	if ($this->_editable === true)
 	{
 		?>
-					<script type="text/javascript" src="<?php echo $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ]; ?>/js/lang.js.php?lang=<?php echo $_SESSION[ 'sess_loginLang' ]; ?>"></script>
+		<script type="text/javascript" src="<?php echo $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion']; ?>/js/lang.js.php?lang=<?php echo $_SESSION['sess_loginLang']; ?>"></script>
-					<script type="text/javascript" src="<?php echo $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ]; ?>/js/editor.js"></script>
+		<script type="text/javascript" src="<?php echo $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion']; ?>/js/editor.js"></script>
-					<script type="text/javascript" src="<?php echo $this -> _website[ $this -> _webkey ][ 'editorUrl' ] . 'v' . $this -> _website[ $this -> _webkey ][ 'editorVersion' ]; ?>/js/ckeditor/ckeditor.js"></script>
+		<script type="text/javascript" src="<?php echo $this->_website[$this->_webkey]['editorUrl'] . '' . $this->_website[$this->_webkey]['editorVersion']; ?>/js/ckeditor/ckeditor.js"></script>
 		<?php
 	}
 
@@ -128,7 +126,9 @@
 <body>
 <?php
 
-			/* Editorlayer */
+/**
+ * Editorlayer
+ */
 if ($this->_editable === true)
 {
 	$editor = clone $this;
@@ -136,7 +136,9 @@
 	$editor->setData(null);
 	echo $editor->output();
 
-					/* Seitenelemente für Standardseiten */
+	/**
+	 * Seitenelemente für Standardseiten
+	 */
 	if (!$this->_specialSite)
 	{
 		$elements = clone $this;
@@ -146,19 +148,15 @@
 	}
 }
 
-		?>
+/**
-		<?php
+ * Galerielayer
-		
+ */
-			/* Galerielayer */
 if (isset($this->_data['galery']) && !empty($this->_data['galery']))
 {
 	$galery = clone($this);
 	$galery->setTemplate('galery');
 	$galery->setData($this->_data['galery']);
 	echo $galery->output();
-					?>
-					
-					<?php
 }
 
 ?>
@@ -169,7 +167,9 @@
 		<div id="navi_main" class="grid_36col" data-editable="struktur">
 			<?php
 
-						/* Hauptnavigation */
+			/**
+			 * Hauptnavigation
+			 */
 			if (isset ($this->_data['navi_main']))
 			{
 				$navi_main = clone $this;
@@ -182,7 +182,7 @@
 			?>
 		</div>
 		<div id="logo" class="grid_4col">
-					<img src="<?php echo PATH_ROOT; ?>/images/svj_logo.png"/>
+			<img src="<?php echo PATH_PREFIX; ?>/images/svj_logo.png"/>
 		</div>
 		<div class="grid_40col spacer"></div>
 		<div class="grid_40col spacer"></div>
@@ -194,7 +194,9 @@
 			<div class="grid_2col spacer"></div>
 			<?php
 
-						/* Keyvisual und Slider - Elemente (siehe $( window ).load ) */
+			/**
+			 * Keyvisual und Slider - Elemente (siehe $( window ).load )
+			 */
 			if (isset ($this->_data['keyvisual']))
 			{
 				?>
@@ -220,7 +222,9 @@
 	</div>
 	<?php
 
-				/* 1. Unternavigation */
+	/**
+	 * 1. Unternavigation
+	 */
 	if (isset ($this->_data['navi_sub']))
 	{
 		?>
@@ -244,7 +248,9 @@
 		<?php
 	}
 
-				/* 2. Unternavigation */
+	/**
+	 * 2. Unternavigation
+	 */
 	if (isset ($this->_data['navi_last']))
 	{
 		?>
@@ -272,7 +278,9 @@
 	<div class="grid_40col wrapper">
 		<?php
 
-					/* Seiteninhalt */
+		/**
+		 * Seiteninhalt
+		 */
 		if (isset ($this->_data['content']))
 		{
 			?>
@@ -300,9 +308,16 @@
 {
 	?>
 	<script>
-					  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(function (i, s, o, g, r, a, m) {
-					  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+			i['GoogleAnalyticsObject'] = r;
-					  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+			i[r] = i[r] || function () {
+					(i[r].q = i[r].q || []).push(arguments)
+				}, i[r].l = 1 * new Date();
+			a = s.createElement(o),
+				m = s.getElementsByTagName(o)[0];
+			a.async = 1;
+			a.src = g;
+			m.parentNode.insertBefore(a, m)
 		})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
 
 		ga('create', 'UA-69496431-1', 'auto');

templates/svjf/tpl_pageContents.php

@@ -7,5 +7,3 @@ foreach ( $this -> _data as $data )
 	$content->setData($data);
 	echo $content->output();
 }
-
-	?>

templates/svjf/tpl_textimage.php

@@ -15,7 +15,7 @@
 		}
 		?>
 		<div class="grid_40col">
-		<img class="grid_13col floatright" id="content_image_<?php echo $content_image_id; ?>" <?php echo ( $this -> _editable ) ? 'data-editable="image"' : '' ; ?>src="<?php echo ( file_exists( PATH_MED . $this -> _prefix . '/' . $this -> _siteId . '/' . $imgName . '.' . $imgExtension ) ) ? PATH_MED . $this -> _prefix . '/' . $this -> _siteId . '/' . $imgName . '.' . $imgExtension : '' ; ?>" title="<?php echo $imgTitle; ?>"/>
+			<img class="grid_13col floatright" id="content_image_<?php echo $content_image_id; ?>" <?php echo ($this->_editable) ? 'data-editable="image"' : ''; ?>src="<?php echo PATH_MED . $this->_prefix . '/' . $this->_siteId . '/' . $imgName . '.' . $imgExtension; ?>" title="<?php echo $imgTitle; ?>"/>
 			<div class="content" id="content_text_<?php echo $content_text_id; ?>" <?php echo ($this->_editable) ? 'data-editable="text"' : ''; ?>>
 				<?php echo $content; ?>
 			</div>

templates/svjf/tpl_widget.php

@@ -7,5 +7,3 @@
 $widget->setEditable($this->_editable);
 $widget->setData($this->_data);
 echo $widget->output();
-
-?>