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

missing function

Browse Source
This commit is contained in:
redmatrix 2016-02-24 11:20:46 -08:00
parent d074c53889
commit b101a8f6fb
6 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Web/Router.php
View File

@ -196,5 +196,4 @@ class Router {
} }
} }
} }
} }

2
include/items.php
View File

@ -4132,7 +4132,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n"; $o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
} }
if(activity_compare($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_compare($item['verb'],ACTIVITY_POST)) { if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) {
$obj = ((is_array($item['obj'])) ? $item['object'] : json_decode($item['object'],true)); $obj = ((is_array($item['obj'])) ? $item['object'] : json_decode($item['object'],true));
$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n"; $o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";

23
include/session.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file include/session.php * @file include/session.php
* *
@ -14,8 +15,8 @@ $session_expire = 180000;
function new_cookie($time) { function new_cookie($time) {
$old_sid = session_id(); $old_sid = session_id();
// ??? This shouldn't have any effect if called after session_start() // ??? This shouldn't have any effect if called after session_start()
// We probably need to set the session expiration and change the PHPSESSID cookie. // We probably need to set the session expiration and change the PHPSESSID cookie.
session_set_cookie_params($time); session_set_cookie_params($time);
session_regenerate_id(false); session_regenerate_id(false);
@ -108,8 +109,9 @@ ini_set('session.use_only_cookies', 1);
ini_set('session.cookie_httponly', 1); ini_set('session.cookie_httponly', 1);
/* /*
* PHP function which sets our user-level session storage functions. * Set our session storage functions.
*/ */
session_set_save_handler( session_set_save_handler(
'ref_session_open', 'ref_session_open',
'ref_session_close', 'ref_session_close',
@ -117,4 +119,17 @@ session_set_save_handler(
'ref_session_write', 'ref_session_write',
'ref_session_destroy', 'ref_session_destroy',
'ref_session_gc' 'ref_session_gc'
); );
// Force cookies to be secure (https only) if this site is SSL enabled. Must be done before session_start().
if(intval($a->config['system']['ssl_cookie_protection'])) {
$arr = session_get_cookie_params();
session_set_cookie_params(
((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
((isset($arr['path'])) ? $arr['path'] : '/'),
((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()),
((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
((isset($arr['httponly'])) ? $arr['httponly'] : true));
}

20
index.php
View File

@ -61,25 +61,11 @@ if(! $a->install) {
load_hooks(); load_hooks();
call_hooks('init_1'); call_hooks('init_1');
$a->language = get_best_language(); }
load_translation_table($a->language);
// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
if(intval($a->config['system']['ssl_cookie_protection'])) {
$arr = session_get_cookie_params();
session_set_cookie_params(
((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
((isset($arr['path'])) ? $arr['path'] : '/'),
((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()),
((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
((isset($arr['httponly'])) ? $arr['httponly'] : true));
}
}
else {
// load translations but do not check plugins as we have no database
$a->language = get_best_language(); $a->language = get_best_language();
load_translation_table($a->language,true); load_translation_table($a->language,$a->install);
}
/** /**

2
mod/webpages.php
View File

@ -128,6 +128,8 @@ function webpages_content(&$a) {
// Get a list of webpages. We can't display all them because endless scroll makes that unusable, // Get a list of webpages. We can't display all them because endless scroll makes that unusable,
// so just list titles and an edit link. // so just list titles and an edit link.
/** @TODO - this should be replaced with pagelist_widget */ /** @TODO - this should be replaced with pagelist_widget */
$sql_extra = item_permissions_sql($owner); $sql_extra = item_permissions_sql($owner);

2
version.inc
View File

@ -1 +1 @@
2016-02-23.1316H 2016-02-24.1317H