Mercurial > hg > fapweb
annotate msitegen.inc.php @ 861:62b3a69e9030
Add stErrorLog() and use it.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 26 Nov 2014 11:07:22 +0200 |
parents | 83ac4155efe2 |
children | ffb5643eff4f |
rev | line source |
---|---|
0 | 1 <? |
2 // | |
571
ce11ea112a65
Change the header blurb a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
569
diff
changeset
|
3 // FAPWeb - Simple Web-based Demoparty Management System |
33 | 4 // Generic and miscellaneous site support code |
565 | 5 // (C) Copyright 2012-2014 Tecnic Software productions (TNSP) |
0 | 6 // |
9
fa9b66f596bb
More work on settings storage.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
7 |
fa9b66f596bb
More work on settings storage.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
8 // Globals and definitions |
0 | 9 $errorSet = FALSE; |
210 | 10 $errorMsgs = array(); |
208
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
11 $statusSet = 0; |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
12 $statusMsg = ""; |
0 | 13 |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
14 // Value types |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
15 define("VT_STR", 1); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
16 define("VT_INT", 2); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
17 define("VT_BOOL", 3); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
18 define("VT_TEXT", 4); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
19 |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
20 // Validation check types |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
21 define("CHK_TYPE", 1); |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
22 define("CHK_ISLT", 2); |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
23 define("CHK_ISGT", 3); |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
24 define("CHK_ISEQ", 4); |
244
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
25 define("CHK_GTEQ", 5); |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
26 define("CHK_LTEQ", 6); |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
27 define("CHK_RANGE", 7); |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
28 define("CHK_CUSTOM", 8); |
810
2a23243a6cc4
Add new check type for stChkRequestItem*(), CHK_ARRAY.
Matti Hamalainen <ccr@tnsp.org>
parents:
803
diff
changeset
|
29 define("CHK_ARRAY", 9); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
30 |
94
6edd7d623eab
Start adding votekey modes code.
Matti Hamalainen <ccr@tnsp.org>
parents:
87
diff
changeset
|
31 |
173
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
32 function stDebug($msg) |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
33 { |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
34 if (stGetSetting("debug")) |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
35 error_log($msg); |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
36 } |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
37 |
fef53f6170b5
Move stDebug() to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
172
diff
changeset
|
38 |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
39 function stErrorLog($msg) |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
40 { |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
41 error_log("FAPWeb: ".$msg); |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
42 return FALSE; |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
43 } |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
44 |
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
45 |
0 | 46 function stError($msg) |
47 { | |
210 | 48 global $errorSet, $errorMsgs; |
0 | 49 $errorSet = TRUE; |
210 | 50 $errorMsgs[] = $msg; |
812
8083b39d3bde
Return FALSE from stError() functions, as a convenience.
Matti Hamalainen <ccr@tnsp.org>
parents:
811
diff
changeset
|
51 return FALSE; |
0 | 52 } |
53 | |
54 | |
208
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
55 function stSetStatus($status, $msg) |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
56 { |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
57 global $statusSet, $statusMsg; |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
58 $statusMsg = $msg; |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
59 $statusSet = $status; |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
60 } |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
61 |
8985d2bdb29b
More work on error handling etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
62 |
211
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
63 function stDumpAJAXStatusErrors() |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
64 { |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
65 global $errorSet, $errorMsgs, $statusSet, $statusMsg; |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
66 |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
67 if ($errorSet && !$statusSet) |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
68 stSetStatus(902, "Error"); |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
69 |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
70 if ($statusSet) |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
71 { |
229 | 72 header("HTTP/1.0 ".$statusSet." ".$statusMsg); |
211
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
73 header("Status: ".$statusSet." ".$statusMsg); |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
74 } |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
75 |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
76 if ($errorSet) |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
77 { |
559 | 78 echo |
79 "<h1>Following errors occured</h1>\n". | |
349
61c4dda0ec03
New message/confirmation boxes code done in JS + CSS instead of relying on
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
80 "<ul>\n"; |
559 | 81 |
211
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
82 foreach ($errorMsgs as $msg) |
349
61c4dda0ec03
New message/confirmation boxes code done in JS + CSS instead of relying on
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
83 echo " <li>".chentities($msg)."</li>\n"; |
559 | 84 |
349
61c4dda0ec03
New message/confirmation boxes code done in JS + CSS instead of relying on
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
85 echo "</ul>\n"; |
211
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
86 } |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
87 } |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
88 |
5bae42020034
Factorize some code into msitegen.
Matti Hamalainen <ccr@tnsp.org>
parents:
210
diff
changeset
|
89 |
0 | 90 function stCheckHTTPS() |
91 { | |
92 return isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] != "" && $_SERVER["HTTPS"] != "off"); | |
93 } | |
94 | |
95 | |
5
76c3b89d7b11
Improve voting, clean up the code, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
96 function stSetupCacheControl() |
76c3b89d7b11
Improve voting, clean up the code, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
97 { |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
98 header("Cache-Control: must-revalidate, no-store, private"); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
99 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past |
5
76c3b89d7b11
Improve voting, clean up the code, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
100 } |
76c3b89d7b11
Improve voting, clean up the code, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
101 |
76c3b89d7b11
Improve voting, clean up the code, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
102 |
198
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
103 function stGetSQLSettingData($item) |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
104 { |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
105 switch ($item["vtype"]) |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
106 { |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
107 case VT_INT: return intval($item["vint"]); |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
108 case VT_BOOL: return intval($item["vint"]) ? true : false; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
109 case VT_STR: return $item["vstr"]; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
110 case VT_TEXT: return $item["vtext"]; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
111 } |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
112 } |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
113 |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
114 |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
115 function stGetSettingSQL($item, $val) |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
116 { |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
117 global $db; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
118 switch ($item["vtype"]) |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
119 { |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
120 case VT_INT: return "vint=".intval($val); break; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
121 case VT_BOOL: return "vint=".($val ? "1" : "0"); break; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
122 case VT_STR: return "vstr=".$db->quote($val); break; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
123 case VT_TEXT: return "vtext=".$db->quote($val); break; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
124 default: return FALSE; |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
125 } |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
126 } |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
127 |
293 | 128 |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
129 function stReloadSettings() |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
130 { |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
131 global $siteSettings; |
198
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
132 |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
133 if (($res = stExecSQL("SELECT * FROM settings")) !== FALSE) |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
134 { |
198
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
135 foreach ($res as $item) |
96ab189e5c03
Add some new helper functions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
136 $siteSettings[$item["key"]] = stGetSQLSettingData($item); |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
137 } |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
138 else |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
139 die("Error fetching site settings."); |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
140 } |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
141 |
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
142 |
538 | 143 function stGetSetting($name, $default = FALSE) |
0 | 144 { |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
145 global $siteSettings; |
0 | 146 if (isset($siteSettings[$name])) |
147 return $siteSettings[$name]; | |
148 else | |
538 | 149 if ($default !== FALSE) |
537
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
150 return $default; |
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
151 else |
291
ce30a9083b40
Add error_log() for missing settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
246
diff
changeset
|
152 { |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
153 stErrorLog("No config value for '".$name."'"); |
8
4c5f651aa107
Migrate certain settings to SQL database, cleanups, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
154 die("No config value for '".$name."'.\n"); |
291
ce30a9083b40
Add error_log() for missing settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
246
diff
changeset
|
155 } |
0 | 156 } |
157 | |
158 | |
159 function stChkSetting($name) | |
160 { | |
161 global $siteSettings; | |
162 return isset($siteSettings[$name]) && $siteSettings[$name]; | |
163 } | |
164 | |
165 | |
166 function dhentities($str) | |
167 { | |
674 | 168 return str_replace(array("<",">"), array("<", ">"), |
169 htmlentities($str, ENT_NOQUOTES, "UTF-8")); | |
0 | 170 } |
171 | |
172 | |
173 function chentities($str) | |
174 { | |
175 return htmlentities($str, ENT_NOQUOTES, "UTF-8"); | |
176 } | |
177 | |
485 | 178 |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
179 function ihentities($str) |
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
180 { |
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
181 return htmlentities($str, ENT_QUOTES, "UTF-8"); |
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
182 } |
0 | 183 |
485 | 184 |
676 | 185 // |
186 // Helper functions for form/HTML elements | |
187 // XXX/TODO .. this name/id/prefix mess needs to be cleaned up. | |
188 // | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
189 function stGetIDName($name, $id, $prefix = "") |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
190 { |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
191 return |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
192 ($id != "" ? "id=\"".$prefix.$name.$id."\" " : ""). |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
193 ($name != "" ? "name=\"".$prefix.$name.$id."\" " : ""); |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
194 } |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
195 |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
196 |
0 | 197 function stGetFormCheckBoxInput($name, $id, $prefix, $checked, $label, $extra = "") |
198 { | |
199 return | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
200 "<input ".$extra." type=\"checkbox\" ".stGetIDName($name, $id, $prefix). |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
201 ($checked ? "checked=\"checked\" " : "")." />". |
336
49094cfbd674
Fix radio- and checkbutton labels.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
202 ($label != "" ? "<label for=\"".$prefix.$name.$id."\">".$label."</label>" : ""); |
0 | 203 } |
204 | |
205 | |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
206 function stGetFormRadioButtonInput($name, $id, $prefix, $value, $checked, $label, $extra = "") |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
207 { |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
208 return |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
209 "<input ".$extra." type=\"radio\" ".stGetIDName($name, $id, $prefix). |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
210 ($checked ? "checked=\"checked\" " : "")." value=\"".$value."\" />". |
336
49094cfbd674
Fix radio- and checkbutton labels.
Matti Hamalainen <ccr@tnsp.org>
parents:
297
diff
changeset
|
211 ($label != "" ? "<label for=\"".$prefix.$name.$id."\">".$label."</label>" : ""); |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
212 } |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
213 |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
214 |
0 | 215 function stGetFormButtonInput($name, $id, $prefix, $label, $onclick = "") |
216 { | |
217 return | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
218 "<input type=\"button\" ".stGetIDName($name, $id, $prefix). |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
219 "value=\" ".ihentities($label)." \" ". |
0 | 220 ($onclick != "" ? "onClick=\"".$onclick."\"" : "")." />"; |
221 } | |
222 | |
223 | |
680
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
224 function stGetFormButtonElement($name, $id, $prefix, $label, $onclick = "") |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
225 { |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
226 return |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
227 "<button class=\"button\" ".stGetIDName($name, $id, $prefix)." type=\"button\"". |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
228 ($onclick != "" ? " onClick=\"".$onclick."\"" : "")."> ".chentities($label)." </button>"; |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
229 } |
c9b96a7b9dc4
Add new helper function and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
676
diff
changeset
|
230 |
747
330e6d79c5dc
Change stGetFormOptionList* function APIs a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
680
diff
changeset
|
231 |
0 | 232 function stGetFormTextArea($rows, $cols, $name, $id, $prefix, $value, $extra = "") |
233 { | |
234 return | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
235 "<textarea ".$extra." ".stGetIDName($name, $id, $prefix). |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
236 "rows=\"".$rows."\" cols=\"".$cols."\">". |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
237 (isset($value) ? ihentities($value) : ""). |
0 | 238 "</textarea>"; |
239 } | |
240 | |
241 | |
242 function stGetFormTextInput($size, $len, $name, $id, $prefix, $value, $extra = "") | |
243 { | |
244 return | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
245 "<input ".$extra." type=\"text\" ".stGetIDName($name, $id, $prefix). |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
246 "size=\"".$size."\" maxlength=\"".$len."\"". |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
247 (isset($value) ? " value=\"".ihentities($value)."\"" : ""). |
0 | 248 " />"; |
249 } | |
250 | |
251 | |
246
cb34e3fafb33
Add extra parameter to stGetFormPasswordInput().
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
252 function stGetFormPasswordInput($name, $id, $prefix, $extra = "") |
0 | 253 { |
254 return | |
246
cb34e3fafb33
Add extra parameter to stGetFormPasswordInput().
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
255 "<input type=\"password\" ".stGetIDName($name, $id, $prefix)." ".$extra." />"; |
0 | 256 } |
257 | |
258 | |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
259 function stGetFormSubmitInput($name, $label, $onclick = "") |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
260 { |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
261 return |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
262 "<input type=\"submit\" name=\"".$name. |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
263 "\" value=\" ".ihentities($label)." \" ". |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
264 ($onclick != "" ? "onClick=\"".$onclick."\"" : "")." />"; |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
265 } |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
266 |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
267 |
0 | 268 function stGetFormHiddenInput($name, $value) |
269 { | |
12
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
270 return |
358534308c61
Clean up some of the html item generation code.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
271 "<input type=\"hidden\" name=\"".$name. |
297
fdcd78675d1c
Possibly fix input quotation and escaping issues.
Matti Hamalainen <ccr@tnsp.org>
parents:
293
diff
changeset
|
272 "\" value=\"".ihentities($value)."\" />"; |
0 | 273 } |
274 | |
275 | |
771
cd8a29647c09
Change the API of stGetFormStart().
Matti Hamalainen <ccr@tnsp.org>
parents:
760
diff
changeset
|
276 function stGetFormStart($name, $action = FALSE, $method = FALSE, $extra = FALSE) |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
277 { |
359
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
278 $str = |
771
cd8a29647c09
Change the API of stGetFormStart().
Matti Hamalainen <ccr@tnsp.org>
parents:
760
diff
changeset
|
279 "<form name=\"".$name."\"". |
cd8a29647c09
Change the API of stGetFormStart().
Matti Hamalainen <ccr@tnsp.org>
parents:
760
diff
changeset
|
280 ($action !== FALSE ? " action=\"".$action."\"" : ""). |
cd8a29647c09
Change the API of stGetFormStart().
Matti Hamalainen <ccr@tnsp.org>
parents:
760
diff
changeset
|
281 " method=\"".($method !== FALSE ? $method : "post")."\"". |
cd8a29647c09
Change the API of stGetFormStart().
Matti Hamalainen <ccr@tnsp.org>
parents:
760
diff
changeset
|
282 ($extra !== FALSE ? " ".$extra : "").">\n"; |
359
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
283 |
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
284 if (($csrfID = stGetSessionItem("csrfID", FALSE)) !== FALSE) |
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
285 $str .= stGetFormHiddenInput("csrfID", $csrfID)."\n"; |
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
286 |
f7a806d5060f
Add preliminary code for CSRF prevention via unique hash tokens. Not fully
Matti Hamalainen <ccr@tnsp.org>
parents:
357
diff
changeset
|
287 return $str; |
26
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
288 } |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
289 |
7be3f8cf1f7a
Lots of cleanups, preparing for adding entry submission support.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
290 |
675 | 291 function stGetFormOptionListStart($id, $indent, $outer, $size = 10, $onChange = "") |
0 | 292 { |
293 return | |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
294 ($outer ? $indent."<div id=\"".$id."\">\n" : ""). |
638
79bbd09114c5
Allow selection list size to be zero.
Matti Hamalainen <ccr@tnsp.org>
parents:
637
diff
changeset
|
295 $indent."<select class=\"selectBox\" id=\"".$id."Sel\"". |
79bbd09114c5
Allow selection list size to be zero.
Matti Hamalainen <ccr@tnsp.org>
parents:
637
diff
changeset
|
296 ($size > 0 ? " size=\"".$size."\"" : ""). |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
297 ($onChange != "" ? " onChange=\"".$onChange."\"" : "").">\n"; |
0 | 298 } |
299 | |
300 | |
747
330e6d79c5dc
Change stGetFormOptionList* function APIs a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
680
diff
changeset
|
301 function stGetFormOptionListItem($indent, $value, $active, $name) |
0 | 302 { |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
303 return |
747
330e6d79c5dc
Change stGetFormOptionList* function APIs a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
680
diff
changeset
|
304 $indent."<option value=\"".$value."\"". |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
305 ($active ? " selected=\"selected\"" : ""). |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
306 ">".str_replace(" ", " ", chentities($name))."</option>\n"; |
0 | 307 } |
308 | |
309 | |
675 | 310 function stGetFormOptionListEnd($indent, $outer) |
0 | 311 { |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
312 return |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
313 $indent."</select>\n". |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
314 ($outer ? $indent."</div>\n" : ""); |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
315 } |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
316 |
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
317 |
752
c714140541d5
Add more data to previewTypeList array and implement array index argument in
Matti Hamalainen <ccr@tnsp.org>
parents:
747
diff
changeset
|
318 function stGetFormOptionListFromArray($id, $indent, $outer, $data, $active, $size = 10, $arrIndex = 0, $onChange = "") |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
319 { |
675 | 320 $str = stGetFormOptionListStart($id, $indent, $outer, $size, $onChange); |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
321 |
639
26ec29d2e728
Elements of arrays passed to selection list can be arrays themselves, the
Matti Hamalainen <ccr@tnsp.org>
parents:
638
diff
changeset
|
322 foreach ($data as $key => $value) |
26ec29d2e728
Elements of arrays passed to selection list can be arrays themselves, the
Matti Hamalainen <ccr@tnsp.org>
parents:
638
diff
changeset
|
323 { |
747
330e6d79c5dc
Change stGetFormOptionList* function APIs a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
680
diff
changeset
|
324 $str .= stGetFormOptionListItem($indent." ", $key, |
642 | 325 ($key == $active), |
752
c714140541d5
Add more data to previewTypeList array and implement array index argument in
Matti Hamalainen <ccr@tnsp.org>
parents:
747
diff
changeset
|
326 is_array($value) ? $value[$arrIndex] : $value); |
639
26ec29d2e728
Elements of arrays passed to selection list can be arrays themselves, the
Matti Hamalainen <ccr@tnsp.org>
parents:
638
diff
changeset
|
327 } |
637
a376521c7bd1
Move some code around, for more appropriate placement in the modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
328 |
675 | 329 return $str.stGetFormOptionListEnd($indent, $outer); |
0 | 330 } |
331 | |
332 | |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
333 function stErrorStrF($fmt) |
0 | 334 { |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
335 $argc = func_num_args(); |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
336 $argv = func_get_args(); |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
337 |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
338 $len = strlen($fmt); |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
339 $str = ""; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
340 $argn = 1; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
341 for ($pos = 0; $pos < $len; $pos++) |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
342 { |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
343 if ($fmt[$pos] == "%") |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
344 { |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
345 $pos++; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
346 if ($fmt[$pos] == "%") |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
347 $str .= "%"; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
348 else |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
349 { |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
350 $n = intval($fmt[$pos]); |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
351 if ($n >= 1 && $n < $argc) |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
352 $str .= $argv[$n]; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
353 else |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
354 { |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
355 stErrorLog("Invalid stErrorStrF() format string, arg #".$n. |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
356 " referenced, but only has ".$argc." arguments: '".$fmt."'\n"); |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
357 return FALSE; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
358 } |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
359 } |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
360 } |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
361 else |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
362 $str .= $fmt[$pos]; |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
363 } |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
364 |
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
365 stError($str); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
366 return FALSE; |
0 | 367 } |
368 | |
369 | |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
370 // |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
371 // Check and validate one item from $_REQUEST[], based on |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
372 // list of validation conditions. For example: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
373 // |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
374 // stChkRequestItem("name", FALSE, |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
375 // array(CHK_ISGT, VT_STR, 0, "Handle / name not given."), |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
376 // array(CHK_ISGT, VT_STR, 3, "Handle / name too short, should be 3 characters or more."), |
244
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
377 // array(CHK_LTEQ, VT_STR, SET_LEN_USERNAME, "Handle / name is too long, should be less than ".SET_LEN_USERNAME." characters."), |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
378 // array(CHK_RANGE, VT_STR, array(3, SET_LEN_USERNAME), "Ulululu!"), |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
379 // ^- ranges specified as array of MIN and MAX values (inclusive) |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
380 // |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
381 // array(CHK_CUSTOM, VT_STR, function($value) { return FALSE; }, "Error! Error!"), |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
382 // ^- can be any callable/anonymous function etc. |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
383 // ... |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
384 // |
244
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
385 function stChkRequestDataItem($type, $value, $cmp) |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
386 { |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
387 switch ($type) |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
388 { |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
389 case CHK_ISLT : return $value < $cmp; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
390 case CHK_ISGT : return $value > $cmp; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
391 case CHK_ISEQ : return $value == $cmp; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
392 case CHK_LTEQ : return $value <= $cmp; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
393 case CHK_GTEQ : return $value >= $cmp; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
394 case CHK_RANGE: |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
395 if (!is_array($cmp)) |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
396 return FALSE; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
397 else |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
398 return ($value >= $cmp[0] && $value <= $cmp[1]); |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
399 break; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
400 default: return FALSE; |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
401 } |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
402 } |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
403 |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
404 |
670
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
405 function stDoCheckRequestItem($name, &$sdata, $nindex, $argc, $argv) |
0 | 406 { |
369
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
407 if (stGetSetting("debug")) |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
408 { |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
409 if (!isset($_REQUEST[$name])) |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
410 return stErrorStrF("Required data item '%1' not set.", $name); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
411 |
369
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
412 $data = trim($_REQUEST[$name]); |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
413 } |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
414 else |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
415 { |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
416 if (!isset($_POST[$name])) |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
417 return stErrorStrF("Required data item '%1' not set.", $name); |
369
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
418 |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
419 $data = trim($_POST[$name]); |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
420 } |
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
421 |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
422 $slen = strlen($data); |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
423 |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
424 |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
425 // Go through list of validation checks |
670
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
426 for ($argn = $nindex; $argn < $argc; $argn++) |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
427 { |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
428 // Act according to check type |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
429 $check = $argv[$argn]; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
430 switch ($check[0]) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
431 { |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
432 case CHK_TYPE: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
433 // Check type of the data |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
434 switch ($check[1]) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
435 { |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
436 case VT_STR: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
437 if ($slen == 0) |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
438 return stErrorStrF($check[2], $slen); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
439 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
440 |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
441 case VT_INT: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
442 case VT_BOOL: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
443 if ($slen == 0 || !is_numeric($data)) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
444 return stErrorStrF($check[2], $data); |
813
c635887048aa
Apply intval() to data when checking type.
Matti Hamalainen <ccr@tnsp.org>
parents:
812
diff
changeset
|
445 else |
c635887048aa
Apply intval() to data when checking type.
Matti Hamalainen <ccr@tnsp.org>
parents:
812
diff
changeset
|
446 $data = intval($data); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
447 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
448 } |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
449 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
450 |
244
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
451 case CHK_ISLT: case CHK_ISGT: case CHK_ISEQ: |
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
452 case CHK_GTEQ: case CHK_LTEQ: case CHK_RANGE: |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
453 // Check length or value of the data |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
454 switch ($check[1]) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
455 { |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
456 case VT_STR: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
457 case VT_TEXT: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
458 // Strings get their length checked |
244
70c424d025d6
Improve input validation helper functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
232
diff
changeset
|
459 if (!stChkRequestDataItem($check[0], $slen, $check[2])) |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
460 return stErrorStrF($check[3], $slen, $check[2]); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
461 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
462 |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
463 case VT_INT: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
464 case VT_BOOL: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
465 // Integer values checked against .. value |
292 | 466 if (!stChkRequestDataItem($check[0], intval($data), $check[2])) |
793
ff6e6c6200a4
Add improved error message formatting to stChkRequestItem*() functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
771
diff
changeset
|
467 return stErrorStrF($check[3], intval($data), $check[2]); |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
468 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
469 } |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
470 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
471 |
810
2a23243a6cc4
Add new check type for stChkRequestItem*(), CHK_ARRAY.
Matti Hamalainen <ccr@tnsp.org>
parents:
803
diff
changeset
|
472 case CHK_ARRAY: |
836
83ac4155efe2
Fix handling of CHK_ARRAY case in stChkRequestItem*().
Matti Hamalainen <ccr@tnsp.org>
parents:
813
diff
changeset
|
473 if (!in_array($data, $check[2], TRUE)) |
811 | 474 return stErrorStrF($check[3], $data); |
810
2a23243a6cc4
Add new check type for stChkRequestItem*(), CHK_ARRAY.
Matti Hamalainen <ccr@tnsp.org>
parents:
803
diff
changeset
|
475 break; |
2a23243a6cc4
Add new check type for stChkRequestItem*(), CHK_ARRAY.
Matti Hamalainen <ccr@tnsp.org>
parents:
803
diff
changeset
|
476 |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
477 case CHK_CUSTOM: |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
478 // Call a custom function (or closure) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
479 $func = $check[1]; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
480 if (!is_callable($func) || !$func($data)) |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
481 return stErrorStrF($check[2], $data); |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
482 break; |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
483 } |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
484 } |
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
485 |
436
4ce10edceedf
Only assign data if it has been completely validated.
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
486 if ($sdata !== FALSE) |
4ce10edceedf
Only assign data if it has been completely validated.
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
487 $sdata = $data; |
4ce10edceedf
Only assign data if it has been completely validated.
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
488 |
184
1b30c2107e5b
Add function for validating input with different definable conditions. Use
Matti Hamalainen <ccr@tnsp.org>
parents:
180
diff
changeset
|
489 return TRUE; |
0 | 490 } |
491 | |
492 | |
670
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
493 function stChkRequestItem($name, &$sdata) |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
494 { |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
495 return stDoCheckRequestItem($name, $sdata, 2, func_num_args(), func_get_args()); |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
496 } |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
497 |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
498 |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
499 function stChkRequestItemFail($name, &$sdata, &$sfail) |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
500 { |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
501 $sres = stDoCheckRequestItem($name, $sdata, 3, func_num_args(), func_get_args()); |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
502 if ($sres !== TRUE) $sfail = FALSE; |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
503 return $sres; |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
504 } |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
505 |
8a091dc8d608
Add new utility function stChkRequestItemFail().
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
506 |
357
7e906c827e68
Make default of request items to allow POST only, GET enabled on case by case basis.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
507 function stGetRequestItem($name, $default = "", $allowGet = FALSE) |
0 | 508 { |
369
a3caded43f6d
Add possibility of always using GET requests when debug mode is enabled.
Matti Hamalainen <ccr@tnsp.org>
parents:
365
diff
changeset
|
509 if ($allowGet || stGetSetting("debug")) |
357
7e906c827e68
Make default of request items to allow POST only, GET enabled on case by case basis.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
510 return isset($_REQUEST[$name]) ? trim($_REQUEST[$name]) : $default; |
7e906c827e68
Make default of request items to allow POST only, GET enabled on case by case basis.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
511 else |
7e906c827e68
Make default of request items to allow POST only, GET enabled on case by case basis.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
512 return isset($_POST[$name]) ? trim($_POST[$name]) : $default; |
0 | 513 } |
514 | |
515 | |
486 | 516 function stConnectSQLDBSpec($dbspec) |
517 { | |
518 try { | |
519 $dbh = new PDO($dbspec); | |
520 } | |
521 catch (PDOException $e) { | |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
522 stErrorLog("Could not connect to SQL database: ".$e->getMessage()."."); |
486 | 523 return FALSE; |
524 } | |
525 return $dbh; | |
526 } | |
527 | |
528 | |
529 function stDBGetSQLParam($dbh, $type, $value) | |
530 { | |
531 switch ($type) | |
532 { | |
533 case "d": return intval($value); | |
534 case "s": return $dbh->quote($value); | |
535 case "b": return intval($value) ? 1 : 0; | |
536 case "D": return intval(stGetRequestItem($value)); | |
537 case "S": return $dbh->quote(stGetRequestItem($value)); | |
538 case "Q": return $dbh->quote(stGetRequestItem($value)); | |
539 case "B": return intval(stGetRequestItem($value)) ? 1 : 0; | |
540 } | |
541 } | |
542 | |
543 | |
501 | 544 function stLogSQLError($dbh, $sql) |
0 | 545 { |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
546 stErrorLog("SQL error '".implode("; ", $dbh->errorInfo())."' in statement: \"".$sql."\""); |
0 | 547 } |
548 | |
549 | |
550 function stConnectSQLDB() | |
551 { | |
552 global $db; | |
537
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
553 try { |
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
554 $db = new PDO(stGetSetting("sqlDB"), |
538 | 555 stGetSetting("sqlUsername", NULL), |
556 stGetSetting("sqlPassword", NULL), | |
537
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
557 stGetSetting("sqlOptions", array())); |
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
558 } |
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
559 catch (PDOException $e) { |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
560 stErrorLog("Could not connect to SQL database: ".$e->getMessage()."."); |
537
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
561 return FALSE; |
12726b4be750
Make database connection settings better.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
562 } |
486 | 563 $db = stConnectSQLDBSpec(stGetSetting("sqlDB")); |
564 return ($db !== false); | |
0 | 565 } |
566 | |
567 | |
487 | 568 function stDBPrepareSQLUpdate($dbh, $table, $cond, $pairs) |
0 | 569 { |
487 | 570 $sql = array(); |
571 foreach ($pairs as $name => $attr) | |
0 | 572 { |
487 | 573 $sql[] = $name."=".stDBGetSQLParam($dbh, $attr, $name); |
0 | 574 } |
487 | 575 return |
576 "UPDATE ".$table." SET ".implode(",", $sql). | |
577 ($cond != "" ? " ".$cond : ""); | |
0 | 578 } |
579 | |
580 | |
487 | 581 function stDBPrepareSQL($dbh) |
0 | 582 { |
583 $argc = func_num_args(); | |
584 $argv = func_get_args(); | |
87 | 585 |
487 | 586 $fmt = $argv[1]; |
0 | 587 $len = strlen($fmt); |
588 $sql = ""; | |
487 | 589 $argn = 2; |
590 for ($pos = 0; $pos < $len; $pos++) | |
0 | 591 { |
592 if ($fmt[$pos] == "%") | |
593 { | |
594 if ($argn < $argc) | |
501 | 595 $sql .= stDBGetSQLParam($dbh, $fmt[++$pos], $argv[$argn++]); |
0 | 596 else |
597 { | |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
598 stErrorLog("Invalid SQL statement format string '".$fmt. |
0 | 599 "', not enough parameters specified (".$argn." of ".$argc.")"); |
600 return FALSE; | |
601 } | |
602 } | |
603 else | |
604 $sql .= $fmt[$pos]; | |
605 } | |
485 | 606 |
0 | 607 return $sql; |
608 } | |
609 | |
610 | |
487 | 611 function stPrepareSQL() |
0 | 612 { |
487 | 613 global $db; |
614 $argc = func_num_args(); | |
615 $argv = func_get_args(); | |
616 | |
617 $fmt = $argv[0]; | |
618 $len = strlen($fmt); | |
619 $sql = ""; | |
620 $argn = 1; | |
621 for ($pos = 0; $pos < $len; $pos++) | |
0 | 622 { |
487 | 623 if ($fmt[$pos] == "%") |
624 { | |
625 if ($argn < $argc) | |
492 | 626 $sql .= stDBGetSQLParam($db, $fmt[++$pos], $argv[$argn++]); |
487 | 627 else |
628 { | |
861
62b3a69e9030
Add stErrorLog() and use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
836
diff
changeset
|
629 stErrorLog("Invalid SQL statement format string '".$fmt. |
487 | 630 "', not enough parameters specified (".$argn." of ".$argc.")"); |
631 return FALSE; | |
632 } | |
633 } | |
634 else | |
635 $sql .= $fmt[$pos]; | |
0 | 636 } |
487 | 637 |
638 return $sql; | |
0 | 639 } |
640 | |
641 | |
547
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
642 function stDBExecSQLInsert($dbh, $sql) |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
643 { |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
644 switch ($dbh->getAttribute(PDO::ATTR_DRIVER_NAME)) |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
645 { |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
646 case "pgsql": |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
647 if (($res = stDBFetchSQLColumn($dbh, $sql." RETURNING id")) !== false) |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
648 return $res; |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
649 else |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
650 return FALSE; |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
651 |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
652 default: |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
653 if (stDBExecSQL($dbh, $sql) !== false) |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
654 return $dbh->lastInsertId(); |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
655 else |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
656 return FALSE; |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
657 } |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
658 } |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
659 |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
660 |
487 | 661 function stDBExecSQL($dbh, $sql) |
0 | 662 { |
487 | 663 if (($res = $dbh->query($sql)) !== FALSE) |
0 | 664 return $res; |
665 else | |
666 { | |
501 | 667 stLogSQLError($dbh, $sql); |
0 | 668 stError("Oh noes! SQL error #23!"); |
669 return FALSE; | |
670 } | |
671 } | |
672 | |
673 | |
487 | 674 function stDBFetchSQL($dbh, $sql) |
0 | 675 { |
487 | 676 if (($res = $dbh->query($sql)) !== FALSE) |
0 | 677 return $res->fetch(); |
678 else | |
679 { | |
501 | 680 stLogSQLError($dbh, $sql); |
0 | 681 stError("Oh noes! SQL error #31!"); |
682 return FALSE; | |
683 } | |
684 } | |
685 | |
686 | |
487 | 687 function stDBFetchSQLColumn($dbh, $sql, $column = 0) |
0 | 688 { |
487 | 689 if (($res = $dbh->query($sql)) !== FALSE) |
0 | 690 return $res->fetchColumn($column); |
691 else | |
692 { | |
501 | 693 stLogSQLError($dbh, $sql); |
0 | 694 stError("Oh noes! SQL error #81!"); |
695 return FALSE; | |
696 } | |
697 } | |
698 | |
699 | |
487 | 700 function stPrepareSQLUpdate($table, $cond, $pairs) |
66
230aacc22cb4
Move some functions to site lib.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
701 { |
487 | 702 global $db; |
703 return stDBPrepareSQLUpdate($db, $table, $cond, $pairs); | |
704 } | |
705 | |
706 | |
547
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
707 function stExecSQLInsert($sql) |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
708 { |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
709 global $db; |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
710 return stDBExecSQLInsert($db, $sql); |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
711 } |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
712 |
1fceb6f57c90
Add helper functions for SQL INSERT that return the last insert id, to work
Matti Hamalainen <ccr@tnsp.org>
parents:
538
diff
changeset
|
713 |
492 | 714 function stExecSQL($sql) |
487 | 715 { |
716 global $db; | |
717 return stDBExecSQL($db, $sql); | |
718 } | |
719 | |
720 | |
492 | 721 function stFetchSQL($sql) |
487 | 722 { |
723 global $db; | |
724 return stDBFetchSQL($db, $sql); | |
725 } | |
726 | |
727 | |
728 function stFetchSQLColumn($sql, $column = 0) | |
729 { | |
730 global $db; | |
731 return stDBFetchSQLColumn($db, $sql, $column); | |
66
230aacc22cb4
Move some functions to site lib.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
732 } |
230aacc22cb4
Move some functions to site lib.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
733 |
230aacc22cb4
Move some functions to site lib.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
734 |
578
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
735 function stDBBeginTransaction($dbh = FALSE) |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
736 { |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
737 global $db; |
579 | 738 return stDBExecSQL(($dbh !== FALSE) ? $dbh : $db, "BEGIN TRANSACTION"); |
578
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
739 } |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
740 |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
741 |
607
e78d90ca4f4a
Use default database handle for transaction commits if none provided.
Matti Hamalainen <ccr@tnsp.org>
parents:
579
diff
changeset
|
742 function stDBCommitTransaction($dbh = FALSE) |
578
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
743 { |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
744 global $db; |
579 | 745 return stDBExecSQL(($dbh !== FALSE) ? $dbh : $db, "COMMIT"); |
578
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
746 } |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
747 |
4227095a1384
Add functions for beginning and committing SQL transactions and use them.
Matti Hamalainen <ccr@tnsp.org>
parents:
577
diff
changeset
|
748 |
577
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
749 function stDBGetTableSchema($dbh, $data) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
750 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
751 $res = array(); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
752 $driver = $dbh->getAttribute(PDO::ATTR_DRIVER_NAME); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
753 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
754 foreach ($data as $col) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
755 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
756 $tmp = array(); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
757 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
758 switch ($driver) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
759 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
760 case "pgsql": |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
761 foreach ($col as $elem) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
762 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
763 // For Postgres, use SERIAL for autoincrement |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
764 if ($elem == "AUTOINCREMENT") |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
765 $tmp[1] = "SERIAL"; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
766 else |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
767 $tmp[] = $elem; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
768 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
769 break; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
770 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
771 case "mysql": |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
772 foreach ($col as $elem) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
773 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
774 if ($elem != "AUTOINCREMENT") |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
775 $tmp[] = "AUTO_INCREMENT"; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
776 else |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
777 $tmp[] = $elem; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
778 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
779 break; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
780 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
781 case "sqlite": |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
782 $tmp = $col; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
783 break; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
784 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
785 default: |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
786 die("Don't know how to handle PDO driver '".$driver."' yet.\n"); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
787 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
788 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
789 $res[] = implode(" ", $tmp); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
790 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
791 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
792 return implode(", ", $res); |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
793 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
794 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
795 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
796 function stDBCreateOneTable($dbh, $name, $schema) |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
797 { |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
798 // echo "CREATE TABLE ".$name ." (".$schema.")\n"; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
799 return (stDBExecSQL($dbh, "CREATE TABLE ".$name." (".$schema.")") !== FALSE) ? TRUE : FALSE; |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
800 } |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
801 |
ba521a7e7653
Move two DB helper functions from managedb to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
575
diff
changeset
|
802 |
803
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
803 function stSubStrCmp($str, $cmp, $send = FALSE) |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
804 { |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
805 if ($send) |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
806 return substr($str, -strlen($cmp)) == $cmp; |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
807 else |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
808 return substr($str, 0, strlen($cmp)) == $cmp; |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
809 } |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
810 |
ddb30c989b47
Add new helper function stSubStrCmp() for comparing substrings.
Matti Hamalainen <ccr@tnsp.org>
parents:
793
diff
changeset
|
811 |
135
eecac02579c4
Move stChop() to site module and rename it to stStrChop().
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
812 function stStrChop($str, $len) |
eecac02579c4
Move stChop() to site module and rename it to stStrChop().
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
813 { |
569
9e8637631089
Fix stStrChop() and stStrChopPad() UTF-8 handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
814 return (mb_strlen($str) > $len) ? mb_substr($str, 0, $len - 3)."..." : $str; |
558
09a11dd385c7
Add new function stStrChopPad() that replaces stStrChop(), but stStrChop()
Matti Hamalainen <ccr@tnsp.org>
parents:
547
diff
changeset
|
815 } |
09a11dd385c7
Add new function stStrChopPad() that replaces stStrChop(), but stStrChop()
Matti Hamalainen <ccr@tnsp.org>
parents:
547
diff
changeset
|
816 |
09a11dd385c7
Add new function stStrChopPad() that replaces stStrChop(), but stStrChop()
Matti Hamalainen <ccr@tnsp.org>
parents:
547
diff
changeset
|
817 |
09a11dd385c7
Add new function stStrChopPad() that replaces stStrChop(), but stStrChop()
Matti Hamalainen <ccr@tnsp.org>
parents:
547
diff
changeset
|
818 function stStrChopPad($str, $len) |
09a11dd385c7
Add new function stStrChopPad() that replaces stStrChop(), but stStrChop()
Matti Hamalainen <ccr@tnsp.org>
parents:
547
diff
changeset
|
819 { |
569
9e8637631089
Fix stStrChop() and stStrChopPad() UTF-8 handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
820 $tmp = stStrChop($str, $len); |
9e8637631089
Fix stStrChop() and stStrChopPad() UTF-8 handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
821 for ($i = mb_strlen($tmp); $i < $len; $i++) |
9e8637631089
Fix stStrChop() and stStrChopPad() UTF-8 handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
822 $tmp .= " "; |
9e8637631089
Fix stStrChop() and stStrChopPad() UTF-8 handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
565
diff
changeset
|
823 return $tmp; |
135
eecac02579c4
Move stChop() to site module and rename it to stStrChop().
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
824 } |
eecac02579c4
Move stChop() to site module and rename it to stStrChop().
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
825 |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
826 |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
827 function cmPrintCSSLine($filename, $media = FALSE) |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
828 { |
180
a3f0f2a3551a
Split stylesheets into separate files for different platforms and also split
Matti Hamalainen <ccr@tnsp.org>
parents:
178
diff
changeset
|
829 echo |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
830 " <link rel=\"stylesheet\" href=\"".$filename. |
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
831 "\" type=\"text/css\" ".($media !== FALSE ? "media=\"".$media."\"": "")." />\n"; |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
832 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
833 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
834 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
835 function cmPrintPageHeader($pageTitle, $pageExtra = "", $useContents = TRUE) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
836 { |
575
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
837 global $pageCSS, $pageCSSIndex, $pageCharset, $pageAuthor, $pageCSSData, $pageUrchin; |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
838 |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
839 if (!isset($pageCSS)) |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
840 { |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
841 if (!isset($pageCSSData)) |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
842 { |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
843 $pageCSSData = array( |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
844 "cookie" => "docscss", |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
845 "prefix" => "/css/docs", |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
846 ); |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
847 } |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
848 |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
849 if (isset($_GET["css"])) |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
850 { |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
851 $pageCSSIndex = intval($_GET["css"]); |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
852 setcookie($pageCSSData["cookie"], $pageCSSIndex, time() + 365*24*60*60, "/"); // expire in a year |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
853 } |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
854 else |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
855 { |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
856 $pageCSSIndex = isset($_COOKIE[$pageCSSData["cookie"]]) ? intval($_COOKIE[$pageCSSData["cookie"]]) : 1; |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
857 } |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
858 $pageCSS = $pageCSSData["prefix"].$pageCSSIndex.".css"; |
1ec34a220df3
Another merge from generic custom site branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
859 } |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
860 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
861 echo |
363 | 862 "<!DOCTYPE html>\n". |
178 | 863 "<html>\n". |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
864 "<head>\n". |
232 | 865 " <meta charset=\"".$pageCharset."\">\n". |
362
38dfe9e0a017
Add meta-equiv for document content type.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
866 " <meta http-equiv=\"Content-type\" content=\"text/html;charset=".$pageCharset."\">\n". |
232 | 867 " <title>".strip_tags($pageTitle)."</title>\n". |
868 $pageExtra; | |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
869 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
870 if (is_array($pageCSS)) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
871 { |
180
a3f0f2a3551a
Split stylesheets into separate files for different platforms and also split
Matti Hamalainen <ccr@tnsp.org>
parents:
178
diff
changeset
|
872 foreach ($pageCSS as $uri => $media) |
a3f0f2a3551a
Split stylesheets into separate files for different platforms and also split
Matti Hamalainen <ccr@tnsp.org>
parents:
178
diff
changeset
|
873 cmPrintCSSLine($uri, $media); |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
874 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
875 else |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
876 { |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
877 cmPrintCSSLine($pageCSS, FALSE); |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
878 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
879 |
232 | 880 echo |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
881 "</head>\n". |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
882 "<body>\n"; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
883 |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
884 if (isset($pageUrchin) && file_exists($pageUrchin)) |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
885 require_once $pageUrchin; |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
886 else |
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
887 if (file_exists("urchin.inc.php")) |
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
888 require_once "urchin.inc.php"; |
349
61c4dda0ec03
New message/confirmation boxes code done in JS + CSS instead of relying on
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
889 |
61c4dda0ec03
New message/confirmation boxes code done in JS + CSS instead of relying on
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
890 echo "<div id=\"messageBox\"></div>\n"; |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
891 |
174
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
892 if ($useContents) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
893 echo "<div id=\"contents\">\n"; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
894 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
895 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
896 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
897 function cmPrintPageFooter($useContents = TRUE) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
898 { |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
899 if ($useContents) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
900 echo "</div>\n"; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
901 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
902 echo "</body>\n</html>\n"; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
903 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
904 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
905 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
906 function cmQM($msg) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
907 { |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
908 global $pageTranslations, $pageLang; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
909 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
910 if (isset($pageTranslations[$msg]) && isset($pageTranslations[$msg][$pageLang])) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
911 $str = $pageTranslations[$msg][$pageLang]; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
912 else |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
913 $str = $msg; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
914 |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
915 foreach (func_get_args() as $argn => $argv) |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
916 $str = preg_replace("/\%".$argn."/", $argv, $str); |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
917 return $str; |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
918 } |
63c840590476
Move common code from mcommon.inc.php to msitegen module.
Matti Hamalainen <ccr@tnsp.org>
parents:
173
diff
changeset
|
919 |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
920 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
921 // |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
922 // CLI related helper functions |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
923 // |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
924 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
925 // Check if we are running from commandline or not |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
926 function stCheckCLIExec($fail = TRUE) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
927 { |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
928 if (php_sapi_name() != "cli" || !empty($_SERVER["REMOTE_ADDR"])) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
929 { |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
930 if ($fail) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
931 { |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
932 header("Status: 404 Not Found"); |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
933 die(); |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
934 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
935 else |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
936 return TRUE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
937 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
938 else |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
939 return FALSE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
940 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
941 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
942 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
943 function stCArg($index) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
944 { |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
945 global $argc, $argv; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
946 if ($index < $argc) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
947 return $argv[$index]; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
948 else |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
949 return FALSE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
950 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
951 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
952 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
953 function stCArgLC($index) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
954 { |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
955 global $argc, $argv; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
956 if ($index < $argc) |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
957 return strtolower($argv[$index]); |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
958 else |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
959 return FALSE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
960 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
961 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
962 |
502
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
963 function stGetDBMeta($dbh, $name) |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
964 { |
502
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
965 if (($item = stDBFetchSQL($dbh, "SELECT * FROM dbmeta WHERE key=".$dbh->quote($name))) === FALSE) |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
966 return FALSE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
967 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
968 return stGetSQLSettingData($item); |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
969 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
970 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
971 |
502
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
972 function stSetDBMeta($dbh, $name, $value) |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
973 { |
502
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
974 if (($item = stDBFetchSQL($dbh, "SELECT * FROM dbmeta WHERE key=".$dbh->quote($name))) === FALSE) |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
975 return FALSE; |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
976 |
502
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
977 $sql = "UPDATE dbmeta SET ".stGetSettingSQL($item, $value)." WHERE key=".$dbh->quote($name); |
d2a38070e18f
Partially refactor database upgrading .. not finished yet, and the
Matti Hamalainen <ccr@tnsp.org>
parents:
501
diff
changeset
|
978 return stDBExecSQL($dbh, $sql); |
479
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
979 } |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
980 |
86ee2b42a995
Move CLI helper functions to msitegen, again.
Matti Hamalainen <ccr@tnsp.org>
parents:
436
diff
changeset
|
981 |
561
6b4cbd590d35
More locale initialization refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
982 // |
6b4cbd590d35
More locale initialization refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
983 // Global locale initialization |
6b4cbd590d35
More locale initialization refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
984 // |
562 | 985 if (!isset($localeInited) || !$localeInited) |
986 { | |
987 $localeInited = TRUE; | |
574
463189fc05ed
Some changes from custom site system branch.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
988 $pageCharset = "UTF-8"; |
561
6b4cbd590d35
More locale initialization refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
989 |
562 | 990 mb_internal_encoding($pageCharset); |
561
6b4cbd590d35
More locale initialization refactoring.
Matti Hamalainen <ccr@tnsp.org>
parents:
560
diff
changeset
|
991 |
562 | 992 $tmp = "en_US.".strtolower(str_replace("-", "", $pageCharset)); |
993 setlocale(LC_ALL, $tmp); | |
994 } | |
0 | 995 ?> |