mirror of https://github.com/friendica/friendica
Merge pull request #4171 from MrPetovan/task/fix-scrutinizer-issues
[Scrutinizer] Fix issues in mod/ (_well_known to contactgroup)
This commit is contained in:
Michael Vogel
GitHub
commit
045a0b2a00
|
|
@ -488,16 +488,16 @@ function get_first_dim($y,$m) {
|
|||
*
|
||||
* @param int $y Year
|
||||
* @param int $m Month
|
||||
* @param bool $links (default false)
|
||||
* @param array $links (default null)
|
||||
* @param string $class
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
* @todo Provide (prev,next) links, define class variations for different size calendars
|
||||
*/
|
||||
function cal($y = 0,$m = 0, $links = false, $class='') {
|
||||
function cal($y = 0, $m = 0, $links = null, $class = '')
|
||||
{
|
||||
// month table - start at 1 to match human usage.
|
||||
|
||||
$mtab = array(' ',
|
||||
'January', 'February', 'March',
|
||||
'April' , 'May' , 'June',
|
||||
|
|
@ -510,6 +510,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
|
|||
if (!$y) {
|
||||
$y = $thisyear;
|
||||
}
|
||||
|
||||
if (!$m) {
|
||||
$m = intval($thismonth);
|
||||
}
|
||||
|
|
@ -543,7 +544,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
|
|||
$o .= "<td $today>";
|
||||
$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
|
||||
if ($started) {
|
||||
if (is_array($links) && isset($links[$d])) {
|
||||
if (x($links, $d) !== false) {
|
||||
$o .= "<a href=\"{$links[$d]}\">$day</a>";
|
||||
} else {
|
||||
$o .= $day;
|
||||
|
|
|
|||
|
|
@ -507,10 +507,10 @@ function event_remove_duplicates($dates) {
|
|||
/**
|
||||
* @brief Get an event by its event ID.
|
||||
*
|
||||
* @param type $owner_uid The User ID of the owner of the event
|
||||
* @param type $event_params An assoziative array with
|
||||
* @param int $owner_uid The User ID of the owner of the event
|
||||
* @param array $event_params An assoziative array with
|
||||
* int 'event_id' => The ID of the event in the event table
|
||||
* @param type $sql_extra
|
||||
* @param string $sql_extra
|
||||
* @return array Query result
|
||||
*/
|
||||
function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
|
||||
|
|
|
|||
|
|
@ -907,12 +907,17 @@ function profile_tabs($a, $is_owner = false, $nickname = null)
|
|||
return replace_macros($tpl, array('$tabs' => $arr['tabs']));
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the my_url session variable
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function get_my_url()
|
||||
{
|
||||
if (x($_SESSION, 'my_url')) {
|
||||
return $_SESSION['my_url'];
|
||||
}
|
||||
return false;
|
||||
return null;
|
||||
}
|
||||
|
||||
function zrl_init(App $a)
|
||||
|
|
|
|||
|
|
@ -7,14 +7,15 @@ require_once("mod/hostxrd.php");
|
|||
require_once("mod/nodeinfo.php");
|
||||
require_once("mod/xrd.php");
|
||||
|
||||
function _well_known_init(App $a) {
|
||||
function _well_known_init(App $a)
|
||||
{
|
||||
if ($a->argc > 1) {
|
||||
switch ($a->argv[1]) {
|
||||
case "host-meta":
|
||||
hostxrd_init($a);
|
||||
break;
|
||||
case "x-social-relay":
|
||||
wk_social_relay($a);
|
||||
wk_social_relay();
|
||||
break;
|
||||
case "nodeinfo":
|
||||
nodeinfo_wellknown($a);
|
||||
|
|
@ -28,8 +29,8 @@ function _well_known_init(App $a) {
|
|||
killme();
|
||||
}
|
||||
|
||||
function wk_social_relay(App $a) {
|
||||
|
||||
function wk_social_relay()
|
||||
{
|
||||
$subscribe = (bool) Config::get('system', 'relay_subscribe', false);
|
||||
|
||||
if ($subscribe) {
|
||||
|
|
@ -63,9 +64,11 @@ function wk_social_relay(App $a) {
|
|||
$taglist[] = $tag;
|
||||
}
|
||||
|
||||
$relay = array("subscribe" => $subscribe,
|
||||
$relay = array(
|
||||
"subscribe" => $subscribe,
|
||||
"scope" => $scope,
|
||||
"tags" => $taglist);
|
||||
"tags" => $taglist
|
||||
);
|
||||
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
echo json_encode($relay, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
use Friendica\App;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
function acctlink_init(App $a) {
|
||||
|
||||
function acctlink_init()
|
||||
{
|
||||
if (x($_GET, 'addr')) {
|
||||
$addr = trim($_GET['addr']);
|
||||
$res = Probe::uri($addr);
|
||||
//logger('acctlink: ' . print_r($res,true));
|
||||
if ($res['url']) {
|
||||
goaway($res['url']);
|
||||
killme();
|
||||
|
|
|
|||
169
mod/admin.php
169
mod/admin.php
|
|
@ -44,7 +44,7 @@ function admin_post(App $a)
|
|||
return;
|
||||
}
|
||||
|
||||
// urls
|
||||
$return_path = 'admin';
|
||||
if ($a->argc > 1) {
|
||||
switch ($a->argv[1]) {
|
||||
case 'site':
|
||||
|
|
@ -62,8 +62,7 @@ function admin_post(App $a)
|
|||
$func($a);
|
||||
}
|
||||
}
|
||||
goaway('admin/plugins/' . $a->argv[2]);
|
||||
return; // NOTREACHED
|
||||
$return_path = 'admin/plugins/' . $a->argv[2];
|
||||
break;
|
||||
case 'themes':
|
||||
if ($a->argc < 2) {
|
||||
|
|
@ -76,38 +75,31 @@ function admin_post(App $a)
|
|||
|
||||
$theme = $a->argv[2];
|
||||
if (is_file("view/theme/$theme/config.php")) {
|
||||
|
||||
function __call_theme_admin_post(App $a, $theme)
|
||||
{
|
||||
$orig_theme = $a->theme;
|
||||
$orig_page = $a->page;
|
||||
$orig_session_theme = $_SESSION['theme'];
|
||||
require_once("view/theme/$theme/theme.php");
|
||||
require_once("view/theme/$theme/config.php");
|
||||
require_once "view/theme/$theme/theme.php";
|
||||
require_once "view/theme/$theme/config.php";
|
||||
$_SESSION['theme'] = $theme;
|
||||
|
||||
|
||||
$init = $theme . "_init";
|
||||
$init = $theme . '_init';
|
||||
if (function_exists($init)) {
|
||||
$init($a);
|
||||
}
|
||||
if (function_exists("theme_admin_post")) {
|
||||
$admin_form = theme_admin_post($a);
|
||||
if (function_exists('theme_admin_post')) {
|
||||
theme_admin_post($a);
|
||||
}
|
||||
|
||||
$_SESSION['theme'] = $orig_session_theme;
|
||||
$a->theme = $orig_theme;
|
||||
$a->page = $orig_page;
|
||||
return $admin_form;
|
||||
}
|
||||
__call_theme_admin_post($a, $theme);
|
||||
}
|
||||
|
||||
info(t('Theme settings updated.'));
|
||||
if (is_ajax()) {
|
||||
return;
|
||||
}
|
||||
goaway('admin/themes/' . $theme);
|
||||
return;
|
||||
$return_path = 'admin/themes/' . $theme;
|
||||
break;
|
||||
case 'features':
|
||||
admin_page_features_post($a);
|
||||
|
|
@ -115,9 +107,6 @@ function admin_post(App $a)
|
|||
case 'logs':
|
||||
admin_page_logs_post($a);
|
||||
break;
|
||||
case 'dbsync':
|
||||
admin_page_dbsync_post($a);
|
||||
break;
|
||||
case 'contactblock':
|
||||
admin_page_contactblock_post($a);
|
||||
break;
|
||||
|
|
@ -130,7 +119,7 @@ function admin_post(App $a)
|
|||
}
|
||||
}
|
||||
|
||||
goaway('admin');
|
||||
goaway($return_path);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
|
@ -652,7 +641,7 @@ function admin_page_federation(App $a)
|
|||
'$autoactive' => Config::get('system', 'poco_completion'),
|
||||
'$counts' => $counts,
|
||||
'$version' => FRIENDICA_VERSION,
|
||||
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes with %d registered users from the following platforms:'), $total, $users),
|
||||
'$legendtext' => t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
}
|
||||
|
|
@ -682,7 +671,7 @@ function admin_page_queue(App $a)
|
|||
return replace_macros($t, array(
|
||||
'$title' => t('Administration'),
|
||||
'$page' => t('Inspect Queue'),
|
||||
'$count' => sizeof($r),
|
||||
'$count' => count($r),
|
||||
'id_header' => t('ID'),
|
||||
'$to_header' => t('Recipient Name'),
|
||||
'$url_header' => t('Recipient Profile'),
|
||||
|
|
@ -713,14 +702,14 @@ function admin_page_summary(App $a)
|
|||
$warningtext = array();
|
||||
if (DBM::is_result($r)) {
|
||||
$showwarning = true;
|
||||
$warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php scripts/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
|
||||
$warningtext[] = t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php scripts/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
|
||||
}
|
||||
// Check if github.com/friendica/master/VERSION is higher then
|
||||
// the local version of Friendica. Check is opt-in, source may be master or devel branch
|
||||
if (Config::get('system', 'check_new_version_url', 'none') != 'none') {
|
||||
$gitversion = Config::get('system', 'git_friendica_version');
|
||||
if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {
|
||||
$warningtext[] = sprintf(t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s'), $FRIENDICA_VERSION, $gitversion);
|
||||
$warningtext[] = t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion);
|
||||
$showwarning = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -739,7 +728,7 @@ function admin_page_summary(App $a)
|
|||
$warningtext[] = t('The worker was never executed. Please check your database structure!');
|
||||
} elseif ((strtotime(datetime_convert()) - strtotime($last_worker_call)) > 60 * 60) {
|
||||
$showwarning = true;
|
||||
$warningtext[] = sprintf(t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.'), $last_worker_call);
|
||||
$warningtext[] = t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
|
||||
}
|
||||
|
||||
$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
|
||||
|
|
@ -817,7 +806,7 @@ function admin_page_site_post(App $a)
|
|||
$new_url = rtrim($new_url, "/");
|
||||
|
||||
$parsed = @parse_url($new_url);
|
||||
if (!$parsed || (!x($parsed, 'host') || !x($parsed, 'scheme'))) {
|
||||
if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
|
||||
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
|
||||
goaway('admin/site');
|
||||
}
|
||||
|
|
@ -847,11 +836,8 @@ function admin_page_site_post(App $a)
|
|||
|
||||
$upds = implode(", ", $upd);
|
||||
|
||||
|
||||
|
||||
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
|
||||
$r = q($q);
|
||||
if (!$r) {
|
||||
$r = q("UPDATE %s SET %s;", $table_name, $upds);
|
||||
if (!DBM::is_result($r)) {
|
||||
notice("Failed updating '$table_name': " . dba::errorMessage());
|
||||
goaway('admin/site');
|
||||
}
|
||||
|
|
@ -1151,8 +1137,7 @@ function admin_page_site(App $a)
|
|||
$theme_choices_mobile = array();
|
||||
$theme_choices_mobile["---"] = t("No special theme for mobile devices");
|
||||
$files = glob('view/theme/*');
|
||||
if ($files) {
|
||||
|
||||
if (is_array($files)) {
|
||||
$allowed_theme_list = Config::get('system', 'allowed_themes');
|
||||
|
||||
foreach ($files as $file) {
|
||||
|
|
@ -1185,16 +1170,6 @@ function admin_page_site(App $a)
|
|||
CP_USERS_AND_GLOBAL => t("Public postings from local users and the federated network")
|
||||
);
|
||||
|
||||
/* OStatus conversation poll choices */
|
||||
$ostatus_poll_choices = array(
|
||||
"-2" => t("Never"),
|
||||
"-1" => t("At post arrival"),
|
||||
"0" => t("Frequently"),
|
||||
"60" => t("Hourly"),
|
||||
"720" => t("Twice daily"),
|
||||
"1440" => t("Daily")
|
||||
);
|
||||
|
||||
$poco_discovery_choices = array(
|
||||
"0" => t("Disabled"),
|
||||
"1" => t("Users"),
|
||||
|
|
@ -1288,7 +1263,7 @@ function admin_page_site(App $a)
|
|||
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
|
||||
'$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")),
|
||||
'$touch_icon' => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
|
||||
'$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/servers.'), get_server())),
|
||||
'$info' => array('info', t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())),
|
||||
'$language' => array('language', t("System language"), Config::get('system','language'), "", $lang_choices),
|
||||
'$theme' => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
|
||||
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
|
||||
|
|
@ -1363,7 +1338,7 @@ function admin_page_site(App $a)
|
|||
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), Config::get('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
|
||||
'$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")),
|
||||
'$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), Config::get('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")),
|
||||
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), Config::get('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), System::baseUrl())),
|
||||
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), Config::get('system','frontend_worker'), t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())),
|
||||
|
||||
'$form_security_token' => get_form_security_token("admin_site")
|
||||
));
|
||||
|
|
@ -1397,11 +1372,11 @@ function admin_page_dbsync(App $a)
|
|||
|
||||
if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
|
||||
$retval = DBStructure::update(false, true);
|
||||
if (!$retval) {
|
||||
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION) . "<br />";
|
||||
if ($retval === '') {
|
||||
$o .= t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";
|
||||
Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
|
||||
} else {
|
||||
$o .= sprintf(t("Executing of database structure update %s failed with error: %s"), DB_UPDATE_VERSION, $retval) . "<br />";
|
||||
$o .= t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";
|
||||
}
|
||||
if ($a->argv[2] === 'check') {
|
||||
return $o;
|
||||
|
|
@ -1414,15 +1389,15 @@ function admin_page_dbsync(App $a)
|
|||
if (function_exists($func)) {
|
||||
$retval = $func();
|
||||
if ($retval === UPDATE_FAILED) {
|
||||
$o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
|
||||
$o .= t("Executing %s failed with error: %s", $func, $retval);
|
||||
} elseif ($retval === UPDATE_SUCCESS) {
|
||||
$o .= sprintf(t('Update %s was successfully applied.', $func));
|
||||
$o .= t('Update %s was successfully applied.', $func);
|
||||
Config::set('database', $func, 'success');
|
||||
} else {
|
||||
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
|
||||
$o .= t('Update %s did not return a status. Unknown if it succeeded.', $func);
|
||||
}
|
||||
} else {
|
||||
$o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func) . "<br />";
|
||||
$o .= t('There was no additional update function %s that needed to be called.', $func) . "<br />";
|
||||
Config::set('database', $func, 'success');
|
||||
}
|
||||
return $o;
|
||||
|
|
@ -1466,11 +1441,11 @@ function admin_page_dbsync(App $a)
|
|||
*/
|
||||
function admin_page_users_post(App $a)
|
||||
{
|
||||
$pending = (x($_POST, 'pending') ? $_POST['pending'] : array());
|
||||
$users = (x($_POST, 'user') ? $_POST['user'] : array());
|
||||
$nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
|
||||
$nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
|
||||
$nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
|
||||
$pending = defaults($_POST, 'pending' , array());
|
||||
$users = defaults($_POST, 'user' , array());
|
||||
$nu_name = defaults($_POST, 'new_user_name' , '');
|
||||
$nu_nickname = defaults($_POST, 'new_user_nickname', '');
|
||||
$nu_email = defaults($_POST, 'new_user_email' , '');
|
||||
$nu_language = Config::get('system', 'language');
|
||||
|
||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
|
||||
|
|
@ -1525,7 +1500,7 @@ function admin_page_users_post(App $a)
|
|||
notification(array(
|
||||
'type' => SYSTEM_EMAIL,
|
||||
'to_email' => $user['email'],
|
||||
'subject' => sprintf(t('Registration details for %s'), $a->config['sitename']),
|
||||
'subject' => t('Registration details for %s', $a->config['sitename']),
|
||||
'preamble' => $preamble,
|
||||
'body' => $body));
|
||||
}
|
||||
|
|
@ -1535,23 +1510,23 @@ function admin_page_users_post(App $a)
|
|||
q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid)
|
||||
);
|
||||
}
|
||||
notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
|
||||
notice(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)));
|
||||
}
|
||||
if (x($_POST, 'page_users_delete')) {
|
||||
foreach ($users as $uid) {
|
||||
User::remove($uid);
|
||||
}
|
||||
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
|
||||
notice(tt("%s user deleted", "%s users deleted", count($users)));
|
||||
}
|
||||
|
||||
if (x($_POST, 'page_users_approve')) {
|
||||
require_once("mod/regmod.php");
|
||||
require_once "mod/regmod.php";
|
||||
foreach ($pending as $hash) {
|
||||
user_allow($hash);
|
||||
}
|
||||
}
|
||||
if (x($_POST, 'page_users_deny')) {
|
||||
require_once("mod/regmod.php");
|
||||
require_once "mod/regmod.php";
|
||||
foreach ($pending as $hash) {
|
||||
user_deny($hash);
|
||||
}
|
||||
|
|
@ -1588,11 +1563,13 @@ function admin_page_users(App $a)
|
|||
// delete user
|
||||
User::remove($uid);
|
||||
|
||||
notice(sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
|
||||
notice(t("User '%s' deleted", $user[0]['username']) . EOL);
|
||||
break;
|
||||
case "block":
|
||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
||||
q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s", intval(1 - $user[0]['blocked']), intval($uid)
|
||||
q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
|
||||
intval(1 - $user[0]['blocked']),
|
||||
intval($uid)
|
||||
);
|
||||
notice(sprintf(($user[0]['blocked'] ? t("User '%s' unblocked") : t("User '%s' blocked")), $user[0]['username']) . EOL);
|
||||
break;
|
||||
|
|
@ -1637,9 +1614,6 @@ function admin_page_users(App $a)
|
|||
if (in_array($new_order, $valid_orders)) {
|
||||
$order = $new_order;
|
||||
}
|
||||
if (x($_GET, 'd')) {
|
||||
$new_direction = $_GET['d'];
|
||||
}
|
||||
}
|
||||
$sql_order = "`" . str_replace('.', '`.`', $order) . "`";
|
||||
$sql_order_direction = ($order_direction === "+") ? "ASC" : "DESC";
|
||||
|
|
@ -1783,11 +1757,11 @@ function admin_page_plugins(App $a)
|
|||
if ($idx !== false) {
|
||||
unset($a->plugins[$idx]);
|
||||
uninstall_plugin($plugin);
|
||||
info(sprintf(t("Plugin %s disabled."), $plugin));
|
||||
info(t("Plugin %s disabled.", $plugin));
|
||||
} else {
|
||||
$a->plugins[] = $plugin;
|
||||
install_plugin($plugin);
|
||||
info(sprintf(t("Plugin %s enabled."), $plugin));
|
||||
info(t("Plugin %s enabled.", $plugin));
|
||||
}
|
||||
Config::set("system", "addon", implode(", ", $a->plugins));
|
||||
goaway('admin/plugins');
|
||||
|
|
@ -1795,8 +1769,6 @@ function admin_page_plugins(App $a)
|
|||
}
|
||||
|
||||
// display plugin details
|
||||
require_once('library/markdown.php');
|
||||
|
||||
if (in_array($plugin, $a->plugins)) {
|
||||
$status = "on";
|
||||
$action = t("Disable");
|
||||
|
|
@ -1807,6 +1779,7 @@ function admin_page_plugins(App $a)
|
|||
|
||||
$readme = Null;
|
||||
if (is_file("addon/$plugin/README.md")) {
|
||||
require_once 'library/markdown.php';
|
||||
$readme = file_get_contents("addon/$plugin/README.md");
|
||||
$readme = Markdown($readme, false);
|
||||
} elseif (is_file("addon/$plugin/README")) {
|
||||
|
|
@ -1814,7 +1787,7 @@ function admin_page_plugins(App $a)
|
|||
}
|
||||
|
||||
$admin_form = "";
|
||||
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
|
||||
if (in_array($plugin, $a->plugins_admin)) {
|
||||
@require_once("addon/$plugin/$plugin.php");
|
||||
$func = $plugin . '_plugin_admin';
|
||||
$func($a, $admin_form);
|
||||
|
|
@ -1857,7 +1830,7 @@ function admin_page_plugins(App $a)
|
|||
|
||||
$plugins = array();
|
||||
$files = glob("addon/*/");
|
||||
if ($files) {
|
||||
if (is_array($files)) {
|
||||
foreach ($files as $file) {
|
||||
if (is_dir($file)) {
|
||||
list($tmp, $id) = array_map("trim", explode("/", $file));
|
||||
|
|
@ -1891,7 +1864,7 @@ function admin_page_plugins(App $a)
|
|||
'$function' => 'plugins',
|
||||
'$plugins' => $plugins,
|
||||
'$pcount' => count($plugins),
|
||||
'$noplugshint' => sprintf(t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s'), 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
|
||||
'$noplugshint' => t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
|
||||
'$form_security_token' => get_form_security_token("admin_themes"),
|
||||
));
|
||||
}
|
||||
|
|
@ -1903,7 +1876,8 @@ function admin_page_plugins(App $a)
|
|||
*/
|
||||
function toggle_theme(&$themes, $th, &$result)
|
||||
{
|
||||
for ($x = 0; $x < count($themes); $x ++) {
|
||||
$count = count($themes);
|
||||
for ($x = 0; $x < $count; $x ++) {
|
||||
if ($themes[$x]['name'] === $th) {
|
||||
if ($themes[$x]['allowed']) {
|
||||
$themes[$x]['allowed'] = 0;
|
||||
|
|
@ -1923,7 +1897,8 @@ function toggle_theme(&$themes, $th, &$result)
|
|||
*/
|
||||
function theme_status($themes, $th)
|
||||
{
|
||||
for ($x = 0; $x < count($themes); $x ++) {
|
||||
$count = count($themes);
|
||||
for ($x = 0; $x < $count; $x ++) {
|
||||
if ($themes[$x]['name'] === $th) {
|
||||
if ($themes[$x]['allowed']) {
|
||||
return 1;
|
||||
|
|
@ -1986,7 +1961,7 @@ function admin_page_themes(App $a)
|
|||
|
||||
$themes = array();
|
||||
$files = glob('view/theme/*');
|
||||
if ($files) {
|
||||
if (is_array($files)) {
|
||||
foreach ($files as $file) {
|
||||
$f = basename($file);
|
||||
|
||||
|
|
@ -2045,8 +2020,6 @@ function admin_page_themes(App $a)
|
|||
}
|
||||
|
||||
// display theme details
|
||||
require_once 'library/markdown.php';
|
||||
|
||||
if (theme_status($themes, $theme)) {
|
||||
$status = "on";
|
||||
$action = t("Disable");
|
||||
|
|
@ -2055,41 +2028,36 @@ function admin_page_themes(App $a)
|
|||
$action = t("Enable");
|
||||
}
|
||||
|
||||
$readme = Null;
|
||||
$readme = null;
|
||||
if (is_file("view/theme/$theme/README.md")) {
|
||||
require_once 'library/markdown.php';
|
||||
$readme = file_get_contents("view/theme/$theme/README.md");
|
||||
$readme = Markdown($readme, false);
|
||||
} elseif (is_file("view/theme/$theme/README")) {
|
||||
$readme = "<pre>" . file_get_contents("view/theme/$theme/README") . "</pre>";
|
||||
}
|
||||
|
||||
$admin_form = "";
|
||||
$admin_form = '';
|
||||
if (is_file("view/theme/$theme/config.php")) {
|
||||
|
||||
function __get_theme_admin_form(App $a, $theme)
|
||||
{
|
||||
$orig_theme = $a->theme;
|
||||
$orig_page = $a->page;
|
||||
$orig_session_theme = $_SESSION['theme'];
|
||||
require_once("view/theme/$theme/theme.php");
|
||||
require_once("view/theme/$theme/config.php");
|
||||
require_once "view/theme/$theme/theme.php";
|
||||
require_once "view/theme/$theme/config.php";
|
||||
$_SESSION['theme'] = $theme;
|
||||
|
||||
|
||||
$init = $theme . "_init";
|
||||
if (function_exists($init)) {
|
||||
$init($a);
|
||||
}
|
||||
if (function_exists("theme_admin")) {
|
||||
|
||||
if (function_exists('theme_admin')) {
|
||||
$admin_form = theme_admin($a);
|
||||
}
|
||||
|
||||
$_SESSION['theme'] = $orig_session_theme;
|
||||
$a->theme = $orig_theme;
|
||||
$a->page = $orig_page;
|
||||
return $admin_form;
|
||||
}
|
||||
$admin_form = __get_theme_admin_form($a, $theme);
|
||||
}
|
||||
|
||||
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
|
||||
|
|
@ -2123,14 +2091,12 @@ function admin_page_themes(App $a)
|
|||
// reload active themes
|
||||
if (x($_GET, "a") && $_GET['a'] == "r") {
|
||||
check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
|
||||
if ($themes) {
|
||||
foreach ($themes as $th) {
|
||||
if ($th['allowed']) {
|
||||
uninstall_theme($th['name']);
|
||||
install_theme($th['name']);
|
||||
}
|
||||
}
|
||||
}
|
||||
info("Themes reloaded");
|
||||
goaway(System::baseUrl() . '/admin/themes');
|
||||
}
|
||||
|
|
@ -2139,11 +2105,9 @@ function admin_page_themes(App $a)
|
|||
* List themes
|
||||
*/
|
||||
|
||||
$xthemes = array();
|
||||
if ($themes) {
|
||||
$plugins = array();
|
||||
foreach ($themes as $th) {
|
||||
$xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
||||
}
|
||||
$plugins[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
||||
}
|
||||
|
||||
$t = get_markup_template('admin/plugins.tpl');
|
||||
|
|
@ -2154,9 +2118,9 @@ function admin_page_themes(App $a)
|
|||
'$reload' => t('Reload active themes'),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$function' => 'themes',
|
||||
'$plugins' => $xthemes,
|
||||
'$plugins' => $plugins,
|
||||
'$pcount' => count($themes),
|
||||
'$noplugshint' => sprintf(t('No themes found on the system. They should be paced in %1$s'),'<code>/view/themes</code>'),
|
||||
'$noplugshint' => t('No themes found on the system. They should be placed in %1$s', '<code>/view/themes</code>'),
|
||||
'$experimental' => t('[Experimental]'),
|
||||
'$unsupported' => t('[Unsupported]'),
|
||||
'$form_security_token' => get_form_security_token("admin_themes"),
|
||||
|
|
@ -2307,7 +2271,6 @@ function admin_page_features_post(App $a)
|
|||
|
||||
logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
|
||||
|
||||
$arr = array();
|
||||
$features = Feature::get(false);
|
||||
|
||||
foreach ($features as $fname => $fdata) {
|
||||
|
|
@ -2362,13 +2325,13 @@ function admin_page_features(App $a)
|
|||
$set = Config::get('feature', $f[0], $f[3]);
|
||||
$arr[$fname][1][] = array(
|
||||
array('feature_' . $f[0], $f[1], $set, $f[2], array(t('Off'), t('On'))),
|
||||
array('featurelock_' . $f[0], sprintf(t('Lock feature %s'), $f[1]), (($f[4] !== false) ? "1" : ''), '', array(t('Off'), t('On')))
|
||||
array('featurelock_' . $f[0], t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', array(t('Off'), t('On')))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('admin/settings_features.tpl');
|
||||
$o .= replace_macros($tpl, array(
|
||||
$o = replace_macros($tpl, array(
|
||||
'$form_security_token' => get_form_security_token("admin_manage_features"),
|
||||
'$title' => t('Manage Additional Features'),
|
||||
'$features' => $arr,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file mod/allfriends.php
|
||||
*/
|
||||
|
|
@ -11,14 +12,15 @@ use Friendica\Model\GContact;
|
|||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
function allfriends_content(App $a) {
|
||||
|
||||
function allfriends_content(App $a)
|
||||
{
|
||||
$o = '';
|
||||
if (!local_user()) {
|
||||
notice(t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$cid = 0;
|
||||
if ($a->argc > 1) {
|
||||
$cid = intval($a->argv[1]);
|
||||
}
|
||||
|
|
@ -43,11 +45,9 @@ function allfriends_content(App $a) {
|
|||
|
||||
$total = GContact::countAllFriends(local_user(), $cid);
|
||||
|
||||
if(count($total))
|
||||
$a->set_pager_total($total);
|
||||
|
||||
$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
|
||||
if (!DBM::is_result($r)) {
|
||||
$o .= t('No friends to display.');
|
||||
return $o;
|
||||
|
|
@ -55,20 +55,20 @@ function allfriends_content(App $a) {
|
|||
|
||||
$id = 0;
|
||||
|
||||
$entries = [];
|
||||
foreach ($r as $rr) {
|
||||
|
||||
//get further details of the contact
|
||||
$contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
|
||||
|
||||
$photo_menu = '';
|
||||
|
||||
$connlnk = '';
|
||||
// $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
|
||||
// If the contact is not common to the user, Connect/Follow' will be added to the photo menu
|
||||
if ($rr[cid]) {
|
||||
$rr[id] = $rr[cid];
|
||||
if ($rr['cid']) {
|
||||
$rr['id'] = $rr['cid'];
|
||||
$photo_menu = Contact::photoMenu($rr);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
|
||||
$photo_menu = array(
|
||||
'profile' => array(t("View Profile"), zrl($rr['url'])),
|
||||
|
|
@ -78,7 +78,7 @@ function allfriends_content(App $a) {
|
|||
|
||||
$entry = array(
|
||||
'url' => $rr['url'],
|
||||
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
||||
'itemurl' => defaults($contact_details, 'addr', $rr['url']),
|
||||
'name' => htmlentities($contact_details['name']),
|
||||
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
|
||||
'img_hover' => htmlentities($contact_details['name']),
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
use Friendica\App;
|
||||
|
||||
function amcd_content(App $a) {
|
||||
function amcd_content()
|
||||
{
|
||||
echo <<< JSON
|
||||
{
|
||||
"version":1,
|
||||
|
|
|
|||
|
|
@ -7,12 +7,14 @@ require_once 'library/markdown.php';
|
|||
require_once 'include/bb2diaspora.php';
|
||||
require_once 'include/html2bbcode.php';
|
||||
|
||||
function visible_lf($s) {
|
||||
function visible_lf($s)
|
||||
{
|
||||
return str_replace("\n", '<br />', $s);
|
||||
}
|
||||
|
||||
function babel_content(App $a) {
|
||||
$o .= '<h1>Babel Diagnostic</h1>';
|
||||
function babel_content()
|
||||
{
|
||||
$o = '<h1>Babel Diagnostic</h1>';
|
||||
|
||||
$o .= '<form action="babel" method="post">';
|
||||
$o .= t('Source (bbcode) text:') . EOL;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use Friendica\Module\Login;
|
|||
require_once('include/conversation.php');
|
||||
require_once('include/items.php');
|
||||
|
||||
function bookmarklet_init(App $a)
|
||||
function bookmarklet_init()
|
||||
{
|
||||
$_GET["mode"] = "minimal";
|
||||
}
|
||||
|
|
|
|||
109
mod/cal.php
109
mod/cal.php
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file mod/cal.php
|
||||
* @brief The calendar module
|
||||
|
|
@ -17,9 +18,11 @@ use Friendica\Model\Group;
|
|||
require_once 'include/event.php';
|
||||
require_once 'include/redir.php';
|
||||
|
||||
function cal_init(App $a) {
|
||||
if($a->argc > 1)
|
||||
function cal_init(App $a)
|
||||
{
|
||||
if ($a->argc > 1) {
|
||||
auto_redir($a, $a->argv[1]);
|
||||
}
|
||||
|
||||
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
|
||||
return;
|
||||
|
|
@ -27,24 +30,24 @@ function cal_init(App $a) {
|
|||
|
||||
nav_set_selected('events');
|
||||
|
||||
$o = '';
|
||||
|
||||
if ($a->argc > 1) {
|
||||
$nick = $a->argv[1];
|
||||
$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
||||
dbesc($nick)
|
||||
);
|
||||
|
||||
if(! count($user))
|
||||
if (!count($user)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$a->data['user'] = $user[0];
|
||||
$a->profile_uid = $user[0]['uid'];
|
||||
|
||||
// if it's a json request abort here becaus we don't
|
||||
// need the widget data
|
||||
if ($a->argv[2] === 'json')
|
||||
if ($a->argv[2] === 'json') {
|
||||
return;
|
||||
}
|
||||
|
||||
$profile = get_profiledata_by_nick($nick, $a->profile_uid);
|
||||
|
||||
|
|
@ -52,7 +55,7 @@ function cal_init(App $a) {
|
|||
|
||||
$tpl = get_markup_template("vcard-widget.tpl");
|
||||
|
||||
$vcard_widget .= replace_macros($tpl, array(
|
||||
$vcard_widget = replace_macros($tpl, array(
|
||||
'$name' => $profile['name'],
|
||||
'$photo' => $profile['photo'],
|
||||
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
|
||||
|
|
@ -62,8 +65,9 @@ function cal_init(App $a) {
|
|||
|
||||
$cal_widget = widget_events();
|
||||
|
||||
if(! x($a->page,'aside'))
|
||||
if (!x($a->page, 'aside')) {
|
||||
$a->page['aside'] = '';
|
||||
}
|
||||
|
||||
$a->page['aside'] .= $vcard_widget;
|
||||
$a->page['aside'] .= $cal_widget;
|
||||
|
|
@ -72,12 +76,10 @@ function cal_init(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
function cal_content(App $a) {
|
||||
function cal_content(App $a)
|
||||
{
|
||||
nav_set_selected('events');
|
||||
|
||||
// First day of the week (0 = Sunday)
|
||||
$firstDay = PConfig::get(local_user(),'system','first_day_of_week', 0);
|
||||
|
||||
// get the translation strings for the callendar
|
||||
$i18n = get_event_strings();
|
||||
|
||||
|
|
@ -94,32 +96,25 @@ function cal_content(App $a) {
|
|||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
|
||||
$o ="";
|
||||
|
||||
$mode = 'view';
|
||||
$y = 0;
|
||||
$m = 0;
|
||||
$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
|
||||
|
||||
if($a->argc == 4) {
|
||||
if($a->argv[2] == 'export') {
|
||||
$format = 'ical';
|
||||
if ($a->argc == 4 && $a->argv[2] == 'export') {
|
||||
$mode = 'export';
|
||||
$format = $a->argv[3];
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Setup permissions structures
|
||||
//
|
||||
|
||||
$contact = null;
|
||||
$remote_contact = false;
|
||||
$contact_id = 0;
|
||||
|
||||
$owner_uid = $a->data['user']['uid'];
|
||||
$nick = $a->data['user']['nickname'];
|
||||
|
||||
if(is_array($_SESSION['remote'])) {
|
||||
if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
|
||||
foreach ($_SESSION['remote'] as $v) {
|
||||
if ($v['uid'] == $a->profile['profile_uid']) {
|
||||
$contact_id = $v['cid'];
|
||||
|
|
@ -127,6 +122,8 @@ function cal_content(App $a) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
$groups = [];
|
||||
if ($contact_id) {
|
||||
$groups = Group::getIdsByContactId($contact_id);
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
|
|
@ -134,17 +131,11 @@ function cal_content(App $a) {
|
|||
intval($a->profile['profile_uid'])
|
||||
);
|
||||
if (DBM::is_result($r)) {
|
||||
$contact = $r[0];
|
||||
$remote_contact = true;
|
||||
}
|
||||
}
|
||||
if(! $remote_contact) {
|
||||
if(local_user()) {
|
||||
$contact_id = $_SESSION['cid'];
|
||||
$contact = $a->contact;
|
||||
}
|
||||
}
|
||||
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
|
||||
|
||||
$is_owner = local_user() == $a->profile['profile_uid'];
|
||||
|
||||
if ($a->profile['hidewall'] && (!$is_owner) && (!$remote_contact)) {
|
||||
notice(t('Access to this profile has been restricted.') . EOL);
|
||||
|
|
@ -157,26 +148,30 @@ function cal_content(App $a) {
|
|||
$sql_extra = " AND `event`.`cid` = 0 " . $sql_perms;
|
||||
|
||||
// get the tab navigation bar
|
||||
$tabs .= profile_tabs($a,false, $a->data['user']['nickname']);
|
||||
$tabs = profile_tabs($a, false, $a->data['user']['nickname']);
|
||||
|
||||
// The view mode part is similiar to /mod/events.php
|
||||
if ($mode == 'view') {
|
||||
|
||||
|
||||
$thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
|
||||
$thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
|
||||
if(! $y)
|
||||
if (!$y) {
|
||||
$y = intval($thisyear);
|
||||
if(! $m)
|
||||
}
|
||||
|
||||
if (!$m) {
|
||||
$m = intval($thismonth);
|
||||
}
|
||||
|
||||
// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
|
||||
// An upper limit was chosen to keep search engines from exploring links millions of years in the future.
|
||||
|
||||
if($y < 1901)
|
||||
if ($y < 1901) {
|
||||
$y = 1900;
|
||||
if($y > 2099)
|
||||
}
|
||||
|
||||
if ($y > 2099) {
|
||||
$y = 2100;
|
||||
}
|
||||
|
||||
$nextyear = $y;
|
||||
$nextmonth = $m + 1;
|
||||
|
|
@ -186,9 +181,9 @@ function cal_content(App $a) {
|
|||
}
|
||||
|
||||
$prevyear = $y;
|
||||
if($m > 1)
|
||||
if ($m > 1) {
|
||||
$prevmonth = $m - 1;
|
||||
else {
|
||||
} else {
|
||||
$prevmonth = 12;
|
||||
$prevyear --;
|
||||
}
|
||||
|
|
@ -199,8 +194,13 @@ function cal_content(App $a) {
|
|||
|
||||
|
||||
if ($a->argv[2] === 'json') {
|
||||
if (x($_GET,'start')) $start = $_GET['start'];
|
||||
if (x($_GET,'end')) $finish = $_GET['end'];
|
||||
if (x($_GET, 'start')) {
|
||||
$start = $_GET['start'];
|
||||
}
|
||||
|
||||
if (x($_GET, 'end')) {
|
||||
$finish = $_GET['end'];
|
||||
}
|
||||
}
|
||||
|
||||
$start = datetime_convert('UTC', 'UTC', $start);
|
||||
|
|
@ -238,16 +238,12 @@ function cal_content(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
$events=array();
|
||||
|
||||
// transform the event in a usable array
|
||||
if (DBM::is_result($r))
|
||||
$r = sort_by_date($r);
|
||||
$events = process_events($r);
|
||||
|
||||
if ($a->argv[2] === 'json') {
|
||||
echo json_encode($events); killme();
|
||||
echo json_encode($events);
|
||||
killme();
|
||||
}
|
||||
|
||||
// links: array('href', 'text', 'extra css classes', 'title')
|
||||
|
|
@ -279,9 +275,7 @@ function cal_content(App $a) {
|
|||
'$previous' => array(System::baseUrl() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''),
|
||||
'$next' => array(System::baseUrl() . "/events/$nextyear/$nextmonth", t('Next'), '', ''),
|
||||
'$calendar' => cal($y, $m, $links, ' eventcal'),
|
||||
|
||||
'$events' => $events,
|
||||
|
||||
"today" => t("today"),
|
||||
"month" => t("month"),
|
||||
"week" => t("week"),
|
||||
|
|
@ -289,7 +283,10 @@ function cal_content(App $a) {
|
|||
"list" => t("list"),
|
||||
));
|
||||
|
||||
if (x($_GET,'id')){ echo $o; killme(); }
|
||||
if (x($_GET, 'id')) {
|
||||
echo $o;
|
||||
killme();
|
||||
}
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
|
@ -311,17 +308,19 @@ function cal_content(App $a) {
|
|||
$evexport = event_export($owner_uid, $format);
|
||||
|
||||
if (!$evexport["success"]) {
|
||||
if($evexport["content"])
|
||||
if ($evexport["content"]) {
|
||||
notice(t('This calendar format is not supported'));
|
||||
else
|
||||
} else {
|
||||
notice(t('No exportable data found'));
|
||||
}
|
||||
|
||||
// If it the own calendar return to the events page
|
||||
// otherwise to the profile calendar page
|
||||
if (local_user() === intval($owner_uid))
|
||||
if (local_user() === intval($owner_uid)) {
|
||||
$return_path = "events";
|
||||
else
|
||||
$returnpath = "cal/".$nick;
|
||||
} else {
|
||||
$return_path = "cal/" . $nick;
|
||||
}
|
||||
|
||||
goaway($return_path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file include/common.php
|
||||
*/
|
||||
|
|
@ -10,8 +11,8 @@ use Friendica\Model\GContact;
|
|||
require_once 'include/contact_selectors.php';
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
function common_content(App $a) {
|
||||
|
||||
function common_content(App $a)
|
||||
{
|
||||
$o = '';
|
||||
|
||||
$cmd = $a->argv[1];
|
||||
|
|
@ -45,8 +46,7 @@ function common_content(App $a) {
|
|||
intval($uid)
|
||||
);
|
||||
/// @TODO Handle $c with DBM::is_result()
|
||||
|
||||
$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
|
||||
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
|
||||
'$name' => htmlentities($c[0]['name']),
|
||||
'$photo' => $c[0]['photo'],
|
||||
'url' => 'contacts/' . $cid
|
||||
|
|
@ -62,19 +62,19 @@ function common_content(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
if(! $cid) {
|
||||
if(get_my_url()) {
|
||||
if (!$cid && get_my_url()) {
|
||||
/// @todo : Initialize $profile_uid
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc(normalise_link(get_my_url())),
|
||||
intval($profile_uid)
|
||||
);
|
||||
if (DBM::is_result($r))
|
||||
if (DBM::is_result($r)) {
|
||||
$cid = $r[0]['id'];
|
||||
else {
|
||||
} else {
|
||||
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
|
||||
dbesc(normalise_link(get_my_url()))
|
||||
);
|
||||
if (DBM::is_result($r))
|
||||
if (DBM::is_result($r)) {
|
||||
$zcid = $r[0]['id'];
|
||||
}
|
||||
}
|
||||
|
|
@ -90,29 +90,27 @@ function common_content(App $a) {
|
|||
$t = GContact::countCommonFriendsZcid($uid, $zcid);
|
||||
}
|
||||
|
||||
if (count($t)) {
|
||||
if ($t > 0) {
|
||||
$a->set_pager_total($t);
|
||||
} else {
|
||||
notice(t('No contacts in common.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
||||
if ($cid) {
|
||||
$r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
|
||||
} else {
|
||||
$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
|
||||
}
|
||||
|
||||
|
||||
if (!DBM::is_result($r)) {
|
||||
return $o;
|
||||
}
|
||||
|
||||
$id = 0;
|
||||
|
||||
$entries = [];
|
||||
foreach ($r as $rr) {
|
||||
|
||||
//get further details of the contact
|
||||
$contact_details = Contact::getDetailsByURL($rr['url'], $uid);
|
||||
|
||||
|
|
@ -120,12 +118,11 @@ function common_content(App $a) {
|
|||
/// @TODO Adding '/" here avoids E_NOTICE on missing constants
|
||||
$rr['id'] = $rr['cid'];
|
||||
|
||||
$photo_menu = '';
|
||||
$photo_menu = Contact::photoMenu($rr);
|
||||
|
||||
$entry = array(
|
||||
'url' => $rr['url'],
|
||||
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
|
||||
'itemurl' => defaults($contact_details, 'addr', $rr['url']),
|
||||
'name' => $contact_details['name'],
|
||||
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
|
||||
'img_hover' => htmlentities($contact_details['name']),
|
||||
|
|
@ -140,7 +137,9 @@ function common_content(App $a) {
|
|||
$entries[] = $entry;
|
||||
}
|
||||
|
||||
if ($cmd === 'loc' && $cid && $uid == local_user()) {
|
||||
$title = '';
|
||||
$tab_str = '';
|
||||
if ($cmd === 'loc' && $cid && local_user() == $uid) {
|
||||
$tab_str = contacts_tab($a, $cid, 4);
|
||||
} else {
|
||||
$title = t('Common Friends');
|
||||
|
|
|
|||
|
|
@ -5,14 +5,16 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
|
||||
function community_init(App $a) {
|
||||
function community_init(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
unset($_SESSION['theme']);
|
||||
unset($_SESSION['mobile-theme']);
|
||||
}
|
||||
}
|
||||
|
||||
function community_content(App $a, $update = 0) {
|
||||
function community_content(App $a, $update = 0)
|
||||
{
|
||||
$o = '';
|
||||
|
||||
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
|
||||
|
|
@ -60,21 +62,25 @@ function community_content(App $a, $update = 0) {
|
|||
$tabs = [];
|
||||
|
||||
if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) {
|
||||
$tabs[] = array('label'=>t('Community'),
|
||||
$tabs[] = array(
|
||||
'label' => t('Community'),
|
||||
'url' => 'community/local',
|
||||
'sel' => $content == 'local' ? 'active' : '',
|
||||
'title' => t('Posts from local users on this server'),
|
||||
'id' => 'community-local-tab',
|
||||
'accesskey' => 'l');
|
||||
'accesskey' => 'l'
|
||||
);
|
||||
}
|
||||
|
||||
if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
|
||||
$tabs[] = array('label' => t('Global Timeline'),
|
||||
$tabs[] = array(
|
||||
'label' => t('Global Timeline'),
|
||||
'url' => 'community/global',
|
||||
'sel' => $content == 'global' ? 'active' : '',
|
||||
'title' => t('Posts from users of the federated network'),
|
||||
'id' => 'community-global-tab',
|
||||
'accesskey' => 'g');
|
||||
'accesskey' => 'g'
|
||||
);
|
||||
}
|
||||
|
||||
$tab_tpl = get_markup_template('common_tabs.tpl');
|
||||
|
|
@ -124,7 +130,7 @@ function community_content(App $a, $update = 0) {
|
|||
return $o;
|
||||
}
|
||||
|
||||
$maxpostperauthor = Config::get('system','max_author_posts_community_page');
|
||||
$maxpostperauthor = (int) Config::get('system', 'max_author_posts_community_page');
|
||||
|
||||
if (($maxpostperauthor != 0) && ($content == 'local')) {
|
||||
$count = 1;
|
||||
|
|
@ -133,7 +139,7 @@ function community_content(App $a, $update = 0) {
|
|||
$s = array();
|
||||
|
||||
do {
|
||||
foreach ($r AS $row=>$item) {
|
||||
foreach ($r as $item) {
|
||||
if ($previousauthor == $item["author-link"]) {
|
||||
++$numposts;
|
||||
} else {
|
||||
|
|
@ -141,14 +147,14 @@ function community_content(App $a, $update = 0) {
|
|||
}
|
||||
$previousauthor = $item["author-link"];
|
||||
|
||||
if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
|
||||
if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) {
|
||||
$s[] = $item;
|
||||
}
|
||||
}
|
||||
if (sizeof($s) < $a->pager['itemspage']) {
|
||||
if (count($s) < $a->pager['itemspage']) {
|
||||
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content);
|
||||
}
|
||||
} while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
|
||||
} while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0));
|
||||
} else {
|
||||
$s = $r;
|
||||
}
|
||||
|
|
@ -168,7 +174,8 @@ function community_content(App $a, $update = 0) {
|
|||
));
|
||||
}
|
||||
|
||||
function community_getitems($start, $itemspage, $content) {
|
||||
function community_getitems($start, $itemspage, $content)
|
||||
{
|
||||
if ($content == 'local') {
|
||||
$r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
|
||||
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ function contactgroup_content(App $a)
|
|||
killme();
|
||||
}
|
||||
|
||||
$change = null;
|
||||
if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
|
||||
$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
|
|
@ -39,7 +40,7 @@ function contactgroup_content(App $a)
|
|||
}
|
||||
}
|
||||
|
||||
if ($change) {
|
||||
if (x($change)) {
|
||||
if (in_array($change, $preselected)) {
|
||||
Group::removeMember($group['id'], $change);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ class App {
|
|||
public $timezone;
|
||||
public $interactive = true;
|
||||
public $plugins;
|
||||
public $plugins_admin = array();
|
||||
public $apps = array();
|
||||
public $identities;
|
||||
public $is_mobile = false;
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ class Config
|
|||
*
|
||||
* @param string $family The category of the configuration value
|
||||
* @param string $key The configuration key to set
|
||||
* @param string $value The value to store
|
||||
* @param mixed $value The value to store
|
||||
*
|
||||
* @return mixed Stored $value or false if the database update failed
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -186,13 +186,22 @@ class DBStructure {
|
|||
return t('Errors encountered performing database changes: ').$message.EOL;
|
||||
}
|
||||
|
||||
public static function update($verbose, $action, $tables = null, $definition = null) {
|
||||
/**
|
||||
* Updates DB structure and returns eventual errors messages
|
||||
*
|
||||
* @param bool $verbose
|
||||
* @param bool $action Whether to actually apply the update
|
||||
* @param array $tables An array of the database tables
|
||||
* @param array $definition An array of the definition tables
|
||||
* @return string Empty string if the update is successful, error messages otherwise
|
||||
*/
|
||||
public static function update($verbose, $action, array $tables = null, array $definition = null) {
|
||||
if ($action) {
|
||||
Config::set('system', 'maintenance', 1);
|
||||
Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), DBM::date().' '.date('e')));
|
||||
}
|
||||
|
||||
$errors = false;
|
||||
$errors = '';
|
||||
|
||||
logger('updating structure', LOGGER_DEBUG);
|
||||
|
||||
|
|
|
|||
|
|
@ -327,8 +327,8 @@ class GContact
|
|||
}
|
||||
|
||||
/**
|
||||
* @param object $uid user
|
||||
* @param object $cid cid
|
||||
* @param integer $uid user
|
||||
* @param integer $cid cid
|
||||
* @param integer $start optional, default 0
|
||||
* @param integer $limit optional, default 9999
|
||||
* @param boolean $shuffle optional, default false
|
||||
|
|
@ -365,8 +365,8 @@ class GContact
|
|||
}
|
||||
|
||||
/**
|
||||
* @param object $uid user
|
||||
* @param object $zcid zcid
|
||||
* @param integer $uid user
|
||||
* @param integer $zcid zcid
|
||||
* @param integer $start optional, default 0
|
||||
* @param integer $limit optional, default 9999
|
||||
* @param boolean $shuffle optional, default false
|
||||
|
|
@ -397,8 +397,8 @@ class GContact
|
|||
}
|
||||
|
||||
/**
|
||||
* @param object $uid user
|
||||
* @param object $cid cid
|
||||
* @param integer $uid user
|
||||
* @param integer $cid cid
|
||||
* @return integer
|
||||
*/
|
||||
public static function countAllFriends($uid, $cid)
|
||||
|
|
@ -420,11 +420,11 @@ class GContact
|
|||
}
|
||||
|
||||
/**
|
||||
* @param object $uid user
|
||||
* @param object $cid cid
|
||||
* @param integer $uid user
|
||||
* @param integer $cid cid
|
||||
* @param integer $start optional, default 0
|
||||
* @param integer $limit optional, default 80
|
||||
* @return object
|
||||
* @return array
|
||||
*/
|
||||
public static function allFriends($uid, $cid, $start = 0, $limit = 80)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue