mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 17:35:12 +00:00
1a5a5c7edb
There were 11 main types of changes:
- UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but
it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just
copied from Friendica. All of these instances, the LIMIT 1 was simply removed.
- Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit
integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice
to boot). Proper explicit boolean conversions were added. New queries should use proper conventions.
- MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_
func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There
were no true toggles (XOR). New queries should refrain from using XOR when not necessary.
- There are several fields which the schema has marked as NOT NULL, but the inserts don't specify
them. The reason this works is because mysql totally ignores the constraint and adds an empty text
default automatically. Again, non-compliant, obviously. In these cases a default of empty text was
added.
- Several statements rely on a non-standard MySQL feature
(http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten
to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run
a zillion times faster, even on MySQL.
- A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG,
UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_
- INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes
around the value -- assist functions added in the dba_
- NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such
thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are
handled in Zot/item packets automagically by quoting all dates with dbescdate().
- char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the
code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works
better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype
for all text fields in the postgres schema. varchar was used in a couple of places where it actually
seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code
actually validates data, new bugs might come out from under the rug.
- postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted.
bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function
was added to handle this transparently.
- postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax.
Statements were updated to be standard.
These changes require corresponding changes in the coding standards. Please review those before
adding any code going forward.
Still on my TODO list:
- remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting
- Rewrite search queries for better results (both MySQL and Postgres)
124 lines
No EOL
3.9 KiB
PHP
124 lines
No EOL
3.9 KiB
PHP
<?php /** @file */
|
|
|
|
|
|
require_once('include/Contact.php');
|
|
require_once('include/contact_widgets.php');
|
|
require_once('include/items.php');
|
|
|
|
|
|
function connect_init(&$a) {
|
|
if(argc() > 1)
|
|
$which = argv(1);
|
|
else {
|
|
notice( t('Requested profile is not available.') . EOL );
|
|
$a->error = 404;
|
|
return;
|
|
}
|
|
|
|
$r = q("select * from channel where channel_address = '%s' limit 1",
|
|
dbesc($which)
|
|
);
|
|
|
|
if($r)
|
|
$a->data['channel'] = $r[0];
|
|
|
|
profile_load($a,$which,'');
|
|
}
|
|
|
|
function connect_post(&$a) {
|
|
|
|
if(! array_key_exists('channel', $a->data))
|
|
return;
|
|
|
|
$edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false);
|
|
|
|
if($edit) {
|
|
$has_premium = (($a->data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
|
|
$premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
|
|
$text = escape_tags($_POST['text']);
|
|
|
|
if($has_premium != $premium) {
|
|
$r = q("update channel set channel_pageflags = ( channel_pageflags & ~%d ) where channel_id = %d",
|
|
intval(PAGE_PREMIUM),
|
|
intval(local_user())
|
|
);
|
|
proc_run('php','include/notifier.php','refresh_all',$a->data['channel']['channel_id']);
|
|
}
|
|
set_pconfig($a->data['channel']['channel_id'],'system','selltext',$text);
|
|
// reload the page completely to get fresh data
|
|
goaway(z_root() . '/' . $a->query_string);
|
|
|
|
}
|
|
|
|
$url = '';
|
|
$observer = $a->get_observer();
|
|
if(($observer) && ($_POST['submit'] === t('Continue'))) {
|
|
if($observer['xchan_follow'])
|
|
$url = sprintf($observer['xchan_follow'],urlencode($a->data['channel']['channel_address'] . '@' . $a->get_hostname()));
|
|
if(! $url) {
|
|
$r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1",
|
|
dbesc($observer['xchan_hash'])
|
|
);
|
|
if($r)
|
|
$url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode($a->data['channel']['channel_address'] . '@' . $a->get_hostname());
|
|
}
|
|
}
|
|
if($url)
|
|
goaway($url . '&confirm=1');
|
|
else
|
|
notice('Unable to connect to your home hub location.');
|
|
|
|
}
|
|
|
|
|
|
|
|
function connect_content(&$a) {
|
|
|
|
$edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false);
|
|
|
|
$text = get_pconfig($a->data['channel']['channel_id'],'system','selltext');
|
|
|
|
if($edit) {
|
|
|
|
$o = replace_macros(get_markup_template('sellpage_edit.tpl'),array(
|
|
'$header' => t('Premium Channel Setup'),
|
|
'$address' => $a->data['channel']['channel_address'],
|
|
'$premium' => array('premium', t('Enable premium channel connection restrictions'),(($a->data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''),
|
|
'$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'),
|
|
'$text' => $text,
|
|
'$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
|
|
'$lbl2' => t('Potential connections will then see the following text before proceeding:'),
|
|
'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
|
|
'$submit' => t('Submit'),
|
|
|
|
|
|
));
|
|
return $o;
|
|
}
|
|
else {
|
|
if(! $text)
|
|
$text = t('(No specific instructions have been provided by the channel owner.)');
|
|
|
|
$submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array(
|
|
'$continue' => t('Continue'),
|
|
'$address' => $a->data['channel']['channel_address']
|
|
));
|
|
|
|
$o = replace_macros(get_markup_template('sellpage_view.tpl'),array(
|
|
'$header' => t('Restricted or Premium Channel'),
|
|
'$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
|
|
'$text' => prepare_text($text),
|
|
|
|
'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
|
|
'$submit' => $submit,
|
|
|
|
));
|
|
|
|
$arr = array('channel' => $a->data['channel'],'observer' => $a->get_observer(), 'sellpage' => $o, 'submit' => $submit);
|
|
call_hooks('connect_premium', $arr);
|
|
$o = $arr['sellpage'];
|
|
|
|
}
|
|
|
|
return $o;
|
|
} |