Browse Source

Merge branch 'rewrites/app_get_baseurl_static' into develop

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
pull/3043/head
Roland Häder 4 years ago
parent
commit
20e71d21a6
11 changed files with 44 additions and 40 deletions
  1. +1
    -1
      include/Core/Config.php
  2. +1
    -1
      include/Core/PConfig.php
  3. +9
    -6
      include/diaspora.php
  4. +0
    -1
      mod/crepair.php
  5. +2
    -2
      mod/dfrn_confirm.php
  6. +0
    -1
      mod/install.php
  7. +6
    -5
      mod/network.php
  8. +2
    -2
      mod/suggest.php
  9. +2
    -1
      mod/videos.php
  10. +0
    -1
      view/theme/duepuntozero/config.php
  11. +21
    -19
      view/theme/quattro/config.php

+ 1
- 1
include/Core/Config.php View File

@ -97,7 +97,7 @@ class Config {
dbesc($family),
dbesc($key)
);
if (dbm::is_result($ret)) {
if (count($ret)) {
// manage array value
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
$a->config[$family][$key] = $val;


+ 1
- 1
include/Core/PConfig.php View File

@ -92,7 +92,7 @@ class PConfig {
dbesc($key)
);
if (dbm::is_result($ret)) {
if (count($ret)) {
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
$a->config[$uid][$family][$key] = $val;


+ 9
- 6
include/diaspora.php View File

@ -1906,20 +1906,23 @@ class Diaspora {
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
if (!$author || !$recipient)
if (!$author || !$recipient) {
return false;
}
// the current protocol version doesn't know these fields
// That means that we will assume their existance
if (isset($data->following))
if (isset($data->following)) {
$following = (unxmlify($data->following) == "true");
else
} else {
$following = true;
}
if (isset($data->sharing))
if (isset($data->sharing)) {
$sharing = (unxmlify($data->sharing) == "true");
else
} else {
$sharing = true;
}
$contact = self::contact_by_handle($importer["uid"],$author);
@ -1937,7 +1940,7 @@ class Diaspora {
// Normally we needn't to do so, but the first message could have been vanished.
if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if($u) {
if ($u) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
$ret = self::send_share($u[0], $contact);
}


+ 0
- 1
mod/crepair.php View File

@ -30,7 +30,6 @@ function crepair_init(App &$a) {
}
}
function crepair_post(App &$a) {
if (! local_user()) {
return;


+ 2
- 2
mod/dfrn_confirm.php View File

@ -588,7 +588,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($decrypted_source_url),
intval($local_uid)
);
if(! dbm::is_result($ret)) {
if(! count($ret)) {
if(strstr($decrypted_source_url,'http:'))
$newurl = str_replace('http:','https:',$decrypted_source_url);
else
@ -598,7 +598,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($newurl),
intval($local_uid)
);
if(! dbm::is_result($ret)) {
if(! count($ret)) {
// this is either a bogus confirmation (?) or we deleted the original introduction.
$message = t('Contact record was not found for you on our site.');
xml_status(3,$message);


+ 0
- 1
mod/install.php View File

@ -565,7 +565,6 @@ function check_imagik(&$checks) {
}
}
function manual_config(App &$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');


+ 6
- 5
mod/network.php View File

@ -6,12 +6,13 @@ function network_init(App &$a) {
}
$is_a_date_query = false;
if(x($_GET['cid']) && intval($_GET['cid']) != 0)
if (x($_GET['cid']) && intval($_GET['cid']) != 0) {
$cid = $_GET['cid'];
}
if($a->argc > 1) {
for($x = 1; $x < $a->argc; $x ++) {
if(is_a_date_arg($a->argv[$x])) {
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
if (is_a_date_arg($a->argv[$x])) {
$is_a_date_query = true;
break;
}
@ -26,7 +27,7 @@ function network_init(App &$a) {
// fetch last used network view and redirect if needed
if(! $is_a_date_query) {
if (! $is_a_date_query) {
$sel_tabs = network_query_get_sel_tab($a);
$sel_nets = network_query_get_sel_net();
$sel_groups = network_query_get_sel_group($a);


+ 2
- 2
mod/suggest.php View File

@ -16,8 +16,8 @@ function suggest_init(App &$a) {
// so add any arguments as hidden inputs
$query = explode_querystring($a->query_string);
$inputs = array();
foreach($query['args'] as $arg) {
if(strpos($arg, 'confirm=') === false) {
foreach ($query['args'] as $arg) {
if (strpos($arg, 'confirm=') === false) {
$arg_parts = explode('=', $arg);
$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
}


+ 2
- 1
mod/videos.php View File

@ -167,8 +167,9 @@ function videos_post(App &$a) {
$url = App::get_baseurl();
$drop_id = intval($i[0]['id']);
if($i[0]['visible'])
if ($i[0]['visible']) {
proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
}
}
}


+ 0
- 1
view/theme/duepuntozero/config.php View File

@ -4,7 +4,6 @@
*/
function theme_content(App &$a){
if (!local_user()) {
return;


+ 21
- 19
view/theme/quattro/config.php View File

@ -3,8 +3,6 @@
* Theme settings
*/
function theme_content(App &$a){
if (!local_user()) {
return;
@ -35,8 +33,8 @@ function theme_post(App &$a){
function theme_admin(App &$a){
$align = get_config('quattro', 'align' );
$color = get_config('quattro', 'color' );
$tfs = get_config("quattro","tfs");
$pfs = get_config("quattro","pfs");
$tfs = get_config("quattro","tfs");
$pfs = get_config("quattro","pfs");
return quattro_form($a,$align, $color, $tfs, $pfs);
}
@ -45,31 +43,35 @@ function theme_admin_post(App &$a){
if (isset($_POST['quattro-settings-submit'])){
set_config('quattro', 'align', $_POST['quattro_align']);
set_config('quattro', 'color', $_POST['quattro_color']);
set_config('quattro', 'tfs', $_POST['quattro_tfs']);
set_config('quattro', 'tfs', $_POST['quattro_tfs']);
set_config('quattro', 'pfs', $_POST['quattro_pfs']);
}
}
/// @TODO $a is no longer used here
function quattro_form(&$a, $align, $color, $tfs, $pfs){
function quattro_form(App &$a, $align, $color, $tfs, $pfs){
$colors = array(
"dark"=>"Quattro",
"lilac"=>"Lilac",
"green"=>"Green"
"dark" => "Quattro",
"lilac" => "Lilac",
"green" => "Green",
);
if ($tfs===false) $tfs="20";
if ($pfs===false) $pfs="12";
if ($tfs === false) {
$tfs = "20";
}
if ($pfs === false) {
$pfs = "12";
}
$t = get_markup_template("theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$submit' => t('Submit'),
'$baseurl' => App::get_baseurl(),
'$title' => t("Theme settings"),
'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
'$pfs' => array('quattro_pfs', t('Posts font size'), $pfs),
'$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs),
'$title' => t("Theme settings"),
'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
'$pfs' => array('quattro_pfs', t('Posts font size'), $pfs),
'$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs),
));
return $o;
}

Loading…
Cancel
Save