X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fadmin.php;h=7799e64ab1a9fb1e468287a16835f5fe6be9a326;hb=0883a614a288a85b973174a03c9498289e6383dc;hp=920adf05d46be6b6a85d67d5419880ecabf09179;hpb=285d617569f525b213318bcb2eadcbb34400e4f3;p=friendica.git diff --git a/mod/admin.php b/mod/admin.php index 920adf05d4..7799e64ab1 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1,8 +1,9 @@ get_baseurl() . '/admin/plugins/' . $a->argv[2] ); - return; // NOTREACHED + return; // NOTREACHED break; case 'logs': admin_page_logs_post($a); break; + case 'update': + admin_page_remoteupdate_post($a); + break; } } @@ -61,7 +65,8 @@ function admin_content(&$a) { $aside = Array( 'site' => Array($a->get_baseurl()."/admin/site/", t("Site") , "site"), 'users' => Array($a->get_baseurl()."/admin/users/", t("Users") , "users"), - 'plugins'=> Array($a->get_baseurl()."/admin/plugins/", t("Plugins") , "plugins") + 'plugins'=> Array($a->get_baseurl()."/admin/plugins/", t("Plugins") , "plugins"), + 'update' => Array($a->get_baseurl()."/admin/update/", t("Update") , "update") ); /* get plugins admin page */ @@ -80,7 +85,7 @@ function admin_content(&$a) { $t = get_markup_template("admin_aside.tpl"); $a->page['aside'] = replace_macros( $t, array( '$admin' => $aside, - '$h_pending' => t('User registrations waiting for confirm'), + '$h_pending' => t('User registrations waiting for confirmation'), '$admurl'=> $a->get_baseurl()."/admin/" )); @@ -105,7 +110,10 @@ function admin_content(&$a) { break; case 'logs': $o = admin_page_logs($a); - break; + break; + case 'update': + $o = admin_page_remoteupdate($a); + break; default: notice( t("Item not found.") ); } @@ -176,16 +184,20 @@ function admin_page_site_post(&$a){ $block_public = ((x($_POST,'block_public')) ? True : False); $force_publish = ((x($_POST,'publish_all')) ? True : False); $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); - $global_search_url = ((x($_POST,'directory_search_url'))? notags(trim($_POST['directory_search_url'])) : ''); $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False); $no_gravatar = !((x($_POST,'no_gravatar')) ? True : False); $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); $no_utf = !((x($_POST,'no_utf')) ? True : False); + $no_community_page = !((x($_POST,'no_community_page')) ? True : False); + $verifyssl = ((x($_POST,'verifyssl')) ? True : False); - $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['global_search_url'])) : ''); - $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['global_search_url'])) : ''); + $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); + $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); + $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); + $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); set_config('config','sitename',$sitename); @@ -222,12 +234,15 @@ function admin_page_site_post(&$a){ set_config('system','no_openid', $no_openid); set_config('system','no_gravatar', $no_gravatar); set_config('system','no_regfullname', $no_regfullname); - set_config('system','proxy', $no_utf); + set_config('system','no_community_page', $no_community_page); + set_config('system','no_utf', $no_utf); set_config('system','verifyssl', $verifyssl); set_config('system','proxyuser', $proxyuser); set_config('system','proxy', $proxy); set_config('system','curl_timeout', $timeout); - + set_config('system','dfrn_only', $dfrn_only); + set_config('system','ostatus_disabled', $ostatus_disabled); + set_config('system','diaspora_enabled', $diaspora_enabled); info( t('Site settings updated.') . EOL); goaway($a->get_baseurl() . '/admin/site' ); @@ -266,14 +281,15 @@ function admin_page_site(&$a) { /* Banner */ $banner = get_config('system','banner'); if($banner == false) - $banner = htmlspecialchars('logoFriendika'); + $banner = 'logoFriendika'; + $banner = htmlspecialchars($banner); //echo "
"; var_dump($lang_choices); die("
"); /* Register policy */ $register_choices = Array( REGISTER_CLOSED => t("Closed"), - REGISTER_APPROVE => t("Need approvation"), + REGISTER_APPROVE => t("Requires approval"), REGISTER_OPEN => t("Open") ); @@ -284,12 +300,12 @@ function admin_page_site(&$a) { '$submit' => t('Submit'), '$registration' => t('Registration'), '$upload' => t('File upload'), - '$corporate' => t('Corporate/Edu'), + '$corporate' => t('Policies'), '$advanced' => t('Advanced'), '$baseurl' => $a->get_baseurl(), // name, label, value, help string, extra data... - '$sitename' => array('sitename', t("Site name"), $a->config['sitename'], ""), + '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), '$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'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices), @@ -297,21 +313,22 @@ function admin_page_site(&$a) { '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "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), - '$register_text' => array('register_text', t("Register text"), $a->config['register_text'], "Will be displayed prominently on the registration page."), + '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."), '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."), '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."), - '$global_search_url'=> array('directory_search_url', t("Global directory search URL"), get_config('system','directory_search_url'), ""), - '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."), '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."), - '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to registrate with a space between his firsname and lastname in Full name, as an antispam measure"), - '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','proxy'), "Use PHP UTF8 regular expressions"), - + '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "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'), "Use PHP UTF8 regular expressions"), + '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), @@ -327,11 +344,8 @@ function admin_page_site(&$a) { * Users admin page */ function admin_page_users_post(&$a){ - $users=array(); $pending=array(); - foreach($_POST as $k=>$v){ - if (substr($k,0,5)=="user_") $users[] = substr($k,5,strlen($k)-5); - if (substr($k,0,8)=="pending_") $users[] = substr($k,8,strlen($k)-8); - } + $pending = ( x(£_POST, 'pending') ? $_POST['pending'] : Array() ); + $users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); if (x($_POST,'page_users_block')){ foreach($users as $uid){ @@ -350,13 +364,13 @@ function admin_page_users_post(&$a){ } if (x($_POST,'page_users_approve')){ - require_once("include/regmod.php"); + require_once("mod/regmod.php"); foreach($pending as $hash){ user_allow($hash); } } if (x($_POST,'page_users_deny')){ - require_once("include/regmod.php"); + require_once("mod/regmod.php"); foreach($pending as $hash){ user_deny($hash); } @@ -409,22 +423,22 @@ function admin_page_users(&$a){ $a->set_pager_itemspage(100); } - $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro` , `lastitem`.`lastitem_date` - FROM ( - SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` + $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date` + FROM + (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` FROM `item` WHERE `item`.`type` = 'wall' - GROUP BY `item`.`uid` - ) AS `lastitem` , `user` - LEFT JOIN `contact` ON `user`.`uid` = `contact`.`uid` - WHERE `user`.`verified` =1 - AND `contact`.`self` =1 - AND `lastitem`.`uid` = `user`.`uid` + GROUP BY `item`.`uid`) AS `lastitem` + RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, + `contact` + WHERE + `user`.`uid` = `contact`.`uid` + AND `user`.`verified` =1 + AND `contact`.`self` =1 ORDER BY `contact`.`name` LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']) - ); function _setup_users($e){ @@ -459,7 +473,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), + '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), @@ -651,3 +665,54 @@ function admin_page_logs(&$a){ )); } +function admin_page_remoteupdate_post(&$a) { + // this function should be called via ajax post + if(!is_site_admin()) { + return login(false); + } + + + if (x($_POST,'remotefile') && $_POST['remotefile']!=""){ + $remotefile = $_POST['remotefile']; + $ftpdata = (x($_POST['ftphost'])?$_POST:false); + doUpdate($remotefile, $ftpdata); + } else { + echo "No remote file to download. Abort!"; + } + + killme(); +} + +function admin_page_remoteupdate(&$a) { + if(!is_site_admin()) { + return login(false); + } + + $canwrite = canWeWrite(); + $canftp = function_exists('ftp_connect'); + + $needupdate = true; + $u = checkUpdate(); + if (!is_array($u)){ + $needupdate = false; + $u = array('','',''); + } + + $tpl = get_markup_template("admin_remoteupdate.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$submit' => t("Update now"), + '$close' => t("Close"), + '$localversion' => FRIENDIKA_VERSION, + '$remoteversion' => $u[1], + '$needupdate' => $needupdate, + '$canwrite' => $canwrite, + '$canftp' => $canftp, + '$ftphost' => array('ftphost', t("FTP Host"), '',''), + '$ftppath' => array('ftppath', t("FTP Path"), '/',''), + '$ftpuser' => array('ftpuser', t("FTP User"), '',''), + '$ftppwd' => array('ftppwd', t("FTP Password"), '',''), + '$remotefile'=>array('remotefile','', $u['2'],'') + )); + +}