Remove unused parameter in can_write_wall()

[friendica.git] / include / session.php

diff --git a/include/session.php b/include/session.php
index f53465501c56d489c8457e85c6a07afb02d8af89..66df498fe076d11d54bf86783d547c5aeaccb5db 100644 (file)
--- a/include/session.php
+++ b/include/session.php
@@ -1,26 +1,28 @@
 <?php
-// Session management functions. These provide database storage of PHP
-// session info.
-
+/**
+ * Session management functions. These provide database storage of PHP session info.
+ */
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
-
-require_once('include/cache.php');
+use Friendica\Database\DBM;
 
 $session_exists = 0;
 $session_expire = 180000;
 
-function ref_session_open($s, $n) {
+function ref_session_open($s, $n)
+{
        return true;
 }
 
-function ref_session_read($id) {
+function ref_session_read($id)
+{
        global $session_exists;
 
        if (!x($id)) {
                return '';
        }
 
-       $memcache = cache::memcache();
+       $memcache = Cache::memcache();
        if (is_object($memcache)) {
                $data = $memcache->get(get_app()->get_hostname().":session:".$id);
                if (!is_bool($data)) {
@@ -32,7 +34,7 @@ function ref_session_read($id) {
        }
 
        $r = dba::select('session', array('data'), array('sid' => $id), array('limit' => 1));
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $session_exists = true;
                return $r['data'];
        } else {
@@ -49,23 +51,28 @@ function ref_session_read($id) {
  * on the case. Uses the $session_expire global for existing session, 5 minutes
  * for newly created session.
  *
- * @global bool $session_exists Whether a session with the given id already exists
- * @global int $session_expire Session expiration delay in seconds
- * @param string $id Session ID with format: [a-z0-9]{26}
- * @param string $data Serialized session data
+ * @global bool   $session_exists Whether a session with the given id already exists
+ * @global int    $session_expire Session expiration delay in seconds
+ * @param  string $id   Session ID with format: [a-z0-9]{26}
+ * @param  string $data Serialized session data
  * @return boolean Returns false if parameters are missing, true otherwise
  */
-function ref_session_write($id, $data) {
+function ref_session_write($id, $data)
+{
        global $session_exists, $session_expire;
 
-       if (!$id || !$data) {
+       if (!$id) {
                return false;
        }
 
+       if (!$data) {
+               return true;
+       }
+
        $expire = time() + $session_expire;
        $default_expire = time() + 300;
 
-       $memcache = cache::memcache();
+       $memcache = Cache::memcache();
        $a = get_app();
        if (is_object($memcache) && is_object($a)) {
                $memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
@@ -84,12 +91,14 @@ function ref_session_write($id, $data) {
        return true;
 }
 
-function ref_session_close() {
+function ref_session_close()
+{
        return true;
 }
 
-function ref_session_destroy($id) {
-       $memcache = cache::memcache();
+function ref_session_destroy($id)
+{
+       $memcache = Cache::memcache();
 
        if (is_object($memcache)) {
                $memcache->delete(get_app()->get_hostname().":session:".$id);
@@ -100,7 +109,8 @@ function ref_session_destroy($id) {
        return true;
 }
 
-function ref_session_gc($expire) {
+function ref_session_gc($expire)
+{
        dba::delete('session', array("`expire` < ?", time()));
        return true;
 }
@@ -116,7 +126,9 @@ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
 }
 
 if (!Config::get('system', 'disable_database_session')) {
-       session_set_save_handler('ref_session_open', 'ref_session_close',
-                               'ref_session_read', 'ref_session_write',
-                               'ref_session_destroy', 'ref_session_gc');
+       session_set_save_handler(
+               'ref_session_open', 'ref_session_close',
+               'ref_session_read', 'ref_session_write',
+               'ref_session_destroy', 'ref_session_gc'
+       );
 }