bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

Browse source 
Conflicts:
	include/uimport.php
This commit is contained in:
Michael 2017-05-13 04:13:07 +00:00
commit e884090efa
26 changed files with 1834 additions and 1816 deletions
Download patch file Download diff file Expand all files Collapse all files

2008
doc/api.md
View file

@ -1,1004 +1,1004 @@
Friendica API Friendica API
=== ===
* [Home](help) * [Home](help)
The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public). The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public).
Please refer to the linked documentation for further information. Please refer to the linked documentation for further information.
## Implemented API calls ## Implemented API calls
### General ### General
#### HTTP Method #### HTTP Method
API endpoints can restrict the method used to request them. API endpoints can restrict the method used to request them.
Using an invalid method results in HTTP error 405 "Method Not Allowed". Using an invalid method results in HTTP error 405 "Method Not Allowed".
In this document, the required method is listed after the endpoint name. "*" means every method can be used. In this document, the required method is listed after the endpoint name. "*" means every method can be used.
#### Auth #### Auth
Friendica supports basic http auth and OAuth 1 to authenticate the user to the api. Friendica supports basic http auth and OAuth 1 to authenticate the user to the api.
OAuth settings can be added by the user in web UI under /settings/oauth/ OAuth settings can be added by the user in web UI under /settings/oauth/
In this document, endpoints which requires auth are marked with "AUTH" after endpoint name In this document, endpoints which requires auth are marked with "AUTH" after endpoint name
#### Unsupported parameters #### Unsupported parameters
* cursor: Not implemented in GNU Social * cursor: Not implemented in GNU Social
* trim_user: Not implemented in GNU Social * trim_user: Not implemented in GNU Social
* contributor_details: Not implemented in GNU Social * contributor_details: Not implemented in GNU Social
* place_id: Not implemented in GNU Social * place_id: Not implemented in GNU Social
* display_coordinates: Not implemented in GNU Social * display_coordinates: Not implemented in GNU Social
* include_rts: To-Do * include_rts: To-Do
* include_my_retweet: Retweets in Friendica are implemented in a different way * include_my_retweet: Retweets in Friendica are implemented in a different way
#### Different behaviour #### Different behaviour
* screen_name: The nick name in friendica is only unique in each network but not for all networks. The users are searched in the following priority: Friendica, StatusNet/GNU Social, Diaspora, pump.io, Twitter. If no contact was found by this way, then the first contact is taken. * screen_name: The nick name in friendica is only unique in each network but not for all networks. The users are searched in the following priority: Friendica, StatusNet/GNU Social, Diaspora, pump.io, Twitter. If no contact was found by this way, then the first contact is taken.
* include_entities: Default is "false". If set to "true" then the plain text is formatted so that links are having descriptions. * include_entities: Default is "false". If set to "true" then the plain text is formatted so that links are having descriptions.
#### Return values #### Return values
* cid: Contact id of the user (important for "contact_allow" and "contact_deny") * cid: Contact id of the user (important for "contact_allow" and "contact_deny")
* network: network of the user * network: network of the user
#### Errors #### Errors
When an error occour in API call, an HTTP error code is returned, with an error message When an error occour in API call, an HTTP error code is returned, with an error message
Usually: Usually:
- 400 Bad Request: if parameter are missing or items can't be found - 400 Bad Request: if parameter are missing or items can't be found
- 403 Forbidden: if authenticated user is missing - 403 Forbidden: if authenticated user is missing
- 405 Method Not Allowed: if API was called with invalid method, eg. GET when API require POST - 405 Method Not Allowed: if API was called with invalid method, eg. GET when API require POST
- 501 Not Implemented: if requested API doesn't exists - 501 Not Implemented: if requested API doesn't exists
- 500 Internal Server Error: on other error contitions - 500 Internal Server Error: on other error contitions
Error body is Error body is
json: json:
``` ```
{ {
"error": "Specific error message", "error": "Specific error message",
"request": "API path requested", "request": "API path requested",
"code": "HTTP error code" "code": "HTTP error code"
} }
``` ```
xml: xml:
``` ```
<status> <status>
<error>Specific error message</error> <error>Specific error message</error>
<request>API path requested</request> <request>API path requested</request>
<code>HTTP error code</code> <code>HTTP error code</code>
</status> </status>
``` ```
--- ---
### account/rate_limit_status (*; AUTH) ### account/rate_limit_status (*; AUTH)
--- ---
### account/verify_credentials (*; AUTH) ### account/verify_credentials (*; AUTH)
#### Parameters #### Parameters
* skip_status: Don't show the "status" field. (Default: false) * skip_status: Don't show the "status" field. (Default: false)
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### conversation/show (*; AUTH) ### conversation/show (*; AUTH)
Unofficial Twitter command. It shows all direct answers (excluding the original post) to a given id. Unofficial Twitter command. It shows all direct answers (excluding the original post) to a given id.
#### Parameter #### Parameter
* id: id of the post * id: id of the post
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### direct_messages (*; AUTH) ### direct_messages (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain" * getText: Defines the format of the status field. Can be "html" or "plain"
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
* friendica_verbose: "true" enables different error returns (default: "false") * friendica_verbose: "true" enables different error returns (default: "false")
#### Unsupported parameters #### Unsupported parameters
* skip_status * skip_status
--- ---
### direct_messages/all (*; AUTH) ### direct_messages/all (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain" * getText: Defines the format of the status field. Can be "html" or "plain"
* friendica_verbose: "true" enables different error returns (default: "false") * friendica_verbose: "true" enables different error returns (default: "false")
--- ---
### direct_messages/conversation (*; AUTH) ### direct_messages/conversation (*; AUTH)
Shows all direct messages of a conversation Shows all direct messages of a conversation
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain" * getText: Defines the format of the status field. Can be "html" or "plain"
* uri: URI of the conversation * uri: URI of the conversation
* friendica_verbose: "true" enables different error returns (default: "false") * friendica_verbose: "true" enables different error returns (default: "false")
--- ---
### direct_messages/sent (*; AUTH) ### direct_messages/sent (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain" * getText: Defines the format of the status field. Can be "html" or "plain"
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
* friendica_verbose: "true" enables different error returns (default: "false") * friendica_verbose: "true" enables different error returns (default: "false")
--- ---
### direct_messages/new (POST,PUT; AUTH) ### direct_messages/new (POST,PUT; AUTH)
#### Parameters #### Parameters
* user_id: id of the user * user_id: id of the user
* screen_name: screen name (for technical reasons, this value is not unique!) * screen_name: screen name (for technical reasons, this value is not unique!)
* text: The message * text: The message
* replyto: ID of the replied direct message * replyto: ID of the replied direct message
* title: Title of the direct message * title: Title of the direct message
--- ---
### direct_messages/destroy (POST,DELETE; AUTH) ### direct_messages/destroy (POST,DELETE; AUTH)
#### Parameters #### Parameters
* id: id of the message to be deleted * id: id of the message to be deleted
* include_entities: optional, currently not yet implemented * include_entities: optional, currently not yet implemented
* friendica_parenturi: optional, can be used for increased safety to delete only intended messages * friendica_parenturi: optional, can be used for increased safety to delete only intended messages
* friendica_verbose: "true" enables different error returns (default: "false") * friendica_verbose: "true" enables different error returns (default: "false")
#### Return values #### Return values
On success: On success:
* JSON return as defined for Twitter API not yet implemented * JSON return as defined for Twitter API not yet implemented
* on friendica_verbose=true: JSON return {"result":"ok","message":"message deleted"} * on friendica_verbose=true: JSON return {"result":"ok","message":"message deleted"}
On error: On error:
HTTP 400 BadRequest HTTP 400 BadRequest
* on friendica_verbose=true: different JSON returns {"result":"error","message":"xyz"} * on friendica_verbose=true: different JSON returns {"result":"error","message":"xyz"}
--- ---
### externalprofile/show (*) ### externalprofile/show (*)
#### Parameters #### Parameters
* profileurl: profile url * profileurl: profile url
--- ---
### favorites (*; AUTH) ### favorites (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* user_id * user_id
* screen_name * screen_name
Favorites aren't displayed to other users, so "user_id" and "screen_name" are unsupported. Favorites aren't displayed to other users, so "user_id" and "screen_name" are unsupported.
Set this values will result in an empty array. Set this values will result in an empty array.
--- ---
### favorites/create (POST,PUT; AUTH) ### favorites/create (POST,PUT; AUTH)
#### Parameters #### Parameters
* id * id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### favorites/destroy (POST,DELETE; AUTH) ### favorites/destroy (POST,DELETE; AUTH)
#### Parameters #### Parameters
* id * id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### followers/ids (*; AUTH) ### followers/ids (*; AUTH)
#### Parameters #### Parameters
* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false) * stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
#### Unsupported parameters #### Unsupported parameters
* user_id * user_id
* screen_name * screen_name
* cursor * cursor
Friendica doesn't allow showing followers of other users. Friendica doesn't allow showing followers of other users.
--- ---
### friends/ids (*; AUTH) ### friends/ids (*; AUTH)
#### Parameters #### Parameters
* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false) * stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
#### Unsupported parameters #### Unsupported parameters
* user_id * user_id
* screen_name * screen_name
* cursor * cursor
Friendica doesn't allow showing friends of other users. Friendica doesn't allow showing friends of other users.
--- ---
### help/test (*) ### help/test (*)
--- ---
### media/upload (POST,PUT; AUTH) ### media/upload (POST,PUT; AUTH)
#### Parameters #### Parameters
* media: image data * media: image data
--- ---
### oauth/request_token (*) ### oauth/request_token (*)
#### Parameters #### Parameters
* oauth_callback * oauth_callback
#### Unsupported parameters #### Unsupported parameters
* x_auth_access_type * x_auth_access_type
--- ---
### oauth/access_token (*) ### oauth/access_token (*)
#### Parameters #### Parameters
* oauth_verifier * oauth_verifier
#### Unsupported parameters #### Unsupported parameters
* x_auth_password * x_auth_password
* x_auth_username * x_auth_username
* x_auth_mode * x_auth_mode
--- ---
### statuses/destroy (POST,DELETE; AUTH) ### statuses/destroy (POST,DELETE; AUTH)
#### Parameters #### Parameters
* id: message number * id: message number
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* trim_user * trim_user
--- ---
### statuses/followers (*; AUTH) ### statuses/followers (*; AUTH)
#### Parameters #### Parameters
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### statuses/friends (*; AUTH) ### statuses/friends (*; AUTH)
#### Parameters #### Parameters
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### statuses/friends_timeline (*; AUTH) ### statuses/friends_timeline (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* exclude_replies: don't show replies (default: false) * exclude_replies: don't show replies (default: false)
* conversation_id: Shows all statuses of a given conversation. * conversation_id: Shows all statuses of a given conversation.
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### statuses/home_timeline (*; AUTH) ### statuses/home_timeline (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* exclude_replies: don't show replies (default: false) * exclude_replies: don't show replies (default: false)
* conversation_id: Shows all statuses of a given conversation. * conversation_id: Shows all statuses of a given conversation.
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### statuses/mentions (*; AUTH) ### statuses/mentions (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### statuses/public_timeline (*; AUTH) ### statuses/public_timeline (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* exclude_replies: don't show replies (default: false) * exclude_replies: don't show replies (default: false)
* conversation_id: Shows all statuses of a given conversation. * conversation_id: Shows all statuses of a given conversation.
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* trim_user * trim_user
--- ---
### statuses/replies (*; AUTH) ### statuses/replies (*; AUTH)
#### Parameters #### Parameters
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### statuses/retweet (POST,PUT; AUTH) ### statuses/retweet (POST,PUT; AUTH)
#### Parameters #### Parameters
* id: message number * id: message number
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* trim_user * trim_user
--- ---
### statuses/show (*; AUTH) ### statuses/show (*; AUTH)
#### Parameters #### Parameters
* id: message number * id: message number
* conversation: if set to "1" show all messages of the conversation with the given id * conversation: if set to "1" show all messages of the conversation with the given id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_my_retweet * include_my_retweet
* trim_user * trim_user
--- ---
### statuses/update, statuses/update_with_media ### statuses/update, statuses/update_with_media
#### Parameters #### Parameters
* title: Title of the status * title: Title of the status
* status: Status in text format * status: Status in text format
* htmlstatus: Status in HTML format * htmlstatus: Status in HTML format
* in_reply_to_status_id * in_reply_to_status_id
* lat: latitude * lat: latitude
* long: longitude * long: longitude
* media: image data * media: image data
* source: Application name * source: Application name
* group_allow * group_allow
* contact_allow * contact_allow
* group_deny * group_deny
* contact_deny * contact_deny
* network * network
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
* media_ids: (By now only a single value, no array) * media_ids: (By now only a single value, no array)
#### Unsupported parameters #### Unsupported parameters
* trim_user * trim_user
* place_id * place_id
* display_coordinates * display_coordinates
--- ---
### statuses/user_timeline (*; AUTH) ### statuses/user_timeline (*; AUTH)
#### Parameters #### Parameters
* user_id: id of the user * user_id: id of the user
* screen_name: screen name (for technical reasons, this value is not unique!) * screen_name: screen name (for technical reasons, this value is not unique!)
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* exclude_replies: don't show replies (default: false) * exclude_replies: don't show replies (default: false)
* conversation_id: Shows all statuses of a given conversation. * conversation_id: Shows all statuses of a given conversation.
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* include_rts * include_rts
* trim_user * trim_user
* contributor_details * contributor_details
--- ---
### statusnet/config (*) ### statusnet/config (*)
--- ---
### statusnet/conversation (*; AUTH) ### statusnet/conversation (*; AUTH)
It shows all direct answers (excluding the original post) to a given id. It shows all direct answers (excluding the original post) to a given id.
#### Parameter #### Parameter
* id: id of the post * id: id of the post
* count: Items per page (default: 20) * count: Items per page (default: 20)
* page: page number * page: page number
* since_id: minimal id * since_id: minimal id
* max_id: maximum id * max_id: maximum id
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
--- ---
### statusnet/version (*) ### statusnet/version (*)
#### Unsupported parameters #### Unsupported parameters
* user_id * user_id
* screen_name * screen_name
* cursor * cursor
Friendica doesn't allow showing followers of other users. Friendica doesn't allow showing followers of other users.
--- ---
### users/search (*) ### users/search (*)
#### Parameters #### Parameters
* q: name of the user * q: name of the user
#### Unsupported parameters #### Unsupported parameters
* page * page
* count * count
* include_entities * include_entities
--- ---
### users/show (*) ### users/show (*)
#### Parameters #### Parameters
* user_id: id of the user * user_id: id of the user
* screen_name: screen name (for technical reasons, this value is not unique!) * screen_name: screen name (for technical reasons, this value is not unique!)
* include_entities: "true" shows entities for pictures and links (Default: false) * include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters #### Unsupported parameters
* user_id * user_id
* screen_name * screen_name
* cursor * cursor
Friendica doesn't allow showing friends of other users. Friendica doesn't allow showing friends of other users.
--- ---
### account/update_profile_image (POST; AUTH) ### account/update_profile_image (POST; AUTH)
#### Parameters #### Parameters
* image: image data as base64 (Twitter has a limit of 700kb, Friendica allows more) * image: image data as base64 (Twitter has a limit of 700kb, Friendica allows more)
* profile_id (optional): id of the profile for which the image should be used, default is changing the default profile * profile_id (optional): id of the profile for which the image should be used, default is changing the default profile
uploads a new profile image (scales 4-6) to database, changes default or specified profile to the new photo uploads a new profile image (scales 4-6) to database, changes default or specified profile to the new photo
#### Return values #### Return values
On success: On success:
* JSON return: returns the updated user details (see account/verify_credentials) * JSON return: returns the updated user details (see account/verify_credentials)
On error: On error:
* 403 FORBIDDEN: if not authenticated * 403 FORBIDDEN: if not authenticated
* 400 BADREQUEST: "no media data submitted", "profile_id not available" * 400 BADREQUEST: "no media data submitted", "profile_id not available"
* 500 INTERNALSERVERERROR: "image size exceeds PHP config settings, file was rejected by server", * 500 INTERNALSERVERERROR: "image size exceeds PHP config settings, file was rejected by server",
"image size exceeds Friendica Config setting (uploaded size: x)", "image size exceeds Friendica Config setting (uploaded size: x)",
"unable to process image data", "unable to process image data",
"image upload failed" "image upload failed"
## Implemented API calls (not compatible with other APIs) ## Implemented API calls (not compatible with other APIs)
--- ---
### friendica/activity/<verb> ### friendica/activity/<verb>
#### parameters #### parameters
* id: item id * id: item id
Add or remove an activity from an item. Add or remove an activity from an item.
'verb' can be one of: 'verb' can be one of:
- like - like
- dislike - dislike
- attendyes - attendyes
- attendno - attendno
- attendmaybe - attendmaybe
To remove an activity, prepend the verb with "un", eg. "unlike" or "undislike" To remove an activity, prepend the verb with "un", eg. "unlike" or "undislike"
Attend verbs disable eachother: that means that if "attendyes" was added to an item, adding "attendno" remove previous "attendyes". Attend verbs disable eachother: that means that if "attendyes" was added to an item, adding "attendno" remove previous "attendyes".
Attend verbs should be used only with event-related items (there is no check at the moment) Attend verbs should be used only with event-related items (there is no check at the moment)
#### Return values #### Return values
On success: On success:
json json
```"ok"``` ```"ok"```
xml xml
```<ok>true</ok>``` ```<ok>true</ok>```
On error: On error:
HTTP 400 BadRequest HTTP 400 BadRequest
--- ---
### friendica/group_show (*; AUTH) ### friendica/group_show (*; AUTH)
Return all or a specified group of the user with the containing contacts as array. Return all or a specified group of the user with the containing contacts as array.
#### Parameters #### Parameters
* gid: optional, if not given, API returns all groups of the user * gid: optional, if not given, API returns all groups of the user
#### Return values #### Return values
Array of: Array of:
* name: name of the group * name: name of the group
* gid: id of the group * gid: id of the group
* user: array of group members (return from api_get_user() function for each member) * user: array of group members (return from api_get_user() function for each member)
--- ---
### friendica/group_delete (POST,DELETE; AUTH) ### friendica/group_delete (POST,DELETE; AUTH)
delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted. delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted.
#### Parameters #### Parameters
* gid: id of the group to be deleted * gid: id of the group to be deleted
* name: name of the group to be deleted * name: name of the group to be deleted
#### Return values #### Return values
Array of: Array of:
* success: true if successfully deleted * success: true if successfully deleted
* gid: gid of the deleted group * gid: gid of the deleted group
* name: name of the deleted group * name: name of the deleted group
* status: „deleted“ if successfully deleted * status: „deleted“ if successfully deleted
* wrong users: empty array * wrong users: empty array
--- ---
### friendica/group_create (POST,PUT; AUTH) ### friendica/group_create (POST,PUT; AUTH)
Create the group with the posted array of contacts as members. Create the group with the posted array of contacts as members.
#### Parameters #### Parameters
* name: name of the group to be created * name: name of the group to be created
#### POST data #### POST data
JSON data as Array like the result of "users/group_show": JSON data as Array like the result of "users/group_show":
* gid * gid
* name * name
* array of users * array of users
#### Return values #### Return values
Array of: Array of:
* success: true if successfully created or reactivated * success: true if successfully created or reactivated
* gid: gid of the created group * gid: gid of the created group
* name: name of the created group * name: name of the created group
* status: „missing user“ | „reactivated“ | „ok“ * status: „missing user“ | „reactivated“ | „ok“
* wrong users: array of users, which were not available in the contact table * wrong users: array of users, which were not available in the contact table
--- ---
### friendica/group_update (POST) ### friendica/group_update (POST)
Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted). Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted).
#### Parameters #### Parameters
* gid: id of the group to be changed * gid: id of the group to be changed
* name: name of the group to be changed * name: name of the group to be changed
#### POST data #### POST data
JSON data as array like the result of „users/group_show“: JSON data as array like the result of „users/group_show“:
* gid * gid
* name * name
* array of users * array of users
#### Return values #### Return values
Array of: Array of:
* success: true if successfully updated * success: true if successfully updated
* gid: gid of the changed group * gid: gid of the changed group
* name: name of the changed group * name: name of the changed group
* status: „missing user“ | „ok“ * status: „missing user“ | „ok“
* wrong users: array of users, which were not available in the contact table * wrong users: array of users, which were not available in the contact table
--- ---
### friendica/notifications (GET) ### friendica/notifications (GET)
Return last 50 notification for current user, ordered by date with unseen item on top Return last 50 notification for current user, ordered by date with unseen item on top
#### Parameters #### Parameters
none none
#### Return values #### Return values
Array of: Array of:
* id: id of the note * id: id of the note
* type: type of notification as int (see NOTIFY_* constants in boot.php) * type: type of notification as int (see NOTIFY_* constants in boot.php)
* name: full name of the contact subject of the note * name: full name of the contact subject of the note
* url: contact's profile url * url: contact's profile url
* photo: contact's profile photo * photo: contact's profile photo
* date: datetime string of the note * date: datetime string of the note
* timestamp: timestamp of the node * timestamp: timestamp of the node
* date_rel: relative date of the note (eg. "1 hour ago") * date_rel: relative date of the note (eg. "1 hour ago")
* msg: note message in bbcode * msg: note message in bbcode
* msg_html: note message in html * msg_html: note message in html
* msg_plain: note message in plain text * msg_plain: note message in plain text
* link: link to note * link: link to note
* seen: seen state: 0 or 1 * seen: seen state: 0 or 1
--- ---
### friendica/notifications/seen (POST) ### friendica/notifications/seen (POST)
Set note as seen, returns item object if possible Set note as seen, returns item object if possible
#### Parameters #### Parameters
id: id of the note to set seen id: id of the note to set seen
#### Return values #### Return values
If the note is linked to an item, the item is returned, just like one of the "statuses/*_timeline" api. If the note is linked to an item, the item is returned, just like one of the "statuses/*_timeline" api.
If the note is not linked to an item, a success status is returned: If the note is not linked to an item, a success status is returned:
* "success" (json) | "&lt;status&gt;success&lt;/status&gt;" (xml) * "success" (json) | "&lt;status&gt;success&lt;/status&gt;" (xml)
--- ---
### friendica/photo (*; AUTH) ### friendica/photo (*; AUTH)
#### Parameters #### Parameters
* photo_id: Resource id of a photo. * photo_id: Resource id of a photo.
* scale: (optional) scale value of the photo * scale: (optional) scale value of the photo
Returns data of a picture with the given resource. Returns data of a picture with the given resource.
If 'scale' isn't provided, returned data include full url to each scale of the photo. If 'scale' isn't provided, returned data include full url to each scale of the photo.
If 'scale' is set, returned data include image data base64 encoded. If 'scale' is set, returned data include image data base64 encoded.
possibile scale value are: possibile scale value are:
* 0: original or max size by server settings * 0: original or max size by server settings
* 1: image with or height at <= 640 * 1: image with or height at <= 640
* 2: image with or height at <= 320 * 2: image with or height at <= 320
* 3: thumbnail 160x160 * 3: thumbnail 160x160
* 4: Profile image at 175x175 * 4: Profile image at 175x175
* 5: Profile image at 80x80 * 5: Profile image at 80x80
* 6: Profile image at 48x48 * 6: Profile image at 48x48
An image used as profile image has only scale 4-6, other images only 0-3 An image used as profile image has only scale 4-6, other images only 0-3
#### Return values #### Return values
json json
``` ```
{ {
"id": "photo id" "id": "photo id"
"created": "date(YYYY-MM-GG HH:MM:SS)", "created": "date(YYYY-MM-GG HH:MM:SS)",
"edited": "date(YYYY-MM-GG HH:MM:SS)", "edited": "date(YYYY-MM-GG HH:MM:SS)",
"title": "photo title", "title": "photo title",
"desc": "photo description", "desc": "photo description",
"album": "album name", "album": "album name",
"filename": "original file name", "filename": "original file name",
"type": "mime type", "type": "mime type",
"height": "number", "height": "number",
"width": "number", "width": "number",
"profile": "1 if is profile photo", "profile": "1 if is profile photo",
"link": { "link": {
"<scale>": "url to image" "<scale>": "url to image"
... ...
}, },
// if 'scale' is set // if 'scale' is set
"datasize": "size in byte", "datasize": "size in byte",
"data": "base64 encoded image data" "data": "base64 encoded image data"
} }
``` ```
xml xml
``` ```
<photo> <photo>
<id>photo id</id> <id>photo id</id>
<created>date(YYYY-MM-GG HH:MM:SS)</created> <created>date(YYYY-MM-GG HH:MM:SS)</created>
<edited>date(YYYY-MM-GG HH:MM:SS)</edited> <edited>date(YYYY-MM-GG HH:MM:SS)</edited>
<title>photo title</title> <title>photo title</title>
<desc>photo description</desc> <desc>photo description</desc>
<album>album name</album> <album>album name</album>
<filename>original file name</filename> <filename>original file name</filename>
<type>mime type</type> <type>mime type</type>
<height>number</height> <height>number</height>
<width>number</width> <width>number</width>
<profile>1 if is profile photo</profile> <profile>1 if is profile photo</profile>
<links type="array"> <links type="array">
<link type="mime type" scale="scale number" href="image url"/> <link type="mime type" scale="scale number" href="image url"/>
... ...
</links> </links>
</photo> </photo>
``` ```
--- ---
### friendica/photos/list (*; AUTH) ### friendica/photos/list (*; AUTH)
Returns a list of all photo resources of the logged in user. Returns a list of all photo resources of the logged in user.
#### Return values #### Return values
json json
``` ```
[ [
{ {
id: "resource_id", id: "resource_id",
album: "album name", album: "album name",
filename: "original file name", filename: "original file name",
type: "image mime type", type: "image mime type",
thumb: "url to thumb sized image" thumb: "url to thumb sized image"
}, },
... ...
] ]
``` ```
xml xml
``` ```
<photos type="array"> <photos type="array">
<photo id="resource_id" <photo id="resource_id"
album="album name" album="album name"
filename="original file name" filename="original file name"
type="image mime type"> type="image mime type">
"url to thumb sized image" "url to thumb sized image"
</photo> </photo>
... ...
</photos> </photos>
``` ```
--- ---
### friendica/photoalbum/delete (POST,DELETE; AUTH) ### friendica/photoalbum/delete (POST,DELETE; AUTH)
#### Parameters #### Parameters
* album: name of the album to be deleted * album: name of the album to be deleted
deletes all images with the specified album name, is not reversible -> ensure that client is asking user for being sure to do this deletes all images with the specified album name, is not reversible -> ensure that client is asking user for being sure to do this
#### Return values #### Return values
On success: On success:
* JSON return {"result":"deleted","message":"album 'xyz' with all containing photos has been deleted."} * JSON return {"result":"deleted","message":"album 'xyz' with all containing photos has been deleted."}
On error: On error:
* 403 FORBIDDEN: if not authenticated * 403 FORBIDDEN: if not authenticated
* 400 BADREQUEST: "no albumname specified", "album not available" * 400 BADREQUEST: "no albumname specified", "album not available"
* 500 INTERNALSERVERERROR: "problem with deleting item occured", "unknown error - deleting from database failed" * 500 INTERNALSERVERERROR: "problem with deleting item occured", "unknown error - deleting from database failed"
--- ---
### friendica/photoalbum/update (POST,PUT; AUTH) ### friendica/photoalbum/update (POST,PUT; AUTH)
#### Parameters #### Parameters
* album: name of the album to be updated * album: name of the album to be updated
* album_new: new name of the album * album_new: new name of the album
changes the album name to album_new for all photos in album changes the album name to album_new for all photos in album
#### Return values #### Return values
On success: On success:
* JSON return {"result":"updated","message":"album 'abc' with all containing photos has been renamed to 'xyz'."} * JSON return {"result":"updated","message":"album 'abc' with all containing photos has been renamed to 'xyz'."}
On error: On error:
* 403 FORBIDDEN: if not authenticated * 403 FORBIDDEN: if not authenticated
* 400 BADREQUEST: "no albumname specified", "no new albumname specified", "album not available" * 400 BADREQUEST: "no albumname specified", "no new albumname specified", "album not available"
* 500 INTERNALSERVERERROR: "unknown error - updating in database failed" * 500 INTERNALSERVERERROR: "unknown error - updating in database failed"
--- ---
### friendica/photo/create (POST; AUTH) ### friendica/photo/create (POST; AUTH)
### friendica/photo/update (POST; AUTH) ### friendica/photo/update (POST; AUTH)
#### Parameters #### Parameters
* photo_id (optional): if specified the photo with this id will be updated * photo_id (optional): if specified the photo with this id will be updated
* media (optional): image data as base64, only optional if photo_id is specified (new upload must have media) * media (optional): image data as base64, only optional if photo_id is specified (new upload must have media)
* desc (optional): description for the photo, updated when photo_id is specified * desc (optional): description for the photo, updated when photo_id is specified
* album: name of the album to be deleted (always necessary) * album: name of the album to be deleted (always necessary)
* album_new (optional): can be used to change the album of a single photo if photo_id is specified * album_new (optional): can be used to change the album of a single photo if photo_id is specified
* allow_cid/allow_gid/deny_cid/deny_gid (optional): on create: empty string or omitting = public photo, specify in format '```<x><y><z>```' for private photo; * allow_cid/allow_gid/deny_cid/deny_gid (optional): on create: empty string or omitting = public photo, specify in format '```<x><y><z>```' for private photo;
on update: keys need to be present with empty values for setting a private photo now to public on update: keys need to be present with empty values for setting a private photo now to public
both calls point to one function for creating AND updating photos. both calls point to one function for creating AND updating photos.
Saves data for the scales 0-2 to database (see above for scale description). Saves data for the scales 0-2 to database (see above for scale description).
Call adds non-visible entries to items table to enable authenticated contacts to comment/like the photo. Call adds non-visible entries to items table to enable authenticated contacts to comment/like the photo.
Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited group. Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited group.
Currently it is best way to inform user that updating rights is not the best way, offer a solution to add photo as a new photo with the new rights. Currently it is best way to inform user that updating rights is not the best way, offer a solution to add photo as a new photo with the new rights.
#### Return values #### Return values
On success: On success:
* new photo uploaded: JSON return with photo data (see friendica/photo) * new photo uploaded: JSON return with photo data (see friendica/photo)
* photo updated - changed photo data: JSON return with photo data (see friendica/photo) * photo updated - changed photo data: JSON return with photo data (see friendica/photo)
* photo updated - changed info: JSON return {"result":"updated","message":"Image id 'xyz' has been updated."} * photo updated - changed info: JSON return {"result":"updated","message":"Image id 'xyz' has been updated."}
* photo updated - nothing changed: JSON return {"result":"cancelled","message":"Nothing to update for image id 'xyz'."} * photo updated - nothing changed: JSON return {"result":"cancelled","message":"Nothing to update for image id 'xyz'."}
On error: On error:
* 403 FORBIDDEN: if not authenticated * 403 FORBIDDEN: if not authenticated
* 400 BADREQUEST: "no albumname specified", "no media data submitted", "photo not available", "acl data invalid" * 400 BADREQUEST: "no albumname specified", "no media data submitted", "photo not available", "acl data invalid"
* 500 INTERNALSERVERERROR: "image size exceeds PHP config settings, file was rejected by server", * 500 INTERNALSERVERERROR: "image size exceeds PHP config settings, file was rejected by server",
"image size exceeds Friendica Config setting (uploaded size: x)", "image size exceeds Friendica Config setting (uploaded size: x)",
"unable to process image data", "unable to process image data",
"image upload failed", "image upload failed",
"unknown error - uploading photo failed, see Friendica log for more information", "unknown error - uploading photo failed, see Friendica log for more information",
"unknown error - update photo entry in database failed", "unknown error - update photo entry in database failed",
"unknown error - this error on uploading or updating a photo should never happen" "unknown error - this error on uploading or updating a photo should never happen"
--- ---
### friendica/photo/delete (DELETE; AUTH) ### friendica/photo/delete (DELETE; AUTH)
#### Parameters #### Parameters
* photo_id: id of the photo to be deleted * photo_id: id of the photo to be deleted
deletes a single image with the specified id, is not reversible -> ensure that client is asking user for being sure to do this deletes a single image with the specified id, is not reversible -> ensure that client is asking user for being sure to do this
Sets item table entries for this photo to deleted = 1 Sets item table entries for this photo to deleted = 1
#### Return values #### Return values
On success: On success:
* JSON return {"result":"deleted","message":"photo with id 'xyz' has been deleted from server."} * JSON return {"result":"deleted","message":"photo with id 'xyz' has been deleted from server."}
On error: On error:
* 403 FORBIDDEN: if not authenticated * 403 FORBIDDEN: if not authenticated
* 400 BADREQUEST: "no photo_id specified", "photo not available" * 400 BADREQUEST: "no photo_id specified", "photo not available"
* 500 INTERNALSERVERERROR: "unknown error on deleting photo", "problem with deleting items occurred" * 500 INTERNALSERVERERROR: "unknown error on deleting photo", "problem with deleting items occurred"
--- ---
### friendica/direct_messages_setseen (GET; AUTH) ### friendica/direct_messages_setseen (GET; AUTH)
#### Parameters #### Parameters
* id: id of the message to be updated as seen * id: id of the message to be updated as seen
#### Return values #### Return values
On success: On success:
* JSON return {"result":"ok","message":"message set to seen"} * JSON return {"result":"ok","message":"message set to seen"}
On error: On error:
* different JSON returns {"result":"error","message":"xyz"} * different JSON returns {"result":"error","message":"xyz"}
--- ---
### friendica/direct_messages_search (GET; AUTH) ### friendica/direct_messages_search (GET; AUTH)
#### Parameters #### Parameters
* searchstring: string for which the API call should search as '%searchstring%' in field 'body' of all messages of the authenticated user (caption ignored) * searchstring: string for which the API call should search as '%searchstring%' in field 'body' of all messages of the authenticated user (caption ignored)
#### Return values #### Return values
Returns only tested with JSON, XML might work as well. Returns only tested with JSON, XML might work as well.
On success: On success:
* JSON return {"success":"true","search_results": array of found messages} * JSON return {"success":"true","search_results": array of found messages}
* JSOn return {"success":"false","search_results":"nothing found"} * JSOn return {"success":"false","search_results":"nothing found"}
On error: On error:
* different JSON returns {"result":"error","message":"searchstring not specified"} * different JSON returns {"result":"error","message":"searchstring not specified"}
--- ---
### friendica/profile/show (GET; AUTH) ### friendica/profile/show (GET; AUTH)
show data of all profiles or a single profile of the authenticated user show data of all profiles or a single profile of the authenticated user
#### Parameters #### Parameters
* profile_id: id of the profile to be returned (optional, if omitted all profiles are returned by default) * profile_id: id of the profile to be returned (optional, if omitted all profiles are returned by default)
#### Return values #### Return values
On success: Array of: On success: Array of:
* multi_profiles: true if user has activated multi_profiles * multi_profiles: true if user has activated multi_profiles
* global_dir: URL of the global directory set in server settings * global_dir: URL of the global directory set in server settings
* friendica_owner: user data of the authenticated user * friendica_owner: user data of the authenticated user
* profiles: array of the profile data * profiles: array of the profile data
On error: On error:
HTTP 403 Forbidden: when no authentication provided HTTP 403 Forbidden: when no authentication provided
HTTP 400 Bad Request: if given profile_id is not in db or not assigned to authenticated user HTTP 400 Bad Request: if given profile_id is not in db or not assigned to authenticated user
General description of profile data in API returns: General description of profile data in API returns:
* profile_id * profile_id
* profile_name * profile_name
* is_default: true if this is the public profile * is_default: true if this is the public profile
* hide_friends: true if friends are hidden * hide_friends: true if friends are hidden
* profile_photo * profile_photo
* profile_thumb * profile_thumb
* publish: true if published on the server's local directory * publish: true if published on the server's local directory
* net_publish: true if published to global_dir * net_publish: true if published to global_dir
* description ... homepage: different data fields from 'profile' table in database * description ... homepage: different data fields from 'profile' table in database
* users: array with the users allowed to view this profile (empty if is_default=true) * users: array with the users allowed to view this profile (empty if is_default=true)
--- ---
## Not Implemented API calls ## Not Implemented API calls
The following API calls are implemented in GNU Social but not in Friendica: (incomplete) The following API calls are implemented in GNU Social but not in Friendica: (incomplete)
* statuses/retweets_of_me * statuses/retweets_of_me
* friendships/create * friendships/create
* friendships/destroy * friendships/destroy
* friendships/exists * friendships/exists
* friendships/show * friendships/show
* account/update_profile_background_image * account/update_profile_background_image
* blocks/create * blocks/create
* blocks/destroy * blocks/destroy
The following API calls from the Twitter API aren't implemented neither in Friendica nor in GNU Social: The following API calls from the Twitter API aren't implemented neither in Friendica nor in GNU Social:
* statuses/mentions_timeline * statuses/mentions_timeline
* statuses/retweets/:id * statuses/retweets/:id
* statuses/oembed * statuses/oembed
* statuses/retweeters/ids * statuses/retweeters/ids
* statuses/lookup * statuses/lookup
* direct_messages/show * direct_messages/show
* search/tweets * search/tweets
* friendships/no_retweets/ids * friendships/no_retweets/ids
* friendships/incoming * friendships/incoming
* friendships/outgoing * friendships/outgoing
* friendships/update * friendships/update
* friends/list * friends/list
* friendships/lookup * friendships/lookup
* account/settings * account/settings
* account/update_delivery_device * account/update_delivery_device
* account/update_profile * account/update_profile
* account/update_profile_background_image * account/update_profile_background_image
* blocks/list * blocks/list
* blocks/ids * blocks/ids
* users/lookup * users/lookup
* users/show * users/show
* users/search * users/search
* account/remove_profile_banner * account/remove_profile_banner
* account/update_profile_banner * account/update_profile_banner
* users/profile_banner * users/profile_banner
* mutes/users/create * mutes/users/create
* mutes/users/destroy * mutes/users/destroy
* mutes/users/ids * mutes/users/ids
* mutes/users/list * mutes/users/list
* users/suggestions/:slug * users/suggestions/:slug
* users/suggestions * users/suggestions
* users/suggestions/:slug/members * users/suggestions/:slug/members
* favorites/list * favorites/list
* lists/list * lists/list
* lists/statuses * lists/statuses
* lists/members/destroy * lists/members/destroy
* lists/memberships * lists/memberships
* lists/subscribers * lists/subscribers
* lists/subscribers/create * lists/subscribers/create
* lists/subscribers/show * lists/subscribers/show
* lists/subscribers/destroy * lists/subscribers/destroy
* lists/members/create_all * lists/members/create_all
* lists/members/show * lists/members/show
* lists/members * lists/members
* lists/members/create * lists/members/create
* lists/destroy * lists/destroy
* lists/update * lists/update
* lists/create * lists/create
* lists/show * lists/show
* lists/subscriptions * lists/subscriptions
* lists/members/destroy_all * lists/members/destroy_all
* lists/ownerships * lists/ownerships
* saved_searches/list * saved_searches/list
* saved_searches/show/:id * saved_searches/show/:id
* saved_searches/create * saved_searches/create
* saved_searches/destroy/:id * saved_searches/destroy/:id
* geo/id/:place_id * geo/id/:place_id
* geo/reverse_geocode * geo/reverse_geocode
* geo/search * geo/search
* geo/place * geo/place
* trends/place * trends/place
* trends/available * trends/available
* help/configuration * help/configuration
* help/languages * help/languages
* help/privacy * help/privacy
* help/tos * help/tos
* trends/closest * trends/closest
* users/report_spam * users/report_spam
--- ---
--- ---
## Usage Examples ## Usage Examples
### BASH / cURL ### BASH / cURL
Betamax has documentated some example API usage from a [bash script](https://en.wikipedia.org/wiki/Bash_(Unix_shell) employing [curl](https://en.wikipedia.org/wiki/CURL) (see [his posting](https://betamax65.de/display/betamax65/43539)). Betamax has documentated some example API usage from a [bash script](https://en.wikipedia.org/wiki/Bash_(Unix_shell) employing [curl](https://en.wikipedia.org/wiki/CURL) (see [his posting](https://betamax65.de/display/betamax65/43539)).
/usr/bin/curl -u USER:PASS https://YOUR.FRIENDICA.TLD/api/statuses/update.xml -d source="some source id" -d status="the status you want to post" /usr/bin/curl -u USER:PASS https://YOUR.FRIENDICA.TLD/api/statuses/update.xml -d source="some source id" -d status="the status you want to post"
### Python ### Python
The [RSStoFriedika](https://github.com/pafcu/RSStoFriendika) code can be used as an example of how to use the API with python. The lines for posting are located at [line 21](https://github.com/pafcu/RSStoFriendika/blob/master/RSStoFriendika.py#L21) and following. The [RSStoFriedika](https://github.com/pafcu/RSStoFriendika) code can be used as an example of how to use the API with python. The lines for posting are located at [line 21](https://github.com/pafcu/RSStoFriendika/blob/master/RSStoFriendika.py#L21) and following.
def tweet(server, message, group_allow=None): def tweet(server, message, group_allow=None):
url = server + '/api/statuses/update' url = server + '/api/statuses/update'
urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True)) urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True))
There is also a [module for python 3](https://bitbucket.org/tobiasd/python-friendica) for using the API. There is also a [module for python 3](https://bitbucket.org/tobiasd/python-friendica) for using the API.

392
doc/autoloader.md
View file

@ -1,197 +1,197 @@
Autoloader with Composer Autoloader with Composer
========== ==========
* [Home](help) * [Home](help)
* [Developer Intro](help/Developers-Intro) * [Developer Intro](help/Developers-Intro)
Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes. Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`. It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`.
* [Using Composer](help/Composer) * [Using Composer](help/Composer)
## A quick introduction to class autoloading ## A quick introduction to class autoloading
The autoloader dynamically includes the file defining a class when it is first referenced, either by instantiating an object or simply making sure that it is available, without the need to explicitly use "require_once". The autoloader dynamically includes the file defining a class when it is first referenced, either by instantiating an object or simply making sure that it is available, without the need to explicitly use "require_once".
Once it is set up you don't have to directly use it, you can directly use any class that is covered by the autoloader (currently `vendor` and `src`) Once it is set up you don't have to directly use it, you can directly use any class that is covered by the autoloader (currently `vendor` and `src`)
Under the hood, Composer registers a callback with [`spl_autoload_register()`](http://php.net/manual/en/function.spl-autoload-register.php) that receives a class name as an argument and includes the corresponding class definition file. Under the hood, Composer registers a callback with [`spl_autoload_register()`](http://php.net/manual/en/function.spl-autoload-register.php) that receives a class name as an argument and includes the corresponding class definition file.
For more info about PHP autoloading, please refer to the [official PHP documentation](http://php.net/manual/en/language.oop5.autoload.php). For more info about PHP autoloading, please refer to the [official PHP documentation](http://php.net/manual/en/language.oop5.autoload.php).
### Example ### Example
Let's say you have a PHP file in `src/` that define a very useful class: Let's say you have a PHP file in `src/` that define a very useful class:
```php ```php
// src/ItemsManager.php // src/ItemsManager.php
<?php <?php
namespace Friendica; namespace Friendica;
class ItemsManager { class ItemsManager {
public function getAll() { ... } public function getAll() { ... }
public function getByID($id) { ... } public function getByID($id) { ... }
} }
``` ```
The class `ItemsManager` has been declared in the `Friendica` namespace. The class `ItemsManager` has been declared in the `Friendica` namespace.
Namespaces are useful to keep classes separated and avoid names conflicts (could be that a library you want to use also defines a class named `ItemsManager`, but as long as it is in another namespace, you don't have any problem) Namespaces are useful to keep classes separated and avoid names conflicts (could be that a library you want to use also defines a class named `ItemsManager`, but as long as it is in another namespace, you don't have any problem)
Let's say now that you need to load some items in a view, maybe in a fictional `mod/network.php`. Let's say now that you need to load some items in a view, maybe in a fictional `mod/network.php`.
In order for the Composer autoloader to work, it must first be included. In Friendica this is already done at the top of `boot.php`, with `require_once('vendor/autoload.php');`. In order for the Composer autoloader to work, it must first be included. In Friendica this is already done at the top of `boot.php`, with `require_once('vendor/autoload.php');`.
The code will be something like: The code will be something like:
```php ```php
// mod/network.php // mod/network.php
<?php <?php
function network_content(App $a) { function network_content(App $a) {
$itemsmanager = new Friendica\ItemsManager(); $itemsmanager = new Friendica\ItemsManager();
$items = $itemsmanager->getAll(); $items = $itemsmanager->getAll();
// pass $items to template // pass $items to template
// return result // return result
} }
``` ```
That's a quite simple example, but look: no `require()`! That's a quite simple example, but look: no `require()`!
If you need to use a class, you can simply use it and you don't need to do anything else. If you need to use a class, you can simply use it and you don't need to do anything else.
Going further: now we have a bunch of `*Manager` classes that cause some code duplication, let's define a `BaseManager` class, where we move all common code between all managers: Going further: now we have a bunch of `*Manager` classes that cause some code duplication, let's define a `BaseManager` class, where we move all common code between all managers:
```php ```php
// src/BaseManager.php // src/BaseManager.php
<?php <?php
namespace Friendica; namespace Friendica;
class BaseManager { class BaseManager {
public function thatFunctionEveryManagerUses() { ... } public function thatFunctionEveryManagerUses() { ... }
} }
``` ```
and then let's change the ItemsManager class to use this code and then let's change the ItemsManager class to use this code
```php ```php
// src/ItemsManager.php // src/ItemsManager.php
<?php <?php
namespace Friendica; namespace Friendica;
class ItemsManager extends BaseManager { class ItemsManager extends BaseManager {
public function getAll() { ... } public function getAll() { ... }
public function getByID($id) { ... } public function getByID($id) { ... }
} }
``` ```
Even though we didn't explicitly include the `src/BaseManager.php` file, the autoloader will when this class is first defined, because it is referenced as a parent class. Even though we didn't explicitly include the `src/BaseManager.php` file, the autoloader will when this class is first defined, because it is referenced as a parent class.
It works with the "BaseManager" example here and it works when we need to call static methods: It works with the "BaseManager" example here and it works when we need to call static methods:
```php ```php
// src/Dfrn.php // src/Dfrn.php
<?php <?php
namespace Friendica; namespace Friendica;
class Dfrn { class Dfrn {
public static function mail($item, $owner) { ... } public static function mail($item, $owner) { ... }
} }
``` ```
```php ```php
// mod/mail.php // mod/mail.php
<?php <?php
mail_post($a){ mail_post($a){
... ...
Friendica\dfrn::mail($item, $owner); Friendica\dfrn::mail($item, $owner);
... ...
} }
``` ```
If your code is in same namespace as the class you need, you don't need to prepend it: If your code is in same namespace as the class you need, you don't need to prepend it:
```php ```php
// include/delivery.php // include/delivery.php
<?php <?php
namespace Friendica; namespace Friendica;
// this is the same content of current include/delivery.php, // this is the same content of current include/delivery.php,
// but has been declared to be in "Friendica" namespace // but has been declared to be in "Friendica" namespace
[...] [...]
switch($contact['network']) { switch($contact['network']) {
case NETWORK_DFRN: case NETWORK_DFRN:
if ($mail) { if ($mail) {
$item['body'] = ... $item['body'] = ...
$atom = Dfrn::mail($item, $owner); $atom = Dfrn::mail($item, $owner);
} elseif ($fsuggest) { } elseif ($fsuggest) {
$atom = Dfrn::fsuggest($item, $owner); $atom = Dfrn::fsuggest($item, $owner);
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id'])); q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
} elseif ($relocate) } elseif ($relocate)
$atom = Dfrn::relocate($owner, $uid); $atom = Dfrn::relocate($owner, $uid);
[...] [...]
``` ```
This is the current code of `include/delivery.php`, and since the code is declared to be in the "Friendica" namespace, you don't need to write it when you need to use the "Dfrn" class. This is the current code of `include/delivery.php`, and since the code is declared to be in the "Friendica" namespace, you don't need to write it when you need to use the "Dfrn" class.
But if you want to use classes from another library, you need to use the full namespace, e.g. But if you want to use classes from another library, you need to use the full namespace, e.g.
```php ```php
// src/Diaspora.php // src/Diaspora.php
<?php <?php
namespace Friendica; namespace Friendica;
class Diaspora { class Diaspora {
public function md2bbcode() { public function md2bbcode() {
$html = \Michelf\MarkdownExtra::defaultTransform($text); $html = \Michelf\MarkdownExtra::defaultTransform($text);
} }
} }
``` ```
if you use that class in many places of the code and you don't want to write the full path to the class every time, you can use the "use" PHP keyword if you use that class in many places of the code and you don't want to write the full path to the class every time, you can use the "use" PHP keyword
```php ```php
// src/Diaspora.php // src/Diaspora.php
<?php <?php
namespace Friendica; namespace Friendica;
use \Michelf\MarkdownExtra; use \Michelf\MarkdownExtra;
class Diaspora { class Diaspora {
public function md2bbcode() { public function md2bbcode() {
$html = MarkdownExtra::defaultTransform($text); $html = MarkdownExtra::defaultTransform($text);
} }
} }
``` ```
Note that namespaces are like paths in filesystem, separated by "\", with the first "\" being the global scope. Note that namespaces are like paths in filesystem, separated by "\", with the first "\" being the global scope.
You can go deeper if you want to, like: You can go deeper if you want to, like:
``` ```
// src/Network/Dfrn.php // src/Network/Dfrn.php
<?php <?php
namespace Friendica\Network; namespace Friendica\Network;
class Dfrn { class Dfrn {
} }
``` ```
Please note that the location of the file defining the class must be placed in the appropriate sub-folders of `src` if the namespace isn't plain `Friendica`. Please note that the location of the file defining the class must be placed in the appropriate sub-folders of `src` if the namespace isn't plain `Friendica`.
or or
``` ```
// src/Dba/Mysql // src/Dba/Mysql
<?php <?php
namespace Friendica\Dba; namespace Friendica\Dba;
class Mysql { class Mysql {
} }
``` ```
So you can think of namespaces as folders in a Unix file system, with global scope as the root ("\"). So you can think of namespaces as folders in a Unix file system, with global scope as the root ("\").
## Related ## Related
* [Using Composer](help/Composer) * [Using Composer](help/Composer)
* [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src) * [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)

100
include/identity.php
View file

@ -5,10 +5,10 @@
use Friendica\App; use Friendica\App;
require_once('include/ForumManager.php'); require_once 'include/ForumManager.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once("mod/proxy.php"); require_once 'mod/proxy.php';
require_once('include/cache.php'); require_once 'include/cache.php';
/** /**
* *
@ -85,9 +85,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
$theme_info_file = "view/theme/".current_theme()."/theme.php"; $theme_info_file = "view/theme/" . current_theme() . "/theme.php";
if (file_exists($theme_info_file)){ if (file_exists($theme_info_file)) {
require_once($theme_info_file); require_once $theme_info_file;
} }
if (! (x($a->page,'aside'))) if (! (x($a->page,'aside')))
@ -372,7 +372,7 @@ function profile_sidebar($profile, $block = 0) {
else else
$diaspora = false; $diaspora = false;
if (!$block){ if (!$block) {
$contact_block = contact_block(); $contact_block = contact_block();
if (is_array($a->profile) AND !$a->profile['hide-friends']) { if (is_array($a->profile) AND !$a->profile['hide-friends']) {
@ -537,13 +537,13 @@ function get_birthdays() {
function get_events() { function get_events() {
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
$a = get_app(); $a = get_app();
if (! local_user() || $a->is_mobile || $a->is_tablet) if (! local_user() || $a->is_mobile || $a->is_tablet) {
return $o; return $o;
}
// $mobile_detect = new Mobile_Detect(); // $mobile_detect = new Mobile_Detect();
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
@ -566,12 +566,14 @@ function get_events() {
$now = strtotime('now'); $now = strtotime('now');
$istoday = false; $istoday = false;
foreach ($r as $rr) { foreach ($r as $rr) {
if (strlen($rr['name'])) if (strlen($rr['name'])) {
$total ++; $total ++;
}
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d'); $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
$istoday = true; $istoday = true;
}
} }
$classtoday = (($istoday) ? 'event-today' : ''); $classtoday = (($istoday) ? 'event-today' : '');
@ -580,12 +582,14 @@ function get_events() {
foreach ($r as &$rr) { foreach ($r as &$rr) {
$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
if (strlen($title) > 35) if (strlen($title) > 35) {
$title = substr($title,0,32) . '... '; $title = substr($title,0,32) . '... ';
}
$description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... '; $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
if (! $description) if (! $description) {
$description = t('[No description]'); $description = t('[No description]');
}
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']); $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
@ -632,7 +636,9 @@ function advanced_profile(App $a) {
$profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ; $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
if ($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); if ($a->profile['gender']) {
$profile['gender'] = array( t('Gender:'), $a->profile['gender'] );
}
if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
$year_bd_format = t('j F, Y'); $year_bd_format = t('j F, Y');
@ -647,10 +653,13 @@ function advanced_profile(App $a) {
} }
if ($age = age($a->profile['dob'],$a->profile['timezone'],'')) $profile['age'] = array( t('Age:'), $age ); if ($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
$profile['age'] = array( t('Age:'), $age );
}
if ($a->profile['marital']) {
if ($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']); $profile['marital'] = array( t('Status:'), $a->profile['marital']);
}
/// @TODO Maybe use x() here, plus below? /// @TODO Maybe use x() here, plus below?
if ($a->profile['with']) { if ($a->profile['with']) {
@ -753,7 +762,7 @@ function advanced_profile(App $a) {
return ''; return '';
} }
function profile_tabs($a, $is_owner=False, $nickname=Null){ function profile_tabs($a, $is_owner=False, $nickname=Null) {
//echo "<pre>"; var_dump($a->user); killme(); //echo "<pre>"; var_dump($a->user); killme();
if (is_null($nickname)) { if (is_null($nickname)) {
@ -770,7 +779,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array( array(
'label'=>t('Status'), 'label'=>t('Status'),
'url' => $url, 'url' => $url,
'sel' => ((!isset($tab) && $a->argv[0]=='profile')?'active':''), 'sel' => ((!isset($tab) && $a->argv[0]=='profile') ? 'active' : ''),
'title' => t('Status Messages and Posts'), 'title' => t('Status Messages and Posts'),
'id' => 'status-tab', 'id' => 'status-tab',
'accesskey' => 'm', 'accesskey' => 'm',
@ -778,7 +787,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array( array(
'label' => t('Profile'), 'label' => t('Profile'),
'url' => $url.'/?tab=profile', 'url' => $url.'/?tab=profile',
'sel' => ((isset($tab) && $tab=='profile')?'active':''), 'sel' => ((isset($tab) && $tab=='profile') ? 'active' : ''),
'title' => t('Profile Details'), 'title' => t('Profile Details'),
'id' => 'profile-tab', 'id' => 'profile-tab',
'accesskey' => 'r', 'accesskey' => 'r',
@ -786,7 +795,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array( array(
'label' => t('Photos'), 'label' => t('Photos'),
'url' => App::get_baseurl() . '/photos/' . $nickname, 'url' => App::get_baseurl() . '/photos/' . $nickname,
'sel' => ((!isset($tab) && $a->argv[0]=='photos')?'active':''), 'sel' => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
'title' => t('Photo Albums'), 'title' => t('Photo Albums'),
'id' => 'photo-tab', 'id' => 'photo-tab',
'accesskey' => 'h', 'accesskey' => 'h',
@ -794,7 +803,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array( array(
'label' => t('Videos'), 'label' => t('Videos'),
'url' => App::get_baseurl() . '/videos/' . $nickname, 'url' => App::get_baseurl() . '/videos/' . $nickname,
'sel' => ((!isset($tab) && $a->argv[0]=='videos')?'active':''), 'sel' => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
'title' => t('Videos'), 'title' => t('Videos'),
'id' => 'video-tab', 'id' => 'video-tab',
'accesskey' => 'v', 'accesskey' => 'v',
@ -806,7 +815,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array( $tabs[] = array(
'label' => t('Events'), 'label' => t('Events'),
'url' => App::get_baseurl() . '/events', 'url' => App::get_baseurl() . '/events',
'sel' =>((!isset($tab) && $a->argv[0]=='events')?'active':''), 'sel' =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
'title' => t('Events and Calendar'), 'title' => t('Events and Calendar'),
'id' => 'events-tab', 'id' => 'events-tab',
'accesskey' => 'e', 'accesskey' => 'e',
@ -817,18 +826,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array( $tabs[] = array(
'label' => t('Events'), 'label' => t('Events'),
'url' => App::get_baseurl() . '/cal/' . $nickname, 'url' => App::get_baseurl() . '/cal/' . $nickname,
'sel' =>((!isset($tab) && $a->argv[0]=='cal')?'active':''), 'sel' =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
'title' => t('Events and Calendar'), 'title' => t('Events and Calendar'),
'id' => 'events-tab', 'id' => 'events-tab',
'accesskey' => 'e', 'accesskey' => 'e',
); );
} }
if ($is_owner){ if ($is_owner) {
$tabs[] = array( $tabs[] = array(
'label' => t('Personal Notes'), 'label' => t('Personal Notes'),
'url' => App::get_baseurl() . '/notes', 'url' => App::get_baseurl() . '/notes',
'sel' =>((!isset($tab) && $a->argv[0]=='notes')?'active':''), 'sel' =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
'title' => t('Only You Can See This'), 'title' => t('Only You Can See This'),
'id' => 'notes-tab', 'id' => 'notes-tab',
'accesskey' => 't', 'accesskey' => 't',
@ -839,7 +848,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array( $tabs[] = array(
'label' => t('Contacts'), 'label' => t('Contacts'),
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname, 'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts')?'active':''), 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
'title' => t('Contacts'), 'title' => t('Contacts'),
'id' => 'viewcontacts-tab', 'id' => 'viewcontacts-tab',
'accesskey' => 'k', 'accesskey' => 'k',
@ -855,8 +864,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
} }
function get_my_url() { function get_my_url() {
if (x($_SESSION,'my_url')) if (x($_SESSION, 'my_url')) {
return $_SESSION['my_url']; return $_SESSION['my_url'];
}
return false; return false;
} }
@ -868,33 +878,31 @@ function zrl_init(App $a) {
// The check fetches the cached value from gprobe to reduce the load for this system // The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str); $urlparts = parse_url($tmp_str);
$result = Cache::get("gprobe:".$urlparts["host"]); $result = Cache::get("gprobe:" . $urlparts["host"]);
if (!is_null($result)) { if ((!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) { logger("DDoS attempt detected for " . $urlparts["host"] . " by " . $_SERVER["REMOTE_ADDR"] . ". server data: " . print_r($_SERVER, true), LOGGER_DEBUG);
logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG); return;
return;
}
} }
proc_run(PRIORITY_LOW, 'include/gprobe.php',bin2hex($tmp_str)); proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($tmp_str));
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd); $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
call_hooks('zrl_init',$arr); call_hooks('zrl_init', $arr);
} }
} }
function zrl($s,$force = false) { function zrl($s, $force = false) {
if (! strlen($s)) { if (! strlen($s)) {
return $s; return $s;
} }
if ((! strpos($s,'/profile/')) && (! $force)) { if ((! strpos($s, '/profile/')) && (! $force)) {
return $s; return $s;
} }
if ($force && substr($s,-1,1) !== '/') { if ($force && substr($s, -1, 1) !== '/') {
$s = $s . '/'; $s = $s . '/';
} }
$achar = strpos($s,'?') ? '&' : '?'; $achar = strpos($s, '?') ? '&' : '?';
$mine = get_my_url(); $mine = get_my_url();
if ($mine and ! link_compare($mine,$s)) { if ($mine && ! link_compare($mine, $s)) {
return $s . $achar . 'zrl=' . urlencode($mine); return $s . $achar . 'zrl=' . urlencode($mine);
} }
return $s; return $s;
@ -916,10 +924,8 @@ function zrl($s,$force = false) {
*/ */
function get_theme_uid() { function get_theme_uid() {
$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0); $uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
if (local_user()) { if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
if ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) { return local_user();
return local_user();
}
} }
return $uid; return $uid;

25
include/lock.php
View file

@ -2,9 +2,9 @@
// Provide some ability to lock a PHP function so that multiple processes // Provide some ability to lock a PHP function so that multiple processes
// can't run the function concurrently // can't run the function concurrently
if(! function_exists('lock_function')) { if (! function_exists('lock_function')) {
function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) { function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
if( $wait_sec == 0 ) if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system $wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$got_lock = false; $got_lock = false;
@ -16,7 +16,7 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
dbesc($fn_name) dbesc($fn_name)
); );
if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { if ((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'", q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($fn_name) dbesc($fn_name)
@ -34,10 +34,10 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
q("UNLOCK TABLES"); q("UNLOCK TABLES");
if(($block) && (! $got_lock)) if (($block) && (! $got_lock))
sleep($wait_sec); sleep($wait_sec);
} while(($block) && (! $got_lock) && ((time() - $start) < $timeout)); } while (($block) && (! $got_lock) && ((time() - $start) < $timeout));
logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG); logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
@ -45,28 +45,29 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
}} }}
if(! function_exists('block_on_function_lock')) { if (! function_exists('block_on_function_lock')) {
function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) { function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
if( $wait_sec == 0 ) if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system $wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$start = time(); $start = time();
do { do {
$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1", $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
dbesc($fn_name) dbesc($fn_name)
); );
if (dbm::is_result($r) && $r[0]['locked']) if (dbm::is_result($r) && $r[0]['locked']) {
sleep($wait_sec); sleep($wait_sec);
}
} while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout)); } while (dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
return; return;
}} }}
if(! function_exists('unlock_function')) { if (! function_exists('unlock_function')) {
function unlock_function($fn_name) { function unlock_function($fn_name) {
$r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'", $r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
dbesc(NULL_DATE), dbesc(NULL_DATE),

14
include/message.php
View file

@ -8,9 +8,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$a = get_app(); $a = get_app();
if(! $recipient) return -1; if (! $recipient) return -1;
if(! strlen($subject)) if (! strlen($subject))
$subject = t('[no subject]'); $subject = t('[no subject]');
$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
@ -21,7 +21,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
intval(local_user()) intval(local_user())
); );
if(! (count($me) && (count($contact)))) { if (! (count($me) && (count($contact)))) {
return -2; return -2;
} }
@ -33,7 +33,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
// look for any existing conversation structure // look for any existing conversation structure
if(strlen($replyto)) { if (strlen($replyto)) {
$reply = true; $reply = true;
$r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1", $r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
intval(local_user()), intval(local_user()),
@ -44,7 +44,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['convid']; $convid = $r[0]['convid'];
} }
if(! $convid) { if (! $convid) {
// create a new conversation // create a new conversation
@ -77,12 +77,12 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['id']; $convid = $r[0]['id'];
} }
if(! $convid) { if (! $convid) {
logger('send message: conversation not found.'); logger('send message: conversation not found.');
return -4; return -4;
} }
if(! strlen($replyto)) { if (! strlen($replyto)) {
$replyto = $convuri; $replyto = $convuri;
} }

2
include/msgclean.php
View file

@ -154,7 +154,7 @@ function removelinebreak($message)
$lines = array(); $lines = array();
$lineno = 0; $lineno = 0;
foreach($arrbody as $i => $line) { foreach ($arrbody as $i => $line) {
$currquotelevel = 0; $currquotelevel = 0;
$currline = $line; $currline = $line;
while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>') while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')

4
include/nav.php
View file

@ -10,7 +10,7 @@ function nav(App $a) {
* *
*/ */
if(!(x($a->page,'nav'))) if (!(x($a->page,'nav')))
$a->page['nav'] = ''; $a->page['nav'] = '';
$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array()); $a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
@ -138,7 +138,7 @@ function nav_info(App $a)
if (strlen(get_config('system', 'singleuser'))) { if (strlen(get_config('system', 'singleuser'))) {
$gdir = get_config('system', 'directory'); $gdir = get_config('system', 'directory');
if(strlen($gdir)) { if (strlen($gdir)) {
$gdirpath = zrl($gdir, true); $gdirpath = zrl($gdir, true);
} }
} elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) { } elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) {

47
include/network.php
View file

@ -172,7 +172,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
// allow for HTTP/2.x without fixing code // allow for HTTP/2.x without fixing code
while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) { while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) {
$chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4); $chunk = substr($base, 0, strpos($base,"\r\n\r\n") + 4);
$header .= $chunk; $header .= $chunk;
$base = substr($base, strlen($chunk)); $base = substr($base, strlen($chunk));
} }
@ -196,9 +196,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) { if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
$newurl = trim(array_pop($matches)); $newurl = trim(array_pop($matches));
} }
if (strpos($newurl,'/') === 0) {
if (strpos($newurl, '/') === 0) { $newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
} }
if (filter_var($newurl, FILTER_VALIDATE_URL)) { if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@ -342,7 +341,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
$newurl = trim(array_pop($matches)); $newurl = trim(array_pop($matches));
if (strpos($newurl, '/') === 0) { if (strpos($newurl, '/') === 0) {
$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl; $newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
} }
if (filter_var($newurl, FILTER_VALIDATE_URL)) { if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@ -375,7 +374,7 @@ function xml_status($st, $message = '') {
$xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : ''); $xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
if($st) if ($st)
logger('xml_status returning non_zero: ' . $st . " message=" . $message); logger('xml_status returning non_zero: ' . $st . " message=" . $message);
header( "Content-type: text/xml" ); header( "Content-type: text/xml" );
@ -403,12 +402,12 @@ function xml_status($st, $message = '') {
*/ */
function http_status_exit($val, $description = array()) { function http_status_exit($val, $description = array()) {
$err = ''; $err = '';
if($val >= 400) { if ($val >= 400) {
$err = 'Error'; $err = 'Error';
if (!isset($description["title"])) if (!isset($description["title"]))
$description["title"] = $err." ".$val; $description["title"] = $err." ".$val;
} }
if($val >= 200 && $val < 300) if ($val >= 200 && $val < 300)
$err = 'OK'; $err = 'OK';
logger('http_status_exit ' . $val); logger('http_status_exit ' . $val);
@ -434,20 +433,20 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it * @return boolean True if it's a valid URL, fals if something wrong with it
*/ */
function validate_url(&$url) { function validate_url(&$url) {
if(get_config('system','disable_url_validation')) if (get_config('system','disable_url_validation'))
return true; return true;
// no naked subdomains (allow localhost for tests) // no naked subdomains (allow localhost for tests)
if(strpos($url,'.') === false && strpos($url,'/localhost/') === false) if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
return false; return false;
if(substr($url,0,4) != 'http') if (substr($url,0,4) != 'http')
$url = 'http://' . $url; $url = 'http://' . $url;
/// @TODO Really supress function outcomes? Why not find them + debug them? /// @TODO Really supress function outcomes? Why not find them + debug them?
$h = @parse_url($url); $h = @parse_url($url);
if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true; return true;
} }
@ -462,14 +461,14 @@ function validate_url(&$url) {
*/ */
function validate_email($addr) { function validate_email($addr) {
if(get_config('system','disable_email_validation')) if (get_config('system','disable_email_validation'))
return true; return true;
if(! strpos($addr,'@')) if (! strpos($addr,'@'))
return false; return false;
$h = substr($addr,strpos($addr,'@') + 1); $h = substr($addr,strpos($addr,'@') + 1);
if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) { if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true; return true;
} }
return false; return false;
@ -502,7 +501,6 @@ function allowed_url($url) {
$host = strtolower($h['host']); $host = strtolower($h['host']);
// always allow our own site // always allow our own site
if ($host == strtolower($_SERVER['SERVER_NAME'])) { if ($host == strtolower($_SERVER['SERVER_NAME'])) {
return true; return true;
} }
@ -563,24 +561,25 @@ function blocked_url($url) {
*/ */
function allowed_email($email) { function allowed_email($email) {
$domain = strtolower(substr($email,strpos($email,'@') + 1)); $domain = strtolower(substr($email,strpos($email,'@') + 1));
if(! $domain) if (! $domain) {
return false; return false;
}
$str_allowed = get_config('system','allowed_email'); $str_allowed = get_config('system','allowed_email');
if(! $str_allowed) if (! $str_allowed) {
return true; return true;
}
$found = false; $found = false;
$fnmatch = function_exists('fnmatch'); $fnmatch = function_exists('fnmatch');
$allowed = explode(',',$str_allowed); $allowed = explode(',',$str_allowed);
if(count($allowed)) { if (count($allowed)) {
foreach($allowed as $a) { foreach ($allowed as $a) {
$pat = strtolower(trim($a)); $pat = strtolower(trim($a));
if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) { if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
$found = true; $found = true;
break; break;
} }
@ -609,8 +608,8 @@ function avatar_img($email) {
function parse_xml_string($s,$strict = true) { function parse_xml_string($s,$strict = true) {
/// @todo Move this function to the xml class /// @todo Move this function to the xml class
if($strict) { if ($strict) {
if(! strstr($s,'<?xml')) if (! strstr($s,'<?xml'))
return false; return false;
$s2 = substr($s,strpos($s,'<?xml')); $s2 = substr($s,strpos($s,'<?xml'));
} }

2
include/oauth.php
View file

@ -157,7 +157,7 @@ class FKOAuth1 extends OAuthServer {
//notice( t("Welcome back ") . $record['username'] . EOL); //notice( t("Welcome back ") . $record['username'] . EOL);
$a->user = $record; $a->user = $record;
if(strlen($a->user['timezone'])) { if (strlen($a->user['timezone'])) {
date_default_timezone_set($a->user['timezone']); date_default_timezone_set($a->user['timezone']);
$a->timezone = $a->user['timezone']; $a->timezone = $a->user['timezone'];
} }

6
include/oembed.php
View file

@ -304,9 +304,11 @@ function oembed_html2bbcode($text) {
$entries = $xpath->query("//span[$xattr]"); $entries = $xpath->query("//span[$xattr]");
$xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed"); $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
foreach($entries as $e) { foreach ($entries as $e) {
$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e); if (!is_null($href)) {
$e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
}
} }
return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
} else { } else {

19
include/onepoll.php
View file

@ -170,7 +170,7 @@ function onepoll_run(&$argv, &$argc){
// But this may be our first communication, so set the writable flag if it isn't set already. // But this may be our first communication, so set the writable flag if it isn't set already.
if (! intval($contact['writable'])) { if (! intval($contact['writable'])) {
q("update contact set writable = 1 where id = %d", intval($contact['id'])); q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d", intval($contact['id']));
} }
$url = $contact['poll'] . '?dfrn_id=' . $idtosend $url = $contact['poll'] . '?dfrn_id=' . $idtosend
@ -437,16 +437,18 @@ function onepoll_run(&$argv, &$argc){
if ($raw_refs) { if ($raw_refs) {
$refs_arr = explode(' ', $raw_refs); $refs_arr = explode(' ', $raw_refs);
if (count($refs_arr)) { if (count($refs_arr)) {
for($x = 0; $x < count($refs_arr); $x ++) for ($x = 0; $x < count($refs_arr); $x ++) {
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; $refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
}
} }
$qstr = implode(',',$refs_arr); $qstr = implode(',',$refs_arr);
$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1", $r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
intval($importer_uid) intval($importer_uid)
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
// $datarray['parent-uri'] = $r[0]['uri']; //$datarray['parent-uri'] = $r[0]['uri'];
}
} }
// Decoding the header // Decoding the header
@ -611,14 +613,17 @@ function onepoll_run(&$argv, &$argc){
consume_feed($xml,$importer,$contact,$hub,1,2); consume_feed($xml,$importer,$contact,$hub,1,2);
$hubmode = 'subscribe'; $hubmode = 'subscribe';
if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {
$hubmode = 'unsubscribe'; $hubmode = 'unsubscribe';
}
if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) {
$hub_update = true; $hub_update = true;
}
if ($force) if ($force) {
$hub_update = true; $hub_update = true;
}
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);

23
include/ostatus.php
View file

@ -70,6 +70,7 @@ class ostatus {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["author-link"])), intval($importer["uid"]), dbesc(normalise_link($author["author-link"])),
dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET)); dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET));
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$contact = $r[0]; $contact = $r[0];
$author["contact-id"] = $r[0]["id"]; $author["contact-id"] = $r[0]["id"];
@ -79,6 +80,7 @@ class ostatus {
// Should not happen // Should not happen
$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `addr` = ? AND `network` != ?", $contact = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `addr` = ? AND `network` != ?",
$importer["uid"], $addr, NETWORK_STATUSNET); $importer["uid"], $addr, NETWORK_STATUSNET);
if (dbm::is_result($contact)) { if (dbm::is_result($contact)) {
$author["contact-id"] = $contact["id"]; $author["contact-id"] = $contact["id"];
$author["author-link"] = $contact["url"]; $author["author-link"] = $contact["url"];
@ -87,17 +89,20 @@ class ostatus {
$avatarlist = array(); $avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context); $avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
foreach($avatars AS $avatar) { foreach ($avatars AS $avatar) {
$href = ""; $href = "";
$width = 0; $width = 0;
foreach($avatar->attributes AS $attributes) { foreach ($avatar->attributes AS $attributes) {
if ($attributes->name == "href") if ($attributes->name == "href") {
$href = $attributes->textContent; $href = $attributes->textContent;
if ($attributes->name == "width") }
if ($attributes->name == "width") {
$width = $attributes->textContent; $width = $attributes->textContent;
}
} }
if (($width > 0) AND ($href != "")) if (($width > 0) AND ($href != "")) {
$avatarlist[$width] = $href; $avatarlist[$width] = $href;
}
} }
if (count($avatarlist) > 0) { if (count($avatarlist) > 0) {
krsort($avatarlist); krsort($avatarlist);
@ -105,8 +110,9 @@ class ostatus {
} }
$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue; $displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
if ($displayname != "") if ($displayname != "") {
$author["author-name"] = $displayname; $author["author-name"] = $displayname;
}
$author["owner-name"] = $author["author-name"]; $author["owner-name"] = $author["author-name"];
$author["owner-link"] = $author["author-link"]; $author["owner-link"] = $author["author-link"];
@ -446,7 +452,7 @@ class ostatus {
foreach ($category->attributes AS $attributes) { foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") { if ($attributes->name == "term") {
$term = $attributes->textContent; $term = $attributes->textContent;
if(strlen($item["tag"])) { if (strlen($item["tag"])) {
$item["tag"] .= ','; $item["tag"] .= ',';
} }
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]"; $item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
@ -1146,6 +1152,7 @@ class ostatus {
continue; continue;
} }
/// @TODO One statment is okay (until if () )
$arr = array(); $arr = array();
$arr["network"] = $details["network"]; $arr["network"] = $details["network"];
$arr["uri"] = $single_conv->id; $arr["uri"] = $single_conv->id;
@ -2211,7 +2218,7 @@ class ostatus {
$owner = $r[0]; $owner = $r[0];
if(!strlen($last_update)) if (!strlen($last_update))
$last_update = 'now -30 days'; $last_update = 'now -30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');

566
include/uimport.php
View file

@ -1,283 +1,283 @@
<?php <?php
use Friendica\App; use Friendica\App;
require_once("include/Photo.php"); require_once("include/Photo.php");
define("IMPORT_DEBUG", False); define("IMPORT_DEBUG", False);
function last_insert_id() { function last_insert_id() {
global $db; global $db;
if (IMPORT_DEBUG) if (IMPORT_DEBUG) {
return 1; return 1;
}
return $db->insert_id();
} return $db->insert_id();
}
function last_error() {
global $db; function last_error() {
return $db->error; global $db;
} return $db->error;
}
/**
* Remove columns from array $arr that aren't in table $table /**
* * Remove columns from array $arr that aren't in table $table
* @param string $table Table name *
* @param array &$arr Column=>Value array from json (by ref) * @param string $table Table name
*/ * @param array &$arr Column=>Value array from json (by ref)
function check_cols($table, &$arr) { */
$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table)); function check_cols($table, &$arr) {
logger("uimport: $query", LOGGER_DEBUG); $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
$r = q($query); logger("uimport: $query", LOGGER_DEBUG);
$tcols = array(); $r = q($query);
// get a plain array of column names $tcols = array();
foreach ($r as $tcol) { // get a plain array of column names
$tcols[] = $tcol['Field']; foreach ($r as $tcol) {
} $tcols[] = $tcol['Field'];
// remove inexistent columns }
foreach ($arr as $icol => $ival) { // remove inexistent columns
if (!in_array($icol, $tcols)) { foreach ($arr as $icol => $ival) {
unset($arr[$icol]); if (!in_array($icol, $tcols)) {
} unset($arr[$icol]);
} }
} }
}
/**
* Import data into table $table /**
* * Import data into table $table
* @param string $table Table name *
* @param array $arr Column=>Value array from json * @param string $table Table name
*/ * @param array $arr Column=>Value array from json
function db_import_assoc($table, $arr) { */
if (isset($arr['id'])) function db_import_assoc($table, $arr) {
unset($arr['id']); if (isset($arr['id']))
check_cols($table, $arr); unset($arr['id']);
$cols = implode("`,`", array_map('dbesc', array_keys($arr))); check_cols($table, $arr);
$vals = implode("','", array_map('dbesc', array_values($arr))); $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')"; $vals = implode("','", array_map('dbesc', array_values($arr)));
logger("uimport: $query", LOGGER_TRACE); $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
if (IMPORT_DEBUG) logger("uimport: $query", LOGGER_TRACE);
return true; if (IMPORT_DEBUG) {
return q($query); return true;
} }
return q($query);
function import_cleanup($newuid) { }
dba::delete('user', array('uid' => $newuid));
} /**
* @brief Import account file exported from mod/uexport
/** *
* @brief Import account file exported from mod/uexport * @param App $a Friendica App Class
* * @param array $file array from $_FILES
* @param App $a Friendica App Class */
* @param array $file array from $_FILES function import_account(App $a, $file) {
*/ logger("Start user import from " . $file['tmp_name']);
function import_account(App $a, $file) { /*
logger("Start user import from " . $file['tmp_name']); STEPS
/* 1. checks
STEPS 2. replace old baseurl with new baseurl
1. checks 3. import data (look at user id and contacts id)
2. replace old baseurl with new baseurl 4. archive non-dfrn contacts
3. import data (look at user id and contacts id) 5. send message to dfrn contacts
4. archive non-dfrn contacts */
5. send message to dfrn contacts
*/ $account = json_decode(file_get_contents($file['tmp_name']), true);
if ($account === null) {
$account = json_decode(file_get_contents($file['tmp_name']), true); notice(t("Error decoding account file"));
if ($account === null) { return;
notice(t("Error decoding account file")); }
return;
}
if (!x($account, 'version')) {
notice(t("Error! No version data in file! This is not a Friendica account file?"));
if (!x($account, 'version')) { return;
notice(t("Error! No version data in file! This is not a Friendica account file?")); }
return;
} /*
* @TODO Old-lost code?
/* // this is not required as we remove columns in json not in current db schema
// this is not required as we remove columns in json not in current db schema if ($account['schema'] != DB_UPDATE_VERSION) {
if ($account['schema'] != DB_UPDATE_VERSION) { notice(t("Error! I can't import this file: DB schema version is not compatible."));
notice(t("Error! I can't import this file: DB schema version is not compatible.")); return;
return; }
} */
*/
// check for username
// check for username $r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']); if ($r === false) {
if ($r === false) { logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL); notice(t('Error! Cannot check nickname'));
notice(t('Error! Cannot check nickname')); return;
return; }
} if (dbm::is_result($r) > 0) {
if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return;
return; }
} // check if username matches deleted account
// check if username matches deleted account $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
$r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']); if ($r === false) {
if ($r === false) { logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL); notice(t('Error! Cannot check nickname'));
notice(t('Error! Cannot check nickname')); return;
return; }
} if (dbm::is_result($r) > 0) {
if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return;
return; }
}
$oldbaseurl = $account['baseurl'];
$oldbaseurl = $account['baseurl']; $newbaseurl = App::get_baseurl();
$newbaseurl = App::get_baseurl(); $olduid = $account['user']['uid'];
$olduid = $account['user']['uid'];
unset($account['user']['uid']);
unset($account['user']['uid']); unset($account['user']['account_expired']);
unset($account['user']['account_expired']); unset($account['user']['account_expires_on']);
unset($account['user']['account_expires_on']); unset($account['user']['expire_notification_sent']);
unset($account['user']['expire_notification_sent']);
foreach ($account['user'] as $k => &$v) { foreach ($account['user'] as $k => &$v) {
$v = str_replace($oldbaseurl, $newbaseurl, $v); $v = str_replace($oldbaseurl, $newbaseurl, $v);
} }
// import user
// import user $r = db_import_assoc('user', $account['user']);
$r = db_import_assoc('user', $account['user']); if ($r === false) {
if ($r === false) { //echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
//echo "<pre>"; var_dump($r, $query, mysql_error()); killme(); logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL); notice(t("User creation error"));
notice(t("User creation error")); return;
return; }
} $newuid = last_insert_id();
$newuid = last_insert_id(); //~ $newuid = 1;
//~ $newuid = 1;
// Generate a new guid for the account. Otherwise there will be problems with diaspora
// Generate a new guid for the account. Otherwise there will be problems with diaspora q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d", dbesc(generate_user_guid()), intval($newuid));
dbesc(generate_user_guid()), intval($newuid));
foreach ($account['profile'] as &$profile) {
foreach ($account['profile'] as &$profile) { foreach ($profile as $k => &$v) {
foreach ($profile as $k => &$v) { $v = str_replace($oldbaseurl, $newbaseurl, $v);
$v = str_replace($oldbaseurl, $newbaseurl, $v); foreach (array("profile", "avatar") as $k) {
foreach (array("profile", "avatar") as $k) $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v); }
} }
$profile['uid'] = $newuid; $profile['uid'] = $newuid;
$r = db_import_assoc('profile', $profile); $r = db_import_assoc('profile', $profile);
if ($r === false) { if ($r === false) {
logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
info(t("User profile creation error")); info(t("User profile creation error"));
import_cleanup($newuid); dba::delete('user', array('uid' => $newuid));
return; return;
} }
} }
$errorcount = 0; $errorcount = 0;
foreach ($account['contact'] as &$contact) { foreach ($account['contact'] as &$contact) {
if ($contact['uid'] == $olduid && $contact['self'] == '1') { if ($contact['uid'] == $olduid && $contact['self'] == '1') {
foreach ($contact as $k => &$v) { foreach ($contact as $k => &$v) {
$v = str_replace($oldbaseurl, $newbaseurl, $v); $v = str_replace($oldbaseurl, $newbaseurl, $v);
foreach (array("profile", "avatar", "micro") as $k) foreach (array("profile", "avatar", "micro") as $k) {
$v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v); $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
} }
} }
if ($contact['uid'] == $olduid && $contact['self'] == '0') { }
// set contacts 'avatar-date' to NULL_DATE to let poller to update urls if ($contact['uid'] == $olduid && $contact['self'] == '0') {
$contact["avatar-date"] = NULL_DATE; // set contacts 'avatar-date' to NULL_DATE to let poller to update urls
$contact["avatar-date"] = NULL_DATE;
switch ($contact['network']) { switch ($contact['network']) {
case NETWORK_DFRN: case NETWORK_DFRN:
// send relocate message (below) // send relocate message (below)
break; break;
case NETWORK_ZOT: case NETWORK_ZOT:
/// @TODO handle zot network /// @TODO handle zot network
break; break;
case NETWORK_MAIL2: case NETWORK_MAIL2:
/// @TODO ? /// @TODO ?
break; break;
case NETWORK_FEED: case NETWORK_FEED:
case NETWORK_MAIL: case NETWORK_MAIL:
// Nothing to do // Nothing to do
break; break;
default: default:
// archive other contacts // archive other contacts
$contact['archive'] = "1"; $contact['archive'] = "1";
} }
} }
$contact['uid'] = $newuid; $contact['uid'] = $newuid;
$r = db_import_assoc('contact', $contact); $r = db_import_assoc('contact', $contact);
if ($r === false) { if ($r === false) {
logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
$errorcount++; $errorcount++;
} else { } else {
$contact['newid'] = last_insert_id(); $contact['newid'] = last_insert_id();
} }
} }
if ($errorcount > 0) { if ($errorcount > 0) {
notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount)); notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
} }
foreach ($account['group'] as &$group) { foreach ($account['group'] as &$group) {
$group['uid'] = $newuid; $group['uid'] = $newuid;
$r = db_import_assoc('group', $group); $r = db_import_assoc('group', $group);
if ($r === false) { if ($r === false) {
logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
} else { } else {
$group['newid'] = last_insert_id(); $group['newid'] = last_insert_id();
} }
} }
foreach ($account['group_member'] as &$group_member) { foreach ($account['group_member'] as &$group_member) {
$group_member['uid'] = $newuid; $group_member['uid'] = $newuid;
$import = 0; $import = 0;
foreach ($account['group'] as $group) { foreach ($account['group'] as $group) {
if ($group['id'] == $group_member['gid'] && isset($group['newid'])) { if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
$group_member['gid'] = $group['newid']; $group_member['gid'] = $group['newid'];
$import++; $import++;
break; break;
} }
} }
foreach ($account['contact'] as $contact) { foreach ($account['contact'] as $contact) {
if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) { if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
$group_member['contact-id'] = $contact['newid']; $group_member['contact-id'] = $contact['newid'];
$import++; $import++;
break; break;
} }
} }
if ($import == 2) { if ($import == 2) {
$r = db_import_assoc('group_member', $group_member); $r = db_import_assoc('group_member', $group_member);
if ($r === false) { if ($r === false) {
logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
} }
} }
} }
foreach ($account['photo'] as &$photo) { foreach ($account['photo'] as &$photo) {
$photo['uid'] = $newuid; $photo['uid'] = $newuid;
$photo['data'] = hex2bin($photo['data']); $photo['data'] = hex2bin($photo['data']);
$p = new Photo($photo['data'], $photo['type']); $p = new Photo($photo['data'], $photo['type']);
$r = $p->store( $r = $p->store(
$photo['uid'], $photo['contact-id'], //0 $photo['uid'], $photo['contact-id'], //0
$photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1 $photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1
$photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid'] $photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid']
); );
if ($r === false) { if ($r === false) {
logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
} }
} }
foreach ($account['pconfig'] as &$pconfig) { foreach ($account['pconfig'] as &$pconfig) {
$pconfig['uid'] = $newuid; $pconfig['uid'] = $newuid;
$r = db_import_assoc('pconfig', $pconfig); $r = db_import_assoc('pconfig', $pconfig);
if ($r === false) { if ($r === false) {
logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL); logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
} }
} }
// send relocate messages // send relocate messages
proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid); proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
info(t("Done. You can now login with your username and password")); info(t("Done. You can now login with your username and password"));
goaway(App::get_baseurl() . "/login"); goaway(App::get_baseurl() . "/login");
} }

