Commit Graph

1893 Commits

Author SHA1 Message Date
Tobias Diekershoff 08fc86802a
Merge pull request #5599 from annando/postupdate
Console script to ensure that all post updates are finished
2018-08-11 07:47:28 +02:00
Michael 5037f9c460 Console script to ensure that all post updates are finished 2018-08-10 21:20:25 +00:00
Michael 7d945e8504 Added a note concerning the question how to fix issue 3838 2018-08-10 20:28:41 +00:00
Michael 170dd2a705 Some more removed notices 2018-08-10 19:39:43 +00:00
Michael 77e3e011e3 Hide deprecated networks 2018-08-10 04:59:26 +00:00
Michael f82580c2ef Avoid probing for contacts if we don't want to update 2018-08-09 06:19:23 +00:00
Michael Vogel 276abfaba6 Issue 5158: Ignore all threads, even public ones (#5588)
* Issue 5158: Ignore all threads, even public ones

* Remove some notice

* Now it really should work

* Using "defaults"
2018-08-08 22:32:11 +02:00
Michael 0c56538cd5 Notice in tt fixed that happens with chinese translations 2018-08-08 12:17:49 +00:00
Michael Vogel 9eb2c2ec16 Fix for duplicated addon entries in the hook table (#5583) 2018-08-07 23:03:38 +02:00
Michael Vogel eaf81e5e66
Merge pull request #5563 from MrPetovan/bug/5470-fix-various-notices
Fix various notices
2018-08-07 21:34:47 +02:00
Michael Vogel 8c2efa6df4 Facebook and App.net is removed from nearly all places (#5581)
* Facebook is removed from nearly all places

* Remove app.net as well - it's dead for some time now
2018-08-07 17:06:51 +02:00
Michael 4921303133 Issue 5541: Don't do magic things when the remote site doesn't support it 2018-08-06 19:59:41 +00:00
Michael 3f612e0641 Issue 5436: Don't store tags that are too long 2018-08-06 17:11:40 +00:00
Michael Vogel c032011143 Post update script for setting the uri-id (#5573)
* Post update is working now

* Changed text.
2018-08-06 18:40:41 +02:00
Michael Vogel 5e61caa34f Fix for not loading the translation / some more notice removed (#5569) 2018-08-06 12:11:17 +02:00
Hypolite Petovan c0e728e7e5 Fix query string parsing border case in Util\Proxy 2018-08-05 15:57:04 +02:00
Hypolite Petovan 6a57574091 Fix missing $profile['nickname'] in Model\Profile 2018-08-05 15:56:41 +02:00
Hypolite Petovan 45de8a28cd Fix missing $_SESSION variable in src/App 2018-08-05 15:56:21 +02:00
Michael Vogel ef1c73fb6b
Merge pull request #5561 from MrPetovan/bug/4584-fix-twitter-gif-still-image
Restore source storing for Twitter conversations
2018-08-05 14:00:19 +02:00
Hypolite Petovan ea45a78218 Increase Twitter parcel constant value 2018-08-05 13:59:33 +02:00
Michael Vogel fa46e97f27 We now store the uri data in a separate table (#5560)
* We now have a item-uri table

* Fixing line endings

* New item uri table

* Rescued ItemURI.php file

* Reverting some git problem

* Corrected the dbstructure file

* Updated database.sql / we now store content in the new id fields
2018-08-05 13:09:59 +02:00
Hypolite Petovan c4e69b7766 Add conversation storage for Twitter 2018-08-05 12:34:33 +02:00
Hypolite Petovan 6678208915 Add new Conversation::PARCEL_TWITTER constant 2018-08-05 12:25:47 +02:00
Hypolite Petovan c13dc549ed Rename PROTOCOL_* constants to Model\Conversation::PARCEL_*
- Remove unused Conversation::PROTOCOL_GS_CONVERSATION constant
- Remove now renamed PROTOCOL_* constant declarations
2018-08-05 12:24:42 +02:00
Michael Vogel 8dea36bd8f We shouldn't cascade this deletion as well (#5558) 2018-08-05 11:02:36 +02:00
Michael Vogel 2f2b134e58 Fixes issue 5321: Likes can be undone and comments can be deleted again (#5557) 2018-08-05 06:35:11 +02:00
Hypolite Petovan c9b756674a Add CW support to shared posts in Protocol\OStatus 2018-08-04 21:40:45 +02:00
Hypolite Petovan 36975d521f Remove plural from $activityobjects variable name in Protocol\OStatus 2018-08-04 21:39:54 +02:00
Michael Vogel 810c108297 Fix: Notes can be posted again. Never use "defaults" with "false" (#5551) 2018-08-04 16:06:36 +02:00
Hypolite Petovan 6a6695b167 Change DBStructure::definition to use config/dbstructure.json 2018-08-04 13:24:04 +02:00
Michael Vogel 2c8c803d64 Avid notices and warnings (#5546) 2018-08-02 19:07:20 +02:00
Michael Vogel 65d752d03c Notices what else? (#5545)
* Poco isn't filled, so we cannot store it

* We should initialize our variables
2018-08-02 16:11:21 +02:00
Michael Vogel c72c64a6d8 Notices again (#5543)
* And again notices

* Notices in the directory

* Much more places

* Fix some double $

* Notice in ping

* Missing field

* Fix: We now remove deleted users from the directory

* Some more stuff

* Notices when removing users

* Added logging

* More logging

* Two more
2018-08-02 07:21:01 +02:00
Hypolite Petovan 4d17fb36d1 Fix missing fields in event reminder (#5540) 2018-08-01 09:27:13 +02:00
Michael Vogel 1afc0ab028 Added logging and one more reason for a notice found (#5538)
* Added logging and one more reason for a notice found

* And one more
2018-08-01 08:47:18 +02:00
Michael Vogel 9d0f18c0b3 Yeah, and again notices ... (#5536)
* Yeah, and again notices ...

* And some more

* Block access without given user name

* Reformatting
2018-08-01 07:29:58 +02:00
Michael Vogel 71b1638d9a Once again, notices ... (#5535) 2018-07-31 18:39:23 +02:00
Michael Vogel b552b711ee And some more notices removed ... (#5533)
* Fix for vanishing notes

* The field needs to be part of the selected fields ...

* And some more notes ...
2018-07-31 07:54:25 +02:00
Michael Vogel c39e0dcf2a Fix for vanishing notes (#5531)
* Fix for vanishing notes

* The field needs to be part of the selected fields ...
2018-07-30 22:23:48 -04:00
Roland Häder 4d39164c1e [WIP] Rewrite to Proxy class: (#5507)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

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

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

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

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

* No instances from utility classes

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

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

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

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
2018-07-30 22:06:22 -04:00
Roland Häder bf87ad4fcf Fixed E_NOTICE in listing worker queue and new utilities class added (#5521)
* Fixes for E_NOTICE in workqueue:
- introduced class `Friendica\Util\Arrays` which will hold static methods for
  handling arrays that cannot be done with PHP's functions, like implode() on
  multi-dimensional arrays
- rewrote old-school for() loop to foreach()

* Added intial unit test with some tests on empty delimiters and/or sinle and
multi-dim array.

* Added test for for 3-dimensional arrays, thanks to  nupplaphil's feedback.
2018-07-30 21:24:26 -04:00
Michael Vogel 1eb8f04274 Fixing SQL error when receiving DFRN posts (#5527)
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...

* Fixing bad SQL query
2018-07-30 07:06:32 +02:00
Michael Vogel a2cea16954 Some more notices (#5526)
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...
2018-07-30 06:41:20 +02:00
Roland Häder 650c3c18e1
Fixed fatal error about when returned 'body' field is empty:
````
PHP Fatal error:  Uncaught TypeError: Argument 1 passed to Friendica\Protocol\PortableContact::discoverServer() must be of the type array, null given, called in /var/www/../src/Protocol/PortableContact.php on line 1664 and defined in /var/www/../src/Protocol/PortableContact.php:1765
Stack trace:
````
2018-07-29 17:34:20 +02:00
Tobias Diekershoff 02d4b1098e
Merge pull request #5519 from annando/test-2
Moved expiring of item content
2018-07-29 11:45:50 +02:00
Michael 6add589c3f Removed some test logging 2018-07-29 04:38:14 +00:00
Michael bc38420801 Some more notices removed 2018-07-29 04:04:23 +00:00
Michael dc9b10fb09 Moved expiring of item content 2018-07-29 03:54:34 +00:00
Michael Vogel 489d3daa94 Trying to clean up a little bit more (#5517)
* "post-type" replaces "bookmark" and "type"

* The permission set is now removed upon expiry

* Post update now stores the permission set

* We don't store the permissions in the item table anymore

* Postupdate now handles "postopts" as well

* "post-type" replaces "bookmark" and "type"

* "post-type" replaces "bookmark" and "type"

* "post-type" replaces "bookmark" and "type"

* The permission set is now removed upon expiry

* The permission set is now removed upon expiry

* We don't store the permissions in the item table anymore

* Postupdate now handles "postopts" as well

* Multiplicated update functions

* And some more duplicated functions ...

* Removed duplicate functions
2018-07-28 16:04:56 -04:00
Michael Vogel 91db91d315 Fix for post update (#5513)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...

* Postupdate now handles "postopts" as well

* Set deprecated fields to "null" if empty

* Postupdates are enabled again

* Fix for post update
2018-07-28 13:12:35 -04:00
Michael Vogel 36d4516e7a Missing stuff in "develop"? (#5516)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...

* Postupdate now handles "postopts" as well

* Set deprecated fields to "null" if empty

* Postupdates are enabled again

* "post-type" replaces "bookmark" and "type"

* The permission set is now stored

* The permission set is now removed upon expiry

* Postupdate now handles "postopts" as well
2018-07-28 13:11:46 -04:00
Hypolite Petovan 0902ea508d
Fix parse error in Protocol\PortableContact (#5515) 2018-07-28 08:52:57 -04:00
Roland Häder c30ac30f29 Possible fix for #5470 - json_decode() (#5511)
* Possible fix for #5470:
- $data is not an object like stdClass but an array
- newer PHP versions doesn't allow cross-access like following:

  $object['foo'] = 123;
  $array->foo = 123;

- added type-hints for private methods for above cases
- used `if (empty($foo)) instead of just `if ($foo)` preventing some nasty
  E_NOTICE
- added some empty lines for better readability

* Rewrite:
- mixture of object/array was here, causing under newer PHP versions some E_NOTICE
- this has been now finally fixed by converting any `object` type to an
  associative `array`
- also changed `is_object()` to `is_array()`
2018-07-28 01:35:27 -04:00
Roland Häder 4a22710b3b Moved global PAGE_* to Profile class (#5500)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class

* Fixed more rewrites from plain (global namespace) PAGE_* to Friendica\Models\Profile class

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* CR request:
- moved ACCOUNT_TYPE_* constants from boot.php to Contact::ACCOUNT_TYPE_*

* Just copy-pasted this code from boot.php, needs to be changed to `const ACCOUNT_TYPE_FOO = x;`

* Ops, melting brain cells here ... :-/
2018-07-27 19:25:57 -04:00
Michael Vogel 5f77e98d76 Postupdate is now working again (#5512)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...

* Postupdate now handles "postopts" as well

* Set deprecated fields to "null" if empty

* Postupdates are enabled again
2018-07-27 19:24:26 -04:00
Michael Vogel 1e83261a88
Merge pull request #5509 from friendica/revert-5506-fixes/portable-contact
Revert "Possible fix for #5470 and empty() usage"
2018-07-27 08:04:19 +02:00
Michael Vogel 82e3163e5e Revert "Possible fix for #5470: (#5506)"
This reverts commit 1e20fd84f7.
2018-07-27 08:02:41 +02:00
Roland Häder 592190892c Continued: (#5508)
- `App` is now "imported" to avoid having \Friendica\App::* everywhere
2018-07-26 22:27:28 -04:00
Roland Häder 1e20fd84f7 Possible fix for #5470: (#5506)
- $data is not an object like stdClass but an array
- newer PHP versions doesn't allow cross-access like following:

  $object['foo'] = 123;
  $array->foo = 123;

- added type-hints for private methods for above cases
- used `if (empty($foo)) instead of just `if ($foo)` preventing some nasty
  E_NOTICE
- added some empty lines for better readability
2018-07-26 18:27:12 -04:00
Michael Vogel 986106a8f7 Item storage: Permissions aren't stored in the items anymore (#5495)
* The permission set is now used for item permissions

* Check for allow_cid, ... is superfluous. Checking for "private" is enough

* We query the permissionset

* Permissions are displayed correctly

* Changed index

* We don't store the permissions in the item table anymore

* Permission fields are now deprecated

* Reversed ...
2018-07-25 19:14:55 -04:00
Roland Häder 37253656e3 Moved CONTACT_* constants to Friendica\Model\Contact class, lesser in global namespace (#5490)
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class

* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
2018-07-24 22:53:46 -04:00
Michael Vogel 69af69d1a0 Fallback to Diaspora if DFRN transmission fails (#5487) 2018-07-24 14:12:09 -04:00
Michael Vogel 5a8654194a
Merge pull request #5452 from MrPetovan/bug/5443-fix-worker-notices
Fix notices in OEmbed et al.
2018-07-24 17:11:53 +02:00
Hypolite Petovan 6771522167 Reduce cache time for OEmbed error 2018-07-24 11:05:09 -04:00
Michael Vogel be8b68aaaf Store guid and plink with event (#5485)
* Store guid and plink with event

* One space too much
2018-07-24 10:01:31 -04:00
Hypolite Petovan b6e3da8443 Move addLanguageToItemArray call when body is ensured 2018-07-24 08:52:25 -04:00
Hypolite Petovan df917251ff Fix undefined oembed properties
- Add Object\OEmbed class
2018-07-24 07:56:27 -04:00
Hypolite Petovan adc47fc8ea Fix Undefined index: nurl in Protocol\PortableContact 2018-07-24 07:55:42 -04:00
Hypolite Petovan 41fd5bef13 Fix by reference notice in Protocol\PortableContact 2018-07-24 07:54:12 -04:00
Hypolite Petovan 4e9ba728c4 Fix undefined index body in Model\Item 2018-07-24 07:54:12 -04:00
Hypolite Petovan d09ab35816 Fix getimagesizefromstring() read errors 2018-07-24 07:54:12 -04:00
Michael Vogel ca2c316de0 Some removed notices when viewing events (#5483) 2018-07-24 07:51:50 -04:00
Michael 432eec770b Issue 5467: Cron jobs hadn't been executed 2018-07-24 06:15:58 +00:00
Michael de984cdaa1 Issue 5467: Fix worker and daemon 2018-07-24 03:42:44 +00:00
Hypolite Petovan 30fff2077c Ad missing use statements after dbesc conversion 2018-07-23 18:44:05 -04:00
Hypolite Petovan a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan d3a598f589 Update DBA::escape to match dbesc() 2018-07-23 15:13:42 -04:00
Hypolite Petovan 538b81d10d Delete Database\DBM class file 2018-07-23 11:04:15 -04:00
Hypolite Petovan aa26943f92 Rename DBA::esc_array to DBA::escapeArray
- Rename internal method DBA::esc_array_callback to
DBA::escapeArrayCallback
2018-07-23 11:04:15 -04:00
Hypolite Petovan ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan 0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan 8ddb94ef06 Use DateTimeFormat::utc() instead of DBM::date() 2018-07-23 10:57:47 -04:00
Hypolite Petovan c55e389bbc Add Database\DBM methods to Database\DBA 2018-07-23 10:57:47 -04:00
Hypolite Petovan 38f341e064
Add missing space between PHP path and script in App->proc_run (#5468) 2018-07-23 10:43:39 -04:00
Michael Vogel 2d0a749734
Merge pull request #5431 from MrPetovan/task/5410-rename-database-methods
Move DBA to src/ part 3.1: Rename DBA methods
2018-07-23 15:18:58 +02:00
Hypolite Petovan b685ef37c9
Fix Fatal errors in Protocol\OStatus (#5466) 2018-07-23 07:48:44 -04:00
Michael Vogel 53876abfda And some more removed notices in the core (#5465) 2018-07-23 07:43:18 -04:00
Philipp cd52d0b3e9 Using getopt for CLI arguments (#5446)
* Adding Argument class to Friendica

* Adding Argument class to Friendica

* Adding Argument class to Friendica

* fixing arguments for `spawnWorker`

* Adding `use Friendica\BaseObject` to `ApiTest.php`

* Refactoring the argument-usages of Friendica

* Refactoring the argument-usages of Friendica

* removing superfluous []
2018-07-23 07:40:52 -04:00
Roland Häder 4eb6707dc9 Cleanup: (#5463)
- rewrote x() to empty() as it is deprecated
- fixed indending for some entries
2018-07-22 21:18:21 -04:00
Hypolite Petovan cdd8e4fd9d Rename DBA::get_db to DBA::getConnection
- Rename DBA::$db to DBA::$connection
2018-07-22 19:28:29 -04:00
Hypolite Petovan 415b982d39 Rename DBA::num_rows to DBA::numRows 2018-07-22 19:27:35 -04:00
Hypolite Petovan 1f2c0b98b5 Rename DBA::server_info to DBA::serverInfo 2018-07-22 19:27:35 -04:00
Hypolite Petovan 4db98eb43d Rename DBA::inArray to DBA::toArray 2018-07-22 19:27:35 -04:00
Hypolite Petovan f051ae1698 Rename DBA::fetch_first to DBA::fetchFirst 2018-07-22 19:27:34 -04:00
Hypolite Petovan 591939dfc0 Rename DBA::database_name to DBA::databaseName 2018-07-22 19:27:34 -04:00
Hypolite Petovan abbaaf5aa5 Rename DBA::clean_query to DBA::cleanQuery 2018-07-22 19:27:34 -04:00
Hypolite Petovan 910e832dc2 Rename DBA::any_value_fallback to DBA::anyValueFallback 2018-07-22 19:27:34 -04:00
Hypolite Petovan e42cf4d4fc Rename DBA::affected_rows to DBA::affectedRows 2018-07-22 19:27:34 -04:00
Roland Häder d3144e2837 Need to load "verb" from notify table, too. This whole thing is a maintenance (#5459)
nightmare. Let's use the new database frontend/backend system and load all
columns anywhere the "entity" is requested.
2018-07-22 19:25:07 -04:00
Hypolite Petovan bb99ac8111
Fix Fatal error in Protocol\Diaspora (#5460) 2018-07-22 19:22:41 -04:00
Roland Häder 7876d6547b Fixed E_NOTICEs when uploading profile picture (#5456)
* Fixed E_NOTICEs when uploading profile picture.

* Fixed E_NOTICEs when $_POST doesn't contain these fields.
2018-07-22 16:01:14 -04:00
Roland Häder c17adaf333 Uncommon logger levels in Friendica (#5453)
* "normal" is an uncommon logger level:
- changed LOGGER_NORMAL -> LOGGER_INFO
- added LOGGER_WARNING (a common logger level)

* Used constants instead of values (MrPetovan)
2018-07-22 14:07:44 -04:00
Hypolite Petovan a202962f03
Fix yet another Fatal Error in Protocol\OStatus (#5454) 2018-07-22 13:32:34 -04:00
Hypolite Petovan d6ccba79e0
Fix another Fatal error in Protocol\OStatus (#5451)
* Fix Fatal error in Protocol\OStatus

* Fix another Fatal error in Protocol\OStatus
2018-07-22 12:57:33 -04:00
Roland Häder 7d47152564 Fixed E_NOTICE in boot.php and DBA class (#5430)
* Fixes:
- fixed missing variable $port (MySQL: 3306)
- "imported" mysqli class

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

* Fixed:
- better use `false` and `$port > 0`

* And better only provide `$port` when larger zero.

* Initialize `$port` with zero value (int) and not `false` (bool).

* Removed duplicate mysqli "import".

* `$post_update` is no longer used. Instead `$prefix` needs to be checked.
2018-07-22 12:53:46 -04:00
Hypolite Petovan 3500e50be9
Fix Fatal error in Protocol\OStatus (#5450) 2018-07-22 12:52:38 -04:00
Roland Häder 0a519f5001 Fixes/tye-hints (#5449)
- added type-hints for DOMDocument, DOMXPath and array
- added missing documentation about optional parameter
- `if ($foo['bar'])` is not a good choice, better use
  `if (!empty($foo['bar']))` instead
2018-07-22 12:35:20 -04:00
Roland Häder 2e332134d4 There is no LOGGER_WARNING (triggering E_NOTICE about absent constant). Either (#5448)
declare it and push all other numbers higher or use LOGGER_NORMAL.
2018-07-22 12:33:28 -04:00
Philipp c5cbf565d9 DBStructure enhancements (#5437)
* Adding DBStructure enhancements

- Added DBStructure::rename()
- Added DBStructure::existTable()
- Added DBStructure::existColumn()

(cherry picked from commit 4ae06ec)

* Adding `pre_update_1279` method

- Added DBStructure::rename()
- Added DBStructure::existTable()
- Added DBStructure::existColumn()

(cherry picked from commit 8496d84)

* code standards

(cherry picked from commit 551d09b)

* simplify to `empty` instead `is_null`

(cherry picked from commit ce68835)
2018-07-21 08:43:43 -04:00
Michael f02bcdba51 Automatically create a .htaccess when not existing 2018-07-21 05:41:19 +00:00
Tobias Diekershoff e4a652cae8
Merge pull request #5433 from annando/mysqli
Forgotten "use"
2018-07-21 07:18:10 +02:00
Michael 4ba91d4ea1 Forgotten "use" 2018-07-21 05:09:09 +00:00
Michael Vogel 6a6a805225 One more notice (#5429)
* Some more notices

* And some more notice in the worker
2018-07-20 20:43:21 -04:00
Michael Vogel 4bbcb61a9e We now have a pre update script (#5425)
* We now have a pre update script

* Some optimized stuff
2018-07-20 15:47:16 -04:00
Michael Vogel 7382be2766 Some more notices (#5424) 2018-07-20 14:07:54 -04:00
Hypolite Petovan af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Tobias Diekershoff b6a1df0598
Merge pull request #5420 from annando/notices
Just some more fixed notice
2018-07-20 12:46:42 +02:00
Michael 045358cb88 Wrong "use" for config 2018-07-20 06:04:23 +00:00
Michael 5c63de1692 Just some more fixed notice 2018-07-20 05:31:26 +00:00
Michael 9a6a3bf1c1 Makes Diaspora working again 2018-07-20 05:10:16 +00:00
Hypolite Petovan 9c70a94589 Add missing PDO* use statements in Database\dba 2018-07-19 22:24:03 -04:00
Hypolite Petovan daa1177e3a Update use statement lists with new Friendica\Database\dba class
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
2018-07-19 22:15:21 -04:00
Hypolite Petovan c316c5ae30 Add new Friendica\Database\dba class 2018-07-19 22:06:13 -04:00
Roland Häder 36c6e35c7e Misc cleanups (#5417)
* Fixed http://github to https://github

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

* reverted back

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

* Added type-hint 'array' as the method uses foreach() on it.

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

* Tpzo fixed ...

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

* Added missing new-line at end of file, will make some POSIX parsers being lesser
confused ...

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-19 20:52:18 -04:00
Michael Vogel 01b67c4eb3 Little fixes (#5414)
* We now store the item delivery data in a separate table

* Reorganized table structure

* Fix  a notice when using the profiler / ensure that permissions are strings
2018-07-19 18:40:39 -04:00
Roland Häder b2899d76cf Small cleanup (#5416)
- added internal TODO to decide about is_result() usage
- removed semicolon (not needed here) from SQL query
- added empty line

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-19 18:39:05 -04:00
Michael Vogel ec49d004e3 We now store the item delivery data in a separate table (#5413)
* We now store the item delivery data in a separate table

* Reorganized table structure
2018-07-19 17:56:52 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
2018-07-19 09:52:05 -04:00
Roland Häder b05b96d04a Fixes: (#5404)
- fixed E_NOTICE in mod/follow.php
- fixed 2 E_NOTICE in src/Protocol/Diaspora.php
- added more type-hints for `array` type where known

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-19 07:07:14 -04:00
Roland Häder 346790cbbc According to @annando and @MrPetovan, $emailcc is no `item` field (column) and (#5401)
should be initialized empty (I did it above the `if()` block).

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-18 17:26:14 -04:00
Pierre Rudloff 6e1ed0b0d3 Fix tests (#5400)
* Avoid argc side-effects

* Fix undefined array keys in JITConfigAdapter::set()

* Avoid argv side effects in ApiTest
2018-07-18 16:30:55 -04:00
Michael Vogel 2fa6cc0000
Merge pull request #5394 from MrPetovan/bug/fix-config-set-return-value
Change (P)Config::set return value to bool
2018-07-18 11:07:10 +02:00
Michael Vogel 66a103e36a
Merge pull request #5295 from MrPetovan/task/4889-move-config-to-config
Move configuration to config/
2018-07-18 11:04:35 +02:00
Hypolite Petovan 0f7c7cebeb Change (P)Config::set return value to bool 2018-07-18 02:32:35 -04:00
Hypolite Petovan 1b6727fb9c Fix notice in Util\Network 2018-07-17 21:00:22 -04:00
Roland Häder a41e49c84a Fixes for E_NOTICE in mod/item.php (#5393)
* Fixes applied:
- `if (is_array($some_array))` is better code style than `if ($some_array)` as
  the `if()` block really needs an array to be found
- same with `if ($some_id)`, maybe `if ($some_id > 0)` is a more proper check
- added missing field 'emailcc' to Item::ITEM_FIELDLIST

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

* Fixes E_NOTICE of missing variable (PHP's lazyness again).

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

* Use !empty() to avoid accessing empty array.

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 18:18:42 -04:00
Roland Häder fd8897851f Fixes for OEmbed class (#5392)
* Fixes:
- stdClass is clearly an object of `\stdClass`, so let's import it and set it
  as type-hint here
- if $o->type is not found, don't continue

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

* Fix for a fix due to 02:51 a.m. (!) edits ...

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 16:28:20 -04:00
Hypolite Petovan 050ad68b9f Improve Console/Config display for array values
- Prevent setting a config key that is an array
2018-07-17 02:15:05 -04:00
Hypolite Petovan d993c8584c Add support for legacy $lang config in App->loadConfig 2018-07-17 02:05:52 -04:00
Hypolite Petovan 007ec92ae4 Remove exception for legacy config file in App->loadDatabase 2018-07-17 02:05:36 -04:00
Hypolite Petovan 7b8efcc23d Fix config value type in MemcachedCacheDriver
- Remove default config values set in CacheDriverFactory
2018-07-17 02:05:06 -04:00
Roland Häder 04b513ba95 Fixed E_NOTICE when 'title' is absent (uninitialized array key) (#5390)
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-17 01:13:22 -04:00
Hypolite Petovan bad2774817 Separate default config values between file-only and admin settings 2018-07-16 19:38:19 -04:00
Hypolite Petovan 67dc08d120 Enforce systen.register_policy value type 2018-07-16 19:38:19 -04:00
Hypolite Petovan 9b01a23c9b Code standards in App 2018-07-16 19:38:19 -04:00
Hypolite Petovan 763c66dd49 Improve console/config display
- Add visual distinction between get/set value
2018-07-16 19:38:18 -04:00
Hypolite Petovan 3001951075 Move the addon-specific config in config/addon.ini.php
- Add sample addon.ini.php file
- Add config/addon.ini.php file to git ignore
2018-07-16 19:38:18 -04:00
Hypolite Petovan c8d3067d0a Fix JITConfigAdapter to retrieve non-db config.* values 2018-07-16 19:38:17 -04:00
Hypolite Petovan bd04c03c9f Fix urlpath determination on the root page 2018-07-16 19:38:17 -04:00
Hypolite Petovan 0cbe3aa8e6 Remove global $db variable 2018-07-16 19:38:17 -04:00
Hypolite Petovan 820afa2284 Replace global $a with BaseObject::getApp() 2018-07-16 19:38:17 -04:00
Hypolite Petovan d0780ccf7d Replace global $lang with system.language 2018-07-16 19:38:17 -04:00
Hypolite Petovan 6b03ae92b8 Fix Memached config value format usage 2018-07-16 19:38:16 -04:00
Hypolite Petovan 762a786611 Replace direct accesses to App->config by Config::get/set calls 2018-07-16 19:38:16 -04:00
Hypolite Petovan 3255b2364b Fix dbesc as a constant notice message 2018-07-16 19:38:15 -04:00
Hypolite Petovan e98216b5bb Improve comparison in App->loadDatabase() 2018-07-16 19:38:15 -04:00
Hypolite Petovan d8096a402c Update use of environment variables in loadDatabase 2018-07-16 19:38:15 -04:00
Hypolite Petovan cd9b864045 Rework App modes
- Replace App mode constants with capability-based flags
- Add App->isInstallMode()
- Add file config fallback in (P)Config abstraction
- Removed logger disabling code
2018-07-16 19:38:15 -04:00
Hypolite Petovan d487c399dd Standards: Rename App methods
- Rename App->max_processes_reached to App->isMaxProcessesReached
- Rename App->maxload_reached to App->isMaxLoadReached
2018-07-16 19:38:14 -04:00
Hypolite Petovan 73b4e0552d Fix wrong urlpath determination 2018-07-16 19:38:14 -04:00
Hypolite Petovan 3fc21f0d64 Fix config mentions (no doc) 2018-07-16 19:38:14 -04:00
Hypolite Petovan 2e2930d770 Add addon config hook 2018-07-16 19:38:14 -04:00
Hypolite Petovan 0448ca3897 Update install procedure
- Fix Notice messages in Core\Install and Database\DBStructure
- Move local config file template from htconfig.tpl to local.ini.tpl
- Remove htconfig.php
2018-07-16 19:38:14 -04:00
Hypolite Petovan e7c3d453c2 Update config console command 2018-07-16 19:38:14 -04:00
Hypolite Petovan fd7179ee6c Prevent infinite loops with Config when App is in install mode 2018-07-16 19:38:13 -04:00
Hypolite Petovan 3985a4bc43 Remove extraneous dba::connect calls 2018-07-16 19:38:13 -04:00
Hypolite Petovan decfc553f7 Set BaseObject::setApp in App 2018-07-16 19:38:13 -04:00
Hypolite Petovan e952d6677b Rename App->path to App->urlpath 2018-07-16 19:38:13 -04:00
Hypolite Petovan 5fdff3d813 Centralize startup steps in Friendica\App
- Add loadDatabase startup step
- Add loadConfigFiles startup step
- Remove startup() in boot.php
- Replace App::checkMaintenanceMode() with App::determineMode()
2018-07-16 19:38:13 -04:00
Hypolite Petovan 2503660f97 Add new INI config files
- Add new local.ini.tpl template
- Change all references from .htconfig.php to config/local.ini.php
2018-07-16 19:38:13 -04:00
Michael 95fe08e5b9 Ensure that "follow" requests can be processed 2018-07-16 06:34:12 +00:00
Michael 78c9e29aa8 Don't accept posts from unknown owners 2018-07-16 05:48:51 +00:00
Michael Vogel d3a2ed85fe Next item structure works (#5380)
* Use "LEFT JOIN" to always fetch the item. Needed for update routines.

* New conversion routine that now covers every item

* Post update is now activated

* We now use a hash based upon RIPEMD-320 for content and activity

* The hash doesn't contain the plink anymore

* Legacy item fields are now "null"able

* New hash function for a server unique item hash

* Introduction of the legacy mode (usage of old item fields)

* Code simplification

* We don't need the "uri" fields anymore in item-activity and item-content

* Use the "created" and not the "received" date for the hash

* Avoiding several notices

* Some more warnings removed

* Improved uri-hash / Likes on Diaspora are now getting a creation date

* Corrected the post update version

* Ensure an unique uri-hash

* Don't delete orhaned item data at the moment

* Partly reworked, due to strange behaviour

* Some more parts reworked

* Using the uri currently seems to be more reliable

* Using the uri here as well

* Use the hash values again

* Grouped item fields in different categories

* Notices again

* use the gravity (we always should)

* Added hint for disabled post updates

* Notices ...

* Issue #5337: Personal notes are displayed again

* Use the gravity again
2018-07-15 14:36:20 -04:00
Hypolite Petovan ffc8b2a79a Rework smilies class and module
- Add new replaceFromArray function to enable smilies replacement with
an arbitrary array
- Moved $sample logic from class to module
2018-07-15 08:03:12 -04:00
Hypolite Petovan 065d10e587 Fix function comments in Util\Network 2018-07-15 08:03:12 -04:00
miqrogroove b5fe1c60a9 Fix Broken Profile Links (#5286)
* Expose the block_public setting to head.tpl

* Do not include hovercard.js if block_public
2018-07-14 16:31:46 -04:00
Roland Häder 6b5d90333f Fixes for some E_NOTICE and type-hints added (#5358)
* Fixed http://github to https://github

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

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

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

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

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

* Fixed missing variable $sql_order causing E_NOTICE.

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

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

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

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

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

* reverted changes that are unintended

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

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

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

* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-13 15:47:14 -04:00
Tobias Diekershoff 26723623f4
Merge pull request #5363 from annando/daemin
Workaround for stalling worker processes when running the daemon
2018-07-11 08:26:09 +02:00
Michael 3cb7a7606e workaround for stalling worker processes when running the daemon 2018-07-11 06:05:22 +00:00
Roland Häder 8825728fa4 "Imported" name spaces (#5361)
* Fixes for #5355:
- let's import SPL/extension classes and then just use them without name spaces
  like we do it with our own classes/interfaces, too.
- need to add namespace \ (global)

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

* Removed leading slashes from "import" lines.

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

* Completed:
- "import" other classes, then use them

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-07-10 18:55:01 -04:00
Michael Vogel 3792e2819d Use a process identifier for logging that contains the pid (#5359) 2018-07-10 18:32:47 -04:00
Michael Vogel 0360f7197a Several more warnings ... (#5340)
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
2018-07-10 08:27:56 -04:00
Andreas Neustifter 32ef5623ab [frio] Improve Group Editing (#5349)
* Improve group-editing and edit-navigation.

Use icons next to groups and header for navigation to editing groups and adding new groups.
Also use icon from group-sidebar for editing groups.

* Unify look&feel of contact search bars.

* Remove nogroup page and replace with /group/none.

* Make sure proper items are selected in aside.

* Use icon instead of link for 'View Contacs' on profile page.

* Fix none-working /group/none.

* Fix highlighting for everyone in group aside.
2018-07-09 18:36:50 -04:00
Andreas Neustifter 09b7e217c7 [Suggestion] Move New User Tip Link (#5342)
* Move new member tips to navigation bar.

The link looks so forlorn when its just somewhere in there. Put it in the nav bar.

* Style new member hints link propery.

* Make changes requested by @MrPetovan.
2018-07-09 18:20:57 -04:00
Philipp Holzer a84c94e94b
bugfix isempty... 2018-07-09 22:10:35 +02:00
Philipp Holzer d1eeaeead9
empty is not isset ... 2018-07-09 21:53:49 +02:00
Philipp Holzer c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Hypolite Petovan 7211fc4f1a
Merge pull request #5338 from annando/warnings
Remove warnings
2018-07-08 09:55:26 -04:00
Michael 6d90751110 Added missing "use 2018-07-08 13:39:48 +00:00
Michael 1d745c25a7 Some more places ... 2018-07-08 12:58:43 +00:00
Michael 7d6933c898 Avoid "Trying to get property of non-object" 2018-07-08 11:46:05 +00:00
Philipp Holzer 269221f013
Merge branch 'develop' of https://github.com/friendica/friendica into redis_serialize 2018-07-08 13:36:05 +02:00
Philipp Holzer be83696f02
Redis serialize instead of json because of objects 2018-07-08 13:35:28 +02:00
Michael 3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael c25c3b5981 urgent bugfix: Wrong function name for locks 2018-07-08 08:32:50 +00:00
Michael c2d4b557ae Only build tag and file when really needed 2018-07-08 05:44:35 +00:00
Michael 69db696ab1 Improve test behaviour 2018-07-08 05:29:06 +00:00
Michael 271b6cb8f9 Hopefully this fixes the tests 2018-07-08 05:10:45 +00:00
Michael 74d5eec571 Merge branch 'item-activities' of github.com:annando/friendica into item-activities 2018-07-08 04:56:35 +00:00
Michael 5ee2db8a16 Avoid undefined index 2018-07-08 04:55:45 +00:00
Michael Vogel ff5ee74ecf
Merge branch 'develop' into item-activities 2018-07-08 06:35:50 +02:00
Michael 75aa831b32 Better not check too strict 2018-07-07 23:31:30 +00:00
Michael 4673560c55 Don't use isset 2018-07-07 23:19:28 +00:00
Michael 4467dd4972 Clear legacy item fields 2018-07-07 23:03:28 +00:00
Michael afa194200b Fix: Ensure that the value is set. 2018-07-07 19:39:00 +00:00
Michael 4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Philipp Holzer 065b83d148
Fixed memcache & unittests 2018-07-07 20:07:07 +02:00
Philipp Holzer 80a4e6263f
Added Unittests for cache
fixed Lock & Cache bugs
2018-07-07 19:46:16 +02:00
Philipp Holzer 1dafaa69c5
bug in memcached clear function 2018-07-07 18:43:55 +02:00
Philipp Holzer f95c420801
bug in redis delete function 2018-07-07 18:39:33 +02:00
Michael d6af9515ba Avoid storing an icid value when iaid is stored/Fix item retraction 2018-07-07 16:38:01 +00:00
Philipp Holzer 1ffe0cfd81
Added Lock Unittests & Bugfixings
Added Redis Lock Unittests
Added Memcached Lock Unittests

Fixed a bug in dba
Fixed a bug in RedisLock
2018-07-07 16:15:03 +02:00
Michael 575662c2d7 Just some code cleanup 2018-07-07 11:39:37 +00:00
Michael 3389e9b213 Removing of likes should work now on comments as well 2018-07-07 10:43:43 +00:00
Michael b421e7708f Removing of orphaned activity and content data 2018-07-07 07:43:13 +00:00
Michael 9e262e6157 Better handling of empty content 2018-07-06 22:08:41 +00:00
Michael Vogel 3eec97aa6e
Merge pull request #5314 from MrPetovan/task/4889-fix-tests
Fix tests after enabling PHP Notices
2018-07-06 22:14:01 +02:00
Tobias Diekershoff a49e094308 added forgotten trim 2018-07-06 15:49:27 +02:00
Tobias Diekershoff 72638acac3 admins can forbid some nicknames from being registered 2018-07-06 15:32:56 +02:00
Michael 0c51159111 New index that is needed for the expiry 2018-07-06 06:46:44 +00:00
Michael 7f78540454 Expire does work now for activities as well 2018-07-06 06:45:30 +00:00
Michael 5a07042560 Added warning 2018-07-06 06:37:33 +00:00
Michael 32d398cc93 Unified content that is stored for a like 2018-07-06 05:39:25 +00:00
Michael da954b92c7 New post update to fill the item-activity table 2018-07-06 05:17:44 +00:00
Michael f33bd5fc8e Update does work now 2018-07-06 05:16:40 +00:00
Michael 5203f41d42 Set iaid after update 2018-07-05 22:50:33 +00:00
Michael 014eea8e12 Improve expire for item-content and item-activity 2018-07-05 22:07:50 +00:00
Michael 44e405d22b We now store activities in a separate table 2018-07-05 22:00:38 +00:00
Philipp Holzer 5a28ad7377
AbstractCacheDriver now working for each CacheDriver 2018-07-05 22:01:33 +02:00
Philipp Holzer 749b167fd9
AbstractCacheDriver now working for each CacheDriver 2018-07-05 21:54:20 +02:00
Philipp Holzer 34cea93a8b
Bugfixings for Cache-Lock
- used wrong cachekey in set
- therefore added an abstraction to avoid wrong key concatenation
- forgot to increase the db-version to 1275
2018-07-05 21:47:52 +02:00
Philipp Holzer e41e7d2edd
Fixings
- fixed test for semaphore
- fixed some issues
- changed namespace in Tests back to "src/"
- changed namings
2018-07-05 20:57:31 +02:00
Philipp Holzer 906bb25972
code standards / simplifications 2018-07-05 07:59:56 +02:00
Philipp Holzer 19209f6826
merged from develop and increased DB-version 2018-07-04 23:44:11 +02:00
Philipp Holzer aac94d1d74
Adding multihost - locking
Adding Unit-Tests for it
2018-07-04 23:37:22 +02:00
Michael 176ab7130f Fixes issue 5322 - events now again are having a plink 2018-07-04 19:53:02 +00:00
Michael f60da34357 Fix unliking liked 2018-07-04 19:07:53 +00:00
Philipp Holzer b07dfbb03f
Merge remote-tracking branch 'remotes/origin/develop' into lock_abstraction 2018-07-03 20:16:31 +02:00
Michael 9a9541809b Fix: Likes from OStatus got the gravity of comments 2018-07-03 04:58:34 +00:00
Hypolite Petovan 79ff49d716 Replace more is_null with empty in DBStructure 2018-07-02 22:42:15 -04:00
Hypolite Petovan e7d6b48bb3 Fix Undefined index: Collation in DBStructure 2018-07-02 22:28:27 -04:00
Hypolite Petovan 58e1470ddb Fix Undefined index: HTTP_USER_AGENT in App 2018-07-02 22:19:21 -04:00
Michael 80f9a45cba Fix: Twitter reshares hadn't been shown as this 2018-07-02 21:15:54 +00:00
Michael 4b3ae6a862 Only use query conditions in user mode 2018-07-02 18:22:27 +00:00
Hypolite Petovan 633a71ec97 Fix notice in Item::deleteById 2018-07-02 07:49:35 -04:00
Hypolite Petovan 07e06341df Simplify config.php_path access in App->proc_run 2018-07-02 07:48:33 -04:00
Hypolite Petovan 89e4629c16 Replace system.proc_windows config by PHP_OS test 2018-07-02 07:47:42 -04:00
Hypolite Petovan a380bcd1c1 Fix more undefined variable/index notice in tests 2018-07-02 07:45:25 -04:00
Hypolite Petovan 6776c4e3f9 Fix some undefined variable/index notices in tests 2018-07-02 07:44:55 -04:00
Hypolite Petovan 28741c8366 Remove startup() function
- Enable notice errors
2018-07-02 07:23:47 -04:00