Context Navigation

← Previous Change
Next Change →

Base

Timestamp:

Aug 15, 2013, 11:17:26 PM (11 years ago)

Author:

chronos

Message:

Fixed: System variable as parameter to constructors of descendents of Module class.
Removed: End PHP mark "?>" from all files.

Location:

trunk/www/Base

Files:

: 33 edited

Controller.php (modified) (1 diff)
Database.php (modified) (1 diff)
Error.php (modified) (1 diff)
Form.php (modified) (7 diffs)
Global.php (modified) (1 diff)
Html.php (modified) (1 diff)
Mail.php (modified) (3 diffs)
Model.php (modified) (1 diff)
Module.php (modified) (1 diff)
System.php (modified) (1 diff)
Table.php (modified) (2 diffs)
Types/Base.php (modified) (1 diff)
Types/Boolean.php (modified) (1 diff)
Types/Date.php (modified) (1 diff)
Types/DateTime.php (modified) (1 diff)
Types/Enumeration.php (modified) (1 diff)
Types/File/File.php (modified) (1 diff)
Types/File/FileDownload.php (modified) (1 diff)
Types/Float.php (modified) (1 diff)
Types/GPS.php (modified) (1 diff)
Types/Hidden.php (modified) (1 diff)
Types/Hyperlink.php (modified) (1 diff)
Types/IPv4Address.php (modified) (1 diff)
Types/Integer.php (modified) (1 diff)
Types/Password.php (modified) (1 diff)
Types/PointerOneToMany.php (modified) (1 diff)
Types/PointerOneToOne.php (modified) (1 diff)
Types/String.php (modified) (1 diff)
Types/Text.php (modified) (1 diff)
Types/Time.php (modified) (1 diff)
Types/Type.php (modified) (2 diffs)
UTF8.php (modified) (1 diff)
View.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/www/Base/Controller.php

r78	r93
17	17	}
18	18	}
19
20		?>

trunk/www/Base/Database.php

r92	r93
107	107	}
108	108	}
109
110		?>

trunk/www/Base/Error.php

r69	r93
73	73
74	74	set_error_handler('CustomErrorHandler');
75
76		?>

trunk/www/Base/Form.php

r78	r93
13	13	function __construct($System, $FormClass)
14	14	{
	15	parent::__construct($System);
15	16	$this->Definition = $FormClass;
16	17	foreach($this->Definition['Items'] as $Index => $Item)
…	…
18	19	$this->Values[$Index] = '';
19	20	}
20		~~$this->System = $System;~~
21		~~$this->Database = $System->Database;~~
22		~~$this->Config = $System->Config;~~
23	21	}
24	22
…	…
43	41	{
44	42	if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default'];
45		$Edit = ExecuteTypeEvent($Item['Type'], 'OnView',
	43	$Edit = ExecuteTypeEvent($this->System, $Item['Type'], 'OnView',
46	44	array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
47	45	array_push($Table['Rows'], array($Item['Caption'], $Edit));
…	…
74	72	{
75	73	if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default'];
76		$Edit = ExecuteTypeEvent($Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
	74	$Edit = ExecuteTypeEvent($this->System, $Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
77	75	array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
78	76	}
…	…
82	80	'</fieldset>';
83	81	foreach($this->Definition['Items'] as $Index => $Item)
84		if($Item['Type'] == 'Hidden') $Output .= ExecuteTypeEvent($Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
	82	if($Item['Type'] == 'Hidden') $Output .= ExecuteTypeEvent($this->System, $Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
85	83	return($Output);
86	84	}
…	…
123	121	{
124	122	if(array_key_exists($Context.$Index, $_POST))
125		$Values[$Index] = ExecuteTypeEvent($Item['Type'], 'OnLoad',
	123	$Values[$Index] = ExecuteTypeEvent($this->System, $Item['Type'], 'OnLoad',
126	124	array('Name' => $Index, 'Type' => $Item['Type']));
127	125	}
…	…
129	127	}
130	128	}
131
132		?>

trunk/www/Base/Global.php

r78	r93
84	84	return($out);
85	85	}
86
87		?>

trunk/www/Base/Html.php

r71	r93
125	125	}
126	126	}
127
128		?>

trunk/www/Base/Mail.php

r78	r93
17	17	$this->AdditionalHeaders['MIME-Version'] = '1.0';
18	18	$this->AdditionalHeaders['Content-type'] = 'text/html; charset=UTF-8';
	19	$Headers = '';
19	20	foreach($this->AdditionalHeaders as $Index => $Item)
20	21	{
…	…
22	23	}
23	24	$Subject = $this->EncodeBase64($this->Subject);
24		return(mail($this->Address, $Subject, $this->Content, $Headers));
	25	return(mail($this->RecipientAddress, $Subject, $this->Content, $Headers));
25	26	}
26	27
…	…
30	31	}
31	32	}
32
33		?>

