keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20326 commits 4 branches 0 tags 179 MiB
Commit graph

457 commits

Author SHA1 Message Date
Hypolite Petovan
916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
Michael
ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
Hypolite Petovan
385a36138a Format valid_email function in include/text 2017-12-12 20:52:28 -05:00
Hypolite Petovan
1cdee234f7
Merge pull request #4028 from annando/mood2 
We've got no mood anymore
 2017-12-07 07:53:46 -05:00
Andy H3
68ac89da58
Update text.php 
Corrected typo
 2017-12-07 14:45:37 +07:00
Michael
0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Adam Magness
b1d16fbdf7 Update use statements 
update use statements for rename to singular.
 2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular 
Rename and update references. Standards and a require_once.
 2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Michael
0982b0413b Bugfix for "Call to undefined function best_link_url()" 2017-11-29 21:27:39 +00:00
Hypolite Petovan
d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
Hypolite Petovan
d38c040d50 Update random_string with random_bytes 
- Updated update.php
 2017-11-25 21:15:50 -05:00
Hypolite Petovan
104a1d7fd3 Move ITemplateEngine to src 
- Fix method name format
 2017-11-19 10:22:18 -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
Michael
731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Michael
3764dc2bf6 Some more code improvements, removed deprecated functions 2017-11-11 06:42:39 +00:00
Michael
cfdbd07628 The friend contact block wasn't displayed in the profile 2017-11-11 05:23:28 +00:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
rabuzarus
553428d1b1 event items are now more themeable in the networkstream. 
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
 2017-10-13 19:42:27 +02:00
Michael
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
Michael
6e670df80f OStatus: Better attachment handling for pictures 2017-09-07 15:34:50 +00:00
Michael
66968efb9a Logger date format is now ISO8601 compatible 2017-09-06 21:13:06 +00:00
Michael
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Michael
83ce42172b Don't add "redir" links on mentions 2017-08-27 09:56:41 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael
4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Michael
a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
Michael
1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
Michael
b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
Michael
181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 
Conflicts:
	include/text.php
 2017-07-13 20:38:18 +00:00
Roland Häder
4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael
910cca0629 Attached pictures in OStatus posts are now displayed 2017-06-06 17:55:14 +00:00
Roland Häder
e9c9c47a84
Continued a bit: 
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:09:07 +02:00
Roland Häder
291af19f25
Some improvements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:06:22 +02:00
Roland Häder
b6648215b8
Opps, missed them 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:42:40 +02:00
Roland Häder
98b407218d
Fixes: 
- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:39:10 +02:00
Roland Häder
11c16f1123
Continued: 
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:32:03 +02:00
Roland Haeder
635b26353c
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:08:15 +02:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Thomas Willingham
7177cc3858 Accidentally included a self-loathing verb. 2017-04-30 11:16:04 +01:00
Thomas Willingham
6eff506cdd Add the dlogger 2017-04-30 11:14:38 +01:00
Hypolite Petovan
1ab28bbe03 Add Text_Highlighter to Composer 
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
 2017-04-05 00:31:49 -04:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Michael
e9b083d13d
You shoudln't use a text variable like an array. 2017-03-19 01:23:34 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:50:19 +01:00
rabuzarus
0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Hypolite Petovan
07aefe61bf Update paginate_data() 
- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type
 2017-03-01 23:26:49 -05:00
rabuzarus
3474b40732 fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts 2017-02-10 03:51:01 +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
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Roland Haeder
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

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:13:50 +01:00
Roland Häder
5588472f6d added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:16 +01:00
Roland Häder
fb0ed18a43 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:03 +01:00
Roland Häder
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
Roland Häder
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
Roland Häder
a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:36 +01:00
Roland Häder
63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
 2016-12-13 11:00:44 +01:00
Roland Häder
6a8a36f12d More usage of dbm::is_result($r) instead of count($r): 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:44:13 +01:00
Roland Häder
293436e5fd Some rewrites: 
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
  both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
  be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
  currently the same, it may be changed later)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:16:36 +01:00
Hypolite Petovan
e29023dc8c Standards 2016-12-07 23:11:53 -05:00
Hypolite Petovan
5e20aed428 Revert adding a leading slash to redir links 2016-12-04 21:31:28 -05:00
Hypolite Petovan
47a370c5e3 Revert adding baseurl to private image URL 2016-12-03 10:39:06 -05:00
Hypolite Petovan
0f2c27e041 Merge branch 'develop' into issue/missing-private-image-src 2016-12-03 10:34:48 -05:00
Michael
fd28ecaacc Pending contacts shouldn't be displayed in the sidebar 2016-11-29 06:40:35 +00:00
Michael
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Michael
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
Hypolite Petovan
c2eb2f460b Fix Friendica private image URL replacing 
- Add baseurl to redir_private_images to prevent empty src attribute in
generated HTML
- URL encode the URL parameter url and conurl
- Formatting
- Documentation
 2016-11-18 22:05:56 -05:00
Hypolite Petovan
3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
Hypolite Petovan
c2e17cb9c4 bbcode documentation: fix broken bookmark form: #^[url]...[/url] 
- Prevents the advance recognition of `^` in tags before bbcode()
- Formatting
- Documentation
 2016-10-30 23:59:14 -04:00
Michael
bebcbd04d3 We should check values after we fetched them :-) 2016-10-28 04:29:22 +00:00
Michael
6601e8c2b7 Prevent a memory Access Violation when the database isn't connected 2016-10-27 20:16:56 +00:00
Hypolite Petovan
b806f87874 Formatting changes to make @annando happy 2016-10-22 13:54:30 -04:00
Hypolite Petovan
9a59878190 Standards enforcing 2016-10-21 23:08:42 -04:00
Hypolite Petovan
44d5dec06f Improve logger performance 
- Reorder condition to prevent constant lookup (one-time ~3,500 substr)
- Enforce coding standards
 2016-10-21 23:00:05 -04:00
Hypolite Petovan
8fc558b8e6 Fix #2817 
- Change all references to language folders
 2016-09-30 10:46:56 -04:00
Michael Vogel
5f9a392fc4 At the search we should do it as well. 2016-09-23 06:36:48 +00:00
Roland Haeder
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
84e84a0689 Small performance improvements 2016-08-01 07:22:54 +02:00
Michael Vogel
fc25e605cb Logging for feeds improved, new "process id" for logging 2016-07-07 20:32:13 +02:00
Michael Vogel
e67554924a use thumb avatar size instead of micro size in the contact list 2016-07-02 09:32:42 +02:00
rabuzarus
fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
rabuzarus
b977efc95c code highlight - some spacing for readability 2016-06-17 15:29:01 +02:00
rabuzarus
0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
rabuzarus
3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Roland Haeder
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
Tobias Diekershoff
c7d8102afe
added title element to emoji images in main repository 2016-05-01 13:47:24 +02:00
rabuzarus
0e531e148e
rework autocomplete: polishing class and methods naming 2016-05-01 13:46:08 +02:00
rabuzarus
12479fb478
rework autocomplete: Access list of smilies over JSON 2016-05-01 13:46:08 +02:00
rabuzarus
01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
 2016-04-14 16:23:51 +02:00
Tobias Diekershoff
bc579ff799 added title element to emoji images in main repository 2016-03-17 17:41:06 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
rabuzarus
30c375d238 rework autocomplete: polishing class and methods naming 2016-02-05 14:26:22 +01:00
Fabrixxm
9fcd74f470 Pass App class instace to all templates via "$APP" variable 2016-02-03 14:01:37 +01:00
rabuzarus
5f7c5e6ab6 rework autocomplete: Access list of smilies over JSON 2016-02-01 17:43:12 +01:00
rabuzarus
8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel
44091aa631 Removed unused functions 2016-01-24 00:11:16 +01:00
Michael Vogel
2275203917 Just some improved queries 2016-01-16 12:32:11 +01:00
Michael Vogel
092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel
c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
rabuzarus
3af7cff281 remove unneeded function page_type_translate() 2015-12-03 00:08:43 +01:00
rabuzarus
89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel
0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory 
display contact information in contact and directory according to the…
 2015-11-30 18:07:35 +01:00
Michael Vogel
25c0c5d4ad Issue 1925 - display nickname@hostname.com 2015-11-28 18:49:37 +01:00
rabuzarus
9189971cb8 display contact information in contact and directory according to the other contact related pages 2015-11-28 02:56:36 +01:00
Fabrixxm
6605e30cf2 pass to all templates by default 2015-11-13 10:56:37 +01:00
Tobias Diekershoff
c0e87b2bea Merge pull request #2045 from annando/1511-dirfind-addr 
You can now discover previously unknown users via the dirsearch
 2015-11-08 15:19:11 +01:00
Michael Vogel
e12b0d27bb You can now search for @username@domain.tld in dirfind and the search will resolve that. 2015-11-08 14:48:47 +01:00
fabrixxm
ae9c9829fa Remove language selectors from themes 
This is now a user setting
 2015-11-08 14:42:54 +01:00
fabrixxm
0aa69f134f Fix template_var hook 
move it to smarty3 replate_macro, pass the theme name in $b
 2015-11-06 19:52:00 +01:00
fabrixxm
545a7a80e4 Add 'template_vars' hook 2015-11-06 19:33:14 +01:00
Michael Vogel
1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel
7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 2015-10-05 22:25:14 +02:00
Michael Vogel
2676a0f0e5 The proxy function sometimes kills embedded pictures ... 2015-10-05 22:19:34 +02:00
Michael Vogel
b1dddd2936 Only offer forum search in local mode. 2015-08-25 05:54:50 +02:00
Michael Vogel
3bca2db11b Don't show search options in side bar. 2015-08-24 12:12:14 +02:00
Michael Vogel
3ff196f00d Now you can set search options so that searching for contacts or forums isn't occult science anymore. 2015-08-24 11:55:29 +02:00
Michael Vogel
fe8f8ade69 The new link description should be better. 2015-08-14 12:48:54 +02:00
Michael Vogel
a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel
bb7ec55f1f Diaspora now uses a 32 digit guid. 2015-08-12 23:37:50 +02:00
Michael Vogel
d5ba3b3b54 Only show real contacts (Friendica, Diaspora, OStatus) on profile page (no Twitter, Facebook, ...) 2015-08-12 17:48:06 +02:00
Michael Vogel
ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
rabuzarus
68e565889d moved formatBytes() to /include/text.php 2015-06-29 11:22:29 +02:00
Michael Vogel
a7cf3639f0 Just some more fixing for issue 1642 2015-06-22 23:47:08 +02:00
Tobias Diekershoff
8fa2030023 <3 causes troubles in D* 2015-06-20 12:31:34 +02:00
Michael Vogel
b763c810fb OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now) 2015-05-29 10:35:13 +02:00
rabuzarus
b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
fabrixxm
6258a21434 map bbcode tag from Red 2015-05-15 20:41:10 +02:00
Michael Vogel
0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
fabrixxm
add3411542 fix paginate url 
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
 2015-03-22 16:38:05 +01:00
Michael Vogel
7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Michael Vogel
ac3a4824df Check for hashtags when storing them and eventually adding hashtag links 2015-03-01 17:33:55 +01:00
Tobias Diekershoff
d39612ac25 Merge pull request #1393 from annando/1502-cleaned-item-storage-code 
Additional check for notifications
 2015-02-14 15:40:35 +01:00
Johannes Schwab
12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Michael Vogel
1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
fabrixxm
f620834d97 Merge branch 'release-3.3.3' into develop 2015-02-07 12:57:12 +01:00
Johannes Schwab
1114ae4c81 fix urls for pager 2015-02-06 17:04:48 +01:00
Tobias Diekershoff
710bd08c30 adopting red matrix iconography for red# 2015-02-04 08:47:57 +01:00
Michael Vogel
b309187e3d Just two more places where pictures have to be send through the proxy function. 2015-01-28 10:09:16 +01:00
Michael Vogel
459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00