new release

Author: ifsale

CHANGELOG

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 ##########################################################
 
@@ -388,3 +389,55 @@ VERSION 0.9.3b IS FULLY COMPATIBLE WITH VERSION 0.9.2
 	-	added $_SESSION['debugStarted'] to check  if debugLoader() has already been called
 	- 	readded the __constructor to call $this->debugLoader()
 
+=======
+
+##########################################################
+
+PhpToolCase Version 0.7 open source project
+
+A powerfull set of tools to speed up the process of coding
+
+##########################################################
+
+
+
+== CHANGELOG ===================================
+
+
+- Version 0.7
+
+	PtcDb.php:
+	
+	-	removed xmlBuilder() method as it does not belong to the mysql class
+	
+	PtcDebug.php:
+	
+	-	added code to parse $_GET from referer, to be able to debug from ajax calls
+	
+	-	changed the debugLoader function and made all the vars empty as default
+	
+	-	renamed startDebug to debugLoader and the function to callDebug aswell
+	
+
+- Version 0.6
+
+	PtcDb.php:
+	
+	-	added static method selfInstance() to autoinitialize the class
+		
+	PtcDebug.php:
+
+	-	removed the __cunstructor and changed it for a self initialized instance "startDebug()"
+	
+	-	changed the debugLoader function and made all the vars to be passed empty as default
+	
+	-	renamed startDebug to debugLoader and the function to callDebug
+	
+	-	added $_SESSION['debugStarted'] to check  if debugLoader() has already been called
+	
+	- 	readded the __constructor to call $this->debugLoader()
+
+
+
+
+>>>>>>> master

examples/README

@@ -4,6 +4,7 @@ EXAMPLE FILES FOR ALL LIBRARY COMPONENTS:
 
 - ptcdebug-ex.php			debugger & logger examples file
 - ptcdb-ex.php				mysql query helper examples file
+<<<<<<< HEAD
 - ptchm-ex.php				handyman example file
 - ptcevent-ex.php			event dispacher component example file
 - ptcmapper-ex.php			ptcmapper object relational mapping example file
@@ -14,3 +15,5 @@ EXAMPLE FILES FOR ALL LIBRARY COMPONENTS:
 - form-example-files			examples folder for the dynamic forms component
 - router-example-files		examples folder for the router component
 - view-example-files			examples folder for the view component
+=======
+>>>>>>> master

examples/ptcdebug-ex.php

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 
 	/* 
@@ -15,6 +16,18 @@
 	require_once( '../PtcDebug.php' );	// include the PtcDebug class
 
 	$options = array				// add some options before class initialization
+=======
+<?
+	//session_start();				# start session for persistent debugging
+	
+	$_GET['debug']=true;       		# turn on the debug
+	
+	//$_GET['debugOff']=true;    		# turn off debug
+	
+	require_once('../PtcDebug.php');	# include the PtcDebug class
+	
+	$options=array
+>>>>>>> master
 	(
 		'url_key'			=>	'debug' ,
 		'url_pass'			=>	'true' ,
@@ -95,6 +108,7 @@ function some_func( ){ fopen( ); }
 	PtcDebug::stopCoverage( );	// we could start it again later, if stopCoverage( ) is not used it will be stopped at shutdown
 
 
+<<<<<<< HEAD
 	/* STOT TRACING FUNCTION CALLS */
 	PtcDebug::stopTrace( );		// we could start it again later, if stopTrace( ) is not used it will be stopped at shutdown
 
@@ -108,6 +122,12 @@ function some_func( ){ fopen( ); }
 	/* CATCHING AN EXCEPTION */
 	throw new Exception( 'Uncaught Exception' );
 
+=======
+	function ddas()
+	{
+		fopen();
+	}
+>>>>>>> master
 
 	//session_destroy();