trunk/www/Base/Model.php

r78	r93
6	6	{
7	7	}
8
9		?>

trunk/www/Base/Module.php

r78	r93
14	14	}
15	15	}
16
17		?>

trunk/www/Base/System.php

r92	r93
228	228	}
229	229	}
230
231		?>

trunk/www/Base/Table.php

r92	r93
97	97	foreach($this->Definition['Items'] as $Index => $Item)
98	98	{
99		$DbRow[$Index] = ExecuteTypeEvent($Item['Type'], 'OnView',
	99	$DbRow[$Index] = ExecuteTypeEvent($this->System, $Item['Type'], 'OnView',
100	100	array('Name' => $Index, 'Value' => $DbRow[$Index], 'Type' => $Item['Type']));
101	101	$Row[$Index] = $DbRow[$Index];
…	…
105	105	}
106	106	}
107
108		?>

trunk/www/Base/Types/Base.php

r78	r93
27	27	}
28	28	}
29
30		?>

trunk/www/Base/Types/Boolean.php

r69	r93
23	23	}
24	24	}
25
26		?>

trunk/www/Base/Types/Date.php

r69	r93
58	58	}
59	59	}
60
61		?>

trunk/www/Base/Types/DateTime.php

r69	r93
90	90	}
91	91	}
92
93		?>

trunk/www/Base/Types/Enumeration.php

r69	r93
28	28	}
29	29	}
30
31		?>

trunk/www/Base/Types/File/File.php

r69	r93
43	43	}
44	44	}
45
46		?>

trunk/www/Base/Types/File/FileDownload.php

r69	r93
20	20	echo(file_get_contents($Config['UploadFileFolder'].'/'.$DbRow['Id']));
21	21	} else echo('Soubor nenalezen!');
22
23		?>

trunk/www/Base/Types/Float.php

r69	r93
22	22	}
23	23	}
24
25		?>

trunk/www/Base/Types/GPS.php

r69	r93
68	68	}
69	69	}
70
71		?>

trunk/www/Base/Types/Hidden.php

r69	r93
20	20	}
21	21	}
22
23		?>

trunk/www/Base/Types/Hyperlink.php

r69	r93
20	20	}
21	21	}
22
23		?>

trunk/www/Base/Types/IPv4Address.php

r69	r93
20	20	}
21	21	}
22
23		?>

trunk/www/Base/Types/Integer.php

r69	r93
22	22	}
23	23	}
24
25		?>

trunk/www/Base/Types/Password.php

r69	r93
40	40	}
41	41	}
42
43		?>

trunk/www/Base/Types/PointerOneToMany.php

r69	r93
20	20	}
21	21	}
22
23		?>

trunk/www/Base/Types/PointerOneToOne.php

r71	r93
45	45	}
46	46	}
47
48		?>

trunk/www/Base/Types/String.php

r69	r93
27	27	}
28	28	}
29
30		?>

trunk/www/Base/Types/Text.php

r69	r93
27	27	}
28	28	}
29
30		?>

trunk/www/Base/Types/Time.php

r69	r93
54	54	}
55	55	}
56
57		?>

trunk/www/Base/Types/Type.php

-              r78
+              r93
 );
 function ExecuteTypeEvent($TypeName, $Event, $Parameters = array())
+function ExecuteTypeEvent($System, $TypeName, $Event, $Parameters = array())
+{
   global $TypeDefinitionList, $System;
+  global $TypeDefinitionList;
   if(array_key_exists($TypeName, $TypeDefinitionList))
 …
   return($TypeDefinitionList[$TypeName]);
+}
-?>

trunk/www/Base/UTF8.php

r75	r93
563	563	return($Result);
564	564	}
565
566		?>

trunk/www/Base/View.php

r78	r93
6	6	{
7	7	}
8
9		?>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 93 for trunk/www/Base

Legend:

Download in other formats: