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
5588472f6d
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
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
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
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
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
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
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
fd28ecaacc
Pending contacts shouldn't be displayed in the sidebar
2016-11-29 06:40:35 +00:00
3a76a6766f
Issue 2772: Pending contacts should now be displayed
2016-11-28 22:11:13 +00:00
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
bebcbd04d3
We should check values after we fetched them :-)
2016-10-28 04:29:22 +00:00
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
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
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
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
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
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
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
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
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
Beanow
2fe79c564b
Fixed whitespace issue causing trueish results in templates.
...
For example: profiles would show labels with no content.
2014-09-07 15:48:44 +02:00
fabrixxm
9a0c37eb47
new password mail via notification()
...
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Michael Vogel
de75d8ca7f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/admin.php
2014-08-13 00:18:05 +02:00
Michael Vogel
d4b2d3bf8a
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
2014-08-13 00:13:13 +02:00
fabrixxm
27024e3b1d
preferred item image size for theme, get smallest photo near scale requested
...
themes can declare preferred image size for images in items, with
$a->theme_info = array(
"item_image_size" => 1
);
0: original, 1:640px, 2:320px
mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
2014-07-30 15:37:34 +02:00
Michael Vogel
e2f9ae3970
Removing of some warnings
2014-07-24 22:53:09 +02:00
Michael Vogel
6541247bd3
Use the GUID to refer to items (preparation for future changes)
2014-07-15 08:47:36 +02:00
Michael Vogel
f68bbffb64
Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews)
2014-07-09 20:44:12 +02:00
fabrixxm
0b83432bf3
better logger format, some comments
2014-04-27 15:18:43 +02:00
fabrixxm
22c45b9bf1
Merge pull request #938 from annando/master
...
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
2014-04-22 16:15:42 +02:00
Michael Vogel
b64ddcce96
Accepting "!"-links as tags. (They are used at statusnet for groups)
2014-04-22 15:54:56 +02:00
fabrixxm
29092ace44
Merge pull request #927 from annando/master
...
Massive SQL stuff
2014-04-04 07:28:06 +00:00
Michael Vogel
a410d9caae
When a user isn't logged in, then the item link got to an invalid address.
2014-03-20 18:46:35 +01:00
Michael Vogel
9496537e5f
Now term table is used for categories and putting items to folder
2014-03-16 17:16:01 +01:00
Michael Vogel
6e7bd68ebb
More "LIMIT 1" removed - and some other SQL improvements.
2014-03-11 23:52:32 +01:00
d29c981aa2
Merge pull request #919 from annando/master
...
plink, disabling features, triming the content of parsed urls
2014-03-02 08:31:03 +01:00
Michael Vogel
9c87e00dd3
Preparation for a new variable that points to the post on the own friendica server
2014-03-02 00:47:22 +01:00
3bbe7a75ec
Merge pull request #911 from annando/master
...
target="_blank" and api improvements
2014-02-16 14:15:44 +01:00
Michael Vogel
01971428aa
target="_blank" instead of target="external-link"
2014-02-11 23:42:06 +01:00
fabrixxm
e312b734ca
Merge pull request #899 from fabrixxm/issue_898
...
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
2014-01-21 23:42:04 -08:00
Fabrixxm
682793ccd3
use 'ENT_QUOTES' in xmlify/unxmlify
2014-01-20 02:59:20 -05:00
c52973f956
red# links to redmatrix.me
2014-01-17 09:25:52 +01:00
Fabrixxm
1e87f4eb8c
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
2014-01-16 09:08:51 -05:00
Michael Vogel
5d3ebcc2cf
Bugfix of the bugfix :)
2013-12-10 21:16:13 +01:00
Michael Vogel
eca9431909
Bugfix: Problem with page switching with the old pager solved
2013-12-10 15:45:26 +01:00
Michael Vogel
7e5c8ab91c
Keeping an offset for page switching: This helps so that you don't see old messages
2013-12-10 00:13:19 +01:00
Michael Vogel
d20d2f74ae
Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms
2013-12-08 20:10:28 +01:00
Mats Sjöberg
2859ce1483
Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.
2013-11-21 21:44:18 +02:00
friendica
bfc9cfb82f
put tags in items
2013-06-26 04:02:04 -07:00
fabrixxm
5cdeef22ea
pager: fix stupid typo
2013-06-19 14:28:39 +02:00
Fabrixxm
faa510befc
move html from paginate functions to template
2013-06-13 08:12:15 -04:00
2b09b8ae17
make red# available as a smilie
2013-05-27 08:34:12 +02:00
Zach Prezkuta
35358baac9
update to v4.0.0; point to local host of SWF
2013-05-11 10:55:09 -06:00
Zach Prezkuta
fec4581f34
basic video playback support using VideoJS
2013-05-03 18:17:56 -06:00
Fabrixxm
d36292c532
template: set smarty3 as default template engine in theme info array.
...
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
2013-04-23 03:35:31 -04:00
Fabrixxm
ddf1caf0fd
template engine rework
...
- use smarty3 as default engine
- new pluggable template engine system
2013-04-23 03:27:52 -04:00
Fabrixxm
1a8bdf8ae8
more phpdocs
2013-03-27 10:28:56 +01:00
Fabrixxm
a161b86d1f
add phpdoc
2013-03-27 05:11:40 -04:00
Zach Prezkuta
0187283709
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
Michael Vogel
93143702ed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
2013-02-17 12:35:40 +01:00
fermionic
a0e18a0ff8
Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify
...
move mb_strlen call out of for loop definition
2013-02-06 21:38:15 -08:00
Zach Prezkuta
c886927a52
use mb_ereg_replace for xmlify and unxmlify
2013-02-06 22:30:27 -07:00
Zach Prezkuta
18f71c1050
parsing multi-byte strings with xmlify
2013-02-06 00:37:15 -07:00
Zach Prezkuta
774a78dbde
better unicode support in xmlify
2013-02-05 23:02:13 -07:00
Zach Prezkuta
6152cbd5ac
add support for more file attachment types
2013-02-04 22:15:16 -07:00
Zach Prezkuta
b6bc7daadf
move mb_strlen call out of for loop definition
2013-02-04 20:17:56 -07:00
Michael Vogel
2cb576d305
Bugfixing after adding timestamps
2013-01-27 13:57:44 +01:00
Michael Vogel
fdee002f73
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
Michael - piratica.eu
2c93067682
Performance: Adding several variables for performance measuring.
2013-01-26 16:46:43 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
Michael Vogel
82c00660e0
Preloading of items in the cache when receiving them.
2013-01-17 23:20:40 +01:00
Michael Vogel
5501dd0759
Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.
2013-01-13 17:13:01 +01:00
friendica
8b643d4c88
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
...
fixes and tweaks to Smarty processing
2013-01-12 12:28:14 -08:00
Zach Prezkuta
74caf1a4a7
* Add MIME types for file attachments
...
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
2013-01-12 06:31:32 -07:00
Zach Prezkuta
609c45e791
fixes and tweaks to Smarty processing
2013-01-12 05:58:54 -07:00
Zach Prezkuta
5f1ef732e0
remove now-unnecessary line in text.php
2013-01-10 21:48:33 -07:00
friendica
215a7f139c
make smarty error reporting a bit less chatty
2012-12-30 00:29:07 -08:00
Zach Prezkuta
e736abd372
small fixes; update smarty3 templates
2012-12-25 12:05:46 -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
