Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 00:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
27865 commits 3 branches 64 tags 237 MiB
Commit graph

587 commits

Author SHA1 Message Date
Michael
09302367d5 Include AP in the contact search 2018-10-06 03:17:44 +00:00
Michael Vogel
7f3fb34c24 Some easy to replace "q" calls have been replaced by "DBA" calls (#5632) 
* Some easy to replace "q" calls have been replaced by "DBA" calls

* Simplified the GUID creation

* And one in the API ...

* And OStatus has got some DBA calls more

* Just some more replaced database calls

* The event query is now simplified

* Events are now shown again

* subthread is now using the DBA calls as well

* Some more replaced database calls

* And some more replaced database calls and prevented notices

* Better use gravity

* Some more replaced database stuff

* Some more replaced database calls in DFRN.php

* The gcontact class now has got the new DBA functions as well

* The Contact class is now changed to new database functions as well

* Small correction

* We can now delete without cascade

* One more functionality is safe for future changes
 2018-08-19 12:46:10 +00:00
Michael Vogel
060e887a31 And still there are notices that have to be removed ... (#5629) 
* And still there are notices that have to be removed ...

* Notice removed in ACL part

* Fix missing fields for notifications

* Fixes issue 5630
 2018-08-18 08:20:50 +02:00
Tobias Diekershoff
d5c2c41b02
Merge pull request #5626 from annando/notices-oh-yeah 
Removed notices, will it ever end?
 2018-08-17 09:33:02 +02:00
Michael Vogel
b6cb83ed4c
Merge pull request #5617 from MrPetovan/task/use-contact-network 
Fix bug with ACL and contact network page
 2018-08-17 05:31:06 +02:00
Michael
0342f9e084 Removed notices, will it ever end? 2018-08-17 03:19:42 +00:00
Michael
e8334c4655 Use the Item class instead of DBA calls when possible 2018-08-15 04:41:49 +00:00
Hypolite Petovan
ea17370211 Fix bug with ACL and contact network page 
- Require user array parameter in ACL::getFullSelectorHTML
- Change all wrong uses where user array was replaced by default
permissions array
 2018-08-15 00:43:27 +02:00
Roland Häder
e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537) 
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
 2018-08-11 22:40:44 +02: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
Roland Häder
37253656e3 Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490) 
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
 2018-07-24 22:53:46 -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
