Changeset 8652 for trunk/templates/base/scripts/BxBaseCommunicator.php

Timestamp:

01/20/09 05:17:52 (3 years ago)

Author:

Alexander Ermashev

Message:

List of changes

• Correct the per_page_step condition into "inc/classes/BxDolPaginate.php";
• Set up the per page step into "templates/scripts/classes/BxBaseBrowse.php";
• Change the greet.php (add the code that send message also into member's site personal mailbox );
• Fix member's actions window size into mailbox ;
• add new sql query into "periodic/cmd.php" that will delete all trashed messages ;

File:

• trunk/templates/base/scripts/BxBaseCommunicator.php (modified) (14 diffs)

trunk/templates/base/scripts/BxBaseCommunicator.php

@@ -58 +58 @@
                 'action_hotlist_delete'      => 'communicator_page_delete_hotlist.html',
                 'action_hotlist_add'         => 'communicator_page_add_hotlist.html',
+                'action_greet_delete'        => 'communicator_page_delete_greeting.html',
             );
         }
@@ -72 +73 @@
             $aTopToggleItems = array
             (
-                'greeting_requests'  =>  _t( '_Greeting Requests' ),
-                'hotlist_requests'  =>  _t( '_Hotlist Requests' ),
+                'greeting_requests' =>  _t( '_Greetings' ),
+                'hotlist_requests'  =>  _t( '_Hotlists' ),
                 'friends_requests'  =>  _t( '_MEMBERS_INVITE_YOU_FRIENDLIST' ),
             );
@@ -129 +130 @@
                 'back_invite' => _t( '_Back Invite' ),
                 'hotlist_add' => _t( '_Add to Hot List' ),
+                'visitor'     => _t( '_Visitor' ),  
             );
 
@@ -140 +142 @@
                         'to'    => _t( '_MEMBERS_YOU_INVITED_FRIENDLIST' )
                    );
-
-                   $aRows = $this -> getRequests( 'FriendList', ' AND `FriendList`.`Check` = 0 ',  $aTypes);
+                   $aRows = $this -> getRequests( 'FriendList', $aTypes, ' AND `FriendList`.`Check` = 0 ');
                 break;
 
@@ -150 +151 @@
                         'to'    => _t( '_MEMBERS_YOU_HOTLISTED_BY' )
                     );
-
-                    $aRows = $this -> getRequests( 'HotList', null,  $aTypes);
+                    $aRows = $this -> getRequests( 'HotList', $aTypes);
                 break;
 
@@ -157 +157 @@
                     $aTypes = array
                     ( 
-                        'from'  => _t( '_MEMBERS_YOU_KISSED' ),
-                        'to'    => _t( '_MEMBERS_YOU_KISSED_BY' )
+                        'from'          => _t( '_MEMBERS_YOU_KISSED' ),
+                        'to'            => _t( '_MEMBERS_YOU_KISSED_BY' ),
+                        'specific_key'  => '_N times',
                     );
-
-                    $aRows = $this -> getRequests( 'VKisses', null,  $aTypes);
+                    $aRows = $this -> getRequests( 'Greetings', $aTypes, null, 'Number' );
                 break;
 
@@ -170 +170 @@
                         'to'    => _t( '_MEMBERS_YOU_INVITED_FRIENDLIST' )
                     );
-
-                    $aRows = $this -> getRequests( 'FriendList', ' AND `FriendList`.`Check` = 0 ',  $aTypes);
+                    $aRows = $this -> getRequests( 'FriendList', $aTypes, ' AND `FriendList`.`Check` = 0 ' );
             }
 
