}
goaway($a->get_baseurl(true) . '/admin' );
- return; // NOTREACHED
+ return; // NOTREACHED
}
/**
/* get plugins admin page */
- $r = q("SELECT * FROM `addon` WHERE `plugin_admin`=1");
+ $r = q("SELECT name FROM `addon` WHERE `plugin_admin`=1");
$aside['plugins_admin']=Array();
foreach ($r as $h){
$plugin =$h['name'];
$r = q("SELECT COUNT(id) as `count` FROM `register`");
$pending = $r[0]['count'];
-
+
$r = q("select count(*) as total from deliverq where 1");
$deliverq = (($r) ? $r[0]['total'] : 0);
check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+ // relocate
+ if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url']!=""){
+ $new_url = $_POST['relocate_url'];
+ $new_url = rtrim($new_url,"/");
+
+ $parsed = @parse_url($new_url);
+ if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
+ notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
+ goaway($a->get_baseurl(true) . '/admin/site' );
+ }
+
+ /* steps:
+ * replace all "baseurl" to "new_url" in config, profile, term, items and contacts
+ * send relocate for every local user
+ * */
+
+ $old_url = $a->get_baseurl(true);
+
+ function update_table($table_name, $fields, $old_url, $new_url) {
+ global $db, $a;
+
+ $dbold = dbesc($old_url);
+ $dbnew = dbesc($new_url);
+
+ $upd = array();
+ foreach ($fields as $f) {
+ $upd[] = "`$f` = REPLACE(`$f`, '$dbold', '$dbnew')";
+ }
+
+ $upds = implode(", ", $upd);
+
+
+
+ $q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
+ $r = q($q);
+ if (!$r) {
+ notice( "Falied updating '$table_name': " . $db->error );
+ goaway($a->get_baseurl(true) . '/admin/site' );
+ }
+ }
+
+ // update tables
+ update_table("profile", array('photo', 'thumb'), $old_url, $new_url);
+ update_table("term", array('url'), $old_url, $new_url);
+ update_table("contact", array('photo','thumb','micro','url','nurl','request','notify','poll','confirm','poco'), $old_url, $new_url);
+ update_table("item", array('owner-link','owner-avatar','author-name','author-link','author-avatar','body','plink','tag'), $old_url, $new_url);
+
+ // update config
+ $a->set_baseurl($new_url);
+ set_config('system','url',$new_url);
+
+ // send relocate
+ $users = q("SELECT uid FROM user WHERE account_removed = 0 AND account_expired = 0");
+
+ foreach ($users as $user) {
+ proc_run('php', 'include/notifier.php', 'relocate', $user['uid']);
+ }
+
+ info("Relocation started. Could take a while to complete.");
+
+ goaway($a->get_baseurl(true) . '/admin/site' );
+ }
+ // end relocate
+
$sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : '');
$banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
$info = ((x($_POST,'info')) ? trim($_POST['info']) : false);
set_config('system','maximagesize', $maximagesize);
set_config('system','max_image_length', $maximagelength);
set_config('system','jpeg_quality', $jpegimagequality);
-
+
set_config('config','register_policy', $register_policy);
set_config('system','max_daily_registrations', $daily_registrations);
set_config('system','account_abandon_days', $abandon_days);
set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
set_config('system','diaspora_enabled', $diaspora_enabled);
set_config('config','private_addons', $private_addons);
-
+
set_config('system','old_share', $old_share);
set_config('system','hide_help', $hide_help);
set_config('system','use_fulltext_engine', $use_fulltext_engine);
set_config('system','lockpath', $lockpath);
set_config('system','temppath', $temppath);
set_config('system','basepath', $basepath);
-
+
info( t('Site settings updated.') . EOL);
goaway($a->get_baseurl(true) . '/admin/site' );
return; // NOTREACHED
* @return string
*/
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/';
$lang_choices[$t[1]] = $t[1];
}
}
-
+
/* Installed themes */
$theme_choices = array();
$theme_choices_mobile = array();
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Site'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$registration' => t('Registration'),
'$upload' => t('File upload'),
'$corporate' => t('Policies'),
'$advanced' => t('Advanced'),
'$performance' => t('Performance'),
-
+ '$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
-
'$baseurl' => $a->get_baseurl(true),
// name, label, value, help string, extra data...
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
'$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
'$private_addons' => array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
'$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
-
+
'$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")),
'$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
+
+ '$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
+
'$form_security_token' => get_form_security_token("admin_site"),
));
}
$failed = array();
- $r = q("select * from config where `cat` = 'database' ");
+ $r = q("select k, v from config where `cat` = 'database' ");
if(count($r)) {
foreach($r as $rr) {
$upd = intval(substr($rr['k'],7));
'$mark' => t('Mark success (if update was manually applied)'),
'$apply' => t('Attempt to execute this update step automatically'),
'$failed' => $failed
- ));
+ ));
return $o;
$nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
-
+
if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
require_once('include/user.php');
require_once('include/email.php');
info( t('Registration successful. Email send to user').EOL );
}
}
-
+
if (x($_POST,'page_users_block')){
foreach($users as $uid){
q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
}
notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) );
}
-
+
if (x($_POST,'page_users_approve')){
require_once("mod/regmod.php");
foreach($pending as $hash){
}
}
goaway($a->get_baseurl(true) . '/admin/users' );
- return; // NOTREACHED
+ return; // NOTREACHED
}
/**
function admin_page_users(&$a){
if ($a->argc>2) {
$uid = $a->argv[3];
- $user = q("SELECT * FROM `user` WHERE `uid`=%d", intval($uid));
+ $user = q("SELECT username, blocked FROM `user` WHERE `uid`=%d", intval($uid));
if (count($user)==0){
notice( 'User not found' . EOL);
goaway($a->get_baseurl(true) . '/admin/users' );
return ''; // NOTREACHED
- }
+ }
switch($a->argv[2]){
case "delete":{
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
// delete user
require_once("include/Contact.php");
user_remove($uid);
-
+
notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
}; break;
case "block":{
}
goaway($a->get_baseurl(true) . '/admin/users' );
return ''; // NOTREACHED
-
+
}
-
+
/* get pending */
$pending = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
FROM `register`
LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
-
-
+
+
/* get users */
$total = q("SELECT count(*) as total FROM `user` where 1");
$a->set_pager_total($total[0]['total']);
$a->set_pager_itemspage(100);
}
-
-
+
+
$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
-
+
function _setup_users($e){
- $a = get_app();
+ $a = get_app();
+
+ $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+
$accounts = Array(
- t('Normal Account'),
+ t('Normal Account'),
t('Soapbox Account'),
t('Community/Celebrity Account'),
t('Automatic Friend Account')
$e['register_date'] = relative_date($e['register_date']);
$e['login_date'] = relative_date($e['login_date']);
$e['lastitem_date'] = relative_date($e['lastitem_date']);
- $e['is_admin'] = ($e['email'] === $a->config['admin_email']);
- $e['deleted'] = ($e['account_removed']?relative_date($e['account_expires_on']):False);
+ //$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
+ $e['is_admin'] = in_array($e['email'], $adminlist);
+ $e['deleted'] = ($e['account_removed']?relative_date($e['account_expires_on']):False);
return $e;
}
$users = array_map("_setup_users", $users);
-
-
+
+
// Get rid of dashes in key names, Smarty3 can't handle them
// and extracting deleted users
-
+
$tmp_users = Array();
$deleted = Array();
-
+
while(count($users)) {
$new_user = Array();
foreach( array_pop($users) as $k => $v) {
// strings //
'$title' => t('Administration'),
'$page' => t('Users'),
- '$submit' => t('Submit'),
+ '$submit' => t('Add User'),
'$select_all' => t('select all'),
'$h_pending' => t('User registrations waiting for confirm'),
'$h_deleted' => t('User waiting for permanent deletion'),
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Plugins'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$baseurl' => $a->get_baseurl(true),
'$function' => 'plugins',
'$plugins' => $plugins,
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Themes'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$baseurl' => $a->get_baseurl(true),
'$function' => 'themes',
'$plugins' => $xthemes,
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Logs'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$clear' => t('Clear'),
'$data' => $data,
'$baseurl' => $a->get_baseurl(true),
function get_theme_config_file($theme){
$a = get_app();
$base_theme = $a->theme_info['extends'];
-
+
if (file_exists("view/theme/$theme/config.php")){
return "view/theme/$theme/config.php";
- }
+ }
if (file_exists("view/theme/$base_theme/config.php")){
return "view/theme/$base_theme/config.php";
}
if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
-
+
call_hooks('plugin_settings_post', $_POST);
return;
}
if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
+
check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
-
+
if(x($_POST, 'imap-submit')) {
-
+
$mail_server = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
$mail_port = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
$mail_ssl = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
dbesc($theme),
intval(local_user())
);
-
+
call_hooks('display_settings_post', $_POST);
goaway($a->get_baseurl(true) . '/settings/display' );
return; // NOTREACHED
}
check_form_security_token_redirectOnErr('/settings', 'settings');
-
+
+ if (x($_POST,'resend_relocate')) {
+ proc_run('php', 'include/notifier.php', 'relocate', local_user());
+ info(t("Relocate message has been send to your contacts"));
+ goaway($a->get_baseurl(true) . '/settings');
+ }
-
++
call_hooks('settings_post', $_POST);
- if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
+ if((x($_POST,'password')) || (x($_POST,'confirm'))) {
- $newpass = $_POST['npassword'];
+ $newpass = $_POST['password'];
$confirm = $_POST['confirm'];
$oldpass = hash('whirlpool', $_POST['opassword']);
$err = true;
}
- // check if the old password was supplied correctly before
+ // check if the old password was supplied correctly before
// changing it to the new value
$r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
if( $oldpass != $r[0]['password'] ) {
}
}
-
+
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
$email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
$timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
$blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
$unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
$cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
- $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
+ $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0);
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
$post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0);
if($email != $a->user['email']) {
$email_changed = true;
- // check for the correct password
- $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
- $password = hash('whirlpool', $_POST['mpassword']);
- if ($password != $r[0]['password']) {
- $err .= t('Wrong Password') . EOL;
- $email = $a->user['email'];
- }
- // check the email is valid
- if(! valid_email($email))
- $err .= t(' Not valid email.');
- // ensure new email is not the admin mail
- if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
- $err .= t(' Cannot change to that email.');
+ // check for the correct password
+ $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
- $password = hash('whirlpool', $_POST['password']);
++ $password = hash('whirlpool', $_POST['mpassword']);
+ if ($password != $r[0]['password']) {
+ $err .= t('Wrong Password') . EOL;
$email = $a->user['email'];
}
+ // check the email is valid
+ if(! valid_email($email))
+ $err .= t(' Not valid email.');
+ // ensure new email is not the admin mail
+ //if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0)) {
+ if(x($a->config,'admin_email')) {
+ $adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
+ if (in_array(strtolower($email), $adminlist)) {
+ $err .= t(' Cannot change to that email.');
+ $email = $a->user['email'];
+ }
+ }
}
if(strlen($err)) {
dbesc(datetime_convert()),
intval(local_user())
);
- }
+ }
if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
goaway($a->get_baseurl(true) . '/settings' );
return; // NOTREACHED
}
-
+
if(! function_exists('settings_content')) {
function settings_content(&$a) {
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_oauth"),
'$title' => t('Add application'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$cancel' => t('Cancel'),
'$name' => array('name', t('Name'), '', ''),
'$key' => array('key', t('Consumer Key'), '', ''),
'$form_security_token' => get_form_security_token("settings_features"),
'$title' => t('Additional Features'),
'$features' => $arr,
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
));
return $o;
}
'$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
'$mail_action' => array('mail_action', t('Action after import:'), $mail_action, '', array(0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder'))),
'$mail_movetofolder' => array('mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$settings_connectors' => $settings_connectors
));
$o = replace_macros($tpl, array(
'$ptitle' => t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$baseurl' => $a->get_baseurl(true),
'$uid' => local_user(),
$o .= replace_macros($stpl, array(
'$ptitle' => t('Account Settings'),
- '$submit' => t('Submit'),
+ '$submit' => t('Save Settings'),
'$baseurl' => $a->get_baseurl(true),
'$uid' => local_user(),
'$form_security_token' => get_form_security_token("settings"),
'$nickname_block' => $prof_addr,
--
++
'$h_pass' => t('Password Settings'),
- '$password1'=> array('npassword', t('New Password:'), '', ''),
+ '$password1'=> array('password', t('New Password:'), '', ''),
'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
'$password3'=> array('opassword', t('Current Password:'), '', t('Your current password to confirm the changes')),
- '$password4'=> array('password', t('Password:'), '', t('Your current password to confirm the changes')),
+ '$password4'=> array('mpassword', t('Password:'), '', t('Your current password to confirm the changes')),
'$oid_enable' => (! get_config('system','no_openid')),
'$openid' => $openid_field,
--
++
'$h_basic' => t('Basic Settings'),
'$username' => array('username', t('Full Name:'), $username,''),
'$email' => array('email', t('Email Address:'), $email, ''),
'$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
'$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
'$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
--
++
'$h_prv' => t('Security and Privacy Settings'),
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
+ '$relocate' => t('Relocate'),
+ '$relocate_text' => t("If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."),
+ '$relocate_button' => t("Resend relocate message to contacts"),
+
));
call_hooks('settings_form',$o);
projects / friendica.git / commitdiff