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

Merge branch 'develop' into api_ping

Browse source
This commit is contained in:
Fabrixxm 2016-02-09 14:06:57 +01:00
commit 04dceb9551
135 changed files with 2234 additions and 3196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/database.md
View file

@ -27,7 +27,6 @@ Database Tables
| [group](help/database/db_group) | privacy groups, group info |
| [group_member](help/database/db_group_member) | privacy groups, member info |
| [gserver](help/database/db_gserver) | |
| [guid](help/database/db_guid) | |
| [hook](help/database/db_hook) | plugin hook registry |
| [intro](help/database/db_intro) | |
| [item](help/database/db_item) | all posts |

12
doc/database/db_guid.md
View file

@ -1,12 +0,0 @@
Table guid
==========
| Field | Description | Type | Null | Key | Default | Extra |
|---------|------------------|------------------|------|-----|---------|----------------|
| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
| guid | | varchar(255) | NO | MUL | | |
| plink | | varchar(255) | NO | MUL | | |
| uri | | varchar(255) | NO | MUL | | |
| network | | varchar(32) | NO | | | |
Return to [database documentation](help/database)

16
doc/themes.md
View file

@ -59,19 +59,7 @@ The same rule applies to the JavaScript files found in
they will be overwritten by files in
/view/theme/**your-theme-name**/js
### Modules
You have the freedom to override core modules found in
/mod
They will be overwritten by files in
/view/theme/**your-theme-name**/mod
Be aware that you can break things easily here if you don't know what you do. Also notice that you can override parts of the module – functions not defined in your theme module will be loaded from the core module.
/view/theme/**your-theme-name**/js.
## Expand an existing Theme
@ -300,4 +288,4 @@ The default file is in
/view/default.php
if you want to change it, say adding a 4th column for banners of your favourite FLOSS projects, place a new default.php file in your theme directory.
As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.

5
include/Photo.php
View file

@ -726,10 +726,11 @@ function guess_image_type($filename, $fromcurl=false) {
* @param string $avatar Link to avatar picture
* @param int $uid User id of contact owner
* @param int $cid Contact id
* @param bool $force force picture update
*
* @return array Returns array of the different avatar sizes
*/
function update_contact_avatar($avatar,$uid,$cid) {
function update_contact_avatar($avatar,$uid,$cid, $force = false) {
$r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
if (!$r)
@ -737,7 +738,7 @@ function update_contact_avatar($avatar,$uid,$cid) {
else
$data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
if ($r[0]["avatar"] != $avatar) {
if (($r[0]["avatar"] != $avatar) OR $force) {
$photos = import_profile_photo($avatar,$uid,$cid, true);
if ($photos) {

408
include/datetime.php
View file

@ -1,8 +1,17 @@
<?php
/**
* @file include/datetime.php
* @brief Some functions for date and time related tasks.
*/
// two-level sort for timezones.
if(! function_exists('timezone_cmp')) {
/**
* @brief Two-level sort for timezones.
*
* @param string $a
* @param string $b
* @return int
*/
function timezone_cmp($a, $b) {
if(strstr($a,'/') && strstr($b,'/')) {
if ( t($a) == t($b)) return 0;
@ -11,11 +20,16 @@ function timezone_cmp($a, $b) {
if(strstr($a,'/')) return -1;
if(strstr($b,'/')) return 1;
if ( t($a) == t($b)) return 0;
return ( t($a) < t($b)) ? -1 : 1;
}}
// emit a timezone selector grouped (primarily) by continent
if(! function_exists('select_timezone')) {
return ( t($a) < t($b)) ? -1 : 1;
}
/**
* @brief Emit a timezone selector grouped (primarily) by continent
*
* @param string $current Timezone
* @return string Parsed HTML output
*/
function select_timezone($current = 'America/Los_Angeles') {
$timezone_identifiers = DateTimeZone::listIdentifiers();
@ -52,13 +66,25 @@ function select_timezone($current = 'America/Los_Angeles') {
}
$o .= '</optgroup></select>';
return $o;
}}
}
// return a select using 'field_select_raw' template, with timezones
// groupped (primarily) by continent
// arguments follow convetion as other field_* template array:
// 'name', 'label', $value, 'help'
if (!function_exists('field_timezone')){
/**
* @brief Generating a Timezone selector
*
* Return a select using 'field_select_raw' template, with timezones
* groupped (primarily) by continent
* arguments follow convetion as other field_* template array:
* 'name', 'label', $value, 'help'
*
* @param string $name Name of the selector
* @param string $label Label for the selector
* @param string $current Timezone
* @param string $help Help text
*
* @return string Parsed HTML
*/
function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){
$options = select_timezone($current);
$options = str_replace('<select id="timezone_select" name="timezone">','', $options);
@ -69,15 +95,19 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
'$field' => array($name, $label, $current, $help, $options),
));
}}
}
// General purpose date parse/convert function.
// $from = source timezone
// $to = dest timezone
// $s = some parseable date/time string
// $fmt = output format
if(! function_exists('datetime_convert')) {
/**
* @brief General purpose date parse/convert function.
*
* @param string $from Source timezone
* @param string $to Dest timezone
* @param string $s Some parseable date/time string
* @param string $fmt Output format recognised from php's DateTime class
* http://www.php.net/manual/en/datetime.format.php
*
* @return string Formatted date according to given format
*/
function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
@ -123,14 +153,20 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
}
$d->setTimeZone($to_obj);
return($d->format($fmt));
}}
}
// wrapper for date selector, tailored for use in birthday fields
/**
* @brief Wrapper for date selector, tailored for use in birthday fields.
*
* @param string $dob Date of Birth
* @return string
*/
function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
$f = get_config('system','birthday_input_format');
if(! $f)
$f = 'ymd';
@ -138,62 +174,69 @@ function dob($dob) {
$value = '';
else
$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
$o = '<input type="text" name="dob" value="' . $value . '" placeholder="' . t('YYYY-MM-DD or MM-DD') . '" />';
// if ($dob && $dob != '0000-00-00')
// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');
// else
// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
return $o;
}
/**
* returns a date selector
* @param $format
* format string, e.g. 'ymd' or 'mdy'. Not currently supported
* @param $min
* unix timestamp of minimum date
* @param $max
* unix timestap of maximum date
* @param $default
* unix timestamp of default date
* @param $id
* id and name of datetimepicker (defaults to "datetimepicker")
* @brief Returns a date selector
*
* @param string $format
* Format string, e.g. 'ymd' or 'mdy'. Not currently supported
* @param string $min
* Unix timestamp of minimum date
* @param string $max
* Unix timestap of maximum date
* @param string $default
* Unix timestamp of default date
* @param string $id
* ID and name of datetimepicker (defaults to "datetimepicker")
*
* @return string Parsed HTML output.
*/
if(! function_exists('datesel')) {
function datesel($format, $min, $max, $default, $id = 'datepicker') {
return datetimesel($format,$min,$max,$default,$id,true,false, '','');
}}
}
/**
* returns a time selector
* @param $format
* format string, e.g. 'ymd' or 'mdy'. Not currently supported
* @brief Returns a time selector
*
* @param string $format
* Format string, e.g. 'ymd' or 'mdy'. Not currently supported
* @param $h
* already selected hour
* Already selected hour
* @param $m
* already selected minute
* @param $id
* id and name of datetimepicker (defaults to "timepicker")
* Already selected minute
* @param string $id
* ID and name of datetimepicker (defaults to "timepicker")
*
* @return string Parsed HTML output.
*/
if(! function_exists('timesel')) {
function timesel($format, $h, $m, $id='timepicker') {
return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),$id,false,true);
}}
}
/**
* @brief Returns a datetime selector.
*
* @param $format
* @param string $format
* format string, e.g. 'ymd' or 'mdy'. Not currently supported
* @param $min
* @param string $min
* unix timestamp of minimum date
* @param $max
* @param string $max
* unix timestap of maximum date
* @param $default
* @param string $default
* unix timestamp of default date
* @param string $id
* id and name of datetimepicker (defaults to "datetimepicker")
* @param boolean $pickdate
* @param bool $pickdate
* true to show date picker (default)
* @param boolean $picktime
* true to show time picker (default)
@ -201,17 +244,15 @@ function timesel($format, $h, $m, $id='timepicker') {
* set minimum date from picker with id $minfrom (none by default)
* @param $maxfrom
* set maximum date from picker with id $maxfrom (none by default)
* @param boolean $required default false
* @param bool $required default false
*
* @return string Parsed HTML output.
*
* @todo Once browser support is better this could probably be replaced with
* native HTML5 date picker.
*/
if(! function_exists('datetimesel')) {
function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
$a = get_app();
// First day of the week (0 = Sunday)
$firstDay = get_pconfig(local_user(),'system','first_day_of_week');
if ($firstDay === false) $firstDay=0;
@ -224,43 +265,58 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
$o = '';
$dateformat = '';
if($pickdate) $dateformat .= 'Y-m-d';
if($pickdate && $picktime) $dateformat .= ' ';
if($picktime) $dateformat .= 'H:i';
$minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
$maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
$input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : '';
$defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
$pickers = '';
if(!$pickdate) $pickers .= ',datepicker: false';
if(!$picktime) $pickers .= ',timepicker: false';
$extra_js = '';
$pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'";
if($minfrom != '')
$extra_js .= "\$('#$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
if($maxfrom != '')
$extra_js .= "\$('#$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})";
$readable_format = $dateformat;
$readable_format = str_replace('Y','yyyy',$readable_format);
$readable_format = str_replace('m','mm',$readable_format);
$readable_format = str_replace('d','dd',$readable_format);
$readable_format = str_replace('H','HH',$readable_format);
$readable_format = str_replace('i','MM',$readable_format);
$o .= "<div class='date'><input type='text' placeholder='$readable_format' name='$id' id='$id' $input_text />";
$o .= '</div>';
$o .= "<script type='text/javascript'>";
$o .= "\$(function () {var picker = \$('#$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})";
$o .= "</script>";
return $o;
}}
}
// implements "3 seconds ago" etc.
// based on $posted_date, (UTC).
// Results relative to current timezone
// Limited to range of timestamps
if(! function_exists('relative_date')) {
/**
* @brief Returns a relative date string.
*
* Implements "3 seconds ago" etc.
* Based on $posted_date, (UTC).
* Results relative to current timezone.
* Limited to range of timestamps.
*
* @param string $posted_date
* @param string $format (optional) Parsed with sprintf()
* <tt>%1$d %2$s ago</tt>, e.g. 22 hours ago, 1 minute ago
*
* @return string with relative date
*/
function relative_date($posted_date,$format = null) {
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
@ -300,23 +356,33 @@ function relative_date($posted_date,$format = null) {
// translators - e.g. 22 hours ago, 1 minute ago
if(! $format)
$format = t('%1$d %2$s ago');
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
}
}
}}
// Returns age in years, given a date of birth,
// the timezone of the person whose date of birth is provided,
// and the timezone of the person viewing the result.
// Why? Bear with me. Let's say I live in Mittagong, Australia, and my
// birthday is on New Year's. You live in San Bruno, California.
// When exactly are you going to see my age increase?
// A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start
// celebrating and become a year older. If you wish me happy birthday
// on January 1 (San Bruno time), you'll be a day late.
}
}
}
/**
* @brief Returns timezone correct age in years.
*
* Returns the age in years, given a date of birth, the timezone of the person
* whose date of birth is provided, and the timezone of the person viewing the
* result.
*
* Why? Bear with me. Let's say I live in Mittagong, Australia, and my birthday
* is on New Year's. You live in San Bruno, California.
* When exactly are you going to see my age increase?
*
* A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start celebrating
* and become a year older. If you wish me happy birthday on January 1
* (San Bruno time), you'll be a day late.
*
* @param string $dob Date of Birth
* @param string $owner_tz (optional) Timezone of the person of interest
* @param string $viewer_tz (optional) Timezone of the person viewing
*
* @return int Age in years
*/
function age($dob,$owner_tz = '',$viewer_tz = '') {
if(! intval($dob))
return 0;
@ -333,64 +399,79 @@ function age($dob,$owner_tz = '',$viewer_tz = '') {
if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day)))
$year_diff--;
return $year_diff;
}
// Get days in month
// get_dim($year, $month);
// returns number of days.
// $month[1] = 'January';
// to match human usage.
if(! function_exists('get_dim')) {
/**
* @brief Get days of a month in a given year.
*
* Returns number of days in the month of the given year.
* $m = 1 is 'January' to match human usage.
*
* @param int $y Year
* @param int $m Month (1=January, 12=December)
*
* @return int Number of days in the given month
*/
function get_dim($y,$m) {
$dim = array( 0,
31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31);
if($m != 2)
return $dim[$m];
if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0))
return 29;
return $dim[2];
}}
$dim = array( 0,
31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31);
if($m != 2)
return $dim[$m];
// Returns the first day in month for a given month, year
// get_first_dim($year,$month)
// returns 0 = Sunday through 6 = Saturday
// Months start at 1.
if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0))
return 29;
if(! function_exists('get_first_dim')) {
return $dim[2];
}
/**
* @brief Returns the first day in month for a given month, year.
*
* Months start at 1.
*
* @param int $y Year
* @param int $m Month (1=January, 12=December)
*
* @return string day 0 = Sunday through 6 = Saturday
*/
function get_first_dim($y,$m) {
$d = sprintf('%04d-%02d-01 00:00', intval($y), intval($m));
return datetime_convert('UTC','UTC',$d,'w');
}}
$d = sprintf('%04d-%02d-01 00:00', intval($y), intval($m));
// output a calendar for the given month, year.
// if $links are provided (array), e.g. $links[12] => 'http://mylink' ,
// date 12 will be linked appropriately. Today's date is also noted by
// altering td class.
// Months count from 1.
return datetime_convert('UTC','UTC',$d,'w');
}
/// @TODO Provide (prev,next) links, define class variations for different size calendars
if(! function_exists('cal')) {
/**
* @brief Output a calendar for the given month, year.
*
* If $links are provided (array), e.g. $links[12] => 'http://mylink' ,
* date 12 will be linked appropriately. Today's date is also noted by
* altering td class.
* Months count from 1.
*
* @param int $y Year
* @param int $m Month
* @param bool $links (default false)
* @param string $class
*
* @return string
*
* @todo Provide (prev,next) links, define class variations for different size calendars
*/
function cal($y = 0,$m = 0, $links = false, $class='') {
// month table - start at 1 to match human usage.
$mtab = array(' ',
'January','February','March',
'April','May','June',
'July','August','September',
'October','November','December'
'January','February','March',
'April','May','June',
'July','August','September',
'October','November','December'
);
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
@ -400,54 +481,63 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
if(! $m)
$m = intval($thismonth);
$dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
$f = get_first_dim($y,$m);
$l = get_dim($y,$m);
$d = 1;
$dow = 0;
$started = false;
$dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
$f = get_first_dim($y,$m);
$l = get_dim($y,$m);
$d = 1;
$dow = 0;
$started = false;
if(($y == $thisyear) && ($m == $thismonth))
$tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j'));
if(($y == $thisyear) && ($m == $thismonth))
$tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j'));
$str_month = day_translate($mtab[$m]);
$o = '<table class="calendar' . $class . '">';
$o .= "<caption>$str_month $y</caption><tr>";
for($a = 0; $a < 7; $a ++)
$o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
$o .= '</tr><tr>';
$o = '<table class="calendar' . $class . '">';
$o .= "<caption>$str_month $y</caption><tr>";
for($a = 0; $a < 7; $a ++)
$o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
while($d <= $l) {
if(($dow == $f) && (! $started))
$started = true;
$today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : '');
$o .= "<td $today>";
$day = str_replace(' ','&nbsp;',sprintf('%2.2d', $d));
if($started) {
if(is_array($links) && isset($links[$d]))
$o .= "<a href=\"{$links[$d]}\">$day</a>";
else
$o .= $day;
$d ++;
}
else
$o .= '&nbsp;';
$o .= '</td>';
$dow ++;
if(($dow == 7) && ($d <= $l)) {
$dow = 0;
$o .= '</tr><tr>';
}
}
if($dow)
for($a = $dow; $a < 7; $a ++)
$o .= '<td>&nbsp;</td>';
$o .= '</tr></table>'."\r\n";
$o .= '</tr><tr>';
return $o;
}}
while($d <= $l) {
if(($dow == $f) && (! $started))
$started = true;
$today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : '');
$o .= "<td $today>";
$day = str_replace(' ','&nbsp;',sprintf('%2.2d', $d));
if($started) {
if(is_array($links) && isset($links[$d]))
$o .= "<a href=\"{$links[$d]}\">$day</a>";
else
$o .= $day;
$d ++;
} else {
$o .= '&nbsp;';
}
$o .= '</td>';
$dow ++;
if(($dow == 7) && ($d <= $l)) {
$dow = 0;
$o .= '</tr><tr>';
}
}
if($dow)
for($a = $dow; $a < 7; $a ++)
$o .= '<td>&nbsp;</td>';
$o .= '</tr></table>'."\r\n";
return $o;
}
/**
* @brief Create a birthday event.
*
* Update the year and the birthday.
*/
function update_contact_birthdays() {
// This only handles foreign or alien networks where a birthday has been provided.
@ -474,8 +564,6 @@ function update_contact_birthdays() {
$bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
intval($rr['uid']),

15
include/dbstructure.php
View file

@ -748,21 +748,6 @@ function db_definition() {
"nurl" => array("nurl"),
)
);
$database["guid"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
),
"indexes" => array(
"PRIMARY" => array("id"),
"guid" => array("guid"),
"plink" => array("plink"),
"uri" => array("uri"),
)
);
$database["hook"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),

