merge

into HEAD

Conflicts:
	.gitignore
	README.md
	_func.php
	secret.php.example
	sql.php

.gitignore

@@ -1,5 +1,5 @@
-/.buildpath
+/.buildpath
-/.project
+/.project
-/secret.php
+/secret.php
-/config.php
+/config.php
 /test.php

README.md

@@ -1,3 +1,2 @@
-git submodule add https://git.seemsleg.it/ef/php-func-lib lib
+# php-func-lib
-
+git submodule add https://git.seemsleg.it/pub/php-func-lib lib
-test

_func.php

@@ -1,10 +1,10 @@
-<?php
+<?php
-// include ('config.php');
+// include ('config.php');
-include_once ('sql.php');
+include_once ('sql.php');
-$sql = new SQL ();
+$sql = new SQL ();
-include_once ('string.php');
+include_once ('string.php');
-include_once ('numbers.php');
+include_once ('numbers.php');
-include_once ('mail.php');
+include_once ('mail.php');
-include_once ('debug.php');
+include_once ('debug.php');
-include_once ('markdown.php');
+include_once ('markdown.php');
 ?>

secret.php.example

@@ -1,10 +1,10 @@
-<?php 
+<?php 
-if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
+if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
-
+
-$_m['host'] = 'localhost'; 
+$_m['host'] = 'localhost'; 
-$_m['user'] = '';
+$_m['user'] = '';
-$_m['pass'] = '';
+$_m['pass'] = '';
-$_m['data'] = '';
+$_m['data'] = '';
-$_m['pre']  = 'efcms2_';
+$_m['pre']  = 'efcms2_';
-$_m['salt'] = '';
+$_m['salt'] = '';
 ?>

sql.php

@@ -196,4 +196,4 @@ class SQL {
     // echo 'DESTROY';
   }
 }
-?>
+?>