X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fadmin.php;h=21731eb5105f5d51c2fc099ce9a95671b9422b17;hb=e803e56eea2790c8bf042ec44404ca73aaba9d93;hp=f79e837b770c0ec003ec9e039d11a90b3179cb6d;hpb=a1da54834b62ccf936eef77ee0e75f27f0d30444;p=friendica.git

diff --git a/mod/admin.php b/mod/admin.php
index f79e837b77..21731eb510 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -47,12 +47,35 @@ function admin_post(&$a){
 				return; // NOTREACHED
 				break;
 			case 'themes':
+				if ($a->argc < 2) {
+					if(is_ajax()) return;
+					goaway($a->get_baseurl(true) . '/admin/' );
+					return;
+				}
+
 				$theme = $a->argv[2];
 				if (is_file("view/theme/$theme/config.php")){
-					require_once("view/theme/$theme/config.php");
-					if (function_exists("theme_admin_post")){
-						theme_admin_post($a);
+					function __call_theme_admin_post(&$a, $theme) {
+						$orig_theme = $a->theme;
+						$orig_page = $a->page;
+						$orig_session_theme = $_SESSION['theme'];
+						require_once("view/theme/$theme/theme.php");
+						require_once("view/theme/$theme/config.php");
+						$_SESSION['theme'] = $theme;
+
+
+						$init = $theme."_init";
+						if(function_exists($init)) $init($a);
+						if(function_exists("theme_admin_post")){
+							$admin_form = theme_admin_post($a);
+						}
+
+						$_SESSION['theme'] = $orig_session_theme;
+						$a->theme = $orig_theme;
+						$a->page = $orig_page;
+						return $admin_form;
 					}
+					__call_theme_admin_post($a, $theme);
 				}
 				info(t('Theme settings updated.'));
 				if(is_ajax()) return;
@@ -580,18 +603,7 @@ function admin_page_site_post(&$a){
 function admin_page_site(&$a) {
 
 	/* Installed langs */
-	$lang_choices = array();
-	$langs = glob('view/*/strings.php'); /**/
-
-	if(is_array($langs) && count($langs)) {
-		if(! in_array('view/en/strings.php',$langs))
-			$langs[] = 'view/en/';
-		asort($langs);
-		foreach($langs as $l) {
-			$t = explode("/",$l);
-			$lang_choices[$t[1]] = $t[1];
-		}
-	}
+	$lang_choices = get_avaiable_languages();
 
 	if (strlen(get_config('system','directory_submit_url')) AND
 		!strlen(get_config('system','directory'))) {
@@ -603,58 +615,60 @@ function admin_page_site(&$a) {
 	$theme_choices = array();
 	$theme_choices_mobile = array();
 	$theme_choices_mobile["---"] = t("No special theme for mobile devices");
-	$files = glob('view/theme/*');
+	$files = glob('view/theme/*'); /**/
 	if($files) {
 		foreach($files as $file) {
+			if (intval(file_exists($file . '/unsupported')))
+				continue;
+
 			$f = basename($file);
 			$theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
 			if (file_exists($file . '/mobile')) {
 				$theme_choices_mobile[$f] = $theme_name;
-			}
-		else {
+			} else {
 				$theme_choices[$f] = $theme_name;
 			}
 		}
-		}
+	}
 
-		/* Community page style */
-		$community_page_style_choices = array(
-			CP_NO_COMMUNITY_PAGE => t("No community page"),
-			CP_USERS_ON_SERVER => t("Public postings from users of this site"),
-			CP_GLOBAL_COMMUNITY => t("Global community page")
-			);
+	/* Community page style */
+	$community_page_style_choices = array(
+		CP_NO_COMMUNITY_PAGE => t("No community page"),
+		CP_USERS_ON_SERVER => t("Public postings from users of this site"),
+		CP_GLOBAL_COMMUNITY => t("Global community page")
+		);
 
-		/* OStatus conversation poll choices */
-		$ostatus_poll_choices = array(
-			"-2" => t("Never"),
-			"-1" => t("At post arrival"),
-			"0" => t("Frequently"),
-			"60" => t("Hourly"),
-			"720" => t("Twice daily"),
-			"1440" => t("Daily")
-			);
+	/* OStatus conversation poll choices */
+	$ostatus_poll_choices = array(
+		"-2" => t("Never"),
+		"-1" => t("At post arrival"),
+		"0" => t("Frequently"),
+		"60" => t("Hourly"),
+		"720" => t("Twice daily"),
+		"1440" => t("Daily")
+		);
 
-		$poco_discovery_choices = array(
-			"0" => t("Disabled"),
-			"1" => t("Users"),
-			"2" => t("Users, Global Contacts"),
-			"3" => t("Users, Global Contacts/fallback"),
-			);
+	$poco_discovery_choices = array(
+		"0" => t("Disabled"),
+		"1" => t("Users"),
+		"2" => t("Users, Global Contacts"),
+		"3" => t("Users, Global Contacts/fallback"),
+		);
 
-		$poco_discovery_since_choices = array(
-			"30" => t("One month"),
-			"91" => t("Three months"),
-			"182" => t("Half a year"),
-			"365" => t("One year"),
-			);
+	$poco_discovery_since_choices = array(
+		"30" => t("One month"),
+		"91" => t("Three months"),
+		"182" => t("Half a year"),
+		"365" => t("One year"),
+		);
 
-		/* get user names to make the install a personal install of X */
-		$user_names = array();
-		$user_names['---'] = t('Multi user instance');
-		$users = q("SELECT username, nickname FROM `user`");
-		foreach ($users as $user) {
-			$user_names[$user['nickname']] = $user['username'];
-		}
+	/* get user names to make the install a personal install of X */
+	$user_names = array();
+	$user_names['---'] = t('Multi user instance');
+	$users = q("SELECT username, nickname FROM `user`");
+	foreach ($users as $user) {
+		$user_names[$user['nickname']] = $user['username'];
+	}
 
 	/* Banner */
 	$banner = get_config('system','banner');
@@ -1405,11 +1419,27 @@ function admin_page_themes(&$a){
 
 		$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);
-			}
+			function __get_theme_admin_form(&$a, $theme) {
+				$orig_theme = $a->theme;
+				$orig_page = $a->page;
+				$orig_session_theme = $_SESSION['theme'];
+				require_once("view/theme/$theme/theme.php");
+				require_once("view/theme/$theme/config.php");
+				$_SESSION['theme'] = $theme;
+
+
+				$init = $theme."_init";
+				if(function_exists($init)) $init($a);
+				if(function_exists("theme_admin")){
+					$admin_form = theme_admin($a);
+				}
 
+				$_SESSION['theme'] = $orig_session_theme;
+				$a->theme = $orig_theme;
+				$a->page = $orig_page;
+				return $admin_form;
+			}
+			$admin_form = __get_theme_admin_form($a, $theme);
 		}
 
 		$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));