Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 09:03:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge develop into 0602_contact_profile

Browse source 
Conflicts:
	mod/contacts.php
This commit is contained in:
rabuzarus 2016-02-09 13:44:30 +01:00
commit 743f2e0391
128 changed files with 538 additions and 799 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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 they will be overwritten by files in
/view/theme/**your-theme-name**/js /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.
## Expand an existing Theme ## Expand an existing Theme

26
include/dfrn.php
View file

@ -634,13 +634,20 @@ class dfrn {
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link); $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
$data = parse_xml_string($r->link, false); // XML does need a single element as root element so we add a dummy element here
foreach ($data->attributes() AS $parameter => $value) $data = parse_xml_string("<dummy>".$r->link."</dummy>", false);
$attributes[$parameter] = $value; if (is_object($data)) {
} else foreach ($data->link AS $link) {
$attributes = array();
foreach ($link->attributes() AS $parameter => $value)
$attributes[$parameter] = $value;
xml_add_element($doc, $entry, "link", "", $attributes);
}
}
} else {
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
xml_add_element($doc, $entry, "link", "", $attributes);
xml_add_element($doc, $entry, "link", "", $attributes); }
} }
if($r->content) if($r->content)
xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html")); xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
@ -1311,9 +1318,10 @@ class dfrn {
if (is_object($title)) if (is_object($title))
$obj_element->appendChild($obj_doc->importNode($title, true)); $obj_element->appendChild($obj_doc->importNode($title, true));
$link = $xpath->query("atom:link", $activity)->item(0); $links = $xpath->query("atom:link", $activity);
if (is_object($link)) if (is_object($links))
$obj_element->appendChild($obj_doc->importNode($link, true)); foreach ($links AS $link)
$obj_element->appendChild($obj_doc->importNode($link, true));
$content = $xpath->query("atom:content", $activity)->item(0); $content = $xpath->query("atom:content", $activity)->item(0);
if (is_object($content)) if (is_object($content))

10
include/items.php
View file

@ -509,6 +509,16 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : '');
$arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : '');
if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 5);
foreach ($trace AS $func)
$function[] = $func["function"];
$function = implode(", ", $function);
logger("Both author-link and owner-link are empty. Called by: ".$function, LOGGER_DEBUG);
}
if ($arr['plink'] == "") { if ($arr['plink'] == "") {
$a = get_app(); $a = get_app();
$arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']); $arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']);

37
include/poller.php
View file