3
mod/login.php
View file

@ -6,6 +6,7 @@ function login_content(App $a) {
if (x($_SESSION, 'theme')) { if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']); unset($_SESSION['theme']);
} }
if (x($_SESSION, 'mobile-theme')) { if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
} }
@ -13,6 +14,6 @@ function login_content(App $a) {
if (local_user()) { if (local_user()) {
goaway(z_root()); goaway(z_root());
} }
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
} }

2
mod/pretheme.php
View file

@ -19,6 +19,6 @@ function pretheme_init(App $a) {
} }
echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits)); echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
} }
killme(); killme();
} }

154
mod/uimport.php
View file

@ -1,77 +1,77 @@
<?php <?php
/** /**
* View for user import * View for user import
*/ */
use Friendica\App; use Friendica\App;
require_once("include/uimport.php"); require_once("include/uimport.php");
function uimport_post(App $a) { function uimport_post(App $a) {
switch ($a->config['register_policy']) { switch ($a->config['register_policy']) {
case REGISTER_OPEN: case REGISTER_OPEN:
$blocked = 0; $blocked = 0;
$verified = 1; $verified = 1;
break; break;
case REGISTER_APPROVE: case REGISTER_APPROVE:
$blocked = 1; $blocked = 1;
$verified = 0; $verified = 0;
break; break;
default: default:
case REGISTER_CLOSED: case REGISTER_CLOSED:
if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) { if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
notice(t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
$blocked = 1; $blocked = 1;
$verified = 0; $verified = 0;
break; break;
} }
if (x($_FILES, 'accountfile')) { if (x($_FILES, 'accountfile')) {
/// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
import_account($a, $_FILES['accountfile']); import_account($a, $_FILES['accountfile']);
return; return;
} }
} }
function uimport_content(App $a) { function uimport_content(App $a) {
if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
notice("Permission denied." . EOL); notice("Permission denied." . EOL);
return; return;
} }
$max_dailies = intval(get_config('system', 'max_daily_registrations')); $max_dailies = intval(get_config('system', 'max_daily_registrations'));
if ($max_dailies) { if ($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if ($r && $r[0]['total'] >= $max_dailies) { if ($r && $r[0]['total'] >= $max_dailies) {
logger('max daily registrations exceeded.'); logger('max daily registrations exceeded.');
notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
return; return;
} }
} }
if (x($_SESSION, 'theme')) { if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']); unset($_SESSION['theme']);
} }
if (x($_SESSION, 'mobile-theme')) { if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
} }
$tpl = get_markup_template("uimport.tpl"); $tpl = get_markup_template("uimport.tpl");
return replace_macros($tpl, array( return replace_macros($tpl, array(
'$regbutt' => t('Import'), '$regbutt' => t('Import'),
'$import' => array( '$import' => array(
'title' => t("Move account"), 'title' => t("Move account"),
'intro' => t("You can import an account from another Friendica server."), 'intro' => t("You can import an account from another Friendica server."),
'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."), 'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"), 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
'field' => array('accountfile', t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')), 'field' => array('accountfile', t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')),
), ),
)); ));
} }

