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