MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use short form array syntax everywhere

Browse source 
- Add short form array syntax to po2php.php generation
This commit is contained in:
Hypolite Petovan 2018-01-15 08:05:12 -05:00
commit e36f2bb1fb
212 changed files with 5160 additions and 5160 deletions
Download patch file Download diff file Expand all files Collapse all files

30
view/theme/vier/config.php
View file

@ -69,9 +69,9 @@ function theme_admin(App $a) {
$helperlist = "https://forum.friendi.ca/profile/helpers";
$t = get_markup_template("theme_admin_settings.tpl");
$o .= replace_macros($t, array(
'$helperlist' => array('vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''),
));
$o .= replace_macros($t, [
'$helperlist' => ['vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''],
]);
$show_pages = get_vier_config('show_pages', true, true);
$show_profiles = get_vier_config('show_profiles', true, true);
@ -100,7 +100,7 @@ function theme_admin_post(App $a) {
/// @TODO $a is no longer used
function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers) {
$styles = array(
$styles = [
"breathe"=>"Breathe",
"netcolour"=>"Coloured Networks",
"dark"=>"Dark",
@ -108,22 +108,22 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $
"plus"=>"Plus",
"plusminus"=>"Plus Minus",
"shadow"=>"Shadow"
);
];
$show_or_not = array('0'=>t("don't show"), '1'=>t("show"),);
$show_or_not = ['0'=>t("don't show"), '1'=>t("show"),];
$t = get_markup_template("theme_settings.tpl");
$o .= replace_macros($t, array(
$o .= replace_macros($t, [
'$submit' => t('Submit'),
'$baseurl' => System::baseUrl(),
'$title' => t("Theme settings"),
'$style' => array('vier_style',t ('Set style'),$style,'',$styles),
'$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not),
'$show_profiles' => array('vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not),
'$show_helpers' => array('vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not),
'$show_services' => array('vier_show_services', t('Connect Services'), $show_services, '', $show_or_not),
'$show_friends' => array('vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not),
'$show_lastusers' => array('vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not)
));
'$style' => ['vier_style',t ('Set style'),$style,'',$styles],
'$show_pages' => ['vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not],
'$show_profiles' => ['vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not],
'$show_helpers' => ['vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not],
'$show_services' => ['vier_show_services', t('Connect Services'), $show_services, '', $show_or_not],
'$show_friends' => ['vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not],
'$show_lastusers' => ['vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not]
]);
return $o;
}

2
view/theme/vier/style.php
View file

@ -56,7 +56,7 @@ header('Last-Modified: '.$modified);
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
$cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
$cached_etag = str_replace(array('"', "-gzip"), array('', ''),
$cached_etag = str_replace(['"', "-gzip"], ['', ''],
stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
if (($cached_modified == $modified) && ($cached_etag == $etag)) {

90
view/theme/vier/theme.php
View file

@ -102,8 +102,8 @@ EOT;
// Hide the left menu bar
/// @TODO maybe move this static array out where it should belong?
if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
"probe", "webfinger", "login", "invite", "credits"))) {
if (($a->page['aside'] == "") && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications",
"probe", "webfinger", "login", "invite", "credits"])) {
$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
}
}
@ -146,16 +146,16 @@ function vier_community_info() {
if (DBM::is_result($r)) {
$aside['$comunity_profiles_title'] = t('Community Profiles');
$aside['$comunity_profiles_items'] = array();
$aside['$comunity_profiles_items'] = [];
foreach ($r as $rr) {
$entry = replace_macros($tpl,array(
$entry = replace_macros($tpl,[
'$id' => $rr['id'],
//'$profile_link' => Profile::zrl($rr['url']),
'$profile_link' => 'follow/?url='.urlencode($rr['url']),
'$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
'$alt_text' => $rr['name'],
));
]);
$aside['$comunity_profiles_items'][] = $entry;
}
}
@ -176,15 +176,15 @@ function vier_community_info() {
if (DBM::is_result($r)) {
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
$aside['$lastusers_items'] = [];
foreach ($r as $rr) {
$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$entry = replace_macros($tpl,array(
$entry = replace_macros($tpl,[
'$id' => $rr['id'],
'$profile_link' => $profile_link,
'$photo' => $a->remove_baseurl($rr['thumb']),
'$alt_text' => $rr['name']));
'$alt_text' => $rr['name']]);
$aside['$lastusers_items'][] = $entry;
}
}
@ -192,13 +192,13 @@ function vier_community_info() {
//right_aside FIND FRIENDS
if ($show_friends && local_user()) {
$nv = array();
$nv['title'] = array("", t('Find Friends'), "", "");
$nv['directory'] = array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
$nv['match'] = array('match', t('Similar Interests'), "", "");
$nv['suggest'] = array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = array('invite', t('Invite Friends'), "", "");
$nv = [];
$nv['title'] = ["", t('Find Friends'), "", ""];
$nv['directory'] = ['directory', t('Local Directory'), "", ""];
$nv['global_directory'] = [get_server(), t('Global Directory'), "", ""];
$nv['match'] = ['match', t('Similar Interests'), "", ""];
$nv['suggest'] = ['suggest', t('Friend Suggestions'), "", ""];
$nv['invite'] = ['invite', t('Invite Friends'), "", ""];
$nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
<span class="sbox_l"></span>
@ -229,7 +229,7 @@ function vier_community_info() {
foreach ($contacts as $contact) {
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = array(
$entry = [
'url' => 'network?f=&cid=' . $contact['id'],
'external_url' => 'redir/' . $contact['id'],
'name' => $contact['name'],
@ -237,7 +237,7 @@ function vier_community_info() {
'selected' => $selected,
'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
'id' => ++$id,
);
];
$entries[] = $entry;
}
@ -246,13 +246,13 @@ function vier_community_info() {
$page .= replace_macros(
$tpl,
array(
[
'$title' => t('Forums'),
'$forums' => $entries,
'$link_desc' => t('External link to forum'),
'$total' => $total,
'$visible_forums' => $visible_forums,
'$showmore' => t('show more'))
'$showmore' => t('show more')]
);
$aside['$page'] = $page;
@ -262,7 +262,7 @@ function vier_community_info() {
// helpers
if ($show_helpers) {
$r = array();
$r = [];
$helperlist = Config::get("vier", "helperlist");
@ -283,22 +283,22 @@ function vier_community_info() {
foreach ($r AS $index => $helper)
$r[$index]["url"] = Profile::zrl($helper["url"]);
$r[] = array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
$r[] = ["url" => "help/Quick-Start-guide", "name" => t("Quick Start")];
$tpl = get_markup_template('ch_helpers.tpl');
if ($r) {
$helpers = array();
$helpers['title'] = array("", t('Help'), "", "");
$helpers = [];
$helpers['title'] = ["", t('Help'), "", ""];
$aside['$helpers_items'] = array();
$aside['$helpers_items'] = [];
foreach ($r as $rr) {
$entry = replace_macros($tpl,array(
$entry = replace_macros($tpl,[
'$url' => $rr['url'],
'$title' => $rr['name'],
));
]);
$aside['$helpers_items'][] = $entry;
}
@ -311,38 +311,38 @@ function vier_community_info() {
if ($show_services) {
/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
$r = array();
$r = [];
if (plugin_enabled("appnet")) {
$r[] = array("photo" => "images/appnet.png", "name" => "App.net");
$r[] = ["photo" => "images/appnet.png", "name" => "App.net"];
}
if (plugin_enabled("buffer")) {
$r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
$r[] = ["photo" => "images/buffer.png", "name" => "Buffer"];
}
if (plugin_enabled("blogger")) {
$r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
$r[] = ["photo" => "images/blogger.png", "name" => "Blogger"];
}
if (plugin_enabled("dwpost")) {
$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
$r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"];
}
if (plugin_enabled("fbpost")) {
$r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
$r[] = ["photo" => "images/facebook.png", "name" => "Facebook"];
}
if (plugin_enabled("ifttt")) {
$r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
$r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"];
}
if (plugin_enabled("statusnet")) {
$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
$r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"];
}
if (plugin_enabled("gpluspost")) {
$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
$r[] = ["photo" => "images/googleplus.png", "name" => "Google+"];
}
/// @TODO old-lost code (and below)?
@ -351,7 +351,7 @@ function vier_community_info() {
//}
if (plugin_enabled("libertree")) {
$r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
$r[] = ["photo" => "images/libertree.png", "name" => "Libertree"];
}
//if (plugin_enabled("ljpost")) {
@ -359,39 +359,39 @@ function vier_community_info() {
//}
if (plugin_enabled("pumpio")) {
$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
$r[] = ["photo" => "images/pumpio.png", "name" => "pump.io"];
}
if (plugin_enabled("tumblr")) {
$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
$r[] = ["photo" => "images/tumblr.png", "name" => "Tumblr"];
}
if (plugin_enabled("twitter")) {
$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
$r[] = ["photo" => "images/twitter.png", "name" => "Twitter"];
}
if (plugin_enabled("wppost")) {
$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
$r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
}
if (function_exists("imap_open") && !Config::get("system","imap_disabled") && !Config::get("system","dfrn_only")) {
$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
$r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
}
$tpl = get_markup_template('ch_connectors.tpl');
if (DBM::is_result($r)) {
$con_services = array();
$con_services['title'] = array("", t('Connect Services'), "", "");
$con_services = [];
$con_services['title'] = ["", t('Connect Services'), "", ""];
$aside['$con_services'] = $con_services;
foreach ($r as $rr) {
$entry = replace_macros($tpl,array(
$entry = replace_macros($tpl,[
'$url' => $url,
'$photo' => $rr['photo'],
'$alt_text' => $rr['name'],
));
]);
$aside['$connector_items'][] = $entry;
}
}