Hypolite Petovan
8ddb94ef06 Use DateTimeFormat::utc() instead of DBM::date() 2018-07-23 10:57:47 -04:00
Hypolite Petovan
4db98eb43d Rename DBA::inArray to DBA::toArray 2018-07-22 19:27:35 -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
5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
Roland Häder
6b5d90333f Fixes for some E_NOTICE and type-hints added (#5358) 
* Fixed http://github to https://github

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes for #4965:
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed E_NOTICE where isset()/empty() was absent.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed missing variable $sql_order causing E_NOTICE.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- added array type-hint where known (some)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes:
- in Profile::load() $user is now only one-dimensional
- $a->get_hostname is no property, it is a method

Signed-off-by: Roland Häder <roland@mxchange.org>

* reverted changes that are unintended

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- removed leading \ (uncommon, okay)
- removed entire if() block (CR by Hypolite)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-07-13 15:47:14 -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
Michael
3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael
bffdf96d87 The "file" variable isn't stored anymore in the item table 2018-07-01 07:57:59 +00:00
Michael
76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
Michael
b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
Michael
6e10de9284 New function to fetch item data especially for users 2018-06-17 17:05:17 +00:00
Michael
0280a46ab4 Use predefined field lists 2018-06-17 06:27:52 +00:00
Michael
bb79b8f4ac More item calls have been replaced with the new functions 2018-06-15 22:30:49 +00:00
Michael
3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Michael
5bcb9daa43 Use local_user instead 2018-05-29 18:57:32 +00:00
Michael
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Michael
fd318a1193 Corrected query to don't show hash tag posts from blocked or ignored contacts 2018-04-28 16:12:45 +00:00
Hypolite Petovan
20843fee38 Reintroduce own posts in network list 2018-04-09 22:50:03 -04:00
Hypolite Petovan
99b446eccc Remove useless intval() calls in mod/network 2018-04-09 09:19:49 -04:00
Hypolite Petovan
7563adcc7d Use positive form for relationship check in mod/network 2018-04-08 20:47:16 -04:00
Hypolite Petovan
b28fd98acd Replaced < comparison with IN for contact.rel in mod/network 2018-04-08 09:59:43 -04:00
Hypolite Petovan
c8b0520144 Use CONTACT_IS_SHARING constant instead of rel value 2018-04-07 08:09:13 -04:00
Hypolite Petovan
b798ad126a Hide posts from recently ignored or unfollowed contact in mod/network 2018-04-07 02:42:42 -04:00
Hypolite Petovan
a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Michael
ccfaf6eef3 Items on the network page should now be ordered always like expected 2018-02-28 20:21:31 +00:00
Michael Vogel
617ace38e4
Merge pull request #4515 from MrPetovan/task/4513-hide-attendno-events 
Add attendance check to event reminder
 2018-02-28 15:29:16 +01:00
Michael
60d00087f0 Don't do the restriction on thread starters when loading a single thread 2018-02-28 06:36:41 +00:00
Hypolite Petovan
f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
Michael
02e969a73b Only update toplevel posts when ordered after posts 2018-02-27 23:25:29 +00:00
Michael
9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00
Michael
4070ad1815 After a post only the single post is now updated 2018-02-27 21:10:05 +00:00
Michael
99c6711cfd Following tags on the network page should now work for comments as well 2018-02-27 13:23:25 +00:00
Hypolite Petovan
9297f0305f
Merge pull request #4506 from annando/fix-update 
Fix for network update (number of maximum comments set to 0)
 2018-02-27 04:18:13 -05:00
Michael
15cd4792b8 Bugfix: The network update after a post now works again 2018-02-27 06:28:53 +00:00
Michael
20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael
a700b3a729 Fix for fetching too old dates 2018-02-26 10:44:54 +00:00
Michael
9ac9481105 Flexible update timeout value 2018-02-26 07:41:58 +00:00
Michael
fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Michael
9308b7f2df inner join is better 2018-02-25 21:58:21 +00:00
Michael
a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
rabuzarus
2e03a3a47f fix undeclared variables or wrong variable names (/mod) 2018-02-12 03:25:09 +01:00
Michael
ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
Michael
e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
8aff8a76eb Add Temporal::utcNow() 2018-02-03 08:56:52 -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
Michael
03aafa8228 Public commenting is now always enabled 2018-01-31 23:22:41 +00: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
Michael
e8effad7f2 Bugfix: Always comment on the correct entry 2018-01-22 17:16:46 +00:00
Hypolite Petovan
0a8e350e4b Remove PConfig nets.selected and group.selected from mod/network 2018-01-21 10:49:05 -05:00
Hypolite Petovan
cb1e305970 Fix quote style for non-SQL, non-translation strings in mod/network 2018-01-21 10:48:15 -05:00
Hypolite Petovan
83124a8d57 Fix formatting in mod/network 2018-01-21 10:26:05 -05:00
Adam Magness
11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -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
6cf6029ff5 Rename functions and calls 
Rename functions and update calls
 2018-01-15 09:50:06 -05:00
Hypolite Petovan
224cfb2746
Merge pull request #4241 from annando/network-update 
Update after comment on public post should now work on the network page
 2018-01-15 09:16:00 -05:00
Michael
94c349a720 Don't use count 2018-01-15 14:02:34 +00:00
Michael
f18d459e46 Update after comment on public post should now work on the network page 2018-01-15 06:59:20 +00:00
Adam Magness
4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -05:00
Michael
eee3ae9617 Only filter for hash tags on federated networks 2018-01-12 00:23:45 +00:00
Michael
e52a2edcf4 Filtering by network type in hash tag following is now possible 2018-01-12 00:14:58 +00:00
Hypolite Petovan
5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Hypolite Petovan
ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan
da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Michael
b007823bca Only do it when public commenting is enabled 2018-01-08 06:59:49 +00:00
Michael
e2ed1fb426 Only show tagged items when there is no filter active 2018-01-08 06:57:51 +00:00
Michael
10b237829f We now can follow hash tags 2018-01-07 22:07:16 +00:00
Hypolite Petovan
d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
Hypolite Petovan
9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
Hypolite Petovan
97bc54cf1b Fix formatting and PHP notices in network and photo modules 
- Remove unused variable $file and associated SQL
- Add back uninitialized variables
 2018-01-02 08:11:14 -05:00
Hypolite Petovan
2dc598ed5b Move login() to Login module 
- Move nuke_session to include/security
- Remove mod/login
 2017-12-29 21:55:13 -05:00
Hypolite Petovan
4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan
abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05: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
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
Hypolite Petovan
58ac3532b7 Fix undefined variables messages 2017-12-01 08:32:21 -05:00
Michael
661f9af93a Network page: Selecting a forum overrides the group selection 2017-11-26 16:17:32 +00:00
Adam Magness
7cee150868 ForumManager to src 
ForumManager moved to Friendica\Content namespace
 2017-11-21 07:20:22 -05: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
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Michael
d739fe2503 Issue 3860: Enhanced support of "!" for forums 2017-11-03 05:07:19 +00:00
Michael
c92ed9bc5e Bugfix: Switch to all networks when posts for a single contact are selected. 2017-10-18 18:54:06 +00:00
Michael
ecce105ae8 Avoid SQL error when in Forum view 2017-10-07 21:51:03 +00:00
Michael
c3589dc043 Added documentation 2017-09-14 06:10:33 +00:00
Michael
92537d6926 Rearranged code 2017-09-13 09:20:08 +00:00
Michael
a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +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
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Michael
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Hypolite Petovan
4b16de6d80 Fix wrong class name case 
- Use leading backslash for non-namespace class names in App
 2017-05-02 23:36:46 -04:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Michael
33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
Michael
407e25e7d6 Some little standard stuff 2017-04-04 05:39:43 +00:00
Michael
a0216af4bb Issue 1720: Group filter and new tab don't like each other 2017-04-04 05:35:04 +00:00
Roland Haeder
5bc2ebb267
Please use x() correctly: 
<?php
if (x($someArray, 'element')) {
	// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-30 21:37:08 +02:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder
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
Michael
eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael
997e94555b The old pager is removed 2017-02-27 21:46:37 +00:00
Michael
cec79ddf2b See issue 3157: Fulltext is now disabled 2017-02-21 05:23:37 +00:00
Michael
ea18d1829f Reformatted stuff, improved query 2017-01-24 06:45:46 +00:00
Michael
75097ebf37 Added limit 2017-01-19 10:00:44 +00:00
Hypolite Petovan
f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Roland Häder
9fad8109ff
changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:21 +01:00
Roland Häder
20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Haeder
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

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:17:09 +01:00
Roland Haeder
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
Roland Häder
ace8f753ac added much more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-20 11:59:13 +01:00
Roland Häder
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
Roland Häder
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
Roland Häder
abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +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
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
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
Michael
23a97465e5 Avoid SQL errors 2016-12-11 07:09:48 +00:00
Michael
fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +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