@@ -221 +220 @@
                 foreach($aRows AS $iKey => $aItems )
                 {
-                    // some member's information ;
-                    $aProfileInfo    = getProfileInfo ($aItems['member_id']);
-                    $sMemberIcon     = get_member_icon($aItems['member_id'], 'left');
-                    $sMemberLocation = getProfileLink ($aItems['member_id']);
-
-                    $sMemberNickName  = $aProfileInfo['NickName'];
-                    $sMemberAge = ( $aProfileInfo['DateOfBirth'] != "0000-00-00" ) 
-                        ? _t( "_y/o", age($aProfileInfo['DateOfBirth']) ) 
-                        : null;
-
-                    $sMemberCountry =  $aProfileInfo['Country'];
-                    $sMemberFlag    =  $site['flags'] . strtolower($sMemberCountry) . $this -> sMembersFlagExtension;
-                    $sMemberSexImg  =  $oFunctions -> genSexIcon($aProfileInfo['Sex']);
-
-                    if ( $sMemberCountry )
-                        $sMemberCountryFlag = '<img src="' . $sMemberFlag . '" alt="' . $sMemberCountry . '" />';
+                    // if member not a visitor ;
+                    if ( $aItems['member_id'] )
+                    {
+                        // ** some member's information ;
+                        $aProfileInfo    = getProfileInfo ($aItems['member_id']);
+
+                        // member's Icon ;
+                        $sMemberIcon     = get_member_icon($aProfileInfo['ID'], 'left');
+
+                        // member's profile location ;
+                        $sMemberLocation = getProfileLink ($aProfileInfo['ID']);
+
+                        // member's nickname ;
+                        $sMemberNickName  = $aProfileInfo['NickName'];
+
+                        // define the member's age ;
+                        $sMemberAge = ( $aProfileInfo['DateOfBirth'] != "0000-00-00" ) 
+                            ? _t( "_y/o", age($aProfileInfo['DateOfBirth']) ) 
+                            : null;
+
+                        // define the member's country, sex, etc ... ;
+                        $sMemberCountry =  $aProfileInfo['Country'];
+                        $sMemberFlag    =  $site['flags'] . strtolower($sMemberCountry) . $this -> sMembersFlagExtension;
+                        $sMemberSexImg  =  $oFunctions -> genSexIcon($aProfileInfo['Sex']);
+
+                        if ( $sMemberCountry )
+                            $sMemberCountryFlag = '<img src="' . $sMemberFlag . '" alt="' . $sMemberCountry . '" />';
+                    }
+                    else
+                    {
+                        // ** if it's a visitor
+
+                        // member's Icon ;
+                        $sMemberIcon        = $aLanguageKeys['visitor'];
+
+                        // member's profile location ;
+                        $sMemberLocation    = null;
+                        $sMemberSexImg      = null;
+                        $sMemberAge         = null;
+                        $sMemberCountryFlag = null;
+                        $sMemberCountry     = null;
+                    }
 
                     // color devider ;  
@@ -244 +269 @@
                     (
                         'filled_class'  => $sFiledCss,
-                        
+
                         'row_value'     => $aItems['member_id'],
                         'member_icon'   => $sMemberIcon,
 
-                        'member_location' => $sMemberLocation,
-                        'member_nickname' => $sMemberNickName,
-                        'member_sex_img'  => $sMemberSexImg,
-                        'member_sex'      => $aProfileInfo['Sex'],
+                        // define the profile page location ;
+                        'member_location' => ( $sMemberLocation ) 
+                            ? '<a href="' . $sMemberLocation . '">' . $sMemberNickName . '</a>' : null,
+
+                        // define the member's sex ;
+                        'member_sex_img'  => ( $sMemberSexImg ) 
+                            ? ' <img src="' . $sMemberSexImg . '" alt="' . $aProfileInfo['Sex'] . '" />' : null ,
+
                         'member_age'      => $sMemberAge,
                         'member_flag'     => $sMemberCountryFlag,
@@ -295 +324 @@
                                 $sActionsList = $oSysTemplate -> parseHtmlByName( $this -> aUsedTemplates['action_friends_accept'], $aTemplateKeys );
                             break;
+
                             case 'from' :
                                 $aTemplateKeys = array
@@ -304 +334 @@
                         }
                     break;
+
                     case 'hotlist_requests' :
                         // define the person mode ;
@@ -309 +340 @@
                         {
                             case 'to' :
-                                 $aTemplateKeys = array
+                                $aTemplateKeys = array
                                 (
                                     'add' => $aLanguageKeys['hotlist_add'],
@@ -316 +347 @@
  
                             break;
+
                             case 'from' :
                                 $aTemplateKeys = array
@@ -324 +356 @@
                             break;
                         }
+                    break;
+
+                    case 'greeting_requests' :
+                        $aTemplateKeys = array
+                        (
+                            'delete' => $aLanguageKeys['delete'],
+                        );
+                        $sActionsList = $oSysTemplate -> parseHtmlByName( $this -> aUsedTemplates['action_greet_delete'], $aTemplateKeys );
                     break;
                 }