X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fadmin.php;h=caf68007b1f29b8e20c11e93092d49236559e516;hb=f6d7ee278116c5d9d6ba77606087ecbd8a379e7d;hp=31e7cd1a7cc7300fdfc49d6806c8cf72adf1e4b4;hpb=5a6da8b447430174ae231a3b8203fd4bd8416cc1;p=friendica.git diff --git a/mod/admin.php b/mod/admin.php index 31e7cd1a7c..caf68007b1 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -629,7 +629,6 @@ function admin_page_site_post(App $a) { $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False); $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); - $no_utf = !((x($_POST,'no_utf')) ? True : False); $community_page_style = ((x($_POST,'community_page_style')) ? intval(trim($_POST['community_page_style'])) : 0); $max_author_posts_community_page = ((x($_POST,'max_author_posts_community_page')) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); @@ -666,7 +665,6 @@ function admin_page_site_post(App $a) { $proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False); $only_tag_search = ((x($_POST,'only_tag_search')) ? True : False); $rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0); - $embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : ''); $worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4); $worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False); $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); @@ -787,7 +785,6 @@ function admin_page_site_post(App $a) { set_config('system','no_regfullname', $no_regfullname); set_config('system','community_page_style', $community_page_style); set_config('system','max_author_posts_community_page', $max_author_posts_community_page); - set_config('system','no_utf', $no_utf); set_config('system','verifyssl', $verifyssl); set_config('system','proxyuser', $proxyuser); set_config('system','proxy', $proxy); @@ -814,15 +811,7 @@ function admin_page_site_post(App $a) { set_config('system','worker_dont_fork', $worker_dont_fork); set_config('system','worker_fastlane', $worker_fastlane); set_config('system','frontend_worker', $worker_frontend); - - if (($rino == 2) and !function_exists('mcrypt_create_iv')) { - notice(t("RINO2 needs mcrypt php extension to work.")); - } else { - set_config('system','rino_encrypt', $rino); - } - - set_config('system','embedly', $embedly); - + set_config('system','rino_encrypt', $rino); info(t('Site settings updated.').EOL); goaway('admin/site'); @@ -859,9 +848,8 @@ function admin_page_site(App $a) { $allowed_theme_list = Config::get('system', 'allowed_themes'); foreach ($files as $file) { - if (file_exists($file.'/unsupported')) + if (intval(file_exists($file.'/unsupported'))) continue; - } $f = basename($file); @@ -1013,7 +1001,6 @@ function admin_page_site(App $a) { '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), - '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices), '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")), '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), @@ -1054,7 +1041,6 @@ function admin_page_site(App $a) { '$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")), '$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")), - '$embedly' => array('embedly', t("Embedly API key"), get_config('system','embedly'), t("Embedly is used to fetch additional data for web pages. This is an optional parameter.")), '$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")), '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")), @@ -1275,7 +1261,7 @@ function admin_page_users(App $a) { if ($a->argc>2) { $uid = $a->argv[3]; $user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid)); - if (!dbm::is_result($user)) { + if (count($user) == 0) { notice('User not found'.EOL); goaway('admin/users'); return ''; // NOTREACHED @@ -1610,7 +1596,7 @@ function admin_page_plugins(App $a) { * @param int $result */ function toggle_theme(&$themes,$th,&$result) { - for ($x = 0; $x < count($themes); $x ++) { + for($x = 0; $x < count($themes); $x ++) { if ($themes[$x]['name'] === $th) { if ($themes[$x]['allowed']) { $themes[$x]['allowed'] = 0; @@ -1630,7 +1616,7 @@ function toggle_theme(&$themes,$th,&$result) { * @return int */ function theme_status($themes,$th) { - for ($x = 0; $x < count($themes); $x ++) { + for($x = 0; $x < count($themes); $x ++) { if ($themes[$x]['name'] === $th) { if ($themes[$x]['allowed']) { return 1; @@ -1707,9 +1693,9 @@ function admin_page_themes(App $a) { continue; } - $is_experimental = file_exists($file.'/experimental'); - $is_supported = (!file_exists($file.'/unsupported')); - $is_allowed = in_array($f,$allowed_themes); + $is_experimental = intval(file_exists($file.'/experimental')); + $is_supported = 1-(intval(file_exists($file.'/unsupported'))); + $is_allowed = intval(in_array($f,$allowed_themes)); if ($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) { $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); @@ -1762,7 +1748,7 @@ function admin_page_themes(App $a) { $status="off"; $action= t("Enable"); } - $readme = null; + $readme = Null; if (is_file("view/theme/$theme/README.md")) { $readme = file_get_contents("view/theme/$theme/README.md"); $readme = Markdown($readme);