Commit graph

574 commits

Author SHA1 Message Date
Hypolite Petovan
ea17370211 Fix bug with ACL and contact network page
- Require user array parameter in ACL::getFullSelectorHTML
- Change all wrong uses where user array was replaced by default
permissions array
2018-08-15 00:43:27 +02:00
Michael
170dd2a705 Some more removed notices 2018-08-10 19:39:43 +00:00
Hypolite Petovan
d9c6c919e8 Fix missing $prv and $nxt variables in mod/photos 2018-08-05 15:55:57 +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
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
Hypolite Petovan
a6fb3568f9 Rename dbesc to DBA::escape 2018-07-23 15:30:54 -04:00
Hypolite Petovan
ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan
0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Roland Häder
ea24ac9d95 Cleaned up: (#5461)
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
2018-07-22 21:19:28 -04:00
Roland Häder
a27ef8d0c9 Prevents 4 E_NOTICEs when POST fields are not set. (#5458)
* Prevents 4 E_NOTICEs when POST fields are not set.

* Don't use x().

* Replaced usage of x() which is deprecated with !isset().

* Use empty() according to MrPetovan
2018-07-22 19:49:16 -04:00
Andreas Neustifter
303aef34f0 Make frio more consistent by replacing textual links with icons everywhere. (#5415)
* Make frio more consistent by replacing textual links with icons everywhere I could find them.

* [frio] Move profile add link to icon.
2018-07-21 07:31:05 -04:00
Andreas Neustifter
b26da6096b [frio] Restyle album edit header. (#5426) 2018-07-20 15:23:51 -04:00
Andreas Neustifter
24fc070c5c [frio] Restyle photo upload (#5427)
* Better wording in photo upload.

* [frio] Restyle photo uploader to conform to frio style.
2018-07-20 15:23:12 -04:00
Hypolite Petovan
af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan
daa1177e3a Update use statement lists with new Friendica\Database\dba class
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
2018-07-19 22:15:21 -04:00
Michael Vogel
5af9596dde New item field "Post-type" and new table "permissionset" (#5408)
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
2018-07-19 09:52:05 -04:00
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
Philipp Holzer
c829e43725
moved get_guid to System::createGUID 2018-07-09 21:38:16 +02:00
Michael
b705a91ccd Standards and some more replace item calls 2018-06-28 03:31:10 +00:00
Michael
76dab3b2d7 Use gravity instead of verb 2018-06-27 18:09:33 +00:00
Michael
a7d2f126eb Fixes Issue 5276 and an endless loop in item::update 2018-06-23 10:32:53 +00:00
Roland Häder
8ad523fbc8
Continued a bit:
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:19:54 +02:00
Roland Haeder
6cb26f884e
Fixes for composer:
- ./vendor/ is being prepared by executing `utils/composer.phar install`, no
  need to have it around
- converted .gitignore to LF line-ending (more common over the whole project)
- no need to have them around ...

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
Roland Haeder
7c048b5077
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-06-20 22:02:17 +02:00
Michael
ab5669e091 Some more direct SQL calls had been replaced 2018-06-19 19:06:17 +00:00
Michael
4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael
14cb128264 New function for generating item URI 2018-06-16 06:44:19 +00:00
Michael
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
2018-06-01 07:30:04 -04:00
Michael
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Michael
54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Roland Häder
5a7bcd4725
Added empty line after if() block (convention)
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:22 +02:00
Roland Häder
8bc565be74
Continued:
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
Roland Haeder
2fd14eac70
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
Roland Häder
cbe12eba76
Continued:
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:59 +02:00
Roland Haeder
8e42e797cc
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
Roland Haeder
7514a3beb8
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:57 +02:00
Roland Haeder
128c9b20e0
fixed curly braces + added more
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
Roland Häder
1de8e31df6
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:49:55 +02:00
Hypolite Petovan
a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Michael
a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
rabuzarus
2e03a3a47f fix undeclared variables or wrong variable names (/mod) 2018-02-12 03:25:09 +01:00
Michael
e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Adam Magness
4c93b592a5 Rebase
fix from rebase
2018-02-05 12:49:03 -05:00
Adam Magness
db8ef98537 Rename functions
rename functions from review comments
2018-02-05 12:48:22 -05:00
Adam Magness
7ffcb25321 Update function names and calls
update function names and calls from other files
2018-02-05 12:47:04 -05:00
Michael Vogel
fa95911fdb
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src
Move include/tags to src/
2018-02-05 18:11:29 +01:00
Hypolite Petovan
2a5431a59e Rename Model\Term methods 2018-02-04 16:48:50 -05:00
Hypolite Petovan
2a486903d1 Remove references to include/tags.php 2018-02-03 23:59:31 -05:00
Hypolite Petovan
9f3acceac7 Replace references to include/tags functions 2018-02-03 23:57:47 -05:00
Hypolite Petovan
cea80c78e4 Replace remaining functions in include/datetime by Temporal methods
- Fix uses statements
2018-02-03 20:47:37 -05:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
a2ee2b56d2 Add Temporal::localNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
89602e44da Add Temporal::timezoneNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
8aff8a76eb Add Temporal::utcNow() 2018-02-03 08:56:52 -05:00
Hypolite Petovan
dc366bf1f7 Refactor datetime_convert into Temporal::convert
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
2018-02-03 08:56:51 -05:00
Michael
7b27dda784 Most functions now moved from include/items.php 2018-01-28 11:18:08 +00:00
Hypolite Petovan
9cd3b17743 Fix translation strings for use with util/extract.php
- Change parentheses to “\x28” and “\x29”
- Remove leading commas
- Remove quotes before commas
2018-01-24 16:51:32 -05:00
Adam Magness
428a22cc76 More sprintf
eliminate more sprintf( with L10n
2018-01-24 07:18:21 -05:00
Adam Magness
407b2397cb Finish t() for mod
finished mod folder
2018-01-22 18:03:26 -05:00
Adam Magness
d49f986d1e Many t() calls
modify many t() calls.
2018-01-22 18:03:26 -05:00
Adam Magness
11cf36105c Update Addon functions and calls
Update function names and calls for Addon class.
2018-01-20 07:48:22 -05:00
Michael
034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
Adam Magness
0f546f7f0f Update functions and calls
Update function names and scope. update calls.
2018-01-15 17:09:06 -05:00
Hypolite Petovan
e36f2bb1fb Use short form array syntax everywhere
- Add short form array syntax to po2php.php generation
2018-01-15 14:07:17 -05:00
Adam Magness
430bd7c6ac Review updates
Update function name, descriptive variable names.
2018-01-14 23:44:39 -05:00
Adam Magness
4fb2547df8 Update function calls
update function calls to use profile class
2018-01-14 21:22:39 -05:00
Adam Magness
7635421d78 Update function calls
update function calls and remove require_once
2018-01-13 09:40:34 -05:00
Hypolite Petovan
722782d553 Remove unused parameter in can_write_wall() 2018-01-04 12:21:13 -05:00
Hypolite Petovan
d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
Tobias Diekershoff
04589ecd38
Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src
Move auth to src
2018-01-04 18:06:42 +01:00
Adam Magness
71534a1475 Review update
Rename function and add new function.
2018-01-03 22:36:15 -05:00
Adam Magness
e37640c44c Move Photos to xrc
Move photos from include to Model\Photo class
2018-01-03 21:01:41 -05:00
Hypolite Petovan
9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
Hypolite Petovan
93ca0d79fe Fix formatting and PHP notice in mod/photos
- Use x() and defaults() to fix undefined indexes.
- Add missing fields in SQL query in dropalbum
- Improve file upload error messaging
- Remove unused variables
- Add back undefined variables
- Simplify nested conditions
- Remove unused public/private code block in photo upload and photo edit
2018-01-02 08:11:14 -05:00
Hypolite Petovan
e16852c2f5 Replace init_groups_visitor with Group::getIdsByContactId 2017-12-29 21:55:12 -05:00
Michael
319e21f6e3 Added explanation 2017-12-29 12:47:56 +00:00
Michael
c7bcc13451 Reformatted file, improved coding for "twist" 2017-12-28 20:37:23 +00:00
Michael
ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
Hypolite Petovan
a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan
3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
2017-12-07 23:54:51 -05:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan
18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan
52bddd580c Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
2017-12-07 08:56:11 -05:00
Adam Magness
b1d16fbdf7 Update use statements
update use statements for rename to singular.
2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular
Rename and update references. Standards and a require_once.
2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src
Move Features to class in Friendica\Content namespace. Update function calls and references.
2017-12-04 08:33:49 -05:00
Adam Magness
0091d318e5 Function names
Update function names and corresponding function calls
2017-11-29 12:17:12 -05:00
Adam Magness
54827e7fed Photo to src
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
2017-11-29 07:52:27 -05:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan
ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
Hypolite Petovan
b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05:00
Michael
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
Adam Magness
4ca68c7af0 Class file relocations
Issue #3878
2017-11-08 08:37:03 -05:00
Adam Magness
0dfa57948f Issue-#3873
Replace deprecated functions with new syntax.
2017-11-07 06:24:39 -05:00
Michael
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Michael
dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Alexandre Alapetite
5b80a1fcaa mod photos compatibility only_full_group_by
Related to https://github.com/friendica/friendica/pull/3323
2017-04-20 21:23:45 +02:00
Alexandre Alapetite
1058b28cea MySQL ANY_VALUE with fallback to MIN
https://github.com/friendica/friendica/issues/3322
2017-04-15 00:42:44 +02:00
Alexandre Alapetite
74b6d09e89 Fix GROUP BY in acl_selector, api, notifier, photos, messages
https://github.com/friendica/friendica/issues/3322
2017-04-12 15:11:50 +02:00
rebeka-catalina
554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
Roland Haeder
60552260e1
Continued with CR:
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 21:04:39 +02:00
Roland Haeder
d4e67338d8
space-time contines ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:56:43 +02:00
Roland Haeder
192f6d7cf4
merged 2 if() into one three times
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:49:03 +02:00
Roland Haeder
de5125a4c7
merged 2 if() into one as requested by CR
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:45:49 +02:00
Roland Haeder
2a480df6fa
added spaces + removed parentheses (include/require are no functions)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:44:55 +02:00
Roland Haeder
6b8f581897
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:42:09 +02:00
Roland Haeder
f998438d43
removed old-lost code by CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:38:36 +02:00
Roland Haeder
d091759888
space to the rescue ... ;-) CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
Roland Haeder
0e6b009425
fixed another parser error, opps
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:04:07 +01:00
Roland Haeder
fccdc63964
Opps, fixed parser error. indending was confusing here
+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:56:23 +01:00
Roland Haeder
73ee285212
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:33:59 +01:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder
d529125c8e
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00
Hypolite Petovan
c38a5e443d Merge branch 'develop' into issue/#3062
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
2017-01-27 15:30:21 -05:00
Michael
7e846ba7ac Hide the calculation for "previous" and "next" behind a setting 2017-01-15 14:50:26 +00:00
Michael
fd5f151a72 New function to detect heavily used indexes 2017-01-13 07:46:47 +00:00
Hypolite Petovan
b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
2017-01-12 09:19:59 +11:00
Michael Vogel
5eaa5951a1 Merge pull request #3078 from Hypolite/issue/#3039-mod-2of3
Normalize App parameter declaration (mod folder, 2 out of 3)
2017-01-11 22:49:01 +01:00
Hypolite Petovan
f92918f471 Normalize App parameter declaration (mod folder, 2 out of 3) 2017-01-09 23:14:25 +11:00
Hypolite Petovan
479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Michael
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Hypolite Petovan
daa8e4f901 Cleaning up, actual changes are in the next commits
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
2017-01-08 02:03:11 +11:00
Michael
c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Michael
1b48799f08 Don't do queries if not needed 2017-01-07 11:28:18 +00:00
Roland Haeder
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
rabuzarus
a6d7ad0755 Update cache on photo edit only when album name has changed 2016-12-26 02:41:00 +01:00
rabuzarus
08fb35838c Update the photo albums cache on upload, album deletion or renaming 2016-12-25 16:58:38 +01:00
Roland Haeder
52f14ffa5f
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:17:09 +01:00
Roland Haeder
6e44acfed6
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:15:53 +01:00
Michael
4aafbb09a5 The object type "photo" is deprecated and was replaced by "image"
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 16:00:23 +01:00
Roland Häder
b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop
Changes in #3034 were somehow conflicting. :-(

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

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 15:44:31 +01:00
Tobias Diekershoff
cc16369b6f Merge pull request #3033 from annando/1612-object-type
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
Roland Häder
51716957b2 converted more to dbm::is_result() + added braces/space
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
Roland Häder
4dce3d8224 changed to this:
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +01:00
Michael
6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Roland Häder
884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder
46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
Roland Häder
63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

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

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
rabuzarus
9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
rabuzarus
5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
Michael Vogel
8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel
ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Michael Vogel
b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel
501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel
60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
Roland Haeder
c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
rabuzarus
3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio 2016-08-04 21:53:22 +02:00
Michael Vogel
668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel
f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Roland Haeder
3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
Michael Vogel
5a90f865ed
Add the guid to items that we create locally 2016-05-01 13:47:24 +02:00
Michael Vogel
8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
fabrixxm
b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
Andrej Stieben
db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
fabrixxm
fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
2016-01-04 11:46:19 +01:00
rabuzarus
29c671bb22 photos aside widget:permissions cleanup 2016-01-03 16:09:05 +01:00
rabuzarus
20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
rabuzarus
e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
rabuzarus
d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
rabuzarus
cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus
89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
rabuzarus
649578ae33 Merge develop-new into event-attendance-new
Conflicts:
	include/conversation.php
2015-10-11 19:39:55 +02:00
rabuzarus
c775d6885b port of reds geotag feature 2015-10-03 20:24:35 +02:00
Michael Vogel
68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus
7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus
2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +02:00
rabuzarus
3d7602a5a3 don't show profile photos in albums to others than the owner or remote user 2015-09-29 19:44:26 +02:00
fabrixxm
5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm
28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
rabuzarus
a982320ba9 show maximagesize warning in a human readable format 2015-06-29 02:39:08 +02:00
rabuzarus
8cca849c2e Merge acl-var into develop
Conflicts:
	mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
rabuzarus
5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
rabuzarus
94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
rabuzarus
bfebf9636b acl for events and photos 2015-06-25 12:38:09 +02:00
fabrixxm
35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
rabuzarus
a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
rabuzarus
b61e39a1cb cleaning after local merge 2015-05-29 16:30:42 +02:00
rabuzarus
553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus
a7d417abb2 remove whitespace 2015-05-29 16:18:30 +02:00
rabuzarus
5cbb5b140c css work 2015-05-29 16:08:17 +02:00
rabuzarus
415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
rabuzarus
1067718018 little revision 2015-05-27 12:44:40 +02:00
rabuzarus
15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus
f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
Michael Vogel
0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Rabuzarus
5939a8cea5 revert last commit f59e574, remove some html code 2014-12-26 14:44:48 +01:00
Rabuzarus
f59e574068 removed Pagination 2014-12-26 12:54:23 +01:00
Rabuzarus
cb47fdfcb9 minor change: rel should not be part of the PHP 2014-12-26 03:32:21 +01:00
Rabuzarus
73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
Fabrixxm
51e6c30188 add id to album name tag
this should be in template
2014-09-17 11:02:18 +02:00
Michael Vogel
ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Fabrixxm
aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item 2014-04-28 09:29:48 -04:00
Michael Vogel
6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
Michael Vogel
608d5255ec Support for twitter cards (in both directions) 2014-02-22 15:46:19 +01:00
Michael Vogel
93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
Zach Prezkuta
488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel
b9afb38f4d Some more function calls to ensure that the tags are deleted when an item is deleted 2013-01-13 15:11:06 +01:00
Michael Vogel
3dc615dd9d Adding the tag creating function to the function when a photo is tagged 2013-01-13 15:05:24 +01:00
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
friendica
5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica
b01ca0e345 what happened to the photos page vcard? 2012-11-09 00:21:16 -08:00
friendica
0627fdcce7 positional params in "was tagged in a photo" string 2012-11-03 15:29:47 -07:00
fermionic
d3290f314f Merge pull request #521 from fermionic/20121101-updates
Various updates
2012-11-02 12:26:49 -07:00
friendica
e8fa4279fa no profile pic on photos page if no photos have been uploaded 2012-11-02 04:20:12 -07:00
Zach Prezkuta
e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Michael Johnston
939227e820 Moved comment box on photos to be after the last comment, added text for the Preview link 2012-10-14 14:41:31 -04:00
Zach Prezkuta
b9818185db for profile and photos, detect contacts from local hub and auto-redir 2012-10-09 09:50:24 -06:00
Zach Prezkuta
ce73cd560f allow tagging of people by name or nickname 2012-09-29 17:55:40 -06:00
friendica
ebabd25717 order photo album list in blog (reverse date) order 2012-09-29 06:08:44 -07:00
friendica
c357fddea7 photo "conversation streams" need work - quite a bit of it 2012-09-29 06:04:01 -07:00
friendica
7bec5778ba provide option to view photo albums in posted order (rather than blog order) 2012-09-08 18:33:28 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta
63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
Zach Prezkuta
9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00
Vasudev Kamath
1b3d84422e orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1].
When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload

[1] http://au2.php.net/manual/en/function.exif-read-data.php
2012-07-07 16:17:26 +05:30
Zach Prezkuta
3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
9528beac34 sidebar photo album list not visible to anybody if user['hidewall'] set 2012-06-24 16:51:39 -07:00
Zach Prezkuta
54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Zvi ben Yaakov (a.k.a rdc)
a801888b15 Now using App::get_cached_avatar_image for /photos page 2012-06-19 16:05:39 -07:00
Zach Prezkuta
42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
Zvi ben Yaakov (a.k.a rdc)
edc68f4876 Enabled Profile photo revisions to be displayed on /photos page 2012-06-17 23:59:29 +03:00
Fabio Comuni
2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
friendica
61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica
54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
Tobias Hößl
720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07:00
friendica
cf2edb5b9a ctrl + left|right cursor keys to prev/next photos 2012-03-19 01:20:53 -07:00
Tobias Hößl
0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00