theme screenshots

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 88ccad6d3e42f9c7f970eba972f04417f132d3bd..53b5ee35447a1984cd1eeeb40733e548e3d7acf3 100755 (executable)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -308,7 +308,7 @@ function admin_page_site(&$a) {
                SSL_POLICY_FULL => t("Force all links to use SSL"),
                SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
        );
-       
+
        $t = get_markup_template("admin_site.tpl");
        return replace_macros($t, array(
                '$title' => t('Administration'),
@@ -325,7 +325,7 @@ function admin_page_site(&$a) {
                '$banner'                       => array('banner', t("Banner/Logo"), $banner, ""),
                '$language'             => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
                '$theme'                        => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
-               '$ssl_policy'       => array('ssl_policy', t("SSL link policy"), get_config('system','ssl_policy'), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+               '$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
                '$maximagesize'         => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
                '$register_policy'      => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
@@ -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
                ));
        }