.htconfig.php and make it writable by the web server.
5. Visit your website with a web browser and follow the instructions. Please
-note any error messages and correct these before continuing. If you are using
-SSL with a known signature authority (recommended), use the https: link to your
-website. If you are using a self-signed cert or no cert, use the http: link.
+note any error messages and correct these before continuing.
+
+If you are using SSL with a known signature authority (recommended), use the
+https: link to your website. If you are using a self-signed cert or no cert,
+use the http: link.
+
+If you need to specify a port for the connection to the database, you can do
+so in the host name setting for the database.
6. *If* the automated installation fails for any reason, check the following:
function info($s) {
$a = get_app();
- if (local_user() AND get_pconfig(local_user(), 'system', 'ignore_info')) {
+ if (local_user() && get_pconfig(local_user(), 'system', 'ignore_info')) {
return;
}
$arr = array('args' => $args, 'run_cmd' => true);
call_hooks("proc_run", $arr);
- if (!$arr['run_cmd'] OR ! count($args)) {
+ if (!$arr['run_cmd'] || ! count($args)) {
return;
}
$path = $basepath;
}
- if (($path == "") OR (!is_dir($path))) {
+ if (($path == "") || (!is_dir($path))) {
return;
}
if ($dh = opendir($path)) {
while (($file = readdir($dh)) !== false) {
$fullpath = $path . "/" . $file;
- if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
+ if ((filetype($fullpath) == "dir") && ($file != ".") && ($file != "..")) {
clear_cache($basepath, $fullpath);
}
- if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
+ if ((filetype($fullpath) == "file") && (filectime($fullpath) < (time() - $cachetime))) {
unlink($fullpath);
}
}
}
$itemcache = get_config('system', 'itemcache');
- if (($itemcache != "") AND App::directory_usable($itemcache)) {
+ if (($itemcache != "") && App::directory_usable($itemcache)) {
return $itemcache;
}
*/
function get_spoolpath() {
$spoolpath = get_config('system', 'spoolpath');
- if (($spoolpath != "") AND App::directory_usable($spoolpath)) {
+ if (($spoolpath != "") && App::directory_usable($spoolpath)) {
// We have a spool path and it is usable
return $spoolpath;
}
$temppath = get_config("system", "temppath");
- if (($temppath != "") AND App::directory_usable($temppath)) {
+ if (($temppath != "") && App::directory_usable($temppath)) {
// We have a temp path and it is usable
return $temppath;
}
$temppath = sys_get_temp_dir();
// Check if it is usable
- if (($temppath != "") AND App::directory_usable($temppath)) {
+ if (($temppath != "") && App::directory_usable($temppath)) {
// To avoid any interferences with other systems we create our own directory
$new_temppath = $temppath . "/" . $a->get_hostname();
if (!is_dir($new_temppath)) {
function infinite_scroll_data($module) {
if (get_pconfig(local_user(), 'system', 'infinite_scroll')
- AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
+ && ($module == "network") && ($_GET["mode"] != "minimal")) {
// get the page number
if (is_string($_GET["page"])) {
// try to get the uri from which we load the content
foreach ($_GET AS $param => $value) {
- if (($param != "page") AND ($param != "q")) {
+ if (($param != "page") && ($param != "q")) {
$reload_uri .= "&" . $param . "=" . urlencode($value);
}
}
- if (($a->page_offset != "") AND ! strstr($reload_uri, "&offset=")) {
+ if (($a->page_offset != "") && ! strstr($reload_uri, "&offset=")) {
$reload_uri .= "&offset=" . urlencode($a->page_offset);
}
* By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds).
* Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'`
* Braces are mandatory in conditions
+ * Boolean operators are `&&` and `||` for PHP conditions, `AND` and `OR` for SQL queries
* No closing PHP tag
* No trailing spaces
Point your web browser to the new site and follow the instructions.
Please note any error messages and correct these before continuing.
+If you need to specify a port for the connection to the database, you can do so in the host name setting for the database.
+
*If* the automated installation fails for any reason, check the following:
* Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php
If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
$a->config['admin_name'] = "Marvin";
+
+## Database Settings
+
+The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection.
+If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable.
+
+ $db_host = 'your.mysqlhost.com:123456';
$profile = $default;
}
- if (($profile["photo"] == "") AND isset($default["photo"])) {
+ if (($profile["photo"] == "") && isset($default["photo"])) {
$profile["photo"] = $default["photo"];
}
- if (($profile["name"] == "") AND isset($default["name"])) {
+ if (($profile["name"] == "") && isset($default["name"])) {
$profile["name"] = $default["name"];
}
- if (($profile["network"] == "") AND isset($default["network"])) {
+ if (($profile["network"] == "") && isset($default["network"])) {
$profile["network"] = $default["network"];
}
- if (($profile["thumb"] == "") AND isset($profile["photo"])) {
+ if (($profile["thumb"] == "") && isset($profile["photo"])) {
$profile["thumb"] = $profile["photo"];
}
- if (($profile["micro"] == "") AND isset($profile["thumb"])) {
+ if (($profile["micro"] == "") && isset($profile["thumb"])) {
$profile["micro"] = $profile["thumb"];
}
- if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
+ if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) &&
in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
}
// Show contact details of Diaspora contacts only if connected
- if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
+ if (($profile["cid"] == 0) && ($profile["network"] == NETWORK_DIASPORA)) {
$profile["location"] = "";
$profile["about"] = "";
$profile["gender"] = "";
// Update the contact every 7 days
$update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days'));
- if (!$update_photo OR $no_update) {
+ if (!$update_photo || $no_update) {
return $contact_id;
}
} elseif ($uid != 0) {
}
}
- if (count($contacts) > 1 AND $uid == 0 AND $contact_id != 0 AND $url != "") {
+ if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $url != "") {
q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
dbesc(normalise_link($url)),
intval($contact_id));
}
// Only update if there had something been changed
- if ($data["addr"] != $contacts[0]["addr"] OR
- $data["alias"] != $contacts[0]["alias"] OR
- $data["name"] != $contacts[0]["name"] OR
+ if ($data["addr"] != $contacts[0]["addr"] ||
+ $data["alias"] != $contacts[0]["alias"] ||
+ $data["name"] != $contacts[0]["name"] ||
$data["nick"] != $contacts[0]["nick"]) {
q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
if($profile['locality'])
$location .= $profile['locality'];
- if($profile['region'] AND ($profile['locality'] != $profile['region'])) {
+ if($profile['region'] && ($profile['locality'] != $profile['region'])) {
if($location)
$location .= ', ';
$myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl);
- $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
+ $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
dbesc($myurl . '$'),
dbesc($myurl . '\\]'),
dbesc($diasp_url . '\\]')
}
/**
- * @brief Check for missing contact data and try to fetch the data from
+ * @brief Check for missing contact data and try to fetch the data from
* from other sources
- *
+ *
* @param array $arr The input array with the intro data
- *
+ *
* @return array The array with the intro data
*/
private function getMissingIntroData($arr) {
$data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
}
- if (($r[0]["avatar"] != $avatar) OR $force) {
+ if (($r[0]["avatar"] != $avatar) || $force) {
$photos = import_profile_photo($avatar, $uid, $cid, true);
if ($photos) {
$filename = basename($photo);
$img_str = fetch_url($photo, true);
- if ($quit_on_error AND ($img_str == "")) {
+ if ($quit_on_error && ($img_str == "")) {
return false;
}
$photo_failure = true;
}
- if ($photo_failure AND $quit_on_error) {
+ if ($photo_failure && $quit_on_error) {
return false;
}
$data = Cache::get($url);
- if (is_null($data) OR !$data OR !is_array($data)) {
+ if (is_null($data) || !$data || !is_array($data)) {
$img_str = fetch_url($url, true, $redirects, 4);
$filesize = strlen($img_str);
/// $default_cid = $r[0]['id'];
/// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
- if ((strlen($imagedata) == 0) AND ($url == "")) {
+ if ((strlen($imagedata) == 0) && ($url == "")) {
logger("No image data and no url provided", LOGGER_DEBUG);
return(array());
} elseif (strlen($imagedata) == 0) {
}
}
- if ($width > 160 AND $height > 160) {
+ if ($width > 160 && $height > 160) {
$x = 0;
$y = 0;
$tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
- if ($privmail AND $preselected) {
+ if ($privmail && $preselected) {
$sql_extra .= " AND `id` IN (".implode(",", $preselected).")";
$hidepreselected = ' style="display: none;"';
} else {
$o .= "</select>\r\n";
- if ($privmail AND $preselected) {
+ if ($privmail && $preselected) {
$o .= implode(", ", $receiverlist);
}
}
function construct_acl_data(App $a, $user) {
+ // This function is now deactivated. It seems as if the generated data isn't used anywhere.
+ /// @todo Remove this function and all function calls before releasing Friendica 3.5.3
+ return;
// Get group and contact information for html ACL selector
$acl_data = acl_lookup($a, 'html');
logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
// Searching for contact URL
- if (!is_null($contact_id) AND (intval($contact_id) == 0)) {
+ if (!is_null($contact_id) && (intval($contact_id) == 0)) {
$user = dbesc(normalise_link($contact_id));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
}
// Searching for contact id with uid = 0
- if (!is_null($contact_id) AND (intval($contact_id) != 0)) {
+ if (!is_null($contact_id) && (intval($contact_id) != 0)) {
$user = dbesc(api_unique_id_to_url($contact_id));
if ($user == "") {
}
}
- if (is_null($user) AND ($a->argc > (count($called_api) - 1)) AND (count($called_api) > 0)) {
+ if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) {
$argid = count($called_api);
list($user, $null) = explode(".", $a->argv[$argid]);
if (is_numeric($user)) {
$network_name = network_to_name($r[0]['network'], $r[0]['url']);
// If no nick where given, extract it from the address
- if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) {
+ if (($r[0]['nick'] == "") || ($r[0]['name'] == $r[0]['nick'])) {
$r[0]['nick'] = api_get_nick($r[0]["url"]);
}
$starred = 0;
// Add a nick if it isn't present there
- if (($uinfo[0]['nick'] == "") OR ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
+ if (($uinfo[0]['nick'] == "") || ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
$uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
}
'contributors_enabled' => false,
'is_translator' => false,
'is_translation_enabled' => false,
- 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) OR ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
+ 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) || ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
'follow_request_sent' => false,
'statusnet_blocking' => false,
'notifications' => false,
$status_user = api_get_user($a, $item["author-link"]);
- $status_user["protected"] = (($item["allow_cid"] != "") OR
- ($item["allow_gid"] != "") OR
- ($item["deny_cid"] != "") OR
- ($item["deny_gid"] != "") OR
+ $status_user["protected"] = (($item["allow_cid"] != "") ||
+ ($item["allow_gid"] != "") ||
+ ($item["deny_cid"] != "") ||
+ ($item["deny_gid"] != "") ||
$item["private"]);
if ($item['thr-parent'] == $item['uri']) {
$status_info["entities"] = $converted["entities"];
}
- if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) {
+ if (($lastwall['item_network'] != "") && ($status["source"] == 'web')) {
$status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
- } elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) {
+ } elseif (($lastwall['item_network'] != "") && (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) {
$status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
}
$user_info["status"]["entities"] = $converted["entities"];
}
- if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) {
+ if (($lastwall['item_network'] != "") && ($user_info["status"]["source"] == 'web')) {
$user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
}
- if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) {
+ if (($lastwall['item_network'] != "") && (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) {
$user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . network_to_name($lastwall['item_network'], $user_info['url']) . ')');
}
`contact`.`id` AS `cid`
FROM `item`, `contact`
WHERE `item`.`uid` = %d
- AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+ AND `item`.`visible` = 1 AND `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `item`.`starred` = 1
AND `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
$statustitle = trim($item['title']);
- if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) {
+ if (($statustitle != '') && (strpos($statusbody, $statustitle) !== false)) {
$statustext = trim($statusbody);
} else {
$statustext = trim($statustitle."\n\n".$statusbody);
}
- if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) {
+ if (($item["network"] == NETWORK_FEED) && (strlen($statustext)> 1000)) {
$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
}
$statushtml = "<h4>" . bbcode($item['title']) . "</h4>\n" . $statushtml;
}
- // feeds without body should contain the link
- if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) {
- $statushtml .= bbcode($item['plink']);
- }
-
+ // feeds without body should contain the link
+ if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) {
+ $statushtml .= bbcode($item['plink']);
+ }
+
$entities = api_get_entitities($statustext, $body);
return array(
$offset = 0;
//foreach ($urls[1] AS $id=>$url) {
foreach ($ordered_urls AS $url) {
- if ((substr($url["title"], 0, 7) != "http://") AND (substr($url["title"], 0, 8) != "https://") AND
- !strpos($url["title"], "http://") AND !strpos($url["title"], "https://"))
+ if ((substr($url["title"], 0, 7) != "http://") && (substr($url["title"], 0, 8) != "https://") &&
+ !strpos($url["title"], "http://") && !strpos($url["title"], "https://"))
$display_url = $url["title"];
else {
$display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url["url"]);
$scale = scale_image($image[0], $image[1], 150);
$sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
- if (($image[0] > 150) OR ($image[1] > 150)) {
+ if (($image[0] > 150) || ($image[1] > 150)) {
$scale = scale_image($image[0], $image[1], 340);
$sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
}
$scale = scale_image($image[0], $image[1], 600);
$sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
- if (($image[0] > 600) OR ($image[1] > 600)) {
+ if (($image[0] > 600) || ($image[1] > 600)) {
$scale = scale_image($image[0], $image[1], 1024);
$sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
}
list($status_user, $owner_user) = api_item_get_user($a, $item);
// Look if the posts are matching if they should be filtered by user id
- if ($filter_user AND ($status_user["id"] != $user_info["id"])) {
+ if ($filter_user && ($status_user["id"] != $user_info["id"])) {
continue;
}
$status["entities"] = $converted["entities"];
}
- if (($item['item_network'] != "") AND ($status["source"] == 'web')) {
+ if (($item['item_network'] != "") && ($status["source"] == 'web')) {
$status["source"] = network_to_name($item['item_network'], $user_info['url']);
- } elseif (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) {
+ } elseif (($item['item_network'] != "") && (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) {
$status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')');
}
// It doesn't work reliable with the link if its a feed
//$IsRetweet = ($item['owner-link'] != $item['author-link']);
//if ($IsRetweet)
- // $IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar']));
+ // $IsRetweet = (($item['owner-name'] != $item['author-name']) || ($item['owner-avatar'] != $item['author-avatar']));
if ($item["id"] == $item["parent"]) {
if (api_user() === false) throw new ForbiddenException();
- if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return;
+ if (!x($_POST, "text") || (!x($_POST,"screen_name") && !x($_POST,"user_id"))) return;
$sender = api_get_user($a);
}
function prepare_photo_data($type, $scale, $photo_id) {
- $scale_sql = ($scale === false ? "" : sprintf("and scale=%d", intval($scale)));
+ $scale_sql = ($scale === false ? "" : sprintf("AND scale=%d", intval($scale)));
$data_sql = ($scale === false ? "" : "data, ");
// added allow_cid, allow_gid, deny_cid, deny_gid to output as string like stored in database
$in_reply_to['user_id_str'] = NULL;
$in_reply_to['screen_name'] = NULL;
- if (($item['thr-parent'] != $item['uri']) AND (intval($item['parent']) != intval($item['id']))) {
+ if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
intval($item['uid']),
dbesc($item['thr-parent']));
if (isset($data["text"]))
$body = $data["text"];
- if (($body == "") AND (isset($data["title"])))
+ if (($body == "") && (isset($data["title"])))
$body = $data["title"];
if (isset($data["url"]))
new_cookie($authcookiedays*24*60*60, $r[0]);
// Do the authentification if not done by now
- if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
+ if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($r[0]);
if (get_config('system','paranoia'))
// Open the logfile if the logfile name is defined
if ($this->sLogFile != '')
- $this->rLogFile = fopen($this->sLogFile, "a") or die("Error opening log file: ". $this->sLogFile);
+ $this->rLogFile = fopen($this->sLogFile, "a") || die("Error opening log file: ". $this->sLogFile);
$this->writeLog("[exAuth] start");
$data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
}
- if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) {
+ if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false)) && ($data["image"] != "")) {
$data["preview"] = $data["image"];
$data["image"] = "";
}
if ($simplehtml == 7) {
$text = style_url_for_mastodon($data["url"]);
- } elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
+ } elseif (($simplehtml != 4) && ($simplehtml != 0)) {
$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
} else {
$text = sprintf('<span class="type-%s">', $data["type"]);
if (strstr(strtolower($oembed), "<iframe ")) {
$text = $oembed;
} else {
- if (($data["image"] != "")
AND !strstr(strtolower($oembed), "<img ")) {
+ if (($data["image"] != "")
&& !strstr(strtolower($oembed), "<img ")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]);
- } elseif (($data["preview"] != "")
AND !strstr(strtolower($oembed), "<img ")) {
+ } elseif (($data["preview"] != "")
&& !strstr(strtolower($oembed), "<img ")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]);
}
- if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) {
+ if (($data["type"] == "photo") && ($data["url"] != "") && ($data["image"] != "")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]);
} else {
$text .= $oembed;
$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
- if ($plaintext OR (($title != "") AND strstr($text, $title))) {
+ if ($plaintext || (($title != "") && strstr($text, $title))) {
$data["title"] = $data["url"];
- } elseif (($text != "") AND strstr($title, $text)) {
+ } elseif (($text != "") && strstr($title, $text)) {
$data["text"] = $data["title"];
$data["title"] = $data["url"];
}
- if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) {
+ if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) {
return $data["title"] . $data["after"];
}
// If the link already is included in the post, don't add it again
- if (($data["url"] != "") AND strpos($data["text"], $data["url"])) {
+ if (($data["url"] != "") && strpos($data["text"], $data["url"])) {
return $data["text"] . $data["after"];
}
$text = $data["text"];
- if (($data["url"] != "") AND ($data["title"] != "")) {
+ if (($data["url"] != "") && ($data["title"] != "")) {
$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
} elseif (($data["url"] != "")) {
$text .= "\n" . $data["url"];
for ($i = 0; $i < strlen($input); $i++) {
$char = substr($input, $i, 1);
- if (($char >= "a") and ($char <= "z")) {
+ if (($char >= "a") && ($char <= "z")) {
$cleaned .= $char;
}
function bb_style_url($match) {
$url = $match[1];
- if (isset($match[2]) AND ($match[1] != $match[2])) {
+ if (isset($match[2]) && ($match[1] != $match[2])) {
return $match[0];
}
$data = get_contact_details_by_url($profile);
- if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != ""))
+ if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != ""))
$userid_compact = $data["name"]." (".$data["addr"].")";
else
$userid_compact = GetProfileUsername($profile,$author, true);
- if (isset($data["addr"]) AND ($data["addr"] != ""))
+ if (isset($data["addr"]) && ($data["addr"] != ""))
$userid = $data["addr"];
else
$userid = GetProfileUsername($profile,$author, false);
- if (isset($data["name"]) AND ($data["name"] != ""))
+ if (isset($data["name"]) && ($data["name"] != ""))
$author = $data["name"];
- if (isset($data["micro"]) AND ($data["micro"] != ""))
+ if (isset($data["micro"]) && ($data["micro"] != ""))
$avatar = $data["micro"];
$preshare = trim($share[1]);
}
function bb_expand_links($match) {
- if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) {
+ if (($match[3] == "") || ($match[2] == $match[3]) || stristr($match[2], $match[3])) {
return ($match[1] . "[url]" . $match[2] . "[/url]");
} else {
return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]");
$MAILSearchString = $URLSearchString;
// Remove all hashtag addresses
- if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) {
+ if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) {
$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
} elseif ($simplehtml == 3) {
$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
// Check for [spoiler] text
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) {
+ while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text);
}
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) {
+ while ((strpos($Text, "[/spoiler]")!== false) && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
"<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
$Text);
// Check for [quote] text
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) {
+ while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text);
}
// handle nested quotes
$endlessloop = 0;
- while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) {
+ while ((strpos($Text, "[/quote]")!== false) && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
$Text);
// Clean up the HTML by loading and saving the HTML with the DOM.
// Bad structured html can break a whole page.
// For performance reasons do it only with ativated item cache or at export.
- if (!$tryoembed OR (get_itemcachepath() != "")) {
+ if (!$tryoembed || (get_itemcachepath() != "")) {
$doc = new DOMDocument();
$doc->preserveWhiteSpace = false;
set_config("system", "cache_cleared_day", time());
}
- if (($max_level <= CACHE_HOUR) AND (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
+ if (($max_level <= CACHE_HOUR) && (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 hours")), intval(CACHE_HOUR));
set_config("system", "cache_cleared_hour", time());
}
- if (($max_level <= CACHE_HALF_HOUR) AND (get_config("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
+ if (($max_level <= CACHE_HALF_HOUR) && (get_config("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 30 minutes")), intval(CACHE_HALF_HOUR));
set_config("system", "cache_cleared_half_hour", time());
}
- if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
+ if (($max_level <= CACHE_QUARTER_HOUR) && (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR));
set_config("system", "cache_cleared_quarter_hour", time());
}
- if (($max_level <= CACHE_FIVE_MINUTES) AND (get_config("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
+ if (($max_level <= CACHE_FIVE_MINUTES) && (get_config("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 5 minutes")), intval(CACHE_FIVE_MINUTES));
set_config("system", "cache_cleared_five_minute", time());
}
- if (($max_level <= CACHE_MINUTE) AND (get_config("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
+ if (($max_level <= CACHE_MINUTE) && (get_config("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 minutes")), intval(CACHE_MINUTE));
$networkname = str_replace($search, $replace, $s);
- if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) {
+ if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) {
$r = q("SELECT `gserver`.`platform` FROM `gcontact`
INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
$networks[] = NETWORK_APPNET;
}
- if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) {
+ if (!plugin_enabled("fbpost") && !plugin_enabled("facebook")) {
$networks[] = NETWORK_FACEBOOK;
}
$profile_link = zrl($profile_link);
}
- if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) {
+ if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"];
}
}
- if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+ if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"];
$menu[t("Poke")] = $poke_link;
}
- if ((($cid == 0) OR ($rel == CONTACT_IS_FOLLOWER)) AND
+ if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
$menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
$contact['priority'] = 2;
}
- if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
+ if ($contact['subhub'] && in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
/*
* We should be getting everything via a hub. But just to be sure, let's check once a day.
* (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
}
- if (($contact['priority'] >= 0) AND !$force) {
+ if (($contact['priority'] >= 0) && !$force) {
$update = false;
$t = $contact['last-update'];
logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]);
- if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
+ if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) {
$priority = PRIORITY_MEDIUM;
} else {
$priority = PRIORITY_LOW;
require_once 'include/datetime.php';
- if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+ if (($argc == 2) && is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
foreach ($a->hooks["cron"] as $hook) {
if ($hook[1] == $argv[1]) {
logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG);
$d = datetime_convert();
- if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+ if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
foreach ($a->hooks["cron"] as $hook) {
logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG);
proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
/**
* @brief Returns the MySQL server version string
- *
+ *
* This function discriminate between the deprecated mysql API and the current
* object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
*
foreach ($r AS $row) {
if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
- $log = (in_array($row['key'], $watchlist) AND
+ $log = (in_array($row['key'], $watchlist) &&
($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
} else {
$log = false;
}
- if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
+ if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) && ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
$log = true;
}
- if (in_array($row['key'], $blacklist) OR ($row['key'] == "")) {
+ if (in_array($row['key'], $blacklist) || ($row['key'] == "")) {
$log = false;
}
// PDO doesn't return "true" on successful operations - like mysqli does
// Emulate this behaviour by checking if the query returned data and had columns
// This should be reliable enough
- if (($this->driver == 'pdo') AND (count($r) == 0) AND ($columns == 0)) {
+ if (($this->driver == 'pdo') && (count($r) == 0) && ($columns == 0)) {
return true;
}
static private function replace_parameters($sql, $args) {
$offset = 0;
foreach ($args AS $param => $value) {
- if (is_int($args[$param]) OR is_float($args[$param])) {
+ if (is_int($args[$param]) || is_float($args[$param])) {
$replace = intval($args[$param]);
} else {
$replace = "'".self::$dbo->escape($args[$param])."'";
unset($args[0]);
// When the second function parameter is an array then use this as the parameter array
- if ((count($args) > 0) AND (is_array($args[1]))) {
+ if ((count($args) > 0) && (is_array($args[1]))) {
$params = $args[1];
} else {
$params = $args;
$args[++$i] = $param;
}
- if (!self::$dbo OR !self::$dbo->connected) {
+ if (!self::$dbo || !self::$dbo->connected) {
return false;
}
// When the search field is the relation field, we don't need to fetch the rows
// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
- if ((count($param) == 1) AND ($field == array_keys($param)[0])) {
+ if ((count($param) == 1) && ($field == array_keys($param)[0])) {
foreach ($rel_def AS $rel_table => $rel_fields) {
foreach ($rel_fields AS $rel_field) {
$retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack);
}
}
- if (!$do_update OR (count($fields) == 0)) {
+ if (!$do_update || (count($fields) == 0)) {
return true;
}
$result = self::p($sql, $condition);
- if (is_bool($result) OR !$single_row) {
+ if (is_bool($result) || !$single_row) {
return $result;
} else {
$row = self::fetch($result);
* regardless of any logging that may or may nor be in effect.
* These usually indicate SQL syntax errors that need to be resolved.
*/
- if (isset($result) AND ($result === false)) {
+ if (isset($result) && ($result === false)) {
logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
if (file_exists('dbfail.out')) {
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
}
}
- if (isset($result) AND (($result === true) || ($result === false))) {
+ if (isset($result) && (($result === true) || ($result === false))) {
return $result;
}
for ($i = 1; $i <= 9; $i++) {
// Execute the background script for a step when it isn't finished.
// Execute step 8 and 9 only when $days is defined.
- if (!Config::get('system', 'finished-dbclean-'.$i, false) AND (($i < 8) OR ($days > 0))) {
+ if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($days > 0))) {
proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
}
}
}
// Call it again if not all entries were purged
- if (($stage != 0) AND ($count > 0)) {
+ if (($stage != 0) && ($count > 0)) {
proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
}
}
if (is_bool($value)) {
$value = ($value ? 'true' : 'false');
- } elseif (is_float($value) OR is_integer($value)) {
+ } elseif (is_float($value) || is_integer($value)) {
$value = (string)$value;
} else {
$value = "'".dbesc($value)."'";
// On utf8mb4 a varchar index can only have a length of 191
// The "show index" command sometimes returns this value although this value wasn't added manually.
// Because we don't want to add this number to every index, we ignore bigger numbers
- if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 191) OR ($index["Key_name"] == "PRIMARY"))) {
+ if (($index["Sub_part"] != "") && (($index["Sub_part"] < 191) || ($index["Key_name"] == "PRIMARY"))) {
$column .= "(".$index["Sub_part"].")";
}
}
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
- if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+ if ((version_compare($db->server_info(), '5.7.4') >= 0) &&
!(strpos($db->server_info(), 'MariaDB') !== false)) {
$ignore = '';
} else {
$field_definition = $database[$name]["fields"][$fieldname];
// Define the default collation if not given
- if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) {
+ if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
$parameters['Collation'] = 'utf8mb4_general_ci';
} else {
$parameters['Collation'] = null;
if ($field_definition['Collation'] != $parameters['Collation']) {
$sql2 = db_modify_table_field($fieldname, $parameters);
- if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) {
+ if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) {
$sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
if ($parameters["extra"] != "")
$fieldstruct .= " ".$parameters["extra"];
- /*if (($parameters["primary"] != "") AND $create)
+ /*if (($parameters["primary"] != "") && $create)
$fieldstruct .= " PRIMARY KEY";*/
return($fieldstruct);
$primary_keys = array();
foreach ($fields AS $fieldname => $field) {
$sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
- if (x($field,'primary') and $field['primary']!='') {
+ if (x($field,'primary') && $field['primary']!='') {
$primary_keys[] = $fieldname;
}
}
$uid = $item_id;
} else {
// find ancestors
- $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
intval($item_id)
);
$updated = $r[0]['edited'];
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+ FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
intval($parent_id)
);
// If we are setup as a soapbox we aren't accepting top level posts from this person
- if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) {
+ if (($x[0]['page-flags'] == PAGE_SOAPBOX) && $top_level) {
break;
}
logger('mod-delivery: local delivery');
$headers .= "References: <".iri2msgid($it["parent-uri"]).">";
// If Threading is enabled, write down the correct parent
- if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
+ if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"]))
$headers .= " <".iri2msgid($it["thr-parent"]).">";
$headers .= "\n";
dbesc($it['parent-uri']),
intval($uid));
- if (dbm::is_result($r) AND ($r[0]['title'] != '')) {
+ if (dbm::is_result($r) && ($r[0]['title'] != '')) {
$subject = $r[0]['title'];
} else {
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($it['parent-uri']),
intval($uid));
- if (dbm::is_result($r) AND ($r[0]['title'] != ''))
+ if (dbm::is_result($r) && ($r[0]['title'] != ''))
$subject = $r[0]['title'];
}
}
/// @TODO This hook can't work anymore
// call_hooks('atom_feed', $atom);
- if (!dbm::is_result($items) OR $onlyheader) {
+ if (!dbm::is_result($items) || $onlyheader) {
$atom = trim($doc->saveXML());
call_hooks('atom_feed_end', $atom);
return $atom;
}
+ /**
+ * @brief Generate an atom entry for a given item id
+ *
+ * @param int $item_id The item id
+ *
+ * @return string DFRN feed entry
+ */
+ public static function itemFeed($item_id) {
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
+ `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
+ `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
+ FROM `item`
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+ LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
+ WHERE `item`.`id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
+ AND `item`.`wall` AND NOT `item`.`private`",
+ intval($item_id)
+ );
+
+ if (!dbm::is_result($r)) {
+ killme();
+ }
+
+ $item = $r[0];
+
+ $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
+ FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1",
+ intval($item['uid'])
+ );
+
+ if (!dbm::is_result($r)) {
+ killme();
+ }
+
+ $owner = $r[0];
+
+ $doc = new DOMDocument('1.0', 'utf-8');
+ $doc->formatOutput = true;
+
+ $alternatelink = $owner['url'];
+
+ $root = self::add_header($doc, $owner, 'dfrn:owner', $alternatelink, true);
+
+ $type = 'html';
+
+ $entry = self::entry($doc, $type, $item, $owner, true);
+ $root->appendChild($entry);
+
+ $atom = trim($doc->saveXML());
+ return $atom;
+ }
+
/**
* @brief Create XML text for DFRN mails
*
$attributes = array();
- if (!$public OR !$hidewall) {
+ if (!$public || !$hidewall) {
$attributes = array("dfrn:updated" => $namdate);
}
$attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
- if (!$public OR !$hidewall) {
+ if (!$public || !$hidewall) {
$attributes["dfrn:updated"] = $picdate;
}
if (count($tags)) {
foreach ($tags as $t) {
- if (($type != 'html') OR ($t[0] != "@")) {
+ if (($type != 'html') || ($t[0] != "@")) {
xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
}
}
intval($owner["uid"]),
dbesc(normalise_link($mention)));
- if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) {
+ if (dbm::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
$contact["avatar-date"] = $attributes->textContent;
}
}
- if (($width > 0) AND ($href != "")) {
+ if (($width > 0) && ($href != "")) {
$avatarlist[$width] = $href;
}
}
$author["avatar"] = current($avatarlist);
}
- if (dbm::is_result($r) AND !$onlyfetch) {
+ if (dbm::is_result($r) && !$onlyfetch) {
logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
$poco = array("url" => $contact["url"]);
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
- if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) {
+ if (($relocate["avatar"] == "") && ($relocate["photo"] != "")) {
$relocate["avatar"] = $relocate["photo"];
}
}
// update last-child if it changes
- if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
+ if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
$title = $attributes->textContent;
}
}
- if (($rel != "") AND ($href != "")) {
+ if (($rel != "") && ($href != "")) {
switch ($rel) {
case "alternate":
$item["plink"] = $href;
);
// Is there an existing item?
- if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND
+ if (dbm::is_result($current) && edited_timestamp_is_newer($current[0], $item) &&
(datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
return;
}
$notice_info = $xpath->query("statusnet:notice_info", $entry);
- if ($notice_info AND ($notice_info->length > 0)) {
+ if ($notice_info && ($notice_info->length > 0)) {
foreach ($notice_info->item(0)->attributes AS $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
}
- if (($term != "") AND ($scheme != "")) {
+ if (($term != "") && ($scheme != "")) {
$parts = explode(":", $scheme);
- if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) {
+ if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
$termhash = array_shift($parts);
$termurl = implode(":", $parts);
$item["contact-id"] = $owner["contact-id"];
}
- if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
+ if (($item["network"] != $owner["network"]) && ($owner["network"] != "")) {
$item["network"] = $owner["network"];
}
$item["contact-id"] = $author["contact-id"];
}
- if (($item["network"] != $author["network"]) AND ($author["network"] != "")) {
+ if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
$item["network"] = $author["network"];
}
);
}
- if ($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+ if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
}
$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
}
- if (!$uri OR !$importer["id"]) {
+ if (!$uri || !$importer["id"]) {
return false;
}
$fields = $postdata['fields'];
// Is it a an action (comment, like, ...) for our own post?
- if (isset($fields->parent_guid) AND !$postdata["relayed"]) {
+ if (isset($fields->parent_guid) && !$postdata["relayed"]) {
$guid = notags(unxmlify($fields->parent_guid));
$importer = self::importer_for_guid($guid);
if (is_array($importer)) {
}
}
- if (($fieldname == "author_signature") AND ($entry != ""))
+ if (($fieldname == "author_signature") && ($entry != ""))
$author_signature = base64_decode($entry);
- elseif (($fieldname == "parent_author_signature") AND ($entry != ""))
+ elseif (($fieldname == "parent_author_signature") && ($entry != ""))
$parent_author_signature = base64_decode($entry);
elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
if ($signed_data != "") {
$signed_data .= $entry;
}
- if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) OR
+ if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) ||
($orig_type == "relayable_retraction"))
xml::copy($entry, $fields, $fieldname);
}
$update = true;
}
- if (!$person OR $update) {
+ if (!$person || $update) {
logger("create or refresh", LOGGER_DEBUG);
$r = probe_url($handle, PROBE_DIASPORA);
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
- if ($r AND ($r["network"] === NETWORK_DIASPORA)) {
+ if ($r && ($r["network"] === NETWORK_DIASPORA)) {
self::add_fcontact($r, $update);
$person = $r;
}
// Fetch the author - for the old and the new Diaspora version
if ($source_xml->post->status_message->diaspora_handle)
$author = (string)$source_xml->post->status_message->diaspora_handle;
- elseif ($source_xml->author AND ($source_xml->getName() == "status_message"))
+ elseif ($source_xml->author && ($source_xml->getName() == "status_message"))
$author = (string)$source_xml->author;
// If this isn't a "status_message" then quit
}
// If we are the origin of the parent we store the original data and notify our followers
- if ($message_id AND $parent_item["origin"]) {
+ if ($message_id && $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
}
// If we are the origin of the parent we store the original data and notify our followers
- if ($message_id AND $parent_item["origin"]) {
+ if ($message_id && $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
if ($contact) {
- if ($following AND $sharing) {
+ if ($following && $sharing) {
logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
self::receive_request_make_friend($importer, $contact);
}
}
- if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
+ if (!$following && $sharing && in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
return false;
- } elseif (!$following AND !$sharing) {
+ } elseif (!$following && !$sharing) {
logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG);
return false;
- } elseif (!$following AND $sharing) {
+ } elseif (!$following && $sharing) {
logger("Author ".$author." wants to share with us.", LOGGER_DEBUG);
- } elseif ($following AND $sharing) {
+ } elseif ($following && $sharing) {
logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG);
- } elseif ($following AND !$sharing) {
+ } elseif ($following && !$sharing) {
logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
}
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
// we are going to change the relationship and make them a follower.
- if (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing AND $following)
+ if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following)
$new_relation = CONTACT_IS_FRIEND;
- elseif (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing)
+ elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing)
$new_relation = CONTACT_IS_SHARING;
else
$new_relation = CONTACT_IS_FOLLOWER;
intval($r[0]["parent"]));
// Only delete it if the parent author really fits
- if (!link_compare($p[0]["author-link"], $contact["url"]) AND !link_compare($r[0]["author-link"], $contact["url"])) {
+ if (!link_compare($p[0]["author-link"], $contact["url"]) && !link_compare($r[0]["author-link"], $contact["url"])) {
logger("Thread author ".$p[0]["author-link"]." and item author ".$r[0]["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
return false;
}
$target_type = notags(unxmlify($data->target_type));
$contact = self::contact_by_handle($importer["uid"], $sender);
- if (!$contact AND (in_array($target_type, array("Contact", "Person")))) {
+ if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
$datarray["location"] = $address["address"];
}
- if (isset($address["lat"]) AND isset($address["lng"])) {
+ if (isset($address["lat"]) && isset($address["lng"])) {
$datarray["coord"] = $address["lat"]." ".$address["lng"];
}
// The message could not be delivered. We mark the contact as "dead"
mark_for_death($contact);
}
- } elseif (($return_code >= 200) AND ($return_code <= 299)) {
+ } elseif (($return_code >= 200) && ($return_code <= 299)) {
// We successfully delivered a message, the contact is alive
unmark_for_death($contact);
}
// Skip if it isn't a pure repeated messages
// Does it start with a share?
- if ((strpos($body, "[share") > 0) AND $complete)
+ if ((strpos($body, "[share") > 0) && $complete)
return(false);
// Does it end with a share?
$ret= array();
$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
- if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == ""))
+ if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == ""))
return(false);
$link = "";
$link = $matches[1];
$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
- if (($ret["root_guid"] == $link) OR (trim($ret["root_guid"]) == ""))
+ if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == ""))
return(false);
return($ret);
if ($event['start']) {
$eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
}
- if ($event['finish'] AND !$event['nofinish']) {
+ if ($event['finish'] && !$event['nofinish']) {
$eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
}
if ($event['summary']) {
$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
// Detect a share element and do a reshare
- if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) {
+ if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) {
$message = array("root_diaspora_id" => $ret["root_handle"],
"root_guid" => $ret["root_guid"],
"guid" => $item["guid"],
"provider_display_name" => $item["app"]);
// Diaspora rejects messages when they contain a location without "lat" or "lng"
- if (!isset($location["lat"]) OR !isset($location["lng"])) {
+ if (!isset($location["lat"]) || !isset($location["lng"])) {
unset($message["location"]);
}
// Old way - is used by the internal Friendica functions
/// @todo Change all signatur storing functions to the new format
- if ($signature['signed_text'] AND $signature['signature'] AND $signature['signer'])
+ if ($signature['signed_text'] && $signature['signature'] && $signature['signer'])
$message = self::message_from_signature($item, $signature);
else {// New way
$msg = json_decode($signature['signed_text'], true);
$target_type = "StatusMessage";
}
- if ($relay AND ($item["uri"] !== $item["parent-uri"]))
+ if ($relay && ($item["uri"] !== $item["parent-uri"]))
$signature = "parent_author_signature";
else
$signature = "target_author_signature";
public static function store_like_signature($contact, $post_id) {
// Is the contact the owner? Then fetch the private key
- if (!$contact['self'] OR ($contact['uid'] == 0)) {
+ if (!$contact['self'] || ($contact['uid'] == 0)) {
logger("No owner post, so not storing signature", LOGGER_DEBUG);
return false;
}
logger($result, LOGGER_DEBUG);
} elseif ($mode == 3) {
update_suggestions();
- } elseif (($mode == 2) AND get_config('system','poco_completion')) {
+ } elseif (($mode == 2) && get_config('system','poco_completion')) {
discover_users();
- } elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) {
+ } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) {
discover_directory($search);
gs_search_user($search);
- } elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) {
+ } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) {
// Query Friendica and Hubzilla servers for their users
poco_discover();
$server_url = $user["server_url"];
}
- if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) {
+ if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
logger('Check profile '.$user["url"]);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
if (dbm::is_result($exists)) {
logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
- if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
+ if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
($exists[0]["updated"] < $exists[0]["last_failure"])) {
continue;
}
if ($p->parameters)
foreach ($p->parameters as $x)
$params[strtolower($x->attribute)] = $x->value;
- if (isset($p->dparameters) and $p->dparameters)
+ if (isset($p->dparameters) && $p->dparameters)
foreach ($p->dparameters as $x)
$params[strtolower($x->attribute)] = $x->value;
// Any part with a filename is an attachment,
// so an attached text file (type 0) is not mistaken as the message.
- if ((isset($params['filename']) and $params['filename']) || (isset($params['name']) and $params['name'])) {
+ if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
// filename may be given as 'Filename' or 'Name' or both
$filename = ($params['filename'])? $params['filename'] : $params['name'];
// filename may be encoded, so see imap_mime_header_decode()
// }
// SUBPART RECURSION
- if (isset($p->parts) and $p->parts) {
+ if (isset($p->parts) && $p->parts) {
$x = "";
foreach ($p->parts as $partno0=>$p2) {
$x .= email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc.
intval($parent_id),
intval($params['uid'])
);
- if ($p AND count($p) AND ($p[0]["ignored"])) {
+ if ($p && count($p) && ($p[0]["ignored"])) {
logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
return;
}
dbesc($params['link']),
intval($params['uid'])
);
- if ($p and count($p)) {
+ if ($p && count($p)) {
pop_lang();
return;
}
logger('sending notification email');
- if (isset($params['parent']) AND (intval($params['parent']) != 0)) {
+ if (isset($params['parent']) && (intval($params['parent']) != 0)) {
$id_for_parent = $params['parent']."@".$hostname;
// Is this the first email notification for this parent item and user?
// Check for invalid profile urls. 13 should be the shortest possible profile length:
// http://a.bc/d
// Additionally check for invalid urls that would return the normalised value "http:"
- if ((strlen($profile) >= 13) AND (normalise_link($profile) != "http:")) {
+ if ((strlen($profile) >= 13) && (normalise_link($profile) != "http:")) {
if (!in_array($profile, $profiles2))
$profiles2[] = $profile;
$tagged = false;
foreach ($profiles AS $profile) {
- if (strpos($item[0]["tag"], "=".$profile."]") OR strpos($item[0]["body"], "=".$profile."]"))
+ if (strpos($item[0]["tag"], "=".$profile."]") || strpos($item[0]["body"], "=".$profile."]"))
$tagged = true;
}
- if ($item[0]["mention"] OR $tagged OR ($defaulttype == NOTIFY_TAGSELF)) {
+ if ($item[0]["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) {
$params["type"] = NOTIFY_TAGSELF;
$params["verb"] = ACTIVITY_TAG;
}
LIMIT 1",
intval($item[0]["parent"]), intval($uid));
- if ($parent AND !isset($params["type"])) {
+ if ($parent && !isset($params["type"])) {
$params["type"] = NOTIFY_COMMENT;
$params["verb"] = ACTIVITY_POST;
}
// make sure to not overwrite existing values with blank entries
foreach ($ret AS $key => $val) {
- if (isset($r[0][$key]) AND ($r[0][$key] != "") AND ($val == ""))
+ if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == ""))
$ret[$key] = $r[0][$key];
- if (isset($r[0][$key]) AND ($ret[$key] != $r[0][$key]))
+ if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key]))
$update = true;
}
}
if (dbm::is_result($r)) {
// Check for accessibility and do a poco discovery
- if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
+ if (poco_last_updated($r[0]['url'], true) && ($r[0]["network"] == NETWORK_DFRN))
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
}
intval($uid),
dbesc($name)
);
- notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
+ notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
}
return true;
}
if (dbm::is_result($r))
foreach ($r as $rr)
$ret[] = $rr['contact-id'];
- if ($check_dead AND !$use_gcontact) {
+ if ($check_dead && !$use_gcontact) {
require_once('include/acl_selectors.php');
$ret = prune_deadguys($ret);
}
if (strpos('*'.$startbb, '$1') > 0) {
- if ($replace and (@$attr[$attribute] != '')) {
+ if ($replace && (@$attr[$attribute] != '')) {
$startbb = preg_replace($value, $startbb, $attr[$attribute], -1, $count);
if ($pos == 0)
$pos = strpos($line, ' ');
- if (($pos > 0) and strlen($line) > $wraplen) {
+ if (($pos > 0) && strlen($line) > $wraplen) {
$newline = trim(substr($line, 0, $pos));
if ($level > 0)
$newline = str_repeat(">", $level).' '.$newline;
$line = substr($line, $pos+1);
}
- } while ((strlen($line) > $wraplen) and !($oldline == $line));
+ } while ((strlen($line) > $wraplen) && !($oldline == $line));
if ($level > 0)
$line = str_repeat(">", $level).' '.$line;
$line = substr($line, 0, $pos).substr($line, $pos+8);
}
- if (!$startquote or ($line != ''))
+ if (!$startquote || ($line != ''))
$newlines[] = breaklines($line, $currlevel, $wraplength);
}
return(implode($newlines, "\n"));
if (strpos($treffer[1], $listitem) !== false)
$ignore = true;
- if ((strpos($treffer[1], "//twitter.com/") !== false) and (strpos($treffer[1], "/status/") !== false))
+ if ((strpos($treffer[1], "//twitter.com/") !== false) && (strpos($treffer[1], "/status/") !== false))
$ignore = false;
- if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
+ if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/posts") !== false))
$ignore = false;
- if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/photos") !== false))
+ if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/photos") !== false))
$ignore = false;
if (!$ignore)
$message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
- if (!$compact AND ($message != "")) {
+ if (!$compact && ($message != "")) {
$counter = 1;
foreach ($urls as $id=>$url)
if ($url != "")
$profile['picdate'] = urlencode($profile['picdate']);
- if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
+ if (($profile['network'] != "") && ($profile['network'] != NETWORK_DFRN)) {
$profile['network_name'] = format_network_name($profile['network'], $profile['url']);
} else {
$profile['network_name'] = "";
}
// Is the local user already connected to that user?
- if ($connect AND local_user()) {
+ if ($connect && local_user()) {
if (isset($profile["url"])) {
$profile_url = normalise_link($profile["url"]);
} else {
$connect = false;
}
- if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
+ if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
$connect = false;
$remoteconnect = NULL;
if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect'];
- if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect))
+ if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect))
$subscribe_feed = t("Atom feed");
else
$subscribe_feed = false;
- if (remote_user() OR (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) {
+ if (remote_user() || (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) {
$wallmessage = t('Message');
$wallmessage_link = "wallmessage/".$profile["nickname"];
if (!$block) {
$contact_block = contact_block();
- if (is_array($a->profile) AND !$a->profile['hide-friends']) {
+ if (is_array($a->profile) && !$a->profile['hide-friends']) {
$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
intval($a->profile['uid']));
if (dbm::is_result($r))
$body = substr($body, 0, strlen($title));
}
- if (($title != $body) and (substr($title, -3) == "...")) {
+ if (($title != $body) && (substr($title, -3) == "...")) {
$pos = strrpos($title, "...");
if ($pos > 0) {
$title = substr($title, 0, $pos);
// It maybe is a rich content, but if it does have everything that a link has,
// then treat it that way
- if (($data["type"] == "rich") AND is_string($data["title"]) AND
- is_string($data["text"]) AND (sizeof($data["images"]) > 0)) {
+ if (($data["type"] == "rich") && is_string($data["title"]) &&
+ is_string($data["text"]) && (sizeof($data["images"]) > 0)) {
$data["type"] = "link";
}
- if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $data["url"])) {
+ if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
return "";
}
- if ($no_photos AND ($data["type"] == "photo")) {
+ if ($no_photos && ($data["type"] == "photo")) {
return "";
}
$preview = str_replace(array("[", "]"), array("[", "]"), htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
// if the preview picture is larger than 500 pixels then show it in a larger mode
// But only, if the picture isn't higher than large (To prevent huge posts)
- if (($data["images"][0]["width"] >= 500) AND ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
+ if (($data["images"][0]["width"] >= 500) && ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
$text .= " image='".$preview."'";
} else {
$text .= " preview='".$preview."'";
$text .= "]".$data["text"]."[/attachment]";
$hashtags = "";
- if (isset($data["keywords"]) AND count($data["keywords"])) {
+ if (isset($data["keywords"]) && count($data["keywords"])) {
$hashtags = "\n";
foreach ($data["keywords"] AS $keyword) {
/// @todo make a positive list of allowed characters
logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG);
- if (!$keywords AND isset($data["keywords"])) {
+ if (!$keywords && isset($data["keywords"])) {
unset($data["keywords"]);
}
- if (($keyword_blacklist != "") AND isset($data["keywords"])) {
+ if (($keyword_blacklist != "") && isset($data["keywords"])) {
$list = explode(", ", $keyword_blacklist);
foreach ($list AS $keyword) {
$keyword = trim($keyword);
$data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist);
$tags = "";
- if (isset($data["keywords"]) AND count($data["keywords"])) {
+ if (isset($data["keywords"]) && count($data["keywords"])) {
foreach ($data["keywords"] AS $keyword) {
$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
array("", "", "", "", "", ""), $keyword);
}
// Convert urls without bbcode elements
- if (!$matches AND $texturl) {
+ if (!$matches && $texturl) {
preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches);
// Yeah, a hack. I really hate regular expressions :)
}
// Remove the link from the body if the link is attached at the end of the post
- if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) {
+ if (isset($footer) && (trim($footer) != "") && (strpos($footer, $matches[1]))) {
$removedlink = trim(str_replace($matches[1], "", $body));
- if (($removedlink == "") OR strstr($body, $removedlink)) {
+ if (($removedlink == "") || strstr($body, $removedlink)) {
$body = $removedlink;
}
$url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]);
$removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body);
- if (($removedlink == "") OR strstr($body, $removedlink)) {
+ if (($removedlink == "") || strstr($body, $removedlink)) {
$body = $removedlink;
}
}
// Add the page information to the bottom
- if (isset($footer) AND (trim($footer) != "")) {
+ if (isset($footer) && (trim($footer) != "")) {
$body .= $footer;
}
if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
$conversation = array('item-uri' => $arr['uri'], 'received' => dbm::date());
- if (isset($arr['parent-uri']) AND ($arr['parent-uri'] != $arr['uri'])) {
+ if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
$conversation['reply-to-uri'] = $arr['parent-uri'];
}
- if (isset($arr['thr-parent']) AND ($arr['thr-parent'] != $arr['uri'])) {
+ if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
$conversation['reply-to-uri'] = $arr['thr-parent'];
}
unset($old_conv['source']);
}
// Update structure data all the time but the source only when its from a better protocol.
- if (($old_conv['protocol'] < $conversation['protocol']) AND ($old_conv['protocol'] != 0)) {
+ if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
unset($conversation['protocol']);
unset($conversation['source']);
}
if ($notify) {
$guid_prefix = "";
- } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) {
+ } elseif ((trim($arr['guid']) == "") && (trim($arr['plink']) != "")) {
$arr['guid'] = uri_to_guid($arr['plink']);
- } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) {
+ } elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) {
$arr['guid'] = uri_to_guid($arr['uri']);
} else {
$parsed = parse_url($arr["author-link"]);
$arr['edited'] = datetime_convert();
}
- if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) {
+ if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG);
}
$a = get_app();
$self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
- if ((normalise_link($arr['author-link']) == $self) OR (normalise_link($arr['owner-link']) == $self)) {
+ if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) {
q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($parent_id));
logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
}
// update the commented timestamp on the parent
// Only update "commented" if it is really a comment
- if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) {
+ if (($arr['verb'] == ACTIVITY_POST) || !get_config("system", "like_no_comment")) {
q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
* current post can be deleted if is for a community page and no mention are
* in it.
*/
- if (!$deleted AND !$dontcache) {
+ if (!$deleted && !$dontcache) {
$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
if ((dbm::is_result($r)) && (count($r) == 1)) {
*/
function item_set_last_item($arr) {
- $update = (!$arr['private'] AND (($arr["author-link"] === $arr["owner-link"]) OR ($arr["parent-uri"] === $arr["uri"])));
+ $update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
// Is it a forum? Then we don't care about the rules from above
- if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) {
+ if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
$isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
intval($arr['contact-id']));
if (dbm::is_result($isforum)) {
// Does the given user have this item?
if ($uid) {
$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
if (dbm::is_result($r)) {
$id = $r[0]["id"];
// Or is it anywhere on the server?
if ($nick == "") {
$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`private` = 0 AND `item`.`wall` = 1
return false;
}
- if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) {
+ if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
return false;
}
intval($importer['uid'])
);
- if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+ if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
// create notification
$hash = random_string();
));
}
- } elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+ } elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
$r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
intval($importer['uid']),
dbesc($url)
logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token);
- if (!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) {
+ if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
$r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d",
dbesc($verify_token),
intval($contact['id'])
);
- $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($uri),
intval(local_user())
);
// Sollte sich der Signaturtrenner innerhalb eines Quotes befinden
// wird keine Signaturtrennung ausgefuehrt
- if (($sigpos < $quotepos) and ($sigpos != 0))
+ if (($sigpos < $quotepos) && ($sigpos != 0))
return(array('body' => $message, 'sig' => ''));
/// @TODO Regexp umstellen, so dass auf 1 oder kein Leerzeichen
preg_match($pattern, $message, $result);
- if (($result[1] != '') and ($result[2] != '')) {
+ if (($result[1] != '') && ($result[2] != '')) {
$cleaned = trim($result[1])."\n";
$sig = trim($result[2]);
// '[hr][size=x-small][color=darkblue]'.trim($result[2]).'[/color][/size]';
foreach ($arrbody as $i => $line) {
$currquotelevel = 0;
$currline = $line;
- while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
- or (substr($currline, 0, 1) == ' '))) {
+ while ((strlen($currline)>0) && ((substr($currline, 0, 1) == '>')
+ || (substr($currline, 0, 1) == ' '))) {
if (substr($currline, 0, 1) == '>')
$currquotelevel++;
$quotelevel = 0;
$nextline = trim($arrbody[$i+1]);
- while ((strlen($nextline)>0) and ((substr($nextline, 0, 1) == '>')
- or (substr($nextline, 0, 1) == ' '))) {
+ while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>')
+ || (substr($nextline, 0, 1) == ' '))) {
if (substr($nextline, 0, 1) == '>')
$quotelevel++;
$len = strlen($line);
$firstword = strpos($nextline.' ', ' ');
- $specialchars = ((substr(trim($nextline), 0, 1) == '-') or
- (substr(trim($nextline), 0, 1) == '=') or
- (substr(trim($nextline), 0, 1) == '*') or
- (substr(trim($nextline), 0, 1) == '·') or
- (substr(trim($nextline), 0, 4) == '[url') or
- (substr(trim($nextline), 0, 5) == '[size') or
- (substr(trim($nextline), 0, 7) == 'http://') or
+ $specialchars = ((substr(trim($nextline), 0, 1) == '-') ||
+ (substr(trim($nextline), 0, 1) == '=') ||
+ (substr(trim($nextline), 0, 1) == '*') ||
+ (substr(trim($nextline), 0, 1) == '·') ||
+ (substr(trim($nextline), 0, 4) == '[url') ||
+ (substr(trim($nextline), 0, 5) == '[size') ||
+ (substr(trim($nextline), 0, 7) == 'http://') ||
(substr(trim($nextline), 0, 8) == 'https://'));
if (!$specialchars)
- $specialchars = ((substr(rtrim($line), -1) == '-') or
- (substr(rtrim($line), -1) == '=') or
- (substr(rtrim($line), -1) == '*') or
- (substr(rtrim($line), -1) == '·') or
- (substr(rtrim($line), -6) == '[/url]') or
+ $specialchars = ((substr(rtrim($line), -1) == '-') ||
+ (substr(rtrim($line), -1) == '=') ||
+ (substr(rtrim($line), -1) == '*') ||
+ (substr(rtrim($line), -1) == '·') ||
+ (substr(rtrim($line), -6) == '[/url]') ||
(substr(rtrim($line), -7) == '[/size]'));
//if ($specialchars)
if (substr($lines[$lineno], -1) != ' ')
$lines[$lineno] .= ' ';
- while ((strlen($line)>0) and ((substr($line, 0, 1) == '>')
- or (substr($line, 0, 1) == ' '))) {
+ while ((strlen($line)>0) && ((substr($line, 0, 1) == '>')
+ || (substr($line, 0, 1) == ' '))) {
$line = ltrim(substr($line, 1));
}
// $lines[$lineno] = $quotelevel.'-'.$len.'-'.$firstword.'-';
$lines[$lineno] .= $line;
- //if ((($len + $firstword < 68) and (substr($line, -1, 1) != ' '))
- // or ($quotelevel != $currquotelevel) or $specialchars)
+ //if ((($len + $firstword < 68) && (substr($line, -1, 1) != ' '))
+ // || ($quotelevel != $currquotelevel) || $specialchars)
if (((substr($line, -1, 1) != ' '))
- or ($quotelevel != $currquotelevel))
+ || ($quotelevel != $currquotelevel))
$lineno++;
}
return(implode("\n", $lines));
$nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games'));
}
- if (local_user() OR !get_config('system', 'local_search')) {
+ if (local_user() || !get_config('system', 'local_search')) {
$nav['search'] = array('search', t('Search'), '', t('Search site content'));
$nav['searchoption'] = array(
$newurl = $curl_info['redirect_url'];
- if (($new_location_info['path'] == '') AND ( $new_location_info['host'] != '')) {
+ if (($new_location_info['path'] == '') && ( $new_location_info['host'] != '')) {
$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
}
if ($http_code == 0)
return($url);
- if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
- AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
+ if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302"))
+ && (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))) {
if ($curl_info['redirect_url'] != "")
return(original_url($curl_info['redirect_url'], ++$depth, $fetchbody));
else
return($url);
// if it isn't a HTML file then exit
- if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
+ if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]),"html"))
return($url);
$stamp1 = microtime(true);
*/
function matching_url($url1, $url2) {
- if (($url1 == "") OR ($url2 == ""))
+ if (($url1 == "") || ($url2 == ""))
return "";
$url1 = normalise_link($url1);
$parts1 = parse_url($url1);
$parts2 = parse_url($url2);
- if (!isset($parts1["host"]) OR !isset($parts2["host"]))
+ if (!isset($parts1["host"]) || !isset($parts2["host"]))
return "";
if ($parts1["scheme"] != $parts2["scheme"])
if ($path1 == $path2)
$path .= $path1."/";
- } while (($path1 == $path2) AND ($i++ <= count($pathparts1)));
+ } while (($path1 == $path2) && ($i++ <= count($pathparts1)));
$match .= $path;
$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
} else {
// find ancestors
- $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
intval($item_id)
);
$updated = $r[0]['edited'];
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+ FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
intval($parent_id)
);
$recipients = array($parent['contact-id']);
$recipients_followup = array($parent['contact-id']);
- //if (!$target_item['private'] AND $target_item['wall'] AND
- if (!$target_item['private'] AND
+ //if (!$target_item['private'] && $target_item['wall'] &&
+ if (!$target_item['private'] &&
(strlen($target_item['allow_cid'].$target_item['allow_gid'].
$target_item['deny_cid'].$target_item['deny_gid']) == 0))
$push_notify = true;
- if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+ if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
$push_notify = true;
// If the thread parent is OStatus then do some magic to distribute the messages.
// We have not only to look at the parent, since it could be a Friendica thread.
- if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+ if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
$diaspora_delivery = false;
}
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
- if ($push_notify AND strlen($hub)) {
+ if ($push_notify && strlen($hub)) {
$hubs = explode(',', $hub);
if (count($hubs)) {
foreach ($hubs as $h) {
$j->embedurl = $embedurl;
// If fetching information doesn't work, then improve via internal functions
- if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
+ if (($j->type == "error") || ($no_rich_type && ($j->type == "rich"))) {
$data = ParseUrl::getSiteinfoCached($embedurl, true, false);
$j->type = $data["type"];
if (isset($j->author_name)) {
$ret.=" (".$j->author_name.")";
}
- } elseif (isset($j->provider_name) OR isset($j->author_name)) {
+ } elseif (isset($j->provider_name) || isset($j->author_name)) {
$embedlink = "";
if (isset($j->provider_name)) {
$embedlink .= $j->provider_name;
$contact = $contacts[0];
// load current friends if possible.
- if (($contact['poco'] != "") AND ($contact['success_update'] > $contact['failure_update'])) {
- $r = q("SELECT count(*) as total from glink
- where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+ if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) {
+ $r = q("SELECT count(*) AS total FROM glink
+ WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
intval($contact['id'])
);
if (dbm::is_result($r)) {
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
// Only delete when mails aren't automatically moved or deleted
- if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3))
+ if (($mailconf[0]['action'] != 1) && ($mailconf[0]['action'] != 3))
if ($meta->deleted && ! $r[0]['deleted']) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
// Is it a reply?
- $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
- (substr(strtolower($datarray['title']), 0, 3) == "re-") or
+ $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
+ (substr(strtolower($datarray['title']), 0, 3) == "re-") ||
($raw_refs != ""));
// Remove Reply-signs in the subject
$datarray['title'] = RemoveReply($datarray['title']);
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
- if (!x($datarray,'parent-uri') and $reply) {
+ if (!x($datarray,'parent-uri') && $reply) {
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
dbesc(protect_sprintf($datarray['title'])),
intval($importer_uid),
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
if (is_object($alternate)) {
foreach ($alternate AS $attributes) {
- if (($attributes->name == "href") AND ($attributes->textContent != "")) {
+ if (($attributes->name == "href") && ($attributes->textContent != "")) {
$author["author-link"] = $attributes->textContent;
}
}
$width = $attributes->textContent;
}
}
- if (($width > 0) AND ($href != "")) {
+ if (($width > 0) && ($href != "")) {
$avatarlist[$width] = $href;
}
}
$author["owner-avatar"] = $author["author-avatar"];
// Only update the contacts if it is an OStatus contact
- if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
+ if ($r && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
// Update contact data
if ($value != "")
$contact["location"] = $value;
- if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR
- ($contact["alias"] != $r[0]["alias"]) OR ($contact["location"] != $r[0]["location"])) {
+ if (($contact["name"] != $r[0]["name"]) || ($contact["nick"] != $r[0]["nick"]) || ($contact["about"] != $r[0]["about"]) ||
+ ($contact["alias"] != $r[0]["alias"]) || ($contact["location"] != $r[0]["location"])) {
logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG);
dbesc(datetime_convert()), intval($contact["id"]));
}
- if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) {
+ if (isset($author["author-avatar"]) && ($author["author-avatar"] != $r[0]['avatar'])) {
logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
// Mastodon Content Warning
- if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) {
+ if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
$clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
$item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]';
}
- if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+ if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
foreach ($links AS $link) {
$attribute = self::read_attributes($link);
- if (($attribute['rel'] != "") AND ($attribute['href'] != "")) {
+ if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
switch ($attribute['rel']) {
case "alternate":
$item["plink"] = $attribute['href'];
- if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
+ if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) ||
($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
$item["body"] .= add_page_info($attribute['href']);
}
$repeat_of = "";
$notice_info = $xpath->query('statusnet:notice_info', $entry);
- if ($notice_info AND ($notice_info->length > 0)) {
+ if ($notice_info && ($notice_info->length > 0)) {
foreach ($notice_info->item(0)->attributes AS $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
// Is it a repeated post?
- if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) {
+ if (($repeat_of != "") || ($item["verb"] == ACTIVITY_SHARE)) {
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
if (is_object($activityobjects)) {
$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
}
$orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
- if ($orig_links AND ($orig_links->length > 0)) {
+ if ($orig_links && ($orig_links->length > 0)) {
foreach ($orig_links->item(0)->attributes AS $attributes) {
if ($attributes->name == "href") {
$orig_link = $attributes->textContent;
intval($importer["uid"]), dbesc($item["parent-uri"]));
// Only fetch missing stuff if it is a comment or reshare.
- if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) AND
- !dbm::is_result($r) AND ($related != "")) {
+ if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) &&
+ !dbm::is_result($r) && ($related != "")) {
$reply_path = str_replace("/notice/", "/api/statuses/show/", $related).".atom";
if ($reply_path != $related) {
public static function convert_href($href) {
$elements = explode(":",$href);
- if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+ if ((count($elements) <= 2) || ($elements[0] != "tag"))
return $href;
$server = explode(",", $elements[1]);
$conversation = explode("=", $elements[2]);
- if ((count($elements) == 4) AND ($elements[2] == "post"))
+ if ((count($elements) == 4) && ($elements[2] == "post"))
return "http://".$server[0]."/notice/".$elements[3];
- if ((count($conversation) != 2) OR ($conversation[1] ==""))
+ if ((count($conversation) != 2) || ($conversation[1] ==""))
return $href;
if ($elements[3] == "objectType=thread")
}
// Don't poll if the interval is set negative
- if (($poll_interval < 0) AND !$override) {
+ if (($poll_interval < 0) && !$override) {
return;
}
}
- if ($last AND !$override) {
+ if ($last && !$override) {
$next = $last + ($poll_interval * 60);
if ($next > time()) {
logger('poll interval not reached');
if ($conversation_id != "") {
$elements = explode(":", $conversation_id);
- if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+ if ((count($elements) <= 2) || ($elements[0] != "tag"))
return $conversation_id;
}
// If the thread shouldn't be completed then store the item and go away
// Don't do a completion on liked content
- if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR
- ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) {
+ if (((intval(get_config('system','ostatus_poll_interval')) == -2) && (count($item) > 0)) ||
+ ($item["verb"] == ACTIVITY_LIKE) || ($conversation_url == "")) {
$item_stored = item_store($item, $all_threads);
return $item_stored;
}
$conv_arr = z_fetch_url($conv."?page=".$pageno);
// If it is a non-ssl site and there is an error, then try ssl or vice versa
- if (!$conv_arr["success"] AND (substr($conv, 0, 7) == "http://")) {
+ if (!$conv_arr["success"] && (substr($conv, 0, 7) == "http://")) {
$conv = str_replace("http://", "https://", $conv);
$conv_as = fetch_url($conv."?page=".$pageno);
- } elseif (!$conv_arr["success"] AND (substr($conv, 0, 8) == "https://")) {
+ } elseif (!$conv_arr["success"] && (substr($conv, 0, 8) == "https://")) {
$conv = str_replace("https://", "http://", $conv);
$conv_as = fetch_url($conv."?page=".$pageno);
} else
// 1. Our conversation hasn't the "real" thread starter
// 2. This first post is a post inside our thread
// 3. This first post is a post inside another thread
- if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) {
+ if (($first_id != $parent["uri"]) && ($parent["uri"] != "")) {
$new_parent = true;
}
// The item we are having on the system is the one that we wanted to store via the item array
- if (isset($item["uri"]) AND ($item["uri"] == $existing_message["uri"])) {
+ if (isset($item["uri"]) && ($item["uri"] == $existing_message["uri"])) {
$item = array();
$item_stored = 0;
}
$details = self::get_actor_details($actor, $uid, $parent["contact-id"]);
// Do we only want to import threads that were started by our contacts?
- if ($details["not_following"] AND $new_parent AND get_config('system','ostatus_full_threads')) {
+ if ($details["not_following"] && $new_parent && get_config('system','ostatus_full_threads')) {
logger("Don't import uri ".$first_id." because user ".$uid." doesn't follow the person ".$actor, LOGGER_DEBUG);
continue;
}
$arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
// Is it a reshared item?
- if (isset($single_conv->verb) AND ($single_conv->verb == "share") AND isset($single_conv->object)) {
+ if (isset($single_conv->verb) && ($single_conv->verb == "share") && isset($single_conv->object)) {
if (is_array($single_conv->object))
$single_conv->object = $single_conv->object[0];
unset($arr["coord"]);
// Copy fields from given item array
- if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] == $single_conv->id))) {
+ if (isset($item["uri"]) && (($item["uri"] == $arr["uri"]) || ($item["uri"] == $single_conv->id))) {
logger('Use stored item array for item with URI '.$item["uri"], LOGGER_DEBUG);
$newitem = item_store($item);
$item = array();
}
}
- if (($item_stored < 0) AND (count($item) > 0)) {
+ if (($item_stored < 0) && (count($item) > 0)) {
if (get_config('system','ostatus_full_threads')) {
$details = self::get_actor_details($item["owner-link"], $uid, $item["contact-id"]);
break;
}
- if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
+ if (($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
$imgdata = get_photo_info($siteinfo["image"]);
$attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"],
*/
private function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) {
- if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+ if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
*/
private function like_entry($doc, $item, $owner, $toplevel) {
- if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+ if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
*/
private function note_entry($doc, $item, $owner, $toplevel) {
- if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+ if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
"href" => App::get_baseurl()."/display/".$item["guid"]));
- if ($complete AND ($item["id"] > 0))
+ if ($complete && ($item["id"] > 0))
xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
xml::add_element($doc, $entry, "activity:verb", $verb);
$mentioned = array();
- if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) {
+ if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
dbesc(normalise_link($mention)));
- if ($r[0]["forum"] OR $r[0]["prv"])
+ if ($r[0]["forum"] || $r[0]["prv"])
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
self::get_attachment($doc, $entry, $item);
- if ($complete AND ($item["id"] > 0)) {
+ if ($complete && ($item["id"] > 0)) {
$app = $item["app"];
if ($app == "")
$app = "web";
$minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0;
$seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0;
- $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1;
+ $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1;
return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
}
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
$albums = Cache::get($key);
- if (is_null($albums) OR $update) {
+ if (is_null($albums) || $update) {
if (!Config::get('system', 'no_count', false)) {
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
if (file_exists($this->_file)) {
$pid = trim(@file_get_contents($this->_file));
- if (($pid != "") AND posix_kill($pid, 0)) {
+ if (($pid != "") && posix_kill($pid, 0)) {
$this->_running = true;
}
}
$picturedata = get_photo_info($matches[1]);
- if (($picturedata[0] >= 500) AND ($picturedata[0] >= $picturedata[1]))
+ if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
$post["image"] = $matches[1];
else
$post["preview"] = $matches[1];
$post["url"] = $matches[1];
$post["title"] = $matches[2];
}
- if (($post["url"] == "") AND (in_array($post["type"], array("link", "video")))
- AND preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
+ if (($post["url"] == "") && (in_array($post["type"], array("link", "video")))
+ && preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
$post["url"] = $matches[1];
}
// Workaround:
// Sometimes photo posts to the own album are not detected at the start.
// So we seem to cannot use the cache for these cases. That's strange.
- if (($data["type"] != "photo") AND strstr($pictures[0][1], "/photos/"))
+ if (($data["type"] != "photo") && strstr($pictures[0][1], "/photos/"))
$data = ParseUrl::getSiteinfo($pictures[0][1], true);
if ($data["type"] == "photo") {
$post["type"] = "text";
$post["text"] = trim($body);
}
- } elseif (isset($post["url"]) AND ($post["type"] == "video")) {
+ } elseif (isset($post["url"]) && ($post["type"] == "video")) {
$data = ParseUrl::getSiteinfoCached($post["url"], true);
if (isset($data["images"][0]))
if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit)
$msg = trim($msg."\n".$line);
// Is the new message empty by now or is it a reshared message?
- elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
+ elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle)))
$msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
else
break;
//$post = get_attached_data($b["body"]);
$post = get_attached_data($body);
- if (($b["title"] != "") AND ($post["text"] != ""))
+ if (($b["title"] != "") && ($post["text"] != ""))
$post["text"] = trim($b["title"]."\n\n".$post["text"]);
elseif ($b["title"] != "")
$post["text"] = trim($b["title"]);
// If we post to a network with no limit we only fetch
// an abstract exactly for this network
- if (($limit == 0) AND ($abstract == $default_abstract))
+ if (($limit == 0) && ($abstract == $default_abstract))
$abstract = "";
} else // Try to guess the correct target network
elseif ($post["type"] == "photo")
$link = $post["image"];
- if (($msg == "") AND isset($post["title"]))
+ if (($msg == "") && isset($post["title"]))
$msg = trim($post["title"]);
- if (($msg == "") AND isset($post["description"]))
+ if (($msg == "") && isset($post["description"]))
$msg = trim($post["description"]);
// If the link is already contained in the post, then it neeedn't to be added again
// But: if the link is beyond the limit, then it has to be added.
- if (($link != "") AND strstr($msg, $link)) {
+ if (($link != "") && strstr($msg, $link)) {
$pos = strpos($msg, $link);
// Will the text be shortened in the link?
// Or is the link the last item in the post?
- if (($limit > 0) AND ($pos < $limit) AND (($pos + 23 > $limit) OR ($pos + strlen($link) == strlen($msg))))
+ if (($limit > 0) && ($pos < $limit) && (($pos + 23 > $limit) || ($pos + strlen($link) == strlen($msg))))
$msg = trim(str_replace($link, "", $msg));
- elseif (($limit == 0) OR ($pos < $limit)) {
+ elseif (($limit == 0) || ($pos < $limit)) {
// The limit has to be increased since it will be shortened - but not now
// Only do it with Twitter (htmlmode = 8)
- if (($limit > 0) AND (strlen($link) > 23) AND ($htmlmode == 8))
+ if (($limit > 0) && (strlen($link) > 23) && ($htmlmode == 8))
$limit = $limit - 23 + strlen($link);
$link = "";
if (iconv_strlen($msg, "UTF-8") > $limit) {
- if (($post["type"] == "text") AND isset($post["url"]))
+ if (($post["type"] == "text") && isset($post["url"]))
$post["url"] = $b["plink"];
elseif (!isset($post["url"])) {
$limit = $limit - 23;
$root = $root . '/';
}
$theme_info = $a->theme_info;
- if (is_array($theme_info) AND array_key_exists('extends',$theme_info)) {
+ if (is_array($theme_info) && array_key_exists('extends',$theme_info)) {
$parent = $theme_info['extends'];
} else {
$parent = 'NOPATH';
use Friendica\Core\Config;
use Friendica\Util\Lock;
-if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
+if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
$directory = dirname($_SERVER["argv"][0]);
if (substr($directory, 0, 1) != "/") {
}
// Now we start additional cron processes if we should do so
- if (($argc <= 1) OR ($argv[1] != "no_cron")) {
+ if (($argc <= 1) || ($argv[1] != "no_cron")) {
poller_run_cron();
}
if (is_null($entries)) {
$entries = poller_total_entries();
}
- if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) {
+ if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($entries > 0) && ($active >= $queues)) {
if (is_null($top_priority)) {
$top_priority = poller_highest_priority();
}
if (is_null($high_running)) {
$high_running = poller_process_with_priority_active($top_priority);
}
- if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
+ if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) {
logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
$queues = $active + 1;
}
logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
// Are there fewer workers running as possible? Then fork a new one.
- if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
+ if (!Config::get("system", "worker_dont_fork") && ($queues > ($active + 1)) && ($entries > 1)) {
logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
$args = array("include/poller.php", "no_cron");
$a = get_app();
if (!$id) {
logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG);
return false;
- } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+ } elseif ((strtotime($id[0]["executed"]) <= 0) || ($id[0]["pid"] == 0)) {
logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
return false;
} elseif ($id[0]["pid"] != $mypid) {
WHERE `thread`.`gcontact-id` = 0 AND
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
- if ($r AND ($r[0]["total"] == 0)) {
+ if ($r && ($r[0]["total"] == 0)) {
set_config("system", "post_update_version", 1192);
return true;
}
WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
- if ($r AND ($r[0]["total"] == 0)) {
+ if ($r && ($r[0]["total"] == 0)) {
set_config("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG);
return true;
return false;
}
foreach ($r AS $user) {
- if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"])) {
+ if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {
q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d",
dbesc($user["lastitem_date"]),
intval($user["id"]));
// For the first 12 hours we'll try to deliver every 15 minutes
// After that, we'll only attempt delivery once per hour.
- $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+ $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
call_hooks('queue_predeliver', $a, $r);
$dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
- if (!is_null($dead) AND $dead) {
+ if (!is_null($dead) && $dead) {
logger('queue: skipping known dead url: '.$c[0]['notify']);
update_queue_time($q_item['id']);
return;
Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
}
- if (!is_null($vital) AND !$vital) {
+ if (!is_null($vital) && !$vital) {
logger('queue: skipping dead server: '.$server);
update_queue_time($q_item['id']);
return;
$quoteline = $arrbody[$i];
while ((strlen($quoteline)>0) and ((substr($quoteline, 0, 1) == '>')
- or (substr($quoteline, 0, 1) == ' '))) {
+ || (substr($quoteline, 0, 1) == ' '))) {
if (substr($quoteline, 0, 1) == '>')
$quotelevel++;
$memcache = cache::memcache();
$a = get_app();
- if (is_object($memcache) AND is_object($a)) {
+ if (is_object($memcache) && is_object($a)) {
$memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
return true;
}
$gender = $entry->gender;
}
- if (isset($entry->generation) AND ($entry->generation > 0)) {
+ if (isset($entry->generation) && ($entry->generation > 0)) {
$generation = ++$entry->generation;
}
}
}
- if (isset($entry->contactType) AND ($entry->contactType >= 0))
+ if (isset($entry->contactType) && ($entry->contactType >= 0))
$contact_type = $entry->contactType;
$gcontact = array("url" => $profile_url,
$alternate = poco_alternate_ostatus_url($gcontact['url']);
// The global contacts should contain the original picture, not the cached one
- if (($gcontact['generation'] != 1) AND stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
+ if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
$gcontact['photo'] = "";
}
$gcontact['network'] = $r[0]["network"];
}
- if (($gcontact['network'] == "") OR ($gcontact['network'] == NETWORK_OSTATUS)) {
+ if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) {
$r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
);
);
if (count($x)) {
- if (!isset($gcontact['network']) AND ($x[0]["network"] != NETWORK_STATUSNET)) {
+ if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
$gcontact['network'] = $x[0]["network"];
}
if ($gcontact['updated'] <= NULL_DATE) {
$gcontact['updated'] = $x[0]["updated"];
}
- if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) {
+ if (!isset($gcontact['server_url']) && (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) {
$gcontact['server_url'] = $x[0]["server_url"];
}
if (!isset($gcontact['addr'])) {
}
}
- if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate)
- AND poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) {
+ if ((!isset($gcontact['network']) || !isset($gcontact['name']) || !isset($gcontact['addr']) || !isset($gcontact['photo']) || !isset($gcontact['server_url']) || $alternate)
+ && poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) {
$data = Probe::uri($gcontact['url']);
if ($data["network"] == NETWORK_PHANTOM) {
$gcontact = array_merge($gcontact, $data);
- if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) {
+ if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
// Delete the old entry - if it exists
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
if ($r) {
}
}
- if (!isset($gcontact['name']) OR !isset($gcontact['photo'])) {
+ if (!isset($gcontact['name']) || !isset($gcontact['photo'])) {
throw new Exception('No name and photo for URL '.$gcontact['url']);
}
$server_url = normalise_link(poco_detect_server($profile));
}
- if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) {
+ if (($server_url == '') && ($gcontacts[0]["server_url"] != "")) {
$server_url = $gcontacts[0]["server_url"];
}
- if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) {
+ if (!$force && (($server_url == '') || ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) {
$server_url = normalise_link(poco_detect_server($profile));
}
}
// noscrape is really fast so we don't cache the call.
- if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) {
+ if (($server_url != "") && ($gcontacts[0]["nick"] != "")) {
// Use noscrape if possible
$server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
if ($server) {
$noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
- if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
+ if ($noscraperet["success"] && ($noscraperet["body"] != "")) {
$noscrape = json_decode($noscraperet["body"], true);
}
// If we only can poll the feed, then we only do this once a while
- if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
+ if (!$force && !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
update_gcontact($contact);
// Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711)
// Then check the other link and delete this one
- if (($data["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($profile) AND
- (normalise_link($profile) == normalise_link($data["alias"])) AND
+ if (($data["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($profile) &&
+ (normalise_link($profile) == normalise_link($data["alias"])) &&
(normalise_link($profile) != normalise_link($data["url"]))) {
// Delete the old entry
return false;
}
- if (($data["poll"] == "") OR (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
+ if (($data["poll"] == "") || (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc(datetime_convert()), dbesc(normalise_link($profile)));
return false;
// If the last contact was less than a week ago and the last failure is older than a week then don't update
- //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time))
+ //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
// return false;
// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
- if ((($now - $contact_time) > (60 * 60 * 24 * 7)) AND (($now - $created_time) > (60 * 60 * 24 * 7)) AND (($now - $failure_time) < (60 * 60 * 24 * 7)))
+ if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7)))
return false;
// If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
- if ((($now - $contact_time) > (60 * 60 * 24 * 30)) AND (($now - $created_time) > (60 * 60 * 24 * 30)) AND (($now - $failure_time) < (60 * 60 * 24 * 30)))
+ if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30)))
return false;
return true;
}
function poco_to_boolean($val) {
- if (($val == "true") OR ($val == 1))
+ if (($val == "true") || ($val == 1))
return(true);
- if (($val == "false") OR ($val == 0))
+ if (($val == "false") || ($val == 0))
return(false);
return ($val);
$server['register_policy'] = REGISTER_CLOSED;
- if (is_bool($nodeinfo->openRegistrations) AND $nodeinfo->openRegistrations) {
+ if (is_bool($nodeinfo->openRegistrations) && $nodeinfo->openRegistrations) {
$server['register_policy'] = REGISTER_OPEN;
}
$info = $servers[0]["info"];
$register_policy = $servers[0]["register_policy"];
- if (!$force AND !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) {
+ if (!$force && !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) {
logger("Use cached data for server ".$server_url, LOGGER_DEBUG);
return ($last_contact >= $last_failure);
}
// Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits.
- if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND
+ if (dbm::is_result($servers) && ($orig_server_url == $server_url) &&
($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
// Maybe the page is unencrypted only?
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
- if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
+ if (!$serverret["success"] || ($serverret["body"] == "") || (@sizeof($xmlobj) == 0) || !is_object($xmlobj)) {
$server_url = str_replace("https://", "http://", $server_url);
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
}
- if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
+ if (!$serverret["success"] || ($serverret["body"] == "") || (sizeof($xmlobj) == 0) || !is_object($xmlobj)) {
// Workaround for bad configured servers (known nginx problem)
if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) {
$failure = true;
// Test for Diaspora, Hubzilla, Mastodon or older Friendica servers
$serverret = z_fetch_url($server_url);
- if (!$serverret["success"] OR ($serverret["body"] == "")) {
+ if (!$serverret["success"] || ($serverret["body"] == "")) {
$failure = true;
} else {
$server = poco_detect_server_type($serverret["body"]);
}
}
- if (!$failure AND ($poco == "")) {
+ if (!$failure && ($poco == "")) {
// Test for Statusnet
// Will also return data for Friendica and GNU Social - but it will be overwritten later
// The "not implemented" is a special treatment for really, really old Friendica versions
$serverret = z_fetch_url($server_url."/api/statusnet/version.json");
- if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
- ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
+ if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
+ ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
$platform = "StatusNet";
// Remove junk that some GNU Social servers return
$version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
// Test for GNU Social
$serverret = z_fetch_url($server_url."/api/gnusocial/version.json");
- if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
- ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
+ if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
+ ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
$platform = "GNU Social";
// Remove junk that some GNU Social servers return
$version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
// Test for Mastodon
$serverret = z_fetch_url($server_url."/api/v1/instance");
- if ($serverret["success"] AND ($serverret["body"] != '')) {
+ if ($serverret["success"] && ($serverret["body"] != '')) {
$data = json_decode($serverret["body"]);
if (isset($data->version)) {
$platform = "Mastodon";
$data->site->private = poco_to_boolean($data->site->private);
$data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
- if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly)
+ if (!$data->site->closed && !$data->site->private and $data->site->inviteonly)
$register_policy = REGISTER_APPROVE;
- elseif (!$data->site->closed AND !$data->site->private)
+ elseif (!$data->site->closed && !$data->site->private)
$register_policy = REGISTER_OPEN;
else
$register_policy = REGISTER_CLOSED;
// Check for noscrape
// Friendica servers could be detected as OStatus servers
- if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
+ if (!$failure && in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
$serverret = z_fetch_url($server_url."/friendica/json");
if (!$serverret["success"])
}
}
- if ($possible_failure AND !$failure) {
+ if ($possible_failure && !$failure) {
$failure = true;
}
$last_failure = $orig_last_failure;
}
- if (($last_contact <= $last_failure) AND !$failure) {
+ if (($last_contact <= $last_failure) && !$failure) {
logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG);
- } else if (($last_contact >= $last_failure) AND $failure) {
+ } else if (($last_contact >= $last_failure) && $failure) {
logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG);
}
$success = poco_discover_server(json_decode($retdata["body"]));
}
- if (!$success AND (get_config('system','poco_discovery') > 2)) {
+ if (!$success && (get_config('system','poco_discovery') > 2)) {
logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server);
}
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id']));
- if (!$complete AND (--$no_of_queries == 0)) {
+ if (!$complete && (--$no_of_queries == 0)) {
break;
}
}
function poco_discover_server($data, $default_generation = 0) {
- if (!isset($data->entry) OR !count($data->entry))
+ if (!isset($data->entry) || !count($data->entry))
return false;
$success = false;
$gender = $entry->gender;
}
- if(isset($entry->generation) AND ($entry->generation > 0)) {
+ if(isset($entry->generation) && ($entry->generation > 0)) {
$generation = ++$entry->generation;
}
- if(isset($entry->contactType) AND ($entry->contactType >= 0)) {
+ if(isset($entry->contactType) && ($entry->contactType >= 0)) {
$contact_type = $entry->contactType;
}
function clean_contact_url($url) {
$parts = parse_url($url);
- if (!isset($parts["scheme"]) OR !isset($parts["host"]))
+ if (!isset($parts["scheme"]) || !isset($parts["host"]))
return $url;
$new_url = $parts["scheme"]."://".$parts["host"];
* @param arr $contact contact array (called by reference)
*/
function fix_alternate_contact_address(&$contact) {
- if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) {
+ if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
$data = probe_url($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
$last_failure = strtotime($r[0]["last_failure"]);
$last_contact_str = $r[0]["last_contact"];
$last_contact = strtotime($r[0]["last_contact"]);
- $doprobing = (((time() - $last_contact) > (90 * 86400)) AND ((time() - $last_failure) > (90 * 86400)));
+ $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
}
} else {
q("INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
function update_gcontact($contact) {
// Check for invalid "contact-type" value
- if (isset($contact['contact-type']) AND (intval($contact['contact-type']) < 0)) {
+ if (isset($contact['contact-type']) && (intval($contact['contact-type']) < 0)) {
$contact['contact-type'] = 0;
}
// assign all unassigned fields from the database entry
foreach ($fields AS $field => $data)
- if (!isset($contact[$field]) OR ($contact[$field] == ""))
+ if (!isset($contact[$field]) || ($contact[$field] == ""))
$contact[$field] = $r[0][$field];
if (!isset($contact["hide"]))
} else
$contact["server_url"] = normalise_link($contact["server_url"]);
- if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) {
+ if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) {
$hostname = str_replace("http://", "", $contact["server_url"]);
$contact["addr"] = $contact["nick"]."@".$hostname;
}
$update = false;
unset($fields["generation"]);
- if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) {
+ if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) {
foreach ($fields AS $field => $data)
if ($contact[$field] != $r[0][$field]) {
logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
"gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"],
"birthday" => $r[0]["dob"], "photo" => $r[0]["photo"],
"notify" => $r[0]["notify"], "url" => $r[0]["url"],
- "hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]),
+ "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
"nick" => $r[0]["nickname"], "addr" => $addr,
"connect" => $addr, "server_url" => App::get_baseurl(),
"generation" => 1, "network" => NETWORK_DFRN);
$path = get_spoolpath();
- if (($path != '') AND is_writable($path)){
+ if (($path != '') && is_writable($path)){
if ($dh = opendir($path)) {
while (($file = readdir($dh)) !== false) {
}
// We can't read or write the file? So we don't care about it.
- if (!is_writable($fullfile) OR !is_readable($fullfile)) {
+ if (!is_writable($fullfile) || !is_readable($fullfile)) {
continue;
}
}
// Skip if it doesn't seem to be an item array
- if (!isset($arr['uid']) AND !isset($arr['uri']) AND !isset($arr['network'])) {
+ if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) {
continue;
}
$tags = "";
foreach ($taglist as $tag)
- if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@"))
+ if ((substr(trim($tag), 0, 1) == "#") || (substr(trim($tag), 0, 1) == "@"))
$tags .= " ".trim($tag);
else
$tags .= " #".trim($tag);
dbesc($link), dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]), intval($global));
// Search for mentions
- if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) {
+ if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
foreach ($users AS $user) {
if ($user["uid"] == $message["uid"]) {
$stripped = trim($stripped, '/');
$pagenum = $a->pager['page'];
- if (($a->page_offset != '') AND !preg_match('/[?&].offset=/', $stripped)) {
+ if (($a->page_offset != '') && !preg_match('/[?&].offset=/', $stripped)) {
$stripped .= '&offset=' . urlencode($a->page_offset);
}
function put_item_in_cache(&$item, $update = false) {
- if (($item["rendered-hash"] != hash("md5", $item["body"])) OR ($item["rendered-hash"] == "") OR
- ($item["rendered-html"] == "") OR get_config("system", "ignore_cache")) {
+ if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") ||
+ ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) {
// The function "redir_private_images" changes the body.
// I'm not sure if we should store it permanently, so we save the old value.
$item["rendered-hash"] = hash("md5", $item["body"]);
$item["body"] = $body;
- if ($update AND ($item["id"] != 0)) {
+ if ($update && ($item["id"] != 0)) {
q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"]));
}
$update = (!local_user() and !remote_user() and ($item["uid"] == 0));
// Or update it if the current viewer is the intented viewer
- if (($item["uid"] == local_user()) AND ($item["uid"] != 0))
+ if (($item["uid"] == local_user()) && ($item["uid"] != 0))
$update = true;
put_item_in_cache($item, $update);
$item = $items[0];
// is it already a copy?
- if (($itemid == 0) OR ($item['uid'] == 0)) {
+ if (($itemid == 0) || ($item['uid'] == 0)) {
return;
}
// Is it a visible public post?
- if (!$item["visible"] OR $item["deleted"] OR $item["moderated"] OR $item["private"]) {
+ if (!$item["visible"] || $item["deleted"] || $item["moderated"] || $item["private"]) {
return;
}
$item = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
- if (count($item) AND ($item[0]["allow_cid"] == '') AND ($item[0]["allow_gid"] == '') AND
- ($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '')) {
+ if (count($item) && ($item[0]["allow_cid"] == '') && ($item[0]["allow_gid"] == '') &&
+ ($item[0]["deny_cid"] == '') && ($item[0]["deny_gid"] == '')) {
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
dbesc($item['uri']));
return;
}
- if (($data["name"] == "") AND ($r[0]['name'] != ""))
+ if (($data["name"] == "") && ($r[0]['name'] != ""))
$data["name"] = $r[0]['name'];
- if (($data["nick"] == "") AND ($r[0]['nick'] != ""))
+ if (($data["nick"] == "") && ($r[0]['nick'] != ""))
$data["nick"] = $r[0]['nick'];
- if (($data["addr"] == "") AND ($r[0]['addr'] != ""))
+ if (($data["addr"] == "") && ($r[0]['addr'] != ""))
$data["addr"] = $r[0]['addr'];
- if (($data["photo"] == "") AND ($r[0]['photo'] != ""))
+ if (($data["photo"] == "") && ($r[0]['photo'] != ""))
$data["photo"] = $r[0]['photo'];
}
foreach($array as $key => $value) {
- if (!isset($element) AND isset($xml)) {
+ if (!isset($element) && isset($xml)) {
$element = $xml;
}
}
$element_parts = explode(":", $key);
- if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
+ if ((count($element_parts) > 1) && isset($namespaces[$element_parts[0]])) {
$namespace = $namespaces[$element_parts[0]];
} elseif (isset($namespaces[""])) {
$namespace = $namespaces[""];
}
// Remove undefined namespaces from the key
- if ((count($element_parts) > 1) AND is_null($namespace)) {
+ if ((count($element_parts) > 1) && is_null($namespace)) {
$key = $element_parts[1];
}
if (substr($key, 0, 11) == "@attributes") {
- if (!isset($element) OR !is_array($value)) {
+ if (!isset($element) || !is_array($value)) {
continue;
}
foreach ($value as $attr_key => $attr_value) {
$element_parts = explode(":", $attr_key);
- if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
+ if ((count($element_parts) > 1) && isset($namespaces[$element_parts[0]])) {
$namespace = $namespaces[$element_parts[0]];
} else {
$namespace = NULL;
if ($type == "open") { // The starting of the tag '<tag>'
$parent[$level-1] = &$current;
- if (!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
+ if (!is_array($current) || (!in_array($tag, array_keys($current)))) { // Insert New tag
$current[$tag] = $result;
if ($attributes_data) {
$current[$tag. '_attr'] = $attributes_data;
/**
* @brief Delete a node in a XML object
- *
+ *
* @param object $doc XML document
* @param string $node Node name
*/
Config::load();
- if ($a->max_processes_reached() OR $a->maxload_reached()) {
+ if ($a->max_processes_reached() || $a->maxload_reached()) {
header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
header('Retry-After: 120');
header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string);
die("System is currently unavailable. Please try again later");
}
- if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
- (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
+ if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+ (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
(substr(App::get_baseurl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . App::get_baseurl() . "/" . $a->query_string);
if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
// Only continue when the given profile link seems valid
// Valid profile links contain a path with "/profile/" and no query parameters
- if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND
+ if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
$_SESSION['my_url'] = $_GET['zrl'];
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
}
// Compatibility with the Firefox App
- if (($a->module == "users") AND ($a->cmd == "users/sign_in")) {
+ if (($a->module == "users") && ($a->cmd == "users/sign_in")) {
$a->module = "login";
}
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
-if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) {
+if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
$doc = new DOMDocument();
$target = new DOMDocument();
}
}
-if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
+if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) {
header("Content-type: text/html; charset=utf-8");
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
// Has the directory url changed? If yes, then resubmit the existing profiles there
- if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) {
+ if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
Config::set('system', 'directory', $global_directory);
proc_run(PRIORITY_LOW, 'include/directory.php');
}
/* Installed langs */
$lang_choices = get_available_languages();
- if (strlen(get_config('system','directory_submit_url')) AND
+ if (strlen(get_config('system','directory_submit_url')) &&
!strlen(get_config('system','directory'))) {
set_config('system','directory', dirname(get_config('system','directory_submit_url')));
del_config('system','directory_submit_url');
$f = basename($file);
// Only show allowed themes here
- if (($allowed_theme_list != '') AND !strstr($allowed_theme_list, $f)) {
+ if (($allowed_theme_list != '') && !strstr($allowed_theme_list, $f)) {
continue;
}
goaway('admin/dbsync');
}
- if (($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
+ if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
require_once("include/dbstructure.php");
$retval = update_structure(false, true);
if (!$retval) {
$show_plugin = true;
// If the addon is unsupported, then only show it, when it is enabled
- if ((strtolower($info["status"]) == "unsupported") AND !in_array($id, $a->plugins)) {
+ if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->plugins)) {
$show_plugin = false;
}
$is_supported = 1-(intval(file_exists($file.'/unsupported')));
$is_allowed = intval(in_array($f,$allowed_themes));
- if ($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) {
+ if ($is_allowed || $is_supported || get_config("system", "show_unsupported_themes")) {
$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
}
}
}
$previousauthor = $item["author-link"];
- if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
+ if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
$s[] = $item;
}
}
if ((sizeof($s) < $a->pager['itemspage'])) {
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
}
- } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
+ } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
} else {
$s = $r;
}
$contact_id = 0;
- if((($a->argc == 2) && intval($a->argv[1])) OR (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
+ if((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
$contact_id = intval($a->argv[1]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
intval(local_user()),
if ($contact_id) {
$a->data['contact'] = $r[0];
- if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
+ if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) {
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
} else {
$networkname = '';
$data = Probe::uri($r[0]["url"], "", 0, false);
// "Feed" or "Unknown" is mostly a sign of communication problems
- if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
+ if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $r[0]["network"]))
return;
$updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
}
foreach($updatefields AS $field)
- if (isset($data[$field]) AND ($data[$field] != ""))
+ if (isset($data[$field]) && ($data[$field] != ""))
$update[$field] = $data[$field];
$update["nurl"] = normalise_link($data["url"]);
$query = "";
- if (isset($data["priority"]) AND ($data["priority"] != 0))
+ if (isset($data["priority"]) && ($data["priority"] != 0))
$query = "`priority` = ".intval($data["priority"]);
foreach($update AS $key => $value) {
if ($contact['network'] == NETWORK_DFRN)
$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
- if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
+ if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) &&
($contact['rel'] == CONTACT_IS_FOLLOWER))
$follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
);
// NOTREACHED
// END $network === NETWORK_DFRN
- } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
+ } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
/*
*
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
// Checking fastlane for validity
- if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+ if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
$_POST["dfrn_url"] = $dfrn_url;
$_POST["confirm_key"] = $confirm_key;
$_POST["localconfirm"] = 1;
// At first look if an address was provided
// Otherwise take the local address
- if (x($_GET,'addr') AND ($_GET['addr'] != "")) {
+ if (x($_GET,'addr') && ($_GET['addr'] != "")) {
$myaddr = hex2bin($_GET['addr']);
- } elseif (x($_GET,'address') AND ($_GET['address'] != "")) {
+ } elseif (x($_GET,'address') && ($_GET['address'] != "")) {
$myaddr = $_GET['address'];
} elseif (local_user()) {
if (strlen($a->path)) {
if (strpos($search,'@') === 0) {
$search = substr($search,1);
$header = sprintf( t('People Search - %s'), $search);
- if ((valid_email($search) AND validate_email($search)) OR
+ if ((valid_email($search) && validate_email($search)) ||
(substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = probe_url($search);
$discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
$j->results[] = $objresult;
// Add the contact to the global contacts if it isn't already in our system
- if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0)) {
+ if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
update_gcontact($user_data);
}
} elseif ($local) {
use Friendica\App;
+require_once('include/dfrn.php');
+
function display_init(App $a) {
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
$nick = (($a->argc > 1) ? $a->argv[1] : '');
$profiledata = array();
+ if ($a->argc == 3) {
+ if (substr($a->argv[2], -5) == '.atom') {
+ $item_id = substr($a->argv[2], 0, -5);
+ $xml = dfrn::itemFeed($item_id);
+ header("Content-type: application/atom+xml");
+ echo $xml;
+ http_status_exit(($xml) ? 200 : 500);
+ }
+ }
+
// If there is only one parameter, then check if this parameter could be a guid
if ($a->argc == 2) {
$nick = "";
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `id` = %d", $r[0]["parent"]);
}
- if (($itemuid != local_user()) AND local_user()) {
+ if (($itemuid != local_user()) && local_user()) {
// Do we know this contact but we haven't got this item?
// Copy the wohle thread to our local storage so that we can interact.
// We really should change this need for the future since it scales very bad.
// Skip if it isn't a pure repeated messages
// Does it start with a share?
- if (!$skip AND strpos($body, "[share") > 0) {
+ if (!$skip && strpos($body, "[share") > 0) {
$skip = true;
}
// Does it end with a share?
- if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) {
+ if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
$skip = true;
}
if (!$skip) {
$o = '';
- $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
-
-
if ($update) {
$nick = $_REQUEST['nick'];
} else {
}
}
- if ($item_id AND !is_numeric($item_id)) {
+ if ($item_id && !is_numeric($item_id)) {
$r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), intval($a->profile['uid']));
if (dbm::is_result($r)) {
return;
}
+ // We are displaying an "alternate" link if that post was public. See issue 2864
+ $items = q("SELECT `id` FROM `item` WHERE `id` = %d AND NOT `private` AND `wall`", intval($item_id));
+ if (dbm::is_result($items)) {
+ $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
+ } else {
+ $alternate = '';
+ }
+
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
+ array('$alternate' => $alternate));
$groups = array();
$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
}
- if ($cid OR ($mode !== 'new')) {
+ if ($cid || ($mode !== 'new')) {
$sh_checked .= ' disabled="disabled" ';
}
function fetch_init(App $a) {
- if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
+ if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
killme();
}
$ret = probe_url($url);
- if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) {
+ if (($ret["network"] == NETWORK_DIASPORA) && !get_config('system','diaspora_enabled')) {
notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
$submit = "";
//goaway($_SESSION['return_url']);
// NOTREACHED
}
- if (($ret["network"] == NETWORK_OSTATUS) AND get_config('system','ostatus_disabled')) {
+ if (($ret["network"] == NETWORK_OSTATUS) && get_config('system','ostatus_disabled')) {
notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
$submit = "";
//goaway($_SESSION['return_url']);
// If the contact id doesn't fit with the contact, then set the contact to null
$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
- if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
- AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
+ if (dbm::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
+ && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) {
$object = ((x($_REQUEST, 'object')) ? $_REQUEST['object'] : '');
// Check for multiple posts with the same message id (when the post was created via API)
- if (($message_id != '') AND ($profile_uid != 0)) {
+ if (($message_id != '') && ($profile_uid != 0)) {
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($message_id),
intval($profile_uid)
// for non native networks use the network of the original post as network of the item
if (($parent_item['network'] != NETWORK_DIASPORA)
- AND ($parent_item['network'] != NETWORK_OSTATUS)
- AND ($network == "")) {
+ && ($parent_item['network'] != NETWORK_OSTATUS)
+ && ($network == "")) {
$network = $parent_item['network'];
}
$bookmark = 0;
$data = get_attachment_data($body);
- if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) {
+ if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) {
$objecttype = ACTIVITY_OBJ_BOOKMARK;
$bookmark = 1;
}
* add a statusnet style reply tag if the original post was from there
* and we are replying, and there isn't one already
*/
- if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
+ if ($parent && ($parent_contact['network'] == NETWORK_OSTATUS)) {
$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
if (!in_array($contact, $tags)) {
}
// select someone by attag or nick and the name passed in the current network
- if(!dbm::is_result($r) AND ($network != ""))
+ if(!dbm::is_result($r) && ($network != ""))
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name),
dbesc($name),
);
//select someone from this user's contacts by name in the current network
- if (!dbm::is_result($r) AND ($network != "")) {
+ if (!dbm::is_result($r) && ($network != "")) {
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
dbesc($name),
dbesc($network),
}
if (dbm::is_result($r)) {
- if (strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"]))) {
+ if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) {
$inform .= ',';
}
$profile = $r[0]["url"];
$alias = $r[0]["alias"];
$newname = $r[0]["nick"];
- if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
- AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET))) {
+ if (($newname == "") || (($r[0]["network"] != NETWORK_OSTATUS) && ($r[0]["network"] != NETWORK_TWITTER)
+ && ($r[0]["network"] != NETWORK_STATUSNET) && ($r[0]["network"] != NETWORK_APPNET))) {
$newname = $r[0]["name"];
}
}
//if there is an url for this persons profile
- if (isset($profile) AND ($newname != "")) {
+ if (isset($profile) && ($newname != "")) {
$replaced = true;
// create profile link
}
set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
- if(!$update AND !$rawmode) {
+ if(!$update && !$rawmode) {
$tabs = network_tabs($a);
$o .= $tabs;
$sql_table = "`thread`";
$sql_parent = "`iid`";
- if ($nouveau OR strlen($file) OR $update) {
+ if ($nouveau || strlen($file) || $update) {
$sql_table = "`item`";
$sql_parent = "`parent`";
$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
killme();
}
- if (($a->argc != 2) OR ($a->argv[1] != '1.0')) {
+ if (($a->argc != 2) || ($a->argv[1] != '1.0')) {
http_status_exit(404);
killme();
}
- $smtp = (function_exists('imap_open') AND !Config::get('system', 'imap_disabled') AND !Config::get('system', 'dfrn_only'));
+ $smtp = (function_exists('imap_open') && !Config::get('system', 'imap_disabled') && !Config::get('system', 'dfrn_only'));
$nodeinfo = array();
$nodeinfo['version'] = '1.0';
if (plugin_enabled('appnet')) {
$nodeinfo['services']['inbound'][] = 'appnet';
}
- if (plugin_enabled('appnet') OR plugin_enabled('buffer')) {
+ if (plugin_enabled('appnet') || plugin_enabled('buffer')) {
$nodeinfo['services']['outbound'][] = 'appnet';
}
if (plugin_enabled('blogger')) {
if (plugin_enabled('dwpost')) {
$nodeinfo['services']['outbound'][] = 'dreamwidth';
}
- if (plugin_enabled('fbpost') OR plugin_enabled('buffer')) {
+ if (plugin_enabled('fbpost') || plugin_enabled('buffer')) {
$nodeinfo['services']['outbound'][] = 'facebook';
}
if (plugin_enabled('statusnet')) {
$nodeinfo['services']['outbound'][] = 'gnusocial';
}
- if (plugin_enabled('gpluspost') OR plugin_enabled('buffer')) {
+ if (plugin_enabled('gpluspost') || plugin_enabled('buffer')) {
$nodeinfo['services']['outbound'][] = 'google';
}
if (plugin_enabled('ijpost')) {
if (plugin_enabled('tumblr')) {
$nodeinfo['services']['outbound'][] = 'tumblr';
}
- if (plugin_enabled('twitter') OR plugin_enabled('buffer')) {
+ if (plugin_enabled('twitter') || plugin_enabled('buffer')) {
$nodeinfo['services']['outbound'][] = 'twitter';
}
if (plugin_enabled('wppost')) {
$month = time() - (30 * 24 * 60 * 60);
foreach ($users AS $user) {
- if ((strtotime($user['login_date']) > $halfyear) OR
+ if ((strtotime($user['login_date']) > $halfyear) ||
(strtotime($user['last-item']) > $halfyear)) {
++$active_users_halfyear;
}
- if ((strtotime($user['login_date']) > $month) OR
+ if ((strtotime($user['login_date']) > $month) ||
(strtotime($user['last-item']) > $month)) {
++$active_users_monthly;
}
profile_load($a,$which,$profile);
- if (!$a->profile['net-publish'] OR $a->profile['hidewall']) {
+ if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
header('Content-type: application/json; charset=utf-8');
$json_info = array("hide" => true);
echo json_encode($json_info);
'tags' => $keywords
);
- if (is_array($a->profile) AND !$a->profile['hide-friends']) {
+ if (is_array($a->profile) && !$a->profile['hide-friends']) {
$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
intval($a->profile['uid']));
if (dbm::is_result($r)) {
intval($resolution)
);
- $public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == '');
+ $public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid'] == '') && ($r[0]['deny_gid'] == '');
if (dbm::is_result($r)) {
$resolution = $r[0]['scale'];
if (dbm::is_result($notifs)) {
// Are the nofications called from the regular process or via the friendica app?
- $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
+ $regularnotifications = (intval($_GET['uid']) && intval($_GET['_']));
foreach ($notifs as $notif) {
- if ($a->is_friendica_app() OR !$regularnotifications) {
+ if ($a->is_friendica_app() || !$regularnotifications) {
$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
}
intval($offset)
);
- if (!$r AND !$seen) {
+ if (!$r && !$seen) {
$seen = true;
$seensql = "";
$order = "DESC";
$notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"];
- if ($notification["visible"] AND !$notification["spam"] AND
- !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
+ if ($notification["visible"] && !$notification["spam"] &&
+ !$notification["deleted"] && !is_array($result[$notification["parent"]])) {
$result[$notification["parent"]] = $notification;
}
}
- } while ((count($result) < 50) AND !$quit);
+ } while ((count($result) < 50) && !$quit);
return($result);
}
$cid = intval($a->argv[4]);
}
- if (! $system_mode AND ! $global) {
+ if (! $system_mode && ! $global) {
$users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
dbesc($user)
if (x($_GET, 'filtered')) {
$ret['filtered'] = false;
}
- if (x($_GET, 'updatedSince') AND ! $global) {
+ if (x($_GET, 'updatedSince') && ! $global) {
$ret['updatedSince'] = false;
}
$ret['startIndex'] = (int) $startIndex;
}
}
- if (($contact['about'] == "") AND isset($contact['pabout'])) {
+ if (($contact['about'] == "") && isset($contact['pabout'])) {
$contact['about'] = $contact['pabout'];
}
if ($contact['location'] == "") {
if (isset($contact['plocation'])) {
$contact['location'] = $contact['plocation'];
}
- if (isset($contact['pregion']) AND ( $contact['pregion'] != "")) {
+ if (isset($contact['pregion']) && ( $contact['pregion'] != "")) {
if ($contact['location'] != "") {
$contact['location'] .= ", ";
}
$contact['location'] .= $contact['pregion'];
}
- if (isset($contact['pcountry']) AND ( $contact['pcountry'] != "")) {
+ if (isset($contact['pcountry']) && ( $contact['pcountry'] != "")) {
if ($contact['location'] != "") {
$contact['location'] .= ", ";
}
}
}
- if (($contact['gender'] == "") AND isset($contact['pgender'])) {
+ if (($contact['gender'] == "") && isset($contact['pgender'])) {
$contact['gender'] = $contact['pgender'];
}
- if (($contact['keywords'] == "") AND isset($contact['pub_keywords'])) {
+ if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) {
$contact['keywords'] = $contact['pub_keywords'];
}
if (isset($contact['account-type'])) {
if ($entry['network'] == NETWORK_STATUSNET) {
$entry['network'] = NETWORK_OSTATUS;
}
- if (($entry['network'] == "") AND ($contact['self'])) {
+ if (($entry['network'] == "") && ($contact['self'])) {
$entry['network'] = NETWORK_DFRN;
}
}
$basepath = $a->get_basepath();
// If the cache path isn't there, try to create it
- if (!is_dir($basepath . '/proxy') AND is_writable($basepath)) {
+ if (!is_dir($basepath . '/proxy') && is_writable($basepath)) {
mkdir($basepath . '/proxy');
}
// Checking if caching into a folder in the webroot is activated and working
- $direct_cache = (is_dir($basepath . '/proxy') AND is_writable($basepath . '/proxy'));
+ $direct_cache = (is_dir($basepath . '/proxy') && is_writable($basepath . '/proxy'));
// Look for filename in the arguments
- if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST['url'])) {
+ if ((isset($a->argv[1]) || isset($a->argv[2]) || isset($a->argv[3])) && !isset($_REQUEST['url'])) {
if (isset($a->argv[3])) {
$url = $a->argv[3];
} elseif (isset($a->argv[2])) {
$url = $a->argv[1];
}
- if (isset($a->argv[3]) AND ($a->argv[3] == 'thumb')) {
+ if (isset($a->argv[3]) && ($a->argv[3] == 'thumb')) {
$size = 200;
}
$urlhash = 'pic:' . sha1($_REQUEST['url']);
$cachefile = get_cachefile(hash('md5', $_REQUEST['url']));
- if ($cachefile != '' AND file_exists($cachefile)) {
+ if ($cachefile != '' && file_exists($cachefile)) {
$img_str = file_get_contents($cachefile);
$mime = image_type_to_mime_type(exif_imagetype($cachefile));
$valid = true;
$r = array();
- if (!$direct_cache AND ($cachefile == '')) {
+ if (!$direct_cache && ($cachefile == '')) {
$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
if (dbm::is_result($r)) {
$img_str = $r[0]['data'];
unlink($tempfile);
// If there is an error then return a blank image
- if ((substr($a->get_curl_code(), 0, 1) == '4') OR (!$img_str)) {
+ if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) {
$img_str = file_get_contents('images/blank.png');
$mime = 'image/png';
$cachefile = ''; // Clear the cachefile so that the dummy isn't stored
$img->scaleImage(10);
$img_str = $img->imageString();
}
- } elseif ($mime != 'image/jpeg' AND !$direct_cache AND $cachefile == '') {
+ } elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') {
$image = @imagecreatefromstring($img_str);
if ($image === FALSE) {
} else {
$img = new Photo($img_str, $mime);
- if ($img->is_valid() AND !$direct_cache AND ($cachefile == '')) {
+ if ($img->is_valid() && !$direct_cache && ($cachefile == '')) {
$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
}
}
// If there is a real existing directory then put the cache file there
// advantage: real file access is really fast
// Otherwise write in cachefile
- if ($valid AND $direct_cache) {
+ if ($valid && $direct_cache) {
file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true), $img_str_orig);
if ($sizetype != '') {
file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true) . $sizetype, $img_str);
$shortpath = hash('md5', $url);
$longpath = substr($shortpath, 0, 2);
- if (is_dir($basepath) AND $writemode AND !is_dir($basepath . '/' . $longpath)) {
+ if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
mkdir($basepath . '/' . $longpath);
chmod($basepath . '/' . $longpath, 0777);
}
// Too long files aren't supported by Apache
// Writemode in combination with long files shouldn't be possible
- if ((strlen($proxypath) > 250) AND $writemode) {
+ if ((strlen($proxypath) > 250) && $writemode) {
return $shortpath;
} elseif (strlen($proxypath) > 250) {
return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
function proxy_img_cb($matches) {
// if the picture seems to be from another picture cache then take the original source
$queryvar = proxy_parse_query($matches[2]);
- if (($queryvar['url'] != '') AND (substr($queryvar['url'], 0, 4) == 'http')) {
+ if (($queryvar['url'] != '') && (substr($queryvar['url'], 0, 4) == 'http')) {
$matches[2] = urldecode($queryvar['url']);
}
}
// Only send a password mail when the password wasn't manually provided
- if (!x($_POST,'password1') OR !x($_POST,'confirm')) {
+ if (!x($_POST,'password1') || !x($_POST,'confirm')) {
$res = send_register_open_eml(
$user['email'],
$a->config['sitename'],
return;
}
- if(get_config('system','local_search') AND !local_user()) {
+ if(get_config('system','local_search') && !local_user()) {
http_status_exit(403,
array("title" => t("Public access denied."),
"description" => t("Only logged in users are permitted to perform a search.")));
//return;
}
- if (get_config('system','permit_crawling') AND !local_user()) {
+ if (get_config('system','permit_crawling') && !local_user()) {
// Default values:
// 10 requests are "free", after the 11th only a call per minute is allowed
$result = Cache::get("remote_search:".$remote);
if (!is_null($result)) {
$resultdata = json_decode($result);
- if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) {
+ if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) {
http_status_exit(429,
array("title" => t("Too Many Requests"),
"description" => t("Only one search per minute is permitted for not logged in users.")));
$notify += intval($_POST['notify8']);
// Adjust the page flag if the account type doesn't fit to the page flag.
- if (($account_type == ACCOUNT_TYPE_PERSON) AND !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE)))
+ if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE)))
$page_flags = PAGE_NORMAL;
- elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) AND !in_array($page_flags, array(PAGE_SOAPBOX)))
+ elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX)))
$page_flags = PAGE_SOAPBOX;
- elseif (($account_type == ACCOUNT_TYPE_NEWS) AND !in_array($page_flags, array(PAGE_SOAPBOX)))
+ elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX)))
$page_flags = PAGE_SOAPBOX;
- elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) AND !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP)))
+ elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP)))
$page_flags = PAGE_COMMUNITY;
$email_changed = false;
$is_experimental = file_exists('view/theme/' . $th . '/experimental');
$unsupported = file_exists('view/theme/' . $th . '/unsupported');
$is_mobile = file_exists('view/theme/' . $th . '/mobile');
- if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
+ if (!$is_experimental || ($is_experimental && (get_config('experimentals','exp_themes')==1 || get_config('experimentals','exp_themes')===false))){
$theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
if ($is_mobile) {
$mobile_themes[$f]=$theme_name;
// Set the account type to "Community" when the page is a community page but the account type doesn't fit
// This is only happening on the first visit after the update
- if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) AND
+ if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) &&
($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY))
$a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
'$type_community' => ACCOUNT_TYPE_COMMUNITY,
'$account_person' => array('account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON,
- t('This account is a regular personal profile'),
+ t('Account for a personal profile.'),
($a->user['account-type'] == ACCOUNT_TYPE_PERSON)),
'$account_organisation' => array('account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
- t('This account is a profile for an organisation'),
+ t('Account for an organisation that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)),
'$account_news' => array('account-type', t('News Page'), ACCOUNT_TYPE_NEWS,
- t('This account is a news account/reflector'),
+ t('Account for a news reflector that automatically approves contact requests as "Followers".'),
($a->user['account-type'] == ACCOUNT_TYPE_NEWS)),
'$account_community' => array('account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
- t('This account is a community forum where people can discuss with each other'),
+ t('Account for community discussions.'),
($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)),
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
- t('This account is a normal personal profile'),
+ t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
($a->user['page-flags'] == PAGE_NORMAL)),
'$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
- t('Automatically approve all connection/friend requests as read-only fans'),
+ t('Account for a public profile that automatically approves contact requests as "Followers".'),
($a->user['page-flags'] == PAGE_SOAPBOX)),
'$page_community' => array('page-flags', t('Public Forum'), PAGE_COMMUNITY,
- t('Automatically approve all contact requests'),
+ t('Automatically approves all contact requests.'),
($a->user['page-flags'] == PAGE_COMMUNITY)),
'$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
- t('Automatically approve all connection/friend requests as friends'),
+ t('Account for a popular profile that automatically approves contact requests as "Friends".'),
($a->user['page-flags'] == PAGE_FREELOVE)),
'$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
- t('Private forum - approved members only'),
+ t('Requires manual approval of contact requests.'),
($a->user['page-flags'] == PAGE_PRVGROUP)),
echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>";
- if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET["force"] == 1)) {
+ if (!get_pconfig($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
$text = network_content($a, $profile_uid);
} else {
$text = "";
$profile_link = zrl($profile_link);
}
- if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
+ if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner());
if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"];
}
}
- if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+ if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner());
if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"];
// Disable features that aren't available in several networks
/// @todo Add NETWORK_DIASPORA when it will pass this information
- if (!in_array($item["item_network"], array(NETWORK_DFRN)) AND isset($buttons["dislike"])) {
+ if (!in_array($item["item_network"], array(NETWORK_DFRN)) && isset($buttons["dislike"])) {
unset($buttons["dislike"],$isevent);
$tagger = '';
}
- if (($item["item_network"] == NETWORK_FEED) AND isset($buttons["like"])) {
+ if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) {
unset($buttons["like"]);
}
- if (($item["item_network"] == NETWORK_MAIL) AND isset($buttons["like"])) {
+ if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) {
unset($buttons["like"]);
}
// Diaspora isn't able to do likes on comments - but Hubzilla does
/// @todo When Diaspora will pass this information we will remove these lines
- if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
- !Diaspora::is_redmatrix($item["owner-link"]) AND isset($buttons["like"])) {
+ if (($item["item_network"] == NETWORK_DIASPORA) && ($indent == 'comment') &&
+ !Diaspora::is_redmatrix($item["owner-link"]) && isset($buttons["like"])) {
unset($buttons["like"]);
}
// Facebook can like comments - but it isn't programmed in the connector yet.
- if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"])) {
+ if (($item["item_network"] == NETWORK_FACEBOOK) && ($indent == 'comment') && isset($buttons["like"])) {
unset($buttons["like"]);
}
if($this->is_toplevel()) {
if($conv->get_mode() !== 'profile') {
- if($this->get_data_value('wall') AND !$this->get_data_value('self')) {
+ if($this->get_data_value('wall') && !$this->get_data_value('self')) {
// On the network page, I am the owner. On the display page it will be the profile owner.
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.
$this->hostname = Config::get('config', 'hostname');
}
- if (!isset($this->hostname) OR ( $this->hostname == '')) {
+ if (!isset($this->hostname) || ( $this->hostname == '')) {
$this->hostname = $hostname;
}
}
$meminfo[$key] = (int) ($meminfo[$key] / 1024);
}
- if (!isset($meminfo['MemAvailable']) OR ! isset($meminfo['MemFree'])) {
+ if (!isset($meminfo['MemAvailable']) || ! isset($meminfo['MemFree'])) {
return false;
}
$cachekey = 'app:proc_run:started';
$result = Cache::get($cachekey);
- if (!is_null($result) AND ( time() - $result) < 2) {
+ if (!is_null($result) && ( time() - $result) < 2) {
return;
}
* @return string system username
*/
static function systemuser() {
- if (!function_exists('posix_getpwuid') OR ! function_exists('posix_geteuid')) {
+ if (!function_exists('posix_getpwuid') || ! function_exists('posix_geteuid')) {
return '';
}
logger('Path "' . $directory . '" is not a directory for user ' . self::systemuser(), LOGGER_DEBUG);
return false;
}
- if ($check_writable AND !is_writable($directory)) {
+ if ($check_writable && !is_writable($directory)) {
logger('Path "' . $directory . '" is not writable for user ' . self::systemuser(), LOGGER_DEBUG);
return false;
}
$stored = self::get($family, $key, null, true);
- if (($stored === $dbvalue) AND self::$in_db[$family][$key]) {
+ if (($stored === $dbvalue) && self::$in_db[$family][$key]) {
return true;
}
// manage array value
$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
- if (is_null($stored) OR !self::$in_db[$family][$key]) {
+ if (is_null($stored) || !self::$in_db[$family][$key]) {
$ret = q("INSERT INTO `config` (`cat`, `k`, `v`) VALUES ('%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
dbesc($family),
dbesc($key),
$stored = self::get($uid, $family, $key, null, true);
- if (($stored === $dbvalue) AND self::$in_db[$uid][$family][$key]) {
+ if (($stored === $dbvalue) && self::$in_db[$uid][$family][$key]) {
return true;
}
// manage array value
$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
- if (is_null($stored) OR !self::$in_db[$uid][$family][$key]) {
+ if (is_null($stored) || !self::$in_db[$uid][$family][$key]) {
$ret = q("INSERT INTO `pconfig` (`uid`, `cat`, `k`, `v`) VALUES (%d, '%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
intval($uid),
dbesc($family),
logger("Probing for ".$host, LOGGER_DEBUG);
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
- if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) AND !self::ownHost($ssl_url)) {
+ if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) && !self::ownHost($ssl_url)) {
logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG);
return false;
}
}
if (($attributes["rel"] == "lrdd")
- AND ($attributes["type"] == "application/xrd+xml")
+ && ($attributes["type"] == "application/xrd+xml")
) {
$xrd_data["lrdd-xml"] = $attributes["template"];
} elseif (($attributes["rel"] == "lrdd")
- AND ($attributes["type"] == "application/json")
+ && ($attributes["type"] == "application/json")
) {
$xrd_data["lrdd-json"] = $attributes["template"];
} elseif ($attributes["rel"] == "lrdd") {
if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
$profile_link = $link['@attributes']['href'];
}
- if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) {
+ if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) && ($profile_link == "")) {
$profile_link = 'stat:'.$link['@attributes']['template'];
}
if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
do {
$lrdd = self::xrd($host);
$host .= "/".array_shift($path_parts);
- } while (!$lrdd AND (sizeof($path_parts) > 0));
+ } while (!$lrdd && (sizeof($path_parts) > 0));
}
if (!$lrdd) {
$path = str_replace('{uri}', urlencode($uri), $link);
$webfinger = self::webfinger($path);
- if (!$webfinger AND (strstr($uri, "@"))) {
+ if (!$webfinger && (strstr($uri, "@"))) {
$path = str_replace('{uri}', urlencode("acct:".$uri), $link);
$webfinger = self::webfinger($path);
}
// Special treatment for Mastodon
// Problem is that Mastodon uses an URL format like http://domain.tld/@nick
// But the webfinger for this format fails.
- if (!$webfinger AND isset($nick)) {
+ if (!$webfinger && isset($nick)) {
// Mastodon uses a "@" as prefix for usernames in their url format
$nick = ltrim($nick, '@');
$data["photo"] = App::get_baseurl().'/images/person-175.jpg';
}
- if (!isset($data["name"]) OR ($data["name"] == "")) {
+ if (!isset($data["name"]) || ($data["name"] == "")) {
if (isset($data["nick"])) {
$data["name"] = $data["nick"];
}
}
}
- if (!isset($data["nick"]) OR ($data["nick"] == "")) {
+ if (!isset($data["nick"]) || ($data["nick"] == "")) {
$data["nick"] = strtolower($data["name"]);
if (strpos($data['nick'], ' ')) {
/// It should only be updated if the existing picture isn't existing anymore.
/// We only update the contact when it is no probing for a specific network.
if (($data['network'] != NETWORK_FEED)
- AND ($network == "")
- AND $data["name"]
- AND $data["nick"]
- AND $data["url"]
- AND $data["addr"]
- AND $data["poll"]
+ && ($network == "")
+ && $data["name"]
+ && $data["nick"]
+ && $data["url"]
+ && $data["addr"]
+ && $data["poll"]
) {
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
`notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
private function detect($uri, $network, $uid) {
$parts = parse_url($uri);
- if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) {
+ if (isset($parts["scheme"]) && isset($parts["host"]) && isset($parts["path"])) {
$host = $parts["host"];
if (isset($parts["port"])) {
$host .= ':'.$parts["port"];
$path_parts = explode("/", trim($parts["path"], "/"));
- while (!$lrdd AND (sizeof($path_parts) > 1)) {
+ while (!$lrdd && (sizeof($path_parts) > 1)) {
$host .= "/".array_shift($path_parts);
$lrdd = self::xrd($host);
}
$webfinger = self::webfinger($path);
// We cannot be sure that the detected address was correct, so we don't use the values
- if ($webfinger AND ($uri != $addr)) {
+ if ($webfinger && ($uri != $addr)) {
$nick = "";
$addr = "";
}
if (in_array($network, array("", NETWORK_DFRN))) {
$result = self::dfrn($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
$result = self::diaspora($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) {
$result = self::ostatus($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
$result = self::pumpio($webfinger);
}
- if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) {
+ if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
$result = self::feed($uri);
} else {
// We overwrite the detected nick with our try if the previois routines hadn't detected it.
// Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
- if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) {
+ if ((!isset($result["nick"]) || ($result["nick"] == "") || (strstr($result["nick"], " "))) && ($nick != "")) {
$result["nick"] = $nick;
}
- if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) {
+ if ((!isset($result["addr"]) || ($result["addr"] == "")) && ($addr != "")) {
$result["addr"] = $addr;
}
}
logger($uri." is ".$result["network"], LOGGER_DEBUG);
- if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
+ if (!isset($result["baseurl"]) || ($result["baseurl"] == "")) {
$pos = strpos($result["url"], $host);
if ($pos) {
$result["baseurl"] = substr($result["url"], 0, $pos).$host;
$data = self::pollNoscrape($noscrape_url, $data);
if (!isset($data["notify"])
- OR !isset($data["confirm"])
- OR !isset($data["request"])
- OR !isset($data["poll"])
- OR !isset($data["poco"])
- OR !isset($data["name"])
- OR !isset($data["photo"])
+ || !isset($data["confirm"])
+ || !isset($data["request"])
+ || !isset($data["poll"])
+ || !isset($data["poco"])
+ || !isset($data["name"])
+ || !isset($data["photo"])
) {
$data = self::pollHcard($profile_link, $data, true);
}
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
- if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) {
+ if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
$data["network"] = NETWORK_DFRN;
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
$hcard_url = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
$data["poco"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) {
$data["photo"] = $link["href"];
- } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
$data["baseurl"] = trim($link["href"], '/');
- } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
$data["guid"] = $link["href"];
- } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]);
- //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]);
}
}
}
- if (!isset($data["network"]) OR ($hcard_url == "")) {
+ if (!isset($data["network"]) || ($hcard_url == "")) {
return false;
}
$data = self::pollNoscrape($noscrape_url, $data);
if (isset($data["notify"])
- AND isset($data["confirm"])
- AND isset($data["request"])
- AND isset($data["poll"])
- AND isset($data["name"])
- AND isset($data["photo"])
+ && isset($data["confirm"])
+ && isset($data["request"])
+ && isset($data["poll"])
+ && isset($data["name"])
+ && isset($data["photo"])
) {
return $data;
}
// We have to discard the guid from the hcard in favour of the guid from lrdd
// Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
- if (($search->length > 0) AND ($data["guid"] == "")) {
+ if (($search->length > 0) && ($data["guid"] == "")) {
$data["guid"] = $search->item(0)->nodeValue;
}
$attr[$attribute->name] = trim($attribute->value);
}
- if (isset($attr["src"]) AND isset($attr["width"])) {
+ if (isset($attr["src"]) && isset($attr["width"])) {
$avatar[$attr["width"]] = $attr["src"];
}
// We don't have a width. So we just take everything that we got.
// This is a Hubzilla workaround which doesn't send a width.
- if ((sizeof($avatar) == 0) AND isset($attr["src"])) {
+ if ((sizeof($avatar) == 0) && isset($attr["src"])) {
$avatar[] = $attr["src"];
}
}
$hcard_url = "";
$data = array();
foreach ($webfinger["links"] as $link) {
- if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
+ if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
$hcard_url = $link["href"];
- } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
$data["baseurl"] = trim($link["href"], '/');
- } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
$data["guid"] = $link["href"];
- } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
$data["poco"] = $link["href"];
- } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
$data["pubkey"] = base64_decode($link["href"]);
- //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
if (strstr($data["pubkey"], 'RSA ')) {
$data["pubkey"] = rsatopem($data["pubkey"]);
}
}
}
- if (!isset($data["url"]) OR ($hcard_url == "")) {
+ if (!isset($data["url"]) || ($hcard_url == "")) {
return false;
}
if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
- if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) {
+ if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
$data["alias"] = $alias;
}
}
}
if (isset($data["url"])
- AND isset($data["guid"])
- AND isset($data["baseurl"])
- AND isset($data["pubkey"])
- AND ($hcard_url != "")
+ && isset($data["guid"])
+ && isset($data["baseurl"])
+ && isset($data["pubkey"])
+ && ($hcard_url != "")
) {
$data["network"] = NETWORK_DIASPORA;
}
}
- if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) {
+ if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")) {
$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
}
$pubkey = "";
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page")
- AND ($link["type"] == "text/html")
- AND ($link["href"] != "")
+ && ($link["type"] == "text/html")
+ && ($link["href"] != "")
) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) {
$pubkey = $link["href"];
if (substr($pubkey, 0, 5) === 'data:') {
}
}
- if (isset($data["notify"]) AND isset($data["pubkey"])
- AND isset($data["poll"])
- AND isset($data["url"])
+ if (isset($data["notify"]) && isset($data["pubkey"])
+ && isset($data["poll"])
+ && isset($data["url"])
) {
$data["network"] = NETWORK_OSTATUS;
} else {
$data = array();
foreach ($webfinger["links"] as $link) {
if (($link["rel"] == "http://webfinger.net/rel/profile-page")
- AND ($link["type"] == "text/html")
- AND ($link["href"] != "")
+ && ($link["type"] == "text/html")
+ && ($link["href"] != "")
) {
$data["url"] = $link["href"];
- } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "activity-inbox") && ($link["href"] != "")) {
$data["notify"] = $link["href"];
- } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "activity-outbox") && ($link["href"] != "")) {
$data["poll"] = $link["href"];
- } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) {
+ } elseif (($link["rel"] == "dialback") && ($link["href"] != "")) {
$data["dialback"] = $link["href"];
}
}
- if (isset($data["poll"]) AND isset($data["notify"])
- AND isset($data["dialback"])
- AND isset($data["url"])
+ if (isset($data["poll"]) && isset($data["notify"])
+ && isset($data["dialback"])
+ && isset($data["url"])
) {
// by now we use these fields only for the network type detection
// So we unset all data that isn't used at the moment
// When the process id isn't used anymore, we can safely claim the lock for us.
// Or we do want to lock something that was already locked by us.
- if (!posix_kill($pid, 0) OR ($pid == getmypid())) {
+ if (!posix_kill($pid, 0) || ($pid == getmypid())) {
$lock = false;
}
}
$memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300);
$got_lock = true;
}
- if (!$got_lock AND ($timeout > 0)) {
+ if (!$got_lock && ($timeout > 0)) {
usleep($wait_sec * 1000000);
}
- } while (!$got_lock AND ((time() - $start) < $timeout));
+ } while (!$got_lock && ((time() - $start) < $timeout));
return $got_lock;
}
dba::unlock();
- if (!$got_lock AND ($timeout > 0)) {
+ if (!$got_lock && ($timeout > 0)) {
sleep($wait_sec);
}
- } while (!$got_lock AND ((time() - $start) < $timeout));
+ } while (!$got_lock && ((time() - $start) < $timeout));
return $got_lock;
}
function update_1036() {
- $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' ");
+ $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' AND `photo` LIKE '%include/photo%' ");
if (dbm::is_result($r)) {
foreach ($r as $rr) {
q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
function update_1188() {
- if (strlen(get_config('system','directory_submit_url')) AND
+ if (strlen(get_config('system','directory_submit_url')) &&
!strlen(get_config('system','directory'))) {
set_config('system','directory', dirname(get_config('system','directory_submit_url')));
del_config('system','directory_submit_url');
Config::set('system', 'maintenance', $maint_mode);
-if ($maint_mode AND ($argc > 2)) {
+if ($maint_mode && ($argc > 2)) {
$reason_arr = $argv;
array_shift($reason_arr);
array_shift($reason_arr);
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 11:09+0200\n"
+"POT-Creation-Date: 2017-06-09 16:42+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133
-#: view/theme/vier/theme.php:256
+#: view/theme/vier/theme.php:248
msgid "Forums"
msgstr ""
-#: include/ForumManager.php:118 view/theme/vier/theme.php:258
+#: include/ForumManager.php:118 view/theme/vier/theme.php:250
msgid "External link to forum"
msgstr ""
#: include/ForumManager.php:121 include/contact_widgets.php:271
#: include/items.php:2432 mod/content.php:625 object/Item.php:417
-#: view/theme/vier/theme.php:261 src/App.php:506
+#: view/theme/vier/theme.php:253 src/App.php:506
msgid "show more"
msgstr ""
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr ""
-
-#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518
-#: view/theme/frio/theme.php:255
-msgid "Network"
-msgstr ""
-
-#: include/NotificationsManager.php:167 mod/network.php:835
-#: mod/profiles.php:699
-msgid "Personal"
-msgstr ""
-
-#: include/NotificationsManager.php:174 include/nav.php:107
-#: include/nav.php:163
-msgid "Home"
-msgstr ""
-
-#: include/NotificationsManager.php:181 include/nav.php:168
-msgid "Introductions"
-msgstr ""
-
-#: include/NotificationsManager.php:239 include/NotificationsManager.php:251
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:250
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: include/NotificationsManager.php:265
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:278
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:291
-#, php-format
-msgid "%s is attending %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:304
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:317
-#, php-format
-msgid "%s may attend %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:334
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: include/NotificationsManager.php:770
-msgid "Friend Suggestion"
-msgstr ""
-
-#: include/NotificationsManager.php:803
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: include/NotificationsManager.php:803
-msgid "New Follower"
-msgstr ""
-
#: include/acl_selectors.php:355
msgid "Post to Email"
msgstr ""
msgstr ""
#: include/contact_widgets.php:37 mod/suggest.php:116
-#: view/theme/vier/theme.php:203
+#: view/theme/vier/theme.php:195
msgid "Friend Suggestions"
msgstr ""
-#: include/contact_widgets.php:38 view/theme/vier/theme.php:202
+#: include/contact_widgets.php:38 view/theme/vier/theme.php:194
msgid "Similar Interests"
msgstr ""
msgid "Random Profile"
msgstr ""
-#: include/contact_widgets.php:40 view/theme/vier/theme.php:204
+#: include/contact_widgets.php:40 view/theme/vier/theme.php:196
msgid "Invite Friends"
msgstr ""
msgstr ""
#: include/conversation.php:749 mod/content.php:455 mod/content.php:761
-#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819
-#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138
+#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018
+#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138
msgid "Delete"
msgstr ""
msgid "Tag term:"
msgstr ""
-#: include/conversation.php:1229 include/conversation.php:1245
-#: mod/filer.php:31
+#: include/conversation.php:1229 include/conversation.php:1245 mod/filer.php:31
msgid "Save to Folder:"
msgstr ""
#: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140
#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/follow.php:126
-#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339
-#: mod/suggest.php:34 mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134
+#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34
+#: mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134
#: mod/dfrn_request.php:894 mod/contacts.php:458 mod/settings.php:683
#: mod/settings.php:709
msgid "Cancel"
msgid "Search"
msgstr ""
-#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32
-#: mod/notes.php:64
+#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64
msgid "Save"
msgstr ""
msgid "Item filed"
msgstr ""
-#: include/Contact.php:437
-msgid "Drop Contact"
-msgstr ""
-
-#: include/Contact.php:819
-msgid "Organisation"
-msgstr ""
-
-#: include/Contact.php:822
-msgid "News"
-msgstr ""
-
-#: include/Contact.php:825
-msgid "Forum"
-msgstr ""
-
#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179
msgid "Image/photo"
msgstr ""
msgid "Invalid link protocol"
msgstr ""
+#: include/Contact.php:437
+msgid "Drop Contact"
+msgstr ""
+
+#: include/Contact.php:819
+msgid "Organisation"
+msgstr ""
+
+#: include/Contact.php:822
+msgid "News"
+msgstr ""
+
+#: include/Contact.php:825
+msgid "Forum"
+msgstr ""
+
#: include/enotify.php:27
msgid "Friendica Notification"
msgstr ""
msgid "Clear notifications"
msgstr ""
-#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862
+#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869
msgid "Logout"
msgstr ""
msgid "Your personal notes"
msgstr ""
-#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863
+#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870
msgid "Login"
msgstr ""
msgid "Sign in"
msgstr ""
+#: include/nav.php:107 include/nav.php:163 include/NotificationsManager.php:176
+msgid "Home"
+msgstr ""
+
#: include/nav.php:107
msgid "Home Page"
msgstr ""
-#: include/nav.php:111 mod/register.php:291 boot.php:839
+#: include/nav.php:111 mod/register.php:291 boot.php:846
msgid "Register"
msgstr ""
msgid "Create an account"
msgstr ""
-#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299
+#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291
msgid "Help"
msgstr ""
msgid "Information about this friendica instance"
msgstr ""
+#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518
+#: view/theme/frio/theme.php:255
+msgid "Network"
+msgstr ""
+
#: include/nav.php:160 view/theme/frio/theme.php:255
msgid "Conversations from your friends"
msgstr ""
msgid "Load Network page with no filters"
msgstr ""
+#: include/nav.php:168 include/NotificationsManager.php:183
+msgid "Introductions"
+msgstr ""
+
#: include/nav.php:168
msgid "Friend Requests"
msgstr ""
msgstr ""
#: include/user.php:306 include/user.php:314 include/user.php:322
-#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189
-#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279
-#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82
-#: mod/profile_photo.php:90 mod/profile_photo.php:214
-#: mod/profile_photo.php:309 mod/profile_photo.php:319
+#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776
+#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865
+#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90
+#: mod/profile_photo.php:214 mod/profile_photo.php:309
+#: mod/profile_photo.php:319
msgid "Profile Photos"
msgstr ""
msgid "Registration details for %s"
msgstr ""
-#: include/api.php:1102
+#: include/dba_pdo.php:76 include/dba.php:57
#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
+msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
-#: include/api.php:1123
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
+#: include/plugin.php:532 include/plugin.php:534
+msgid "Click here to upgrade."
msgstr ""
-#: include/api.php:1144
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
+#: include/plugin.php:541
+msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: include/dba.php:57 include/dba_pdo.php:75
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: include/plugin.php:546
+msgid "This action is not available under your subscription plan."
msgstr ""
-#: include/dbstructure.php:25
-msgid "There are no tables on MyISAM."
+#: include/profile_selectors.php:6
+msgid "Male"
msgstr ""
-#: include/dbstructure.php:66
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
+#: include/profile_selectors.php:6
+msgid "Female"
msgstr ""
-#: include/dbstructure.php:71
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
+#: include/profile_selectors.php:6
+msgid "Currently Male"
msgstr ""
-#: include/dbstructure.php:195
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
+#: include/profile_selectors.php:6
+msgid "Currently Female"
msgstr ""
-#: include/dbstructure.php:198
-msgid "Errors encountered performing database changes: "
+#: include/profile_selectors.php:6
+msgid "Mostly Male"
msgstr ""
-#: include/dbstructure.php:206
-msgid ": Database update"
+#: include/profile_selectors.php:6
+msgid "Mostly Female"
msgstr ""
-#: include/dbstructure.php:438
-#, php-format
-msgid "%s: updating %s table."
+#: include/profile_selectors.php:6
+msgid "Transgender"
msgstr ""
-#: include/diaspora.php:2214
-msgid "Sharing notification from Diaspora network"
+#: include/profile_selectors.php:6
+msgid "Intersex"
msgstr ""
-#: include/diaspora.php:3234
-msgid "Attachments:"
+#: include/profile_selectors.php:6
+msgid "Transsexual"
msgstr ""
-#: include/identity.php:45
-msgid "Requested account is not available."
+#: include/profile_selectors.php:6
+msgid "Hermaphrodite"
msgstr ""
-#: include/identity.php:54 mod/profile.php:22
-msgid "Requested profile is not available."
+#: include/profile_selectors.php:6
+msgid "Neuter"
msgstr ""
-#: include/identity.php:98 include/identity.php:325 include/identity.php:755
-msgid "Edit profile"
+#: include/profile_selectors.php:6
+msgid "Non-specific"
msgstr ""
-#: include/identity.php:265
-msgid "Atom feed"
+#: include/profile_selectors.php:6
+msgid "Other"
msgstr ""
-#: include/identity.php:296
-msgid "Manage/edit profiles"
+#: include/profile_selectors.php:23
+msgid "Males"
msgstr ""
-#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790
-msgid "Change profile photo"
+#: include/profile_selectors.php:23
+msgid "Females"
msgstr ""
-#: include/identity.php:302 mod/profiles.php:791
-msgid "Create New Profile"
+#: include/profile_selectors.php:23
+msgid "Gay"
msgstr ""
-#: include/identity.php:312 mod/profiles.php:780
-msgid "Profile Image"
+#: include/profile_selectors.php:23
+msgid "Lesbian"
msgstr ""
-#: include/identity.php:315 mod/profiles.php:782
-msgid "visible to everybody"
+#: include/profile_selectors.php:23
+msgid "No Preference"
msgstr ""
-#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783
-msgid "Edit visibility"
+#: include/profile_selectors.php:23
+msgid "Bisexual"
msgstr ""
-#: include/identity.php:344 include/identity.php:644 mod/directory.php:137
-#: mod/notifications.php:252
-msgid "Gender:"
+#: include/profile_selectors.php:23
+msgid "Autosexual"
msgstr ""
-#: include/identity.php:347 include/identity.php:665 mod/directory.php:139
-msgid "Status:"
+#: include/profile_selectors.php:23
+msgid "Abstinent"
msgstr ""
-#: include/identity.php:349 include/identity.php:682 mod/directory.php:141
-msgid "Homepage:"
+#: include/profile_selectors.php:23
+msgid "Virgin"
msgstr ""
-#: include/identity.php:351 include/identity.php:702 mod/directory.php:143
-#: mod/notifications.php:248 mod/contacts.php:643
-msgid "About:"
+#: include/profile_selectors.php:23
+msgid "Deviant"
msgstr ""
-#: include/identity.php:353 mod/contacts.php:641
-msgid "XMPP:"
+#: include/profile_selectors.php:23
+msgid "Fetish"
msgstr ""
-#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58
-msgid "Network:"
+#: include/profile_selectors.php:23
+msgid "Oodles"
msgstr ""
-#: include/identity.php:468 include/identity.php:558
-msgid "g A l F d"
+#: include/profile_selectors.php:23
+msgid "Nonsexual"
msgstr ""
-#: include/identity.php:469 include/identity.php:559
-msgid "F d"
+#: include/profile_selectors.php:42
+msgid "Single"
msgstr ""
-#: include/identity.php:520 include/identity.php:609
-msgid "[today]"
+#: include/profile_selectors.php:42
+msgid "Lonely"
msgstr ""
-#: include/identity.php:532
-msgid "Birthday Reminders"
+#: include/profile_selectors.php:42
+msgid "Available"
msgstr ""
-#: include/identity.php:533
-msgid "Birthdays this week:"
+#: include/profile_selectors.php:42
+msgid "Unavailable"
msgstr ""
-#: include/identity.php:595
-msgid "[No description]"
+#: include/profile_selectors.php:42
+msgid "Has crush"
msgstr ""
-#: include/identity.php:620
-msgid "Event Reminders"
+#: include/profile_selectors.php:42
+msgid "Infatuated"
msgstr ""
-#: include/identity.php:621
-msgid "Events this week:"
+#: include/profile_selectors.php:42
+msgid "Dating"
msgstr ""
-#: include/identity.php:641 mod/settings.php:1287
-msgid "Full Name:"
+#: include/profile_selectors.php:42
+msgid "Unfaithful"
msgstr ""
-#: include/identity.php:648
-msgid "j F, Y"
+#: include/profile_selectors.php:42
+msgid "Sex Addict"
msgstr ""
-#: include/identity.php:649
-msgid "j F"
+#: include/profile_selectors.php:42
+msgid "Friends/Benefits"
msgstr ""
-#: include/identity.php:661
-msgid "Age:"
+#: include/profile_selectors.php:42
+msgid "Casual"
msgstr ""
-#: include/identity.php:674
-#, php-format
-msgid "for %1$d %2$s"
+#: include/profile_selectors.php:42
+msgid "Engaged"
msgstr ""
-#: include/identity.php:678 mod/profiles.php:706
-msgid "Sexual Preference:"
+#: include/profile_selectors.php:42
+msgid "Married"
msgstr ""
-#: include/identity.php:686 mod/profiles.php:733
-msgid "Hometown:"
+#: include/profile_selectors.php:42
+msgid "Imaginarily married"
msgstr ""
-#: include/identity.php:690 mod/follow.php:139 mod/notifications.php:250
-#: mod/contacts.php:645
-msgid "Tags:"
+#: include/profile_selectors.php:42
+msgid "Partners"
msgstr ""
-#: include/identity.php:694 mod/profiles.php:734
-msgid "Political Views:"
+#: include/profile_selectors.php:42
+msgid "Cohabiting"
msgstr ""
-#: include/identity.php:698
-msgid "Religion:"
+#: include/profile_selectors.php:42
+msgid "Common law"
msgstr ""
-#: include/identity.php:706
-msgid "Hobbies/Interests:"
+#: include/profile_selectors.php:42
+msgid "Happy"
msgstr ""
-#: include/identity.php:710 mod/profiles.php:738
-msgid "Likes:"
+#: include/profile_selectors.php:42
+msgid "Not looking"
msgstr ""
-#: include/identity.php:714 mod/profiles.php:739
-msgid "Dislikes:"
+#: include/profile_selectors.php:42
+msgid "Swinger"
msgstr ""
-#: include/identity.php:718
-msgid "Contact information and Social Networks:"
+#: include/profile_selectors.php:42
+msgid "Betrayed"
msgstr ""
-#: include/identity.php:722
-msgid "Musical interests:"
+#: include/profile_selectors.php:42
+msgid "Separated"
msgstr ""
-#: include/identity.php:726
-msgid "Books, literature:"
+#: include/profile_selectors.php:42
+msgid "Unstable"
msgstr ""
-#: include/identity.php:730
-msgid "Television:"
+#: include/profile_selectors.php:42
+msgid "Divorced"
msgstr ""
-#: include/identity.php:734
-msgid "Film/dance/culture/entertainment:"
+#: include/profile_selectors.php:42
+msgid "Imaginarily divorced"
msgstr ""
-#: include/identity.php:738
-msgid "Love/Romance:"
+#: include/profile_selectors.php:42
+msgid "Widowed"
msgstr ""
-#: include/identity.php:742
-msgid "Work/employment:"
+#: include/profile_selectors.php:42
+msgid "Uncertain"
msgstr ""
-#: include/identity.php:746
-msgid "School/education:"
+#: include/profile_selectors.php:42
+msgid "It's complicated"
msgstr ""
-#: include/identity.php:751
-msgid "Forums:"
+#: include/profile_selectors.php:42
+msgid "Don't care"
msgstr ""
-#: include/identity.php:760 mod/events.php:509
-msgid "Basic"
+#: include/profile_selectors.php:42
+msgid "Ask me"
msgstr ""
-#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065
-#: mod/contacts.php:881
-msgid "Advanced"
+#: include/NotificationsManager.php:155
+msgid "System"
msgstr ""
-#: include/identity.php:787 mod/follow.php:147 mod/contacts.php:847
-msgid "Status Messages and Posts"
+#: include/NotificationsManager.php:169 mod/network.php:835
+#: mod/profiles.php:699
+msgid "Personal"
msgstr ""
-#: include/identity.php:795 mod/contacts.php:855
-msgid "Profile Details"
+#: include/NotificationsManager.php:241 include/NotificationsManager.php:253
+#, php-format
+msgid "%s commented on %s's post"
msgstr ""
-#: include/identity.php:803 mod/photos.php:95
-msgid "Photo Albums"
+#: include/NotificationsManager.php:252
+#, php-format
+msgid "%s created a new post"
msgstr ""
-#: include/identity.php:842 mod/notes.php:49
-msgid "Personal Notes"
+#: include/NotificationsManager.php:267
+#, php-format
+msgid "%s liked %s's post"
msgstr ""
-#: include/identity.php:845
-msgid "Only You Can See This"
+#: include/NotificationsManager.php:280
+#, php-format
+msgid "%s disliked %s's post"
msgstr ""
-#: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759
-msgid "[Name Withheld]"
+#: include/NotificationsManager.php:293
+#, php-format
+msgid "%s is attending %s's event"
msgstr ""
-#: include/items.php:2121 mod/display.php:105 mod/display.php:280
-#: mod/display.php:485 mod/notice.php:17 mod/viewsrc.php:16 mod/admin.php:248
-#: mod/admin.php:1571 mod/admin.php:1822
-msgid "Item not found."
+#: include/NotificationsManager.php:306
+#, php-format
+msgid "%s is not attending %s's event"
msgstr ""
-#: include/items.php:2160
-msgid "Do you really want to delete this item?"
+#: include/NotificationsManager.php:319
+#, php-format
+msgid "%s may attend %s's event"
msgstr ""
-#: include/items.php:2162 mod/api.php:107 mod/follow.php:115
-#: mod/message.php:208 mod/register.php:247 mod/suggest.php:31
-#: mod/dfrn_request.php:880 mod/contacts.php:455 mod/profiles.php:643
-#: mod/profiles.php:646 mod/profiles.php:673 mod/settings.php:1172
-#: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189
-#: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204
-#: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236
-#: mod/settings.php:1237 mod/settings.php:1238 mod/settings.php:1239
-msgid "Yes"
+#: include/NotificationsManager.php:336
+#, php-format
+msgid "%s is now friends with %s"
msgstr ""
-#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33
-#: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105
-#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15
-#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188
-#: mod/follow.php:13 mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80
-#: mod/group.php:20 mod/invite.php:17 mod/invite.php:105 mod/manage.php:103
-#: mod/message.php:48 mod/message.php:173 mod/mood.php:116 mod/network.php:7
-#: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73
-#: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111
-#: mod/poke.php:155 mod/register.php:44 mod/repair_ostatus.php:11
-#: mod/suggest.php:60 mod/viewcontacts.php:49 mod/wall_attach.php:69
-#: mod/wall_attach.php:72 mod/wall_upload.php:101 mod/wall_upload.php:104
-#: mod/wallmessage.php:11 mod/wallmessage.php:35 mod/wallmessage.php:75
-#: mod/wallmessage.php:99 mod/item.php:197 mod/item.php:209 mod/regmod.php:106
-#: mod/uimport.php:26 mod/contacts.php:363 mod/profile_photo.php:19
-#: mod/profile_photo.php:179 mod/profile_photo.php:190
-#: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610
-#: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410
-msgid "Permission denied."
+#: include/NotificationsManager.php:774
+msgid "Friend Suggestion"
msgstr ""
-#: include/items.php:2426
-msgid "Archives"
+#: include/NotificationsManager.php:803
+msgid "Friend/Connect Request"
msgstr ""
-#: include/ostatus.php:1962
+#: include/NotificationsManager.php:803
+msgid "New Follower"
+msgstr ""
+
+#: include/api.php:1102
#, php-format
-msgid "%s is now following %s."
+msgid "Daily posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/ostatus.php:1963
-msgid "following"
+#: include/api.php:1123
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/ostatus.php:1966
+#: include/api.php:1144
#, php-format
-msgid "%s stopped following %s."
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
msgstr ""
-#: include/ostatus.php:1967
-msgid "stopped following"
+#: include/dbstructure.php:25
+msgid "There are no tables on MyISAM."
msgstr ""
-#: include/plugin.php:531 include/plugin.php:533
-msgid "Click here to upgrade."
+#: include/dbstructure.php:66
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
msgstr ""
-#: include/plugin.php:539
-msgid "This action exceeds the limits set by your subscription plan."
+#: include/dbstructure.php:71
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
msgstr ""
-#: include/plugin.php:544
-msgid "This action is not available under your subscription plan."
+#: include/dbstructure.php:195
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Male"
+#: include/dbstructure.php:198
+msgid "Errors encountered performing database changes: "
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Female"
+#: include/dbstructure.php:206
+msgid ": Database update"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Currently Male"
+#: include/dbstructure.php:438
+#, php-format
+msgid "%s: updating %s table."
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Currently Female"
+#: include/diaspora.php:2214
+msgid "Sharing notification from Diaspora network"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Mostly Male"
+#: include/diaspora.php:3234
+msgid "Attachments:"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Mostly Female"
+#: include/identity.php:45
+msgid "Requested account is not available."
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Transgender"
+#: include/identity.php:54 mod/profile.php:22
+msgid "Requested profile is not available."
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Intersex"
+#: include/identity.php:98 include/identity.php:325 include/identity.php:755
+msgid "Edit profile"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Transsexual"
+#: include/identity.php:265
+msgid "Atom feed"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: include/identity.php:296
+msgid "Manage/edit profiles"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Neuter"
+#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790
+msgid "Change profile photo"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Non-specific"
+#: include/identity.php:302 mod/profiles.php:791
+msgid "Create New Profile"
msgstr ""
-#: include/profile_selectors.php:6
-msgid "Other"
+#: include/identity.php:312 mod/profiles.php:780
+msgid "Profile Image"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Males"
+#: include/identity.php:315 mod/profiles.php:782
+msgid "visible to everybody"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Females"
+#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783
+msgid "Edit visibility"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Gay"
+#: include/identity.php:344 include/identity.php:644 mod/directory.php:137
+#: mod/notifications.php:252
+msgid "Gender:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Lesbian"
+#: include/identity.php:347 include/identity.php:665 mod/directory.php:139
+msgid "Status:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "No Preference"
+#: include/identity.php:349 include/identity.php:682 mod/directory.php:141
+msgid "Homepage:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Bisexual"
+#: include/identity.php:351 include/identity.php:702 mod/directory.php:143
+#: mod/notifications.php:248 mod/contacts.php:643
+msgid "About:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Autosexual"
+#: include/identity.php:353 mod/contacts.php:641
+msgid "XMPP:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Abstinent"
+#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58
+msgid "Network:"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Virgin"
+#: include/identity.php:468 include/identity.php:558
+msgid "g A l F d"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Deviant"
+#: include/identity.php:469 include/identity.php:559
+msgid "F d"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Fetish"
+#: include/identity.php:520 include/identity.php:609
+msgid "[today]"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Oodles"
+#: include/identity.php:532
+msgid "Birthday Reminders"
msgstr ""
-#: include/profile_selectors.php:23
-msgid "Nonsexual"
+#: include/identity.php:533
+msgid "Birthdays this week:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Single"
+#: include/identity.php:595
+msgid "[No description]"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Lonely"
+#: include/identity.php:620
+msgid "Event Reminders"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Available"
+#: include/identity.php:621
+msgid "Events this week:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Unavailable"
+#: include/identity.php:641 mod/settings.php:1287
+msgid "Full Name:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Has crush"
+#: include/identity.php:648
+msgid "j F, Y"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Infatuated"
+#: include/identity.php:649
+msgid "j F"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Dating"
+#: include/identity.php:661
+msgid "Age:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Unfaithful"
+#: include/identity.php:674
+#, php-format
+msgid "for %1$d %2$s"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Sex Addict"
+#: include/identity.php:678 mod/profiles.php:706
+msgid "Sexual Preference:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: include/identity.php:686 mod/profiles.php:733
+msgid "Hometown:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Casual"
+#: include/identity.php:690 mod/follow.php:139 mod/notifications.php:250
+#: mod/contacts.php:645
+msgid "Tags:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Engaged"
+#: include/identity.php:694 mod/profiles.php:734
+msgid "Political Views:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Married"
+#: include/identity.php:698
+msgid "Religion:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: include/identity.php:706
+msgid "Hobbies/Interests:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Partners"
+#: include/identity.php:710 mod/profiles.php:738
+msgid "Likes:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Cohabiting"
+#: include/identity.php:714 mod/profiles.php:739
+msgid "Dislikes:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Common law"
+#: include/identity.php:718
+msgid "Contact information and Social Networks:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Happy"
+#: include/identity.php:722
+msgid "Musical interests:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Not looking"
+#: include/identity.php:726
+msgid "Books, literature:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Swinger"
+#: include/identity.php:730
+msgid "Television:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Betrayed"
+#: include/identity.php:734
+msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Separated"
+#: include/identity.php:738
+msgid "Love/Romance:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Unstable"
+#: include/identity.php:742
+msgid "Work/employment:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Divorced"
+#: include/identity.php:746
+msgid "School/education:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: include/identity.php:751
+msgid "Forums:"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Widowed"
+#: include/identity.php:760 mod/events.php:509
+msgid "Basic"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Uncertain"
+#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881
+#: mod/admin.php:1065
+msgid "Advanced"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "It's complicated"
+#: include/identity.php:787 mod/follow.php:147 mod/contacts.php:847
+msgid "Status Messages and Posts"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Don't care"
+#: include/identity.php:795 mod/contacts.php:855
+msgid "Profile Details"
msgstr ""
-#: include/profile_selectors.php:42
-msgid "Ask me"
+#: include/identity.php:803 mod/photos.php:95
+msgid "Photo Albums"
+msgstr ""
+
+#: include/identity.php:842 mod/notes.php:49
+msgid "Personal Notes"
+msgstr ""
+
+#: include/identity.php:845
+msgid "Only You Can See This"
+msgstr ""
+
+#: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759
+msgid "[Name Withheld]"
+msgstr ""
+
+#: include/items.php:2121 mod/display.php:105 mod/display.php:280
+#: mod/display.php:485 mod/notice.php:17 mod/viewsrc.php:16 mod/admin.php:248
+#: mod/admin.php:1571 mod/admin.php:1822
+msgid "Item not found."
+msgstr ""
+
+#: include/items.php:2160
+msgid "Do you really want to delete this item?"
+msgstr ""
+
+#: include/items.php:2162 mod/api.php:107 mod/follow.php:115
+#: mod/message.php:208 mod/register.php:247 mod/suggest.php:31
+#: mod/dfrn_request.php:880 mod/contacts.php:455 mod/profiles.php:643
+#: mod/profiles.php:646 mod/profiles.php:673 mod/settings.php:1172
+#: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189
+#: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204
+#: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236
+#: mod/settings.php:1237 mod/settings.php:1238 mod/settings.php:1239
+msgid "Yes"
+msgstr ""
+
+#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33
+#: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105
+#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15
+#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 mod/follow.php:13
+#: mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 mod/group.php:20
+#: mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 mod/message.php:48
+#: mod/message.php:173 mod/mood.php:116 mod/network.php:7 mod/nogroup.php:29
+#: mod/notes.php:25 mod/notifications.php:73 mod/ostatus_subscribe.php:11
+#: mod/photos.php:168 mod/photos.php:1111 mod/poke.php:155 mod/register.php:44
+#: mod/repair_ostatus.php:11 mod/suggest.php:60 mod/viewcontacts.php:49
+#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101
+#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35
+#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/item.php:197
+#: mod/item.php:209 mod/regmod.php:106 mod/uimport.php:26 mod/contacts.php:363
+#: mod/profile_photo.php:19 mod/profile_photo.php:179 mod/profile_photo.php:190
+#: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610
+#: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410
+msgid "Permission denied."
+msgstr ""
+
+#: include/items.php:2426
+msgid "Archives"
+msgstr ""
+
+#: include/ostatus.php:1962
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
+#: include/ostatus.php:1963
+msgid "following"
+msgstr ""
+
+#: include/ostatus.php:1966
+#, php-format
+msgid "%s stopped following %s."
+msgstr ""
+
+#: include/ostatus.php:1967
+msgid "stopped following"
msgstr ""
#: mod/allfriends.php:48
#: mod/content.php:729 mod/crepair.php:159 mod/events.php:508
#: mod/fsuggest.php:109 mod/install.php:244 mod/install.php:284
#: mod/invite.php:144 mod/localtime.php:46 mod/manage.php:156
-#: mod/message.php:340 mod/message.php:523 mod/mood.php:139
-#: mod/photos.php:1143 mod/photos.php:1273 mod/photos.php:1599
-#: mod/photos.php:1648 mod/photos.php:1690 mod/photos.php:1770
-#: mod/poke.php:204 mod/contacts.php:588 mod/profiles.php:684
-#: object/Item.php:702 view/theme/duepuntozero/config.php:64
-#: view/theme/frio/config.php:67 view/theme/quattro/config.php:70
-#: view/theme/vier/config.php:113
+#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 mod/photos.php:1143
+#: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648
+#: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204
+#: mod/contacts.php:588 mod/profiles.php:684 object/Item.php:702
+#: view/theme/duepuntozero/config.php:64 view/theme/frio/config.php:67
+#: view/theme/quattro/config.php:70 view/theme/vier/config.php:113
msgid "Submit"
msgstr ""
"entries from this contact."
msgstr ""
-#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509
-#: mod/admin.php:1522 mod/admin.php:1538 mod/settings.php:684
-#: mod/settings.php:710
+#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522
+#: mod/admin.php:1538 mod/settings.php:684 mod/settings.php:710
msgid "Name"
msgstr ""
msgid "%1$s welcomes %2$s"
msgstr ""
-#: mod/directory.php:195 view/theme/vier/theme.php:201
+#: mod/directory.php:195 view/theme/vier/theme.php:193
msgid "Global Directory"
msgstr ""
"Password reset failed."
msgstr ""
-#: mod/lostpass.php:112 boot.php:877
+#: mod/lostpass.php:112 boot.php:884
msgid "Password Reset"
msgstr ""
"your email for further instructions."
msgstr ""
-#: mod/lostpass.php:163 boot.php:865
+#: mod/lostpass.php:163 boot.php:872
msgid "Nickname or Email: "
msgstr ""
msgid "Invalid request identifier."
msgstr ""
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
+#: mod/notifications.php:46 mod/notifications.php:182 mod/notifications.php:229
msgid "Discard"
msgstr ""
-#: mod/notifications.php:62 mod/notifications.php:181
-#: mod/notifications.php:265 mod/contacts.php:617 mod/contacts.php:817
-#: mod/contacts.php:1002
+#: mod/notifications.php:62 mod/notifications.php:181 mod/notifications.php:265
+#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002
msgid "Ignore"
msgstr ""
msgid "View Album"
msgstr ""
-#: mod/ping.php:273
-msgid "{0} wants to be your friend"
-msgstr ""
-
-#: mod/ping.php:288
-msgid "{0} sent you a message"
-msgstr ""
-
-#: mod/ping.php:303
-msgid "{0} requested registration"
-msgstr ""
-
#: mod/poke.php:197
msgid "Poke/Prod"
msgstr ""
"select \"Export account\""
msgstr ""
-#: mod/admin.php:97
-msgid "Theme settings updated."
-msgstr ""
-
-#: mod/admin.php:166 mod/admin.php:1060
-msgid "Site"
-msgstr ""
+#: mod/contacts.php:137
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] ""
+msgstr[1] ""
-#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520
-msgid "Users"
+#: mod/contacts.php:172 mod/contacts.php:381
+msgid "Could not access contact record."
msgstr ""
-#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76
-msgid "Plugins"
+#: mod/contacts.php:186
+msgid "Could not locate selected profile."
msgstr ""
-#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948
-msgid "Themes"
+#: mod/contacts.php:219
+msgid "Contact updated."
msgstr ""
-#: mod/admin.php:170 mod/settings.php:54
-msgid "Additional features"
+#: mod/contacts.php:402
+msgid "Contact has been blocked"
msgstr ""
-#: mod/admin.php:171
-msgid "DB updates"
+#: mod/contacts.php:402
+msgid "Contact has been unblocked"
msgstr ""
-#: mod/admin.php:172 mod/admin.php:513
-msgid "Inspect Queue"
+#: mod/contacts.php:413
+msgid "Contact has been ignored"
msgstr ""
-#: mod/admin.php:173 mod/admin.php:289
-msgid "Server Blocklist"
+#: mod/contacts.php:413
+msgid "Contact has been unignored"
msgstr ""
-#: mod/admin.php:174 mod/admin.php:479
-msgid "Federation Statistics"
+#: mod/contacts.php:425
+msgid "Contact has been archived"
msgstr ""
-#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022
-msgid "Logs"
+#: mod/contacts.php:425
+msgid "Contact has been unarchived"
msgstr ""
-#: mod/admin.php:189 mod/admin.php:2090
-msgid "View Logs"
+#: mod/contacts.php:450
+msgid "Drop contact"
msgstr ""
-#: mod/admin.php:190
-msgid "probe address"
+#: mod/contacts.php:453 mod/contacts.php:812
+msgid "Do you really want to delete this contact?"
msgstr ""
-#: mod/admin.php:191
-msgid "check webfinger"
+#: mod/contacts.php:472
+msgid "Contact has been removed."
msgstr ""
-#: mod/admin.php:198
-msgid "Plugin Features"
+#: mod/contacts.php:509
+#, php-format
+msgid "You are mutual friends with %s"
msgstr ""
-#: mod/admin.php:200
-msgid "diagnostics"
+#: mod/contacts.php:513
+#, php-format
+msgid "You are sharing with %s"
msgstr ""
-#: mod/admin.php:201
-msgid "User registrations waiting for confirmation"
+#: mod/contacts.php:518
+#, php-format
+msgid "%s is sharing with you"
msgstr ""
-#: mod/admin.php:280
-msgid "The blocked domain"
+#: mod/contacts.php:538
+msgid "Private communications are not available for this contact."
msgstr ""
-#: mod/admin.php:281 mod/admin.php:294
-msgid "The reason why you blocked this domain."
+#: mod/contacts.php:541 mod/admin.php:984
+msgid "Never"
msgstr ""
-#: mod/admin.php:282
-msgid "Delete domain"
+#: mod/contacts.php:545
+msgid "(Update was successful)"
msgstr ""
-#: mod/admin.php:282
-msgid "Check to delete this entry from the blocklist"
+#: mod/contacts.php:545
+msgid "(Update was not successful)"
msgstr ""
-#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592
-#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684
-#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089
-msgid "Administration"
+#: mod/contacts.php:547 mod/contacts.php:975
+msgid "Suggest friends"
msgstr ""
-#: mod/admin.php:290
-msgid ""
-"This page can be used to define a black list of servers from the federated "
-"network that are not allowed to interact with your node. For all entered "
-"domains you should also give a reason why you have blocked the remote server."
+#: mod/contacts.php:551
+#, php-format
+msgid "Network type: %s"
msgstr ""
-#: mod/admin.php:291
-msgid ""
-"The list of blocked servers will be made publically available on the /"
-"friendica page so that your users and people investigating communication "
-"problems can find the reason easily."
+#: mod/contacts.php:564
+msgid "Communications lost with this contact!"
msgstr ""
-#: mod/admin.php:292
-msgid "Add new entry to block list"
+#: mod/contacts.php:567
+msgid "Fetch further information for feeds"
msgstr ""
-#: mod/admin.php:293
-msgid "Server Domain"
+#: mod/contacts.php:568 mod/admin.php:993
+msgid "Disabled"
msgstr ""
-#: mod/admin.php:293
-msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
+#: mod/contacts.php:568
+msgid "Fetch information"
msgstr ""
-#: mod/admin.php:294
-msgid "Block reason"
+#: mod/contacts.php:568
+msgid "Fetch information and keywords"
msgstr ""
-#: mod/admin.php:295
-msgid "Add Entry"
+#: mod/contacts.php:586
+msgid "Contact"
msgstr ""
-#: mod/admin.php:296
-msgid "Save changes to the blocklist"
+#: mod/contacts.php:589
+msgid "Profile Visibility"
msgstr ""
-#: mod/admin.php:297
-msgid "Current Entries in the Blocklist"
+#: mod/contacts.php:590
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
msgstr ""
-#: mod/admin.php:300
-msgid "Delete entry from blocklist"
+#: mod/contacts.php:591
+msgid "Contact Information / Notes"
msgstr ""
-#: mod/admin.php:303
-msgid "Delete entry from blocklist?"
+#: mod/contacts.php:592
+msgid "Edit contact notes"
msgstr ""
-#: mod/admin.php:328
-msgid "Server added to blocklist."
+#: mod/contacts.php:598
+msgid "Block/Unblock contact"
msgstr ""
-#: mod/admin.php:344
-msgid "Site blocklist updated."
+#: mod/contacts.php:599
+msgid "Ignore contact"
msgstr ""
-#: mod/admin.php:409
-msgid "unknown"
+#: mod/contacts.php:600
+msgid "Repair URL settings"
msgstr ""
-#: mod/admin.php:472
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
+#: mod/contacts.php:601
+msgid "View conversations"
msgstr ""
-#: mod/admin.php:473
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
+#: mod/contacts.php:607
+msgid "Last update:"
msgstr ""
-#: mod/admin.php:485
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
+#: mod/contacts.php:609
+msgid "Update public posts"
msgstr ""
-#: mod/admin.php:515
-msgid "ID"
+#: mod/contacts.php:611 mod/contacts.php:985
+msgid "Update now"
msgstr ""
-#: mod/admin.php:516
-msgid "Recipient Name"
+#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994
+#: mod/admin.php:1516
+msgid "Unblock"
msgstr ""
-#: mod/admin.php:517
-msgid "Recipient Profile"
+#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994
+#: mod/admin.php:1515
+msgid "Block"
msgstr ""
-#: mod/admin.php:519
-msgid "Created"
+#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002
+msgid "Unignore"
msgstr ""
-#: mod/admin.php:520
-msgid "Last Tried"
+#: mod/contacts.php:621
+msgid "Currently blocked"
msgstr ""
-#: mod/admin.php:521
-msgid ""
-"This page lists the content of the queue for outgoing postings. These are "
-"postings the initial delivery failed for. They will be resend later and "
-"eventually deleted if the delivery fails permanently."
+#: mod/contacts.php:622
+msgid "Currently ignored"
msgstr ""
-#: mod/admin.php:546
-#, php-format
-msgid ""
-"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 include/"
-"dbstructure.php toinnodb</tt> of your Friendica installation for an "
-"automatic conversion.<br />"
+#: mod/contacts.php:623
+msgid "Currently archived"
msgstr ""
-#: mod/admin.php:555
+#: mod/contacts.php:624
msgid ""
-"The database update failed. Please run \"php include/dbstructure.php update"
-"\" from the command line and have a look at the errors that might appear."
+"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
-#: mod/admin.php:560 mod/admin.php:1453
-msgid "Normal Account"
+#: mod/contacts.php:625
+msgid "Notification for new posts"
msgstr ""
-#: mod/admin.php:561 mod/admin.php:1454
-msgid "Soapbox Account"
+#: mod/contacts.php:625
+msgid "Send a notification of every new post of this contact"
msgstr ""
-#: mod/admin.php:562 mod/admin.php:1455
-msgid "Community/Celebrity Account"
+#: mod/contacts.php:628
+msgid "Blacklisted keywords"
msgstr ""
-#: mod/admin.php:563 mod/admin.php:1456
-msgid "Automatic Friend Account"
+#: mod/contacts.php:628
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
msgstr ""
-#: mod/admin.php:564
-msgid "Blog Account"
+#: mod/contacts.php:646
+msgid "Actions"
msgstr ""
-#: mod/admin.php:565
-msgid "Private Forum"
+#: mod/contacts.php:649
+msgid "Contact Settings"
msgstr ""
-#: mod/admin.php:587
-msgid "Message queues"
+#: mod/contacts.php:695
+msgid "Suggestions"
msgstr ""
-#: mod/admin.php:593
-msgid "Summary"
+#: mod/contacts.php:698
+msgid "Suggest potential friends"
msgstr ""
-#: mod/admin.php:595
-msgid "Registered users"
+#: mod/contacts.php:706
+msgid "Show all contacts"
msgstr ""
-#: mod/admin.php:597
-msgid "Pending registrations"
-msgstr ""
-
-#: mod/admin.php:598
-msgid "Version"
+#: mod/contacts.php:711
+msgid "Unblocked"
msgstr ""
-#: mod/admin.php:603
-msgid "Active plugins"
+#: mod/contacts.php:714
+msgid "Only show unblocked contacts"
msgstr ""
-#: mod/admin.php:628
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+#: mod/contacts.php:720
+msgid "Blocked"
msgstr ""
-#: mod/admin.php:920
-msgid "Site settings updated."
+#: mod/contacts.php:723
+msgid "Only show blocked contacts"
msgstr ""
-#: mod/admin.php:948 mod/settings.php:944
-msgid "No special theme for mobile devices"
+#: mod/contacts.php:729
+msgid "Ignored"
msgstr ""
-#: mod/admin.php:977
-msgid "No community page"
+#: mod/contacts.php:732
+msgid "Only show ignored contacts"
msgstr ""
-#: mod/admin.php:978
-msgid "Public postings from users of this site"
+#: mod/contacts.php:738
+msgid "Archived"
msgstr ""
-#: mod/admin.php:979
-msgid "Global community page"
+#: mod/contacts.php:741
+msgid "Only show archived contacts"
msgstr ""
-#: mod/admin.php:984 mod/contacts.php:541
-msgid "Never"
+#: mod/contacts.php:747
+msgid "Hidden"
msgstr ""
-#: mod/admin.php:985
-msgid "At post arrival"
+#: mod/contacts.php:750
+msgid "Only show hidden contacts"
msgstr ""
-#: mod/admin.php:993 mod/contacts.php:568
-msgid "Disabled"
+#: mod/contacts.php:807
+msgid "Search your contacts"
msgstr ""
-#: mod/admin.php:995
-msgid "Users, Global Contacts"
+#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708
+msgid "Update"
msgstr ""
-#: mod/admin.php:996
-msgid "Users, Global Contacts/fallback"
+#: mod/contacts.php:818 mod/contacts.php:1010
+msgid "Archive"
msgstr ""
-#: mod/admin.php:1000
-msgid "One month"
+#: mod/contacts.php:818 mod/contacts.php:1010
+msgid "Unarchive"
msgstr ""
-#: mod/admin.php:1001
-msgid "Three months"
+#: mod/contacts.php:821
+msgid "Batch Actions"
msgstr ""
-#: mod/admin.php:1002
-msgid "Half a year"
+#: mod/contacts.php:867
+msgid "View all contacts"
msgstr ""
-#: mod/admin.php:1003
-msgid "One year"
+#: mod/contacts.php:877
+msgid "View all common friends"
msgstr ""
-#: mod/admin.php:1008
-msgid "Multi user instance"
+#: mod/contacts.php:884
+msgid "Advanced Contact Settings"
msgstr ""
-#: mod/admin.php:1031
-msgid "Closed"
+#: mod/contacts.php:918
+msgid "Mutual Friendship"
msgstr ""
-#: mod/admin.php:1032
-msgid "Requires approval"
+#: mod/contacts.php:922
+msgid "is a fan of yours"
msgstr ""
-#: mod/admin.php:1033
-msgid "Open"
+#: mod/contacts.php:926
+msgid "you are a fan of"
msgstr ""
-#: mod/admin.php:1037
-msgid "No SSL policy, links will track page SSL state"
+#: mod/contacts.php:996
+msgid "Toggle Blocked status"
msgstr ""
-#: mod/admin.php:1038
-msgid "Force all links to use SSL"
+#: mod/contacts.php:1004
+msgid "Toggle Ignored status"
msgstr ""
-#: mod/admin.php:1039
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+#: mod/contacts.php:1012
+msgid "Toggle Archive status"
msgstr ""
-#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023
-#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793
-#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006
-#: mod/settings.php:1272
-msgid "Save Settings"
+#: mod/contacts.php:1020
+msgid "Delete contact"
msgstr ""
-#: mod/admin.php:1063
-msgid "File upload"
+#: mod/ping.php:274
+msgid "{0} wants to be your friend"
msgstr ""
-#: mod/admin.php:1064
-msgid "Policies"
+#: mod/ping.php:289
+msgid "{0} sent you a message"
msgstr ""
-#: mod/admin.php:1066
-msgid "Auto Discovered Contact Directory"
+#: mod/ping.php:304
+msgid "{0} requested registration"
msgstr ""
-#: mod/admin.php:1067
-msgid "Performance"
+#: mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
msgstr ""
-#: mod/admin.php:1068
-msgid "Worker"
+#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93
+#: mod/profile_photo.php:322
+#, php-format
+msgid "Image size reduction [%s] failed."
msgstr ""
-#: mod/admin.php:1069
+#: mod/profile_photo.php:127
msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
msgstr ""
-#: mod/admin.php:1072
-msgid "Site name"
+#: mod/profile_photo.php:136
+msgid "Unable to process image"
msgstr ""
-#: mod/admin.php:1073
-msgid "Host name"
+#: mod/profile_photo.php:253
+msgid "Upload File:"
msgstr ""
-#: mod/admin.php:1074
-msgid "Sender Email"
+#: mod/profile_photo.php:254
+msgid "Select a profile:"
msgstr ""
-#: mod/admin.php:1074
-msgid ""
-"The email address your server shall use to send notification emails from."
+#: mod/profile_photo.php:256
+msgid "Upload"
msgstr ""
-#: mod/admin.php:1075
-msgid "Banner/Logo"
+#: mod/profile_photo.php:259
+msgid "or"
msgstr ""
-#: mod/admin.php:1076
-msgid "Shortcut icon"
+#: mod/profile_photo.php:259
+msgid "skip this step"
msgstr ""
-#: mod/admin.php:1076
-msgid "Link to an icon that will be used for browsers."
+#: mod/profile_photo.php:259
+msgid "select a photo from your photo albums"
msgstr ""
-#: mod/admin.php:1077
-msgid "Touch icon"
+#: mod/profile_photo.php:273
+msgid "Crop Image"
msgstr ""
-#: mod/admin.php:1077
-msgid "Link to an icon that will be used for tablets and mobiles."
+#: mod/profile_photo.php:274
+msgid "Please adjust the image cropping for optimum viewing."
msgstr ""
-#: mod/admin.php:1078
-msgid "Additional Info"
+#: mod/profile_photo.php:276
+msgid "Done Editing"
msgstr ""
-#: mod/admin.php:1078
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
+#: mod/profile_photo.php:312
+msgid "Image uploaded successfully."
msgstr ""
-#: mod/admin.php:1079
-msgid "System language"
+#: mod/profiles.php:42
+msgid "Profile deleted."
msgstr ""
-#: mod/admin.php:1080
-msgid "System theme"
+#: mod/profiles.php:58 mod/profiles.php:94
+msgid "Profile-"
msgstr ""
-#: mod/admin.php:1080
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
+#: mod/profiles.php:77 mod/profiles.php:122
+msgid "New profile created."
msgstr ""
-#: mod/admin.php:1081
-msgid "Mobile system theme"
+#: mod/profiles.php:100
+msgid "Profile unavailable to clone."
msgstr ""
-#: mod/admin.php:1081
-msgid "Theme for mobile devices"
+#: mod/profiles.php:196
+msgid "Profile Name is required."
msgstr ""
-#: mod/admin.php:1082
-msgid "SSL link policy"
+#: mod/profiles.php:336
+msgid "Marital Status"
msgstr ""
-#: mod/admin.php:1082
-msgid "Determines whether generated links should be forced to use SSL"
+#: mod/profiles.php:340
+msgid "Romantic Partner"
msgstr ""
-#: mod/admin.php:1083
-msgid "Force SSL"
+#: mod/profiles.php:352
+msgid "Work/Employment"
msgstr ""
-#: mod/admin.php:1083
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
+#: mod/profiles.php:355
+msgid "Religion"
msgstr ""
-#: mod/admin.php:1084
-msgid "Hide help entry from navigation menu"
+#: mod/profiles.php:359
+msgid "Political Views"
msgstr ""
-#: mod/admin.php:1084
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
+#: mod/profiles.php:363
+msgid "Gender"
msgstr ""
-#: mod/admin.php:1085
-msgid "Single user instance"
+#: mod/profiles.php:367
+msgid "Sexual Preference"
msgstr ""
-#: mod/admin.php:1085
-msgid "Make this instance multi-user or single-user for the named user"
+#: mod/profiles.php:371
+msgid "XMPP"
msgstr ""
-#: mod/admin.php:1086
-msgid "Maximum image size"
+#: mod/profiles.php:375
+msgid "Homepage"
msgstr ""
-#: mod/admin.php:1086
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: mod/profiles.php:379 mod/profiles.php:698
+msgid "Interests"
msgstr ""
-#: mod/admin.php:1087
-msgid "Maximum image length"
+#: mod/profiles.php:383
+msgid "Address"
msgstr ""
-#: mod/admin.php:1087
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
+#: mod/profiles.php:390 mod/profiles.php:694
+msgid "Location"
msgstr ""
-#: mod/admin.php:1088
-msgid "JPEG image quality"
+#: mod/profiles.php:475
+msgid "Profile updated."
msgstr ""
-#: mod/admin.php:1088
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
+#: mod/profiles.php:567
+msgid " and "
msgstr ""
-#: mod/admin.php:1090
-msgid "Register policy"
+#: mod/profiles.php:576
+msgid "public profile"
msgstr ""
-#: mod/admin.php:1091
-msgid "Maximum Daily Registrations"
+#: mod/profiles.php:579
+#, php-format
+msgid "%1$s changed %2$s to “%3$s”"
msgstr ""
-#: mod/admin.php:1091
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user "
-"registrations to accept per day. If register is set to closed, this setting "
-"has no effect."
+#: mod/profiles.php:580
+#, php-format
+msgid " - Visit %1$s's %2$s"
msgstr ""
-#: mod/admin.php:1092
-msgid "Register text"
+#: mod/profiles.php:582
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
-#: mod/admin.php:1092
-msgid "Will be displayed prominently on the registration page."
+#: mod/profiles.php:640
+msgid "Hide contacts and friends:"
msgstr ""
-#: mod/admin.php:1093
-msgid "Accounts abandoned after x days"
+#: mod/profiles.php:645
+msgid "Hide your contact/friend list from viewers of this profile?"
msgstr ""
-#: mod/admin.php:1093
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: mod/profiles.php:670
+msgid "Show more profile fields:"
msgstr ""
-#: mod/admin.php:1094
-msgid "Allowed friend domains"
+#: mod/profiles.php:682
+msgid "Profile Actions"
msgstr ""
-#: mod/admin.php:1094
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: mod/profiles.php:683
+msgid "Edit Profile Details"
msgstr ""
-#: mod/admin.php:1095
-msgid "Allowed email domains"
+#: mod/profiles.php:685
+msgid "Change Profile Photo"
msgstr ""
-#: mod/admin.php:1095
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
+#: mod/profiles.php:686
+msgid "View this profile"
msgstr ""
-#: mod/admin.php:1096
-msgid "Block public"
+#: mod/profiles.php:688
+msgid "Create a new profile using these settings"
msgstr ""
-#: mod/admin.php:1096
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+#: mod/profiles.php:689
+msgid "Clone this profile"
msgstr ""
-#: mod/admin.php:1097
-msgid "Force publish"
+#: mod/profiles.php:690
+msgid "Delete this profile"
msgstr ""
-#: mod/admin.php:1097
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: mod/profiles.php:692
+msgid "Basic information"
msgstr ""
-#: mod/admin.php:1098
-msgid "Global directory URL"
+#: mod/profiles.php:693
+msgid "Profile picture"
msgstr ""
-#: mod/admin.php:1098
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
+#: mod/profiles.php:695
+msgid "Preferences"
msgstr ""
-#: mod/admin.php:1099
-msgid "Allow threaded items"
+#: mod/profiles.php:696
+msgid "Status information"
msgstr ""
-#: mod/admin.php:1099
-msgid "Allow infinite level threading for items on this site."
+#: mod/profiles.php:697
+msgid "Additional information"
msgstr ""
-#: mod/admin.php:1100
-msgid "Private posts by default for new users"
+#: mod/profiles.php:700
+msgid "Relation"
msgstr ""
-#: mod/admin.php:1100
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
+#: mod/profiles.php:704
+msgid "Your Gender:"
msgstr ""
-#: mod/admin.php:1101
-msgid "Don't include post content in email notifications"
+#: mod/profiles.php:705
+msgid "<span class=\"heart\">♥</span> Marital Status:"
msgstr ""
-#: mod/admin.php:1101
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
+#: mod/profiles.php:707
+msgid "Example: fishing photography software"
msgstr ""
-#: mod/admin.php:1102
-msgid "Disallow public access to addons listed in the apps menu."
+#: mod/profiles.php:712
+msgid "Profile Name:"
msgstr ""
-#: mod/admin.php:1102
+#: mod/profiles.php:714
msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: mod/admin.php:1103
-msgid "Don't embed private images in posts"
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
msgstr ""
-#: mod/admin.php:1103
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
+#: mod/profiles.php:715
+msgid "Your Full Name:"
msgstr ""
-#: mod/admin.php:1104
-msgid "Allow Users to set remote_self"
+#: mod/profiles.php:716
+msgid "Title/Description:"
msgstr ""
-#: mod/admin.php:1104
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
+#: mod/profiles.php:719
+msgid "Street Address:"
msgstr ""
-#: mod/admin.php:1105
-msgid "Block multiple registrations"
+#: mod/profiles.php:720
+msgid "Locality/City:"
msgstr ""
-#: mod/admin.php:1105
-msgid "Disallow users to register additional accounts for use as pages."
+#: mod/profiles.php:721
+msgid "Region/State:"
msgstr ""
-#: mod/admin.php:1106
-msgid "OpenID support"
+#: mod/profiles.php:722
+msgid "Postal/Zip Code:"
msgstr ""
-#: mod/admin.php:1106
-msgid "OpenID support for registration and logins."
+#: mod/profiles.php:723
+msgid "Country:"
msgstr ""
-#: mod/admin.php:1107
-msgid "Fullname check"
+#: mod/profiles.php:727
+msgid "Who: (if applicable)"
msgstr ""
-#: mod/admin.php:1107
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
+#: mod/profiles.php:727
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr ""
-#: mod/admin.php:1108
-msgid "Community Page Style"
+#: mod/profiles.php:728
+msgid "Since [date]:"
msgstr ""
-#: mod/admin.php:1108
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
+#: mod/profiles.php:730
+msgid "Tell us about yourself..."
msgstr ""
-#: mod/admin.php:1109
-msgid "Posts per user on community page"
+#: mod/profiles.php:731
+msgid "XMPP (Jabber) address:"
msgstr ""
-#: mod/admin.php:1109
+#: mod/profiles.php:731
msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
+"The XMPP address will be propagated to your contacts so that they can follow "
+"you."
msgstr ""
-#: mod/admin.php:1110
-msgid "Enable OStatus support"
+#: mod/profiles.php:732
+msgid "Homepage URL:"
msgstr ""
-#: mod/admin.php:1110
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
+#: mod/profiles.php:735
+msgid "Religious Views:"
msgstr ""
-#: mod/admin.php:1111
-msgid "OStatus conversation completion interval"
+#: mod/profiles.php:736
+msgid "Public Keywords:"
msgstr ""
-#: mod/admin.php:1111
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
+#: mod/profiles.php:736
+msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr ""
-#: mod/admin.php:1112
-msgid "Only import OStatus threads from our contacts"
+#: mod/profiles.php:737
+msgid "Private Keywords:"
msgstr ""
-#: mod/admin.php:1112
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option "
-"we only store threads that are started by a contact that is known on our "
-"system."
+#: mod/profiles.php:737
+msgid "(Used for searching profiles, never shown to others)"
msgstr ""
-#: mod/admin.php:1113
-msgid "OStatus support can only be enabled if threading is enabled."
+#: mod/profiles.php:740
+msgid "Musical interests"
msgstr ""
-#: mod/admin.php:1115
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
+#: mod/profiles.php:741
+msgid "Books, literature"
msgstr ""
-#: mod/admin.php:1116
-msgid "Enable Diaspora support"
+#: mod/profiles.php:742
+msgid "Television"
msgstr ""
-#: mod/admin.php:1116
-msgid "Provide built-in Diaspora network compatibility."
+#: mod/profiles.php:743
+msgid "Film/dance/culture/entertainment"
msgstr ""
-#: mod/admin.php:1117
-msgid "Only allow Friendica contacts"
+#: mod/profiles.php:744
+msgid "Hobbies/Interests"
msgstr ""
-#: mod/admin.php:1117
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
+#: mod/profiles.php:745
+msgid "Love/romance"
msgstr ""
-#: mod/admin.php:1118
-msgid "Verify SSL"
+#: mod/profiles.php:746
+msgid "Work/employment"
msgstr ""
-#: mod/admin.php:1118
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
+#: mod/profiles.php:747
+msgid "School/education"
msgstr ""
-#: mod/admin.php:1119
-msgid "Proxy user"
+#: mod/profiles.php:748
+msgid "Contact information and Social Networks"
msgstr ""
-#: mod/admin.php:1120
-msgid "Proxy URL"
+#: mod/profiles.php:789
+msgid "Edit/Manage Profiles"
msgstr ""
-#: mod/admin.php:1121
-msgid "Network timeout"
+#: mod/admin.php:97
+msgid "Theme settings updated."
msgstr ""
-#: mod/admin.php:1121
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: mod/admin.php:166 mod/admin.php:1060
+msgid "Site"
msgstr ""
-#: mod/admin.php:1122
-msgid "Maximum Load Average"
+#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520
+msgid "Users"
msgstr ""
-#: mod/admin.php:1122
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76
+msgid "Plugins"
msgstr ""
-#: mod/admin.php:1123
-msgid "Maximum Load Average (Frontend)"
+#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948
+msgid "Themes"
msgstr ""
-#: mod/admin.php:1123
-msgid "Maximum system load before the frontend quits service - default 50."
+#: mod/admin.php:170 mod/settings.php:54
+msgid "Additional features"
msgstr ""
-#: mod/admin.php:1124
-msgid "Minimal Memory"
+#: mod/admin.php:171
+msgid "DB updates"
msgstr ""
-#: mod/admin.php:1124
-msgid ""
-"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
+#: mod/admin.php:172 mod/admin.php:513
+msgid "Inspect Queue"
msgstr ""
-#: mod/admin.php:1125
-msgid "Maximum table size for optimization"
+#: mod/admin.php:173 mod/admin.php:289
+msgid "Server Blocklist"
msgstr ""
-#: mod/admin.php:1125
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
+#: mod/admin.php:174 mod/admin.php:479
+msgid "Federation Statistics"
msgstr ""
-#: mod/admin.php:1126
-msgid "Minimum level of fragmentation"
+#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022
+msgid "Logs"
msgstr ""
-#: mod/admin.php:1126
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
+#: mod/admin.php:189 mod/admin.php:2090
+msgid "View Logs"
msgstr ""
-#: mod/admin.php:1128
-msgid "Periodical check of global contacts"
+#: mod/admin.php:190
+msgid "probe address"
msgstr ""
-#: mod/admin.php:1128
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
+#: mod/admin.php:191
+msgid "check webfinger"
msgstr ""
-#: mod/admin.php:1129
-msgid "Days between requery"
+#: mod/admin.php:198
+msgid "Plugin Features"
msgstr ""
-#: mod/admin.php:1129
-msgid "Number of days after which a server is requeried for his contacts."
+#: mod/admin.php:200
+msgid "diagnostics"
msgstr ""
-#: mod/admin.php:1130
-msgid "Discover contacts from other servers"
+#: mod/admin.php:201
+msgid "User registrations waiting for confirmation"
msgstr ""
-#: mod/admin.php:1130
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
+#: mod/admin.php:280
+msgid "The blocked domain"
msgstr ""
-#: mod/admin.php:1131
-msgid "Timeframe for fetching global contacts"
+#: mod/admin.php:281 mod/admin.php:294
+msgid "The reason why you blocked this domain."
msgstr ""
-#: mod/admin.php:1131
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
+#: mod/admin.php:282
+msgid "Delete domain"
msgstr ""
-#: mod/admin.php:1132
-msgid "Search the local directory"
+#: mod/admin.php:282
+msgid "Check to delete this entry from the blocklist"
msgstr ""
-#: mod/admin.php:1132
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
+#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592
+#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684
+#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089
+msgid "Administration"
msgstr ""
-#: mod/admin.php:1134
-msgid "Publish server information"
+#: mod/admin.php:290
+msgid ""
+"This page can be used to define a black list of servers from the federated "
+"network that are not allowed to interact with your node. For all entered "
+"domains you should also give a reason why you have blocked the remote server."
msgstr ""
-#: mod/admin.php:1134
+#: mod/admin.php:291
msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a "
-"href='http://the-federation.info/'>the-federation.info</a> for details."
+"The list of blocked servers will be made publically available on the /"
+"friendica page so that your users and people investigating communication "
+"problems can find the reason easily."
msgstr ""
-#: mod/admin.php:1136
-msgid "Suppress Tags"
+#: mod/admin.php:292
+msgid "Add new entry to block list"
msgstr ""
-#: mod/admin.php:1136
-msgid "Suppress showing a list of hashtags at the end of the posting."
+#: mod/admin.php:293
+msgid "Server Domain"
msgstr ""
-#: mod/admin.php:1137
-msgid "Path to item cache"
+#: mod/admin.php:293
+msgid ""
+"The domain of the new server to add to the block list. Do not include the "
+"protocol."
msgstr ""
-#: mod/admin.php:1137
-msgid "The item caches buffers generated bbcode and external images."
+#: mod/admin.php:294
+msgid "Block reason"
msgstr ""
-#: mod/admin.php:1138
-msgid "Cache duration in seconds"
+#: mod/admin.php:295
+msgid "Add Entry"
msgstr ""
-#: mod/admin.php:1138
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One "
-"day). To disable the item cache, set the value to -1."
+#: mod/admin.php:296
+msgid "Save changes to the blocklist"
msgstr ""
-#: mod/admin.php:1139
-msgid "Maximum numbers of comments per post"
+#: mod/admin.php:297
+msgid "Current Entries in the Blocklist"
msgstr ""
-#: mod/admin.php:1139
-msgid "How much comments should be shown for each post? Default value is 100."
+#: mod/admin.php:300
+msgid "Delete entry from blocklist"
msgstr ""
-#: mod/admin.php:1140
-msgid "Temp path"
+#: mod/admin.php:303
+msgid "Delete entry from blocklist?"
msgstr ""
-#: mod/admin.php:1140
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
+#: mod/admin.php:328
+msgid "Server added to blocklist."
msgstr ""
-#: mod/admin.php:1141
-msgid "Base path to installation"
+#: mod/admin.php:344
+msgid "Site blocklist updated."
msgstr ""
-#: mod/admin.php:1141
-msgid ""
-"If the system cannot detect the correct path to your installation, enter the "
-"correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
+#: mod/admin.php:409
+msgid "unknown"
msgstr ""
-#: mod/admin.php:1142
-msgid "Disable picture proxy"
+#: mod/admin.php:472
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
msgstr ""
-#: mod/admin.php:1142
+#: mod/admin.php:473
msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
msgstr ""
-#: mod/admin.php:1143
-msgid "Only search in tags"
+#: mod/admin.php:485
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
msgstr ""
-#: mod/admin.php:1143
-msgid "On large systems the text search can slow down the system extremely."
+#: mod/admin.php:515
+msgid "ID"
msgstr ""
-#: mod/admin.php:1145
-msgid "New base url"
+#: mod/admin.php:516
+msgid "Recipient Name"
msgstr ""
-#: mod/admin.php:1145
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts "
-"of all users."
+#: mod/admin.php:517
+msgid "Recipient Profile"
msgstr ""
-#: mod/admin.php:1147
-msgid "RINO Encryption"
+#: mod/admin.php:519
+msgid "Created"
msgstr ""
-#: mod/admin.php:1147
-msgid "Encryption layer between nodes."
+#: mod/admin.php:520
+msgid "Last Tried"
msgstr ""
-#: mod/admin.php:1149
-msgid "Maximum number of parallel workers"
+#: mod/admin.php:521
+msgid ""
+"This page lists the content of the queue for outgoing postings. These are "
+"postings the initial delivery failed for. They will be resend later and "
+"eventually deleted if the delivery fails permanently."
msgstr ""
-#: mod/admin.php:1149
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
+#: mod/admin.php:546
+#, php-format
+msgid ""
+"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 include/"
+"dbstructure.php toinnodb</tt> of your Friendica installation for an "
+"automatic conversion.<br />"
msgstr ""
-#: mod/admin.php:1150
-msgid "Don't use 'proc_open' with the worker"
+#: mod/admin.php:555
+msgid ""
+"The database update failed. Please run \"php include/dbstructure.php update"
+"\" from the command line and have a look at the errors that might appear."
msgstr ""
-#: mod/admin.php:1150
-msgid ""
-"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 poller calls in your crontab."
+#: mod/admin.php:560 mod/admin.php:1453
+msgid "Normal Account"
msgstr ""
-#: mod/admin.php:1151
-msgid "Enable fastlane"
+#: mod/admin.php:561 mod/admin.php:1454
+msgid "Soapbox Account"
msgstr ""
-#: mod/admin.php:1151
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes "
-"with higher priority are blocked by processes of lower priority."
+#: mod/admin.php:562 mod/admin.php:1455
+msgid "Community/Celebrity Account"
msgstr ""
-#: mod/admin.php:1152
-msgid "Enable frontend worker"
+#: mod/admin.php:563 mod/admin.php:1456
+msgid "Automatic Friend Account"
msgstr ""
-#: mod/admin.php:1152
-msgid ""
-"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 yourdomain.tld/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. The worker background process needs to be activated for this."
+#: mod/admin.php:564
+msgid "Blog Account"
msgstr ""
-#: mod/admin.php:1182
-msgid "Update has been marked successful"
+#: mod/admin.php:565
+msgid "Private Forum"
msgstr ""
-#: mod/admin.php:1190
-#, php-format
-msgid "Database structure update %s was successfully applied."
+#: mod/admin.php:587
+msgid "Message queues"
msgstr ""
-#: mod/admin.php:1193
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
+#: mod/admin.php:593
+msgid "Summary"
msgstr ""
-#: mod/admin.php:1207
-#, php-format
-msgid "Executing %s failed with error: %s"
+#: mod/admin.php:595
+msgid "Registered users"
msgstr ""
-#: mod/admin.php:1210
-#, php-format
-msgid "Update %s was successfully applied."
+#: mod/admin.php:597
+msgid "Pending registrations"
msgstr ""
-#: mod/admin.php:1213
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: mod/admin.php:598
+msgid "Version"
msgstr ""
-#: mod/admin.php:1216
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
+#: mod/admin.php:603
+msgid "Active plugins"
msgstr ""
-#: mod/admin.php:1236
-msgid "No failed updates."
+#: mod/admin.php:628
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
msgstr ""
-#: mod/admin.php:1237
-msgid "Check database structure"
+#: mod/admin.php:920
+msgid "Site settings updated."
msgstr ""
-#: mod/admin.php:1242
-msgid "Failed Updates"
+#: mod/admin.php:948 mod/settings.php:944
+msgid "No special theme for mobile devices"
msgstr ""
-#: mod/admin.php:1243
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
+#: mod/admin.php:977
+msgid "No community page"
msgstr ""
-#: mod/admin.php:1244
-msgid "Mark success (if update was manually applied)"
+#: mod/admin.php:978
+msgid "Public postings from users of this site"
msgstr ""
-#: mod/admin.php:1245
-msgid "Attempt to execute this update step automatically"
+#: mod/admin.php:979
+msgid "Global community page"
msgstr ""
-#: mod/admin.php:1279
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
+#: mod/admin.php:985
+msgid "At post arrival"
msgstr ""
-#: mod/admin.php:1282
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default "
-"profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
+#: mod/admin.php:995
+msgid "Users, Global Contacts"
msgstr ""
-#: mod/admin.php:1326
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/admin.php:996
+msgid "Users, Global Contacts/fallback"
+msgstr ""
-#: mod/admin.php:1333
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/admin.php:1000
+msgid "One month"
+msgstr ""
-#: mod/admin.php:1380
-#, php-format
-msgid "User '%s' deleted"
+#: mod/admin.php:1001
+msgid "Three months"
msgstr ""
-#: mod/admin.php:1388
-#, php-format
-msgid "User '%s' unblocked"
+#: mod/admin.php:1002
+msgid "Half a year"
msgstr ""
-#: mod/admin.php:1388
-#, php-format
-msgid "User '%s' blocked"
+#: mod/admin.php:1003
+msgid "One year"
msgstr ""
-#: mod/admin.php:1496 mod/admin.php:1522
-msgid "Register date"
+#: mod/admin.php:1008
+msgid "Multi user instance"
msgstr ""
-#: mod/admin.php:1496 mod/admin.php:1522
-msgid "Last login"
+#: mod/admin.php:1031
+msgid "Closed"
msgstr ""
-#: mod/admin.php:1496 mod/admin.php:1522
-msgid "Last item"
+#: mod/admin.php:1032
+msgid "Requires approval"
msgstr ""
-#: mod/admin.php:1496 mod/settings.php:45
-msgid "Account"
+#: mod/admin.php:1033
+msgid "Open"
msgstr ""
-#: mod/admin.php:1505
-msgid "Add User"
+#: mod/admin.php:1037
+msgid "No SSL policy, links will track page SSL state"
msgstr ""
-#: mod/admin.php:1506
-msgid "select all"
+#: mod/admin.php:1038
+msgid "Force all links to use SSL"
msgstr ""
-#: mod/admin.php:1507
-msgid "User registrations waiting for confirm"
+#: mod/admin.php:1039
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr ""
-#: mod/admin.php:1508
-msgid "User waiting for permanent deletion"
+#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023
+#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793
+#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006
+#: mod/settings.php:1272
+msgid "Save Settings"
msgstr ""
-#: mod/admin.php:1509
-msgid "Request date"
+#: mod/admin.php:1063
+msgid "File upload"
msgstr ""
-#: mod/admin.php:1510
-msgid "No registrations."
+#: mod/admin.php:1064
+msgid "Policies"
msgstr ""
-#: mod/admin.php:1511
-msgid "Note from the user"
+#: mod/admin.php:1066
+msgid "Auto Discovered Contact Directory"
msgstr ""
-#: mod/admin.php:1513
-msgid "Deny"
+#: mod/admin.php:1067
+msgid "Performance"
msgstr ""
-#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816
-#: mod/contacts.php:994
-msgid "Block"
+#: mod/admin.php:1068
+msgid "Worker"
msgstr ""
-#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816
-#: mod/contacts.php:994
-msgid "Unblock"
+#: mod/admin.php:1069
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
msgstr ""
-#: mod/admin.php:1517
-msgid "Site admin"
+#: mod/admin.php:1072
+msgid "Site name"
msgstr ""
-#: mod/admin.php:1518
-msgid "Account expired"
+#: mod/admin.php:1073
+msgid "Host name"
msgstr ""
-#: mod/admin.php:1521
-msgid "New User"
+#: mod/admin.php:1074
+msgid "Sender Email"
+msgstr ""
+
+#: mod/admin.php:1074
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr ""
+
+#: mod/admin.php:1075
+msgid "Banner/Logo"
+msgstr ""
+
+#: mod/admin.php:1076
+msgid "Shortcut icon"
+msgstr ""
+
+#: mod/admin.php:1076
+msgid "Link to an icon that will be used for browsers."
+msgstr ""
+
+#: mod/admin.php:1077
+msgid "Touch icon"
msgstr ""
-#: mod/admin.php:1522
-msgid "Deleted since"
+#: mod/admin.php:1077
+msgid "Link to an icon that will be used for tablets and mobiles."
msgstr ""
-#: mod/admin.php:1527
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: mod/admin.php:1078
+msgid "Additional Info"
msgstr ""
-#: mod/admin.php:1528
+#: mod/admin.php:1078
+#, php-format
msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
msgstr ""
-#: mod/admin.php:1538
-msgid "Name of the new user."
+#: mod/admin.php:1079
+msgid "System language"
msgstr ""
-#: mod/admin.php:1539
-msgid "Nickname"
+#: mod/admin.php:1080
+msgid "System theme"
msgstr ""
-#: mod/admin.php:1539
-msgid "Nickname of the new user."
+#: mod/admin.php:1080
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
msgstr ""
-#: mod/admin.php:1540
-msgid "Email address of the new user."
+#: mod/admin.php:1081
+msgid "Mobile system theme"
msgstr ""
-#: mod/admin.php:1583
-#, php-format
-msgid "Plugin %s disabled."
+#: mod/admin.php:1081
+msgid "Theme for mobile devices"
msgstr ""
-#: mod/admin.php:1587
-#, php-format
-msgid "Plugin %s enabled."
+#: mod/admin.php:1082
+msgid "SSL link policy"
msgstr ""
-#: mod/admin.php:1598 mod/admin.php:1850
-msgid "Disable"
+#: mod/admin.php:1082
+msgid "Determines whether generated links should be forced to use SSL"
msgstr ""
-#: mod/admin.php:1600 mod/admin.php:1852
-msgid "Enable"
+#: mod/admin.php:1083
+msgid "Force SSL"
msgstr ""
-#: mod/admin.php:1623 mod/admin.php:1899
-msgid "Toggle"
+#: mod/admin.php:1083
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
msgstr ""
-#: mod/admin.php:1631 mod/admin.php:1908
-msgid "Author: "
+#: mod/admin.php:1084
+msgid "Hide help entry from navigation menu"
msgstr ""
-#: mod/admin.php:1632 mod/admin.php:1909
-msgid "Maintainer: "
+#: mod/admin.php:1084
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
msgstr ""
-#: mod/admin.php:1687
-msgid "Reload active plugins"
+#: mod/admin.php:1085
+msgid "Single user instance"
msgstr ""
-#: mod/admin.php:1692
-#, php-format
-msgid ""
-"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"
+#: mod/admin.php:1085
+msgid "Make this instance multi-user or single-user for the named user"
msgstr ""
-#: mod/admin.php:1811
-msgid "No themes found."
+#: mod/admin.php:1086
+msgid "Maximum image size"
msgstr ""
-#: mod/admin.php:1890
-msgid "Screenshot"
+#: mod/admin.php:1086
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
msgstr ""
-#: mod/admin.php:1950
-msgid "Reload active themes"
+#: mod/admin.php:1087
+msgid "Maximum image length"
msgstr ""
-#: mod/admin.php:1955
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
+#: mod/admin.php:1087
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
msgstr ""
-#: mod/admin.php:1956
-msgid "[Experimental]"
+#: mod/admin.php:1088
+msgid "JPEG image quality"
msgstr ""
-#: mod/admin.php:1957
-msgid "[Unsupported]"
+#: mod/admin.php:1088
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
msgstr ""
-#: mod/admin.php:1981
-msgid "Log settings updated."
+#: mod/admin.php:1090
+msgid "Register policy"
msgstr ""
-#: mod/admin.php:2013
-msgid "PHP log currently enabled."
+#: mod/admin.php:1091
+msgid "Maximum Daily Registrations"
msgstr ""
-#: mod/admin.php:2015
-msgid "PHP log currently disabled."
+#: mod/admin.php:1091
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user "
+"registrations to accept per day. If register is set to closed, this setting "
+"has no effect."
msgstr ""
-#: mod/admin.php:2024
-msgid "Clear"
+#: mod/admin.php:1092
+msgid "Register text"
msgstr ""
-#: mod/admin.php:2029
-msgid "Enable Debugging"
+#: mod/admin.php:1092
+msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: mod/admin.php:2030
-msgid "Log file"
+#: mod/admin.php:1093
+msgid "Accounts abandoned after x days"
msgstr ""
-#: mod/admin.php:2030
+#: mod/admin.php:1093
msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: mod/admin.php:2031
-msgid "Log level"
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
msgstr ""
-#: mod/admin.php:2034
-msgid "PHP logging"
+#: mod/admin.php:1094
+msgid "Allowed friend domains"
msgstr ""
-#: mod/admin.php:2035
+#: mod/admin.php:1094
msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr ""
-#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783
-msgid "Off"
+#: mod/admin.php:1095
+msgid "Allowed email domains"
msgstr ""
-#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783
-msgid "On"
+#: mod/admin.php:1095
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
msgstr ""
-#: mod/admin.php:2166
-#, php-format
-msgid "Lock feature %s"
+#: mod/admin.php:1096
+msgid "Block public"
msgstr ""
-#: mod/admin.php:2174
-msgid "Manage Additional Features"
+#: mod/admin.php:1096
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
msgstr ""
-#: mod/contacts.php:137
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
+#: mod/admin.php:1097
+msgid "Force publish"
+msgstr ""
-#: mod/contacts.php:172 mod/contacts.php:381
-msgid "Could not access contact record."
+#: mod/admin.php:1097
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: mod/contacts.php:186
-msgid "Could not locate selected profile."
+#: mod/admin.php:1098
+msgid "Global directory URL"
msgstr ""
-#: mod/contacts.php:219
-msgid "Contact updated."
+#: mod/admin.php:1098
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
msgstr ""
-#: mod/contacts.php:402
-msgid "Contact has been blocked"
+#: mod/admin.php:1099
+msgid "Allow threaded items"
msgstr ""
-#: mod/contacts.php:402
-msgid "Contact has been unblocked"
+#: mod/admin.php:1099
+msgid "Allow infinite level threading for items on this site."
msgstr ""
-#: mod/contacts.php:413
-msgid "Contact has been ignored"
+#: mod/admin.php:1100
+msgid "Private posts by default for new users"
msgstr ""
-#: mod/contacts.php:413
-msgid "Contact has been unignored"
+#: mod/admin.php:1100
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
msgstr ""
-#: mod/contacts.php:425
-msgid "Contact has been archived"
+#: mod/admin.php:1101
+msgid "Don't include post content in email notifications"
msgstr ""
-#: mod/contacts.php:425
-msgid "Contact has been unarchived"
+#: mod/admin.php:1101
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
msgstr ""
-#: mod/contacts.php:450
-msgid "Drop contact"
+#: mod/admin.php:1102
+msgid "Disallow public access to addons listed in the apps menu."
msgstr ""
-#: mod/contacts.php:453 mod/contacts.php:812
-msgid "Do you really want to delete this contact?"
+#: mod/admin.php:1102
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
msgstr ""
-#: mod/contacts.php:472
-msgid "Contact has been removed."
+#: mod/admin.php:1103
+msgid "Don't embed private images in posts"
msgstr ""
-#: mod/contacts.php:509
-#, php-format
-msgid "You are mutual friends with %s"
+#: mod/admin.php:1103
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a while."
msgstr ""
-#: mod/contacts.php:513
-#, php-format
-msgid "You are sharing with %s"
+#: mod/admin.php:1104
+msgid "Allow Users to set remote_self"
msgstr ""
-#: mod/contacts.php:518
-#, php-format
-msgid "%s is sharing with you"
+#: mod/admin.php:1104
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
msgstr ""
-#: mod/contacts.php:538
-msgid "Private communications are not available for this contact."
+#: mod/admin.php:1105
+msgid "Block multiple registrations"
msgstr ""
-#: mod/contacts.php:545
-msgid "(Update was successful)"
+#: mod/admin.php:1105
+msgid "Disallow users to register additional accounts for use as pages."
msgstr ""
-#: mod/contacts.php:545
-msgid "(Update was not successful)"
+#: mod/admin.php:1106
+msgid "OpenID support"
msgstr ""
-#: mod/contacts.php:547 mod/contacts.php:975
-msgid "Suggest friends"
+#: mod/admin.php:1106
+msgid "OpenID support for registration and logins."
msgstr ""
-#: mod/contacts.php:551
-#, php-format
-msgid "Network type: %s"
+#: mod/admin.php:1107
+msgid "Fullname check"
msgstr ""
-#: mod/contacts.php:564
-msgid "Communications lost with this contact!"
+#: mod/admin.php:1107
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
msgstr ""
-#: mod/contacts.php:567
-msgid "Fetch further information for feeds"
+#: mod/admin.php:1108
+msgid "Community Page Style"
msgstr ""
-#: mod/contacts.php:568
-msgid "Fetch information"
+#: mod/admin.php:1108
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
msgstr ""
-#: mod/contacts.php:568
-msgid "Fetch information and keywords"
+#: mod/admin.php:1109
+msgid "Posts per user on community page"
msgstr ""
-#: mod/contacts.php:586
-msgid "Contact"
+#: mod/admin.php:1109
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
msgstr ""
-#: mod/contacts.php:589
-msgid "Profile Visibility"
+#: mod/admin.php:1110
+msgid "Enable OStatus support"
msgstr ""
-#: mod/contacts.php:590
-#, php-format
+#: mod/admin.php:1110
msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
msgstr ""
-#: mod/contacts.php:591
-msgid "Contact Information / Notes"
+#: mod/admin.php:1111
+msgid "OStatus conversation completion interval"
msgstr ""
-#: mod/contacts.php:592
-msgid "Edit contact notes"
+#: mod/admin.php:1111
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
msgstr ""
-#: mod/contacts.php:598
-msgid "Block/Unblock contact"
+#: mod/admin.php:1112
+msgid "Only import OStatus threads from our contacts"
msgstr ""
-#: mod/contacts.php:599
-msgid "Ignore contact"
+#: mod/admin.php:1112
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option "
+"we only store threads that are started by a contact that is known on our "
+"system."
msgstr ""
-#: mod/contacts.php:600
-msgid "Repair URL settings"
+#: mod/admin.php:1113
+msgid "OStatus support can only be enabled if threading is enabled."
msgstr ""
-#: mod/contacts.php:601
-msgid "View conversations"
+#: mod/admin.php:1115
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
msgstr ""
-#: mod/contacts.php:607
-msgid "Last update:"
+#: mod/admin.php:1116
+msgid "Enable Diaspora support"
msgstr ""
-#: mod/contacts.php:609
-msgid "Update public posts"
+#: mod/admin.php:1116
+msgid "Provide built-in Diaspora network compatibility."
msgstr ""
-#: mod/contacts.php:611 mod/contacts.php:985
-msgid "Update now"
+#: mod/admin.php:1117
+msgid "Only allow Friendica contacts"
msgstr ""
-#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002
-msgid "Unignore"
+#: mod/admin.php:1117
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
msgstr ""
-#: mod/contacts.php:621
-msgid "Currently blocked"
+#: mod/admin.php:1118
+msgid "Verify SSL"
msgstr ""
-#: mod/contacts.php:622
-msgid "Currently ignored"
+#: mod/admin.php:1118
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
msgstr ""
-#: mod/contacts.php:623
-msgid "Currently archived"
+#: mod/admin.php:1119
+msgid "Proxy user"
msgstr ""
-#: mod/contacts.php:624
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
+#: mod/admin.php:1120
+msgid "Proxy URL"
msgstr ""
-#: mod/contacts.php:625
-msgid "Notification for new posts"
+#: mod/admin.php:1121
+msgid "Network timeout"
msgstr ""
-#: mod/contacts.php:625
-msgid "Send a notification of every new post of this contact"
+#: mod/admin.php:1121
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: mod/contacts.php:628
-msgid "Blacklisted keywords"
+#: mod/admin.php:1122
+msgid "Maximum Load Average"
msgstr ""
-#: mod/contacts.php:628
+#: mod/admin.php:1122
msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
msgstr ""
-#: mod/contacts.php:646
-msgid "Actions"
+#: mod/admin.php:1123
+msgid "Maximum Load Average (Frontend)"
msgstr ""
-#: mod/contacts.php:649
-msgid "Contact Settings"
+#: mod/admin.php:1123
+msgid "Maximum system load before the frontend quits service - default 50."
msgstr ""
-#: mod/contacts.php:695
-msgid "Suggestions"
+#: mod/admin.php:1124
+msgid "Minimal Memory"
msgstr ""
-#: mod/contacts.php:698
-msgid "Suggest potential friends"
+#: mod/admin.php:1124
+msgid ""
+"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
msgstr ""
-#: mod/contacts.php:706
-msgid "Show all contacts"
+#: mod/admin.php:1125
+msgid "Maximum table size for optimization"
msgstr ""
-#: mod/contacts.php:711
-msgid "Unblocked"
+#: mod/admin.php:1125
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
msgstr ""
-#: mod/contacts.php:714
-msgid "Only show unblocked contacts"
+#: mod/admin.php:1126
+msgid "Minimum level of fragmentation"
msgstr ""
-#: mod/contacts.php:720
-msgid "Blocked"
+#: mod/admin.php:1126
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
msgstr ""
-#: mod/contacts.php:723
-msgid "Only show blocked contacts"
+#: mod/admin.php:1128
+msgid "Periodical check of global contacts"
msgstr ""
-#: mod/contacts.php:729
-msgid "Ignored"
+#: mod/admin.php:1128
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
msgstr ""
-#: mod/contacts.php:732
-msgid "Only show ignored contacts"
+#: mod/admin.php:1129
+msgid "Days between requery"
msgstr ""
-#: mod/contacts.php:738
-msgid "Archived"
+#: mod/admin.php:1129
+msgid "Number of days after which a server is requeried for his contacts."
msgstr ""
-#: mod/contacts.php:741
-msgid "Only show archived contacts"
+#: mod/admin.php:1130
+msgid "Discover contacts from other servers"
msgstr ""
-#: mod/contacts.php:747
-msgid "Hidden"
+#: mod/admin.php:1130
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
msgstr ""
-#: mod/contacts.php:750
-msgid "Only show hidden contacts"
+#: mod/admin.php:1131
+msgid "Timeframe for fetching global contacts"
msgstr ""
-#: mod/contacts.php:807
-msgid "Search your contacts"
+#: mod/admin.php:1131
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
msgstr ""
-#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708
-msgid "Update"
+#: mod/admin.php:1132
+msgid "Search the local directory"
msgstr ""
-#: mod/contacts.php:818 mod/contacts.php:1010
-msgid "Archive"
+#: mod/admin.php:1132
+msgid ""
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
msgstr ""
-#: mod/contacts.php:818 mod/contacts.php:1010
-msgid "Unarchive"
+#: mod/admin.php:1134
+msgid "Publish server information"
+msgstr ""
+
+#: mod/admin.php:1134
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a "
+"href='http://the-federation.info/'>the-federation.info</a> for details."
msgstr ""
-#: mod/contacts.php:821
-msgid "Batch Actions"
+#: mod/admin.php:1136
+msgid "Suppress Tags"
msgstr ""
-#: mod/contacts.php:867
-msgid "View all contacts"
+#: mod/admin.php:1136
+msgid "Suppress showing a list of hashtags at the end of the posting."
msgstr ""
-#: mod/contacts.php:877
-msgid "View all common friends"
+#: mod/admin.php:1137
+msgid "Path to item cache"
msgstr ""
-#: mod/contacts.php:884
-msgid "Advanced Contact Settings"
+#: mod/admin.php:1137
+msgid "The item caches buffers generated bbcode and external images."
msgstr ""
-#: mod/contacts.php:918
-msgid "Mutual Friendship"
+#: mod/admin.php:1138
+msgid "Cache duration in seconds"
msgstr ""
-#: mod/contacts.php:922
-msgid "is a fan of yours"
+#: mod/admin.php:1138
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One "
+"day). To disable the item cache, set the value to -1."
msgstr ""
-#: mod/contacts.php:926
-msgid "you are a fan of"
+#: mod/admin.php:1139
+msgid "Maximum numbers of comments per post"
msgstr ""
-#: mod/contacts.php:996
-msgid "Toggle Blocked status"
+#: mod/admin.php:1139
+msgid "How much comments should be shown for each post? Default value is 100."
msgstr ""
-#: mod/contacts.php:1004
-msgid "Toggle Ignored status"
+#: mod/admin.php:1140
+msgid "Temp path"
msgstr ""
-#: mod/contacts.php:1012
-msgid "Toggle Archive status"
+#: mod/admin.php:1140
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
msgstr ""
-#: mod/contacts.php:1020
-msgid "Delete contact"
+#: mod/admin.php:1141
+msgid "Base path to installation"
msgstr ""
-#: mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
+#: mod/admin.php:1141
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the "
+"correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
msgstr ""
-#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93
-#: mod/profile_photo.php:322
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: mod/admin.php:1142
+msgid "Disable picture proxy"
msgstr ""
-#: mod/profile_photo.php:127
+#: mod/admin.php:1142
msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
msgstr ""
-#: mod/profile_photo.php:136
-msgid "Unable to process image"
+#: mod/admin.php:1143
+msgid "Only search in tags"
msgstr ""
-#: mod/profile_photo.php:253
-msgid "Upload File:"
+#: mod/admin.php:1143
+msgid "On large systems the text search can slow down the system extremely."
msgstr ""
-#: mod/profile_photo.php:254
-msgid "Select a profile:"
+#: mod/admin.php:1145
+msgid "New base url"
msgstr ""
-#: mod/profile_photo.php:256
-msgid "Upload"
+#: mod/admin.php:1145
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts "
+"of all users."
msgstr ""
-#: mod/profile_photo.php:259
-msgid "or"
+#: mod/admin.php:1147
+msgid "RINO Encryption"
msgstr ""
-#: mod/profile_photo.php:259
-msgid "skip this step"
+#: mod/admin.php:1147
+msgid "Encryption layer between nodes."
msgstr ""
-#: mod/profile_photo.php:259
-msgid "select a photo from your photo albums"
+#: mod/admin.php:1149
+msgid "Maximum number of parallel workers"
msgstr ""
-#: mod/profile_photo.php:273
-msgid "Crop Image"
+#: mod/admin.php:1149
+msgid ""
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
msgstr ""
-#: mod/profile_photo.php:274
-msgid "Please adjust the image cropping for optimum viewing."
+#: mod/admin.php:1150
+msgid "Don't use 'proc_open' with the worker"
msgstr ""
-#: mod/profile_photo.php:276
-msgid "Done Editing"
+#: mod/admin.php:1150
+msgid ""
+"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 poller calls in your crontab."
msgstr ""
-#: mod/profile_photo.php:312
-msgid "Image uploaded successfully."
+#: mod/admin.php:1151
+msgid "Enable fastlane"
msgstr ""
-#: mod/profiles.php:42
-msgid "Profile deleted."
+#: mod/admin.php:1151
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes "
+"with higher priority are blocked by processes of lower priority."
msgstr ""
-#: mod/profiles.php:58 mod/profiles.php:94
-msgid "Profile-"
+#: mod/admin.php:1152
+msgid "Enable frontend worker"
msgstr ""
-#: mod/profiles.php:77 mod/profiles.php:122
-msgid "New profile created."
+#: mod/admin.php:1152
+msgid ""
+"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 yourdomain.tld/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. The worker background process needs to be activated for this."
msgstr ""
-#: mod/profiles.php:100
-msgid "Profile unavailable to clone."
+#: mod/admin.php:1182
+msgid "Update has been marked successful"
msgstr ""
-#: mod/profiles.php:196
-msgid "Profile Name is required."
+#: mod/admin.php:1190
+#, php-format
+msgid "Database structure update %s was successfully applied."
msgstr ""
-#: mod/profiles.php:336
-msgid "Marital Status"
+#: mod/admin.php:1193
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
msgstr ""
-#: mod/profiles.php:340
-msgid "Romantic Partner"
+#: mod/admin.php:1207
+#, php-format
+msgid "Executing %s failed with error: %s"
msgstr ""
-#: mod/profiles.php:352
-msgid "Work/Employment"
+#: mod/admin.php:1210
+#, php-format
+msgid "Update %s was successfully applied."
msgstr ""
-#: mod/profiles.php:355
-msgid "Religion"
+#: mod/admin.php:1213
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr ""
-#: mod/profiles.php:359
-msgid "Political Views"
+#: mod/admin.php:1216
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
msgstr ""
-#: mod/profiles.php:363
-msgid "Gender"
+#: mod/admin.php:1236
+msgid "No failed updates."
msgstr ""
-#: mod/profiles.php:367
-msgid "Sexual Preference"
+#: mod/admin.php:1237
+msgid "Check database structure"
msgstr ""
-#: mod/profiles.php:371
-msgid "XMPP"
+#: mod/admin.php:1242
+msgid "Failed Updates"
msgstr ""
-#: mod/profiles.php:375
-msgid "Homepage"
+#: mod/admin.php:1243
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
msgstr ""
-#: mod/profiles.php:379 mod/profiles.php:698
-msgid "Interests"
+#: mod/admin.php:1244
+msgid "Mark success (if update was manually applied)"
msgstr ""
-#: mod/profiles.php:383
-msgid "Address"
+#: mod/admin.php:1245
+msgid "Attempt to execute this update step automatically"
msgstr ""
-#: mod/profiles.php:390 mod/profiles.php:694
-msgid "Location"
+#: mod/admin.php:1279
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
msgstr ""
-#: mod/profiles.php:475
-msgid "Profile updated."
+#: mod/admin.php:1282
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default "
+"profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
msgstr ""
-#: mod/profiles.php:567
-msgid " and "
-msgstr ""
+#: mod/admin.php:1326
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
-#: mod/profiles.php:576
-msgid "public profile"
-msgstr ""
+#: mod/admin.php:1333
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
-#: mod/profiles.php:579
+#: mod/admin.php:1380
#, php-format
-msgid "%1$s changed %2$s to “%3$s”"
+msgid "User '%s' deleted"
msgstr ""
-#: mod/profiles.php:580
+#: mod/admin.php:1388
#, php-format
-msgid " - Visit %1$s's %2$s"
+msgid "User '%s' unblocked"
msgstr ""
-#: mod/profiles.php:582
+#: mod/admin.php:1388
#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgid "User '%s' blocked"
msgstr ""
-#: mod/profiles.php:640
-msgid "Hide contacts and friends:"
+#: mod/admin.php:1496 mod/admin.php:1522
+msgid "Register date"
msgstr ""
-#: mod/profiles.php:645
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: mod/admin.php:1496 mod/admin.php:1522
+msgid "Last login"
msgstr ""
-#: mod/profiles.php:670
-msgid "Show more profile fields:"
+#: mod/admin.php:1496 mod/admin.php:1522
+msgid "Last item"
msgstr ""
-#: mod/profiles.php:682
-msgid "Profile Actions"
+#: mod/admin.php:1496 mod/settings.php:45
+msgid "Account"
msgstr ""
-#: mod/profiles.php:683
-msgid "Edit Profile Details"
+#: mod/admin.php:1505
+msgid "Add User"
msgstr ""
-#: mod/profiles.php:685
-msgid "Change Profile Photo"
+#: mod/admin.php:1506
+msgid "select all"
msgstr ""
-#: mod/profiles.php:686
-msgid "View this profile"
+#: mod/admin.php:1507
+msgid "User registrations waiting for confirm"
msgstr ""
-#: mod/profiles.php:688
-msgid "Create a new profile using these settings"
+#: mod/admin.php:1508
+msgid "User waiting for permanent deletion"
msgstr ""
-#: mod/profiles.php:689
-msgid "Clone this profile"
+#: mod/admin.php:1509
+msgid "Request date"
msgstr ""
-#: mod/profiles.php:690
-msgid "Delete this profile"
+#: mod/admin.php:1510
+msgid "No registrations."
msgstr ""
-#: mod/profiles.php:692
-msgid "Basic information"
+#: mod/admin.php:1511
+msgid "Note from the user"
msgstr ""
-#: mod/profiles.php:693
-msgid "Profile picture"
+#: mod/admin.php:1513
+msgid "Deny"
msgstr ""
-#: mod/profiles.php:695
-msgid "Preferences"
+#: mod/admin.php:1517
+msgid "Site admin"
msgstr ""
-#: mod/profiles.php:696
-msgid "Status information"
+#: mod/admin.php:1518
+msgid "Account expired"
msgstr ""
-#: mod/profiles.php:697
-msgid "Additional information"
+#: mod/admin.php:1521
+msgid "New User"
msgstr ""
-#: mod/profiles.php:700
-msgid "Relation"
+#: mod/admin.php:1522
+msgid "Deleted since"
msgstr ""
-#: mod/profiles.php:704
-msgid "Your Gender:"
+#: mod/admin.php:1527
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: mod/profiles.php:705
-msgid "<span class=\"heart\">♥</span> Marital Status:"
+#: mod/admin.php:1528
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: mod/profiles.php:707
-msgid "Example: fishing photography software"
+#: mod/admin.php:1538
+msgid "Name of the new user."
msgstr ""
-#: mod/profiles.php:712
-msgid "Profile Name:"
+#: mod/admin.php:1539
+msgid "Nickname"
msgstr ""
-#: mod/profiles.php:714
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: mod/admin.php:1539
+msgid "Nickname of the new user."
msgstr ""
-#: mod/profiles.php:715
-msgid "Your Full Name:"
+#: mod/admin.php:1540
+msgid "Email address of the new user."
msgstr ""
-#: mod/profiles.php:716
-msgid "Title/Description:"
+#: mod/admin.php:1583
+#, php-format
+msgid "Plugin %s disabled."
msgstr ""
-#: mod/profiles.php:719
-msgid "Street Address:"
+#: mod/admin.php:1587
+#, php-format
+msgid "Plugin %s enabled."
msgstr ""
-#: mod/profiles.php:720
-msgid "Locality/City:"
+#: mod/admin.php:1598 mod/admin.php:1850
+msgid "Disable"
msgstr ""
-#: mod/profiles.php:721
-msgid "Region/State:"
+#: mod/admin.php:1600 mod/admin.php:1852
+msgid "Enable"
msgstr ""
-#: mod/profiles.php:722
-msgid "Postal/Zip Code:"
+#: mod/admin.php:1623 mod/admin.php:1899
+msgid "Toggle"
msgstr ""
-#: mod/profiles.php:723
-msgid "Country:"
+#: mod/admin.php:1631 mod/admin.php:1908
+msgid "Author: "
msgstr ""
-#: mod/profiles.php:727
-msgid "Who: (if applicable)"
+#: mod/admin.php:1632 mod/admin.php:1909
+msgid "Maintainer: "
msgstr ""
-#: mod/profiles.php:727
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: mod/admin.php:1687
+msgid "Reload active plugins"
msgstr ""
-#: mod/profiles.php:728
-msgid "Since [date]:"
+#: mod/admin.php:1692
+#, php-format
+msgid ""
+"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"
msgstr ""
-#: mod/profiles.php:730
-msgid "Tell us about yourself..."
+#: mod/admin.php:1811
+msgid "No themes found."
msgstr ""
-#: mod/profiles.php:731
-msgid "XMPP (Jabber) address:"
+#: mod/admin.php:1890
+msgid "Screenshot"
msgstr ""
-#: mod/profiles.php:731
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow "
-"you."
+#: mod/admin.php:1950
+msgid "Reload active themes"
msgstr ""
-#: mod/profiles.php:732
-msgid "Homepage URL:"
+#: mod/admin.php:1955
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
msgstr ""
-#: mod/profiles.php:735
-msgid "Religious Views:"
+#: mod/admin.php:1956
+msgid "[Experimental]"
msgstr ""
-#: mod/profiles.php:736
-msgid "Public Keywords:"
+#: mod/admin.php:1957
+msgid "[Unsupported]"
msgstr ""
-#: mod/profiles.php:736
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: mod/admin.php:1981
+msgid "Log settings updated."
msgstr ""
-#: mod/profiles.php:737
-msgid "Private Keywords:"
+#: mod/admin.php:2013
+msgid "PHP log currently enabled."
msgstr ""
-#: mod/profiles.php:737
-msgid "(Used for searching profiles, never shown to others)"
+#: mod/admin.php:2015
+msgid "PHP log currently disabled."
msgstr ""
-#: mod/profiles.php:740
-msgid "Musical interests"
+#: mod/admin.php:2024
+msgid "Clear"
msgstr ""
-#: mod/profiles.php:741
-msgid "Books, literature"
+#: mod/admin.php:2029
+msgid "Enable Debugging"
msgstr ""
-#: mod/profiles.php:742
-msgid "Television"
+#: mod/admin.php:2030
+msgid "Log file"
msgstr ""
-#: mod/profiles.php:743
-msgid "Film/dance/culture/entertainment"
+#: mod/admin.php:2030
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
msgstr ""
-#: mod/profiles.php:744
-msgid "Hobbies/Interests"
+#: mod/admin.php:2031
+msgid "Log level"
msgstr ""
-#: mod/profiles.php:745
-msgid "Love/romance"
+#: mod/admin.php:2034
+msgid "PHP logging"
msgstr ""
-#: mod/profiles.php:746
-msgid "Work/employment"
+#: mod/admin.php:2035
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
msgstr ""
-#: mod/profiles.php:747
-msgid "School/education"
+#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783
+msgid "Off"
msgstr ""
-#: mod/profiles.php:748
-msgid "Contact information and Social Networks"
+#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783
+msgid "On"
msgstr ""
-#: mod/profiles.php:789
-msgid "Edit/Manage Profiles"
+#: mod/admin.php:2166
+#, php-format
+msgid "Lock feature %s"
+msgstr ""
+
+#: mod/admin.php:2174
+msgid "Manage Additional Features"
msgstr ""
#: mod/settings.php:62
msgstr ""
#: mod/settings.php:1121
-msgid "This account is a regular personal profile"
+msgid "Account for a personal profile."
msgstr ""
#: mod/settings.php:1124
msgstr ""
#: mod/settings.php:1125
-msgid "This account is a profile for an organisation"
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
msgstr ""
#: mod/settings.php:1128
msgstr ""
#: mod/settings.php:1129
-msgid "This account is a news account/reflector"
+msgid ""
+"Account for a news reflector that automatically approves contact requests as "
+"\"Followers\"."
msgstr ""
#: mod/settings.php:1132
msgstr ""
#: mod/settings.php:1133
-msgid ""
-"This account is a community forum where people can discuss with each other"
+msgid "Account for community discussions."
msgstr ""
#: mod/settings.php:1136
msgstr ""
#: mod/settings.php:1137
-msgid "This account is a normal personal profile"
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
msgstr ""
#: mod/settings.php:1140
msgstr ""
#: mod/settings.php:1141
-msgid "Automatically approve all connection/friend requests as read-only fans"
+msgid ""
+"Account for a public profile that automatically approves contact requests as "
+"\"Followers\"."
msgstr ""
#: mod/settings.php:1144
msgstr ""
#: mod/settings.php:1145
-msgid "Automatically approve all contact requests"
+msgid "Automatically approves all contact requests."
msgstr ""
#: mod/settings.php:1148
msgstr ""
#: mod/settings.php:1149
-msgid "Automatically approve all connection/friend requests as friends"
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
msgstr ""
#: mod/settings.php:1152
msgstr ""
#: mod/settings.php:1153
-msgid "Private forum - approved members only"
+msgid "Requires manual approval of contact requests."
msgstr ""
#: mod/settings.php:1164
msgid "Community Pages"
msgstr ""
-#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151
+#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143
msgid "Community Profiles"
msgstr ""
msgid "Help or @NewHere ?"
msgstr ""
-#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392
+#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384
msgid "Connect Services"
msgstr ""
-#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199
+#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191
msgid "Find Friends"
msgstr ""
-#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181
+#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173
msgid "Last users"
msgstr ""
-#: view/theme/vier/theme.php:200
+#: view/theme/vier/theme.php:192
msgid "Local Directory"
msgstr ""
-#: view/theme/vier/theme.php:292
+#: view/theme/vier/theme.php:284
msgid "Quick Start"
msgstr ""
msgid "toggle mobile"
msgstr ""
-#: boot.php:726
+#: boot.php:733
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: boot.php:838
+#: boot.php:845
msgid "Create a New Account"
msgstr ""
-#: boot.php:866
+#: boot.php:873
msgid "Password: "
msgstr ""
-#: boot.php:867
+#: boot.php:874
msgid "Remember me"
msgstr ""
-#: boot.php:870
+#: boot.php:877
msgid "Or login using OpenID: "
msgstr ""
-#: boot.php:876
+#: boot.php:883
msgid "Forgot your password?"
msgstr ""
-#: boot.php:879
+#: boot.php:886
msgid "Website Terms of Service"
msgstr ""
-#: boot.php:880
+#: boot.php:887
msgid "terms of service"
msgstr ""
-#: boot.php:882
+#: boot.php:889
msgid "Website Privacy Policy"
msgstr ""
-#: boot.php:883
+#: boot.php:890
msgid "privacy policy"
msgstr ""
// load base messages.po and extract msgids
$base_msgids = array();
$norm_base_msgids = array();
-$base_f = file("util/messages.po") or die("No base messages.po\n");
+$base_f = file("util/messages.po") || die("No base messages.po\n");
$_f = 0; $_mid = ""; $_mids = array();
foreach( $base_f as $l) {
$l = trim($l);
foreach (new RecursiveIteratorIterator($Iterator) as $file) {
if (substr($file, -4) === '.php') {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
}
$files = glob('mod/*.php');
foreach ($files as $file) {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
echo "Directory: include\n";
$files = glob('include/*.php');
foreach ($files as $file) {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
echo "Directory: object\n";
$files = glob('object/*.php');
foreach ($files as $file) {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
echo "Directory: addon\n";
$files = glob($dir . '/' . $addon . '.php');
foreach ($files as $file) {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
}
echo 'util/strings.php' . "\n";
passthru("$phpath -l util/strings.php", $ret);
-$ret === 0 or die();
+$ret === 0 || die();
$files = glob('view/lang/*/strings.php');
foreach ($files as $file) {
passthru("$phpath -l $file", $ret);
- $ret === 0 or die();
+ $ret === 0 || die();
}
-
+{{if $alternate}}<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'>{{/if}}
<script>
$(document).ready(function() {
$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl");
});
</script>
-
<?php
/* ********************************************************************
- * The following configuration has to be within the .htconfig file
- * and will not be overruled by decisions made in the admin panel.
+ * The following configuration has to be within the .htconfig.php
+ * file and will not be overruled by decisions made in the admin panel.
*
* See below for variables that may be overruled by the admin panel.
* ********************************************************************/
// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
+//
+// If you need to specify a port for reacing the database, you can do so by
+// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
$db_host = '{{$dbhost}}';
$db_user = '{{$dbuser}}';
* @todo Check if this is really needed.
*/
function load_page(App $a) {
- if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
+ if(isset($_GET["mode"]) && ($_GET["mode"] == "minimal")) {
require "view/theme/frio/minimal.php";
- } elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
+ } elseif((isset($_GET["mode"]) && ($_GET["mode"] == "none"))) {
require "view/theme/frio/none.php";
} else {
$template = 'view/theme/' . current_theme() . '/'
$cached_etag = str_replace(array('"', "-gzip"), array('', ''),
stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
- if (($cached_modified == $modified) AND ($cached_etag == $etag)) {
+ if (($cached_modified == $modified) && ($cached_etag == $etag)) {
header('HTTP/1.1 304 Not Modified');
exit();
}
set_template_engine($a, 'smarty3');
- if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) {
+ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
vier_community_info();
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
// Hide the left menu bar
/// @TODO maybe move this static array out where it should belong?
- if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
+ if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
"probe", "webfinger", "login", "invite", "credits"))) {
$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
}
}
function get_vier_config($key, $default = false, $admin = false) {
- if (local_user() AND !$admin) {
+ if (local_user() && !$admin) {
$result = get_pconfig(local_user(), "vier", $key);
if ($result !== false) {
return $result;
}
//right_aside FIND FRIENDS
- if ($show_friends AND local_user()) {
+ if ($show_friends && local_user()) {
$nv = array();
$nv['title'] = array("", t('Find Friends'), "", "");
$nv['directory'] = array('directory', t('Local Directory'), "", "");
}
//Community_Pages at right_aside
- if ($show_pages AND local_user()) {
+ if ($show_pages && local_user()) {
require_once 'include/ForumManager.php';
$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
}
- if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
+ if (function_exists("imap_open") && !get_config("system","imap_disabled") && !get_config("system","dfrn_only")) {
$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
}
projects / friendica.git / commitdiff