Commit graph

236 commits

Author SHA1 Message Date
Jonny Tischbein
ecb67cfcb4 syntax typo 2018-10-02 18:22:23 +02:00
Jonny Tischbein
fa3bbc5f45 Code Standards + return path for \!local_user() and cancel 2018-10-02 18:13:58 +02:00
Jonny Tischbein
9915523490 mod/message return to conversation if message deleted 2018-10-02 13:16:43 +02:00
Michael Vogel
103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks
Rewrite JS hooks
2018-10-01 17:10:30 +00:00
Jonny Tischbein
57fe36e9a3 replace session return url by static pages 2018-09-30 19:26:29 +02:00
a6996601d5
Merge pull request #5789 from friendica/master
Update develop from master-2019.09
2018-09-23 18:55:20 -04:00
Hypolite Petovan
1eaa523e61 Remove unused App->page['end']
- Remove unused empty templates
2018-09-20 21:02:28 -04:00
Jonny Tischbein
58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Jonny Tischbein
807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Roland Häder
4d39164c1e [WIP] Rewrite to Proxy class: (#5507)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
2018-07-30 22:06:22 -04:00
Hypolite Petovan
a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan
ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan
0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Andreas Neustifter
303aef34f0 Make frio more consistent by replacing textual links with icons everywhere. (#5415)
* Make frio more consistent by replacing textual links with icons everywhere I could find them.

* [frio] Move profile add link to icon.
2018-07-21 07:31:05 -04:00
Hypolite Petovan
af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan
daa1177e3a Update use statement lists with new Friendica\Database\dba class
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
2018-07-19 22:15:21 -04:00
Michael Vogel
0360f7197a Several more warnings ... (#5340)
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
2018-07-10 08:27:56 -04:00
8ad523fbc8
Continued a bit:
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:19:54 +02:00
f806fa91b1
Replace old database queries with the new ones 2018-06-20 22:02:17 +02:00
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan
dca0fa3f1d Fix wrong variable type in mod/message 2018-03-02 18:40:09 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
113ea38d50 Move contact_select to Acl
- Simplify Acl::getMessageContactSelectHTML parameters
2018-03-02 18:40:08 -05:00
59aed9533e missing L10n::t for date string formatting 2018-02-18 09:56:27 +01:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
rabuzarus
2e03a3a47f fix undeclared variables or wrong variable names (/mod) 2018-02-12 03:25:09 +01:00
Hypolite Petovan
cea80c78e4 Replace remaining functions in include/datetime by Temporal methods
- Fix uses statements
2018-02-03 20:47:37 -05:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
0bee706e51 Add Temporal::local() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
dc366bf1f7 Refactor datetime_convert into Temporal::convert
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
2018-02-03 08:56:51 -05:00
Adam Magness
407b2397cb Finish t() for mod
finished mod folder
2018-01-22 18:03:26 -05:00
Adam Magness
3b0f69599e Updat tt() calls
update function calls for tt()
2018-01-22 18:03:26 -05:00
Adam Magness
d49f986d1e Many t() calls
modify many t() calls.
2018-01-22 18:03:26 -05:00
Adam Magness
0f546f7f0f Update functions and calls
Update function names and scope. update calls.
2018-01-15 17:09:06 -05:00
Hypolite Petovan
e36f2bb1fb Use short form array syntax everywhere
- Add short form array syntax to po2php.php generation
2018-01-15 14:07:17 -05:00
Adam Magness
b3e6a1d283 Update functions and calls
Update functions and calls.
2018-01-15 12:14:09 -05:00
Hypolite Petovan
e52c11cc58 Fix formatting and PHP notice in mod/message
- Use argc to check for argv existence
- Simplify sprintf(t()) structures
2018-01-02 08:11:14 -05:00
88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00:00
Hypolite Petovan
a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan
18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan
ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
Hypolite Petovan
b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05:00
Adam Magness
4d146acf90 Smilies to src
Move Smilies to Friendica\Content namespace.

Related to #3878
2017-11-11 07:21:15 -05:00
Adam Magness
4ca68c7af0 Class file relocations
Issue #3878
2017-11-08 08:37:03 -05:00
b1668ffdda Address instead of url 2017-09-01 19:32:12 +00:00
0e8104b172 Links to profiles in mails mow show the profile address and "redir" always works 2017-08-31 12:01:44 +00:00
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Alexandre Alapetite
02faf42403 Fix SQL syntax bug in mod message 2017-05-07 21:39:00 +02:00
Hypolite Petovan
20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Alexandre Alapetite
d1888ac05c SQL AS for messages
Fix bug introduced in https://github.com/friendica/friendica/pull/3323
2017-04-17 15:01:05 +02:00
Alexandre Alapetite
6be6badd91 SQL typo mod/message
Mistake in previous commit
2017-04-15 00:45:30 +02:00
Alexandre Alapetite
1058b28cea MySQL ANY_VALUE with fallback to MIN
https://github.com/friendica/friendica/issues/3322
2017-04-15 00:42:44 +02:00
Alexandre Alapetite
74b6d09e89 Fix GROUP BY in acl_selector, api, notifier, photos, messages
https://github.com/friendica/friendica/issues/3322
2017-04-12 15:11:50 +02:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00
63e4750b4a
more coding convention applied:
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Hypolite Petovan
66482c1d9c - Remove $theme_richtext_editor boot var
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
2017-01-26 22:57:53 -05:00
Hypolite Petovan
9d5384f107 - Remove tinyMCE mentions or convert to addeditortext()
- Remove $editselect template value
2017-01-26 22:50:27 -05:00
Hypolite Petovan
f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11: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

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:15:53 +01:00
e24c3a5b82 added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
4dce3d8224 changed to this:
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +01:00
fb676335db Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Michael Vogel
e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Michael Vogel
7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
	boot.php
2016-07-02 13:38:23 +02:00
Michael Vogel
807fbe173b Some more places where the avatar picture is taken from the database 2016-06-10 07:44:32 +02:00
Michael Vogel
71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel
0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
Michael Vogel
77f7619720 Issue 1769: Some enhancements for sending wall mails 2016-05-29 19:35:23 +02:00
3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
Michael Vogel
1021111241
Bugfix: Messages work now again 2016-05-01 13:48:52 +02:00
Michael Vogel
8e0b3b28da Bugfix: The message list always showed "x and you" 2016-04-30 14:13:43 +02:00
Michael Vogel
0f24f2d9ae Bugfix: Messages work now again 2016-04-17 22:07:01 +02:00
9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result().
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 18:54:55 +01:00
4ec377008d Introduced is_filled_array() + added some missing array initialization
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
fabrixxm
b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
Andrej Stieben
db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
Michael Vogel
2f13506180 Bugfix: The participants on the mail page were displayed wrong 2015-12-28 18:13:03 +01:00
FlxAlbroscheit
613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
FlxAlbroscheit
14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
Zach Prezkuta
488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Zach Prezkuta
609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00