@ -26,6 +26,9 @@ function poller_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
if (poller_max_connections_reached())
return;
$load = current_load(); $load = current_load();
if($load) { if($load) {
$maxsysload = intval(get_config('system','maxloadavg')); $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 * @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 not, next look for a 'standard' program module in the 'mod' directory
*/
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((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) { 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/hostxrd.php");
require_once("mod/nodeinfo.php"); require_once("mod/nodeinfo.php");
if(! function_exists('_well_known_init')) {
function _well_known_init(&$a){ function _well_known_init(&$a){
if ($a->argc > 1) { if ($a->argc > 1) {
switch($a->argv[1]) { switch($a->argv[1]) {
@ -20,9 +19,7 @@ function _well_known_init(&$a){
http_status_exit(404); http_status_exit(404);
killme(); killme();
} }
}
if(! function_exists('wk_social_relay')) {
function wk_social_relay(&$a) { function wk_social_relay(&$a) {
define('SR_SCOPE_ALL', 'all'); define('SR_SCOPE_ALL', 'all');
@ -67,4 +64,3 @@ function wk_social_relay(&$a) {
echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit; exit;
} }
}

3
mod/acctlink.php
View file

@ -2,8 +2,8 @@
require_once('include/Scrape.php'); require_once('include/Scrape.php');
if(! function_exists('acctlink_init')) {
function acctlink_init(&$a) { function acctlink_init(&$a) {
if(x($_GET,'addr')) { if(x($_GET,'addr')) {
$addr = trim($_GET['addr']); $addr = trim($_GET['addr']);
$res = probe_url($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"); require_once("include/acl_selectors.php");
if(! function_exists('acl_init')) {
function acl_init(&$a){ function acl_init(&$a){
acl_lookup($a); acl_lookup($a);
} }
}

46
mod/admin.php
View file

@ -23,7 +23,6 @@ require_once("include/text.php");
* @param App $a * @param App $a
* *
*/ */
if(! function_exists('admin_post')) {
function admin_post(&$a){ function admin_post(&$a){
@ -111,7 +110,6 @@ function admin_post(&$a){
goaway($a->get_baseurl(true) . '/admin' ); goaway($a->get_baseurl(true) . '/admin' );
return; // NOTREACHED return; // NOTREACHED
} }
}
/** /**
* @brief Generates content of the admin panel pages * @brief Generates content of the admin panel pages
@ -130,7 +128,6 @@ function admin_post(&$a){
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_content')) {
function admin_content(&$a) { function admin_content(&$a) {
if(!is_site_admin()) { if(!is_site_admin()) {
@ -248,7 +245,6 @@ function admin_content(&$a) {
return $o; return $o;
} }
} }
}
/** /**
* @brief Subpage with some stats about "the federation" network * @brief Subpage with some stats about "the federation" network
@ -264,7 +260,6 @@ function admin_content(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_federation')) {
function admin_page_federation(&$a) { function admin_page_federation(&$a) {
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
// social and statusnet nodes this node is knowing // social and statusnet nodes this node is knowing
@ -366,7 +361,6 @@ function admin_page_federation(&$a) {
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
)); ));
} }
}
/** /**
* @brief Admin Inspect Queue Page * @brief Admin Inspect Queue Page
@ -381,7 +375,6 @@ function admin_page_federation(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_queue')) {
function admin_page_queue(&$a) { function admin_page_queue(&$a) {
// get content from the queue table // 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;"); $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, '$entries' => $r,
)); ));
} }
}
/** /**
* @brief Admin Summary Page * @brief Admin Summary Page
@ -414,7 +406,6 @@ function admin_page_queue(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_summary')) {
function admin_page_summary(&$a) { function admin_page_summary(&$a) {
$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`"); $r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
$accounts = array( $accounts = array(
@ -461,14 +452,12 @@ function admin_page_summary(&$a) {
'$plugins' => array( t('Active plugins'), $a->plugins ) '$plugins' => array( t('Active plugins'), $a->plugins )
)); ));
} }
}
/** /**
* @brief Process send data from Admin Site Page * @brief Process send data from Admin Site Page
* *
* @param App $a * @param App $a
*/ */
if(! function_exists('admin_page_site_post')) {
function admin_page_site_post(&$a) { function admin_page_site_post(&$a) {
if(!x($_POST,"page_site")) { if(!x($_POST,"page_site")) {
return; return;
@ -781,7 +770,6 @@ function admin_page_site_post(&$a) {
return; // NOTREACHED return; // NOTREACHED
} }
}
/** /**
* @brief Generate Admin Site subpage * @brief Generate Admin Site subpage
@ -791,7 +779,6 @@ function admin_page_site_post(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_site')) {
function admin_page_site(&$a) { function admin_page_site(&$a) {
/* Installed langs */ /* Installed langs */
@ -996,7 +983,7 @@ function admin_page_site(&$a) {
'$form_security_token' => get_form_security_token("admin_site") '$form_security_token' => get_form_security_token("admin_site")
)); ));
}
} }
/** /**
@ -1011,7 +998,6 @@ function admin_page_site(&$a) {
* @param App $a * @param App $a
* @return string * @return string
**/ **/
if(! function_exists('admin_page_dbsync')) {
function admin_page_dbsync(&$a) { function admin_page_dbsync(&$a) {
$o = ''; $o = '';
@ -1087,7 +1073,7 @@ function admin_page_dbsync(&$a) {
} }
return $o; return $o;
}
} }
/** /**
@ -1095,7 +1081,6 @@ function admin_page_dbsync(&$a) {
* *
* @param App $a * @param App $a
*/ */
if(! function_exists('admin_page_users_post')) {
function admin_page_users_post(&$a){ function admin_page_users_post(&$a){
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() ); $pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : 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' ); goaway($a->get_baseurl(true) . '/admin/users' );
return; // NOTREACHED return; // NOTREACHED
} }
}
/** /**
* @brief Admin panel subpage for User management * @brief Admin panel subpage for User management
@ -1200,7 +1184,6 @@ function admin_page_users_post(&$a){
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_users')) {
function admin_page_users(&$a){ function admin_page_users(&$a){
if($a->argc>2) { if($a->argc>2) {
$uid = $a->argv[3]; $uid = $a->argv[3];
@ -1353,7 +1336,7 @@ function admin_page_users(&$a){
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }
}
/** /**
* @brief Plugins admin page * @brief Plugins admin page
@ -1371,7 +1354,6 @@ function admin_page_users(&$a){
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_plugins')) {
function admin_page_plugins(&$a){ function admin_page_plugins(&$a){
/* /*
@ -1502,14 +1484,12 @@ function admin_page_plugins(&$a){
'$form_security_token' => get_form_security_token("admin_themes"), '$form_security_token' => get_form_security_token("admin_themes"),
)); ));
} }
}
/** /**
* @param array $themes * @param array $themes
* @param string $th * @param string $th
* @param int $result * @param int $result
*/ */
if(! function_exists('toggle_theme')) {
function toggle_theme(&$themes,$th,&$result) { function toggle_theme(&$themes,$th,&$result) {
for($x = 0; $x < count($themes); $x ++) { for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) { if($themes[$x]['name'] === $th) {
@ -1524,14 +1504,12 @@ function toggle_theme(&$themes,$th,&$result) {
} }
} }
} }
}
/** /**
* @param array $themes * @param array $themes
* @param string $th * @param string $th
* @return int * @return int
*/ */
if(! function_exists('theme_status')) {
function theme_status($themes,$th) { function theme_status($themes,$th) {
for($x = 0; $x < count($themes); $x ++) { for($x = 0; $x < count($themes); $x ++) {
if($themes[$x]['name'] === $th) { if($themes[$x]['name'] === $th) {
@ -1545,13 +1523,12 @@ function theme_status($themes,$th) {
} }
return 0; return 0;
} }
}
/** /**
* @param array $themes * @param array $themes
* @return string * @return string
*/ */
if(! function_exists('rebuild_theme_table')) {
function rebuild_theme_table($themes) { function rebuild_theme_table($themes) {
$o = ''; $o = '';
if(count($themes)) { if(count($themes)) {
@ -1565,7 +1542,7 @@ function rebuild_theme_table($themes) {
} }
return $o; return $o;
} }
}
/** /**
* @brief Themes admin page * @brief Themes admin page
@ -1583,7 +1560,6 @@ function rebuild_theme_table($themes) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_themes')) {
function admin_page_themes(&$a){ function admin_page_themes(&$a){
$allowed_themes_str = get_config('system','allowed_themes'); $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"), '$form_security_token' => get_form_security_token("admin_themes"),
)); ));
} }
}
/** /**
* @brief Prosesses data send by Logs admin page * @brief Prosesses data send by Logs admin page
* *
* @param App $a * @param App $a
*/ */
if(! function_exists('admin_page_logs_post')) {
function admin_page_logs_post(&$a) { function admin_page_logs_post(&$a) {
if(x($_POST,"page_logs")) { if(x($_POST,"page_logs")) {
check_form_security_token_redirectOnErr('/admin/logs', 'admin_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' ); goaway($a->get_baseurl(true) . '/admin/logs' );
return; // NOTREACHED return; // NOTREACHED
} }
}
/** /**
* @brief Generates admin panel subpage for configuration of the logs * @brief Generates admin panel subpage for configuration of the logs
@ -1801,7 +1775,6 @@ function admin_page_logs_post(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_logs')) {
function admin_page_logs(&$a){ function admin_page_logs(&$a){
$log_choices = array( $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');", '$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 * @brief Generates admin panel subpage to view the Friendica log
@ -1853,7 +1825,6 @@ function admin_page_logs(&$a){
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_viewlogs')) {
function admin_page_viewlogs(&$a){ function admin_page_viewlogs(&$a){
$t = get_markup_template("admin_viewlogs.tpl"); $t = get_markup_template("admin_viewlogs.tpl");
$f = get_config('system','logfile'); $f = get_config('system','logfile');
@ -1890,14 +1861,12 @@ function admin_page_viewlogs(&$a){
'$logname' => get_config('system','logfile') '$logname' => get_config('system','logfile')
)); ));
} }
}
/** /**
* @brief Prosesses data send by the features admin page * @brief Prosesses data send by the features admin page
* *
* @param App $a * @param App $a
*/ */
if(! function_exists('admin_page_features_post')) {
function admin_page_features_post(&$a) { function admin_page_features_post(&$a) {
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features'); check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
@ -1929,7 +1898,6 @@ function admin_page_features_post(&$a) {
goaway($a->get_baseurl(true) . '/admin/features' ); goaway($a->get_baseurl(true) . '/admin/features' );
return; // NOTREACHED return; // NOTREACHED
} }
}
/** /**
* @brief Subpage for global additional feature management * @brief Subpage for global additional feature management
@ -1945,7 +1913,6 @@ function admin_page_features_post(&$a) {
* @param App $a * @param App $a
* @return string * @return string
*/ */
if(! function_exists('admin_page_features')) {
function admin_page_features(&$a) { function admin_page_features(&$a) {
if((argc() > 1) && (argv(1) === 'features')) { if((argc() > 1) && (argv(1) === 'features')) {
@ -1978,4 +1945,3 @@ function admin_page_features(&$a) {
return $o; 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('include/contact_selectors.php');
require_once('mod/contacts.php'); require_once('mod/contacts.php');
if(! function_exists('allfriends_content')) {
function allfriends_content(&$a) { function allfriends_content(&$a) {
$o = ''; $o = '';
@ -98,4 +97,3 @@ function allfriends_content(&$a) {
return $o; return $o;
} }
}

3
mod/amcd.php
View file

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

11
mod/api.php
View file

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

40
mod/apps.php
View file

@ -1,23 +1,25 @@
<?php <?php
if(! function_exists('apps_content')) {
function apps_content(&$a) { function apps_content(&$a) {
$privateaddons = get_config('config','private_addons'); $privateaddons = get_config('config','private_addons');
if ($privateaddons === "1") { if ($privateaddons === "1") {
if((! (local_user()))) { if((! (local_user()))) {
info( t("You must be logged in to use addons. ")); info( t("You must be logged in to use addons. "));
return; 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,
));
} }
$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 <?php
require_once('include/security.php'); require_once('include/security.php');
if(! function_exists('attach_init')) {
function attach_init(&$a) { function attach_init(&$a) {
if($a->argc != 2) { if($a->argc != 2) {
@ -47,4 +47,3 @@ function attach_init(&$a) {
killme(); killme();
// NOTREACHED // NOTREACHED
} }
}

2
mod/babel.php
View file

@ -9,7 +9,6 @@ function visible_lf($s) {
return str_replace("\n",'<br />', $s); return str_replace("\n",'<br />', $s);
} }
if(! function_exists('babel_content')) {
function babel_content(&$a) { function babel_content(&$a) {
$o .= '<h1>Babel Diagnostic</h1>'; $o .= '<h1>Babel Diagnostic</h1>';
@ -78,4 +77,3 @@ function babel_content(&$a) {
return $o; return $o;
} }
}

5
mod/bookmarklet.php
View file

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

9
mod/cb.php
View file

@ -4,28 +4,21 @@
* General purpose landing page for plugins/addons * General purpose landing page for plugins/addons
*/ */
if(! function_exists('cb_init')) {
function cb_init(&$a) { function cb_init(&$a) {
call_hooks('cb_init'); call_hooks('cb_init');
} }
}
if(! function_exists('cb_post')) {
function cb_post(&$a) { function cb_post(&$a) {
call_hooks('cb_post', $_POST); call_hooks('cb_post', $_POST);
} }
}
if(! function_exists('cb_afterpost')) {
function cb_afterpost(&$a) { function cb_afterpost(&$a) {
call_hooks('cb_afterpost'); call_hooks('cb_afterpost');
} }
}
if(! function_exists('cb_content')) {
function cb_content(&$a) { function cb_content(&$a) {
$o = ''; $o = '';
call_hooks('cb_content', $o); call_hooks('cb_content', $o);
return $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('include/contact_selectors.php');
require_once('mod/contacts.php'); require_once('mod/contacts.php');
if(! function_exists('common_content')) {
function common_content(&$a) { function common_content(&$a) {
$o = ''; $o = '';
@ -145,4 +144,3 @@ function common_content(&$a) {
return $o; return $o;
} }
}

13
mod/community.php
View file

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

2
mod/contactgroup.php
View file

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

34
mod/contacts.php
View file

@ -7,7 +7,6 @@ require_once('include/Scrape.php');
require_once('mod/proxy.php'); require_once('mod/proxy.php');
require_once('include/Photo.php'); require_once('include/Photo.php');
if(! function_exists('contacts_init')) {
function contacts_init(&$a) { function contacts_init(&$a) {
if(! local_user()) if(! local_user())
return; return;
@ -89,10 +88,9 @@ function contacts_init(&$a) {
'$base' => $base '$base' => $base
)); ));
}
} }
if(! function_exists('contacts_batch_actions')) {
function contacts_batch_actions(&$a){ function contacts_batch_actions(&$a){
$contacts_id = $_POST['contact_batch']; $contacts_id = $_POST['contact_batch'];
if (!is_array($contacts_id)) return; if (!is_array($contacts_id)) return;
@ -134,10 +132,10 @@ function contacts_batch_actions(&$a){
goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
else else
goaway($a->get_baseurl(true) . '/contacts'); goaway($a->get_baseurl(true) . '/contacts');
}
} }
if(! function_exists('contacts_post')) {
function contacts_post(&$a) { function contacts_post(&$a) {
if(! local_user()) if(! local_user())
@ -217,11 +215,10 @@ function contacts_post(&$a) {
$a->data['contact'] = $r[0]; $a->data['contact'] = $r[0];
return; return;
}
} }
/*contact actions*/ /*contact actions*/
if(! function_exists('_contact_update')) {
function _contact_update($contact_id) { function _contact_update($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r) if (!$r)
@ -242,9 +239,7 @@ function _contact_update($contact_id) {
// pull feed and consume it, which should subscribe to the hub. // pull feed and consume it, which should subscribe to the hub.
proc_run('php',"include/onepoll.php","$contact_id", "force"); proc_run('php',"include/onepoll.php","$contact_id", "force");
} }
}
if(! function_exists('_contact_update_profile')) {
function _contact_update_profile($contact_id) { function _contact_update_profile($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r) if (!$r)
@ -304,9 +299,7 @@ function _contact_update_profile($contact_id) {
// Update the entry in the gcontact table // Update the entry in the gcontact table
update_gcontact_from_probe($data["url"]); update_gcontact_from_probe($data["url"]);
} }
}
if(! function_exists('_contact_block')) {
function _contact_block($contact_id, $orig_record) { function _contact_block($contact_id, $orig_record) {
$blocked = (($orig_record['blocked']) ? 0 : 1); $blocked = (($orig_record['blocked']) ? 0 : 1);
$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d", $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()) intval(local_user())
); );
return $r; return $r;
}
}
if(! function_exists('_contact_ignore')) { }
function _contact_ignore($contact_id, $orig_record) { function _contact_ignore($contact_id, $orig_record) {
$readonly = (($orig_record['readonly']) ? 0 : 1); $readonly = (($orig_record['readonly']) ? 0 : 1);
$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d", $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; return $r;
} }
}
if(! function_exists('_contact_archive')) {
function _contact_archive($contact_id, $orig_record) { function _contact_archive($contact_id, $orig_record) {
$archived = (($orig_record['archive']) ? 0 : 1); $archived = (($orig_record['archive']) ? 0 : 1);
$r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d", $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; return $r;
} }
}
if(! function_exists('_contact_drop')) {
function _contact_drop($contact_id, $orig_record) { function _contact_drop($contact_id, $orig_record) {
$a = get_app(); $a = get_app();
terminate_friendship($a->user,$a->contact,$orig_record); terminate_friendship($a->user,$a->contact,$orig_record);
contact_remove($orig_record['id']); contact_remove($orig_record['id']);
} }
}
if(! function_exists('contacts_content')) {
function contacts_content(&$a) { function contacts_content(&$a) {
$sort_type = 0; $sort_type = 0;
@ -822,7 +806,6 @@ function contacts_content(&$a) {
return $o; return $o;
} }
}
/** /**
* @brief List of pages for the Contact TabBar * @brief List of pages for the Contact TabBar
@ -882,7 +865,6 @@ function contacts_tab($a, $contact_id, $active_tab) {
return $tab_str; return $tab_str;
} }
if(! function_exists('contact_posts')) {
function contact_posts($a, $contact_id) { function contact_posts($a, $contact_id) {
$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id)); $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
@ -910,9 +892,7 @@ function contact_posts($a, $contact_id) {
return $o; return $o;
} }
}
if(! function_exists('_contact_detail_for_template')) {
function _contact_detail_for_template($rr){ function _contact_detail_for_template($rr){
$community = ''; $community = '';
@ -963,7 +943,7 @@ function _contact_detail_for_template($rr){
'url' => $url, 'url' => $url,
'network' => network_to_name($rr['network'], $rr['url']), 'network' => network_to_name($rr['network'], $rr['url']),
); );
}
} }
/** /**

8
mod/content.php
View file

@ -15,7 +15,7 @@
// fast - e.g. one or two milliseconds to fetch parent items for the current content, // 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. // and 10-20 milliseconds to fetch all the child items.
if(! function_exists('content_content')) {
function content_content(&$a, $update = 0) { function content_content(&$a, $update = 0) {
require_once('include/conversation.php'); require_once('include/conversation.php');
@ -304,9 +304,9 @@ function content_content(&$a, $update = 0) {
echo json_encode($o); echo json_encode($o);
killme(); killme();
} }
}
if(! function_exists('render_content')) {
function render_content(&$a, $items, $mode, $update, $preview = false) { function render_content(&$a, $items, $mode, $update, $preview = false) {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
@ -897,5 +897,5 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
return $threads; return $threads;
}
} }

2
mod/credits.php
View file

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

10
mod/crepair.php
View file

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

6
mod/delegate.php
View file

@ -1,13 +1,11 @@
<?php <?php
require_once('mod/settings.php'); require_once('mod/settings.php');
if(! function_exists('delegate_init')) {
function delegate_init(&$a) { function delegate_init(&$a) {
return settings_init($a); return settings_init($a);
} }
}
if(! function_exists('delegate_content')) {
function delegate_content(&$a) { function delegate_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -146,5 +144,5 @@ function delegate_content(&$a) {
return $o; return $o;
}
} }

3
mod/dfrn_confirm.php
View file

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

6
mod/dfrn_notify.php
View file

@ -6,7 +6,6 @@ require_once('include/event.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
if(! function_exists('dfrn_notify_post')) {
function dfrn_notify_post(&$a) { function dfrn_notify_post(&$a) {
logger(__function__, LOGGER_TRACE); logger(__function__, LOGGER_TRACE);
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ''); $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
@ -215,9 +214,8 @@ function dfrn_notify_post(&$a) {
// NOTREACHED // NOTREACHED
} }
}
if(! function_exists('dfrn_notify_content')) {
function dfrn_notify_content(&$a) { function dfrn_notify_content(&$a) {
if(x($_GET,'dfrn_id')) { if(x($_GET,'dfrn_id')) {
@ -341,5 +339,5 @@ function dfrn_notify_content(&$a) {
killme(); killme();
} }
}
} }

9
mod/dfrn_poll.php
View file

@ -3,7 +3,7 @@ require_once('include/items.php');
require_once('include/auth.php'); require_once('include/auth.php');
require_once('include/dfrn.php'); require_once('include/dfrn.php');
if(! function_exists('dfrn_poll_init')) {
function dfrn_poll_init(&$a) { function dfrn_poll_init(&$a) {
@ -195,11 +195,11 @@ function dfrn_poll_init(&$a) {
return; // NOTREACHED return; // NOTREACHED
} }
} }
}
} }
if(! function_exists('dfrn_poll_post')) {
function dfrn_poll_post(&$a) { function dfrn_poll_post(&$a) {
$dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : ''); $dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : '');
@ -377,9 +377,7 @@ function dfrn_poll_post(&$a) {
} }
} }
}
if(! function_exists('dfrn_poll_content')) {
function dfrn_poll_content(&$a) { function dfrn_poll_content(&$a) {
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
@ -564,4 +562,3 @@ function dfrn_poll_content(&$a) {
} }
} }
} }
}

11
mod/directory.php
View file

@ -1,5 +1,5 @@
<?php <?php
if(! function_exists('directory_init')) {
function directory_init(&$a) { function directory_init(&$a) {
$a->set_pager_itemspage(60); $a->set_pager_itemspage(60);
@ -16,17 +16,17 @@ function directory_init(&$a) {
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
} }
}
} }
if(! function_exists('directory_post')) {
function directory_post(&$a) { function directory_post(&$a) {
if(x($_POST,'search')) if(x($_POST,'search'))
$a->data['search'] = $_POST['search']; $a->data['search'] = $_POST['search'];
} }
}
if(! function_exists('directory_content')) {
function directory_content(&$a) { function directory_content(&$a) {
global $db; global $db;
@ -217,4 +217,3 @@ function directory_content(&$a) {
return $o; 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('include/contact_selectors.php');
require_once('mod/contacts.php'); require_once('mod/contacts.php');
if(! function_exists('dirfind_init')) {
function dirfind_init(&$a) { function dirfind_init(&$a) {
if(! local_user()) { if(! local_user()) {
@ -20,9 +19,9 @@ function dirfind_init(&$a) {
$a->page['aside'] .= follow_widget(); $a->page['aside'] .= follow_widget();
} }
}
if(! function_exists('dirfind_content')) {
function dirfind_content(&$a, $prefix = "") { function dirfind_content(&$a, $prefix = "") {
$community = false; $community = false;
@ -236,4 +235,3 @@ function dirfind_content(&$a, $prefix = "") {
return $o; return $o;
} }
}

9
mod/display.php
View file

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

5
mod/editpost.php
View file

@ -2,7 +2,6 @@
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
if(! function_exists('editpost_content')) {
function editpost_content(&$a) { function editpost_content(&$a) {
$o = ''; $o = '';
@ -151,5 +150,7 @@ function editpost_content(&$a) {
)); ));
return $o; 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/event.php');
require_once('include/items.php'); require_once('include/items.php');
if(! function_exists('events_post')) {
function events_post(&$a) { function events_post(&$a) {
logger('post: ' . print_r($_REQUEST,true)); logger('post: ' . print_r($_REQUEST,true));
@ -157,9 +156,9 @@ function events_post(&$a) {
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }
}
if(! function_exists('events_content')) {
function events_content(&$a) { function events_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -579,4 +578,3 @@ function events_content(&$a) {
return $o; return $o;
} }
} }
}

3
mod/fbrowser.php
View file

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

3
mod/filer.php
View file

@ -4,7 +4,7 @@ require_once('include/security.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
require_once('include/items.php'); require_once('include/items.php');
if(! function_exists('filer_content')) {
function filer_content(&$a) { function filer_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -35,4 +35,3 @@ function filer_content(&$a) {
} }
killme(); killme();
} }
}

2
mod/filerm.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('filerm_content')) {
function filerm_content(&$a) { function filerm_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -26,4 +25,3 @@ function filerm_content(&$a) {
killme(); 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.php');
require_once('include/contact_selectors.php'); require_once('include/contact_selectors.php');
if(! function_exists('follow_content')) {
function follow_content(&$a) { function follow_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -149,9 +148,7 @@ function follow_content(&$a) {
return $o; return $o;
} }
}
if(! function_exists('follow_post')) {
function follow_post(&$a) { function follow_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -188,4 +185,3 @@ function follow_post(&$a) {
goaway($return_url); goaway($return_url);
// NOTREACHED // NOTREACHED
} }
}

7
mod/friendica.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('friendica_init')) {
function friendica_init(&$a) { function friendica_init(&$a) {
if ($a->argv[1]=="json"){ if ($a->argv[1]=="json"){
$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
@ -57,9 +56,9 @@ function friendica_init(&$a) {
killme(); killme();
} }
} }
}
if(! function_exists('friendica_content')) {
function friendica_content(&$a) { function friendica_content(&$a) {
$o = ''; $o = '';
@ -106,5 +105,5 @@ function friendica_content(&$a) {
call_hooks('about_hook', $o); call_hooks('about_hook', $o);
return $o; return $o;
}
} }

7
mod/fsuggest.php
View file

@ -1,6 +1,6 @@
<?php <?php
if(! function_exists('fsuggest_post')) {
function fsuggest_post(&$a) { function fsuggest_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -65,11 +65,11 @@ function fsuggest_post(&$a) {
} }
}
} }
if(! function_exists('fsuggest_content')) {
function fsuggest_content(&$a) { function fsuggest_content(&$a) {
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
@ -109,4 +109,3 @@ function fsuggest_content(&$a) {
return $o; return $o;
} }
}

11
mod/group.php
View file

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

4
mod/hcard.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('hcard_init')) {
function hcard_init(&$a) { function hcard_init(&$a) {
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
@ -47,5 +46,6 @@ function hcard_init(&$a) {
$dfrn_pages = array('request', 'confirm', 'notify', 'poll'); $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn) 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-{$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) { function help_content(&$a) {
nav_set_selected('help'); nav_set_selected('help');
@ -99,5 +98,5 @@ function help_content(&$a) {
} }
</style>".$html; </style>".$html;
return $html; return $html;
}
} }

3
mod/hostxrd.php
View file

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

3
mod/ignored.php
View file

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

47
mod/install.php
View file

@ -3,7 +3,7 @@ require_once "include/Photo.php";
$install_wizard_pass=1; $install_wizard_pass=1;
if(! function_exists('install_init')) {
function install_init(&$a){ function install_init(&$a){
// $baseurl/install/testrwrite to test if rewite in .htaccess is working // $baseurl/install/testrwrite to test if rewite in .htaccess is working
@ -22,10 +22,9 @@ function install_init(&$a){
global $install_wizard_pass; global $install_wizard_pass;
if (x($_POST,'pass')) if (x($_POST,'pass'))
$install_wizard_pass = intval($_POST['pass']); $install_wizard_pass = intval($_POST['pass']);
}
} }
if(! function_exists('install_post')) {
function install_post(&$a) { function install_post(&$a) {
global $install_wizard_pass, $db; global $install_wizard_pass, $db;
@ -113,18 +112,14 @@ function install_post(&$a) {
break; break;
} }
} }
}
if(! function_exists('get_db_errno')) {
function get_db_errno() { function get_db_errno() {
if(class_exists('mysqli')) if(class_exists('mysqli'))
return mysqli_connect_errno(); return mysqli_connect_errno();
else else
return mysql_errno(); return mysql_errno();
} }
}
if(! function_exists('install_content')) {
function install_content(&$a) { function install_content(&$a) {
global $install_wizard_pass, $db; global $install_wizard_pass, $db;
@ -309,7 +304,6 @@ function install_content(&$a) {
} }
} }
}
/** /**
* checks : array passed to template * checks : array passed to template
@ -318,8 +312,7 @@ function install_content(&$a) {
* required : boolean * required : boolean
* help : string optional * 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( $checks[] = array(
'title' => $title, 'title' => $title,
'status' => $status, 'status' => $status,
@ -327,9 +320,7 @@ function check_add(&$checks, $title, $status, $required, $help) {
'help' => $help, 'help' => $help,
); );
} }
}
if(! function_exists('check_php')) {
function check_php(&$phpath, &$checks) { function check_php(&$phpath, &$checks) {
$passed = $passed2 = $passed3 = false; $passed = $passed2 = $passed3 = false;
if (strlen($phpath)){ if (strlen($phpath)){
@ -379,10 +370,9 @@ function check_php(&$phpath, &$checks) {
check_add($checks, t('PHP register_argc_argv'), $passed3, true, $help); check_add($checks, t('PHP register_argc_argv'), $passed3, true, $help);
} }
}
} }
if(! function_exists('check_keys')) {
function check_keys(&$checks) { function check_keys(&$checks) {
$help = ''; $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".'); $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); check_add($checks, t('Generate encryption keys'), $res, true, $help);
}
} }
if(! function_exists('check_funcs')) {
function check_funcs(&$checks) { function check_funcs(&$checks) {
$ck_funcs = array(); $ck_funcs = array();
check_add($ck_funcs, t('libCurl PHP module'), true, true, ""); 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'])) /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
notice( t('Please see the file "INSTALL.txt".') . EOL);*/ notice( t('Please see the file "INSTALL.txt".') . EOL);*/
} }
}
if(! function_exists('check_htconfig')) {
function check_htconfig(&$checks) { function check_htconfig(&$checks) {
$status = true; $status = true;
$help = ""; $help = "";
@ -484,10 +473,9 @@ function check_htconfig(&$checks) {
} }
check_add($checks, t('.htconfig.php is writable'), $status, false, $help); check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
}
} }
if(! function_exists('check_smarty3')) {
function check_smarty3(&$checks) { function check_smarty3(&$checks) {
$status = true; $status = true;
$help = ""; $help = "";
@ -501,10 +489,9 @@ function check_smarty3(&$checks) {
} }
check_add($checks, t('view/smarty3 is writable'), $status, true, $help); check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
}
} }
if(! function_exists('check_htaccess')) {
function check_htaccess(&$checks) { function check_htaccess(&$checks) {
$a = get_app(); $a = get_app();
$status = true; $status = true;
@ -524,9 +511,7 @@ function check_htaccess(&$checks) {
// cannot check modrewrite if libcurl is not installed // cannot check modrewrite if libcurl is not installed
} }
} }
}
if(! function_exists('check_imagik')) {
function check_imagik(&$checks) { function check_imagik(&$checks) {
$imagick = false; $imagick = false;
$gif = false; $gif = false;
@ -543,18 +528,16 @@ function check_imagik(&$checks) {
check_add($checks, t('ImageMagick supports GIF'), $gif, false, ""); check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
} }
} }
}
if(! function_exists('manual_config')) {
function manual_config(&$a) { function manual_config(&$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8'); $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 = 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>"; $o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
return $o; return $o;
} }
}
if(! function_exists('load_database_rem')) {
function load_database_rem($v, $i){ function load_database_rem($v, $i){
$l = trim($i); $l = trim($i);
if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){ if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){
@ -563,9 +546,8 @@ function load_database_rem($v, $i){
return $v."\n".$i; return $v."\n".$i;
} }
} }
}
if(! function_exists('load_database')) {
function load_database($db) { function load_database($db) {
require_once("include/dbstructure.php"); require_once("include/dbstructure.php");
@ -585,9 +567,7 @@ function load_database($db) {
return $errors; return $errors;
} }
}
if(! function_exists('what_next')) {
function what_next() { function what_next() {
$a = get_app(); $a = get_app();
$baseurl = $a->get_baseurl(); $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.") .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>"; ."</p>";
} }
}

5
mod/invite.php
View file

@ -9,7 +9,6 @@
require_once('include/email.php'); require_once('include/email.php');
if(! function_exists('invite_post')) {
function invite_post(&$a) { function invite_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -94,9 +93,8 @@ function invite_post(&$a) {
notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL); notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
return; return;
} }
}
if(! function_exists('invite_content')) {
function invite_content(&$a) { function invite_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -144,4 +142,3 @@ function invite_content(&$a) {
return $o; return $o;
} }
}

13
mod/item.php
View file

@ -25,7 +25,6 @@ require_once('include/text.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/Scrape.php'); require_once('include/Scrape.php');
if(! function_exists('item_post')) {
function item_post(&$a) { function item_post(&$a) {
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
@ -1018,9 +1017,7 @@ function item_post(&$a) {
item_post_return($a->get_baseurl(), $api_source, $return_path); item_post_return($a->get_baseurl(), $api_source, $return_path);
// NOTREACHED // NOTREACHED
} }
}
if(! function_exists('item_post_return')) {
function item_post_return($baseurl, $api_source, $return_path) { function item_post_return($baseurl, $api_source, $return_path) {
// figure out how to return, depending on from whence we came // figure out how to return, depending on from whence we came
@ -1040,9 +1037,9 @@ function item_post_return($baseurl, $api_source, $return_path) {
echo json_encode($json); echo json_encode($json);
killme(); killme();
} }
}
if(! function_exists('item_content')) {
function item_content(&$a) { function item_content(&$a) {
if((! local_user()) && (! remote_user())) if((! local_user()) && (! remote_user()))
@ -1061,7 +1058,6 @@ function item_content(&$a) {
} }
return $o; return $o;
} }
}
/** /**
* This function removes the tag $tag from the text $body and replaces it with * This function removes the tag $tag from the text $body and replaces it with
@ -1075,7 +1071,6 @@ function item_content(&$a) {
* *
* @return boolean true if replaced, false if not replaced * @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 = "") { function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/socgraph.php"); require_once("include/socgraph.php");
@ -1250,9 +1245,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
return array('replaced' => $replaced, 'contact' => $r[0]); 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) { 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 // We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
@ -1290,4 +1284,3 @@ function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item,
return; return;
} }
}

7
mod/like.php
View file

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

7
mod/localtime.php
View file

@ -2,7 +2,7 @@
require_once('include/datetime.php'); require_once('include/datetime.php');
if(! function_exists('localtime_post')) {
function localtime_post(&$a) { function localtime_post(&$a) {
$t = $_REQUEST['time']; $t = $_REQUEST['time'];
@ -13,10 +13,9 @@ function localtime_post(&$a) {
if($_POST['timezone']) if($_POST['timezone'])
$a->data['mod-localtime'] = datetime_convert('UTC',$_POST['timezone'],$t,$bd_format); $a->data['mod-localtime'] = datetime_convert('UTC',$_POST['timezone'],$t,$bd_format);
}
} }
if(! function_exists('localtime_content')) {
function localtime_content(&$a) { function localtime_content(&$a) {
$t = $_REQUEST['time']; $t = $_REQUEST['time'];
if(! $t) if(! $t)
@ -46,5 +45,5 @@ function localtime_content(&$a) {
$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form>'; $o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form>';
return $o; return $o;
}
} }

4
mod/lockview.php
View file

@ -1,6 +1,6 @@
<?php <?php
if(! function_exists('lockview_content')) {
function lockview_content(&$a) { function lockview_content(&$a) {
$type = (($a->argc > 1) ? $a->argv[1] : 0); $type = (($a->argc > 1) ? $a->argv[1] : 0);
@ -86,5 +86,5 @@ function lockview_content(&$a) {
echo $o . implode(', ', $l); echo $o . implode(', ', $l);
killme(); killme();
}
} }

4
mod/login.php
View file

@ -1,5 +1,5 @@
<?php <?php
if(! function_exists('login_content')) {
function login_content(&$a) { function login_content(&$a) {
if(x($_SESSION,'theme')) if(x($_SESSION,'theme'))
unset($_SESSION['theme']); unset($_SESSION['theme']);
@ -9,5 +9,5 @@ function login_content(&$a) {
if(local_user()) if(local_user())
goaway(z_root()); goaway(z_root());
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); 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/enotify.php');
require_once('include/text.php'); require_once('include/text.php');
if(! function_exists('lostpass_post')) {
function lostpass_post(&$a) { function lostpass_post(&$a) {
$loginame = notags(trim($_POST['login-name'])); $loginame = notags(trim($_POST['login-name']));
@ -75,10 +74,10 @@ function lostpass_post(&$a) {
'body' => $body)); 'body' => $body));
goaway(z_root()); goaway(z_root());
}
} }
if(! function_exists('lostpass_content')) {
function lostpass_content(&$a) { function lostpass_content(&$a) {
@ -165,5 +164,5 @@ function lostpass_content(&$a) {
return $o; return $o;
} }
}
} }

3
mod/maintenance.php
View file

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

8
mod/manage.php
View file

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

2
mod/match.php
View file

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

13
mod/message.php
View file

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

4
mod/modexp.php
View file

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

8
mod/mood.php
View file

@ -4,7 +4,7 @@ require_once('include/security.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
require_once('include/items.php'); require_once('include/items.php');
if(! function_exists('mood_init')) {
function mood_init(&$a) { function mood_init(&$a) {
if(! local_user()) if(! local_user())
@ -105,9 +105,9 @@ function mood_init(&$a) {
return; return;
} }
}
if(! function_exists('mood_content')) {
function mood_content(&$a) { function mood_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -138,5 +138,5 @@ function mood_content(&$a) {
)); ));
return $o; return $o;
}
} }

3
mod/msearch.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('msearch_post')) {
function msearch_post(&$a) { function msearch_post(&$a) {
$perpage = (($_POST['n']) ? $_POST['n'] : 80); $perpage = (($_POST['n']) ? $_POST['n'] : 80);
@ -39,5 +38,5 @@ function msearch_post(&$a) {
echo json_encode($output); echo json_encode($output);
killme(); killme();
}
} }

3
mod/navigation.php
View file

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

17
mod/network.php
View file

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

2
mod/newmember.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('newmember_content')) {
function newmember_content(&$a) { function newmember_content(&$a) {
@ -83,4 +82,3 @@ function newmember_content(&$a) {
return $o; return $o;
} }
}

9
mod/nodeinfo.php
View file

@ -7,7 +7,6 @@
require_once("include/plugin.php"); require_once("include/plugin.php");
if(! function_exists('nodeinfo_wellknown')) {
function nodeinfo_wellknown(&$a) { function nodeinfo_wellknown(&$a) {
if (!get_config("system", "nodeinfo")) { if (!get_config("system", "nodeinfo")) {
http_status_exit(404); http_status_exit(404);
@ -20,9 +19,7 @@ function nodeinfo_wellknown(&$a) {
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit; exit;
} }
}
if(! function_exists('nodeinfo_init')) {
function nodeinfo_init(&$a){ function nodeinfo_init(&$a){
if (!get_config("system", "nodeinfo")) { if (!get_config("system", "nodeinfo")) {
http_status_exit(404); http_status_exit(404);
@ -146,9 +143,9 @@ function nodeinfo_init(&$a){
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
exit; exit;
} }
}
if(! function_exists('nodeinfo_cron')) {
function nodeinfo_cron() { function nodeinfo_cron() {
$a = get_app(); $a = get_app();
@ -263,5 +260,5 @@ function nodeinfo_cron() {
logger("cron_end"); logger("cron_end");
set_config('nodeinfo','last_calucation', time()); 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/socgraph.php');
require_once('include/contact_selectors.php'); require_once('include/contact_selectors.php');
if(! function_exists('nogroup_init')) {
function nogroup_init(&$a) { function nogroup_init(&$a) {
if(! local_user()) if(! local_user())
@ -18,9 +17,8 @@ function nogroup_init(&$a) {
$a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id); $a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id);
} }
}
if(! function_exists('nogroup_content')) {
function nogroup_content(&$a) { function nogroup_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -68,5 +66,5 @@ function nogroup_content(&$a) {
)); ));
return $o; return $o;
}
} }

3
mod/noscrape.php
View file

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

6
mod/notes.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('notes_init')) {
function notes_init(&$a) { function notes_init(&$a) {
if(! local_user()) if(! local_user())
@ -13,10 +12,10 @@ function notes_init(&$a) {
nav_set_selected('home'); nav_set_selected('home');
// profile_load($a,$which,$profile); // profile_load($a,$which,$profile);
}
} }
if(! function_exists('notes_content')) {
function notes_content(&$a,$update = false) { function notes_content(&$a,$update = false) {
if(! local_user()) { if(! local_user()) {
@ -136,4 +135,3 @@ function notes_content(&$a,$update = false) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }
}

7
mod/notice.php
View file

@ -1,8 +1,7 @@
<?php <?php
/* identi.ca -> friendica items permanent-url compatibility */ /* identi.ca -> friendica items permanent-url compatibility */
if(! function_exists('notice_init')) { function notice_init(&$a){
function notice_init(&$a) {
$id = $a->argv[1]; $id = $a->argv[1];
$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d", $r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
intval($id) intval($id)
@ -17,5 +16,5 @@ if(! function_exists('notice_init')) {
} }
return; 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/contact_selectors.php");
include_once("include/Scrape.php"); include_once("include/Scrape.php");
if(! function_exists('notifications_post')) {
function notifications_post(&$a) { function notifications_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -59,11 +58,11 @@ function notifications_post(&$a) {
} }
} }
} }
}
if(! function_exists('notifications_content')) {
function notifications_content(&$a) { function notifications_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -580,4 +579,3 @@ function notifications_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }
}

8
mod/notify.php
View file

@ -1,6 +1,6 @@
<?php <?php
if(! function_exists('notify_init')) {
function notify_init(&$a) { function notify_init(&$a) {
if(! local_user()) if(! local_user())
return; return;
@ -42,10 +42,10 @@ function notify_init(&$a) {
echo $j; echo $j;
killme(); killme();
} }
}
} }
if(! function_exists('notify_content')) {
function notify_content(&$a) { function notify_content(&$a) {
if(! local_user()) if(! local_user())
return login(); return login();
@ -80,5 +80,5 @@ function notify_content(&$a) {
return $o; return $o;
}
} }

4
mod/oembed.php
View file

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

9
mod/oexchange.php
View file

@ -1,6 +1,6 @@
<?php <?php
if(! function_exists('oexchange_init')) {
function oexchange_init(&$a) { function oexchange_init(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'xrd')) { if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
@ -11,10 +11,9 @@ function oexchange_init(&$a) {
killme(); killme();
} }
}
} }
if(! function_exists('oexchange_content')) {
function oexchange_content(&$a) { function oexchange_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -53,5 +52,7 @@ function oexchange_content(&$a) {
$_REQUEST = $post; $_REQUEST = $post;
require_once('mod/item.php'); require_once('mod/item.php');
item_post($a); item_post($a);
} }
}

4
mod/openid.php
View file

@ -1,8 +1,9 @@
<?php <?php
require_once('library/openid.php'); require_once('library/openid.php');
if(! function_exists('openid_content')) {
function openid_content(&$a) { function openid_content(&$a) {
$noid = get_config('system','no_openid'); $noid = get_config('system','no_openid');
@ -93,4 +94,3 @@ function openid_content(&$a) {
goaway(z_root()); goaway(z_root());
// NOTREACHED // NOTREACHED
} }
}

6
mod/opensearch.php
View file

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

2
mod/ostatus_subscribe.php
View file

@ -3,7 +3,6 @@
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/follow.php'); require_once('include/follow.php');
if(! function_exists('ostatus_subscribe_content')) {
function ostatus_subscribe_content(&$a) { function ostatus_subscribe_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -77,4 +76,3 @@ function ostatus_subscribe_content(&$a) {
return $o; 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"); require_once("include/diaspora.php");
if(! function_exists('p_init')) { function p_init($a){
function p_init($a) {
if ($a->argc != 2) { if ($a->argc != 2) {
header($_SERVER["SERVER_PROTOCOL"].' 510 '.t('Not Extended')); header($_SERVER["SERVER_PROTOCOL"].' 510 '.t('Not Extended'));
killme(); killme();
@ -80,4 +79,3 @@ function p_init($a) {
killme(); killme();
} }
}

10
mod/parse_url.php
View file

@ -27,7 +27,6 @@ if(!function_exists('deletenode')) {
} }
} }
if(! function_exists('completeurl')) {
function completeurl($url, $scheme) { function completeurl($url, $scheme) {
$urlarr = parse_url($url); $urlarr = parse_url($url);
@ -54,9 +53,7 @@ function completeurl($url, $scheme) {
return($complete); return($complete);
} }
}
if(! function_exists('parseurl_getsiteinfo_cached')) {
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) { function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
if ($url == "") if ($url == "")
@ -80,9 +77,7 @@ function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = tr
return $data; return $data;
} }
}
if(! function_exists('parseurl_getsiteinfo')) {
function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) { function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
require_once("include/network.php"); require_once("include/network.php");
require_once("include/Photo.php"); require_once("include/Photo.php");
@ -405,15 +400,11 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
return($siteinfo); return($siteinfo);
} }
}
if(! function_exists('arr_add_hashes')) {
function arr_add_hashes(&$item,$k) { function arr_add_hashes(&$item,$k) {
$item = '#' . $item; $item = '#' . $item;
} }
}
if(! function_exists('parse_url_content')) {
function parse_url_content(&$a) { function parse_url_content(&$a) {
$text = null; $text = null;
@ -567,5 +558,4 @@ function parse_url_content(&$a) {
killme(); killme();
} }
}
?> ?>

2
mod/photo.php
View file

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

11
mod/photos.php
View file

@ -9,7 +9,6 @@ require_once('include/redir.php');
require_once('include/tags.php'); require_once('include/tags.php');
require_once('include/threads.php'); require_once('include/threads.php');
if(! function_exists('photos_init')) {
function photos_init(&$a) { function photos_init(&$a) {
if($a->argc > 1) if($a->argc > 1)
@ -122,9 +121,9 @@ function photos_init(&$a) {
return; return;
} }
}
if(! function_exists('photos_post')) {
function photos_post(&$a) { function photos_post(&$a) {
logger('mod-photos: photos_post: begin' , LOGGER_DEBUG); logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
@ -958,9 +957,9 @@ function photos_post(&$a) {
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
}
if(! function_exists('photos_content')) {
function photos_content(&$a) { function photos_content(&$a) {
// URLs: // URLs:
@ -1907,4 +1906,4 @@ function photos_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }
}

4
mod/ping.php
View file

@ -5,7 +5,6 @@ require_once('include/ForumManager.php');
require_once('include/group.php'); require_once('include/group.php');
require_once("mod/proxy.php"); require_once("mod/proxy.php");
if(! function_exists('ping_init')) {
function ping_init(&$a) { function ping_init(&$a) {
header("Content-type: text/xml"); header("Content-type: text/xml");
@ -339,9 +338,7 @@ function ping_init(&$a) {
killme(); killme();
} }
}
if(! function_exists('ping_get_notifications')) {
function ping_get_notifications($uid) { function ping_get_notifications($uid) {
$result = array(); $result = array();
@ -413,4 +410,3 @@ function ping_get_notifications($uid) {
return($result); return($result);
} }
}

3
mod/poco.php
View file

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

8
mod/poke.php
View file

@ -18,7 +18,7 @@ require_once('include/security.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
require_once('include/items.php'); require_once('include/items.php');
if(! function_exists('poke_init')) {
function poke_init(&$a) { function poke_init(&$a) {
if(! local_user()) if(! local_user())
@ -140,9 +140,9 @@ function poke_init(&$a) {
return; return;
} }
}
if(! function_exists('poke_content')) {
function poke_content(&$a) { function poke_content(&$a) {
if(! local_user()) { if(! local_user()) {
@ -201,5 +201,5 @@ function poke_content(&$a) {
)); ));
return $o; return $o;
}
} }

3
mod/post.php
View file

@ -10,7 +10,6 @@ require_once('include/crypto.php');
// not yet ready for prime time // not yet ready for prime time
//require_once('include/zot.php'); //require_once('include/zot.php');
if(! function_exists('post_post')) {
function post_post(&$a) { function post_post(&$a) {
$bulk_delivery = false; $bulk_delivery = false;
@ -49,4 +48,4 @@ function post_post(&$a) {
http_status_exit(($ret) ? $ret : 200); http_status_exit(($ret) ? $ret : 200);
// NOTREACHED // NOTREACHED
} }
}

2
mod/pretheme.php
View file

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

2
mod/probe.php
View file

@ -2,7 +2,6 @@
require_once('include/Scrape.php'); require_once('include/Scrape.php');
if(! function_exists('probe_content')) {
function probe_content(&$a) { function probe_content(&$a) {
$o .= '<h3>Probe Diagnostic</h3>'; $o .= '<h3>Probe Diagnostic</h3>';
@ -23,4 +22,3 @@ function probe_content(&$a) {
} }
return $o; return $o;
} }
}

7
mod/profile.php
View file

@ -3,7 +3,7 @@
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
require_once('include/redir.php'); require_once('include/redir.php');
if(! function_exists('profile_init')) {
function profile_init(&$a) { function profile_init(&$a) {
if(! x($a->page,'aside')) if(! x($a->page,'aside'))
@ -65,10 +65,10 @@ function profile_init(&$a) {
foreach($dfrn_pages as $dfrn) 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-{$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"; $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) { function profile_content(&$a, $update = 0) {
$category = $datequery = $datequery2 = ''; $category = $datequery = $datequery2 = '';
@ -350,4 +350,3 @@ function profile_content(&$a, $update = 0) {
return $o; return $o;
} }
}

8
mod/profile_photo.php
View file

@ -2,7 +2,6 @@
require_once("include/Photo.php"); require_once("include/Photo.php");
if(! function_exists('profile_photo_init')) {
function profile_photo_init(&$a) { function profile_photo_init(&$a) {
if(! local_user()) { if(! local_user()) {
@ -10,10 +9,10 @@ function profile_photo_init(&$a) {
} }
profile_load($a,$a->user['nickname']); profile_load($a,$a->user['nickname']);
}
} }
if(! function_exists('profile_photo_post')) {
function profile_photo_post(&$a) { function profile_photo_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -165,7 +164,7 @@ function profile_photo_post(&$a) {
$ph->orient($src); $ph->orient($src);
@unlink($src); @unlink($src);
return profile_photo_crop_ui_head($a, $ph); return profile_photo_crop_ui_head($a, $ph);
}
} }
@ -324,3 +323,4 @@ function profile_photo_crop_ui_head(&$a, $ph){
$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array()); $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
return; return;
}} }}

14
mod/profiles.php
View file

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

8
mod/profperm.php
View file

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

16
mod/pubsub.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('hub_return')) {
function hub_return($valid,$body) { function hub_return($valid,$body) {
if($valid) { if($valid) {
@ -15,18 +14,18 @@ function hub_return($valid,$body) {
// NOTREACHED // NOTREACHED
} }
}
// when receiving an XML feed, always return OK // when receiving an XML feed, always return OK
if(! function_exists('hub_post_return')) {
function hub_post_return() { function hub_post_return() {
header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK'); header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
killme(); killme();
}
} }
if(! function_exists('pubsub_init')) {
function pubsub_init(&$a) { function pubsub_init(&$a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
@ -96,11 +95,9 @@ function pubsub_init(&$a) {
hub_return(true, $hub_challenge); hub_return(true, $hub_challenge);
} }
} }
}
require_once('include/security.php'); require_once('include/security.php');
if(! function_exists('pubsub_post')) {
function pubsub_post(&$a) { function pubsub_post(&$a) {
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');
@ -158,5 +155,8 @@ function pubsub_post(&$a) {
consume_feed($xml,$importer,$contact,$feedhub,1,2); consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return(); hub_post_return();
} }
}

5
mod/pubsubhubbub.php
View file

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

3
mod/qsearch.php
View file

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

3
mod/randprof.php
View file

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

4
mod/receive.php
View file

@ -9,7 +9,7 @@ require_once('include/salmon.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/diaspora.php'); require_once('include/diaspora.php');
if(! function_exists('receive_post')) {
function receive_post(&$a) { function receive_post(&$a) {
@ -73,4 +73,4 @@ function receive_post(&$a) {
http_status_exit(($ret) ? $ret : 200); http_status_exit(($ret) ? $ret : 200);
// NOTREACHED // NOTREACHED
} }
}

2
mod/redir.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('redir_init')) {
function redir_init(&$a) { function redir_init(&$a) {
$url = ((x($_GET,'url')) ? $_GET['url'] : ''); $url = ((x($_GET,'url')) ? $_GET['url'] : '');
@ -76,4 +75,3 @@ function redir_init(&$a) {
goaway(z_root()); goaway(z_root());
} }
}

9
mod/regmod.php
View file

@ -3,7 +3,6 @@
require_once('include/enotify.php'); require_once('include/enotify.php');
require_once('include/user.php'); require_once('include/user.php');
if(! function_exists('user_allow')) {
function user_allow($hash) { function user_allow($hash) {
$a = get_app(); $a = get_app();
@ -56,14 +55,14 @@ function user_allow($hash) {
info( t('Account approved.') . EOL ); info( t('Account approved.') . EOL );
return true; return true;
} }
}
} }
// This does not have to go through user_remove() and save the nickname // This does not have to go through user_remove() and save the nickname
// permanently against re-registration, as the person was not yet // permanently against re-registration, as the person was not yet
// allowed to have friends on this system // allowed to have friends on this system
if(! function_exists('user_deny')) {
function user_deny($hash) { function user_deny($hash) {
$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1", $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
@ -92,10 +91,9 @@ function user_deny($hash) {
); );
notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL); notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
return true; return true;
}
} }
if(! function_exists('regmod_content')) {
function regmod_content(&$a) { function regmod_content(&$a) {
global $lang; global $lang;
@ -133,4 +131,3 @@ function regmod_content(&$a) {
killme(); killme();
} }
} }
}

6
mod/removeme.php
View file

@ -1,6 +1,5 @@
<?php <?php
if(! function_exists('removeme_post')) {
function removeme_post(&$a) { function removeme_post(&$a) {
if(! local_user()) if(! local_user())
@ -25,10 +24,9 @@ function removeme_post(&$a) {
user_remove($a->user['uid']); user_remove($a->user['uid']);
// NOTREACHED // NOTREACHED
} }
}
} }
if(! function_exists('removeme_content')) {
function removeme_content(&$a) { function removeme_content(&$a) {
if(! local_user()) if(! local_user())
@ -52,5 +50,5 @@ function removeme_content(&$a) {
)); ));
return $o; return $o;
}
} }

2
mod/repair_ostatus.php
View file

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

4
mod/rsd_xml.php
View file

@ -1,6 +1,7 @@
<?php <?php
if(! function_exists('rsd_xml_content')) {
function rsd_xml_content(&$a) { function rsd_xml_content(&$a) {
header ("Content-Type: text/xml"); header ("Content-Type: text/xml");
echo '<?xml version="1.0" encoding="UTF-8"?> echo '<?xml version="1.0" encoding="UTF-8"?>
@ -21,4 +22,3 @@ function rsd_xml_content(&$a) {
'; ';
die(); die();
} }
}

5
mod/salmon.php
View file

@ -6,7 +6,6 @@ require_once('include/crypto.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/follow.php'); require_once('include/follow.php');
if(! function_exists('salmon_return')) {
function salmon_return($val) { function salmon_return($val) {
if($val >= 400) if($val >= 400)
@ -17,10 +16,9 @@ function salmon_return($val) {
logger('mod-salmon returns ' . $val); logger('mod-salmon returns ' . $val);
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err); header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
killme(); killme();
}
} }
if(! function_exists('salmon_post')) {
function salmon_post(&$a) { function salmon_post(&$a) {
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');
@ -187,4 +185,3 @@ function salmon_post(&$a) {
http_status_exit(200); http_status_exit(200);
} }
}

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