Changeset 15211 for trunk/xmlrpc/BxDolXMLRPCFriends.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/BxDolXMLRPCFriends.php (modified) (6 diffs)

trunk/xmlrpc/BxDolXMLRPCFriends.php

@@ -9 +9 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        BxDolXMLRPCUtil::setLanguage ($sLang); 
+        BxDolXMLRPCUtil::setLanguage ($sLang);
 
-        $sFriendsSQL = "
-            SELECT `p`.*, `f`.`ID`
-            FROM (
-                SELECT `ID` AS `ID` FROM `sys_friend_list` WHERE `Profile` = '{$iIdProfile}' AND `Check` =1
-                UNION
-                SELECT `Profile` AS `ID` FROM `sys_friend_list` WHERE `ID` = '{$iIdProfile}' AND `Check` =1
-            ) AS `f`
-            INNER JOIN `Profiles` AS `p` ON `p`.`ID` = `f`.`ID`
-            ORDER BY p.`Avatar` DESC
-        ";
-        $r = db_res($sFriendsSQL);
+        $sFriendsSQL = "
+            SELECT `p`.*, `f`.`ID`
+            FROM (
+                SELECT `ID` AS `ID` FROM `sys_friend_list` WHERE `Profile` = '{$iIdProfile}' AND `Check` =1
+                UNION
+                SELECT `Profile` AS `ID` FROM `sys_friend_list` WHERE `ID` = '{$iIdProfile}' AND `Check` =1
+            ) AS `f`
+            INNER JOIN `Profiles` AS `p` ON `p`.`ID` = `f`.`ID`
+            ORDER BY p.`Avatar` DESC
+        ";
+        $r = db_res($sFriendsSQL);
 
         /*$r = db_res ("SELECT `Profiles`.* FROM `sys_friend_list`
             LEFT JOIN `Profiles` ON (`Profiles`.`ID` = `sys_friend_list`.`Profile` AND `sys_friend_list`.`ID` = '$iIdProfile' OR `Profiles`.`ID` = `sys_friend_list`.`ID` AND `sys_friend_list`.`Profile` = '$iIdProfile')
-            WHERE (`sys_friend_list`.`Profile` = '$iIdProfile' OR `sys_friend_list`.`ID` = '$iIdProfile') AND `sys_friend_list`.`Check` = '1' 
+            WHERE (`sys_friend_list`.`Profile` = '$iIdProfile' OR `sys_friend_list`.`ID` = '$iIdProfile') AND `sys_friend_list`.`Check` = '1'
             ORDER BY `Profiles`.`Avatar` DESC");*/
 
@@ -39 +39 @@
         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
-    
-        BxDolXMLRPCUtil::setLanguage ($sLang); 
+
+        BxDolXMLRPCUtil::setLanguage ($sLang);
 
         $r = db_res ("
@@ -64 +64 @@
         $aCommunicatorSettings = array ('member_id' => $iId);
         $aMembersList = array ($iIdProfile);
-        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);   
+        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);
         $oCommunicator->execFunction('_deleteRequest', 'sys_friend_list', $aMembersList);
 
@@ -74 +74 @@
         $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick);
         if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
-            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));            
-        
+            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
+
         require_once( BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $GLOBALS['tmpl'] . '/scripts/BxTemplCommunicator.php');
         $aCommunicatorSettings = array ('member_id' => $iId);
         $aMembersList = array ($iIdProfile);
-        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);   
+        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);
         $oCommunicator->execFunction('_acceptFriendInvite', 'sys_friend_list', $aMembersList);
 
@@ -94 +94 @@
         $aCommunicatorSettings = array ('member_id' => $iId);
         $aMembersList = array ($iIdProfile);
-        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);   
+        $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings);
         $oCommunicator->execFunction( '_deleteRequest', 'sys_friend_list', $aMembersList, array(1, 1));
 
@@ -106 +106 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        BxDolXMLRPCUtil::setLanguage ($sLang); 
+        BxDolXMLRPCUtil::setLanguage ($sLang);
 
         ob_start();