Replaced $_SESSION['id'] and $_SESSION['guid'] with get_loggedin_userid()

git-svn-id: http://code.elgg.org/elgg/trunk@7143 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/defaultwidgets/views/default/admin/appearance/default_dashboard_widgets.php b/mod/defaultwidgets/views/default/admin/appearance/default_dashboard_widgets.php
index 6efcd5b519d6ca6060d2c705742c25a78037ba33..b6cc010dff7a9bc0998e911ae776c469d9b7fd43 100644 (file)
--- a/mod/defaultwidgets/views/default/admin/appearance/default_dashboard_widgets.php
+++ b/mod/defaultwidgets/views/default/admin/appearance/default_dashboard_widgets.php
@@ -7,7 +7,7 @@
  **/
 
 // Set admin user for user block
-set_page_owner($_SESSION['guid']);
+set_page_owner(get_loggedin_userid());
 
 // create the view
 $time = time();

diff --git a/mod/defaultwidgets/views/default/admin/appearance/default_profile_widgets.php b/mod/defaultwidgets/views/default/admin/appearance/default_profile_widgets.php
index 2abbf02e46ceac97e2084df2a545b21638681087..bb1f3fbe0553949bcc834fa285b140d3c818b686 100644 (file)
--- a/mod/defaultwidgets/views/default/admin/appearance/default_profile_widgets.php
+++ b/mod/defaultwidgets/views/default/admin/appearance/default_profile_widgets.php
@@ -7,7 +7,7 @@
  **/
 
 // set admin user for user block
-set_page_owner($_SESSION['guid']);
+set_page_owner(get_loggedin_userid());
 
 // create the view
 $time = time();

