Browse Source

Revert "Updated modules to allow for partial overrides without errors"

This reverts commit db949bb802.
tags/3.5
fabrixxm 4 years ago
parent
commit
b202e02fbf
100 changed files with 398 additions and 662 deletions
  1. +0
    -4
      mod/_well_known.php
  2. +1
    -2
      mod/acctlink.php
  3. +2
    -2
      mod/acl.php
  4. +22
    -56
      mod/admin.php
  5. +0
    -2
      mod/allfriends.php
  6. +2
    -3
      mod/amcd.php
  7. +5
    -6
      mod/api.php
  8. +19
    -17
      mod/apps.php
  9. +1
    -2
      mod/attach.php
  10. +22
    -24
      mod/babel.php
  11. +1
    -4
      mod/bookmarklet.php
  12. +2
    -9
      mod/cb.php
  13. +0
    -2
      mod/common.php
  14. +5
    -8
      mod/community.php
  15. +1
    -3
      mod/contactgroup.php
  16. +8
    -30
      mod/contacts.php
  17. +24
    -24
      mod/content.php
  18. +0
    -2
      mod/credits.php
  19. +4
    -6
      mod/crepair.php
  20. +4
    -6
      mod/delegate.php
  21. +1
    -2
      mod/dfrn_confirm.php
  22. +2
    -4
      mod/dfrn_notify.php
  23. +5
    -8
      mod/dfrn_poll.php
  24. +9
    -10
      mod/directory.php
  25. +2
    -4
      mod/dirfind.php
  26. +3
    -6
      mod/display.php
  27. +3
    -2
      mod/editpost.php
  28. +2
    -4
      mod/events.php
  29. +1
    -2
      mod/fbrowser.php
  30. +2
    -3
      mod/filer.php
  31. +0
    -2
      mod/filerm.php
  32. +0
    -4
      mod/follow.php
  33. +5
    -6
      mod/friendica.php
  34. +9
    -10
      mod/fsuggest.php
  35. +3
    -8
      mod/group.php
  36. +5
    -5
      mod/hcard.php
  37. +1
    -2
      mod/help.php
  38. +1
    -2
      mod/hostxrd.php
  39. +1
    -2
      mod/ignored.php
  40. +18
    -37
      mod/install.php
  41. +5
    -8
      mod/invite.php
  42. +3
    -10
      mod/item.php
  43. +3
    -4
      mod/like.php
  44. +5
    -6
      mod/localtime.php
  45. +10
    -10
      mod/lockview.php
  46. +2
    -2
      mod/login.php
  47. +3
    -4
      mod/lostpass.php
  48. +1
    -2
      mod/maintenance.php
  49. +4
    -4
      mod/manage.php
  50. +0
    -2
      mod/match.php
  51. +3
    -10
      mod/message.php
  52. +2
    -2
      mod/modexp.php
  53. +5
    -5
      mod/mood.php
  54. +4
    -5
      mod/msearch.php
  55. +1
    -2
      mod/navigation.php
  56. +4
    -13
      mod/network.php
  57. +4
    -6
      mod/newmember.php
  58. +4
    -7
      mod/nodeinfo.php
  59. +2
    -4
      mod/nogroup.php
  60. +1
    -2
      mod/noscrape.php
  61. +9
    -11
      mod/notes.php
  62. +4
    -5
      mod/notice.php
  63. +2
    -4
      mod/notifications.php
  64. +4
    -4
      mod/notify.php
  65. +1
    -3
      mod/oembed.php
  66. +9
    -8
      mod/oexchange.php
  67. +5
    -5
      mod/openid.php
  68. +8
    -8
      mod/opensearch.php
  69. +0
    -2
      mod/ostatus_subscribe.php
  70. +1
    -3
      mod/p.php
  71. +4
    -14
      mod/parse_url.php
  72. +0
    -2
      mod/photo.php
  73. +7
    -8
      mod/photos.php
  74. +0
    -4
      mod/ping.php
  75. +1
    -2
      mod/poco.php
  76. +6
    -6
      mod/poke.php
  77. +3
    -4
      mod/post.php
  78. +1
    -3
      mod/pretheme.php
  79. +1
    -3
      mod/probe.php
  80. +3
    -4
      mod/profile.php
  81. +13
    -13
      mod/profile_photo.php
  82. +4
    -10
      mod/profiles.php
  83. +6
    -6
      mod/profperm.php
  84. +0
    -12
      mod/proxy.php
  85. +10
    -10
      mod/pubsub.php
  86. +1
    -4
      mod/pubsubhubbub.php
  87. +1
    -2
      mod/qsearch.php
  88. +1
    -2
      mod/randprof.php
  89. +2
    -2
      mod/receive.php
  90. +2
    -4
      mod/redir.php
  91. +3
    -6
      mod/regmod.php
  92. +2
    -4
      mod/removeme.php
  93. +0
    -2
      mod/repair_ostatus.php
  94. +3
    -3
      mod/rsd_xml.php
  95. +2
    -5
      mod/salmon.php
  96. +6
    -8
      mod/search.php
  97. +1
    -2
      mod/session.php
  98. +7
    -9
      mod/settings.php
  99. +2
    -7
      mod/share.php
  100. +1
    -5
      mod/smilies.php

+ 0
- 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;
}
}

+ 1
- 2
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) {
}
}
}
}

+ 2
- 2
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);
}
}



+ 22
- 56
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;
}
}
}

+ 0
- 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;
}
}

+ 2
- 3
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();
}
}
}

+ 5
- 6
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();
}
}

+ 19
- 17
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;
}
}
$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');
$title = t('Applications');

if(count($a->apps)==0)
notice( t('No installed applications.') . EOL);
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,
));


$tpl = get_markup_template("apps.tpl");
return replace_macros($tpl, array(
'$title' => $title,
'$apps' => $a->apps,
));
}
}

+ 1
- 2
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
}
}

+ 22
- 24
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;
}
}

+ 1
- 4
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;
}
}

+ 2
- 9
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;
}
}
}

+ 0
- 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;
}
}

+ 5
- 8
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);
}
}

+ 1
- 3
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();
}
}
}

+ 8
- 30
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']),
);
}
}

+ 24
- 24
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;
}
}

+ 0
- 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,
));
}
}

+ 4
- 6
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;
}
}

+ 4
- 6
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;

}
}

+ 1
- 2
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
}
}

+ 2
- 4
mod/dfrn_notify.php View File

@@ -5,7 +5,6 @@ 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'])) : '');
@@ -214,9 +213,8 @@ function dfrn_notify_post(&$a) {

// NOTREACHED
}
}

if(! function_exists('dfrn_notify_content')) {
function dfrn_notify_content(&$a) {

if(x($_GET,'dfrn_id')) {
@@ -340,5 +338,5 @@ function dfrn_notify_content(&$a) {

killme();
}
}
}

+ 5
- 8
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) {
}
}
}
}

+ 9
- 10
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;
}
}

+ 2
- 4
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;
}
}

+ 3
- 6
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;
}
}

+ 3
- 2
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;

}
}



+ 2
- 4
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;
}
}
}

+ 1
- 2
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();
}

}
}

+ 2
- 3
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();
}
}

+ 0
- 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();
}
}

+ 0
- 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
}
}

+ 5
- 6
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;
}
}

+ 9
- 10
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;
}
}

+ 3
- 8
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);
}
}

+ 5
- 5
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";

}
}

+ 1
- 2
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;
}
}

+ 1
- 2
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();
}
}

+ 1
- 2
mod/ignored.php View File

@@ -1,6 +1,6 @@
<?php