Merge pull request #8 from effone/module-htgen

Hypertext Generator

.gitignore

@@ -25,4 +25,5 @@ Thumbs.db
 # Generic git files
 *.orig
 
-# Package Helpers
+# Files not part of software
+app/vault

app/core/class/di.php

@@ -25,7 +25,7 @@ class DI
 	 * @param      $abstract
 	 * @param null $concrete
 	 */
-	public function push($abstract, $concrete = null)
+	public function set($abstract, $concrete = null)
 	{
 		if ($concrete === null) {
 			$concrete = $abstract;
@@ -40,7 +40,7 @@ public function push($abstract, $concrete = null)
 	 * @return mixed|null|object
 	 * @throws Exception
 	 */
-	public function pull($abstract, $values = [])
+	public function get($abstract, $values = [])
 	{
 		// if we don't have it, just register it
 		if (!isset($this->instances[$abstract])) {

app/core/class/htgen.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Elyzin - PHP based free forum software
+ * 
+ * @since 0.1.0
+ * @version 0.1.0
+ * @package Model : User
+ * @author Elyzin Devs <[email protected]>
+ * @source https://github.com/elyzin/elyzin Base repository
+ * @link http://elyz.in
+ * @copyright 2018 Elyzin
+ * @license MIT
+ * 
+ * @todo Namespace
+ * @todo Interface, Form elements, Markdown Parser
+ */
+
+class HTGen
+{
+	protected $void_tags = ['area', 'base', 'br', 'col', 'hr', 'img', 'input', 'link', 'meta', 'param', 'command', 'keygen', 'source']; // HTML5 Compliant Void Tags
+
+	public function __construct()
+	{
+	}
+
+	/**
+	 * HTML Element Generator (all pre-structured elements depend on this method)
+	 *
+	 * @param string $tag
+	 * @param string $content
+	 * @param array $arg
+	 * @param boolean $multiline
+	 * @param boolean $xhtml
+	 * @return string
+	 */
+	public function elem($tag = 'br', $content = '', $arg = array(), $multiline = true, $xhtml = false)
+	{
+		$decl = "";
+		if (!empty($arg)) { // && !in_array($tag, ['br','hr']))
+			$decl = array();
+			foreach ($arg as $attrib => $value) {
+				if (is_array($value)) $value = implode(', ', $value);
+				if (is_numeric($attrib)) {
+					$attrib = $value;
+					$value = '';
+				}
+				$value = (!$value) ? '' : '="' . $value . '"';
+				$decl[] = $attrib . $value;
+			}
+			$decl = empty($decl) ? '' : ' ' . implode(' ', $decl);
+		}
+		if (in_array($tag, $this->void_tags)) {
+			$multiline = false; // Force oneline for void tags
+			$startclose = $content = '';
+			$endopen = $xhtml ? ' /' : ''; // XHTML compatibility, false by default
+		} else {
+			$startclose = '>';
+			$endopen = '</' . $tag;
+		}
+
+		$eol = $multiline ? PHP_EOL : '';
+		return '
+<' . $tag . $decl . $startclose . $content . $eol . $endopen . '>';
+	}
+}

app/core/class/page.php

@@ -480,7 +480,6 @@ public function out(int $pagegen = 0)
 			$this->mustext['all'][] = 'nav';
 			$varhr['name'] = conf('basename');
 			$varhr['caption'] = $this->caption;
-			$varhr['project_name'] = isset($_SESSION['project']['name']) ? $_SESSION['project']['name'] : $this->lang('base', ['project_na']);
 			$varhr['navigation'] = $this->buildNav();
 
 			// Generate the visible header