c0ec9c5907
proxy_url: Fix extension extraction for URLs containing a . after a ?
Hypolite Petovan
2016-12-19 20:19:26 -05:00
b580c23844
Merge remote-tracking branch 'upstream/develop' into develop
Roland Häder
2016-12-21 09:11:58 +01:00
769b849665
url_from_contact_guid: move network constant to arg list
Hypolite Petovan
2016-12-20 20:52:42 -05:00
875110ab27
Merge pull request #3038 from Hypolite/bug/proxy_url_extension
Michael Vogel
2016-12-20 22:44:34 +01:00
3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl().
Roland Haeder
2016-12-20 21:51:25 +01:00
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
Roland Haeder
2016-12-20 21:51:25 +01:00
9814414b6a
used dbm::is_result() instead of count()
Roland Haeder
2016-12-20 21:39:06 +01:00
b4bc07fdcc
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:31:05 +01:00
536f078ed4
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:31:05 +01:00
04d90d9780
Merge branch 'rewrites/dbm_is_result' into develop
Roland Haeder
2016-12-20 21:21:31 +01:00
013f8a4139
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:16:01 +01:00
d6e57f0348
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:15:53 +01:00
4edc73486e
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:13:50 +01:00
70a042fd04
added more curly braces + space between "if" and brace
Roland Häder
2016-12-20 17:43:46 +01:00
f334f9e61f
proxy_url: Fix extension extraction for URLs containing a . after a ?
Hypolite Petovan
2016-12-19 20:19:26 -05:00
bb06d9ce32
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:16:01 +01:00
52f14ffa5f
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:15:53 +01:00
6c0c9d542a
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:13:50 +01:00
54615be22e
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:16:01 +01:00
6e44acfed6
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:15:53 +01:00
af2909bf8f
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:13:50 +01:00
b631442760
Misc changes to url_from_contact_guid
Hypolite Petovan
2016-12-20 14:33:33 -05:00
b6d11f2129
Merge remote-tracking branch 'upstream/develop' into develop
Roland Haeder
2016-12-20 19:33:40 +01:00
c0cc65304b
converted more to dbm::is_result() + added braces/space
Roland Häder
2016-12-20 15:37:27 +01:00
51716957b2
converted more to dbm::is_result() + added braces/space
Roland Häder
2016-12-20 15:37:27 +01:00
268f90a705
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder
2016-12-20 12:51:51 +01:00
9972a029e3
Changed $a->get_baseurl() to App::get_baseurl()
Roland Häder
2016-12-20 12:45:16 +01:00
4f26bee453
Changed $a->get_baseurl() to App::get_baseurl()
Roland Häder
2016-12-20 12:45:16 +01:00
0e58bf6675
Changed $a->get_baseurl() to App::get_baseurl()
Roland Häder
2016-12-20 12:45:16 +01:00
d5f2d387bd
Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted)
Roland Häder
2016-12-20 12:36:51 +01:00
b69d82e64c
Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted)
Roland Häder
2016-12-20 12:36:51 +01:00
bbbc63b8ad
Continued a bit: - added more curly braces around conditional blocks - added space between "if" and brace - aligned "=>" (will do with more if wanted)
Roland Häder
2016-12-20 12:36:51 +01:00
3569c9d212
Opps, forgot this ...
Roland Häder
2016-12-20 12:36:51 +01:00
a883514604
Opps, forgot this ...
Roland Häder
2016-12-20 12:36:51 +01:00
c22878643b
Opps, forgot this ...
Roland Häder
2016-12-20 12:36:51 +01:00
a25b628286
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 12:35:18 +01:00
76f43f9b30
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 12:35:18 +01:00
8d28135c59
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 12:35:18 +01:00
61c1317f80
added much more curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:56:34 +01:00
ace8f753ac
added much more curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:56:34 +01:00
e24c3a5b82
added much more curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:56:34 +01:00
5f41375ad3
Continued:
Roland Häder
2016-12-20 11:39:53 +01:00
e70b3b45df
Continued:
Roland Häder
2016-12-20 11:39:53 +01:00
51d352922a
Continued:
Roland Häder
2016-12-20 11:39:53 +01:00
1248b26d3c
added more curly braces + fixed space->tab for code indentation.
Roland Häder
2016-12-20 11:33:04 +01:00
2e908ebbbf
added more curly braces + fixed space->tab for code indentation.
Roland Häder
2016-12-20 11:33:04 +01:00
c1845c97cc
added more curly braces + fixed space->tab for code indentation.
Roland Häder
2016-12-20 11:33:04 +01:00
4780df394d
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:27:40 +01:00
d0bc38dbf8
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:27:40 +01:00
507db84243
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:27:40 +01:00
fd0e2a9406
added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
Roland Häder
2016-12-20 11:21:32 +01:00
beca51bfba
added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
Roland Häder
2016-12-20 11:21:32 +01:00
9c097c20dd
added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
Roland Häder
2016-12-20 11:21:32 +01:00
757a0c76f0
added curly braces + space between "if" and brace + added missing @param
Roland Häder
2016-12-20 11:18:54 +01:00
fa444f373c
added curly braces + space between "if" and brace + added missing @param
Roland Häder
2016-12-20 11:18:54 +01:00
4299cce719
added curly braces + space between "if" and brace + added missing @param
Roland Häder
2016-12-20 11:18:54 +01:00
e05a8e9974
added curly braces + space between "if" and brace + added TODO
Roland Häder
2016-12-20 11:14:30 +01:00
244636d26c
added curly braces + space between "if" and brace + added TODO
Roland Häder
2016-12-20 11:14:30 +01:00
40bdc5d33c
added curly braces + space between "if" and brace + added TODO
Roland Häder
2016-12-20 11:14:30 +01:00
35973b9273
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder
2016-12-20 11:06:07 +01:00
6ab84bf520
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:04:29 +01:00
92ad87590b
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:04:29 +01:00
40dc3774e4
Also here (was committed in other branch, too. :-( )
Roland Häder
2016-12-20 11:02:57 +01:00
34fcaeb209
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:59:11 +01:00
fb817b18ad
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:59:06 +01:00
4dce3d8224
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:58:55 +01:00
fb0ed18a43
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:58:03 +01:00
a9bed1422e
added more curyl braces + spaces between "if" and brace
Roland Häder
2016-12-20 10:44:27 +01:00
3ffea45a1c
added more curyl braces + spaces between "if" and brace
Roland Häder
2016-12-20 10:44:27 +01:00
Hypolite Petovan
Roland Häder
Michael Vogel
Hypolite Petovan
Michael
Tobias Diekershoff