Friendica';
$banner = htmlspecialchars($banner);
-
+
//echo ""; var_dump($lang_choices); die("");
/* Register policy */
@@ -763,7 +762,7 @@ function admin_page_users(&$a){
* @return string
*/
function admin_page_plugins(&$a){
-
+
/**
* Single plugin
*/
@@ -773,9 +772,9 @@ function admin_page_plugins(&$a){
notice( t("Item not found.") );
return '';
}
-
+
if (x($_GET,"a") && $_GET['a']=="t"){
- check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
+ check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
// Toggle plugin status
$idx = array_search($plugin, $a->plugins);
@@ -800,52 +799,53 @@ function admin_page_plugins(&$a){
} else {
$status="off"; $action= t("Enable");
}
-
+
$readme=Null;
if (is_file("addon/$plugin/README.md")){
$readme = file_get_contents("addon/$plugin/README.md");
$readme = Markdown($readme);
} else if (is_file("addon/$plugin/README")){
$readme = "". file_get_contents("addon/$plugin/README") ."";
- }
-
+ }
+
$admin_form="";
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
@require_once("addon/$plugin/$plugin.php");
$func = $plugin.'_plugin_admin';
$func($a, $admin_form);
}
-
+
$t = get_markup_template("admin_plugins_details.tpl");
+
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Plugins'),
'$toggle' => t('Toggle'),
'$settings' => t('Settings'),
'$baseurl' => $a->get_baseurl(true),
-
+
'$plugin' => $plugin,
'$status' => $status,
'$action' => $action,
'$info' => get_plugin_info($plugin),
'$str_author' => t('Author: '),
- '$str_maintainer' => t('Maintainer: '),
-
+ '$str_maintainer' => t('Maintainer: '),
+
'$admin_form' => $admin_form,
'$function' => 'plugins',
'$screenshot' => '',
'$readme' => $readme,
- '$form_security_token' => get_form_security_token("admin_themes"),
+ '$form_security_token' => get_form_security_token("admin_themes"),
));
- }
-
-
-
+ }
+
+
+
/**
* List plugins
*/
-
+
$plugins = array();
$files = glob("addon/*/");
if($files) {
@@ -857,7 +857,7 @@ function admin_page_plugins(&$a){
}
}
}
-
+
$t = get_markup_template("admin_plugins.tpl");
return replace_macros($t, array(
'$title' => t('Administration'),
@@ -928,7 +928,7 @@ function rebuild_theme_table($themes) {
return $o;
}
-
+
/**
* Themes admin page
*
@@ -936,7 +936,7 @@ function rebuild_theme_table($themes) {
* @return string
*/
function admin_page_themes(&$a){
-
+
$allowed_themes_str = get_config('system','allowed_themes');
$allowed_themes_raw = explode(',',$allowed_themes_str);
$allowed_themes = array();
@@ -972,9 +972,9 @@ function admin_page_themes(&$a){
notice( t("Item not found.") );
return '';
}
-
+
if (x($_GET,"a") && $_GET['a']=="t"){
- check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
+ check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
// Toggle theme status
@@ -998,28 +998,27 @@ function admin_page_themes(&$a){
} else {
$status="off"; $action= t("Enable");
}
-
+
$readme=Null;
if (is_file("view/theme/$theme/README.md")){
$readme = file_get_contents("view/theme/$theme/README.md");
$readme = Markdown($readme);
} else if (is_file("view/theme/$theme/README")){
$readme = "". file_get_contents("view/theme/$theme/README") ."";
- }
-
+ }
+
$admin_form="";
if (is_file("view/theme/$theme/config.php")){
require_once("view/theme/$theme/config.php");
if(function_exists("theme_admin")){
$admin_form = theme_admin($a);
}
-
+
}
-
$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
if(! stristr($screenshot[0],$theme))
- $screenshot = null;
+ $screenshot = null;
$t = get_markup_template("admin_plugins_details.tpl");
return replace_macros($t, array(
@@ -1028,7 +1027,7 @@ function admin_page_themes(&$a){
'$toggle' => t('Toggle'),
'$settings' => t('Settings'),
'$baseurl' => $a->get_baseurl(true),
-
+
'$plugin' => $theme,
'$status' => $status,
'$action' => $action,
@@ -1042,21 +1041,19 @@ function admin_page_themes(&$a){
'$form_security_token' => get_form_security_token("admin_themes"),
));
- }
-
-
-
+ }
+
/**
* List themes
*/
-
+
$xthemes = array();
if($themes) {
foreach($themes as $th) {
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
}
}
-
+
$t = get_markup_template("admin_plugins.tpl");
return replace_macros($t, array(
'$title' => t('Administration'),
diff --git a/mod/network.php b/mod/network.php
index 872c34da95..9909cd4451 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -321,7 +321,7 @@ function network_query_get_sel_net() {
if(x($_GET,'nets')) {
$network = $_GET['nets'];
}
-
+
return $network;
}
@@ -382,14 +382,14 @@ function network_content(&$a, $update = 0) {
// item filter tabs
// TODO: fix this logic, reduce duplication
//$a->page['content'] .= '"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
$cmd = (($datequery) ? '' : $a->cmd);
- $len_naked_cmd = strlen(str_replace('/new','',$cmd));
+ $len_naked_cmd = strlen(str_replace('/new','',$cmd));
// tabs
$tabs = array(
@@ -435,10 +435,10 @@ function network_content(&$a, $update = 0) {
// 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
// 'sel'=> $spam_active,
// 'title' => t('Posts flagged as SPAM'),
-// ),
+// ),
);
-
+
if(feature_enabled(local_user(),'personal_tab')) {
$tabs[] = array(
'label' => t('Personal'),
@@ -571,11 +571,11 @@ function network_content(&$a, $update = 0) {
}
- // We don't have to deal with ACL's on this page. You're looking at everything
+ // We don't have to deal with ACLs on this page. You're looking at everything
// that belongs to you, hence you can see all of it. We will filter by group if
// desired.
-
+
$sql_options = (($star) ? " and starred = 1 " : '');
$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
diff --git a/object/Conversation.php b/object/Conversation.php
index 8b838f7d00..bd7a95cf2a 100644
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -127,6 +127,7 @@ class Conversation extends BaseObject {
* _ false on failure
*/
public function get_template_data($alike, $dlike) {
+ global $a;
$result = array();
foreach($this->threads as $item) {
@@ -140,6 +141,7 @@ class Conversation extends BaseObject {
$result[] = $item_data;
}
+ //$a->mark_timestamp();
return $result;
}