38
view/php/default.php
View file

@ -1,19 +1,19 @@
<!DOCTYPE html > <!DOCTYPE html >
<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>"> <html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script> <script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section> <section>
<?php if(x($page,'content')) echo $page['content']; ?> <?php if(x($page,'content')) echo $page['content']; ?>
<div id="pause"></div> <!-- The pause/resume Ajax indicator --> <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>
</html> </html>

27
view/php/minimal.php
View file

@ -1,14 +1,13 @@
<!DOCTYPE html > <!DOCTYPE html >
<html> <html>
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script> <script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?> <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
</body> </body>
</html> </html>

12
view/templates/group_drop.tpl
View file

@ -1,11 +1,11 @@
<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" > <div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
<a href="group/drop/{{$id}}?t={{$form_security_token}}" <a href="group/drop/{{$id}}?t={{$form_security_token}}"
onclick="return confirmDelete();" onclick="return confirmDelete();"
id="group-delete-icon-{{$id}}" id="group-delete-icon-{{$id}}"
class="icon drophide group-delete-icon" class="icon drophide group-delete-icon"
onmouseover="imgbright(this);" onmouseover="imgbright(this);"
onmouseout="imgdull(this);" onmouseout="imgdull(this);"
title="{{$delete}}"> title="{{$delete}}">
</a> </a>
</div> </div>

1
view/templates/groupeditor.tpl
View file

@ -59,4 +59,3 @@
</div> </div>
<div id="group-all-contacts-end"></div> <div id="group-all-contacts-end"></div>
</div> </div>

14
view/theme/frio/js/mod_group.js
View file

@ -5,9 +5,9 @@
*/ */
$(document).ready(function(){ $(document).ready(function() {
// Add an event listeners on buttons for switching the contact list view // Add an event listeners on buttons for switching the contact list view
$("body").on("click", ".group-list-switcher", function(){ $("body").on("click", ".group-list-switcher", function() {
switchGroupViewMode(this); switchGroupViewMode(this);
}); });
}); });
@ -15,11 +15,11 @@ $(document).ready(function(){
/** /**
* @brief Change the group membership of the contacts and fetch the new grup list * @brief Change the group membership of the contacts and fetch the new grup list
* as html * as html
* *
* @param {int} gid The group ID * @param {int} gid The group ID
* @param {int} cid The contact ID * @param {int} cid The contact ID
* @param {string} sec_token The security token * @param {string} sec_token The security token
* *
* @returns {undefined} * @returns {undefined}
*/ */
function groupChangeMember(gid, cid, sec_token) { function groupChangeMember(gid, cid, sec_token) {
@ -42,7 +42,7 @@ function groupChangeMember(gid, cid, sec_token) {
/** /**
* @brief Change the group list view mode * @brief Change the group list view mode
* *
* @param {object} elm The button element of the view mode switcher * @param {object} elm The button element of the view mode switcher
* @returns {undefined} * @returns {undefined}
*/ */
@ -53,7 +53,7 @@ function switchGroupViewMode(elm) {
$(elm).addClass("active"); $(elm).addClass("active");
// Add or remove the css classes for the group list with regard to the active view mode // Add or remove the css classes for the group list with regard to the active view mode
if (elm.id === "group-list-small") { if (elm.id === "group-list-small") {
$("#contact-group-list > li").addClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12"); $("#contact-group-list > li").addClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
} else { } else {
$("#contact-group-list > li").removeClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12"); $("#contact-group-list > li").removeClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
@ -62,7 +62,7 @@ function switchGroupViewMode(elm) {
/** /**
* @brief Filter the group member list for contacts * @brief Filter the group member list for contacts
* *
* @returns {undefined} * @returns {undefined}
*/ */
function filterList() { function filterList() {

1
view/theme/frio/templates/admin_aside.tpl
View file

@ -83,4 +83,3 @@
</li> </li>
</ul> </ul>
</div> </div>

12
view/theme/frio/templates/group_edit.tpl
View file

@ -1,5 +1,5 @@
{{* This template is for the "group" module. It provides the user the possibility to {{* This template is for the "group" module. It provides the user the possibility to
modify a specific contact group (remove contact group, edit contact group name, modify a specific contact group (remove contact group, edit contact group name,
add or remove contacts to the contact group. add or remove contacts to the contact group.
*}} *}}
@ -40,11 +40,11 @@
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="col-md-8 "> <div class="col-md-8 ">
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input type="text" <input type="text"
name="filter" name="filter"
id="contacts-search" id="contacts-search"
class="search-input form-control form-search" class="search-input form-control form-search"
onkeyup="filterList(); return false;" onkeyup="filterList(); return false;"
onfocus="this.select(); return false;" onfocus="this.select(); return false;"
/> />
</div> </div>

2
view/theme/frio/templates/groupeditor.tpl
View file

@ -5,7 +5,7 @@
<ul id="contact-group-list" class="viewcontact_wrapper media-list"> <ul id="contact-group-list" class="viewcontact_wrapper media-list">
{{* The contacts who are already members of the contact group *}} {{* The contacts who are already members of the contact group *}}
{{foreach $groupeditor.members as $contact}} {{foreach $groupeditor.members as $contact}}
<li class="members active">{{include file="contact_template.tpl"}}</li> <li class="members active">{{include file="contact_template.tpl"}}</li>
{{/foreach}} {{/foreach}}

90
view/theme/frost-mobile/php/default.php
View file

@ -1,45 +1,45 @@
<!DOCTYPE html > <!DOCTYPE html >
<html lang="<?php echo $lang; ?>"> <html lang="<?php echo $lang; ?>">
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script> <script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>> <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>
<center> <center>
<div class="login-button"> <div class="login-button">
<a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a> <a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>
</div> </div>
</center> </center>
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
?> ?>
<div class='section-wrapper'> <div class='section-wrapper'>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<?php } else { ?> <?php } else { ?>
<div class='main-container'> <div class='main-container'>
<!-- <div class='main-content-container'>--> <!-- <div class='main-content-container'>-->
<div class='section-wrapper'> <div class='section-wrapper'>
<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?> <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
<section> <section>
<?php if(x($page,'content')) echo $page['content']; ?> <?php if(x($page,'content')) echo $page['content']; ?>
<div id="pause"></div> <!-- The pause/resume Ajax indicator --> <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
</div> </div>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?> <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<!-- </div>--> <!-- </div>-->
</div> </div>
<?php } ?> <?php } ?>
<?php if(x($page,'end')) echo $page['end']; ?> <?php if(x($page,'end')) echo $page['end']; ?>
</body> </body>
</html> </html>

86
view/theme/frost/php/default.php
View file

@ -1,43 +1,43 @@
<!DOCTYPE html > <!DOCTYPE html >
<html lang="<?php echo $lang; ?>"> <html lang="<?php echo $lang; ?>">
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script> <script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>> <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>
<center> <center>
<div class="login-button"> <div class="login-button">
<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a> <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
</div> </div>
</center> </center>
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
?> ?>
<div class='section-wrapper'> <div class='section-wrapper'>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<?php } else { ?> <?php } else { ?>
<div class='main-container'> <div class='main-container'>
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>--> <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
<div class='main-content-container'> <div class='main-content-container'>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section> <section>
<?php if(x($page,'content')) echo $page['content']; ?> <?php if(x($page,'content')) echo $page['content']; ?>
<div id="pause"></div> <!-- The pause/resume Ajax indicator --> <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<?php if(x($page,'end')) echo $page['end']; ?> <?php if(x($page,'end')) echo $page['end']; ?>
</body> </body>
</html> </html>