harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slow progress on sys publishing, making sure all the data we need is in the places we need it but validate it anyway

Browse Source
This commit is contained in:
friendica 2014-11-11 19:29:30 -08:00
parent 37742be6af
commit b5af667985
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -677,8 +677,8 @@ class App {
public $css_sources = array(); public $css_sources = array();
public $js_sources = array(); public $js_sources = array();
public $theme_info = array(); public $theme_info = array();
public $is_sys = false;
public $nav_sel; public $nav_sel;
public $category; public $category;

2
include/text.php
View File

@ -2024,7 +2024,7 @@ function design_tools() {
$channel = get_app()->get_channel(); $channel = get_app()->get_channel();
if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] == 1 && is_site_admin()) { if(get_app()->is_sys && is_site_admin()) {
require_once('include/identity.php'); require_once('include/identity.php');
$channel = get_sys_channel(); $channel = get_sys_channel();
} }

2
include/widgets.php
View File

@ -585,7 +585,7 @@ function widget_design_tools($arr) {
// otherwise local_user() is sufficient for permissions. // otherwise local_user() is sufficient for permissions.
if($a->profile['profile_uid']) if($a->profile['profile_uid'])
if($a->profile['profile_uid'] != local_user()) if(($a->profile['profile_uid'] != local_user()) && (! $a->is_sys))
return ''; return '';
if(! local_user()) if(! local_user())

27
mod/webpages.php
View File

@ -1,16 +1,33 @@
<?php <?php
function webpages_content(&$a) { function webpages_init(&$a) {
if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) {
require_once('include/identity.php');
$sys = get_sys_channel();
if($sys && intval($sys['channel_id'])) {
$a->is_sys = true;
}
}
if(argc() > 1) if(argc() > 1)
$which = argv(1); $which = argv(1);
else { else
return;
profile_load($a,$which,$profile);
}
function webpages_content(&$a) {
if(! $a->profile) {
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;
} }
$uid = 0; $uid = 0;
$owner = 0; $owner = 0;
$channel = null; $channel = null;
@ -19,7 +36,7 @@ function webpages_content(&$a) {
$profile = 0; $profile = 0;
$channel = $a->get_channel(); $channel = $a->get_channel();
if($which === 'sys' && is_site_admin()) { if($a->is_sys && is_site_admin()) {
require_once('include/identity.php'); require_once('include/identity.php');
$sys = get_sys_channel(); $sys = get_sys_channel();
if($sys && intval($sys['channel_id'])) { if($sys && intval($sys['channel_id'])) {
@ -29,8 +46,6 @@ function webpages_content(&$a) {
} }
} }
profile_load($a,$which,$profile);
if(! $owner) { if(! $owner) {
// Figure out who the page owner is. // Figure out who the page owner is.
$r = q("select channel_id from channel where channel_address = '%s'", $r = q("select channel_id from channel where channel_address = '%s'",