keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Review changes

Browse source 
Replacements for ::delete() as well as changes to include use statements.
This commit is contained in:
Adam Magness 2017-11-07 09:12:01 -05:00
parent 1a83b80dbd
commit b995e858e6
6 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/oauth.php
View file

@ -116,7 +116,7 @@ class FKOAuthDataStore extends OAuthDataStore {
if (!is_null($ret) && $uverifier!==false){ if (!is_null($ret) && $uverifier!==false){
del_config("oauth", $verifier); Config::delele("oauth", $verifier);
/* $apps = PConfig::get($uverifier, "oauth", "apps"); /* $apps = PConfig::get($uverifier, "oauth", "apps");
if ($apps===false) $apps=array(); if ($apps===false) $apps=array();
$apps[] = $consumer->key; $apps[] = $consumer->key;

10
mod/admin.php
View file

@ -944,7 +944,7 @@ function admin_page_site_post(App $a) {
} }
if ($info == "") { if ($info == "") {
del_config('config','info'); Config::delete('config','info');
} else { } else {
Config::set('config','info',$info); Config::set('config','info',$info);
} }
@ -952,12 +952,12 @@ function admin_page_site_post(App $a) {
Config::set('system','theme', $theme); Config::set('system','theme', $theme);
if ($theme_mobile == '---') { if ($theme_mobile == '---') {
del_config('system','mobile-theme'); Config::delete('system','mobile-theme');
} else { } else {
Config::set('system','mobile-theme', $theme_mobile); Config::set('system','mobile-theme', $theme_mobile);
} }
if ($singleuser == '---') { if ($singleuser == '---') {
del_config('system','singleuser'); Config::delete('system','singleuser');
} else { } else {
Config::set('system','singleuser', $singleuser); Config::set('system','singleuser', $singleuser);
} }
@ -1048,7 +1048,7 @@ function admin_page_site(App $a) {
if (strlen(Config::get('system','directory_submit_url')) && if (strlen(Config::get('system','directory_submit_url')) &&
!strlen(Config::get('system','directory'))) { !strlen(Config::get('system','directory'))) {
Config::set('system','directory', dirname(Config::get('system','directory_submit_url'))); Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
del_config('system','directory_submit_url'); Config::delete('system','directory_submit_url');
} }
/* Installed themes */ /* Installed themes */
@ -2239,7 +2239,7 @@ function admin_page_features_post(App $a) {
if (x($_POST, $featurelock)) { if (x($_POST, $featurelock)) {
Config::set('feature_lock', $feature, $val); Config::set('feature_lock', $feature, $val);
} else { } else {
del_config('feature_lock', $feature); Config::delete('feature_lock', $feature);
} }
} }
} }

1
mod/dirfind.php
View file

@ -7,7 +7,6 @@ use Friendica\Core\Worker;
use Friendica\Network\Probe; use Friendica\Network\Probe;
require_once 'include/contact_widgets.php'; require_once 'include/contact_widgets.php';
require_once 'include/probe.php';
require_once 'include/socgraph.php'; require_once 'include/socgraph.php';
require_once 'include/Contact.php'; require_once 'include/Contact.php';
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';

4
mod/ostatus_subscribe.php
View file

@ -53,8 +53,8 @@ function ostatus_subscribe_content(App $a) {
if ($counter >= $total) { if ($counter >= $total) {
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">'; $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
del_pconfig($uid, "ostatus", "legacy_friends"); PConfig::delete($uid, "ostatus", "legacy_friends");
del_pconfig($uid, "ostatus", "legacy_contact"); PConfig::delete($uid, "ostatus", "legacy_contact");
$o .= t("Done"); $o .= t("Done");
return $o; return $o;
} }

8
update.php
View file

@ -1659,7 +1659,7 @@ function update_1188() {
if (strlen(Config::get('system','directory_submit_url')) && if (strlen(Config::get('system','directory_submit_url')) &&
!strlen(Config::get('system','directory'))) { !strlen(Config::get('system','directory'))) {
Config::set('system','directory', dirname(Config::get('system','directory_submit_url'))); Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
del_config('system','directory_submit_url'); Config::delete('system','directory_submit_url');
} }
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
@ -1705,20 +1705,20 @@ function update_1190() {
$value = $rr['v']; $value = $rr['v'];
if ($key === 'randomise') if ($key === 'randomise')
del_pconfig($uid,$family,$key); PConfig::delete($uid,$family,$key);
if ($key === 'show_on_profile') { if ($key === 'show_on_profile') {
if ($value) if ($value)
PConfig::set($uid,feature,forumlist_profile,$value); PConfig::set($uid,feature,forumlist_profile,$value);
del_pconfig($uid,$family,$key); PConfig::delete($uid,$family,$key);
} }
if ($key === 'show_on_network') { if ($key === 'show_on_network') {
if ($value) if ($value)
PConfig::set($uid,feature,forumlist_widget,$value); PConfig::set($uid,feature,forumlist_widget,$value);
del_pconfig($uid,$family,$key); PConfig::delete($uid,$family,$key);
} }
} }
} }

15
view/theme/frio/php/default.php
View file

@ -6,6 +6,9 @@
?> ?>
<!DOCTYPE html > <!DOCTYPE html >
<?php <?php
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
require_once('view/theme/frio/php/frio_boot.php'); require_once('view/theme/frio/php/frio_boot.php');
// $minimal = is_modal(); // $minimal = is_modal();
@ -17,9 +20,9 @@
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>"> <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script> <script type="text/javascript">var baseurl="<?php echo System::baseUrl() ?>";</script>
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script> <script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = Friendica\Core\System::baseUrl(); ?> <?php $baseurl = System::baseUrl(); ?>
<?php $frio = "view/theme/frio"; ?> <?php $frio = "view/theme/frio"; ?>
<?php <?php
// Because we use minimal for modals the header and the included js stuff should be only loaded // Because we use minimal for modals the header and the included js stuff should be only loaded
@ -37,14 +40,14 @@
if (is_null($uid)) { if (is_null($uid)) {
$uid = get_theme_uid(); $uid = get_theme_uid();
} }
$schema = Friendica\Core\PConfig::get($uid, 'frio', 'schema'); $schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) { if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/'.$schema.'.php')) { if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
$schemefile = 'view/theme/frio/schema/'.$schema.'.php'; $schemefile = 'view/theme/frio/schema/'.$schema.'.php';
require_once($schemefile); require_once($schemefile);
} }
} else { } else {
$nav_bg = Friendica\Core\PConfig::get($uid, 'frio', 'nav_bg'); $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
} }
if (!$nav_bg) { if (!$nav_bg) {
$nav_bg = "#708fa0"; $nav_bg = "#708fa0";
@ -66,8 +69,8 @@ else
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a> <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php <?php
if(x($page,'nav') && (!$minimal)){ if(x($page,'nav') && (!$minimal)){
echo str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'), echo str_replace("~config.sitename~",Config::get('config','sitename'),
str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'), str_replace("~system.banner~",Config::get('system','banner'),
$page['nav'] $page['nav']
));}; ));};