Changeset 390

Timestamp:

04/05/08 14:29:00 (5 years ago)

Author:

d0nut

Message:

socialaccess is used for permissions

Location:

buddyloo

Files:

• files/js/buddylooSocial.js (modified) (1 diff)
• files/lib/action/BuddylooSocialAction.class.php (modified) (4 diffs)
• files/lib/data/user/BuddylooSocialData.class.php (modified) (2 diffs)
• files/lib/system/event/listener/BuddylooUserPageListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/BuddylooUserProfileMenuListener.class.php (modified) (3 diffs)
• install.sql (modified) (1 diff)
• templates/buddylooSocial.tpl (modified) (3 diffs)
• update.sql (modified) (1 diff)

buddyloo/files/js/buddylooSocial.js

@@ -21 +21 @@
 function buddylooLockSocial(ob) {
         locked = (locked+1) % 3;
-        $.post('index.php?action=BuddylooSocial&handle=lockSocial&userID='+userID+'&socialID='+socialID, 'locked='+locked, function(data) {
+        $.post('index.php?action=BuddylooSocial&handle=lockSocial&userID='+userID+'&socialID='+socialID, 'socialAccess='+locked, function(data) {
                 buddylooMessage('Info', language['wcf.buddyloo.social.page.access.'+locked]);
                 ob.src = RELATIVE_WCF_DIR+'icon/'+buddylooAccessIcons[locked]+'.png';   

buddyloo/files/lib/action/BuddylooSocialAction.class.php

@@ -18 +18 @@
         public $visible = -1;
         public $handle = "";
+        public $socialAccess = 0;
         
         /**
@@ -37 +38 @@
                 if (isset($_REQUEST['handle'])) $this->handle = $_REQUEST['handle'];
                 
-                if (isset($_REQUEST['socialTitle'])) $this->socialTitle = $_REQUEST['socialTitle'];             
+                if (isset($_REQUEST['socialTitle'])) $this->socialTitle = $_REQUEST['socialTitle'];
+                if (isset($_REQUEST['socialAccess'])) $this->socialAccess = intval($_REQUEST['socialAccess']);  
                 
                 // remove or hide
@@ -71 +73 @@
                         throw new PermissionDeniedException();
                 }
-                
+
                 // check users settings
                 //TODO
@@ -104 +106 @@
                                         SET             socialTitle = '".escapeString($this->socialTitle)."'
                                         WHERE           socialID = ".$this->socialID;
+                                WCF::getDB()->sendQuery($sql);
+                        break;
+                        case 'lockSocial':
+                                $sql = "UPDATE          wcf".WCF_N."_buddyloo_social
+                                        SET             socialAccess = ".$this->socialAccess."
+                                        WHERE           socialID = ".$this->socialID;
+                                        echo $sql;
                                 WCF::getDB()->sendQuery($sql);
                         break;

buddyloo/files/lib/data/user/BuddylooSocialData.class.php

@@ -35 +35 @@
                         FROM            wcf'.WCF_N.'_buddyloo_user_to_social  us
                         NATURAL JOIN    wcf'.WCF_N.'_buddyloo_social s
-                        WHERE           su.socialID = '.$this->socialID.'
-                        AND             su.userID = '.$this->userID;
+                        WHERE           us.socialID = '.$this->socialID.'
+                        AND             us.userID = '.$this->userID;
                 $row = WCF::getDB()->getFirstRow($sql);
                 $this->access = $row['socialAccess'];
-                
+
                 $access = $this->getPermission();
                 if(!$access) $access = $this->access>0 && $this->isFriend($this->userID);
-                if(!$access) $access = $this->access>1 && WCF::getUser()->getPermission('user.profile.canSocial');
+                if(!$access) $access = $this->access == 1 && WCF::getUser()->getPermission('user.profile.canSocial');
                 if($access) $this->fetchColumns();
         }
@@ -57 +57 @@
          */
         public function getPermission() {
-                return WCF::getUser()->userID == $this->userID || $this->userID === null;
+                return WCF::getUser()->userID == $this->userID;
         }
 

buddyloo/files/lib/system/event/listener/BuddylooUserPageListener.class.php

@@ -66 +66 @@
                                 }
                         }
-                        if(count($this->eventObj->categories[$keys[$i]]['options']) == 0) {
+                        if(isset($keys[$i]) && isset($this->eventObj->categories[$keys[$i]]['options']) && count($this->eventObj->categories[$keys[$i]]['options']) == 0) {
                                 unset($this->eventObj->categories[$keys[$i]]);
                         }

buddyloo/files/lib/system/event/listener/BuddylooUserProfileMenuListener.class.php

@@ -20 +20 @@
                 $this->eventObj = $eventObj;
                 $this->className = $className;
-                
-                if(!WCF::getUser()->getPermission('user.profile.canSocial') || !$this->getPermission()) return;
 
                 switch ($eventName) {
@@ -70 +68 @@
                 }
         }
+
+        /**
+         * checks if i am in the friendlist of the user
+         */
+        protected function isFriend($userID) {
+                WCF::getCache()->addResource('buddyloo.friendships', 
+                        WCF_DIR.'cache/cache.buddyloo.friendships.php',
+                        WCF_DIR.'lib/system/cache/CacheBuilderBuddylooFriendships.class.php');
+                        
+                $cache = WCF::getCache()->get('buddyloo.friendships');
+                return isset($cache[$userID]) && in_array(WCF::getUser()->userID, $cache[$userID]);
+        }
         
         /**
@@ -89 +99 @@
                         FROM            wcf'.WCF_N.'_buddyloo_user_to_social us
                         NATURAL JOIN    wcf'.WCF_N.'_buddyloo_social s
-                        JOIN            wcf'.WCF_N.'_user u
-                        ON              us.userID = u.userID
                         WHERE           us.userID = '.$this->eventObj->userID.'
+                        AND (
+                                        '.($this->getPermission()?1:0).'
+                                OR (
+                                                s.socialAccess = 1
+                                        OR (
+                                                s.socialAccess = 2 AND  '.($this->isFriend($this->eventObj->userID)?1:0).'
+                                        )
+                                )
+                        )
                         ORDER BY        icolumn ASC';
                 $result = WCF::getDB()->sendQuery($sql);

buddyloo/install.sql

@@ -19 +19 @@
   socialID int(10) unsigned NOT NULL auto_increment,
   socialTitle varchar(80) NOT NULL,
-  socialAccess tinyint(1) NOT NULL DEFAULT 0,
+  socialAccess tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (socialID)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

buddyloo/templates/buddylooSocial.tpl

@@ -13 +13 @@
                 var userID = {$user->userID};
                 var language = new Array();
-                var locked = {$social->socialAccess};
+                var locked = {$social->access};
                 language['wcf.buddyloo.social.page.access.0'] = '{lang}wcf.buddyloo.social.page.access.0{/lang}';
                 language['wcf.buddyloo.social.page.access.1'] = '{lang}wcf.buddyloo.social.page.access.1{/lang}';
@@ -34 +34 @@
 
 <div id="main">
+        {if $social->getPermission()}
         <div class="largeButtons">
                 <ul>
@@ -42 +43 @@
                 </ul>
         </div>
+        {/if}
         
         {capture append=userMessages}

buddyloo/update.sql

@@ -4 +4 @@
   socialID int(10) unsigned NOT NULL auto_increment,
   socialTitle varchar(80) NOT NULL,
-  socialAccess tinyint(1) NOT NULL DEFAULT 0,
+  socialAccess tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (socialID)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;