Form Class update to fix possible primary key variable overwrite when

reference inserts are written.

www/admin/class_test.php

@@ -1,5 +1,4 @@
 <?
-	// $Id: class_test.php 4835 2014-01-23 03:03:55Z gullevek $
 	$DEBUG_ALL = 1;
 	$PRINT_ALL = 1;
 	$DB_DEBUG = 1;
@@ -134,7 +133,7 @@
 	while (($ret = $basic->db_check_async()) === true)
 	{
 		print "[ERR]: $ret<br>";
-		sleep(5);
+//		sleep(5);
 	}
 
 	// search path check
@@ -147,6 +146,10 @@
 	$status = $basic->db_exec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
 	print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
 
+	// magic links test
+	print $basic->magic_links('user@bubu.at').'<br>';
+	print $basic->magic_links('http://test.com/foo/bar.php?foo=1').'<br>';
+
 	// print error messages
 	print $basic->print_error_msg();
 

www/admin/edit_base.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/edit_base.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-08 13:09:19 +0900 (Wed, 08 Jan 2014) $
-	* $LastChangedRevision: 4807 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/06/10
 	* SHORT DESCRIPTION:
@@ -320,7 +315,7 @@
 
 	// debug data, if DEBUG flag is on, this data is print out
 	$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
-	$DEBUG_DATA['Id'] = '$Id: edit_base.inc 4807 2014-01-08 04:09:19Z gullevek $';
+	$DEBUG_DATA['Id'] = '$Id: edit_base.inc 4897 2014-02-06 08:16:56Z gullevek $';
 
 	// create main data array
 	$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
@@ -337,5 +332,4 @@
 	// debug output
 	echo $login->print_error_msg();
 	echo $form->print_error_msg();
-	// $Id: edit_base.inc 4807 2014-01-08 04:09:19Z gullevek $
 ?>

www/admin/edit_order.php

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/edit_order.php $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-08 13:09:19 +0900 (Wed, 08 Jan 2014) $
-	* $LastChangedRevision: 4807 $
-	*********************************************************************
 	* AUTHOR: Clemens Schwaighofer 
 	* CREATED: 2001/07/11
 	* SHORT DESCRIPTION:
@@ -200,7 +195,7 @@
 
 	// debug data, if DEBUG flag is on, this data is print out
 	$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
-	$DEBUG_DATA['Id'] = '$Id: edit_order.php 4807 2014-01-08 04:09:19Z gullevek $';
+	$DEBUG_DATA['Id'] = '$Id: edit_order.php 4897 2014-02-06 08:16:56Z gullevek $';
 
 	// create main data array
 	$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);

www/admin/files.php

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/files.php $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	* $LastChangedRevision: 3159 $
-	*********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* CREATED: 2005/07/13
 	* SHORT DESCRIPTION:
@@ -481,7 +476,7 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil
 	//------------------------------ processing data end
 
 	//------------------------------ debug data
-	$DEBUG_DATA['Id'] = '$Id: files.php 3159 2010-09-02 02:58:10Z gullevek $';
+	$DEBUG_DATA['Id'] = '$Id: files.php 4897 2014-02-06 08:16:56Z gullevek $';
 	//------------------------------ debug data
 
 	//------------------------------ smarty start
@@ -492,5 +487,4 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil
 	require("footer.inc");
 	//------------------------------ footer
 		
-	// $Id: files.php 3159 2010-09-02 02:58:10Z gullevek $
 ?>

www/admin/includes/Date.Vars.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/includes/Date.Vars.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	* $LastChangedRevision: 3159 $
-	*********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* CREATED: 2005/07/19
 	* SHORT DESCRIPTION:
@@ -55,5 +50,4 @@
 	$month_short[11] = "Nov";
 	$month_short[12] = "Dec";
 
-	// $Id: Date.Vars.inc 3159 2010-09-02 02:58:10Z gullevek $
 ?>

www/admin/set_paths.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/set_paths.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-08 15:03:09 +0900 (Wed, 08 Jan 2014) $
-	* $LastChangedRevision: 4818 $
-	*********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* CREATED: 2007/09/03
 	* SHORT DESCRIPTION:
@@ -113,5 +108,4 @@
 	$cms->debug("LANGUAGE", "SL: ".$_SESSION['DEFAULT_CHARSET']." | ".$_SESSION['LANG']." | ".$_SESSION['DEFAULT_LANG']);
 	$cms->debug("TEMPLATE", "P: ".$smarty->getTemplateDir()[0]);
 
-	// $Id: set_paths.inc 4818 2014-01-08 06:03:09Z gullevek $
 ?>

www/admin/smarty.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/admin/smarty.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-02-18 16:25:12 +0900 (Mon, 18 Feb 2013) $
-	* $LastChangedRevision: 4381 $
-	*********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* CREATED: 2005/07/12
 	* SHORT DESCRIPTION:
@@ -91,7 +86,7 @@
 	// debug data, if DEBUG flag is on, this data is print out
 	$cms->DEBUG_DATA['debug_error_msg'] = $cms->running_time();
 	$cms->DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
-	$cms->DEBUG_DATA['Id'] = '$Id: smarty.inc 4381 2013-02-18 07:25:12Z gullevek $';
+	$cms->DEBUG_DATA['Id'] = '$Id: smarty.inc 4897 2014-02-06 08:16:56Z gullevek $';
 
 	// create main data array
 	$cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA);
@@ -102,5 +97,4 @@
 	}
 	$smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang);
 
-	// $Id: smarty.inc 4381 2013-02-18 07:25:12Z gullevek $
 ?>

www/admin/table_arrays/array_edit_access.inc

@@ -1,6 +1,4 @@
 <?
