Changeset 15211 for trunk/xmlrpc/BxDolXMLRPCMedia.php

Timestamp:

06/07/11 23:41:51 (12 months ago)

Author:

Alexander Trofimov

Message:

Code cleaning:

• converting new lines to \n
• deleting spaces at the end of every line
• converting all tabs to 4 spaces
• automated script for future cleaning was added

File:

• trunk/xmlrpc/BxDolXMLRPCMedia.php (modified) (7 diffs)

trunk/xmlrpc/BxDolXMLRPCMedia.php

@@ -24 +24 @@
 
     function _getMediaAlbums ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false)
-    {        
-        $aAlbums = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums);
+    {
+        $aAlbums = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums);
 
         $aXmlRpc = array ();
 
-        foreach ($aAlbums as $r)
-        {
+        foreach ($aAlbums as $r)
+        {
             $a = array (
                 'Id' => new xmlrpcval($r['Id']),
@@ -40 +40 @@
 
         return new xmlrpcval ($aXmlRpc, "array");
-    }    
+    }
 
-    function _getMediaCount ($sType, $iIdProfile, $iIdProfileViewer) {
-        $a = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer);
-        $iNum = 0;
-        foreach ($a as $r) 
-            $iNum += $r['Num'];
-        return $iNum;
-    }
+    function _getMediaCount ($sType, $iIdProfile, $iIdProfileViewer) {
+        $a = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer);
+        $iNum = 0;
+        foreach ($a as $r)
+            $iNum += $r['Num'];
+        return $iNum;
+    }
 
     function _getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false)
-    {        
+    {
         switch ($sType) {
             case 'photo':
-                $sModuleName = 'photos';
+                $sModuleName = 'photos';
                 $sType = 'bx_photos';
-                $sMemAction = 'BX_PHOTOS_VIEW';
+                $sMemAction = 'BX_PHOTOS_VIEW';
                 break;
             case 'video':
-                $sModuleName = 'videos';
+                $sModuleName = 'videos';
                 $sType = 'bx_videos';
-                $sMemAction = 'BX_VIDEOS_VIEW';
+                $sMemAction = 'BX_VIDEOS_VIEW';
                 break;
             case 'music':
-                $sModuleName = 'sounds';
+                $sModuleName = 'sounds';
                 $sType = 'bx_sounds';
-                $sMemAction = 'BX_SOUNDS_VIEW';
-                break;          
+                $sMemAction = 'BX_SOUNDS_VIEW';
+                break;
             default:
                 return array();
         }
 
-        if (!BxDolXMLRPCMedia::_isMembershipEnabledFor($iIdProfileViewer, $sMemAction))
-            return array ();
+        if (!BxDolXMLRPCMedia::_isMembershipEnabledFor($iIdProfileViewer, $sMemAction))
+            return array ();
 
         bx_import('BxDolAlbums');
@@ -81 +81 @@
         foreach ($aList as $r)
         {
-            if ($iIdProfile != $iIdProfileViewer && !BxDolService::call ($sModuleName, 'get_album_privacy', array((int)$r['ID'], $iIdProfileViewer), 'Search'))
-                continue;
-            
+            if ($iIdProfile != $iIdProfileViewer && !BxDolService::call ($sModuleName, 'get_album_privacy', array((int)$r['ID'], $iIdProfileViewer), 'Search'))
+                continue;
+
             $aRet[] = array (
                 'Id' => $r['ID'],
@@ -93 +93 @@
     }
 
-    // ----------------- file list in albums 
+    // ----------------- file list in albums
 
     function getVideoInAlbum($sUser, $sPwd, $sNick, $iAlbumId)
@@ -114 +114 @@
 
     function _getFilesInAlbum ($sModuleName, $iIdProfile, $iIdProfileViewer, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '')
-    {     
+    {
         if ($sWidget && preg_match('/^[a-zA-Z0-9_]+$/', $sWidget)) {
             require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/global/inc/db.inc.php");
@@ -127 +127 @@
         foreach ($a as $k => $aRow)
         {
-            if ('youtube' == $aRow['Source'])
-            {
-                $sUrl = $aRow['Video'];
-            }       
-            else
-            {
-                $sToken = '';
-                if ($sFuncToken)
-                    $sToken = $sFuncToken($aRow['id']);
-          
-                $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
-            }
+            if ('youtube' == $aRow['Source'])
+            {
+                $sUrl = $aRow['Video'];
+            }
+            else
+            {
+                $sToken = '';
+                if ($sFuncToken)
+                    $sToken = $sFuncToken($aRow['id']);
+
+                $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
+            }
 
             $a = array (
@@ -158 +158 @@
     function _isMembershipEnabledFor ($iProfileId, $sMembershipActionConstant, $isPerformAction = false) {
         defineMembershipActions (array('photos add', 'photos view', 'sounds view', 'videos view'));
-        if (!defined($sMembershipActionConstant))
-            return false;
-        $aCheck = checkAction($iProfileId ? $iProfileId : $_COOKIE['memberID'], constant($sMembershipActionConstant), $isPerformAction);
+        if (!defined($sMembershipActionConstant))
+            return false;
+        $aCheck = checkAction($iProfileId ? $iProfileId : $_COOKIE['memberID'], constant($sMembershipActionConstant), $isPerformAction);
         return $aCheck[CHECK_ACTION_RESULT] == CHECK_ACTION_RESULT_ALLOWED;
-    }    
+    }
 }