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

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -14 +14 @@
         // hot list
         $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p`
-            INNER JOIN `sys_fave_list` AS `h` ON (`h`.`Profile` = `p`.`ID`) 
+            INNER JOIN `sys_fave_list` AS `h` ON (`h`.`Profile` = `p`.`ID`)
             WHERE `h`.`ID` = $iId");
         while ($aRow = mysql_fetch_array ($r))
@@ -21 +21 @@
         // mail contacts received
         $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p`
-            INNER JOIN `sys_messages` AS `m` ON (`m`.`Sender` = `p`.`ID`) 
+            INNER JOIN `sys_messages` AS `m` ON (`m`.`Sender` = `p`.`ID`)
             WHERE `p`.`ID` != $iId AND `m`.`Recipient` = $iId");
         while ($aRow = mysql_fetch_array ($r))
@@ -38 +38 @@
             WHERE `fr`.`ID` = '$iId' AND `fr`.`Profile` != $iId AND `fr`.`Check` = '1'");
         while ($aRow = mysql_fetch_array ($r))
-            $aAll[$aRow['ID']] = $aRow; 
+            $aAll[$aRow['ID']] = $aRow;
 
         // friends 2
@@ -45 +45 @@
             WHERE `fr`.`Profile` = '$iId' AND `fr`.`ID` != $iId AND `fr`.`Check` = '1'");
         while ($aRow = mysql_fetch_array ($r))
-            $aAll[$aRow['ID']] = $aRow; 
+            $aAll[$aRow['ID']] = $aRow;
 
 
@@ -58 +58 @@
         return new xmlrpcval ($aContacts, "array");
     }
-    
+
     function getCountries($sUser, $sPwd, $sLang)
     {
@@ -64 +64 @@
         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
-  
-        BxDolXMLRPCUtil::setLanguage ($sLang); 
+
+        BxDolXMLRPCUtil::setLanguage ($sLang);
 
         $aCountries = array ();
@@ -88 +88 @@
     function getUserInfo($iId, $iIdViewer = 0)
     {
-        if (!$iIdViewer)
-            $iIdViewer = $_COOKIE['memberID'];
+        if (!$iIdViewer)
+            $iIdViewer = $_COOKIE['memberID'];
 
         $aRet = array ();
-        $aSexSql = getProfileInfo((int)$iId); 
+        $aSexSql = getProfileInfo((int)$iId);
         $aRet['title'] = new xmlrpcval($aSexSql['Headline']);
         $aRet['thumb'] = new xmlrpcval(BxDolXMLRPCUtil::getThumbLink($iId));
@@ -111 +111 @@
     function fillProfileArray ($a, $sImage = 'icon', $iIdViewer = 0)
     {
-        if (!$iIdViewer)
-            $iIdViewer = $_COOKIE['memberID'];
+        if (!$iIdViewer)
+            $iIdViewer = $_COOKIE['memberID'];
 
         $sImageKey = ucfirst ($sImage);
@@ -145 +145 @@
         //sleep(1);
         $iId = (int)BxDolXMLRPCUtil::getIdByNickname ($sUser);
-        $aProfile = getProfileInfo((int)$iId);
-        if (!$aProfile) 
-            return 0;
+        $aProfile = getProfileInfo((int)$iId);
+        if (!$aProfile)
+            return 0;
         $_COOKIE["memberID" ] = $iId;
-        $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']);       
+        $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']);
         return ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0;
     }
@@ -165 +165 @@
     function concat($s1, $s2)
     {
-        return new xmlrpcval($s1.$s2);            
-    }    
+        return new xmlrpcval($s1.$s2);
+    }
 }