-	// $Id: array_edit_access.inc 3159 2010-09-02 02:58:10Z gullevek $
-	
 	$edit_access = array (
 		"table_array" => array (
 			"edit_access_id" => array (

www/admin/table_arrays/array_edit_groups.inc

@@ -1,8 +1,5 @@
 <?
-	// $Id: array_edit_groups.inc 4381 2013-02-18 07:25:12Z gullevek $
-
 	$edit_groups = array (
-
 		"table_array" => array (
 			"edit_group_id" => array (
 				"value" => $GLOBALS["edit_group_id"],

www/admin/table_arrays/array_edit_languages.inc

@@ -1,76 +1,73 @@
 <?
-	// $Id: array_edit_languages.inc 3159 2010-09-02 02:58:10Z gullevek $
+	$edit_languages=array (
-
+		"table_array" => array (
-   $edit_languages=array(
+			"edit_language_id" => array (
-
+				"value" => $GLOBALS["edit_language_id"],
-   "table_array" => array(
+				"type" => "hidden",
-     "edit_language_id" => array (
+				"pk" => 1
-       "value" => $GLOBALS["edit_language_id"],
+			),
-       "type" => "hidden",
+			"short_name" => array (
-       "pk" => 1
+				"value" => $GLOBALS["short_name"],
-     ),
+				"output_name" => "Language (short)",
-     "short_name" => array (
+				"mandatory" => 1,
-       "value" => $GLOBALS["short_name"],
+				"type" => "text",
-       "output_name" => "Language (short)",
+				"size" => 2,
-       "mandatory" => 1,
+				"length" => 2       
-       "type" => "text",
+			),
-       "size" => 2,
+			"long_name" => array (
-       "length" => 2       
+				"value" => $GLOBALS["long_name"],
-     ),
+				"output_name" => "Language (long)",
-     "long_name" => array (
+				"mandatory" => 1,
-       "value" => $GLOBALS["long_name"],
+				"type" => "text",
-       "output_name" => "Language (long)",
+				"size" => 40
-       "mandatory" => 1,
+			),
-       "type" => "text",
+			"iso_name" => array (
-       "size" => 40
+				"value" => $GLOBALS["iso_name"],
-     ),
+				"output_name" => "ISO Code",
-     "iso_name" => array (
+				"mandatory" => 1,
-       "value" => $GLOBALS["iso_name"],
+				"type" => "text"
-       "output_name" => "ISO Code",
+			), 
-       "mandatory" => 1,
+			"order_number" => array (
-       "type" => "text"
+				"value" => $GLOBALS["order_number"],
-     ), 
+				"int" => 1,
-     "order_number" => array (
+				"order" => 1
-       "value" => $GLOBALS["order_number"],
+			),
-       "int" => 1,
+			"enabled" => array (
-       "order" => 1
+				"value" => $GLOBALS["enabled"], 
-     ),
+				"output_name" => "Enabled", 
-     "enabled" => array (
+				"int" => 1,
-       "value" => $GLOBALS["enabled"], 
+				"type" => "binary", 
-       "output_name" => "Enabled", 
+				"element_list" => array (
-       "int" => 1,
+					"1" => "Yes", 
-       "type" => "binary", 
+					"0" => "No"
-       "element_list" => array (
+				)
-         "1" => "Yes", 
+			),
-         "0" => "No"
+			"lang_default" => array (
-       )
+				"value" => $GLOBALS["lang_default"], 
-     ),
+				"output_name" => "Default Language", 
-     "lang_default" => array (
+				"int" => 1,
-       "value" => $GLOBALS["lang_default"], 
+				"type" => "binary", 
-       "output_name" => "Default Language", 
+				"element_list" => array (
-       "int" => 1,
+					"1" => "Yes", 
-       "type" => "binary", 
+					"0" => "No"
-       "element_list" => array (
+				)
-         "1" => "Yes", 
+			)
-         "0" => "No"
+		),
-       )
+		"load_query" => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
-     )
+		"show_fields" => array (
-   ),
+			array (
-   "load_query" => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
+				"name" => "long_name"
-   "show_fields" => array(
+			),
-     array (
+			array (
-       "name" => "long_name"
+				"name" => "iso_name",
-     ),
+				"before_value" => "ISO: "
-     array (
+			),
-       "name" => "iso_name",
+			array (
-       "before_value" => "ISO: "
+				"name" => "enabled",
-     ),
+				"before_value" => "Enabled: ",
-     array (
+				"binary" => array ("Yes","No")
-       "name" => "enabled",
+			)
-       "before_value" => "Enabled: ",
+		),
-       "binary" => array ("Yes","No")
+		"table_name" => "edit_language"
-     )
+	);
-   ),
-     "table_name" => "edit_language"
-   );
 ?>

www/admin/table_arrays/array_edit_menu_group.inc

@@ -1,6 +1,4 @@
 <?
-	// $Id: array_edit_menu_group.inc 3159 2010-09-02 02:58:10Z gullevek $
-	
 	$edit_menu_group = array (
 		"table_array" => array (
 			"edit_menu_group_id" => array (

www/admin/table_arrays/array_edit_pages.inc

@@ -1,8 +1,6 @@
 <?
-	// $Id: array_edit_pages.inc 3159 2010-09-02 02:58:10Z gullevek $
+	$edit_pages = array (
-
+		"table_array" => array (
-	$edit_pages = array(
-		"table_array" => array(
 			"edit_page_id" => array (
 				"value" => $GLOBALS["edit_page_id"], 
 				"type" => "hidden",
@@ -96,11 +94,11 @@
 		),
 		"load_query" => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
 		"table_name" => "edit_page",
-		"show_fields" => array(
+		"show_fields" => array (
-			array(
+			array (
 				"name" => "name"
 			),
-			array(
+			array (
 				"name" => "filename",
 				"before_value" => "Filename: "
 			),

www/admin/table_arrays/array_edit_schemes.inc

@@ -1,8 +1,5 @@
 <?
-	// $Id: array_edit_schemes.inc 3159 2010-09-02 02:58:10Z gullevek $
+   $edit_schemes = array (
-
-   $edit_schemes=array (
-
 	   "table_array" => array (
 		 "edit_scheme_id" => array (
 		   "value" => $GLOBALS["edit_scheme_id"],
@@ -44,11 +41,11 @@
 	   ),
 	   "table_name" => "edit_scheme",
 	   "load_query" => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
-	   "show_fields" => array(
+	   "show_fields" => array (
-		 array(
+		 array (
 		   "name" => "name"
 		 ),
-		 array(
+		 array (
 		   "name" => "enabled",
 		   "binary" => array ("Yes", "No"),
 		   "before_value" => "Enabled: " 

www/admin/table_arrays/array_edit_users.inc

@@ -1,6 +1,4 @@
 <?
-	// $Id: array_edit_users.inc 4381 2013-02-18 07:25:12Z gullevek $
-
 	$edit_users = array (
 		"table_array" => array (
 			"edit_user_id" => array (

www/admin/table_arrays/array_edit_visible_group.inc

@@ -1,6 +1,4 @@
 <?
-	// $Id: array_edit_visible_group.inc 3159 2010-09-02 02:58:10Z gullevek $
-	
 	$edit_visible_group = array (
 		"table_array" => array (
 			"edit_visible_group_id" => array (

www/configs/config.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/configs/config.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-02-18 16:27:24 +0900 (Mon, 18 Feb 2013) $
-	* $LastChangedRevision: 4382 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/06/10
 	* SHORT DESCRIPTION:
@@ -232,5 +227,4 @@
 	// any other global definitons here
 //	DEFINE('SOME_ID', <SOME VALUE>);
 	
-	// $Id: config.inc 4382 2013-02-18 07:27:24Z gullevek $	
 ?>

www/layout/admin/default/css/edit.css

@@ -1,11 +1,4 @@
 /*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/css/edit.css $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/04/14
@@ -517,5 +510,3 @@ div.spacer
 }
 
 /* ***************************** ADMIN EDIT INTERFACE COLORS ********************************* */
-
-/* $Id: edit.css 3159 2010-09-02 02:58:10Z gullevek $ */

www/layout/admin/default/javascript/edit.js

@@ -1,11 +1,4 @@
 /*
-    = SUBVERSION DATA ===================================================
-    = $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/javascript/edit.js $
-    = $LastChangedBy: gullevek $
-    = $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-    = $LastChangedRevision: 3159 $
-    = SUBVERSION DATA ===================================================
-
 	AUTHOR: Clemens Schwaighofer
 	DATE: 2006/09/05
 	DESC: edit shop js file
@@ -124,5 +117,3 @@ function le(id)
 	if (document.forms[form_name].action_yes.value == 'true')
 		document.forms[form_name].submit();
 }
-
-/* $Id: edit.js 3159 2010-09-02 02:58:10Z gullevek $ */

www/layout/admin/default/lang/messages_en_utf8.po

@@ -1,9 +1,4 @@
 #********************************************************************
-# $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/lang/messages_en_utf8.po $
-# $LastChangedBy: gullevek $
-# $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-# $LastChangedRevision: 3159 $
-#********************************************************************
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2005/08/09
 # SHORT DESCRIPTION:
@@ -15,11 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: cs@tequila.co.jp\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@e-graphics.com\n"
 "POT-Creation-Date: 2005-08-09 09:26+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
-"Language-Team: Tequila Japan <info@tequila.co.jp>\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@e-graphics.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

www/layout/admin/default/lang/messages_ja_utf8.po

@@ -1,9 +1,4 @@
 #********************************************************************
-# $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/lang/messages_ja_utf8.po $
-# $LastChangedBy: gullevek $
-# $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-# $LastChangedRevision: 3159 $
-#********************************************************************
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2007/04/18
 # SHORT DESCRIPTION:
@@ -15,11 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: cs@tequila.co.jp\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@e-graphics.com\n"
 "POT-Creation-Date: 2007-04-18 17:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
-"Language-Team: Tequila Japan <info@tequila.co.jp>\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@e-graphics.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

www/layout/admin/default/templates/edit_body.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/edit_body.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2013-09-10 11:08:58 +0900 (Tue, 10 Sep 2013) $
-	= $LastChangedRevision: 4634 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -119,4 +112,3 @@
 </table>
 </body>
 </html>
-{* $Id: edit_body.tpl 4634 2013-09-10 02:08:58Z gullevek $ *}

www/layout/admin/default/templates/edit_elements.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_elements.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2012-06-12 18:58:20 +0900 (Tue, 12 Jun 2012) $
-	= $LastChangedRevision: 4014 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -131,4 +124,3 @@
 		</td>
 	</tr>
 {/foreach}
-{* $Id: edit_elements.tpl 4014 2012-06-12 09:58:20Z gullevek $ *}

www/layout/admin/default/templates/edit_error_msg.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_error_msg.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2006-12-21 11:47:45 +0900 (Thu, 21 Dec 2006) $
-	= $LastChangedRevision: 1636 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -20,5 +13,3 @@
 		{$element.msg}
 	</td>
 </tr>
-
-{* $Id: edit_error_msg.tpl 1636 2006-12-21 02:47:45Z gullevek $ *}

www/layout/admin/default/templates/edit_hidden.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_hidden.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2006-12-21 11:47:45 +0900 (Thu, 21 Dec 2006) $
-	= $LastChangedRevision: 1636 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -17,4 +10,3 @@
 {foreach from=$hidden item=element key=key name=loop}
 	<input type="hidden" name="{$element.key}" value="{$element.value}">
 {/foreach}
-{* $Id: edit_hidden.tpl 1636 2006-12-21 02:47:45Z gullevek $ *}

www/layout/admin/default/templates/edit_load.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_load.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2006-12-21 11:47:45 +0900 (Thu, 21 Dec 2006) $
-	= $LastChangedRevision: 1636 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -27,5 +20,3 @@
 		<input type="submit" name="archive" value="{t}Load{/t}">
 	</td>
 </tr>
-
-{* $Id: edit_load.tpl 1636 2006-12-21 02:47:45Z gullevek $ *}

www/layout/admin/default/templates/edit_new.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_new.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2006-12-21 11:47:45 +0900 (Thu, 21 Dec 2006) $
-	= $LastChangedRevision: 1636 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -29,4 +22,4 @@
          </td>
      </tr>
 
-{* $Id: edit_new.tpl 1636 2006-12-21 02:47:45Z gullevek $ *}
+{* $Id: edit_new.tpl 4897 2014-02-06 08:16:56Z gullevek $ *}

www/layout/admin/default/templates/edit_order.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/edit_order.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2013-09-10 11:08:58 +0900 (Tue, 10 Sep 2013) $
-	= $LastChangedRevision: 4634 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/07/11
@@ -87,4 +80,3 @@
 </table>
 </body>
 </html>
-{* $Id: edit_order.tpl 4634 2013-09-10 02:08:58Z gullevek $ *}

www/layout/admin/default/templates/edit_save_delete.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/html/mailing_tool/branches/version-4/templates/default/edit_save_delete.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2006-12-21 11:47:45 +0900 (Thu, 21 Dec 2006) $
-	= $LastChangedRevision: 1636 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -37,4 +30,3 @@
 	{/if}
 		</td>
 	</tr>
-{* $Id: edit_save_delete.tpl 1636 2006-12-21 02:47:45Z gullevek $ *}

www/layout/admin/default/templates/index.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/index.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -113,5 +106,3 @@ left
 		</div>
 	</div>
 </div>
-
-{* $Id: index.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/layout/admin/default/templates/main_body.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/main_body.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2013-02-18 16:27:24 +0900 (Mon, 18 Feb 2013) $
-	= $LastChangedRevision: 4382 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2005/06/23
@@ -145,5 +138,3 @@
 
 </body>
 </html>
-
-{* $Id: main_body.tpl 4382 2013-02-18 07:27:24Z gullevek $ *}

www/layout/admin/default/templates/main_content.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/main_content.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2007/10/18
@@ -118,5 +111,3 @@ var show_sort = {$show_sort};
 		</form>
 	</div>
 </div>
-
-{* $Id: main_content.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/layout/admin/default/templates/main_content_blank.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/main_content_blank.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2007/10/18
@@ -47,5 +40,3 @@ var show_sort = {if $show_sort}{$show_sort}{else}0{/if};
 	<input type="hidden" name="action_loaded" value="true">
 	</form>
 </div>
-
-{* $Id: main_content_blank.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/layout/admin/default/templates/main_content_index.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/main_content_index.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2007/10/18
@@ -24,5 +17,3 @@ var show_sort = {if $show_sort}{$show_sort}{else}0{/if};
 </script>
 
 {include file=$CONTENT_INCLUDE}
-
-{* $Id: main_content_index.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/layout/admin/default/templates/main_content_special.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/admin/default/templates/main_content_special.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2008/04/11
@@ -96,5 +89,3 @@ var load_id = {if $primary_key}{$primary_key}{else}0{/if};
 		</form>
 	</div>
 </div>
-
-{* $Id: main_content_special.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/layout/frontend/default/javascript/frontend.js

@@ -1,14 +1,8 @@
 /*
- * $HeadURL: svn://svn/development/core_data/php/www/layout/frontend/default/javascript/frontend.js $
- * $LastChangedBy: gullevek $
- * $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
- * $LastChangedRevision: 3159 $
- *
  * AUTHOR: Clemens Schwaighofer
  * DATE: 2008/12/29
  * DESC: Javascript functions for the Catalogue frontend
- *
+*/
- */
 
 // METHOD: SwitchImage
 // PARAMS: front/back -> what image to show
@@ -30,5 +24,3 @@ function OutputSwitchImage(data)
 {
 
 }
-
-/* $Id: frontend.js 3159 2010-09-02 02:58:10Z gullevek $ */

www/layout/frontend/default/templates/main_body.tpl

@@ -1,11 +1,4 @@
 {*
-	= SUBVERSION DATA ===================================================
-	= $HeadURL: svn://svn/development/core_data/php/www/layout/frontend/default/templates/main_body.tpl $
-	= $LastChangedBy: gullevek $
-	= $LastChangedDate: 2010-09-02 11:58:10 +0900 (Thu, 02 Sep 2010) $
-	= $LastChangedRevision: 3159 $
-	= SUBVERSION DATA ===================================================
-
 	********************************************************************
 	* AUTHOR: Clemens Schwaighofer
 	* DATE: 2008/12/24
@@ -55,5 +48,3 @@
 
 </body>
 </html>
-
-{* $Id: main_body.tpl 3159 2010-09-02 02:58:10Z gullevek $ *}

www/libs/Class.Admin.Backend.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.Admin.Backend.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-12-12 13:31:02 +0900 (Thu, 12 Dec 2013) $
-	* $LastChangedRevision: 4739 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2006/08/15
 	* VERSION: 0.1.0
@@ -83,9 +78,7 @@
 			$this->class_info["adbBackend"] = array(
 				"class_name" => "Admin Interface Backend",
 				"class_version" => "0.1.0",
-				"class_revision" => '$LastChangedRevision: 4739 $',
 				"class_created" => "2006/08/15",
-				"class_last_changed" => '$LastChangedDate: 2013-12-12 13:31:02 +0900 (Thu, 12 Dec 2013) $',
 				"class_author" => "cs/gullevek/jp"
 			);
 
@@ -340,6 +333,4 @@
 		}
 
 	}
-
-	// $Id: Class.Admin.Backend.inc 4739 2013-12-12 04:31:02Z gullevek $
 ?>

www/libs/Class.Basic.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.Basic.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-07 11:51:59 +0900 (Tue, 07 Jan 2014) $
-	* $LastChangedRevision: 4793 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/03/24
 	* VERSION: 0.9.0
@@ -175,9 +170,7 @@
 			$this->class_info["basic"] = array (
 				"class_name" => "Basic",
 				"class_version" => "0.9.0",
-				"class_revision" => '$LastChangedRevision: 4793 $',
 				"class_created" => "2003-03-24",
-				"class_last_changed" => '$LastChangedDate: 2014-01-07 11:51:59 +0900 (Tue, 07 Jan 2014) $',
 				"class_author" => 'Clemens "Gullevek" Schwaighofer (.at)'
 			); 
 
@@ -723,16 +716,31 @@
 			// _5: (_3) parameters of url or tld part of email
 			// _7: link name/email link name
 			// _9: style sheet class
-			$output = preg_replace("/(href=\")?(\>)?\b($protRegex)([\w\.\-?&=+%#~,;\/]+)\b([\.\-?&=+%#~,;\/]*)(\|([^\||^#]+)(#([^\|]+))?\|)?/e", "\$this->create_url('\\1', '\\2', '\\3', '\\4', '\\5', $target, '\\7', '\\9')", $output);
+			$self = $this;
+//			$this->debug('URL', 'Before: '.$output);
+			$output = preg_replace_callback("/(href=\")?(\>)?\b($protRegex)([\w\.\-?&=+%#~,;\/]+)\b([\.\-?&=+%#~,;\/]*)(\|([^\||^#]+)(#([^\|]+))?\|)?/", 
+				function ($matches) use ($self)
+				{
+					return $self->create_url($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
+				},
+				$output
+			);
 			// find email-addresses, but not mailto prefix ones
-			$output = preg_replace("/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/e", "\$this->create_email('\\1', '\\2', '\\3', '\\4', '\\5', '\\7', '\\9')", $output);
+			$output = preg_replace_callback("/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/", 
+				function ($matches) use ($self)
+				{
+					return $self->create_email($matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[7], $matches[9]);
+				}, 
+				$output
+			);
 
-//			$this->debug('URL', "$output");
+			$this->debug('URL', 'After: '.$output);
 //			// we have one slashes after the Protocol -> internal link no domain, strip out the proto
 //			$output = preg_replace("/($protRegex)\/(.*)/e", "\\2", $ouput); 
 //			$this->debug('URL', "$output");
 
 			// post processing
+			$output = str_replace ("{TARGET}", $target, $output);
 			$output = str_replace ("##LT##", "<", $output);
 			$output = str_replace ("##GT##", ">", $output);
 			$output = str_replace ("##QUOT##", "\"", $output);
@@ -749,15 +757,19 @@
 		// DESCRIPTION
 		// internal function, called by the magic url create functions.
 		// checks if title $_4 exists, if not, set url as title
-		private function create_url($href, $atag, $_1, $_2, $_3, $target, $name, $class)
+		private function create_url($href, $atag, $_1, $_2, $_3, $name, $class)
 		{
-//echo "DEBUG: 1: $_1 - 2: $_2 - $_3 - atag: $atag - target: $target - name: $name - class: $class<br>";
+//			$this->debug('URL', "1: $_1 - 2: $_2 - $_3 - atag: $atag - name: $name - class: $class");
 			// if $_1 ends with //, then we strip $_1 complete & target is also blanked (its an internal link)
 			if (preg_match("/\/\/$/", $_1) && preg_match("/^\//", $_2))
 			{
 				$_1 = '';
 				$target  = '';
 			}
+			else
+			{
+				$target = '{TARGET}';
+			}
 			// if it is a link already just return the original link do not touch anything
 			if (!$href && !$atag)
 				return "##LT##a href=##QUOT##".$_1.$_2.$_3."##QUOT##".(($class) ? ' class=##QUOT##'.$class.'##QUOT##' : '').(($target) ? " target=##QUOT##".$target."##QUOT##" : '')."##GT##".(($name) ? $name : $_2.$_3)."##LT##/a##GT##";
@@ -1318,6 +1330,16 @@
 			return $string;
 		}
 
+		// METHOD: _sha1_short
+		// PARAMS: string
+		// RETURN: sha1 short (9 chars), but current calls _crc32b
+		// DESC  : replacement for _crc32b call
+		public function _sha1_short($string)
+		{
+//			return substr(hash('sha1', $string), 0, 9);
+			return $this->_crc32b($string);
+		}
+
 		// METHOD: checkPHPVersion
 		// PARAMS: $min_version: minimum version. in format x, x.y or x.y.z
 		//         $max_version: default empty, else in same format as min version
@@ -1827,6 +1849,4 @@
 			return $_SESSION[$name] === $token;
 		}
 	}
-
-	// $Id: Class.Basic.inc 4793 2014-01-07 02:51:59Z gullevek $
 ?>

www/libs/Class.DB.Array.IO.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.DB.Array.IO.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-03-13 13:27:49 +0900 (Wed, 13 Mar 2013) $
-	* $LastChangedRevision: 4429 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2002/12/17
 	* VERSION: 0.4.0
@@ -86,9 +81,7 @@
 			$this->class_info["db_array_io"] = array(
 				"class_name" => "DB Array IO",
 				"class_version" => "0.4.0",
-				"class_revision" => '$LastChangedRevision: 4429 $',
 				"class_created" => "2002/12/17",
-				"class_last_changed" => '$LastChangedDate: 2013-03-13 13:27:49 +0900 (Wed, 13 Mar 2013) $',
 				"class_author" => "cs/gullevek/at"
 			);
 		}
@@ -510,6 +503,4 @@ $this->debug('write_check', "[$spalte][".$this->table_array[$spalte]["value"]."]
 			return $this->table_array;
 		}                                           
 	} // end of class
-	
-	// $Id: Class.DB.Array.IO.inc 4429 2013-03-13 04:27:49Z gullevek $
 ?>

www/libs/Class.DB.IO.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.DB.IO.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-20 12:27:10 +0900 (Mon, 20 Jan 2014) $
-	* $LastChangedRevision: 4831 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2000/11/23
 	* VERSION: 4.1.0
@@ -369,9 +364,7 @@
 			$this->class_info['db_io']=array(
 				'class_name' => 'DB IO',
 				'class_version' => '4.1.0',
-				'class_revision' => '$LastChangedRevision: 4831 $',
 				'class_created' => '2000-11-23',
-				'class_last_changed' => '$LastChangedDate: 2014-01-20 12:27:10 +0900 (Mon, 20 Jan 2014) $',
 				'class_author' => 'Clemens Schwaighofer'
 			);
 		}
@@ -1666,6 +1659,4 @@ $this->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[
 			return $value;
 		}
 	} // end if db class
-
-	// $Id: Class.DB.IO.inc 4831 2014-01-20 03:27:10Z gullevek $
 ?>

www/libs/Class.Form.Generate.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.Form.Generate.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-09-10 11:08:58 +0900 (Tue, 10 Sep 2013) $
-	* $LastChangedRevision: 4634 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2002/10/22
 	* VERSION: 2.4.9
@@ -228,6 +223,7 @@
 		public $error; // the error flag set for printing red error msg
 		public $warning; // warning flag, for information (saved, loaded, etc)
 		public $archive_pk_name; // the pk name for the load select form
+		private $int_pk_name; // primary key, only internal usage
 		public $reference_array = array (); // reference arrays -> stored in $this->reference_array[$table_name]=>array();
 		public $element_list; // element list for elements next to each other as a special sub group
 		public $my_page_name; // the name of the page without .php extension
@@ -272,6 +268,7 @@
 			$this->load_query = $config_array["load_query"];
 			$this->archive_pk_name = "a_".$this->pk_name;
 			$this->col_name = str_replace("_id", "", $this->pk_name);
+			$this->int_pk_name = $this->pk_name;
 			// check if reference_arrays are given and proceed them
 			if (is_array($config_array["reference_arrays"]))
 			{
@@ -314,8 +311,6 @@
 				"class_name" => "Form create",
 				"class_version" => "2.4.9",
 				"class_created" => "2002-10-22",
-				"class_revision" => '$LastChangedRevision: 4634 $',
-				"class_last_changed" => '$LastChangedDate: 2013-09-10 11:08:58 +0900 (Tue, 10 Sep 2013) $',
 				"class_author" => "cs/gullevek/at"
 			);
 		}
@@ -594,10 +589,10 @@
 				$this->db_exec($this->load_query);
 				while ($res = $this->db_fetch_array())
 				{
-					$pk_ids[] = $res[$this->pk_name];
+					$pk_ids[] = $res[$this->int_pk_name];
-					if ($res[$this->pk_name] == $this->table_array[$this->pk_name]["value"])
+					if ($res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]["value"])
 					{ 
-						$pk_selected = $res[$this->pk_name];
+						$pk_selected = $res[$this->int_pk_name];
 					}
 					unset($t_string);
 					for ($i = 0; $i < count($this->field_array); $i ++)
@@ -652,7 +647,7 @@
 				if ($this->group_level_user <= $this->security_level["save"])
 				{
 					$seclevel_okay = 1;
-					if (!$this->table_array[$this->pk_name]["value"]) 
+					if (!$this->table_array[$this->int_pk_name]["value"]) 
 					{ 
 						$save = $this->l->__("Save");
 					}
@@ -663,12 +658,12 @@
 					// print the old_school hidden if requestet
 					if ($old_school_hidden)
 					{
-						$pk_name = $this->pk_name;
+						$pk_name = $this->int_pk_name;
-						$pk_value = $this->table_array[$this->pk_name]["value"];
+						$pk_value = $this->table_array[$this->int_pk_name]["value"];
 					}
 				} // show save part
 				// show delete part only if pk is set && we want to see the delete
-				if ($this->table_array[$this->pk_name]["value"] && !$hide_delete && $this->group_level_user <= $this->security_level["delete"])
+				if ($this->table_array[$this->int_pk_name]["value"] && !$hide_delete && $this->group_level_user <= $this->security_level["delete"])
 				{
 					$show_delete = 1;
 				}
@@ -899,8 +894,8 @@
 							// check unique, check if field in table is not yet exist
 							case "unique":
 								$q = "SELECT ".$key." FROM ".$this->table_name." WHERE ".$key." = '".addslashes($this->table_array[$key]["value"])."'";
-								if ($this->table_array[$this->pk_name]["value"])
+								if ($this->table_array[$this->int_pk_name]["value"])
-									$q .= " AND ".$this->pk_name." <> ".$this->table_array[$this->pk_name]["value"];
+									$q .= " AND ".$this->int_pk_name." <> ".$this->table_array[$this->int_pk_name]["value"];
 								list($$key) = $this->db_return_row($q);
 								if ($$key)
 									$this->msg .= sprintf($this->l->__("The field <b>%s</b> can be used only once!<br>"), $this->table_array[$key]["output_name"]);
@@ -1078,9 +1073,9 @@
 					if (!$this->table_array[$order_name]["value"])
 						$this->table_array[$order_name]["value"] = 1;
 				}
-				else if ($this->table_array[$this->pk_name]["value"])
+				else if ($this->table_array[$this->int_pk_name]["value"])
 				{
-					$q = "SELECT $order_name FROM ".$this->table_name." WHERE ".$this->pk_name." = ".$this->table_array[$this->pk_name]["value"];
+					$q = "SELECT $order_name FROM ".$this->table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
 					list($this->table_array[$order_name]["value"]) = $this->db_return_row($q);
 				}
 			}
@@ -1137,7 +1132,7 @@
 				while (list($key, $value) = each($this->reference_array))
 				{
 					unset($this->reference_array[$key]["selected"]);
-					$q = "SELECT ".$this->reference_array[$key]["other_table_pk"]." FROM ".$this->reference_array[$key]["table_name"]." WHERE ".$this->pk_name."=".$this->table_array[$this->pk_name]["value"];
+					$q = "SELECT ".$this->reference_array[$key]["other_table_pk"]." FROM ".$this->reference_array[$key]["table_name"]." WHERE ".$this->int_pk_name."=".$this->table_array[$this->int_pk_name]["value"];
 					while ($res = $this->db_return($q))
 						$this->reference_array[$key]["selected"][] = $res[$this->reference_array[$key]["other_table_pk"]];
 				}
@@ -1283,12 +1278,12 @@
 				reset($this->reference_array);
 				foreach ($this->reference_array AS $reference_array)
 				{
-					$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->pk_name."=".$this->table_array[$this->pk_name]["value"];
+					$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name."=".$this->table_array[$this->int_pk_name]["value"];
 					$this->db_exec($q);
-					$q = "INSERT INTO ".$reference_array["table_name"]." (".$reference_array["other_table_pk"].", ".$this->pk_name.") VALUES ";
+					$q = "INSERT INTO ".$reference_array["table_name"]." (".$reference_array["other_table_pk"].", ".$this->int_pk_name.") VALUES ";
 					for ($i = 0; $i < count($reference_array["selected"]); $i ++)
 					{
-						$t_q = "(".$reference_array["selected"][$i].", ".$this->table_array[$this->pk_name]["value"].")";
+						$t_q = "(".$reference_array["selected"][$i].", ".$this->table_array[$this->int_pk_name]["value"].")";
 						$this->db_exec($q.$t_q);
 					}
 				} // foreach reference arrays
@@ -1346,7 +1341,7 @@
 							}
 							// write all data (insert/update) because I don't know until all are processed if it is insert or update
 							// don't write primary key backup for update
-//$this->debug('edit_error', "I: $i | EL Name: $prfx$el_name | Data: ".$_POST[$prfx.$el_name][$i]." {".$_POST[$prfx.$el_name]."} | Type: ".$type[$i]." | PK: ".$data_array["pk_id"]." ");
+$this->debug('edit_error', "I: $i | EL Name: $prfx$el_name | Data: ".$_POST[$prfx.$el_name][$i]." {".$_POST[$prfx.$el_name]."} | Type: ".$type[$i]." | PK: ".$data_array["pk_id"]." ");
 							if (!$data_array["pk_id"])
 							{
 								// update
@@ -1397,7 +1392,7 @@
 							}
 							else
 							{
-								$q = $q_begin[$i].$q_names[$i].", ".$this->pk_name.$q_middle[$i].$q_values[$i].", ".$this->table_array[$this->pk_name]["value"].$q_end[$i];
+								$q = $q_begin[$i].$q_names[$i].", ".$this->int_pk_name.$q_middle[$i].$q_values[$i].", ".$this->table_array[$this->int_pk_name]["value"].$q_end[$i];
 							}
 //$this->debug('edit', "Q: ".$q."<br>");
 							// write the dataset
@@ -1422,7 +1417,7 @@
 				reset($this->reference_array);
 				foreach ($this->reference_array AS $reference_array)
 				{
-					$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->pk_name." = ".$this->table_array[$this->pk_name]["value"];
+					$q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
 					$this->db_exec($q);
 				}
 			}
@@ -1432,7 +1427,7 @@
 				reset($this->element_list);
 				while (list($table_name, $data_array) = each($this->element_list))
 				{
-					$q = "DELETE FROM ".$table_name." WHERE ".$this->pk_name." = ".$this->table_array[$this->pk_name]["value"];
+					$q = "DELETE FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
 					$this->db_exec($q);
 				}
 			}
@@ -1562,18 +1557,18 @@
 				$data['type'][$data["prefix"].$this->element_list[$table_name]["read_data"]["name"]] = 'string';	
 				// build the read query
 				$q = "SELECT ";
-//				if (!$this->table_array[$this->pk_name]["value"])
+//				if (!$this->table_array[$this->int_pk_name]["value"])
 //					$q .= "DISTINCT ";
 				// prefix join key with table name
 				$q .= str_replace($this->element_list[$table_name]["read_data"]["pk_id"], $this->element_list[$table_name]["read_data"]["table_name"].".".$this->element_list[$table_name]["read_data"]["pk_id"], implode(", ", $q_select))." ";
-//				if (!$this->table_array[$this->pk_name]["value"] && $this->element_list[$table_name]["read_data"]["order"])
+//				if (!$this->table_array[$this->int_pk_name]["value"] && $this->element_list[$table_name]["read_data"]["order"])
 //					$q .= ", ".$this->element_list[$table_name]["read_data"]["order"]." ";
 				$q .= "FROM ".$this->element_list[$table_name]["read_data"]["table_name"]." ";
 				$q .= "LEFT JOIN ".$table_name." ";
 				$q .= "ON (";
 				$q .= $this->element_list[$table_name]["read_data"]["table_name"].".".$this->element_list[$table_name]["read_data"]["pk_id"]." = ".$table_name.".".$this->element_list[$table_name]["read_data"]["pk_id"]." ";
-//				if ($this->table_array[$this->pk_name]["value"])
+//				if ($this->table_array[$this->int_pk_name]["value"])
-				$q .= "AND ".$this->pk_name." = ".(($this->table_array[$this->pk_name]["value"]) ? $this->table_array[$this->pk_name]["value"] : 'NULL')." ";
+				$q .= "AND ".$this->int_pk_name." = ".(($this->table_array[$this->int_pk_name]["value"]) ? $this->table_array[$this->int_pk_name]["value"] : 'NULL')." ";
 				$q .= ") ";
 				if ($this->element_list[$table_name]["read_data"]["order"])
 					$q .= " ORDER BY ".$this->element_list[$table_name]["read_data"]["order"];
@@ -1581,8 +1576,8 @@
 			else
 			{
 				// only create query if we have a primary key
-				if ($this->table_array[$this->pk_name]["value"])
+				if ($this->table_array[$this->int_pk_name]["value"])
-					$q = "SELECT ".implode(", ", $q_select)." FROM ".$table_name." WHERE ".$this->pk_name." = ".$this->table_array[$this->pk_name]["value"];
+					$q = "SELECT ".implode(", ", $q_select)." FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"];
 			}
 			// only run if we have query strnig
 			if ($q)
@@ -1629,6 +1624,4 @@
 			return array('output_name' => $output_name, 'type' => $type, 'color' => 'edit_fgcolor', 'data' => $data);
 		}
 	} // end of class
-
-	// $Id: Class.Form.Generate.inc 4634 2013-09-10 02:08:58Z gullevek $
 ?>

www/libs/Class.Login.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.Login.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-29 11:36:52 +0900 (Wed, 29 Jan 2014) $
-	* $LastChangedRevision: 4849 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2000/06/01
 	* VERSION: 4.0.0
@@ -172,8 +167,6 @@
 			$this->class_info["login"] = array(
 				"class_name" => "Login",
 				"class_version" => "4.0.0",
-				"class_revision" => '$LastChangedRevision: 4849 $',
-				"class_last_changed" => '$LastChangedDate: 2014-01-29 11:36:52 +0900 (Wed, 29 Jan 2014) $',
 				"class_created" => "2000-06-01",
 				"class_author" => "cs/gullevek/at"
 			);
@@ -976,6 +969,4 @@ EOM;
 		}
 
 	} // close class
-
-	// $Id: Class.Login.inc 4849 2014-01-29 02:36:52Z gullevek $
 ?>

www/libs/Class.Smarty.Extend.inc

@@ -1,10 +1,5 @@
 <?
 	/********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.Smarty.Extend.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-02-21 17:58:57 +0900 (Thu, 21 Feb 2013) $
-	* $LastChangedRevision: 4389 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2004/12/21
 	* SHORT DESCRIPTION:
@@ -32,6 +27,4 @@
 		}
 
 	}
-
-	// $Id: Class.Smarty.Extend.inc 4389 2013-02-21 08:58:57Z gullevek $
 ?>

www/libs/Class.l10n.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/Class.l10n.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-09-12 11:22:11 +0900 (Thu, 12 Sep 2013) $
-	* $LastChangedRevision: 4640 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2004/11/18
 	* VERSION: 0.1.1
@@ -110,5 +105,4 @@
 	}
 
 //require(LIBS.'locale.php');
-	// $Id: Class.l10n.inc 4640 2013-09-12 02:22:11Z gullevek $
 ?>

www/libs/Error.Handling.inc

@@ -1,10 +1,5 @@
 <?
     /*********************************************************************
-    * $HeadURL: svn://svn/development/core_data/php/www/libs/Error.Handling.inc $
-    * $LastChangedBy: gullevek $
-    * $LastChangedDate: 2013-10-10 17:14:05 +0900 (Thu, 10 Oct 2013) $
-    * $LastChangedRevision: 4684 $
-    *********************************************************************
     * AUTHOR: Clemens Schwaighofer
     * CREATED: 2011/2/8
 	* DESCRIPTION: pre function to collect all non critical errors into a log file if possible
@@ -105,6 +100,4 @@
 
 	// init the error handler
 	set_error_handler("MyErrorHandler");
-
-	/* $Id: Error.Handling.inc 4684 2013-10-10 08:14:05Z gullevek $ */
 ?>

www/libs/FileUploader.inc

@@ -1,7 +1,5 @@
 <?php
 
-// $Id: FileUploader.inc 4019 2012-06-13 03:16:34Z gullevek $
-
 /**
  * Handle file uploads via XMLHttpRequest
  */

www/libs/TRAIT_db_pgsql.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/db_pgsql.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2013-02-06 10:26:17 +0900 (Wed, 06 Feb 2013) $
-	* $LastChangedRevision: 4360 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/04/09 
 	* SHORT DESCRIPTION:
@@ -271,6 +266,4 @@
 			return $output;
 		}
 	}
-
-	// $Id: db_pgsql.inc 4360 2013-02-06 01:26:17Z gullevek $
 ?>

www/libs/db_pgsql.inc

@@ -1,10 +1,5 @@
 <?
 	/*********************************************************************
-	* $HeadURL: svn://svn/development/core_data/php/www/libs/db_pgsql.inc $
-	* $LastChangedBy: gullevek $
-	* $LastChangedDate: 2014-01-23 12:57:54 +0900 (Thu, 23 Jan 2014) $
-	* $LastChangedRevision: 4836 $
-	*********************************************************************
 	* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 	* CREATED: 2003/04/09 
 	* SHORT DESCRIPTION:
@@ -387,6 +382,4 @@
 			return $output;
 		}
 	}
-
-	// $Id: db_pgsql.inc 4836 2014-01-23 03:57:54Z gullevek $
 ?>