2
include/delivery.php
View file

@ -374,7 +374,7 @@ function delivery_run(&$argv, &$argc){
break;
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);
dfrn::import($atom, $x[0]);
break;
}
}

1423
include/dfrn.php
View file

File diff suppressed because it is too large Load diff

2170
include/items.php
View file

File diff suppressed because it is too large Load diff

77
include/ostatus.php
View file

@ -17,15 +17,6 @@ define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes
define("NS_ATOM", "http://www.w3.org/2005/Atom");
define("NS_THR", "http://purl.org/syndication/thread/1.0");
define("NS_GEORSS", "http://www.georss.org/georss");
define("NS_ACTIVITY", "http://activitystrea.ms/spec/1.0/");
define("NS_MEDIA", "http://purl.org/syndication/atommedia");
define("NS_POCO", "http://portablecontacts.net/spec/1.0");
define("NS_OSTATUS", "http://ostatus.org/schema/1.0");
define("NS_STATUSNET", "http://status.net/schema/api/1/");
function ostatus_check_follow_friends() {
$r = q("SELECT `uid`,`v` FROM `pconfig` WHERE `cat`='system' AND `k`='ostatus_legacy_contact' AND `v` != ''");
@ -193,14 +184,14 @@ function ostatus_salmon_author($xml, $importer) {
@$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
$xpath->registerNamespace('georss', "http://www.georss.org/georss");
$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
$xpath->registerNamespace('thr', NAMESPACE_THREAD);
$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
$xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
$xpath->registerNamespace('media', NAMESPACE_MEDIA);
$xpath->registerNamespace('poco', NAMESPACE_POCO);
$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
$entries = $xpath->query('/atom:entry');
@ -224,14 +215,14 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
@$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
$xpath->registerNamespace('georss', "http://www.georss.org/georss");
$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
$xpath->registerNamespace('thr', NAMESPACE_THREAD);
$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
$xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
$xpath->registerNamespace('media', NAMESPACE_MEDIA);
$xpath->registerNamespace('poco', NAMESPACE_POCO);
$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
$gub = "";
$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
@ -1120,16 +1111,16 @@ function ostatus_format_picture_post($body) {
function ostatus_add_header($doc, $owner) {
$a = get_app();
$root = $doc->createElementNS(NS_ATOM, 'feed');
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
$doc->appendChild($root);
$root->setAttribute("xmlns:thr", NS_THR);
$root->setAttribute("xmlns:georss", NS_GEORSS);
$root->setAttribute("xmlns:activity", NS_ACTIVITY);
$root->setAttribute("xmlns:media", NS_MEDIA);
$root->setAttribute("xmlns:poco", NS_POCO);
$root->setAttribute("xmlns:ostatus", NS_OSTATUS);
$root->setAttribute("xmlns:statusnet", NS_STATUSNET);
$root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
$root->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
$root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
$root->setAttribute("xmlns:media", NAMESPACE_MEDIA);
$root->setAttribute("xmlns:poco", NAMESPACE_POCO);
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
@ -1321,6 +1312,10 @@ function ostatus_add_author($doc, $owner) {
function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) {
$a = get_app();
if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
$is_repeat = false;
/* if (!$repeat) {
@ -1343,15 +1338,15 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
$entry = $doc->createElement("activity:object");
$title = sprintf("New note by %s", $owner["nick"]);
} else {
$entry = $doc->createElementNS(NS_ATOM, "entry");
$entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry");
$entry->setAttribute("xmlns:thr", NS_THR);
$entry->setAttribute("xmlns:georss", NS_GEORSS);
$entry->setAttribute("xmlns:activity", NS_ACTIVITY);
$entry->setAttribute("xmlns:media", NS_MEDIA);
$entry->setAttribute("xmlns:poco", NS_POCO);
$entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
$entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
$entry->setAttribute("xmlns:thr", NAMESPACE_THREAD);
$entry->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
$entry->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
$entry->setAttribute("xmlns:media", NAMESPACE_MEDIA);
$entry->setAttribute("xmlns:poco", NAMESPACE_POCO);
$entry->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$entry->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
$author = ostatus_add_author($doc, $owner);
$entry->appendChild($author);

37
include/poller.php
View file

@ -26,6 +26,9 @@ function poller_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
if (poller_max_connections_reached())
return;
$load = current_load();
if($load) {
$maxsysload = intval(get_config('system','maxloadavg'));
@ -117,6 +120,40 @@ function poller_run(&$argv, &$argc){
}
/**
* @brief Checks if the number of database connections has reached a critical limit.
*
* @return bool Are more than 3/4 of the maximum connections used?
*/
function poller_max_connections_reached() {
$r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
if (!$r)
return false;
$max = intval($r[0]["Value"]);
if ($max == 0)
return false;
$r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
if (!$r)
return false;
$connected = intval($r[0]["Value"]);
if ($connected == 0)
return false;
$level = $connected / $max;
logger("Connection usage: ".$connected."/".$max, LOGGER_DEBUG);
if ($level < (3/4))
return false;
logger("Maximum level (3/4) of connections reached: ".$connected."/".$max);
return true;
}
/**
* @brief fix the queue entry if the worker process died
*

11
index.php
View file

@ -233,16 +233,7 @@ if(strlen($a->module)) {
}
/**
* If not, next look for module overrides by the theme
*/
if((! $a->module_loaded) && (file_exists("view/theme/" . current_theme() . "/mod/{$a->module}.php"))) {
include_once("view/theme/" . current_theme() . "/mod/{$a->module}.php");
// We will not set module_loaded to true to allow for partial overrides.
}
/**
* Finally, look for a 'standard' program module in the 'mod' directory
* If not, next look for a 'standard' program module in the 'mod' directory
*/
if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {

4
mod/_well_known.php
View file

@ -2,7 +2,6 @@
require_once("mod/hostxrd.php");
require_once("mod/nodeinfo.php");
if(! function_exists('_well_known_init')) {
function _well_known_init(&$a){
if ($a->argc > 1) {
switch($a->argv[1]) {
@ -20,9 +19,7 @@ function _well_known_init(&$a){
http_status_exit(404);
killme();
}
}
if(! function_exists('wk_social_relay')) {
function wk_social_relay(&$a) {
define('SR_SCOPE_ALL', 'all');
@ -67,4 +64,3 @@ function wk_social_relay(&$a) {
echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit;
}
}

3
mod/acctlink.php
View file

@ -2,8 +2,8 @@
require_once('include/Scrape.php');
if(! function_exists('acctlink_init')) {
function acctlink_init(&$a) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
$res = probe_url($addr);
@ -14,4 +14,3 @@ function acctlink_init(&$a) {
}
}
}
}

4
mod/acl.php
View file

@ -3,8 +3,8 @@
require_once("include/acl_selectors.php");
if(! function_exists('acl_init')) {
function acl_init(&$a){
acl_lookup($a);
}
}

78
mod/admin.php
View file

@ -2,7 +2,7 @@
/**
* @file mod/admin.php
*
*
* @brief Friendica admin
*/
@ -23,7 +23,6 @@ require_once("include/text.php");
* @param App $a
*
*/
if(! function_exists('admin_post')) {
function admin_post(&$a){
@ -111,7 +110,6 @@ function admin_post(&$a){
goaway($a->get_baseurl(true) . '/admin' );
return; // NOTREACHED
}
}
/**
* @brief Generates content of the admin panel pages
@ -130,7 +128,6 @@ function admin_post(&$a){
* @param App $a
* @return string
*/
if(! function_exists('admin_content')) {
function admin_content(&$a) {
if(!is_site_admin()) {
@ -248,7 +245,6 @@ function admin_content(&$a) {
return $o;
}
}
}
/**
* @brief Subpage with some stats about "the federation" network
@ -264,7 +260,6 @@ function admin_content(&$a) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_federation')) {
function admin_page_federation(&$a) {
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
// social and statusnet nodes this node is knowing
@ -289,7 +284,7 @@ function admin_page_federation(&$a) {
// what versions for that platform do we know at all?
// again only the active nodes
$v = q('SELECT count(*) AS total, version FROM gserver
WHERE last_contact > last_failure AND platform LIKE "%s"
WHERE last_contact > last_failure AND platform LIKE "%s"
GROUP BY version
ORDER BY version;', $p);
@ -306,12 +301,12 @@ function admin_page_federation(&$a) {
$newVC = $vv['total'];
$newVV = $vv['version'];
$posDash = strpos($newVV, '-');
if($posDash)
if($posDash)
$newVV = substr($newVV, 0, $posDash);
if(isset($newV[$newVV]))
$newV[$newVV] += $newVC;
$newV[$newVV] += $newVC;
else
$newV[$newVV] = $newVC;
$newV[$newVV] = $newVC;
}
foreach ($newV as $key => $value) {
array_push($newVv, array('total'=>$value, 'version'=>$key));
@ -366,7 +361,6 @@ function admin_page_federation(&$a) {
'$baseurl' => $a->get_baseurl(),
));
}
}
/**
* @brief Admin Inspect Queue Page
@ -381,7 +375,6 @@ function admin_page_federation(&$a) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_queue')) {
function admin_page_queue(&$a) {
// get content from the queue table
$r = q("SELECT c.name,c.nurl,q.id,q.network,q.created,q.last from queue as q, contact as c where c.id=q.cid order by q.cid, q.created;");
@ -401,7 +394,6 @@ function admin_page_queue(&$a) {
'$entries' => $r,
));
}
}
/**
* @brief Admin Summary Page
@ -414,7 +406,6 @@ function admin_page_queue(&$a) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_summary')) {
function admin_page_summary(&$a) {
$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
$accounts = array(
@ -461,14 +452,12 @@ function admin_page_summary(&$a) {
'$plugins' => array( t('Active plugins'), $a->plugins )
));
}
}
/**
* @brief Process send data from Admin Site Page
*
*
* @param App $a
*/
if(! function_exists('admin_page_site_post')) {
function admin_page_site_post(&$a) {
if(!x($_POST,"page_site")) {
return;
@ -781,7 +770,6 @@ function admin_page_site_post(&$a) {
return; // NOTREACHED
}
}
/**
* @brief Generate Admin Site subpage
@ -791,7 +779,6 @@ function admin_page_site_post(&$a) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_site')) {
function admin_page_site(&$a) {
/* Installed langs */
@ -996,7 +983,7 @@ function admin_page_site(&$a) {
'$form_security_token' => get_form_security_token("admin_site")
));
}
}
/**
@ -1011,7 +998,6 @@ function admin_page_site(&$a) {
* @param App $a
* @return string
**/
if(! function_exists('admin_page_dbsync')) {
function admin_page_dbsync(&$a) {
$o = '';
@ -1087,15 +1073,14 @@ function admin_page_dbsync(&$a) {
}
return $o;
}
}
/**
* @brief Process data send by Users admin page
*
*
* @param App $a
*/
if(! function_exists('admin_page_users_post')) {
function admin_page_users_post(&$a){
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : array() );
@ -1186,7 +1171,6 @@ function admin_page_users_post(&$a){
goaway($a->get_baseurl(true) . '/admin/users' );
return; // NOTREACHED
}
}
/**
* @brief Admin panel subpage for User management
@ -1200,7 +1184,6 @@ function admin_page_users_post(&$a){
* @param App $a
* @return string
*/
if(! function_exists('admin_page_users')) {
function admin_page_users(&$a){
if($a->argc>2) {
$uid = $a->argv[3];
@ -1353,7 +1336,7 @@ function admin_page_users(&$a){
$o .= paginate($a);
return $o;
}
}
/**
* @brief Plugins admin page
@ -1371,7 +1354,6 @@ function admin_page_users(&$a){
* @param App $a
* @return string
*/
if(! function_exists('admin_page_plugins')) {
function admin_page_plugins(&$a){
/*
@ -1497,19 +1479,17 @@ function admin_page_plugins(&$a){
'$baseurl' => $a->get_baseurl(true),
'$function' => 'plugins',
'$plugins' => $plugins,
'$pcount' => count($plugins),
'$pcount' => count($plugins),
'$noplugshint' => sprintf( t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s'), 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
'$form_security_token' => get_form_security_token("admin_themes"),
));
}
}
/**
* @param array $themes
* @param string $th
* @param int $result
*/
if(! function_exists('toggle_theme')) {
function toggle_theme(&$themes,$th,&$result) {
for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) {
@ -1524,14 +1504,12 @@ function toggle_theme(&$themes,$th,&$result) {
}
}
}
}
/**
* @param array $themes
* @param string $th
* @return int
*/
if(! function_exists('theme_status')) {
function theme_status($themes,$th) {
for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) {
@ -1545,13 +1523,12 @@ function theme_status($themes,$th) {
}
return 0;
}
}
/**
* @param array $themes
* @return string
*/
if(! function_exists('rebuild_theme_table')) {
function rebuild_theme_table($themes) {
$o = '';
if(count($themes)) {
@ -1565,7 +1542,7 @@ function rebuild_theme_table($themes) {
}
return $o;
}
}
/**
* @brief Themes admin page
@ -1583,7 +1560,6 @@ function rebuild_theme_table($themes) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_themes')) {
function admin_page_themes(&$a){
$allowed_themes_str = get_config('system','allowed_themes');
@ -1758,14 +1734,13 @@ function admin_page_themes(&$a){
'$form_security_token' => get_form_security_token("admin_themes"),
));
}
}
/**
* @brief Prosesses data send by Logs admin page
*
*
* @param App $a
*/
if(! function_exists('admin_page_logs_post')) {
function admin_page_logs_post(&$a) {
if(x($_POST,"page_logs")) {
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
@ -1783,7 +1758,6 @@ function admin_page_logs_post(&$a) {
goaway($a->get_baseurl(true) . '/admin/logs' );
return; // NOTREACHED
}
}
/**
* @brief Generates admin panel subpage for configuration of the logs
@ -1801,7 +1775,6 @@ function admin_page_logs_post(&$a) {
* @param App $a
* @return string
*/
if(! function_exists('admin_page_logs')) {
function admin_page_logs(&$a){
$log_choices = array(
@ -1833,7 +1806,6 @@ function admin_page_logs(&$a){
'$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE );\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
));
}
}
/**
* @brief Generates admin panel subpage to view the Friendica log
@ -1853,7 +1825,6 @@ function admin_page_logs(&$a){
* @param App $a
* @return string
*/
if(! function_exists('admin_page_viewlogs')) {
function admin_page_viewlogs(&$a){
$t = get_markup_template("admin_viewlogs.tpl");
$f = get_config('system','logfile');
@ -1890,14 +1861,12 @@ function admin_page_viewlogs(&$a){
'$logname' => get_config('system','logfile')
));
}
}
/**
* @brief Prosesses data send by the features admin page
*
*
* @param App $a
*/
if(! function_exists('admin_page_features_post')) {
function admin_page_features_post(&$a) {
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
@ -1929,25 +1898,23 @@ function admin_page_features_post(&$a) {
goaway($a->get_baseurl(true) . '/admin/features' );
return; // NOTREACHED
}
}
/**
* @brief Subpage for global additional feature management
*
*
* This functin generates the subpage 'Manage Additional Features'
* for the admin panel. At this page the admin can set preferences
* for the user settings of the 'additional features'. If needed this
* for the user settings of the 'additional features'. If needed this
* preferences can be locked through the admin.
*
*
* The returned string contains the HTML code of the subpage 'Manage
* Additional Features'
*
*
* @param App $a
* @return string
*/
if(! function_exists('admin_page_features')) {
function admin_page_features(&$a) {
if((argc() > 1) && (argv(1) === 'features')) {
$arr = array();
$features = get_features(false);
@ -1966,7 +1933,7 @@ function admin_page_features(&$a) {
);
}
}
$tpl = get_markup_template("admin_settings_features.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("admin_manage_features"),
@ -1978,4 +1945,3 @@ function admin_page_features(&$a) {
return $o;
}
}
}

2
mod/allfriends.php
View file

@ -5,7 +5,6 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
if(! function_exists('allfriends_content')) {
function allfriends_content(&$a) {
$o = '';
@ -98,4 +97,3 @@ function allfriends_content(&$a) {
return $o;
}
}

5
mod/amcd.php
View file

@ -1,5 +1,5 @@
<?php
if(! function_exists('amcd_content')) {
function amcd_content(&$a) {
//header("Content-type: text/json");
echo <<< EOT
@ -46,5 +46,4 @@ echo <<< EOT
}
EOT;
killme();
}
}
}

11
mod/api.php
View file

@ -1,8 +1,10 @@
<?php
require_once('include/api.php');
if(! function_exists('oauth_get_client')) {
function oauth_get_client($request){
$params = $request->get_parameters();
$token = $params['oauth_token'];
@ -17,10 +19,9 @@ function oauth_get_client($request){
return $r[0];
}
}
if(! function_exists('api_post')) {
function api_post(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return;
@ -30,10 +31,9 @@ function api_post(&$a) {
notice( t('Permission denied.') . EOL);
return;
}
}
}
if(! function_exists('api_content')) {
function api_content(&$a) {
if ($a->cmd=='api/oauth/authorize'){
/*
@ -114,4 +114,3 @@ function api_content(&$a) {
echo api_call($a);
killme();
}
}

40
mod/apps.php
View file

@ -1,23 +1,25 @@
<?php
if(! function_exists('apps_content')) {
function apps_content(&$a) {
$privateaddons = get_config('config','private_addons');
if ($privateaddons === "1") {
if((! (local_user()))) {
info( t("You must be logged in to use addons. "));
return;
}
}
$title = t('Applications');
if(count($a->apps)==0)
notice( t('No installed applications.') . EOL);
$tpl = get_markup_template("apps.tpl");
return replace_macros($tpl, array(
'$title' => $title,
'$apps' => $a->apps,
));
$privateaddons = get_config('config','private_addons');
if ($privateaddons === "1") {
if((! (local_user()))) {
info( t("You must be logged in to use addons. "));
return;};
}
$title = t('Applications');
if(count($a->apps)==0)
notice( t('No installed applications.') . EOL);
$tpl = get_markup_template("apps.tpl");
return replace_macros($tpl, array(
'$title' => $title,
'$apps' => $a->apps,
));
}

3
mod/attach.php
View file

@ -1,7 +1,7 @@
<?php
require_once('include/security.php');
if(! function_exists('attach_init')) {
function attach_init(&$a) {
if($a->argc != 2) {
@ -47,4 +47,3 @@ function attach_init(&$a) {
killme();
// NOTREACHED
}
}

46
mod/babel.php
View file

@ -9,56 +9,55 @@ function visible_lf($s) {
return str_replace("\n",'<br />', $s);
}
if(! function_exists('babel_content')) {
function babel_content(&$a) {
$o .= '<h1>Babel Diagnostic</h1>';
$o .= '<form action="babel" method="post">';
$o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<br /><br />';
$o .= '<form action="babel" method="post">';
$o .= t('Source (Diaspora) text to convert to BBcode:') . EOL . '<textarea name="d2bbtext" >' . htmlspecialchars($_REQUEST['d2bbtext']) .'</textarea>' . EOL;
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<br /><br />';
if(x($_REQUEST,'text')) {
$text = trim($_REQUEST['text']);
$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($text) . EOL. EOL;
$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($text) . EOL. EOL;
$html = bbcode($text);
$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL;
$o .= htmlspecialchars($html). EOL. EOL;
$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL;
$o .= htmlspecialchars($html). EOL. EOL;
//$html = bbcode($text);
$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$bbcode = html2bbcode($html);
$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$diaspora = bb2diaspora($text);
$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($diaspora) . EOL. EOL;
$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($diaspora) . EOL. EOL;
$html = Markdown($diaspora);
$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$bbcode = diaspora2bb($diaspora);
$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$bbcode = html2bbcode($html);
$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
@ -67,15 +66,14 @@ function babel_content(&$a) {
if(x($_REQUEST,'d2bbtext')) {
$d2bbtext = trim($_REQUEST['d2bbtext']);
$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL;
$o .= visible_lf($d2bbtext) . EOL. EOL;
$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL;
$o .= visible_lf($d2bbtext) . EOL. EOL;
$bb = diaspora2bb($d2bbtext);
$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bb) . EOL. EOL;
$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bb) . EOL. EOL;
}
return $o;
}
}

5
mod/bookmarklet.php
View file

@ -1,14 +1,12 @@
<?php
require_once('include/conversation.php');
require_once('include/items.php');
if(! function_exists('bookmarklet_init')) {
function bookmarklet_init(&$a) {
$_GET["mode"] = "minimal";
}
}
if(! function_exists('bookmarklet_content')) {
function bookmarklet_content(&$a) {
if(!local_user()) {
$o = '<h2>'.t('Login').'</h2>';
@ -46,4 +44,3 @@ function bookmarklet_content(&$a) {
return $o;
}
}

11
mod/cb.php
View file

@ -4,28 +4,21 @@
* General purpose landing page for plugins/addons
*/
if(! function_exists('cb_init')) {
function cb_init(&$a) {
call_hooks('cb_init');
}
}
if(! function_exists('cb_post')) {
function cb_post(&$a) {
call_hooks('cb_post', $_POST);
}
}
if(! function_exists('cb_afterpost')) {
function cb_afterpost(&$a) {
call_hooks('cb_afterpost');
}
}
if(! function_exists('cb_content')) {
function cb_content(&$a) {
$o = '';
call_hooks('cb_content', $o);
return $o;
}
}
}

2
mod/common.php
View file

@ -5,7 +5,6 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
if(! function_exists('common_content')) {
function common_content(&$a) {
$o = '';
@ -145,4 +144,3 @@ function common_content(&$a) {
return $o;
}
}

13
mod/community.php
View file

@ -1,14 +1,15 @@
<?php
if(! function_exists('community_init')) {
function community_init(&$a) {
if(! local_user()) {
unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']);
}
}
}
if(! function_exists('community_content')) {
function community_content(&$a, $update = 0) {
$o = '';
@ -114,9 +115,7 @@ function community_content(&$a, $update = 0) {
return $o;
}
}
if(! function_exists('community_getitems')) {
function community_getitems($start, $itemspage) {
if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
return(community_getpublicitems($start, $itemspage));
@ -141,10 +140,9 @@ function community_getitems($start, $itemspage) {
);
return($r);
}
}
if(! function_exists('community_getpublicitems')) {
function community_getpublicitems($start, $itemspage) {
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`,
@ -159,4 +157,3 @@ function community_getpublicitems($start, $itemspage) {
return($r);
}
}

4
mod/contactgroup.php
View file

@ -2,7 +2,6 @@
require_once('include/group.php');
if(! function_exists('contactgroup_content')) {
function contactgroup_content(&$a) {
@ -48,5 +47,4 @@ function contactgroup_content(&$a) {
}
killme();
}
}
}

38
mod/contacts.php
View file

@ -7,7 +7,6 @@ require_once('include/Scrape.php');
require_once('mod/proxy.php');
require_once('include/Photo.php');
if(! function_exists('contacts_init')) {
function contacts_init(&$a) {
if(! local_user())
return;
@ -39,7 +38,7 @@ function contacts_init(&$a) {
if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
} else
} else
$networkname = '';
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
@ -89,10 +88,9 @@ function contacts_init(&$a) {
'$base' => $base
));
}
}
if(! function_exists('contacts_batch_actions')) {
function contacts_batch_actions(&$a){
$contacts_id = $_POST['contact_batch'];
if (!is_array($contacts_id)) return;
@ -134,10 +132,10 @@ function contacts_batch_actions(&$a){
goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
else
goaway($a->get_baseurl(true) . '/contacts');
}
}
if(! function_exists('contacts_post')) {
function contacts_post(&$a) {
if(! local_user())
@ -217,11 +215,10 @@ function contacts_post(&$a) {
$a->data['contact'] = $r[0];
return;
}
}
/*contact actions*/
if(! function_exists('_contact_update')) {
function _contact_update($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r)
@ -242,9 +239,7 @@ function _contact_update($contact_id) {
// pull feed and consume it, which should subscribe to the hub.
proc_run('php',"include/onepoll.php","$contact_id", "force");
}
}
if(! function_exists('_contact_update_profile')) {
function _contact_update_profile($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r)
@ -304,9 +299,7 @@ function _contact_update_profile($contact_id) {
// Update the entry in the gcontact table
update_gcontact_from_probe($data["url"]);
}
}
if(! function_exists('_contact_block')) {
function _contact_block($contact_id, $orig_record) {
$blocked = (($orig_record['blocked']) ? 0 : 1);
$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
@ -315,10 +308,8 @@ function _contact_block($contact_id, $orig_record) {
intval(local_user())
);
return $r;
}
}
if(! function_exists('_contact_ignore')) {
}
function _contact_ignore($contact_id, $orig_record) {
$readonly = (($orig_record['readonly']) ? 0 : 1);
$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
@ -328,9 +319,6 @@ function _contact_ignore($contact_id, $orig_record) {
);
return $r;
}
}
if(! function_exists('_contact_archive')) {
function _contact_archive($contact_id, $orig_record) {
$archived = (($orig_record['archive']) ? 0 : 1);
$r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
@ -343,18 +331,14 @@ function _contact_archive($contact_id, $orig_record) {
}
return $r;
}
}
if(! function_exists('_contact_drop')) {
function _contact_drop($contact_id, $orig_record) {
$a = get_app();
terminate_friendship($a->user,$a->contact,$orig_record);
contact_remove($orig_record['id']);
}
}
if(! function_exists('contacts_content')) {
function contacts_content(&$a) {
$sort_type = 0;
@ -815,9 +799,7 @@ function contacts_content(&$a) {
return $o;
}
}
if(! function_exists('contacts_tab')) {
function contacts_tab($a, $contact_id, $active_tab) {
// tabs
$tabs = array(
@ -891,9 +873,7 @@ function contacts_tab($a, $contact_id, $active_tab) {
return $tab_str;
}
}
if(! function_exists('contact_posts')) {
function contact_posts($a, $contact_id) {
$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
@ -921,9 +901,7 @@ function contact_posts($a, $contact_id) {
return $o;
}
}
if(! function_exists('_contact_detail_for_template')) {
function _contact_detail_for_template($rr){
$community = '';
@ -974,5 +952,5 @@ function _contact_detail_for_template($rr){
'url' => $url,
'network' => network_to_name($rr['network'], $rr['url']),
);
}
}

48
mod/content.php
View file

@ -15,7 +15,7 @@
// fast - e.g. one or two milliseconds to fetch parent items for the current content,
// and 10-20 milliseconds to fetch all the child items.
if(! function_exists('content_content')) {
function content_content(&$a, $update = 0) {
require_once('include/conversation.php');
@ -61,7 +61,7 @@ function content_content(&$a, $update = 0) {
$o = '';
$contact_id = $a->cid;
@ -100,7 +100,7 @@ function content_content(&$a, $update = 0) {
$def_acl = array('allow_cid' => $str);
}
$sql_options = (($star) ? " and starred = 1 " : '');
$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
@ -137,7 +137,7 @@ function content_content(&$a, $update = 0) {
}
elseif($cid) {
$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d
$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d
AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
intval($cid)
);
@ -304,9 +304,9 @@ function content_content(&$a, $update = 0) {
echo json_encode($o);
killme();
}
}
if(! function_exists('render_content')) {
function render_content(&$a, $items, $mode, $update, $preview = false) {
require_once('include/bbcode.php');
@ -373,7 +373,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
// "New Item View" on network page or search page results
// "New Item View" on network page or search page results
// - just loop through the items and format them minimally for display
//$tpl = get_markup_template('search_item.tpl');
@ -389,7 +389,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$sparkle = '';
if($mode === 'search' || $mode === 'community') {
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
&& ($item['id'] != $item['parent']))
continue;
$nickname = $item['nickname'];
@ -436,7 +436,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$drop = array(
'dropping' => $dropping,
'select' => t('Select'),
'select' => t('Select'),
'delete' => t('Delete'),
);
@ -526,11 +526,11 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$comments[$item['parent']] = 1;
else
$comments[$item['parent']] += 1;
} elseif(! x($comments,$item['parent']))
} elseif(! x($comments,$item['parent']))
$comments[$item['parent']] = 0; // avoid notices later on
}
// map all the like/dislike activities for each parent item
// map all the like/dislike activities for each parent item
// Store these in the $alike and $dlike arrays
foreach($items as $item) {
@ -617,14 +617,14 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
? t('Private Message')
: false);
// Top-level wall post not written by the wall owner (wall-to-wall)
// First figure out who owns it.
// First figure out who owns it.
$osparkle = '';
@ -651,13 +651,13 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
// The author url doesn't match the owner (typically the contact)
// and also doesn't match the contact alias.
// The name match is a hack to catch several weird cases where URLs are
// and also doesn't match the contact alias.
// The name match is a hack to catch several weird cases where URLs are
// all over the park. It can be tricked, but this prevents you from
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
// well that it's the same Bob Smith.
// well that it's the same Bob Smith.
// But it could be somebody else with the same name. It just isn't highly likely.
// But it could be somebody else with the same name. It just isn't highly likely.
$owner_url = $item['owner-link'];
@ -666,7 +666,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$template = $wallwall;
$commentww = 'ww';
// If it is our contact, use a friendly redirect link
if((link_compare($item['owner-link'],$item['url']))
if((link_compare($item['owner-link'],$item['url']))
&& ($item['network'] === NETWORK_DFRN)) {
$owner_url = $redirect_url;
$osparkle = ' sparkle';
@ -678,7 +678,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
}
$likebuttons = '';
$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
if($page_writeable) {
/* if($toplevelpost) { */
@ -698,7 +698,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => '',
'$return_path' => '',
'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $item['item_id'],
@ -739,7 +739,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$drop = array(
'dropping' => $dropping,
'select' => t('Select'),
'select' => t('Select'),
'delete' => t('Delete'),
);
@ -805,9 +805,9 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
$shiny = "";
if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
$shiny = 'shiny';
$shiny = 'shiny';
//
//
localize_item($item);
@ -897,5 +897,5 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
return $threads;
}
}

2
mod/credits.php
View file

@ -5,7 +5,6 @@
* addons repository will be listed though ATM)
*/
if(! function_exists('credits_content')) {
function credits_content (&$a) {
/* fill the page with credits */
$f = fopen('util/credits.txt','r');
@ -19,4 +18,3 @@ function credits_content (&$a) {
'$names' => $arr,
));
}
}

10
mod/crepair.php
View file

@ -2,7 +2,6 @@
require_once("include/contact_selectors.php");
require_once("mod/contacts.php");
if(! function_exists('crepair_init')) {
function crepair_init(&$a) {
if(! local_user())
return;
@ -29,9 +28,8 @@ function crepair_init(&$a) {
profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
}
}
}
if(! function_exists('crepair_post')) {
function crepair_post(&$a) {
if(! local_user())
return;
@ -93,9 +91,9 @@ function crepair_post(&$a) {
return;
}
}
if(! function_exists('crepair_content')) {
function crepair_content(&$a) {
if(! local_user()) {
@ -182,5 +180,5 @@ function crepair_content(&$a) {
));
return $o;
}
}

10
mod/delegate.php
View file

@ -1,13 +1,11 @@
<?php
require_once('mod/settings.php');
if(! function_exists('delegate_init')) {
function delegate_init(&$a) {
return settings_init($a);
}
}
if(! function_exists('delegate_content')) {
function delegate_content(&$a) {
if(! local_user()) {
@ -92,12 +90,12 @@ function delegate_content(&$a) {
// find every contact who might be a candidate for delegation
$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s'
$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s'
and contact.uid = %d and contact.self = 0 and network = '%s' ",
dbesc(normalise_link($a->get_baseurl())),
intval(local_user()),
dbesc(NETWORK_DFRN)
);
);
if(! count($r)) {
notice( t('No potential page delegates located.') . EOL);
@ -146,5 +144,5 @@ function delegate_content(&$a) {
return $o;
}
}

3
mod/dfrn_confirm.php
View file

@ -16,7 +16,6 @@
require_once('include/enotify.php');
if(! function_exists('dfrn_confirm_post')) {
function dfrn_confirm_post(&$a,$handsfree = null) {
if(is_array($handsfree)) {
@ -802,5 +801,5 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
goaway(z_root());
// NOTREACHED
}
}

9
mod/dfrn_notify.php
View file

@ -1,11 +1,11 @@
<?php
require_once('include/items.php');
require_once('include/dfrn.php');
require_once('include/event.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
if(! function_exists('dfrn_notify_post')) {
function dfrn_notify_post(&$a) {
logger(__function__, LOGGER_TRACE);
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
@ -209,14 +209,13 @@ function dfrn_notify_post(&$a) {
logger('rino: decrypted data: ' . $data, LOGGER_DATA);
}
$ret = local_delivery($importer,$data);
$ret = dfrn::import($data, $importer);
xml_status($ret);
// NOTREACHED
}
}
if(! function_exists('dfrn_notify_content')) {
function dfrn_notify_content(&$a) {
if(x($_GET,'dfrn_id')) {
@ -340,5 +339,5 @@ function dfrn_notify_content(&$a) {
killme();
}
}
}

13
mod/dfrn_poll.php
View file

@ -3,7 +3,7 @@ require_once('include/items.php');
require_once('include/auth.php');
require_once('include/dfrn.php');
if(! function_exists('dfrn_poll_init')) {
function dfrn_poll_init(&$a) {
@ -160,7 +160,7 @@ function dfrn_poll_init(&$a) {
if($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site
// did not decode properly - cannot trust this site
xml_status(3, 'Bad decryption');
}
@ -195,11 +195,11 @@ function dfrn_poll_init(&$a) {
return; // NOTREACHED
}
}
}
}
if(! function_exists('dfrn_poll_post')) {
function dfrn_poll_post(&$a) {
$dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
@ -257,7 +257,7 @@ function dfrn_poll_post(&$a) {
if($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site
// did not decode properly - cannot trust this site
xml_status(3, 'Bad decryption');
}
@ -377,9 +377,7 @@ function dfrn_poll_post(&$a) {
}
}
}
if(! function_exists('dfrn_poll_content')) {
function dfrn_poll_content(&$a) {
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
@ -564,4 +562,3 @@ function dfrn_poll_content(&$a) {
}
}
}
}

19
mod/directory.php
View file

@ -1,5 +1,5 @@
<?php
if(! function_exists('directory_init')) {
function directory_init(&$a) {
$a->set_pager_itemspage(60);
@ -16,23 +16,23 @@ function directory_init(&$a) {
unset($_SESSION['mobile-theme']);
}
}
}
if(! function_exists('directory_post')) {
function directory_post(&$a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
}
if(! function_exists('directory_content')) {
function directory_content(&$a) {
global $db;
require_once("mod/proxy.php");
if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
(get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
@ -123,14 +123,14 @@ function directory_content(&$a) {
}
// if(strlen($rr['dob'])) {
// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
// $details .= '<br />' . t('Age: ') . $years ;
// $details .= '<br />' . t('Age: ') . $years ;
// }
// if(strlen($rr['gender']))
// $details .= '<br />' . t('Gender: ') . $rr['gender'];
// show if account is a community account
/// @TODO The other page types should be also respected, but first we need a good
/// @TODO The other page types should be also respected, but first we need a good
/// translatiion and systemwide consistency for displaying the page type
if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP))
$community = true;
@ -158,7 +158,7 @@ function directory_content(&$a) {
else {
$location_e = $location;
}
$photo_menu = array(array(t("View Profile"), zrl($profile_link)));
$entry = array(
@ -217,4 +217,3 @@ function directory_content(&$a) {
return $o;
}
}

6
mod/dirfind.php
View file

@ -5,7 +5,6 @@ require_once('include/Contact.php');
require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
if(! function_exists('dirfind_init')) {
function dirfind_init(&$a) {
if(! local_user()) {
@ -20,9 +19,9 @@ function dirfind_init(&$a) {
$a->page['aside'] .= follow_widget();
}
}
if(! function_exists('dirfind_content')) {
function dirfind_content(&$a, $prefix = "") {
$community = false;
@ -236,4 +235,3 @@ function dirfind_content(&$a, $prefix = "") {
return $o;
}
}

9
mod/display.php
View file

@ -1,5 +1,5 @@
<?php
if(! function_exists('display_init')) {
function display_init(&$a) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@ -85,10 +85,9 @@ function display_init(&$a) {
}
profile_load($a, $nick, 0, $profiledata);
}
}
if(! function_exists('display_fetchauthor')) {
function display_fetchauthor($a, $item) {
$profiledata = array();
@ -221,9 +220,7 @@ function display_fetchauthor($a, $item) {
return($profiledata);
}
}
if(! function_exists('display_content')) {
function display_content(&$a, $update = 0) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@ -525,4 +522,4 @@ function display_content(&$a, $update = 0) {
return $o;
}
}

5
mod/editpost.php
View file

@ -2,7 +2,6 @@
require_once('include/acl_selectors.php');
if(! function_exists('editpost_content')) {
function editpost_content(&$a) {
$o = '';
@ -151,5 +150,7 @@ function editpost_content(&$a) {
));
return $o;
}
}

6
mod/events.php
View file

@ -5,7 +5,6 @@ require_once('include/datetime.php');
require_once('include/event.php');
require_once('include/items.php');
if(! function_exists('events_post')) {
function events_post(&$a) {
logger('post: ' . print_r($_REQUEST,true));
@ -157,9 +156,9 @@ function events_post(&$a) {
goaway($_SESSION['return_url']);
}
}
if(! function_exists('events_content')) {
function events_content(&$a) {
if(! local_user()) {
@ -579,4 +578,3 @@ function events_content(&$a) {
return $o;
}
}
}

3
mod/fbrowser.php
View file

@ -10,7 +10,6 @@ require_once('include/Photo.php');
/**
* @param App $a
*/
if(! function_exists('fbrowser_content')) {
function fbrowser_content($a){
if (!local_user())
@ -142,5 +141,5 @@ function fbrowser_content($a){
killme();
}
}
}

5
mod/filer.php
View file

@ -4,7 +4,7 @@ require_once('include/security.php');
require_once('include/bbcode.php');
require_once('include/items.php');
if(! function_exists('filer_content')) {
function filer_content(&$a) {
if(! local_user()) {
@ -30,9 +30,8 @@ function filer_content(&$a) {
'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
'$submit' => t('Save'),
));
echo $o;
}
killme();
}
}

2
mod/filerm.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('filerm_content')) {
function filerm_content(&$a) {
if(! local_user()) {
@ -26,4 +25,3 @@ function filerm_content(&$a) {
killme();
}
}

4
mod/follow.php
View file

@ -5,7 +5,6 @@ require_once('include/follow.php');
require_once('include/Contact.php');
require_once('include/contact_selectors.php');
if(! function_exists('follow_content')) {
function follow_content(&$a) {
if(! local_user()) {
@ -149,9 +148,7 @@ function follow_content(&$a) {
return $o;
}
}
if(! function_exists('follow_post')) {
function follow_post(&$a) {
if(! local_user()) {
@ -188,4 +185,3 @@ function follow_post(&$a) {
goaway($return_url);
// NOTREACHED
}
}

11
mod/friendica.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('friendica_init')) {
function friendica_init(&$a) {
if ($a->argv[1]=="json"){
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
@ -57,9 +56,9 @@ function friendica_init(&$a) {
killme();
}
}
}
if(! function_exists('friendica_content')) {
function friendica_content(&$a) {
$o = '';
@ -71,7 +70,7 @@ function friendica_content(&$a) {
$o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
$o .= t('running at web location') . ' ' . z_root() . '</p><p>';
$o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';
$o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';
$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a></p><p>';
$o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
@ -103,8 +102,8 @@ function friendica_content(&$a) {
else
$o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
call_hooks('about_hook', $o);
call_hooks('about_hook', $o);
return $o;
}
}

19
mod/fsuggest.php
View file

@ -1,6 +1,6 @@
<?php
if(! function_exists('fsuggest_post')) {
function fsuggest_post(&$a) {
if(! local_user()) {
@ -39,11 +39,11 @@ function fsuggest_post(&$a) {
VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
intval(local_user()),
intval($contact_id),
dbesc($r[0]['name']),
dbesc($r[0]['url']),
dbesc($r[0]['request']),
dbesc($r[0]['photo']),
dbesc($hash),
dbesc($r[0]['name']),
dbesc($r[0]['url']),
dbesc($r[0]['request']),
dbesc($r[0]['photo']),
dbesc($hash),
dbesc(datetime_convert())
);
$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
@ -65,11 +65,11 @@ function fsuggest_post(&$a) {
}
}
}
if(! function_exists('fsuggest_content')) {
function fsuggest_content(&$a) {
require_once('include/acl_selectors.php');
@ -100,7 +100,7 @@ function fsuggest_content(&$a) {
$o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >';
$o .= contact_selector('suggest','suggest-select', false,
$o .= contact_selector('suggest','suggest-select', false,
array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true));
@ -109,4 +109,3 @@ function fsuggest_content(&$a) {
return $o;
}
}

11
mod/group.php
View file

@ -1,21 +1,18 @@
<?php
if(! function_exists('validate_members')) {
function validate_members(&$item) {
$item = intval($item);
}
}
if(! function_exists('group_init')) {
function group_init(&$a) {
if(local_user()) {
require_once('include/group.php');
$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
}
}
}
if(! function_exists('group_post')) {
function group_post(&$a) {
if(! local_user()) {
@ -67,9 +64,7 @@ function group_post(&$a) {
}
return;
}
}
if(! function_exists('group_content')) {
function group_content(&$a) {
$change = false;
@ -234,5 +229,5 @@ function group_content(&$a) {
}
return replace_macros($tpl, $context);
}
}

10
mod/hcard.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('hcard_init')) {
function hcard_init(&$a) {
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
@ -16,7 +15,7 @@ function hcard_init(&$a) {
$profile = 0;
if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
$which = $a->user['nickname'];
$profile = $a->argv[1];
$profile = $a->argv[1];
}
profile_load($a,$which,$profile);
@ -24,7 +23,7 @@ function hcard_init(&$a) {
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
}
if(x($a->profile,'openidserver'))
if(x($a->profile,'openidserver'))
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
if(x($a->profile,'openid')) {
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
@ -43,9 +42,10 @@ function hcard_init(&$a) {
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn)
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
}
}

3
mod/help.php
View file

@ -18,7 +18,6 @@ if (!function_exists('load_doc_file')) {
}
if(! function_exists('help_content')) {
function help_content(&$a) {
nav_set_selected('help');
@ -99,5 +98,5 @@ function help_content(&$a) {
}
</style>".$html;
return $html;
}
}

3
mod/hostxrd.php
View file

@ -2,7 +2,6 @@
require_once('include/crypto.php');
if(! function_exists('hostxrd_init')) {
function hostxrd_init(&$a) {
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
@ -28,5 +27,5 @@ function hostxrd_init(&$a) {
));
session_write_close();
exit();
}
}

3
mod/ignored.php
View file

@ -1,6 +1,6 @@
<?php
if(! function_exists('ignored_init')) {
function ignored_init(&$a) {
$ignored = 0;
@ -43,4 +43,3 @@ function ignored_init(&$a) {
echo json_encode($ignored);
killme();
}
}

55
mod/install.php
View file

@ -3,7 +3,7 @@ require_once "include/Photo.php";
$install_wizard_pass=1;
if(! function_exists('install_init')) {
function install_init(&$a){
// $baseurl/install/testrwrite to test if rewite in .htaccess is working
@ -11,21 +11,20 @@ function install_init(&$a){
echo "ok";
killme();
}
// We overwrite current theme css, because during install we could not have a working mod_rewrite
// so we could not have a css at all. Here we set a static css file for the install procedure pages
$a->config['system']['theme'] = "../install";
$a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css";
global $install_wizard_pass;
if (x($_POST,'pass'))
$install_wizard_pass = intval($_POST['pass']);
}
}
if(! function_exists('install_post')) {
function install_post(&$a) {
global $install_wizard_pass, $db;
@ -113,18 +112,14 @@ function install_post(&$a) {
break;
}
}
}
if(! function_exists('get_db_errno')) {
function get_db_errno() {
if(class_exists('mysqli'))
return mysqli_connect_errno();
else
return mysql_errno();
}
}
if(! function_exists('install_content')) {
function install_content(&$a) {
global $install_wizard_pass, $db;
@ -309,7 +304,6 @@ function install_content(&$a) {
}
}
}
/**
* checks : array passed to template
@ -318,8 +312,7 @@ function install_content(&$a) {
* required : boolean
* help : string optional
*/
if(! function_exists('check_add')) {
function check_add(&$checks, $title, $status, $required, $help) {
function check_add(&$checks, $title, $status, $required, $help){
$checks[] = array(
'title' => $title,
'status' => $status,
@ -327,9 +320,7 @@ function check_add(&$checks, $title, $status, $required, $help) {
'help' => $help,
);
}
}
if(! function_exists('check_php')) {
function check_php(&$phpath, &$checks) {
$passed = $passed2 = $passed3 = false;
if (strlen($phpath)){
@ -379,10 +370,9 @@ function check_php(&$phpath, &$checks) {
check_add($checks, t('PHP register_argc_argv'), $passed3, true, $help);
}
}
}
if(! function_exists('check_keys')) {
function check_keys(&$checks) {
$help = '';
@ -402,10 +392,10 @@ function check_keys(&$checks) {
$help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
}
check_add($checks, t('Generate encryption keys'), $res, true, $help);
}
}
if(! function_exists('check_funcs')) {
function check_funcs(&$checks) {
$ck_funcs = array();
check_add($ck_funcs, t('libCurl PHP module'), true, true, "");
@ -467,9 +457,8 @@ function check_funcs(&$checks) {
/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
notice( t('Please see the file "INSTALL.txt".') . EOL);*/
}
}
if(! function_exists('check_htconfig')) {
function check_htconfig(&$checks) {
$status = true;
$help = "";
@ -484,10 +473,9 @@ function check_htconfig(&$checks) {
}
check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
}
}
if(! function_exists('check_smarty3')) {
function check_smarty3(&$checks) {
$status = true;
$help = "";
@ -501,10 +489,9 @@ function check_smarty3(&$checks) {
}
check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
}
}
if(! function_exists('check_htaccess')) {
function check_htaccess(&$checks) {
$a = get_app();
$status = true;
@ -524,9 +511,7 @@ function check_htaccess(&$checks) {
// cannot check modrewrite if libcurl is not installed
}
}
}
if(! function_exists('check_imagik')) {
function check_imagik(&$checks) {
$imagick = false;
$gif = false;
@ -543,18 +528,16 @@ function check_imagik(&$checks) {
check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
}
}
}
if(! function_exists('manual_config')) {
function manual_config(&$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
return $o;
}
}
if(! function_exists('load_database_rem')) {
function load_database_rem($v, $i){
$l = trim($i);
if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){
@ -563,9 +546,8 @@ function load_database_rem($v, $i){
return $v."\n".$i;
}
}
}
if(! function_exists('load_database')) {
function load_database($db) {
require_once("include/dbstructure.php");
@ -585,9 +567,7 @@ function load_database($db) {
return $errors;
}
}
if(! function_exists('what_next')) {
function what_next() {
$a = get_app();
$baseurl = $a->get_baseurl();
@ -599,4 +579,5 @@ function what_next() {
.t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
."</p>";
}
}

13
mod/invite.php
View file

@ -9,7 +9,6 @@
require_once('include/email.php');
if(! function_exists('invite_post')) {
function invite_post(&$a) {
if(! local_user()) {
@ -50,7 +49,7 @@ function invite_post(&$a) {
notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
continue;
}
if($invonly && ($x || is_site_admin())) {
$code = autoname(8) . srand(1000,9999);
$nmessage = str_replace('$invite_code',$code,$message);
@ -71,8 +70,8 @@ function invite_post(&$a) {
else
$nmessage = $message;
$res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
$nmessage,
$res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
$nmessage,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
@ -94,9 +93,8 @@ function invite_post(&$a) {
notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
return;
}
}
if(! function_exists('invite_content')) {
function invite_content(&$a) {
if(! local_user()) {
@ -136,7 +134,7 @@ function invite_content(&$a) {
'$msg_text' => t('Your message:'),
'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
. $linktxt
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" ,
'$submit' => t('Submit')
@ -144,4 +142,3 @@ function invite_content(&$a) {
return $o;
}
}

16
mod/item.php
View file

@ -25,7 +25,6 @@ require_once('include/text.php');
require_once('include/items.php');
require_once('include/Scrape.php');
if(! function_exists('item_post')) {
function item_post(&$a) {
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
@ -845,9 +844,6 @@ function item_post(&$a) {
// NOTREACHED
}
// Store the guid and other relevant data
add_guid($datarray);
$post_id = $r[0]['id'];
logger('mod_item: saved item ' . $post_id);
@ -1018,9 +1014,7 @@ function item_post(&$a) {
item_post_return($a->get_baseurl(), $api_source, $return_path);
// NOTREACHED
}
}
if(! function_exists('item_post_return')) {
function item_post_return($baseurl, $api_source, $return_path) {
// figure out how to return, depending on from whence we came
@ -1040,9 +1034,9 @@ function item_post_return($baseurl, $api_source, $return_path) {
echo json_encode($json);
killme();
}
}
if(! function_exists('item_content')) {
function item_content(&$a) {
if((! local_user()) && (! remote_user()))
@ -1061,7 +1055,6 @@ function item_content(&$a) {
}
return $o;
}
}
/**
* This function removes the tag $tag from the text $body and replaces it with
@ -1075,7 +1068,6 @@ function item_content(&$a) {
*
* @return boolean true if replaced, false if not replaced
*/
if(! function_exists('handle_tag')) {
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
require_once("include/Scrape.php");
require_once("include/socgraph.php");
@ -1250,9 +1242,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
return array('replaced' => $replaced, 'contact' => $r[0]);
}
}
if(! function_exists('store_diaspora_comment_sig')) {
function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item, $post_id) {
// We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
@ -1290,4 +1281,3 @@ function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item,
return;
}
}

7
mod/like.php
View file

@ -5,7 +5,6 @@ require_once('include/bbcode.php');
require_once('include/items.php');
require_once('include/like.php');
if(! function_exists('like_content')) {
function like_content(&$a) {
if(! local_user() && ! remote_user()) {
return false;
@ -29,11 +28,11 @@ function like_content(&$a) {
killme(); // NOTREACHED
// return; // NOTREACHED
}
}
// Decide how to return. If we were called with a 'return' argument,
// then redirect back to the calling page. If not, just quietly end
if(! function_exists('like_content_return')) {
function like_content_return($baseurl, $return_path) {
if($return_path) {
@ -46,4 +45,4 @@ function like_content_return($baseurl, $return_path) {
killme();
}
}

11
mod/localtime.php
View file

@ -2,7 +2,7 @@
require_once('include/datetime.php');
if(! function_exists('localtime_post')) {
function localtime_post(&$a) {
$t = $_REQUEST['time'];
@ -13,10 +13,9 @@ function localtime_post(&$a) {
if($_POST['timezone'])
$a->data['mod-localtime'] = datetime_convert('UTC',$_POST['timezone'],$t,$bd_format);
}
}
if(! function_exists('localtime_content')) {
function localtime_content(&$a) {
$t = $_REQUEST['time'];
if(! $t)
@ -39,12 +38,12 @@ function localtime_content(&$a) {
$o .= '<form action ="' . $a->get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
$o .= '<p>' . t('Please select your timezone:') . '</p>';
$o .= '<p>' . t('Please select your timezone:') . '</p>';
$o .= select_timezone(($_REQUEST['timezone']) ? $_REQUEST['timezone'] : 'America/Los_Angeles');
$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form>';
return $o;
}
}
}

20
mod/lockview.php
View file

@ -1,8 +1,8 @@
<?php
if(! function_exists('lockview_content')) {
function lockview_content(&$a) {
function lockview_content(&$a) {
$type = (($a->argc > 1) ? $a->argv[1] : 0);
if (is_numeric($type)) {
$item_id = intval($type);
@ -10,13 +10,13 @@ function lockview_content(&$a) {
} else {
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
}
if(! $item_id)
killme();
if (!in_array($type, array('item','photo','event')))
killme();
$r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1",
dbesc($type),
intval($item_id)
@ -33,7 +33,7 @@ function lockview_content(&$a) {
}
if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
echo t('Remote privacy information not available.') . '<br />';
@ -53,7 +53,7 @@ function lockview_content(&$a) {
dbesc(implode(', ', $allowed_groups))
);
if(count($r))
foreach($r as $rr)
foreach($r as $rr)
$l[] = '<b>' . $rr['name'] . '</b>';
}
if(count($allowed_users)) {
@ -61,7 +61,7 @@ function lockview_content(&$a) {
dbesc(implode(', ',$allowed_users))
);
if(count($r))
foreach($r as $rr)
foreach($r as $rr)
$l[] = $rr['name'];
}
@ -71,7 +71,7 @@ function lockview_content(&$a) {
dbesc(implode(', ', $deny_groups))
);
if(count($r))
foreach($r as $rr)
foreach($r as $rr)
$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
}
if(count($deny_users)) {
@ -79,12 +79,12 @@ function lockview_content(&$a) {
dbesc(implode(', ',$deny_users))
);
if(count($r))
foreach($r as $rr)
foreach($r as $rr)
$l[] = '<strike>' . $rr['name'] . '</strike>';
}
echo $o . implode(', ', $l);
killme();
}
}

4
mod/login.php
View file

@ -1,5 +1,5 @@
<?php
if(! function_exists('login_content')) {
function login_content(&$a) {
if(x($_SESSION,'theme'))
unset($_SESSION['theme']);
@ -9,5 +9,5 @@ function login_content(&$a) {
if(local_user())
goaway(z_root());
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
}
}

7
mod/lostpass.php
View file

@ -4,7 +4,6 @@ require_once('include/email.php');
require_once('include/enotify.php');
require_once('include/text.php');
if(! function_exists('lostpass_post')) {
function lostpass_post(&$a) {
$loginame = notags(trim($_POST['login-name']));
@ -75,10 +74,10 @@ function lostpass_post(&$a) {
'body' => $body));
goaway(z_root());
}
}
if(! function_exists('lostpass_content')) {
function lostpass_content(&$a) {
@ -165,5 +164,5 @@ function lostpass_content(&$a) {
return $o;
}
}
}

3
mod/maintenance.php
View file

@ -1,8 +1,7 @@
<?php
if(! function_exists('maintenance_content')) {
function maintenance_content(&$a) {
return replace_macros(get_markup_template('maintenance.tpl'), array(
'$sysdown' => t('System down for maintenance')
));
}
}

8
mod/manage.php
View file

@ -2,7 +2,7 @@
require_once("include/text.php");
if(! function_exists('manage_post')) {
function manage_post(&$a) {
if(! local_user())
@ -87,9 +87,9 @@ function manage_post(&$a) {
goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
// NOTREACHED
}
}
if(! function_exists('manage_content')) {
function manage_content(&$a) {
if(! local_user()) {
@ -144,5 +144,5 @@ function manage_content(&$a) {
));
return $o;
}
}

2
mod/match.php
View file

@ -13,7 +13,6 @@ require_once('mod/proxy.php');
* @param App &$a
* @return void|string
*/
if(! function_exists('match_content')) {
function match_content(&$a) {
$o = '';
@ -110,4 +109,3 @@ function match_content(&$a) {
return $o;
}
}

13
mod/message.php
View file

@ -3,7 +3,6 @@
require_once('include/acl_selectors.php');
require_once('include/message.php');
if(! function_exists('message_init')) {
function message_init(&$a) {
$tabs = '';
@ -37,10 +36,9 @@ function message_init(&$a) {
'$baseurl' => $a->get_baseurl(true),
'$base' => $base
));
}
}
if(! function_exists('message_post')) {
function message_post(&$a) {
if(! local_user()) {
@ -93,7 +91,7 @@ function message_post(&$a) {
}
else
goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
}
}
// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
@ -173,7 +171,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
}}
if(! function_exists('message_content')) {
function message_content(&$a) {
$o = '';
@ -532,9 +530,7 @@ function message_content(&$a) {
return $o;
}
}
}
if(! function_exists('get_messages')) {
function get_messages($user, $lstart, $lend) {
return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
@ -545,9 +541,7 @@ function get_messages($user, $lstart, $lend) {
intval($user), intval($lstart), intval($lend)
);
}
}
if(! function_exists('render_messages')) {
function render_messages($msg, $t) {
$a = get_app();
@ -599,4 +593,3 @@ function render_messages($msg, $t) {
return $rslt;
}
}

4
mod/modexp.php
View file

@ -2,7 +2,6 @@
require_once('library/asn1.php');
if(! function_exists('modexp_init')) {
function modexp_init(&$a) {
if($a->argc != 2)
@ -30,5 +29,6 @@ function modexp_init(&$a) {
echo 'RSA' . '.' . $m . '.' . $e ;
killme();
}
}

10
mod/mood.php
View file

@ -4,7 +4,7 @@ require_once('include/security.php');
require_once('include/bbcode.php');
require_once('include/items.php');
if(! function_exists('mood_init')) {
function mood_init(&$a) {
if(! local_user())
@ -59,7 +59,7 @@ function mood_init(&$a) {
$uri = item_new_uri($a->get_hostname(),$uid);
$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]);
$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]);
$arr = array();
@ -105,9 +105,9 @@ function mood_init(&$a) {
return;
}
}
if(! function_exists('mood_content')) {
function mood_content(&$a) {
if(! local_user()) {
@ -138,5 +138,5 @@ function mood_content(&$a) {
));
return $o;
}
}

9
mod/msearch.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('msearch_post')) {
function msearch_post(&$a) {
$perpage = (($_POST['n']) ? $_POST['n'] : 80);
@ -27,8 +26,8 @@ function msearch_post(&$a) {
if(count($r)) {
foreach($r as $rr)
$results[] = array(
'name' => $rr['name'],
'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'],
'name' => $rr['name'],
'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'],
'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
'tags' => str_replace(array(',',' '),array(' ',' '),$rr['pub_keywords'])
);
@ -39,5 +38,5 @@ function msearch_post(&$a) {
echo json_encode($output);
killme();
}
}
}

3
mod/navigation.php
View file

@ -2,7 +2,6 @@
require_once("include/nav.php");
if(! function_exists('navigation_content')) {
function navigation_content(&$a) {
$nav_info = nav_info($a);
@ -23,5 +22,5 @@ function navigation_content(&$a) {
'$apps' => $a->apps,
'$clear_notifs' => t('Clear notifications')
));
}
}

17
mod/network.php
View file

@ -1,6 +1,4 @@
<?php
if(! function_exists('network_init')) {
function network_init(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
@ -155,10 +153,9 @@ function network_init(&$a) {
$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
$a->page['aside'] .= saved_searches($search);
$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
}
}
if(! function_exists('saved_searches')) {
function saved_searches($search) {
if(! feature_enabled(local_user(),'savedsearch'))
@ -207,7 +204,7 @@ function saved_searches($search) {
));
return $o;
}
}
/**
@ -225,7 +222,6 @@ function saved_searches($search) {
*
* @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
*/
if(! function_exists('network_query_get_sel_tab')) {
function network_query_get_sel_tab($a) {
$no_active='';
$starred_active = '';
@ -282,12 +278,10 @@ function network_query_get_sel_tab($a) {
return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
}
}
/**
* Return selected network from query
*/
if(! function_exists('network_query_get_sel_net')) {
function network_query_get_sel_net() {
$network = false;
@ -297,9 +291,7 @@ function network_query_get_sel_net() {
return $network;
}
}
if(! function_exists('network_query_get_sel_group')) {
function network_query_get_sel_group($a) {
$group = false;
@ -309,9 +301,8 @@ function network_query_get_sel_group($a) {
return $group;
}
}
if(! function_exists('network_content')) {
function network_content(&$a, $update = 0) {
require_once('include/conversation.php');
@ -895,4 +886,4 @@ function network_content(&$a, $update = 0) {
return $o;
}
}

10
mod/newmember.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('newmember_content')) {
function newmember_content(&$a) {
@ -16,7 +15,7 @@ function newmember_content(&$a) {
$o .= '<ul>';
$o .= '<li> ' . '<a target="newmember" href="help/guide">' . t('Friendica Walk-Through') . '</a><br />' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
$o .= '<li> ' . '<a target="newmember" href="help/guide">' . t('Friendica Walk-Through') . '</a><br />' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
$o .= '</ul>';
@ -24,7 +23,7 @@ function newmember_content(&$a) {
$o .= '<ul>';
$o .= '<li>' . '<a target="newmember" href="settings">' . t('Go to Your Settings') . '</a><br />' . t('On your <em>Settings</em> page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</li>' . EOL;
$o .= '<li>' . '<a target="newmember" href="settings">' . t('Go to Your Settings') . '</a><br />' . t('On your <em>Settings</em> page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</li>' . EOL;
$o .= '<li>' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</li>' . EOL;
@ -34,7 +33,7 @@ function newmember_content(&$a) {
$o .= '<ul>';
$o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload Profile Photo') . '</a><br />' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</li>' . EOL;
$o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload Profile Photo') . '</a><br />' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</li>' . EOL;
$o .= '<li>' . '<a target="newmember" href="profiles">' . t('Edit Your Profile') . '</a><br />' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</li>' . EOL;
@ -47,7 +46,7 @@ function newmember_content(&$a) {
$o .= '<ul>';
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
if(! $mail_disabled)
$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . t('Importing Emails') . '</a><br />' . t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</li>' . EOL;
@ -83,4 +82,3 @@ function newmember_content(&$a) {
return $o;
}
}

11
mod/nodeinfo.php
View file

@ -1,13 +1,12 @@
<?php
/**
* @file mod/nodeinfo.php
*
*
* Documentation: http://nodeinfo.diaspora.software/schema.html
*/
require_once("include/plugin.php");
if(! function_exists('nodeinfo_wellknown')) {
function nodeinfo_wellknown(&$a) {
if (!get_config("system", "nodeinfo")) {
http_status_exit(404);
@ -20,9 +19,7 @@ function nodeinfo_wellknown(&$a) {
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit;
}
}
if(! function_exists('nodeinfo_init')) {
function nodeinfo_init(&$a){
if (!get_config("system", "nodeinfo")) {
http_status_exit(404);
@ -146,9 +143,9 @@ function nodeinfo_init(&$a){
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit;
}
}
if(! function_exists('nodeinfo_cron')) {
function nodeinfo_cron() {
$a = get_app();
@ -263,5 +260,5 @@ function nodeinfo_cron() {
logger("cron_end");
set_config('nodeinfo','last_calucation', time());
}
}
?>

6
mod/nogroup.php
View file

@ -4,7 +4,6 @@ require_once('include/Contact.php');
require_once('include/socgraph.php');
require_once('include/contact_selectors.php');
if(! function_exists('nogroup_init')) {
function nogroup_init(&$a) {
if(! local_user())
@ -18,9 +17,8 @@ function nogroup_init(&$a) {
$a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id);
}
}
if(! function_exists('nogroup_content')) {
function nogroup_content(&$a) {
if(! local_user()) {
@ -68,5 +66,5 @@ function nogroup_content(&$a) {
));
return $o;
}
}

3
mod/noscrape.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('noscrape_init')) {
function noscrape_init(&$a) {
if($a->argc > 1)
@ -63,5 +62,5 @@ function noscrape_init(&$a) {
header('Content-type: application/json; charset=utf-8');
echo json_encode($json_info);
exit;
}
}

20
mod/notes.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('notes_init')) {
function notes_init(&$a) {
if(! local_user())
@ -13,10 +12,10 @@ function notes_init(&$a) {
nav_set_selected('home');
// profile_load($a,$which,$profile);
}
}
if(! function_exists('notes_content')) {
function notes_content(&$a,$update = false) {
if(! local_user()) {
@ -70,12 +69,12 @@ function notes_content(&$a,$update = false) {
// Construct permissions
// default permissions - anonymous user
$sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
@ -91,7 +90,7 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
and `item`.`moderated` = 0 AND `item`.`type` = 'note'
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
@ -110,10 +109,10 @@ function notes_content(&$a,$update = false) {
foreach($r as $rr)
$parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
@ -136,4 +135,3 @@ function notes_content(&$a,$update = false) {
$o .= paginate($a);
return $o;
}
}

9
mod/notice.php
View file

@ -1,8 +1,7 @@
<?php
/* identi.ca -> friendica items permanent-url compatibility */
if(! function_exists('notice_init')) {
function notice_init(&$a) {
/* identi.ca -> friendica items permanent-url compatibility */
function notice_init(&$a){
$id = $a->argv[1];
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
intval($id)
@ -17,5 +16,5 @@ if(! function_exists('notice_init')) {
}
return;
}
}

6
mod/notifications.php
View file

@ -3,7 +3,6 @@ include_once("include/bbcode.php");
include_once("include/contact_selectors.php");
include_once("include/Scrape.php");
if(! function_exists('notifications_post')) {
function notifications_post(&$a) {
if(! local_user()) {
@ -59,11 +58,11 @@ function notifications_post(&$a) {
}
}
}
}
if(! function_exists('notifications_content')) {
function notifications_content(&$a) {
if(! local_user()) {
@ -580,4 +579,3 @@ function notifications_content(&$a) {
$o .= paginate($a);
return $o;
}
}

10
mod/notify.php
View file

@ -1,9 +1,9 @@
<?php
require_once('include/NotificationsManager.php');
if(! function_exists('notify_init')) {
function notify_init(&$a) {
if(! local_user()) return;
$nm = new NotificationsManager();
if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
@ -33,10 +33,9 @@ function notify_init(&$a) {
echo $j;
killme();
}
}
}
if(! function_exists('notify_content')) {
function notify_content(&$a) {
if(! local_user()) return login();
@ -69,6 +68,5 @@ function notify_content(&$a) {
return $o;
}
}
}

4
mod/oembed.php
View file

@ -1,8 +1,7 @@
<?php
require_once("include/oembed.php");
if(! function_exists('oembed_content')) {
function oembed_content(&$a) {
function oembed_content(&$a){
// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
if ($a->argv[1]=='b2h'){
@ -34,4 +33,3 @@ function oembed_content(&$a) {
}
killme();
}
}

17
mod/oexchange.php
View file

@ -1,6 +1,6 @@
<?php
if(! function_exists('oexchange_init')) {
function oexchange_init(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
@ -11,10 +11,9 @@ function oexchange_init(&$a) {
killme();
}
}
}
if(! function_exists('oexchange_content')) {
function oexchange_content(&$a) {
if(! local_user()) {
@ -27,13 +26,13 @@ function oexchange_content(&$a) {
return;
}
$url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
$url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
? urlencode(notags(trim($_REQUEST['url']))) : '');
$title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
$title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
$description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
$description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
$s = fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
@ -53,5 +52,7 @@ function oexchange_content(&$a) {
$_REQUEST = $post;
require_once('mod/item.php');
item_post($a);
}
}

10
mod/openid.php
View file

@ -1,8 +1,9 @@
<?php
require_once('library/openid.php');
if(! function_exists('openid_content')) {
function openid_content(&$a) {
$noid = get_config('system','no_openid');
@ -24,8 +25,8 @@ function openid_content(&$a) {
goaway(z_root());
}
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
dbesc($authid)
);
@ -39,7 +40,7 @@ function openid_content(&$a) {
require_once('include/security.php');
authenticate_success($r[0],true,true);
// just in case there was no return url set
// just in case there was no return url set
// and we fell through
goaway(z_root());
@ -93,4 +94,3 @@ function openid_content(&$a) {
goaway(z_root());
// NOTREACHED
}
}

16
mod/opensearch.php
View file

@ -1,18 +1,18 @@
<?php
if(! function_exists('opensearch_content')) {
function opensearch_content(&$a) {
function opensearch_content(&$a) {
$tpl = get_markup_template('opensearch.tpl');
header("Content-type: application/opensearchdescription+xml");
$o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$nodename' => $a->get_hostname(),
));
echo $o;
killme();
}
}
?>
?>

2
mod/ostatus_subscribe.php
View file

@ -3,7 +3,6 @@
require_once('include/Scrape.php');
require_once('include/follow.php');
if(! function_exists('ostatus_subscribe_content')) {
function ostatus_subscribe_content(&$a) {
if(! local_user()) {
@ -77,4 +76,3 @@ function ostatus_subscribe_content(&$a) {
return $o;
}
}

4
mod/p.php
View file

@ -4,8 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
*/
require_once("include/diaspora.php");
if(! function_exists('p_init')) {
function p_init($a) {
function p_init($a){
if ($a->argc != 2) {
header($_SERVER["SERVER_PROTOCOL"].' 510 '.t('Not Extended'));
killme();
@ -80,4 +79,3 @@ function p_init($a) {
killme();
}
}

18
mod/parse_url.php
View file

@ -1,14 +1,14 @@
<?php
/**
/**
* @file mod/parse_url.php
*
*
* @todo https://developers.google.com/+/plugins/snippet/
*
*
* @verbatim
* <meta itemprop="name" content="Toller Titel">
* <meta itemprop="description" content="Eine tolle Beschreibung">
* <meta itemprop="image" content="http://maple.libertreeproject.org/images/tree-icon.png">
*
*
* <body itemscope itemtype="http://schema.org/Product">
* <h1 itemprop="name">Shiny Trinket</h1>
* <img itemprop="image" src="{image-url}" />
@ -27,7 +27,6 @@ if(!function_exists('deletenode')) {
}
}
if(! function_exists('completeurl')) {
function completeurl($url, $scheme) {
$urlarr = parse_url($url);
@ -54,9 +53,7 @@ function completeurl($url, $scheme) {
return($complete);
}
}
if(! function_exists('parseurl_getsiteinfo_cached')) {
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
if ($url == "")
@ -80,9 +77,7 @@ function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = tr
return $data;
}
}
if(! function_exists('parseurl_getsiteinfo')) {
function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
require_once("include/network.php");
require_once("include/Photo.php");
@ -405,15 +400,11 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
return($siteinfo);
}
}
if(! function_exists('arr_add_hashes')) {
function arr_add_hashes(&$item,$k) {
$item = '#' . $item;
}
}
if(! function_exists('parse_url_content')) {
function parse_url_content(&$a) {
$text = null;
@ -567,5 +558,4 @@ function parse_url_content(&$a) {
killme();
}
}
?>

2
mod/photo.php
View file

@ -3,7 +3,6 @@
require_once('include/security.php');
require_once('include/Photo.php');
if(! function_exists('photo_init')) {
function photo_init(&$a) {
global $_SERVER;
@ -210,4 +209,3 @@ function photo_init(&$a) {
killme();
// NOTREACHED
}
}

15
mod/photos.php
View file

@ -9,7 +9,6 @@ require_once('include/redir.php');
require_once('include/tags.php');
require_once('include/threads.php');
if(! function_exists('photos_init')) {
function photos_init(&$a) {
if($a->argc > 1)
@ -122,9 +121,9 @@ function photos_init(&$a) {
return;
}
}
if(! function_exists('photos_post')) {
function photos_post(&$a) {
logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
@ -958,9 +957,9 @@ function photos_post(&$a) {
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
// NOTREACHED
}
}
if(! function_exists('photos_content')) {
function photos_content(&$a) {
// URLs:
@ -1329,7 +1328,7 @@ function photos_content(&$a) {
}
/**
/**
* Display one photo
*/
@ -1862,7 +1861,7 @@ function photos_content(&$a) {
//hide profile photos to others
if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
continue;
if($twist == 'rotright')
$twist = 'rotleft';
else
@ -1907,4 +1906,4 @@ function photos_content(&$a) {
$o .= paginate($a);
return $o;
}
}

10
mod/ping.php
View file

@ -5,7 +5,6 @@ require_once('include/ForumManager.php');
require_once('include/group.php');
require_once("mod/proxy.php");
if(! function_exists('ping_init')) {
function ping_init(&$a) {
header("Content-type: text/xml");
@ -339,9 +338,7 @@ function ping_init(&$a) {
killme();
}
}
if(! function_exists('ping_get_notifications')) {
function ping_get_notifications($uid) {
$result = array();
@ -392,7 +389,11 @@ function ping_get_notifications($uid) {
// Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold.
$pos = strpos($notification["message"],$notification['name']);
if ($notification['name'] != "")
$pos = strpos($notification["message"],$notification['name']);
else
$pos = false;
if ($pos !== false)
$notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
@ -409,4 +410,3 @@ function ping_get_notifications($uid) {
return($result);
}
}

3
mod/poco.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('poco_init')) {
function poco_init(&$a) {
require_once("include/bbcode.php");
@ -325,5 +324,5 @@ function poco_init(&$a) {
else
http_status_exit(500);
}
}

12
mod/poke.php
View file

@ -4,11 +4,11 @@
*
* Poke, prod, finger, or otherwise do unspeakable things to somebody - who must be a connection in your address book
* This function can be invoked with the required arguments (verb and cid and private and possibly parent) silently via ajax or
* other web request. You must be logged in and connected to a profile.
* other web request. You must be logged in and connected to a profile.
* If the required arguments aren't present, we'll display a simple form to choose a recipient and a verb.
* parent is a special argument which let's you attach this activity as a comment to an existing conversation, which
* may have started with somebody else poking (etc.) somebody, but this isn't necessary. This can be used in the more pokes
* plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
* plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
*
* private creates a private conversation with the recipient. Otherwise your profile's default post privacy is used.
*
@ -18,7 +18,7 @@ require_once('include/security.php');
require_once('include/bbcode.php');
require_once('include/items.php');
if(! function_exists('poke_init')) {
function poke_init(&$a) {
if(! local_user())
@ -140,9 +140,9 @@ function poke_init(&$a) {
return;
}
}
if(! function_exists('poke_content')) {
function poke_content(&$a) {
if(! local_user()) {
@ -201,5 +201,5 @@ function poke_content(&$a) {
));
return $o;
}
}

7
mod/post.php
View file

@ -9,8 +9,7 @@ require_once('include/salmon.php');
require_once('include/crypto.php');
// not yet ready for prime time
//require_once('include/zot.php');
if(! function_exists('post_post')) {
function post_post(&$a) {
$bulk_delivery = false;
@ -20,7 +19,7 @@ function post_post(&$a) {
}
else {
$nickname = $a->argv[2];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s'
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s'
AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nickname)
);
@ -49,4 +48,4 @@ function post_post(&$a) {
http_status_exit(($ret) ? $ret : 200);
// NOTREACHED
}
}

4
mod/pretheme.php
View file

@ -1,8 +1,7 @@
<?php
if(! function_exists('pretheme_init')) {
function pretheme_init(&$a) {
if($_REQUEST['theme']) {
$theme = $_REQUEST['theme'];
$info = get_theme_info($theme);
@ -21,4 +20,3 @@ function pretheme_init(&$a) {
}
killme();
}
}

4
mod/probe.php
View file

@ -2,14 +2,13 @@
require_once('include/Scrape.php');
if(! function_exists('probe_content')) {
function probe_content(&$a) {
$o .= '<h3>Probe Diagnostic</h3>';
$o .= '<form action="probe" method="get">';
$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<br /><br />';
@ -23,4 +22,3 @@ function probe_content(&$a) {
}
return $o;
}
}

7
mod/profile.php
View file

@ -3,7 +3,7 @@
require_once('include/contact_widgets.php');
require_once('include/redir.php');
if(! function_exists('profile_init')) {
function profile_init(&$a) {
if(! x($a->page,'aside'))
@ -65,10 +65,10 @@ function profile_init(&$a) {
foreach($dfrn_pages as $dfrn)
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".$a->get_baseurl()."/poco/{$which}\" />\r\n";
}
}
if(! function_exists('profile_content')) {
function profile_content(&$a, $update = 0) {
$category = $datequery = $datequery2 = '';
@ -350,4 +350,3 @@ function profile_content(&$a, $update = 0) {
return $o;
}
}

26
mod/profile_photo.php
View file

@ -2,7 +2,6 @@
require_once("include/Photo.php");
if(! function_exists('profile_photo_init')) {
function profile_photo_init(&$a) {
if(! local_user()) {
@ -10,10 +9,10 @@ function profile_photo_init(&$a) {
}
profile_load($a,$a->user['nickname']);
}
}
if(! function_exists('profile_photo_post')) {
function profile_photo_post(&$a) {
if(! local_user()) {
@ -144,7 +143,7 @@ function profile_photo_post(&$a) {
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
if ($filetype=="") $filetype=guess_image_type($filename);
$maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) {
@ -165,7 +164,7 @@ function profile_photo_post(&$a) {
$ph->orient($src);
@unlink($src);
return profile_photo_crop_ui_head($a, $ph);
}
}
@ -176,7 +175,7 @@ function profile_photo_content(&$a) {
notice( t('Permission denied.') . EOL );
return;
}
$newuser = false;
if($a->argc == 2 && $a->argv[1] === 'new')
@ -187,9 +186,9 @@ function profile_photo_content(&$a) {
notice( t('Permission denied.') . EOL );
return;
};
// check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
$resource_id = $a->argv[2];
//die(":".local_user());
$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
@ -241,7 +240,7 @@ function profile_photo_content(&$a) {
if(! x($a->config,'imagecrop')) {
$tpl = get_markup_template('profile_photo.tpl');
$o .= replace_macros($tpl,array(
@ -296,11 +295,11 @@ function profile_photo_crop_ui_head(&$a, $ph){
}
$hash = photo_new_resource();
$smallest = 0;
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
if($r)
info( t('Image uploaded successfully.') . EOL );
@ -309,8 +308,8 @@ function profile_photo_crop_ui_head(&$a, $ph){
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
if($r === false)
notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
else
@ -324,3 +323,4 @@ function profile_photo_crop_ui_head(&$a, $ph){
$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
return;
}}

14
mod/profiles.php
View file

@ -1,7 +1,6 @@
<?php
require_once("include/Contact.php");
if(! function_exists('profiles_init')) {
function profiles_init(&$a) {
nav_set_selected('profiles');
@ -140,10 +139,9 @@ function profiles_init(&$a) {
}
}
}
if(! function_exists('profile_clean_keywords')) {
function profile_clean_keywords($keywords) {
$keywords = str_replace(","," ",$keywords);
$keywords = explode(" ", $keywords);
@ -160,9 +158,7 @@ function profile_clean_keywords($keywords) {
return $keywords;
}
}
if(! function_exists('profiles_post')) {
function profiles_post(&$a) {
if(! local_user()) {
@ -506,9 +502,8 @@ function profiles_post(&$a) {
}
}
}
}
if(! function_exists('profile_activity')) {
function profile_activity($changed, $value) {
$a = get_app();
@ -598,9 +593,8 @@ function profile_activity($changed, $value) {
}
}
}
if(! function_exists('profiles_content')) {
function profiles_content(&$a) {
if(! local_user()) {
@ -824,5 +818,5 @@ function profiles_content(&$a) {
}
return $o;
}
}
}

12
mod/profperm.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('profperm_init')) {
function profperm_init(&$a) {
if(! local_user())
@ -10,10 +9,10 @@ function profperm_init(&$a) {
$profile = $a->argv[1];
profile_load($a,$which,$profile);
}
}
if(! function_exists('profperm_content')) {
function profperm_content(&$a) {
if(! local_user()) {
@ -109,9 +108,9 @@ function profperm_content(&$a) {
}
$o .= '<div id="prof-update-wrapper">';
if($change)
if($change)
$o = '';
$o .= '<div id="prof-members-title">';
$o .= '<h3>' . t('Visible To') . '</h3>';
$o .= '</div>';
@ -157,5 +156,6 @@ function profperm_content(&$a) {
}
$o .= '</div>';
return $o;
}
}

12
mod/proxy.php
View file

@ -12,7 +12,6 @@ define("PROXY_SIZE_LARGE", "large");
require_once('include/security.php');
require_once("include/Photo.php");
if(! function_exists('proxy_init')) {
function proxy_init() {
global $a, $_SERVER;
@ -233,9 +232,7 @@ function proxy_init() {
killme();
}
}
if(! function_exists('proxy_url')) {
function proxy_url($url, $writemode = false, $size = "") {
global $_SERVER;
@ -297,13 +294,11 @@ function proxy_url($url, $writemode = false, $size = "") {
else
return ($proxypath.$size);
}
}
/**
* @param $url string
* @return boolean
*/
if(! function_exists('proxy_is_local_image')) {
function proxy_is_local_image($url) {
if ($url[0] == '/') return true;
@ -314,9 +309,7 @@ function proxy_is_local_image($url) {
$url = normalise_link($url);
return (substr($url, 0, strlen($baseurl)) == $baseurl);
}
}
if(! function_exists('proxy_parse_query')) {
function proxy_parse_query($var) {
/**
* Use this function to parse out the query array element from
@ -335,9 +328,7 @@ function proxy_parse_query($var) {
unset($val, $x, $var);
return $arr;
}
}
if(! function_exists('proxy_img_cb')) {
function proxy_img_cb($matches) {
// if the picture seems to be from another picture cache then take the original source
@ -351,13 +342,10 @@ function proxy_img_cb($matches) {
return $matches[1].proxy_url(htmlspecialchars_decode($matches[2])).$matches[3];
}
}
if(! function_exists('proxy_parse_html')) {
function proxy_parse_html($html) {
$a = get_app();
$html = str_replace(normalise_link($a->get_baseurl())."/", $a->get_baseurl()."/", $html);
return preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "proxy_img_cb", $html);
}
}

20
mod/pubsub.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('hub_return')) {
function hub_return($valid,$body) {
if($valid) {
@ -15,18 +14,18 @@ function hub_return($valid,$body) {
// NOTREACHED
}
}
// when receiving an XML feed, always return OK
if(! function_exists('hub_post_return')) {
function hub_post_return() {
header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
killme();
}
}
if(! function_exists('pubsub_init')) {
function pubsub_init(&$a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
@ -58,7 +57,7 @@ function pubsub_init(&$a) {
$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
intval($contact_id),
intval($owner['uid'])
@ -76,7 +75,7 @@ function pubsub_init(&$a) {
$contact = $r[0];
// We must initiate an unsubscribe request with a verify_token.
// We must initiate an unsubscribe request with a verify_token.
// Don't allow outsiders to unsubscribe us.
if($hub_mode === 'unsubscribe') {
@ -96,11 +95,9 @@ function pubsub_init(&$a) {
hub_return(true, $hub_challenge);
}
}
}
require_once('include/security.php');
if(! function_exists('pubsub_post')) {
function pubsub_post(&$a) {
$xml = file_get_contents('php://input');
@ -158,5 +155,8 @@ function pubsub_post(&$a) {
consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return();
}
}

5
mod/pubsubhubbub.php
View file

@ -1,12 +1,9 @@
<?php
if(! function_exists('post_var')) {
function post_var($name) {
return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
}
}
if(! function_exists('pubsubhubbub_init')) {
function pubsubhubbub_init(&$a) {
// PuSH subscription must be considered "public" so just block it
// if public access isn't enabled.
@ -161,5 +158,5 @@ function pubsubhubbub_init(&$a) {
killme();
}
}
?>

3
mod/qsearch.php
View file

@ -1,6 +1,5 @@
<?php
if(! function_exists('qsearch_init')) {
function qsearch_init(&$a) {
if(! local_user())
@ -48,4 +47,4 @@ function qsearch_init(&$a) {
echo json_encode((object) $results);
killme();
}
}

3
mod/randprof.php
View file

@ -1,6 +1,6 @@
<?php
if(! function_exists('randprof_init')) {
function randprof_init(&$a) {
require_once('include/Contact.php');
$x = random_profile();
@ -8,4 +8,3 @@ function randprof_init(&$a) {
goaway(zrl($x));
goaway($a->get_baseurl() . '/profile');
}
}

Some files were not shown because too many files have changed in this diff Show more