From: jumpin-banana <jumpin.banana@gmail.com>
Date: Wed, 24 Mar 2010 13:02:50 +0000 (+0100)
Subject: updates
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=e3a2b3979af8be42373809d09d354624c285ead3;p=dolphin.git

updates
---

diff --git a/simple-framework/.htaccess b/simple-framework/.htaccess
new file mode 100644
index 0000000..8f6b9b6
--- /dev/null
+++ b/simple-framework/.htaccess
@@ -0,0 +1,4 @@
+php_flag magic_quotes_gpc off
+php_flag default_charset utf-8
+
+Options +FollowSymlinks -Indexes
diff --git a/simple-framework/conf/db.php b/simple-framework/conf/db.php
index cace352..80cc1e6 100644
--- a/simple-framework/conf/db.php
+++ b/simple-framework/conf/db.php
@@ -1,4 +1,22 @@
 <?php
+/**
+* dolphin. Collection of usefull PHP skeletons.
+* Copyright (C) 2009 Johannes 'Banana' Keßler
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 define('DB_TYPE','mysqli'); // Pdo_mysql has a bug with '?'
 define('DB_HOST','localhost');
 define('DB_DATABASE','db-name');
diff --git a/simple-framework/conf/main.php b/simple-framework/conf/main.php
index b780cd5..32e51f4 100644
--- a/simple-framework/conf/main.php
+++ b/simple-framework/conf/main.php
@@ -1,4 +1,21 @@
 <?php
+/**
+* dolphin. Collection of usefull PHP skeletons.
+* Copyright (C) 2009 Johannes 'Banana' Keßler
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 
 // to get the system messages make it true
 define('DEBUG',true);
diff --git a/simple-framework/index.php b/simple-framework/index.php
index 751ea78..8c114f9 100644
--- a/simple-framework/index.php
+++ b/simple-framework/index.php
@@ -1,21 +1,21 @@
 <?php
 /**
- *                   |                                 |             |
- *  __ \   _ \   __| __| |   |  __|    __|  _ \  __ \  __|  __| _ \  |
- *  |   | (   | |    |   |   |\__ \   (    (   | |   | |   |   (   | |
- * _|  _|\___/ _|   \__|\__, |____/_)\___|\___/ _|  _|\__|_|  \___/ _|
- *                      ____/
- *
- * nortys.control
- * Websiten Statistik Tool
- *
- * Copyright (C) 2010 Johannes Keßler
- * nortys Gmbh
- * E3, 13
- * 68159 Mannheim
- *
- * @version: $Id: index.php 11 2010-01-12 14:31:05Z jk $
- */
+* dolphin. Collection of usefull PHP skeletons.
+* Copyright (C) 2009 Johannes 'Banana' Keßler
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 
 mb_internal_encoding("UTF-8");
 
diff --git a/simple-framework/lib/function.library.php b/simple-framework/lib/function.library.php
index 6d2aa9c..8af9f2e 100644
--- a/simple-framework/lib/function.library.php
+++ b/simple-framework/lib/function.library.php
@@ -1,4 +1,23 @@
 <?php
+/**
+* dolphin. Collection of usefull PHP skeletons.
+* Copyright (C) 2009 Johannes 'Banana' Keßler
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
 /**
  * validate given string if it is in given format
  *
diff --git a/simple-framework/site/script/start.php b/simple-framework/site/script/start.php
index 92c9840..809d35c 100644
--- a/simple-framework/site/script/start.php
+++ b/simple-framework/site/script/start.php
@@ -1,8 +1,26 @@
 <?php
 
+/**
+* dolphin. Collection of usefull PHP skeletons.
+* Copyright (C) 2009 Johannes 'Banana' Keßler
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 // do something:
 $var = 1;
-$var-new = $var+1;
+$var_new = $var+1;
 
 // fill the $data variable
 $data['test'] = "hallo";