From 7ef1ed2d7045a381c032d2142413b3a14af0d8e3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Mar 2012 17:55:43 -0700 Subject: theme screenshots --- mod/admin.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index a64b26903..53b5ee354 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -583,6 +583,7 @@ function admin_page_plugins(&$a){ '$admin_form' => $admin_form, '$function' => 'plugins', + '$screenshot' => '', '$readme' => $readme )); } @@ -738,7 +739,11 @@ function admin_page_themes(&$a){ } $admin_form=""; - + + $screenshot = array( get_theme_screenshot($theme), t('Screenshot')); + if(! stristr($screenshot[0],$theme)) + $screenshot = null; + $t = get_markup_template("admin_plugins_details.tpl"); return replace_macros($t, array( '$title' => t('Administration'), @@ -755,6 +760,7 @@ function admin_page_themes(&$a){ '$admin_form' => $admin_form, '$str_author' => t('Author: '), '$str_maintainer' => t('Maintainer: '), + '$screenshot' => $screenshot, '$readme' => $readme )); } -- cgit v1.2.3 From 9391fc965d68fea5fc18e93a1583e90d8f11bd02 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Apr 2012 17:43:11 -0700 Subject: bug #363 and a couple of other reported ssl link issues --- mod/admin.php | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 53b5ee354..8caa76370 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -208,6 +208,38 @@ function admin_page_site_post(&$a){ $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); + if($ssl_policy != intval(get_config('system','ssl_policy'))) { + if($ssl_policy == SSL_POLICY_FULL) { + q("update `contact` set + `url` = replace(`url` , 'http:' , 'https:'), + `photo` = replace(`photo` , 'http:' , 'https:'), + `thumb` = replace(`thumb` , 'http:' , 'https:'), + `micro` = replace(`micro` , 'http:' , 'https:'), + `request` = replace(`request`, 'http:' , 'https:'), + `notify` = replace(`notify` , 'http:' , 'https:'), + `poll` = replace(`poll` , 'http:' , 'https:'), + `confirm` = replace(`confirm`, 'http:' , 'https:'), + `poco` = replace(`poco` , 'http:' , 'https:') + where `self` = 1" + ); + } + elseif($ssl_policy == SSL_POLICY_SELFSIGN) { + q("update `contact` set + `url` = replace(`url` , 'https:' , 'http:'), + `photo` = replace(`photo` , 'https:' , 'http:'), + `thumb` = replace(`thumb` , 'https:' , 'http:'), + `micro` = replace(`micro` , 'https:' , 'http:'), + `request` = replace(`request`, 'https:' , 'http:'), + `notify` = replace(`notify` , 'https:' , 'http:'), + `poll` = replace(`poll` , 'https:' , 'http:'), + `confirm` = replace(`confirm`, 'https:' , 'http:'), + `poco` = replace(`poco` , 'https:' , 'http:') + where `self` = 1" + ); + } + } + set_config('system','ssl_policy',$ssl_policy); + set_config('config','sitename',$sitename); if ($banner==""){ // don't know why, but del_config doesn't work... @@ -218,7 +250,6 @@ function admin_page_site_post(&$a){ } else { set_config('system','banner', $banner); } - set_config('system','ssl_policy',$ssl_policy); set_config('system','language', $language); set_config('system','theme', $theme); set_config('system','maximagesize', $maximagesize); -- cgit v1.2.3 From 466188ebd77a4ef07fce459d9a591f4b45b08d44 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Apr 2012 20:14:37 -0700 Subject: re-opened bug #363 --- mod/admin.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 8caa76370..a395027c1 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -222,6 +222,11 @@ function admin_page_site_post(&$a){ `poco` = replace(`poco` , 'http:' , 'https:') where `self` = 1" ); + q("update `profile` set + `photo` = replace(`photo` , 'http:' , 'https:'), + `thumb` = replace(`thumb` , 'http:' , 'https:') + where 1 " + ); } elseif($ssl_policy == SSL_POLICY_SELFSIGN) { q("update `contact` set @@ -236,6 +241,11 @@ function admin_page_site_post(&$a){ `poco` = replace(`poco` , 'https:' , 'http:') where `self` = 1" ); + q("update `profile` set + `photo` = replace(`photo` , 'https:' , 'http:'), + `thumb` = replace(`thumb` , 'https:' , 'http:') + where 1 " + ); } } set_config('system','ssl_policy',$ssl_policy); -- cgit v1.2.3