diff --git a/mod/file/search.php b/mod/file/search.php
index 9279129a807800d67f66c2f97e63d6e6ca36c47d..221e340791c20720a6aaea3bbd176609f86ae463 100644 (file)
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -53,7 +53,7 @@
                        if (is_array($owner_guid)) {
                                //$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
                                $area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
-                       } else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != $_SESSION['guid']) {
+                       } else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != get_loggedin_userid()) {
                                //$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),elgg_get_page_owner()->name));
                                $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
                        } else{

diff --git a/mod/file/world.php b/mod/file/world.php
index 2bc24bd66a38e221375f36534aedbed489ca61a5..e35b3c067f4cc3ad749ef524275e6812dc9eb4c8 100644 (file)
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -14,7 +14,7 @@
                $page_owner = elgg_get_page_owner();
                if ($page_owner === false || is_null($page_owner)) {
                        $page_owner = get_loggedin_user();
-                       set_page_owner($_SESSION['guid']);
+                       set_page_owner(get_loggedin_userid());
                }
        
        $title = elgg_echo('file:all');

diff --git a/mod/groups/actions/leave.php b/mod/groups/actions/leave.php
index 58f2655ad08f0f2d84b9746f588bb8dd34437121..220a106cfd6f515d3c9d51492b27dcf949e203e1 100644 (file)
--- a/mod/groups/actions/leave.php
+++ b/mod/groups/actions/leave.php
@@ -24,7 +24,7 @@
        
        if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
        {
-               if ($group->getOwner() != $_SESSION['guid']) {
+               if ($group->getOwner() != get_loggedin_userid()) {
                        if ($group->leave($user))
                                system_message(elgg_echo("groups:left"));
                        else

diff --git a/mod/pages/world.php b/mod/pages/world.php
index 0b411b8b22f564aeee61b6223931a36668ff562c..f00fb3acd84cb4a47f11d119becf56ebb3a64526 100644 (file)
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -13,7 +13,7 @@ global $CONFIG;
 $page_owner = elgg_get_page_owner();
 if ($page_owner === false || is_null($page_owner)) {
        $page_owner = get_loggedin_user();
-       set_page_owner($_SESSION['guid']);
+       set_page_owner(get_loggedin_userid());
 }
 
 if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())){

diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php
index a896a0acef03d1173117dcab045df858f48d74e8..e901442c2c91c1b409d0357f8667e41a958648c8 100755 (executable)
--- a/mod/profile/views/default/profile/admin_menu.php
+++ b/mod/profile/views/default/profile/admin_menu.php
@@ -5,7 +5,7 @@
 global $CONFIG;
 
 if (isadminloggedin()){
-       if ($_SESSION['id']!=elgg_get_page_owner_guid()){
+       if (get_loggedin_userid()!=elgg_get_page_owner_guid()){
                $user = get_user(elgg_get_page_owner_guid());
                $url = $vars['url'];
                $ts = time();

diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php
index 0491925c6d1f13c3f8780446df78ac6b46f1e449..a5765082c8a44a49c19732d225635d6a399806ed 100644 (file)
--- a/mod/profile/views/default/profile/commentwall/commentwalladd.php
+++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php
@@ -8,7 +8,7 @@
     <!-- textarea for the contents -->
     <textarea name="message_content" value="" class="commentwall"></textarea><br />
     <!-- the person posting an item on the message board -->
-    <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />
+    <input type="hidden" name="guid" value="<?php echo get_loggedin_userid(); ?>"  />
     <!-- the page owner, this will be the profile owner -->
     <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
     <?php echo elgg_view('input/securitytoken'); ?>

diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 1423070d4d4f41ae961b67234fdb3e662646353b..82404676e9b62d8ffe73deba5a9ae620b10159cb 100644 (file)
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -76,7 +76,7 @@ if ($vars['entity'] instanceof ElggUser) {
                                        }
                                        
                                        // if Admin is logged in, and not looking at admins own avatar menu
-                                       if (isadminloggedin() && ($_SESSION['id']!=$vars['entity']->guid) ){
+                                       if (isadminloggedin() && (get_loggedin_userid()!=$vars['entity']->guid) ){
                                                $adminlinks = elgg_view('profile/menu/adminlinks', $vars);
                                                if (!empty($adminlinks)) {
                                                        echo "<li class='user_menu_admin'>{$adminlinks}</li>";

diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index 807fa10341763a52af7b4c6cfc9880157935192b..6d99613ea824b518808c7da086d98ae5e2633d0a 100644 (file)
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -8,7 +8,7 @@
  */
 
 if (isadminloggedin()){
-       if ($_SESSION['id']!=$vars['entity']->guid){
+       if (get_loggedin_userid()!=$vars['entity']->guid){
 ?>
                <a href="<?php echo $vars['url']; ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
 <?php 

diff --git a/mod/thewire/index.php b/mod/thewire/index.php
index a0bc1757d8fa783368621e576afdb8137cf616ba..61eb9ef4aadac44a29ea4376632052238a70c3f9 100644 (file)
--- a/mod/thewire/index.php
+++ b/mod/thewire/index.php
@@ -17,7 +17,7 @@
                }
                
        // title
-               if (elgg_get_page_owner_guid() == $_SESSION['guid']) {
+               if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
                    $area2 = elgg_view_title(elgg_echo("thewire:read"));
            } else {
                    $area2 = elgg_view_title(sprintf(elgg_echo("thewire:user"),$page_owner->name));

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 097d740013bc57017b2d7bf16653fcdb7b05474b..c47e17d5c45ac9dca502597b9823442aaa61aeb2 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -60,7 +60,7 @@
 
                        //add submenu options
                                if (get_context() == "thewire") {
-                                       if ((elgg_get_page_owner_guid() == $_SESSION['guid'] || !elgg_get_page_owner_guid()) && isloggedin()) {
+                                       if ((elgg_get_page_owner_guid() == get_loggedin_userid() || !elgg_get_page_owner_guid()) && isloggedin()) {
                                                add_submenu_item(elgg_echo('thewire:read'),$CONFIG->wwwroot."pg/thewire/" . get_loggedin_user()->username);
                                                add_submenu_item(elgg_echo('thewire:everyone'),$CONFIG->wwwroot."mod/thewire/everyone.php");
                                                //add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php");