Merge branch 'platal-0.9.17' into hruid

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index bfb4b27..18d301a 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -597,7 +597,7 @@ class AdminModule extends PLModule
                         // and the password was changed, updates the Google Apps password as well.
                         if ($globals->mailstorage->googleapps_domain && Env::v('newpass_clair') != "********") {
                             require_once 'googleapps.inc.php';
-                            $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+                            $account = new GoogleAppsAccount(User::get($mr['forlife']));
                             if ($account->active() && $account->sync_password) {
                                 $account->set_password($pass_encrypted);
                             }
@@ -608,7 +608,7 @@ class AdminModule extends PLModule
                             $new_fields['perms'] == 'disabled' &&
                             $new_fields['perms'] != $old_fields['perms']) {
                             require_once 'googleapps.inc.php';
-                            $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+                            $account = new GoogleAppsAccount(User::get($mr['forlife']));
                             $account->suspend();
                         }
                         break;
@@ -944,6 +944,8 @@ class AdminModule extends PLModule
         $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1))));
 
         $hidden = array();
+        $res = XDB::query('SELECT hidden_requests FROM requests_hidden WHERE user_id = {?}', S::v('uid'));
+        $hide_requests = $res->fetchOneCell();
         if (Post::has('hide')) {
             $hide = array();
             foreach ($categories as $cat)
@@ -951,9 +953,11 @@ class AdminModule extends PLModule
                     $hidden[$cat] = 1;
                     $hide[] = $cat;
                 }
-            setcookie('hide_requests', join(',',$hide), time()+(count($hide)?25920000:(-3600)), '/', '', 0);
-        } elseif (Env::has('hide_requests'))  {
-            foreach (explode(',',Env::v('hide_requests')) as $hide_type)
+            $hide_requests = join(',', $hide);
+            XDB::query('REPLACE INTO requests_hidden (user_id, hidden_requests) VALUES({?}, {?})',
+                       S::v('uid'), $hide_requests);
+        } elseif ($hide_requests)  {
+            foreach (explode(',', $hide_requests) as $hide_type)
                 $hidden[$hide_type] = true;
         }
         $page->assign('hide_requests', $hidden);