I guess, @Hypolite will still find something to change ...
This commit is contained in:
parent
0dbc72c4ea
commit
eaf93dc041
330
mod/admin.php
330
mod/admin.php
|
|
@ -27,7 +27,7 @@ require_once("include/text.php");
|
|||
function admin_post(App $a) {
|
||||
|
||||
|
||||
if(!is_site_admin()) {
|
||||
if (!is_site_admin()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ function admin_post(App $a) {
|
|||
|
||||
// urls
|
||||
if ($a->argc > 1) {
|
||||
switch ($a->argv[1]){
|
||||
switch ($a->argv[1]) {
|
||||
case 'site':
|
||||
admin_page_site_post($a);
|
||||
break;
|
||||
|
|
@ -47,10 +47,10 @@ function admin_post(App $a) {
|
|||
admin_page_users_post($a);
|
||||
break;
|
||||
case 'plugins':
|
||||
if($a->argc > 2 &&
|
||||
if ($a->argc > 2 &&
|
||||
is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) {
|
||||
@include_once("addon/".$a->argv[2]."/".$a->argv[2].".php");
|
||||
if(function_exists($a->argv[2].'_plugin_admin_post')) {
|
||||
if (function_exists($a->argv[2].'_plugin_admin_post')) {
|
||||
$func = $a->argv[2].'_plugin_admin_post';
|
||||
$func($a);
|
||||
}
|
||||
|
|
@ -59,14 +59,16 @@ function admin_post(App $a) {
|
|||
return; // NOTREACHED
|
||||
break;
|
||||
case 'themes':
|
||||
if($a->argc < 2) {
|
||||
if(is_ajax()) return;
|
||||
if ($a->argc < 2) {
|
||||
if (is_ajax()) {
|
||||
return;
|
||||
}
|
||||
goaway('admin/');
|
||||
return;
|
||||
}
|
||||
|
||||
$theme = $a->argv[2];
|
||||
if(is_file("view/theme/$theme/config.php")){
|
||||
if (is_file("view/theme/$theme/config.php")) {
|
||||
function __call_theme_admin_post(App $a, $theme) {
|
||||
$orig_theme = $a->theme;
|
||||
$orig_page = $a->page;
|
||||
|
|
@ -77,8 +79,10 @@ function admin_post(App $a) {
|
|||
|
||||
|
||||
$init = $theme."_init";
|
||||
if(function_exists($init)) $init($a);
|
||||
if(function_exists("theme_admin_post")) {
|
||||
if (function_exists($init)) {
|
||||
$init($a);
|
||||
}
|
||||
if (function_exists("theme_admin_post")) {
|
||||
$admin_form = theme_admin_post($a);
|
||||
}
|
||||
|
||||
|
|
@ -90,8 +94,9 @@ function admin_post(App $a) {
|
|||
__call_theme_admin_post($a, $theme);
|
||||
}
|
||||
info(t('Theme settings updated.'));
|
||||
if(is_ajax()) return;
|
||||
|
||||
if (is_ajax()) {
|
||||
return;
|
||||
}
|
||||
goaway('admin/themes/'.$theme);
|
||||
return;
|
||||
break;
|
||||
|
|
@ -130,7 +135,7 @@ function admin_post(App $a) {
|
|||
*/
|
||||
function admin_content(App $a) {
|
||||
|
||||
if(!is_site_admin()) {
|
||||
if (!is_site_admin()) {
|
||||
return login(false);
|
||||
}
|
||||
|
||||
|
|
@ -168,7 +173,7 @@ function admin_content(App $a) {
|
|||
|
||||
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
|
||||
$aside_tools['plugins_admin']=array();
|
||||
foreach ($r as $h){
|
||||
foreach ($r as $h) {
|
||||
$plugin =$h['name'];
|
||||
$aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
|
||||
// temp plugins with admin
|
||||
|
|
@ -199,8 +204,8 @@ function admin_content(App $a) {
|
|||
*/
|
||||
$o = '';
|
||||
// urls
|
||||
if($a->argc > 1) {
|
||||
switch ($a->argv[1]){
|
||||
if ($a->argc > 1) {
|
||||
switch ($a->argv[1]) {
|
||||
case 'site':
|
||||
$o = admin_page_site($a);
|
||||
break;
|
||||
|
|
@ -238,7 +243,7 @@ function admin_content(App $a) {
|
|||
$o = admin_page_summary($a);
|
||||
}
|
||||
|
||||
if(is_ajax()) {
|
||||
if (is_ajax()) {
|
||||
echo $o;
|
||||
killme();
|
||||
return '';
|
||||
|
|
@ -310,19 +315,21 @@ function admin_page_federation(App $a) {
|
|||
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
||||
// part (-xx) should be removed to clean up the versions from the "head
|
||||
// commit" information and combined into a single entry for x.x.x.x
|
||||
if($p=='Diaspora') {
|
||||
if ($p == 'Diaspora') {
|
||||
$newV = array();
|
||||
$newVv = array();
|
||||
foreach($v as $vv) {
|
||||
foreach ($v as $vv) {
|
||||
$newVC = $vv['total'];
|
||||
$newVV = $vv['version'];
|
||||
$posDash = strpos($newVV, '-');
|
||||
if($posDash)
|
||||
if ($posDash) {
|
||||
$newVV = substr($newVV, 0, $posDash);
|
||||
if(isset($newV[$newVV]))
|
||||
}
|
||||
if (isset($newV[$newVV])) {
|
||||
$newV[$newVV] += $newVC;
|
||||
else
|
||||
} else {
|
||||
$newV[$newVV] = $newVC;
|
||||
}
|
||||
}
|
||||
foreach ($newV as $key => $value) {
|
||||
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
||||
|
|
@ -333,7 +340,7 @@ function admin_page_federation(App $a) {
|
|||
// early friendica versions have the format x.x.xxxx where xxxx is the
|
||||
// DB version stamp; those should be operated out and versions be
|
||||
// conbined
|
||||
if ($p=='Friendi%%a') {
|
||||
if ($p == 'Friendi%%a') {
|
||||
$newV = array();
|
||||
$newVv = array();
|
||||
foreach ($v as $vv) {
|
||||
|
|
@ -341,12 +348,14 @@ function admin_page_federation(App $a) {
|
|||
$newVV = $vv['version'];
|
||||
$lastDot = strrpos($newVV,'.');
|
||||
$len = strlen($newVV)-1;
|
||||
if(($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3))
|
||||
if (($lastDot == $len-4) && (!strrpos($newVV,'-rc') == $len-3)) {
|
||||
$newVV = substr($newVV, 0, $lastDot);
|
||||
if(isset($newV[$newVV]))
|
||||
}
|
||||
if (isset($newV[$newVV])) {
|
||||
$newV[$newVV] += $newVC;
|
||||
else
|
||||
} else {
|
||||
$newV[$newVV] = $newVC;
|
||||
}
|
||||
}
|
||||
foreach ($newV as $key => $value) {
|
||||
array_push($newVv, array('total'=>$value, 'version'=>$key));
|
||||
|
|
@ -455,7 +464,10 @@ function admin_page_summary(App $a) {
|
|||
);
|
||||
|
||||
$users=0;
|
||||
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
|
||||
foreach ($r as $u) {
|
||||
$accounts[$u['page-flags']][1] = $u['count'];
|
||||
$users+= $u['count'];
|
||||
}
|
||||
|
||||
logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
|
||||
|
||||
|
|
@ -506,19 +518,19 @@ function admin_page_summary(App $a) {
|
|||
* @param App $a
|
||||
*/
|
||||
function admin_page_site_post(App $a) {
|
||||
if(!x($_POST,"page_site")) {
|
||||
if (!x($_POST,"page_site")) {
|
||||
return;
|
||||
}
|
||||
|
||||
check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
|
||||
|
||||
// relocate
|
||||
if(x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url']!="") {
|
||||
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'))) {
|
||||
if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
|
||||
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
|
||||
goaway('admin/site');
|
||||
}
|
||||
|
|
@ -551,7 +563,7 @@ function admin_page_site_post(App $a) {
|
|||
|
||||
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
|
||||
$r = q($q);
|
||||
if(!$r) {
|
||||
if (!$r) {
|
||||
notice("Failed updating '$table_name': ".$db->error);
|
||||
goaway('admin/site');
|
||||
}
|
||||
|
|
@ -670,14 +682,14 @@ function admin_page_site_post(App $a) {
|
|||
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
|
||||
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
|
||||
|
||||
if($a->get_path() != "")
|
||||
if ($a->get_path() != "") {
|
||||
$diaspora_enabled = false;
|
||||
|
||||
if(!$thread_allow)
|
||||
}
|
||||
if (!$thread_allow) {
|
||||
$ostatus_disabled = true;
|
||||
|
||||
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
||||
if($ssl_policy == SSL_POLICY_FULL) {
|
||||
}
|
||||
if ($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
||||
if ($ssl_policy == SSL_POLICY_FULL) {
|
||||
q("UPDATE `contact` SET
|
||||
`url` = REPLACE(`url` , 'http:' , 'https:'),
|
||||
`photo` = REPLACE(`photo` , 'http:' , 'https:'),
|
||||
|
|
@ -695,8 +707,7 @@ function admin_page_site_post(App $a) {
|
|||
`thumb` = REPLACE(`thumb` , 'http:' , 'https:')
|
||||
WHERE 1 "
|
||||
);
|
||||
}
|
||||
elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
|
||||
} elseif ($ssl_policy == SSL_POLICY_SELFSIGN) {
|
||||
q("UPDATE `contact` SET
|
||||
`url` = REPLACE(`url` , 'https:' , 'http:'),
|
||||
`photo` = REPLACE(`photo` , 'https:' , 'http:'),
|
||||
|
|
@ -736,7 +747,7 @@ function admin_page_site_post(App $a) {
|
|||
set_config('system','shortcut_icon',$shortcut_icon);
|
||||
set_config('system','touch_icon',$touch_icon);
|
||||
|
||||
if($banner=="") {
|
||||
if ($banner == "") {
|
||||
// don't know why, but del_config doesn't work...
|
||||
q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
||||
dbesc("system"),
|
||||
|
|
@ -746,7 +757,7 @@ function admin_page_site_post(App $a) {
|
|||
set_config('system','banner', $banner);
|
||||
}
|
||||
|
||||
if($info=="") {
|
||||
if ($info == "") {
|
||||
del_config('config','info');
|
||||
} else {
|
||||
set_config('config','info',$info);
|
||||
|
|
@ -754,12 +765,12 @@ function admin_page_site_post(App $a) {
|
|||
set_config('system','language', $language);
|
||||
set_config('system','theme', $theme);
|
||||
|
||||
if($theme_mobile === '---') {
|
||||
if ($theme_mobile === '---') {
|
||||
del_config('system','mobile-theme');
|
||||
} else {
|
||||
set_config('system','mobile-theme', $theme_mobile);
|
||||
}
|
||||
if($singleuser === '---') {
|
||||
if ($singleuser === '---') {
|
||||
del_config('system','singleuser');
|
||||
} else {
|
||||
set_config('system','singleuser', $singleuser);
|
||||
|
|
@ -819,7 +830,7 @@ function admin_page_site_post(App $a) {
|
|||
set_config('system','worker_fastlane', $worker_fastlane);
|
||||
set_config('system','frontend_worker', $worker_frontend);
|
||||
|
||||
if($rino==2 and !function_exists('mcrypt_create_iv')) {
|
||||
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);
|
||||
|
|
@ -847,7 +858,7 @@ function admin_page_site(App $a) {
|
|||
/* Installed langs */
|
||||
$lang_choices = get_available_languages();
|
||||
|
||||
if(strlen(get_config('system','directory_submit_url')) AND
|
||||
if (strlen(get_config('system','directory_submit_url')) AND
|
||||
!strlen(get_config('system','directory'))) {
|
||||
set_config('system','directory', dirname(get_config('system','directory_submit_url')));
|
||||
del_config('system','directory_submit_url');
|
||||
|
|
@ -858,12 +869,12 @@ function admin_page_site(App $a) {
|
|||
$theme_choices_mobile = array();
|
||||
$theme_choices_mobile["---"] = t("No special theme for mobile devices");
|
||||
$files = glob('view/theme/*');
|
||||
if($files) {
|
||||
if ($files) {
|
||||
|
||||
$allowed_theme_list = Config::get('system', 'allowed_themes');
|
||||
|
||||
foreach($files as $file) {
|
||||
if(intval(file_exists($file.'/unsupported')))
|
||||
foreach ($files as $file) {
|
||||
if (intval(file_exists($file.'/unsupported')))
|
||||
continue;
|
||||
|
||||
$f = basename($file);
|
||||
|
|
@ -875,7 +886,7 @@ function admin_page_site(App $a) {
|
|||
|
||||
$theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
||||
|
||||
if(file_exists($file.'/mobile')) {
|
||||
if (file_exists($file.'/mobile')) {
|
||||
$theme_choices_mobile[$f] = $theme_name;
|
||||
} else {
|
||||
$theme_choices[$f] = $theme_name;
|
||||
|
|
@ -924,8 +935,9 @@ function admin_page_site(App $a) {
|
|||
|
||||
/* Banner */
|
||||
$banner = get_config('system','banner');
|
||||
if($banner == false)
|
||||
if ($banner == false) {
|
||||
$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
|
||||
}
|
||||
$banner = htmlspecialchars($banner);
|
||||
$info = get_config('config','info');
|
||||
$info = htmlspecialchars($info);
|
||||
|
|
@ -950,9 +962,9 @@ function admin_page_site(App $a) {
|
|||
SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
|
||||
);
|
||||
|
||||
if($a->config['hostname'] == "")
|
||||
if ($a->config['hostname'] == "") {
|
||||
$a->config['hostname'] = $a->get_hostname();
|
||||
|
||||
}
|
||||
$diaspora_able = ($a->get_path() == "");
|
||||
|
||||
$optimize_max_tablesize = Config::get('system','optimize_max_tablesize', 100);
|
||||
|
|
@ -1091,42 +1103,45 @@ function admin_page_dbsync(App $a) {
|
|||
|
||||
$o = '';
|
||||
|
||||
if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
|
||||
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
|
||||
set_config('database', 'update_'.intval($a->argv[3]), 'success');
|
||||
$curr = get_config('system','build');
|
||||
if(intval($curr) == intval($a->argv[3]))
|
||||
if (intval($curr) == intval($a->argv[3])) {
|
||||
set_config('system','build',intval($curr) + 1);
|
||||
}
|
||||
info(t('Update has been marked successful').EOL);
|
||||
goaway('admin/dbsync');
|
||||
}
|
||||
|
||||
if(($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
|
||||
if (($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
|
||||
require_once("include/dbstructure.php");
|
||||
$retval = update_structure(false, true);
|
||||
if(!$retval) {
|
||||
if (!$retval) {
|
||||
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
|
||||
set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
|
||||
} else
|
||||
} else {
|
||||
$o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
|
||||
DB_UPDATE_VERSION, $retval)."<br />";
|
||||
if($a->argv[2] === 'check')
|
||||
}
|
||||
if ($a->argv[2] === 'check') {
|
||||
return $o;
|
||||
}
|
||||
}
|
||||
|
||||
if($a->argc > 2 && intval($a->argv[2])) {
|
||||
if ($a->argc > 2 && intval($a->argv[2])) {
|
||||
require_once('update.php');
|
||||
$func = 'update_'.intval($a->argv[2]);
|
||||
if(function_exists($func)) {
|
||||
if (function_exists($func)) {
|
||||
$retval = $func();
|
||||
if($retval === UPDATE_FAILED) {
|
||||
if ($retval === UPDATE_FAILED) {
|
||||
$o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
|
||||
}
|
||||
elseif($retval === UPDATE_SUCCESS) {
|
||||
elseif ($retval === UPDATE_SUCCESS) {
|
||||
$o .= sprintf(t('Update %s was successfully applied.', $func));
|
||||
set_config('database',$func, 'success');
|
||||
}
|
||||
else
|
||||
} else {
|
||||
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
|
||||
}
|
||||
} else {
|
||||
$o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
|
||||
set_config('database',$func, 'success');
|
||||
|
|
@ -1139,8 +1154,9 @@ function admin_page_dbsync(App $a) {
|
|||
if (dbm::is_result($r)) {
|
||||
foreach ($r as $rr) {
|
||||
$upd = intval(substr($rr['k'],7));
|
||||
if($upd < 1139 || $rr['v'] === 'success')
|
||||
if ($upd < 1139 || $rr['v'] === 'success') {
|
||||
continue;
|
||||
}
|
||||
$failed[] = $upd;
|
||||
}
|
||||
}
|
||||
|
|
@ -1180,7 +1196,7 @@ function admin_page_users_post(App $a) {
|
|||
|
||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
|
||||
|
||||
if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
|
||||
if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) {
|
||||
require_once('include/user.php');
|
||||
|
||||
$result = create_user(array('username'=>$nu_name, 'email'=>$nu_email,
|
||||
|
|
@ -1231,31 +1247,31 @@ function admin_page_users_post(App $a) {
|
|||
|
||||
}
|
||||
|
||||
if(x($_POST,'page_users_block')) {
|
||||
foreach($users as $uid){
|
||||
if (x($_POST,'page_users_block')) {
|
||||
foreach ($users as $uid) {
|
||||
q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s",
|
||||
intval($uid)
|
||||
);
|
||||
}
|
||||
notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
|
||||
}
|
||||
if(x($_POST,'page_users_delete')) {
|
||||
if (x($_POST,'page_users_delete')) {
|
||||
require_once("include/Contact.php");
|
||||
foreach($users as $uid){
|
||||
foreach ($users as $uid) {
|
||||
user_remove($uid);
|
||||
}
|
||||
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
|
||||
}
|
||||
|
||||
if(x($_POST,'page_users_approve')) {
|
||||
if (x($_POST,'page_users_approve')) {
|
||||
require_once("mod/regmod.php");
|
||||
foreach($pending as $hash){
|
||||
foreach ($pending as $hash) {
|
||||
user_allow($hash);
|
||||
}
|
||||
}
|
||||
if(x($_POST,'page_users_deny')) {
|
||||
if (x($_POST,'page_users_deny')) {
|
||||
require_once("mod/regmod.php");
|
||||
foreach($pending as $hash){
|
||||
foreach ($pending as $hash) {
|
||||
user_deny($hash);
|
||||
}
|
||||
}
|
||||
|
|
@ -1276,31 +1292,31 @@ function admin_page_users_post(App $a) {
|
|||
* @return string
|
||||
*/
|
||||
function admin_page_users(App $a) {
|
||||
if($a->argc>2) {
|
||||
if ($a->argc>2) {
|
||||
$uid = $a->argv[3];
|
||||
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
|
||||
if(count($user)==0) {
|
||||
if (count($user) == 0) {
|
||||
notice('User not found'.EOL);
|
||||
goaway('admin/users');
|
||||
return ''; // NOTREACHED
|
||||
}
|
||||
switch($a->argv[2]){
|
||||
case "delete":{
|
||||
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":{
|
||||
break;
|
||||
case "block":
|
||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
|
||||
q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
|
||||
intval(1-$user[0]['blocked']),
|
||||
intval($uid)
|
||||
);
|
||||
notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
|
||||
}; break;
|
||||
break;
|
||||
}
|
||||
goaway('admin/users');
|
||||
return ''; // NOTREACHED
|
||||
|
|
@ -1316,7 +1332,7 @@ function admin_page_users(App $a) {
|
|||
|
||||
/* get users */
|
||||
$total = qu("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
|
||||
if(count($total)) {
|
||||
if (count($total)) {
|
||||
$a->set_pager_total($total[0]['total']);
|
||||
$a->set_pager_itemspage(100);
|
||||
}
|
||||
|
|
@ -1333,22 +1349,22 @@ function admin_page_users(App $a) {
|
|||
|
||||
$order = "contact.name";
|
||||
$order_direction = "+";
|
||||
if (x($_GET,'o')){
|
||||
if (x($_GET,'o')) {
|
||||
$new_order = $_GET['o'];
|
||||
if ($new_order[0]==="-") {
|
||||
if ($new_order[0] === "-") {
|
||||
$order_direction = "-";
|
||||
$new_order = substr($new_order,1);
|
||||
}
|
||||
|
||||
if (in_array($new_order, $valid_orders)){
|
||||
if (in_array($new_order, $valid_orders)) {
|
||||
$order = $new_order;
|
||||
}
|
||||
if (x($_GET,'d')){
|
||||
if (x($_GET,'d')) {
|
||||
$new_direction = $_GET['d'];
|
||||
}
|
||||
}
|
||||
$sql_order = "`".str_replace('.','`.`',$order)."`";
|
||||
$sql_order_direction = ($order_direction==="+")?"ASC":"DESC";
|
||||
$sql_order_direction = ($order_direction === "+")?"ASC":"DESC";
|
||||
|
||||
$users = qu("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
|
||||
FROM `user`
|
||||
|
|
@ -1362,7 +1378,7 @@ function admin_page_users(App $a) {
|
|||
//echo "<pre>$users"; killme();
|
||||
|
||||
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
||||
$_setup_users = function ($e) use ($adminlist){
|
||||
$_setup_users = function ($e) use ($adminlist) {
|
||||
$accounts = array(
|
||||
t('Normal Account'),
|
||||
t('Soapbox Account'),
|
||||
|
|
@ -1388,22 +1404,21 @@ function admin_page_users(App $a) {
|
|||
$tmp_users = array();
|
||||
$deleted = array();
|
||||
|
||||
while(count($users)) {
|
||||
while (count($users)) {
|
||||
$new_user = array();
|
||||
foreach(array_pop($users) as $k => $v) {
|
||||
foreach (array_pop($users) as $k => $v) {
|
||||
$k = str_replace('-','_',$k);
|
||||
$new_user[$k] = $v;
|
||||
}
|
||||
if($new_user['deleted']) {
|
||||
if ($new_user['deleted']) {
|
||||
array_push($deleted, $new_user);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
array_push($tmp_users, $new_user);
|
||||
}
|
||||
}
|
||||
//Reversing the two array, and moving $tmp_users to $users
|
||||
array_reverse($deleted);
|
||||
while(count($tmp_users)) {
|
||||
while (count($tmp_users)) {
|
||||
array_push($users, array_pop($tmp_users));
|
||||
}
|
||||
|
||||
|
|
@ -1480,19 +1495,19 @@ function admin_page_plugins(App $a) {
|
|||
/*
|
||||
* Single plugin
|
||||
*/
|
||||
if($a->argc == 3) {
|
||||
if ($a->argc == 3) {
|
||||
$plugin = $a->argv[2];
|
||||
if(!is_file("addon/$plugin/$plugin.php")) {
|
||||
if (!is_file("addon/$plugin/$plugin.php")) {
|
||||
notice(t("Item not found."));
|
||||
return '';
|
||||
}
|
||||
|
||||
if(x($_GET,"a") && $_GET['a']=="t") {
|
||||
if (x($_GET,"a") && $_GET['a']=="t") {
|
||||
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
|
||||
|
||||
// Toggle plugin status
|
||||
$idx = array_search($plugin, $a->plugins);
|
||||
if($idx !== false) {
|
||||
if ($idx !== false) {
|
||||
unset($a->plugins[$idx]);
|
||||
uninstall_plugin($plugin);
|
||||
info(sprintf(t("Plugin %s disabled."), $plugin));
|
||||
|
|
@ -1509,22 +1524,22 @@ function admin_page_plugins(App $a) {
|
|||
// display plugin details
|
||||
require_once('library/markdown.php');
|
||||
|
||||
if(in_array($plugin, $a->plugins)) {
|
||||
if (in_array($plugin, $a->plugins)) {
|
||||
$status="on"; $action= t("Disable");
|
||||
} else {
|
||||
$status="off"; $action= t("Enable");
|
||||
}
|
||||
|
||||
$readme=Null;
|
||||
if(is_file("addon/$plugin/README.md")) {
|
||||
if (is_file("addon/$plugin/README.md")) {
|
||||
$readme = file_get_contents("addon/$plugin/README.md");
|
||||
$readme = Markdown($readme);
|
||||
} elseif(is_file("addon/$plugin/README")) {
|
||||
} elseif (is_file("addon/$plugin/README")) {
|
||||
$readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
|
||||
}
|
||||
|
||||
$admin_form="";
|
||||
if(is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
|
||||
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
|
||||
@require_once("addon/$plugin/$plugin.php");
|
||||
$func = $plugin.'_plugin_admin';
|
||||
$func($a, $admin_form);
|
||||
|
|
@ -1616,8 +1631,8 @@ function admin_page_plugins(App $a) {
|
|||
*/
|
||||
function toggle_theme(&$themes,$th,&$result) {
|
||||
for($x = 0; $x < count($themes); $x ++) {
|
||||
if($themes[$x]['name'] === $th) {
|
||||
if($themes[$x]['allowed']) {
|
||||
if ($themes[$x]['name'] === $th) {
|
||||
if ($themes[$x]['allowed']) {
|
||||
$themes[$x]['allowed'] = 0;
|
||||
$result = 0;
|
||||
}
|
||||
|
|
@ -1636,8 +1651,8 @@ function toggle_theme(&$themes,$th,&$result) {
|
|||
*/
|
||||
function theme_status($themes,$th) {
|
||||
for($x = 0; $x < count($themes); $x ++) {
|
||||
if($themes[$x]['name'] === $th) {
|
||||
if($themes[$x]['allowed']) {
|
||||
if ($themes[$x]['name'] === $th) {
|
||||
if ($themes[$x]['allowed']) {
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
|
|
@ -1655,11 +1670,12 @@ function theme_status($themes,$th) {
|
|||
*/
|
||||
function rebuild_theme_table($themes) {
|
||||
$o = '';
|
||||
if(count($themes)) {
|
||||
foreach($themes as $th) {
|
||||
if($th['allowed']) {
|
||||
if(strlen($o))
|
||||
if (count($themes)) {
|
||||
foreach ($themes as $th) {
|
||||
if ($th['allowed']) {
|
||||
if (strlen($o)) {
|
||||
$o .= ',';
|
||||
}
|
||||
$o .= $th['name'];
|
||||
}
|
||||
}
|
||||
|
|
@ -1689,15 +1705,18 @@ function admin_page_themes(App $a) {
|
|||
$allowed_themes_str = get_config('system','allowed_themes');
|
||||
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
||||
$allowed_themes = array();
|
||||
if(count($allowed_themes_raw))
|
||||
foreach($allowed_themes_raw as $x)
|
||||
if(strlen(trim($x)))
|
||||
if (count($allowed_themes_raw)) {
|
||||
foreach ($allowed_themes_raw as $x) {
|
||||
if (strlen(trim($x))) {
|
||||
$allowed_themes[] = trim($x);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$themes = array();
|
||||
$files = glob('view/theme/*');
|
||||
if($files) {
|
||||
foreach($files as $file) {
|
||||
if ($files) {
|
||||
foreach ($files as $file) {
|
||||
$f = basename($file);
|
||||
|
||||
// Is there a style file?
|
||||
|
|
@ -1712,12 +1731,13 @@ function admin_page_themes(App $a) {
|
|||
$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"))
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(! count($themes)) {
|
||||
if (! count($themes)) {
|
||||
notice(t('No themes found.'));
|
||||
return '';
|
||||
}
|
||||
|
|
@ -1726,25 +1746,24 @@ function admin_page_themes(App $a) {
|
|||
* Single theme
|
||||
*/
|
||||
|
||||
if($a->argc == 3) {
|
||||
if ($a->argc == 3) {
|
||||
$theme = $a->argv[2];
|
||||
if(! is_dir("view/theme/$theme")) {
|
||||
if (! is_dir("view/theme/$theme")) {
|
||||
notice(t("Item not found."));
|
||||
return '';
|
||||
}
|
||||
|
||||
if(x($_GET,"a") && $_GET['a']=="t") {
|
||||
if (x($_GET,"a") && $_GET['a']=="t") {
|
||||
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
|
||||
|
||||
// Toggle theme status
|
||||
|
||||
toggle_theme($themes,$theme,$result);
|
||||
$s = rebuild_theme_table($themes);
|
||||
if($result) {
|
||||
if ($result) {
|
||||
install_theme($theme);
|
||||
info(sprintf('Theme %s enabled.',$theme));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
uninstall_theme($theme);
|
||||
info(sprintf('Theme %s disabled.',$theme));
|
||||
}
|
||||
|
|
@ -1757,22 +1776,22 @@ function admin_page_themes(App $a) {
|
|||
// display theme details
|
||||
require_once('library/markdown.php');
|
||||
|
||||
if(theme_status($themes,$theme)) {
|
||||
if (theme_status($themes,$theme)) {
|
||||
$status="on"; $action= t("Disable");
|
||||
} else {
|
||||
$status="off"; $action= t("Enable");
|
||||
}
|
||||
|
||||
$readme=Null;
|
||||
if(is_file("view/theme/$theme/README.md")) {
|
||||
$readme = Null;
|
||||
if (is_file("view/theme/$theme/README.md")) {
|
||||
$readme = file_get_contents("view/theme/$theme/README.md");
|
||||
$readme = Markdown($readme);
|
||||
} elseif(is_file("view/theme/$theme/README")) {
|
||||
} elseif (is_file("view/theme/$theme/README")) {
|
||||
$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
|
||||
}
|
||||
|
||||
$admin_form="";
|
||||
if(is_file("view/theme/$theme/config.php")) {
|
||||
$admin_form = "";
|
||||
if (is_file("view/theme/$theme/config.php")) {
|
||||
function __get_theme_admin_form(App $a, $theme) {
|
||||
$orig_theme = $a->theme;
|
||||
$orig_page = $a->page;
|
||||
|
|
@ -1783,8 +1802,10 @@ function admin_page_themes(App $a) {
|
|||
|
||||
|
||||
$init = $theme."_init";
|
||||
if(function_exists($init)) $init($a);
|
||||
if(function_exists("theme_admin")) {
|
||||
if (function_exists($init)) {
|
||||
$init($a);
|
||||
}
|
||||
if (function_exists("theme_admin")) {
|
||||
$admin_form = theme_admin($a);
|
||||
}
|
||||
|
||||
|
|
@ -1797,9 +1818,9 @@ function admin_page_themes(App $a) {
|
|||
}
|
||||
|
||||
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
|
||||
if(! stristr($screenshot[0],$theme))
|
||||
if (! stristr($screenshot[0],$theme)) {
|
||||
$screenshot = null;
|
||||
|
||||
}
|
||||
|
||||
$t = get_markup_template("admin_plugins_details.tpl");
|
||||
return replace_macros($t, array(
|
||||
|
|
@ -1845,7 +1866,7 @@ function admin_page_themes(App $a) {
|
|||
|
||||
$xthemes = array();
|
||||
if ($themes) {
|
||||
foreach($themes as $th) {
|
||||
foreach ($themes as $th) {
|
||||
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
||||
}
|
||||
}
|
||||
|
|
@ -1970,25 +1991,25 @@ function admin_page_viewlogs(App $a) {
|
|||
$f = get_config('system','logfile');
|
||||
$data = '';
|
||||
|
||||
if(!file_exists($f)) {
|
||||
if (!file_exists($f)) {
|
||||
$data = t("Error trying to open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f exist and is readable.");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$fp = fopen($f, 'r');
|
||||
if(!$fp) {
|
||||
if (!$fp) {
|
||||
$data = t("Couldn't open <strong>$f</strong> log file.\r\n<br/>Check to see if file $f is readable.");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$fstat = fstat($fp);
|
||||
$size = $fstat['size'];
|
||||
if($size != 0) {
|
||||
if($size > 5000000 || $size < 0)
|
||||
if ($size != 0) {
|
||||
if ($size > 5000000 || $size < 0) {
|
||||
$size = 5000000;
|
||||
}
|
||||
$seek = fseek($fp,0-$size,SEEK_END);
|
||||
if($seek === 0) {
|
||||
if ($seek === 0) {
|
||||
$data = escape_tags(fread($fp,$size));
|
||||
while(! feof($fp))
|
||||
while (! feof($fp)) {
|
||||
$data .= escape_tags(fread($fp,4096));
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose($fp);
|
||||
|
|
@ -2016,22 +2037,24 @@ function admin_page_features_post(App $a) {
|
|||
$arr = array();
|
||||
$features = get_features(false);
|
||||
|
||||
foreach($features as $fname => $fdata) {
|
||||
foreach(array_slice($fdata,1) as $f) {
|
||||
foreach ($features as $fname => $fdata) {
|
||||
foreach (array_slice($fdata,1) as $f) {
|
||||
$feature = $f[0];
|
||||
$feature_state = 'feature_'.$feature;
|
||||
$featurelock = 'featurelock_'.$feature;
|
||||
|
||||
if(x($_POST[$feature_state]))
|
||||
if (x($_POST[$feature_state])) {
|
||||
$val = intval($_POST['feature_'.$feature]);
|
||||
else
|
||||
} else {
|
||||
$val = 0;
|
||||
}
|
||||
set_config('feature',$feature,$val);
|
||||
|
||||
if(x($_POST[$featurelock]))
|
||||
if (x($_POST[$featurelock])) {
|
||||
set_config('feature_lock',$feature,$val);
|
||||
else
|
||||
} else {
|
||||
del_config('feature_lock',$feature);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2055,18 +2078,19 @@ function admin_page_features_post(App $a) {
|
|||
*/
|
||||
function admin_page_features(App $a) {
|
||||
|
||||
if((argc() > 1) && (argv(1) === 'features')) {
|
||||
if ((argc() > 1) && (argv(1) === 'features')) {
|
||||
$arr = array();
|
||||
$features = get_features(false);
|
||||
|
||||
foreach($features as $fname => $fdata) {
|
||||
foreach ($features as $fname => $fdata) {
|
||||
$arr[$fname] = array();
|
||||
$arr[$fname][0] = $fdata[0];
|
||||
foreach(array_slice($fdata,1) as $f) {
|
||||
foreach (array_slice($fdata,1) as $f) {
|
||||
|
||||
$set = get_config('feature',$f[0]);
|
||||
if($set === false)
|
||||
if ($set === false) {
|
||||
$set = $f[3];
|
||||
}
|
||||
$arr[$fname][1][] = array(
|
||||
array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
|
||||
array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
|
||||
|
|
|
|||
Loading…
Reference in a new issue