Home›Help›Trac

Changeset 9985


Ignore:
Timestamp:
04/06/09 23:30:15 (3 years ago)
Author:
Andrey Prikaznov
Message:
 
Location:
trunk
Files:
46 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/activityTrac.php

    r7305 r9985  
    2323function getUserActions ($iUser) { 
    2424    $iUser = (int)$iUser; 
    25     $sqlQuery = "SELECT `alertId`, `actionUnit`, `alertRcpId`, `actionText`, `actionDate` FROM `alerts` WHERE `actionAuthId`='$iUser' ORDER BY `actionDate` DESC"; 
     25    $sqlQuery = "SELECT `alertId`, `actionUnit`, `alertRcpId`, `actionText`, `actionDate` FROM `sys_notifications` WHERE `actionAuthId`='$iUser' ORDER BY `actionDate` DESC"; 
    2626    $rData = db_res($sqlQuery); 
    2727    $aList = array(); 

  • trunk/admin/links.php

    r6556 r9985  
    5454    else 
    5555    { 
    56         if( db_res( "INSERT INTO `Links` SET `Title` = '" . $_POST['title'] . "', `URL` = '" . $_POST['URL'] . "', `Description` = '" . $_POST['desc'] . "';" ) ) 
     56        if( db_res( "INSERT INTO `sys_links` SET `Title` = '" . $_POST['title'] . "', `URL` = '" . $_POST['URL'] . "', `Description` = '" . $_POST['desc'] . "';" ) ) 
    5757        { 
    5858            echo GetActionText( 'link successfully added', 1); 
    … …  
    9191    else 
    9292    { 
    93         if( db_res( "UPDATE `Links` SET `Title` = '" . process_db_input($_POST['title']) . "', `URL` = '" . process_db_input($_POST['URL']) . "', `Description` = '" . process_db_input($_POST['desc']) . "' WHERE `ID` = " . (int)$_POST['linkID'] . ";" ) ) 
     93        if( db_res( "UPDATE `sys_links` SET `Title` = '" . process_db_input($_POST['title']) . "', `URL` = '" . process_db_input($_POST['URL']) . "', `Description` = '" . process_db_input($_POST['desc']) . "' WHERE `ID` = " . (int)$_POST['linkID'] . ";" ) ) 
    9494        { 
    9595            echo GetActionText( 'link updated successfully', 1 ); 
    … …  
    105105elseif( !$demo_mode && 'delete' == $_GET['action'] ) 
    106106{ 
    107     if( db_res( "DELETE FROM `Links` WHERE `ID` = " . (int)$_GET['linkID'] ) ) 
     107    if( db_res( "DELETE FROM `sys_links` WHERE `ID` = " . (int)$_GET['linkID'] ) ) 
    108108    { 
    109109        echo GetActionText( 'link deleted successfully', 1 ); 
    … …  
    128128    global $site; 
    129129 
    130     $link_query = "SELECT `ID`, `Title`, `URL`, `Description` FROM `Links`"; 
     130    $link_query = "SELECT `ID`, `Title`, `URL`, `Description` FROM `sys_links`"; 
    131131    $link_res = db_res($link_query); 
    132132 
    133     $link_count = db_arr("SELECT COUNT(ID) FROM `Links`"); 
     133    $link_count = db_arr("SELECT COUNT(ID) FROM `sys_links`"); 
    134134    $link_count = $link_count['0']; 
    135135    $links_onpage = 10; 
    … …  
    186186    if( $edit ) 
    187187    { 
    188         $link_arr = db_arr( "SELECT `ID`, `Title`, `URL`, `Description` FROM `Links` WHERE `ID` = '" . (int)$linkID . "';"); 
     188        $link_arr = db_arr( "SELECT `ID`, `Title`, `URL`, `Description` FROM `sys_links` WHERE `ID` = '" . (int)$linkID . "';"); 
    189189        $value_title = htmlspecialchars($link_arr['Title']); 
    190190        $value_URL = htmlspecialchars($link_arr['URL']); 

  • trunk/admin/preValues.php

    r9976 r9985  
    351351    //alter Profiles table 
    352352    $sValuesAlter = substr( $sValuesAlter, 0, -2 ); //remove ', ' 
    353     $sQuery = "SELECT `Name` FROM `ProfileFields` WHERE `Type` = 'select_set' AND `Values` = '#!{$sList_db}'"; 
     353    $sQuery = "SELECT `Name` FROM `sys_profile_fields` WHERE `Type` = 'select_set' AND `Values` = '#!{$sList_db}'"; 
    354354    $rFields = db_res( $sQuery ); 
    355355    while( $aField = mysql_fetch_assoc( $rFields ) ) { 

  • trunk/admin/profiles.php

    r9977 r9985  
    601601            break; 
    602602        case 'alert': 
    603             $sqlAct  = "SELECT COUNT(*) as `Num` FROM `alerts` WHERE `actionAuthId`=$ID"; 
     603            $sqlAct  = "SELECT COUNT(*) as `Num` FROM `sys_notifications` WHERE `actionAuthId`=$ID"; 
    604604            $sHrefA  = '#'; 
    605605            $sOnMouseOver = 'onmouseover = "showFloatDescUrl(\'activityTrac.php?iUser='.$ID.'\');"'; 

  • trunk/flash/modules/desktop/inc/customFunctions.inc.php

    r9972 r9985  
    5959     
    6060    $sNotIn = empty($sGotMails) ? "" : " AND `ID` NOT IN(" . $sGotMails . ")"; 
    61     $sQuery = "SELECT `ID`, `Sender`, SUBSTRING(`Text`, 1, 150) AS `Body` FROM `Messages` WHERE `Recipient` = '" . $sId . "' AND `New`='1'" . $sNotIn . " AND NOT FIND_IN_SET('recipient', `Trash`)"; 
     61    $sQuery = "SELECT `ID`, `Sender`, SUBSTRING(`Text`, 1, 150) AS `Body` FROM `sys_messages` WHERE `Recipient` = '" . $sId . "' AND `New`='1'" . $sNotIn . " AND NOT FIND_IN_SET('recipient', `Trash`)"; 
    6262    $rResult = getResult($sQuery); 
    6363     

  • trunk/greet.php

    r9984 r9985  
    209209    " 
    210210        INSERT INTO 
    211             `Messages` 
     211            `sys_messages` 
    212212        SET 
    213213            `Date` = NOW(), 

  • trunk/group_actions.php

    r9967 r9985  
    364364                        $msg_text = addslashes( $msg_text ); 
    365365                         
    366                         db_res( "INSERT INTO `Messages` 
     366                        db_res( "INSERT INTO `sys_messages` 
    367367                            ( `Date`, `Sender`, `Recipient`, `Subject`, `Text`, `New` ) 
    368368                            VALUES ( NOW(), $memberID, $mem, '$msg_subj', '$msg_text', '1' )" ); 
    … …  
    418418                        $msg_text = addslashes( $msg_text ); 
    419419                         
    420                         db_res( "INSERT INTO `Messages` 
     420                        db_res( "INSERT INTO `sys_messages` 
    421421                            ( `Date`, `Sender`, `Recipient`, `Subject`, `Text`, `New` ) 
    422422                            VALUES ( NOW(), $memberID, $mem, '$msg_subj', '$msg_text', '1' )" ); 
    … …  
    660660     
    661661    $msg_text = addslashes( $msg_text ); 
    662     db_res( "INSERT INTO `Messages` 
     662    db_res( "INSERT INTO `sys_messages` 
    663663        ( `Date`, `Sender`, `Recipient`, `Subject`, `Text`, `New` ) 
    664664        VALUES ( NOW(), $memberID, $iMemID, '$msg_subj', '$msg_text', '1' )" ); 

  • trunk/inc/admin.inc.php

    r9984 r9985  
    372372        $get_parameters .= 'affID='. (int)$affID .'&'; 
    373373 
    374     $respd = db_res("SELECT * FROM `ProfileFields` WHERE `Type` <> 'none' ORDER BY `Type` ASC"); 
     374    $respd = db_res("SELECT * FROM `sys_profile_fields` WHERE `Type` <> 'none' ORDER BY `Type` ASC"); 
    375375    while ( $arrpd = mysql_fetch_array($respd) ) 
    376376    { 
    … …  
    536536        $get_inputs .= '<input type="hidden" name="affID" value="'. (int)$affID .'" />'; 
    537537 
    538     $respd = db_res("SELECT * FROM `ProfileFields` WHERE `Type` <> 'none' ORDER BY `Type` ASC"); 
     538    $respd = db_res("SELECT * FROM `sys_profile_fields` WHERE `Type` <> 'none' ORDER BY `Type` ASC"); 
    539539    while ( $arrpd = mysql_fetch_array($respd) ) 
    540540    { 
    … …  
    978978    db_res( "DELETE FROM `sys_block_list` WHERE `ID` = '{$ID}' OR `Profile` = '{$ID}'" ); 
    979979    db_res( "DELETE FROM `sys_profiles_track` WHERE `ID` = '{$ID}' OR `Profile` = '{$ID}'" ); 
    980     db_res( "DELETE FROM `Messages` WHERE Recipient = {$ID} " ); 
     980    db_res( "DELETE FROM `sys_messages` WHERE Recipient = {$ID} " ); 
    981981    db_res( "DELETE FROM `sys_aff_members` WHERE idProfile = {$ID}" ); 
    982982    db_res( "DELETE FROM `sys_fave_list` WHERE ID = {$ID} OR Profile = {$ID}" ); 

  • trunk/inc/classes/BxDolGroups.php

    r9146 r9985  
    18671867        $msg = addslashes( $msg ); 
    18681868 
    1869         db_res( "INSERT INTO `Messages` 
     1869        db_res( "INSERT INTO `sys_messages` 
    18701870            ( `Date`, `Sender`, `Recipient`, `Text`, `Subject`, `New` ) 
    18711871            VALUES 

  • trunk/inc/classes/BxDolMailBox.php

    r9968 r9985  
    100100               $this -> aSortCriterias = array 
    101101               ( 
    102                     'date'            => '`Messages`.`Date` ASC', 
    103                     'date_desc'       => '`Messages`.`Date` DESC', 
    104  
    105                     'subject'         => '`Messages`.`Subject` ASC', 
    106                     'subject_desc'    => '`Messages`.`Subject` DESC', 
    107  
    108                     'type'            => '`Messages`.`Type` ASC', 
    109                     'type_desc'       => '`Messages`.`Type` DESC', 
     102                    'date'            => '`sys_messages`.`Date` ASC', 
     103                    'date_desc'       => '`sys_messages`.`Date` DESC', 
     104 
     105                    'subject'         => '`sys_messages`.`Subject` ASC', 
     106                    'subject_desc'    => '`sys_messages`.`Subject` DESC', 
     107 
     108                    'type'            => '`sys_messages`.`Type` ASC', 
     109                    'type_desc'       => '`sys_messages`.`Type` DESC', 
    110110 
    111111                    'author'          => '`Profiles`.`NickName` ASC', 
    … …  
    121121               {  
    122122                    // generate types from DB ; 
    123                     $sQuery  = "SHOW COLUMNS FROM  `Messages` LIKE 'Type'"; 
     123                    $sQuery  = "SHOW COLUMNS FROM  `sys_messages` LIKE 'Type'"; 
    124124                    $rResult = db_res($sQuery); 
    125125 
    … …  
    188188               if ( $this -> aMailBoxSettings['messageID'] ) 
    189189               { 
    190                     $aMessageInfo = db_arr("SELECT `Recipient`, `New` FROM `Messages` WHERE `ID` = {$this -> aMailBoxSettings['messageID']}"); 
     190                    $aMessageInfo = db_arr("SELECT `Recipient`, `New` FROM `sys_messages` WHERE `ID` = {$this -> aMailBoxSettings['messageID']}"); 
    191191                    if ( $aMessageInfo['Recipient'] == $this -> aMailBoxSettings['member_id'] and $aMessageInfo['New'] == '1' ) 
    192192                    { 
    193                          db_res("UPDATE `Messages` SET `New` = '0' WHERE `ID` = {$this -> aMailBoxSettings['messageID']}"); 
     193                         db_res("UPDATE `sys_messages` SET `New` = '0' WHERE `ID` = {$this -> aMailBoxSettings['messageID']}"); 
    194194                    } 
    195195               } 
    … …  
    218218                                   IF (`Sender` = {$this -> aMailBoxSettings['member_id']},  `Recipient`, `Sender` ) AS `iSecondPerson` 
    219219                              FROM  
    220                                    `Messages`  
     220                                   `sys_messages`  
    221221                              WHERE  
    222222                                   `ID` = {$this -> aMailBoxSettings['messageID']} 
    … …  
    251251                                        COUNT(*)  
    252252                                   FROM  
    253                                         `Messages` 
     253                                        `sys_messages` 
    254254                                   WHERE 
    255255                                        `Sender` = {$iSenderID} 
    … …  
    267267                                   `Sender`, `Text`, `Subject`, `New`, `ID` 
    268268                              FROM 
    269                                    `Messages` 
     269                                   `sys_messages` 
    270270                              WHERE 
    271271                                   `Sender` = {$iSenderID} 
    … …  
    404404                    COUNT( DISTINCT if(`Recipient` = {$this -> aMailBoxSettings['member_id']}, `Sender`, `Recipient`) ) AS `Contacts`  
    405405               FROM  
    406                     `Messages`  
     406                    `sys_messages`  
    407407               WHERE 
    408408                    `Sender` = {$this -> aMailBoxSettings['member_id']}  
    … …  
    418418                    SELECT 
    419419                         DISTINCT `Profiles`.*, 
    420                          DATE_FORMAT(`Messages`.`Date`, '%d.%c.%Y') AS `When` 
     420                         DATE_FORMAT(`sys_messages`.`Date`, '%d.%c.%Y') AS `When` 
    421421                    FROM      
    422                          `Messages` 
     422                         `sys_messages` 
    423423                    INNER JOIN 
    424424                         `Profiles` 
    425425                    ON 
    426                          `Profiles`.`ID` = IF (`Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}, `Messages`.`Sender`, `Messages`.`Recipient`) 
     426                         `Profiles`.`ID` = IF (`sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}, `sys_messages`.`Sender`, `sys_messages`.`Recipient`) 
    427427                    WHERE 
    428428                         `Sender` = {$this -> aMailBoxSettings['member_id']} 
    … …  
    432432                         `Profiles`.`NickName` 
    433433                    ORDER BY 
    434                          `Messages`.`Date` DESC 
     434                         `sys_messages`.`Date` DESC 
    435435                    {$sSqlLimit} 
    436436               "; 
    … …  
    456456                         COUNT(*)  
    457457                    FROM  
    458                          `Messages`  
     458                         `sys_messages`  
    459459                    WHERE  
    460460                    ( 
    … …  
    492492                                   AND 
    493493                              ( 
    494                                    `Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']} 
     494                                   `sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']} 
    495495                                        AND 
    496                                    NOT FIND_IN_SET('Recipient', `Messages`.`Trash`) 
     496                                   NOT FIND_IN_SET('Recipient', `sys_messages`.`Trash`) 
    497497                               ) 
    498498                         ";      
    … …  
    503503                                   AND 
    504504                              ( 
    505                                    `Messages`.`Sender` = {$this -> aMailBoxSettings['member_id']} 
     505                                   `sys_messages`.`Sender` = {$this -> aMailBoxSettings['member_id']} 
    506506                                        AND 
    507                                    NOT FIND_IN_SET('Sender', `Messages`.`Trash`) 
     507                                   NOT FIND_IN_SET('Sender', `sys_messages`.`Trash`) 
    508508                              ) 
    509509                         ";  
    … …  
    515515                              ( 
    516516                                   ( 
    517                                         `Messages`.`Sender` = {$this -> aMailBoxSettings['member_id']}  
     517                                        `sys_messages`.`Sender` = {$this -> aMailBoxSettings['member_id']}  
    518518                                             AND  
    519                                         FIND_IN_SET('Sender', `Messages`.`Trash`) 
     519                                        FIND_IN_SET('Sender', `sys_messages`.`Trash`) 
    520520                                   )  
    521521                                   OR 
    522522                                   ( 
    523                                         `Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}  
     523                                        `sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}  
    524524                                             AND  
    525                                         FIND_IN_SET('Recipient', `Messages`.`Trash`) 
     525                                        FIND_IN_SET('Recipient', `sys_messages`.`Trash`) 
    526526                                   ) 
    527527                              ) 
    … …  
    536536                    { 
    537537                         if ($sKey)  
    538                               $sTypeMessages .= "`Messages`.`Type` = '{$sKey}' OR"; 
     538                              $sTypeMessages .= "`sys_messages`.`Type` = '{$sKey}' OR"; 
    539539                    } 
    540540                    $sTypeMessages = 'AND (' . preg_replace("/OR$/", '', $sTypeMessages). ')'; 
    … …  
    550550                    (" 
    551551                         SELECT  
    552                               COUNT(`Messages`.`ID`)  
     552                              COUNT(`sys_messages`.`ID`)  
    553553                         FROM  
    554                               `Messages`  
     554                              `sys_messages`  
    555555                         WHERE  
    556556                              1 
    … …  
    571571                         " 
    572572                              SELECT  
    573                                    `Messages`.`ID`, DATE_FORMAT(`Messages`.`Date`, '%d.%m.%Y %H.%i') AS `Date`, 
    574                                    `Messages`.`Sender`, `Messages`.`Recipient`, `Messages`.`Text`,  
    575                                    `Messages`.`Subject`, `Messages`.`New`, `Messages`.`Type` 
     573                                   `sys_messages`.`ID`, DATE_FORMAT(`sys_messages`.`Date`, '%d.%m.%Y %H.%i') AS `Date`, 
     574                                   `sys_messages`.`Sender`, `sys_messages`.`Recipient`, `sys_messages`.`Text`,  
     575                                   `sys_messages`.`Subject`, `sys_messages`.`New`, `sys_messages`.`Type` 
    576576                              FROM  
    577                                    `Messages` 
     577                                   `sys_messages` 
    578578                              INNER JOIN 
    579579                                   `Profiles` 
    580580                              ON 
    581                                    `Profiles`.`ID` = `Messages`.`Sender` 
     581                                   `Profiles`.`ID` = `sys_messages`.`Sender` 
    582582                              WHERE 
    583583                                   1 
    … …  
    615615           " 
    616616                UPDATE  
    617                      `Messages`  
     617                     `sys_messages`  
    618618                SET  
    619619                     `New` = '{$iMarkMode}' 
    … …  
    637637          { 
    638638               // try to define mailbox mode and trash mode; 
    639                $sQuery = "SELECT `Sender`, `Recipient`, `Trash` FROM `Messages` WHERE `ID` = {$iMessageID}"; 
     639               $sQuery = "SELECT `Sender`, `Recipient`, `Trash` FROM `sys_messages` WHERE `ID` = {$iMessageID}"; 
    640640               $rResult = db_res($sQuery); 
    641641 
    … …  
    660660               " 
    661661                         UPDATE 
    662                               `Messages` 
     662                              `sys_messages` 
    663663                         SET 
    664664                              `Trash` = '" . strtolower($sTrashValue) . "' 
    … …  
    684684               $iMessageOwner = 0; 
    685685 
    686                $sQuery = "SELECT `Sender`, `Recipient`, `Trash`     FROM `Messages` WHERE `ID` = {$iMessageID}"; 
     686               $sQuery = "SELECT `Sender`, `Recipient`, `Trash`     FROM `sys_messages` WHERE `ID` = {$iMessageID}"; 
    687687               $rResult = db_res($sQuery); 
    688688 
    … …  
    715715                    " 
    716716                         UPDATE  
    717                               `Messages`  
     717                              `sys_messages`  
    718718                         SET      
    719719                              `Trash` = '{$sTrashMode}'  
    … …  
    789789                              `ID`  
    790790                         FROM  
    791                               `Messages`  
     791                              `sys_messages`  
    792792                         WHERE  
    793793                              `Sender` = {$this -> aMailBoxSettings['member_id']}  
    … …  
    824824                        " 
    825825                            INSERT INTO  
    826                                 `Messages`  
     826                                `sys_messages`  
    827827                            SET  
    828828                                `Sender`       = {$this -> aMailBoxSettings['member_id']}, 

  • trunk/inc/classes/BxDolNotificationsQuery.php

    r8046 r9985  
    3939                `tp`.`NickName` AS `actor_username`, 
    4040                `ta`.`actionText` AS `action_content`  
    41             FROM `alerts` AS `ta` 
     41            FROM `sys_notifications` AS `ta` 
    4242            LEFT JOIN `Profiles` AS `tp` ON `ta`.`actionAuthId`=`tp`.`ID` 
    4343            WHERE `ta`.`alertRcpId`='" . $iUserId . "' AND `ta`.`actionAuthId` <> '0' AND `ta`.`actionDate`>(UNIX_TIMESTAMP()-" . $iExpirationTime . ") 

  • trunk/inc/classes/BxDolPFM.php

    r9975 r9985  
    9898                `ID`, 
    9999                `Name` 
    100             FROM `ProfileFields` 
     100            FROM `sys_profile_fields` 
    101101            WHERE 
    102102                `{$this -> areaOrderCol}` IS NOT NULL AND 
    … …  
    118118                    `ID`, 
    119119                    `Name` 
    120                 FROM `ProfileFields` 
     120                FROM `sys_profile_fields` 
    121121                WHERE 
    122122                    `Type` != 'block' AND 
    … …  
    147147                `ID`, 
    148148                `Name` 
    149             FROM `ProfileFields` 
     149            FROM `sys_profile_fields` 
    150150            WHERE 
    151151                `{$this -> areaOrderCol}` IS NULL AND 
    … …  
    167167                `ID`, 
    168168                `Name` 
    169             FROM `ProfileFields` 
     169            FROM `sys_profile_fields` 
    170170            WHERE 
    171171                `Type` != 'block' AND ( 
    … …  
    189189     
    190190    function savePositions( $aInArrays ) { 
    191         db_res( "UPDATE `ProfileFields` SET `{$this -> areaOrderCol}` = NULL" ); 
    192         db_res( "UPDATE `ProfileFields` SET `{$this -> areaBlockCol}` = 0" ); 
     191        db_res( "UPDATE `sys_profile_fields` SET `{$this -> areaOrderCol}` = NULL" ); 
     192        db_res( "UPDATE `sys_profile_fields` SET `{$this -> areaBlockCol}` = 0" ); 
    193193         
    194194        if( is_array( $aInArrays['blocks'] ) ) { 
    … …  
    198198                $iBlockOrd = (int)db_value( " 
    199199                    SELECT MAX( `{$this -> areaOrderCol}` ) 
    200                     FROM `ProfileFields` 
     200                    FROM `sys_profile_fields` 
    201201                    WHERE `Type` = 'block' 
    202202                " ) + 1; 
    203203                 
    204204                db_res( " 
    205                     UPDATE `ProfileFields` 
     205                    UPDATE `sys_profile_fields` 
    206206                    SET `{$this -> areaOrderCol}` = $iBlockOrd 
    207207                    WHERE `ID` = $iBlockID 
    … …  
    217217                        $iItemOrd = db_value( " 
    218218                            SELECT MAX( `{$this -> areaOrderCol}` ) 
    219                             FROM `ProfileFields` 
     219                            FROM `sys_profile_fields` 
    220220                            WHERE `Type` != 'block' AND `{$this -> areaBlockCol}` = $iItemBlockID 
    221221                        " ) + 1; 
    222222                         
    223223                        db_res( " 
    224                             UPDATE `ProfileFields` 
     224                            UPDATE `sys_profile_fields` 
    225225                            SET 
    226226                                `{$this -> areaOrderCol}` = $iItemOrd, 
    … …  
    260260                ) . " 
    261261                 
    262             FROM `ProfileFields` WHERE `ID` = $iItemID"; 
     262            FROM `sys_profile_fields` WHERE `ID` = $iItemID"; 
    263263         
    264264        $aField = db_assoc_arr( $sQuery ); 
    … …  
    451451         
    452452         
    453         $sQuery = "SELECT `Name` FROM `ProfileFields` WHERE $sWhere"; 
     453        $sQuery = "SELECT `Name` FROM `sys_profile_fields` WHERE $sWhere"; 
    454454        $rFields = db_res( $sQuery ); 
    455455         
    … …  
    465465     
    466466    function getJoinPagesSelector( $iCurrent ) { 
    467         $sQuery = "SELECT MAX( `JoinPage` ) FROM `ProfileFields`"; 
     467        $sQuery = "SELECT MAX( `JoinPage` ) FROM `sys_profile_fields`"; 
    468468        $iMaxPage = (int)db_value( $sQuery ); 
    469469         
    … …  
    518518        } 
    519519         
    520         $sQuery = "SELECT `ID`, `Name` FROM `ProfileFields` WHERE FIND_IN_SET( `Type`, '" . implode( ',', $aSelectFields ) . "' )"; 
     520        $sQuery = "SELECT `ID`, `Name` FROM `sys_profile_fields` WHERE FIND_IN_SET( `Type`, '" . implode( ',', $aSelectFields ) . "' )"; 
    521521        $rMyFields = db_res( $sQuery ); 
    522522         
    … …  
    799799        $iItemID = (int)$aData['id']; 
    800800         
    801         $aItem = db_assoc_arr( "SELECT * FROM `ProfileFields` WHERE `ID` = $iItemID" ); 
     801        $aItem = db_assoc_arr( "SELECT * FROM `sys_profile_fields` WHERE `ID` = $iItemID" ); 
    802802         
    803803        if( !$aItem ) { 
    … …  
    824824                $this -> genSaveItemError( 'The name must begin with a latin letter and contain only latin letters, numbers or underscores.', 'Name' ); 
    825825                $bHaveErrors = true; 
    826             } elseif( db_value( "SELECT COUNT(*) FROM `ProfileFields` WHERE `Name` = '$sName' and `ID` != $iItemID" ) ) { 
     826            } elseif( db_value( "SELECT COUNT(*) FROM `sys_profile_fields` WHERE `Name` = '$sName' and `ID` != $iItemID" ) ) { 
    827827                $this -> genSaveItemError( 'A field with such name already exists. Please select another.', 'Name' ); 
    828828                $bHaveErrors = true; 
    … …  
    11501150         
    11511151        $sQuery = " 
    1152             UPDATE `ProfileFields` SET  
     1152            UPDATE `sys_profile_fields` SET  
    11531153                " . implode( ",  
    11541154                ", $aUpdateStrs ) . " 
    … …  
    12111211         
    12121212        //try to insert new item 
    1213         if( db_res( "INSERT INTO `ProfileFields` (`Name`, `Type` ) VALUES ('NEW_ITEM', 'text')", 0 ) and $iNewID = mysql_insert_id() ) { 
     1213        if( db_res( "INSERT INTO `sys_profile_fields` (`Name`, `Type` ) VALUES ('NEW_ITEM', 'text')", 0 ) and $iNewID = mysql_insert_id() ) { 
    12141214            //if success - try to alter table 
    12151215            if( !db_res( "ALTER TABLE `Profiles` ADD `NEW_ITEM` varchar(255) NOT NULL default ''", 0 ) ) { 
    12161216                //if couldn't alter - delete inserted field 
    1217                 db_res( "DELETE FROM `ProfileFields` WHERE `ID` = $iNewID" ); 
     1217                db_res( "DELETE FROM `sys_profile_fields` WHERE `ID` = $iNewID" ); 
    12181218                $iNewID = 0; 
    12191219            } 
    … …  
    12241224     
    12251225    function createNewBlock() { 
    1226         db_res( "INSERT INTO `ProfileFields` (`Name`, `Type` ) VALUES ('NEW BLOCK', 'block')", 0 ); 
     1226        db_res( "INSERT INTO `sys_profile_fields` (`Name`, `Type` ) VALUES ('NEW BLOCK', 'block')", 0 ); 
    12271227        $iNewID = mysql_insert_id(); 
    12281228         
    … …  
    13031303        $this -> genSaveItemHeader(); 
    13041304         
    1305         $aItem = db_assoc_arr( "SELECT * FROM `ProfileFields` WHERE `ID` = $iItemID" ); 
     1305        $aItem = db_assoc_arr( "SELECT * FROM `sys_profile_fields` WHERE `ID` = $iItemID" ); 
    13061306         
    13071307        if( !$aItem ) 
    … …  
    13101310            $this -> genSaveItemError( 'The field cannot be deleted.' ); 
    13111311        else{ 
    1312             $sQuery = "DELETE FROM `ProfileFields` WHERE `ID` = $iItemID"; 
     1312            $sQuery = "DELETE FROM `sys_profile_fields` WHERE `ID` = $iItemID"; 
    13131313            db_res( $sQuery ); 
    13141314             
    … …  
    14581458        ); 
    14591459         
    1460         $this -> sCacheFile = BX_DIRECTORY_PATH_DBCACHE . 'ProfileFields.inc'; 
     1460        $this -> sCacheFile = BX_DIRECTORY_PATH_DBCACHE . 'sys_profile_fields.inc'; 
    14611461         
    14621462    } 
    … …  
    16711671            SELECT 
    16721672                DISTINCT `JoinPage` 
    1673             FROM `ProfileFields` 
     1673            FROM `sys_profile_fields` 
    16741674            WHERE 
    16751675                `Type` = 'block' AND 
    … …  
    16941694                `ID`, 
    16951695                `Name` 
    1696             FROM `ProfileFields` 
     1696            FROM `sys_profile_fields` 
    16971697            WHERE 
    16981698                `Type` = 'block' AND 
    … …  
    17331733                $sAddSelect 
    17341734            FROM 
    1735                 `ProfileFields` 
     1735                `sys_profile_fields` 
    17361736            WHERE 
    17371737                `Type` != 'block' AND 

  • trunk/inc/classes/BxDolProfileFields.php

    r9879 r9985  
    1818        $this -> iAreaID = $iAreaID; 
    1919         
    20         $this -> sCacheFile = BX_DIRECTORY_PATH_DBCACHE . 'ProfileFields.inc'; 
     20        $this -> sCacheFile = BX_DIRECTORY_PATH_DBCACHE . 'sys_profile_fields.inc'; 
    2121         
    2222        if( !$this -> loadCache() ) 

  • trunk/inc/classes/BxDolSharedFiles.php

    r9951 r9985  
    350350        $sCatWhere = ''; 
    351351        if ($sCat) { 
    352             $sCatJoin = " LEFT JOIN `Categories` AS `c` ON (`c`.`ID` = `{$this->sFileTable}`.`{$this->aFileFields['medID']}` AND `c`.`Type` = 'photo') "; 
     352            $sCatJoin = " LEFT JOIN `sys_categories` AS `c` ON (`c`.`ID` = `{$this->sFileTable}`.`{$this->aFileFields['medID']}` AND `c`.`Type` = 'photo') "; 
    353353            $sCatWhere = " AND `c`.`Category` = '$sCat' "; 
    354354        } 

  • trunk/inc/design.inc.php

    r9984 r9985  
    287287    //impl 
    288288     
    289     $sValues = db_value( "SELECT `Values` FROM `ProfileFields` WHERE `Name` = '$sField'" ); 
     289    $sValues = db_value( "SELECT `Values` FROM `sys_profile_fields` WHERE `Name` = '$sField'" ); 
    290290     
    291291    if( substr( $sValues, 0, 2 ) == '#!' ) { 

  • trunk/inc/profiles.inc.php

    r9977 r9985  
    331331            COUNT(`Recipient`)  
    332332        FROM  
    333             `Messages`  
     333            `sys_messages`  
    334334        WHERE  
    335335            `Recipient`='$iID'  

  • trunk/install/sql/v70.sql

    r9984 r9985  
    66 
    77SET NAMES 'utf8'; 
    8 DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_links`, `sys_admin_menu`, `sys_admin_menu_categ`, `sys_admins`, `sys_aff`, `sys_aff_banners`, `sys_aff_members`, `alerts`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_objects_browse`, `Categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `Groups`, `GroupsCateg`, `GroupsGallery`, `GroupsMembers`, `groups_rating`, `groups_voting_track`, `grp_forum`, `grp_forum_cat`, `grp_forum_flag`, `grp_forum_post`, `grp_forum_report`, `grp_forum_topic`, `grp_forum_user`, `grp_forum_user_activity`, `grp_forum_user_stat`, `grp_forum_vote`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `Links`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_members_as_aff`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `Messages`, `sys_moderators`, `News`, `sys_subscriptions`, `sys_mail_mass_messages`, `sys_mail_queue`, `sys_page_compose`, `sys_page_compose_pages`, `sys_payment_parameters`, `sys_payment_providers`, `sys_payment_subscriptions`, `sys_stat_member`, `sys_pre_values`, `ProfileFields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profiles_settings`, `sys_profiles_track`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayGlobalTrackUsers`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideo_commentsFiles`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `smiles`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `Stories`, `Tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`; 
     8DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_links`, `sys_admin_menu`, `sys_admin_menu_categ`, `sys_admins`, `sys_aff`, `sys_aff_banners`, `sys_aff_members`, `sys_notifications`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_objects_browse`, `sys_categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `Groups`, `GroupsCateg`, `GroupsGallery`, `GroupsMembers`, `groups_rating`, `groups_voting_track`, `grp_forum`, `grp_forum_cat`, `grp_forum_flag`, `grp_forum_post`, `grp_forum_report`, `grp_forum_topic`, `grp_forum_user`, `grp_forum_user_activity`, `grp_forum_user_stat`, `grp_forum_vote`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `sys_links`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_members_as_aff`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `sys_messages`, `sys_moderators`, `News`, `sys_subscriptions`, `sys_mail_mass_messages`, `sys_mail_queue`, `sys_page_compose`, `sys_page_compose_pages`, `sys_payment_parameters`, `sys_payment_providers`, `sys_payment_subscriptions`, `sys_stat_member`, `sys_pre_values`, `sys_profile_fields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profiles_settings`, `sys_profiles_track`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayGlobalTrackUsers`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideo_commentsFiles`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `smiles`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `Stories`, `Tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`; 
    99ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; 
    1010 
    … …  
    254254 
    255255-- 
    256 -- Table structure for table `alerts` 
    257 -- 
    258  
    259 CREATE TABLE `alerts` ( 
     256-- Table structure for table `sys_notifications` 
     257-- 
     258 
     259CREATE TABLE `sys_notifications` ( 
    260260    `alertId` bigint(8) NOT NULL auto_increment, 
    261261    `alertObjId` int(10) unsigned NOT NULL, 
    … …  
    271271 
    272272-- 
    273 -- Dumping data for table `alerts` 
     273-- Dumping data for table `sys_notifications` 
    274274-- 
    275275 
    … …  
    426426 
    427427-- 
    428 -- Table structure for table `Categories` 
    429 -- 
    430  
    431 CREATE TABLE `Categories` ( 
     428-- Table structure for table `sys_categories` 
     429-- 
     430 
     431CREATE TABLE `sys_categories` ( 
    432432  `Category` varchar(32) NOT NULL default '', 
    433433  `ID` int(10) unsigned NOT NULL default '0', 
    … …  
    439439 
    440440-- 
    441 -- Dumping data for table `Categories` 
     441-- Dumping data for table `sys_categories` 
    442442-- 
    443443 
    … …  
    17071707 
    17081708-- 
    1709 -- Table structure for table `Links` 
    1710 -- 
    1711  
    1712 CREATE TABLE `Links` ( 
     1709-- Table structure for table `sys_links` 
     1710-- 
     1711 
     1712CREATE TABLE `sys_links` ( 
    17131713  `ID` bigint(20) unsigned NOT NULL auto_increment, 
    17141714  `Title` varchar(250) default NULL, 
    … …  
    17191719 
    17201720-- 
    1721 -- Dumping data for table `Links` 
    1722 -- 
    1723  
    1724 INSERT INTO `Links` VALUES(6, 'Free Online Dating Personals - 4ppl', 'http://www.4ppl.com/', 'Looking for friends, a match or pen pals? 4PPL is exactly for you. Join the First Absolutely Free dating site without any membership payments or annoying ads. Enjoy its simple, pleasurable design and modern features. Use it for free!'); 
    1725 INSERT INTO `Links` VALUES(8, 'Ray Community Widget Suite', 'http://www.boonex.com/products/ray/', 'Expand your community site with A/V chat, A/V Instant Messenger, A/V Recorder, MP3 Player, Web Presence and Desktop Application. Bring life to your community site!'); 
    1726 INSERT INTO `Links` VALUES(10, 'Unity - the Community of Communitites', 'http://www.boonex.com/unity/', 'Our goal is to unite people who can deliver support for any community software and who want to receive qualified support. Here you can sell your products and services, as well as buy everything you want to make a Unique Community website. '); 
    1727 INSERT INTO `Links` VALUES(11, 'LoveLandia: Love Poems', 'http://www.lovelandia.com/', 'LoveLandia is the best place to share your love poems, love quotes, stories, songs, tips and much more about Love. Just visit our LoveLandia site and enjoy its modern features: chat, A/V Recorder, Forum, "Transfer to" and more! Disclose your talent! Impress your Lover!'); 
    1728 INSERT INTO `Links` VALUES(12, 'Shark Enterprise Community Platform', 'http://www.boonex.com/products/shark/', 'Specially developed software for big community websites. Turn your small community site into a serious moneymaking business!'); 
    1729 INSERT INTO `Links` VALUES(13, 'Orca Interactive Forum Script', 'http://www.boonex.com/products/orca/', 'The first Interactive Forum Script based on AJAX technology! Self-Ruling, Integrable and under General Public License.'); 
    1730 INSERT INTO `Links` VALUES(15, 'Dolphin Smart Community Builder', 'http://www.boonex.com/products/dolphin/', 'Dolphin is secure, modifiable and reliably tested Community Software which will help you to build a Unique Community website.'); 
    1731 INSERT INTO `Links` VALUES(17, 'DreamSCat: Sharing Ideas & Dreams', 'http://www.dreamscat.com/', 'Simply the best place to share and learn genius ideas on science, environment and fun. You can also post your know-how concerning business, beauty and cooking as well as declare your miracles and dreams. Look for creative and useful tips here on self-improvement, health and home.'); 
    1732 INSERT INTO `Links` VALUES(18, 'Make Your Car Famous :: AboutMyCar', 'http://www.aboutmycar.com/', 'Car stories about real and dream cars with photos, experience and impressions. Latest auto news on new car models, car high tech, motorsports; histories of car builders; vintage automotive proverbs & sayings, auto humor.'); 
    1733 INSERT INTO `Links` VALUES(19, 'Boonex Community Software Experts', 'http://www.boonex.com/', 'BoonEx delivers quality community web  application software with more features than you ever dreamed of. We offer community software development which responds to rapid changes in Internet-related technologies. You can find everything you need to create your own community!\r\n\r\n'); 
    1734 INSERT INTO `Links` VALUES(22, 'BoonEx Blog', 'http://www.boonex.com/unity/', 'BoonEx Blog, hosted by Andrey Sivtsov - general Director of BoonEx, is a discussion venue for future releases of BoonEx products and functionality of BoonEx websites. This Unity blog is a part of Unite People movement, supported by BoonEx. Anyone is welcome to participate by sharing ideas, testing products and providing suggestions.'); 
    1735 INSERT INTO `Links` VALUES(21, 'BoonEx Development Zone', 'http://www.boonex.com/trac/', 'Have a suggestion for the new BoonEx products versions? You are welcome to use BoonEx development zone where you can make your deposit in the Ray, Dolphin, or Orca development process via a "Ticket" system. To be up-to-date you can view the "Timeline" of the development progress and the "Roadmap" of what will be done. Many of those who wish to help build a better product are already there.'); 
     1721-- Dumping data for table `sys_links` 
     1722-- 
     1723 
     1724INSERT INTO `sys_links` VALUES(6, 'Free Online Dating Personals - 4ppl', 'http://www.4ppl.com/', 'Looking for friends, a match or pen pals? 4PPL is exactly for you. Join the First Absolutely Free dating site without any membership payments or annoying ads. Enjoy its simple, pleasurable design and modern features. Use it for free!'); 
     1725INSERT INTO `sys_links` VALUES(8, 'Ray Community Widget Suite', 'http://www.boonex.com/products/ray/', 'Expand your community site with A/V chat, A/V Instant Messenger, A/V Recorder, MP3 Player, Web Presence and Desktop Application. Bring life to your community site!'); 
     1726INSERT INTO `sys_links` VALUES(10, 'Unity - the Community of Communitites', 'http://www.boonex.com/unity/', 'Our goal is to unite people who can deliver support for any community software and who want to receive qualified support. Here you can sell your products and services, as well as buy everything you want to make a Unique Community website. '); 
     1727INSERT INTO `sys_links` VALUES(11, 'LoveLandia: Love Poems', 'http://www.lovelandia.com/', 'LoveLandia is the best place to share your love poems, love quotes, stories, songs, tips and much more about Love. Just visit our LoveLandia site and enjoy its modern features: chat, A/V Recorder, Forum, "Transfer to" and more! Disclose your talent! Impress your Lover!'); 
     1728INSERT INTO `sys_links` VALUES(12, 'Shark Enterprise Community Platform', 'http://www.boonex.com/products/shark/', 'Specially developed software for big community websites. Turn your small community site into a serious moneymaking business!'); 
     1729INSERT INTO `sys_links` VALUES(13, 'Orca Interactive Forum Script', 'http://www.boonex.com/products/orca/', 'The first Interactive Forum Script based on AJAX technology! Self-Ruling, Integrable and under General Public License.'); 
     1730INSERT INTO `sys_links` VALUES(15, 'Dolphin Smart Community Builder', 'http://www.boonex.com/products/dolphin/', 'Dolphin is secure, modifiable and reliably tested Community Software which will help you to build a Unique Community website.'); 
     1731INSERT INTO `sys_links` VALUES(17, 'DreamSCat: Sharing Ideas & Dreams', 'http://www.dreamscat.com/', 'Simply the best place to share and learn genius ideas on science, environment and fun. You can also post your know-how concerning business, beauty and cooking as well as declare your miracles and dreams. Look for creative and useful tips here on self-improvement, health and home.'); 
     1732INSERT INTO `sys_links` VALUES(18, 'Make Your Car Famous :: AboutMyCar', 'http://www.aboutmycar.com/', 'Car stories about real and dream cars with photos, experience and impressions. Latest auto news on new car models, car high tech, motorsports; histories of car builders; vintage automotive proverbs & sayings, auto humor.'); 
     1733INSERT INTO `sys_links` VALUES(19, 'Boonex Community Software Experts', 'http://www.boonex.com/', 'BoonEx delivers quality community web  application software with more features than you ever dreamed of. We offer community software development which responds to rapid changes in Internet-related technologies. You can find everything you need to create your own community!\r\n\r\n'); 
     1734INSERT INTO `sys_links` VALUES(22, 'BoonEx Blog', 'http://www.boonex.com/unity/', 'BoonEx Blog, hosted by Andrey Sivtsov - general Director of BoonEx, is a discussion venue for future releases of BoonEx products and functionality of BoonEx websites. This Unity blog is a part of Unite People movement, supported by BoonEx. Anyone is welcome to participate by sharing ideas, testing products and providing suggestions.'); 
     1735INSERT INTO `sys_links` VALUES(21, 'BoonEx Development Zone', 'http://www.boonex.com/trac/', 'Have a suggestion for the new BoonEx products versions? You are welcome to use BoonEx development zone where you can make your deposit in the Ray, Dolphin, or Orca development process via a "Ticket" system. To be up-to-date you can view the "Timeline" of the development progress and the "Roadmap" of what will be done. Many of those who wish to help build a better product are already there.'); 
    17361736 
    17371737-- -------------------------------------------------------- 
    … …  
    20082008 
    20092009-- 
    2010 -- Table structure for table `Messages` 
    2011 -- 
    2012  
    2013 CREATE TABLE `Messages` ( 
     2010-- Table structure for table `sys_messages` 
     2011-- 
     2012 
     2013CREATE TABLE `sys_messages` ( 
    20142014  `ID` int(11) NOT NULL auto_increment, 
    20152015  `Date` datetime NOT NULL default '0000-00-00 00:00:00', 
    … …  
    20262026 
    20272027-- 
    2028 -- Dumping data for table `Messages` 
     2028-- Dumping data for table `sys_messages` 
    20292029-- 
    20302030 
    … …  
    23452345-- 
    23462346 
    2347 INSERT INTO `sys_stat_member` VALUES('mma', 'SELECT COUNT(*) FROM `Messages` WHERE `Recipient`=''__member_id__'''); 
    2348 INSERT INTO `sys_stat_member` VALUES('mmn', 'SELECT COUNT(`Recipient`) FROM `Messages` WHERE `Recipient`=''__member_id__'' AND `New`=''1'''); 
     2347INSERT INTO `sys_stat_member` VALUES('mma', 'SELECT COUNT(*) FROM `sys_messages` WHERE `Recipient`=''__member_id__'''); 
     2348INSERT INTO `sys_stat_member` VALUES('mmn', 'SELECT COUNT(`Recipient`) FROM `sys_messages` WHERE `Recipient`=''__member_id__'' AND `New`=''1'''); 
    23492349INSERT INTO `sys_stat_member` VALUES('mfl', 'SELECT COUNT(*) FROM `sys_fave_list` WHERE `ID` = ''__member_id__'' '); 
    23502350INSERT INTO `sys_stat_member` VALUES('mfr', 'SELECT COUNT(*) FROM `sys_friend_list` WHERE `Profile` = ''__member_id__'' AND  `Check` = ''0'''); 
    … …  
    27582758 
    27592759-- 
    2760 -- Table structure for table `ProfileFields` 
    2761 -- 
    2762  
    2763 CREATE TABLE `ProfileFields` ( 
     2760-- Table structure for table `sys_profile_fields` 
     2761-- 
     2762 
     2763CREATE TABLE `sys_profile_fields` ( 
    27642764  `ID` smallint(10) unsigned NOT NULL auto_increment, 
    27652765  `Name` varchar(255) character set utf8 collate utf8_bin NOT NULL default '', 
    … …  
    28082808 
    28092809-- 
    2810 -- Dumping data for table `ProfileFields` 
    2811 -- 
    2812  
    2813 INSERT INTO `ProfileFields` VALUES(1, 'ID', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 1, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 17, 1, 17, 1, 0, NULL, '', 17, 2, 17, 2, 0, NULL, 0, 0); 
    2814 INSERT INTO `ProfileFields` VALUES(2, 'NickName', 'text', NULL, '', 4, 16, '', 'LKey', 'return ( preg_match( ''/^[\\pL\\pN_-]+$/u'', $arg0 ) and !file_exists( $dir[''root''] . $arg0 ) );', 1, '', 1, 0, 0, 17, 1, 17, 1, 17, 1, 17, 1, 0, NULL, 17, 2, 17, 2, 0, NULL, '', 17, 1, 17, 1, 0, NULL, 0, 0); 
    2815 INSERT INTO `ProfileFields` VALUES(3, 'Password', 'pass', NULL, '', 5, 16, '', 'LKey', '', 0, '', 1, 0, 0, 17, 3, 17, 4, 17, 4, 17, 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2816 INSERT INTO `ProfileFields` VALUES(4, 'Email', 'text', NULL, '', 6, NULL, '', 'LKey', 'return (bool)preg_match( ''/^[a-z0-9_\\-]+(\\.[_a-z0-9\\-]+)*@([_a-z0-9\\-]+\\.)+([a-z]{2}|aero|arpa|asia|biz|cat|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel)$/i'', $arg0 );', 1, '', 1, 0, 0, 17, 2, 17, 2, 17, 2, 17, 2, 0, NULL, 21, 1, 21, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2817 INSERT INTO `ProfileFields` VALUES(5, 'DateReg', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 2, 21, 2, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2818 INSERT INTO `ProfileFields` VALUES(6, 'DateLastEdit', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 4, 21, 4, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2819 INSERT INTO `ProfileFields` VALUES(7, 'Status', 'system', NULL, '', NULL, NULL, 'Unconfirmed\nApproval\nActive\nRejected\nSuspended', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 1, 21, 1, 0, NULL, 17, 3, 17, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2820 INSERT INTO `ProfileFields` VALUES(8, 'DateLastLogin', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 3, 21, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2821 INSERT INTO `ProfileFields` VALUES(9, 'Featured', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 2, 21, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2822 INSERT INTO `ProfileFields` VALUES(10, 'Sex', 'select_one', 'radio', '', NULL, NULL, '#!Sex', 'LKey', '', 0, 'male', 1, 0, 0, 20, 1, 17, 3, 17, 3, 17, 3, 17, 1, 17, 4, 17, 4, 17, 1, '', 20, 2, 20, 2, 17, 2, 11, 40); 
    2823 INSERT INTO `ProfileFields` VALUES(11, 'LookingFor', 'select_set', 'checkbox', '', NULL, NULL, '#!Sex', 'LKey2', '', 0, '', 0, 0, 0, 20, 2, 20, 1, 20, 1, 20, 1, 17, 5, 17, 5, 17, 5, 17, 4, '', 20, 1, 20, 1, 0, NULL, 10, 40); 
    2824 INSERT INTO `ProfileFields` VALUES(12, 'DescriptionMe', 'area', NULL, '', 20, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 20, 5, 20, 4, 20, 4, 20, 4, 17, 7, 22, 2, 22, 2, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2825 INSERT INTO `ProfileFields` VALUES(13, 'DateOfBirth', 'date', NULL, '', 18, 75, '', 'LKey', '', 0, '', 1, 1, 0, 20, 3, 20, 2, 20, 2, 20, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 20, 3, 20, 3, 17, 3, 0, 0); 
    2826 INSERT INTO `ProfileFields` VALUES(14, 'Headline', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 4, 20, 3, 20, 3, 20, 3, 17, 6, 22, 1, 22, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2827 INSERT INTO `ProfileFields` VALUES(15, 'Country', 'select_one', 'select', '', NULL, NULL, '#!Country', 'LKey', '', 0, 'US', 0, 0, 0, 20, 6, 20, 5, 20, 5, 20, 5, 17, 3, 20, 2, 20, 2, 17, 2, '', 20, 4, 20, 4, 20, 1, 15, 20); 
    2828 INSERT INTO `ProfileFields` VALUES(16, 'City', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 7, 20, 6, 20, 6, 20, 6, 17, 4, 20, 3, 20, 3, 17, 3, '', 0, NULL, 0, NULL, 20, 2, 0, 0); 
    2829 INSERT INTO `ProfileFields` VALUES(17, 'General Info', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 2, 0, 1, 0, 2, 0, 2, 0, 1, 0, 2, 0, 1, 0, 1, '', 0, 1, 0, 1, 0, 1, 0, 0); 
    2830 INSERT INTO `ProfileFields` VALUES(18, 'Location', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 5, 0, 0); 
    2831 INSERT INTO `ProfileFields` VALUES(19, 'Keyword', 'system', NULL, 'DescriptionMe\nHeadline', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 3, 0, 0); 
    2832 INSERT INTO `ProfileFields` VALUES(20, 'Misc Info', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 3, 0, 2, 0, 3, 0, 3, 0, NULL, 0, 3, 0, 2, 0, NULL, '', 0, 2, 0, 2, 0, 2, 0, 0); 
    2833 INSERT INTO `ProfileFields` VALUES(21, 'Admin Controls', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, NULL, 0, NULL, 0, 1, 0, 1, 0, NULL, 0, 5, 0, 4, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2834 INSERT INTO `ProfileFields` VALUES(22, 'Description', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, 4, 0, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2835 INSERT INTO `ProfileFields` VALUES(23, 'Couple', 'system', NULL, 'Country\nCity', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 30, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 17, 1, 0, 0); 
    2836 INSERT INTO `ProfileFields` VALUES(24, 'Captcha', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 25, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2837 INSERT INTO `ProfileFields` VALUES(25, 'Security Image', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2838 INSERT INTO `ProfileFields` VALUES(30, 'Profile Type', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2839 INSERT INTO `ProfileFields` VALUES(41, 'EmailNotify', 'system', NULL, '', NULL, NULL, 'NotifyMe\nNotNotifyMe', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2840 INSERT INTO `ProfileFields` VALUES(39, 'zip', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 8, 20, 7, 20, 7, 20, 7, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2841 INSERT INTO `ProfileFields` VALUES(34, 'DateLastNav', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2842 INSERT INTO `ProfileFields` VALUES(35, 'PrimPhoto', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2843 INSERT INTO `ProfileFields` VALUES(36, 'Picture', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2844 INSERT INTO `ProfileFields` VALUES(37, 'aff_num', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2845 INSERT INTO `ProfileFields` VALUES(38, 'Tags', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 9, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 4, 0, 0); 
    2846 INSERT INTO `ProfileFields` VALUES(42, 'TermsOfUse', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 25, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2847 INSERT INTO `ProfileFields` VALUES(43, 'Membership', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 3, 21, 3, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2848 INSERT INTO `ProfileFields` VALUES(44, 'Age', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 1, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 17, 2, 20, 1, 20, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2849 INSERT INTO `ProfileFields` VALUES(45, 'ProfilePhoto', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 10, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2850 INSERT INTO `ProfileFields` VALUES(46, 'UserStatus', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2851 INSERT INTO `ProfileFields` VALUES(47, 'UserStatusMessage', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2852 INSERT INTO `ProfileFields` VALUES(48, 'UserStatusMessageWhen', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    2853 INSERT INTO `ProfileFields` VALUES(49, 'Avatar', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2810-- Dumping data for table `sys_profile_fields` 
     2811-- 
     2812 
     2813INSERT INTO `sys_profile_fields` VALUES(1, 'ID', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 1, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 17, 1, 17, 1, 0, NULL, '', 17, 2, 17, 2, 0, NULL, 0, 0); 
     2814INSERT INTO `sys_profile_fields` VALUES(2, 'NickName', 'text', NULL, '', 4, 16, '', 'LKey', 'return ( preg_match( ''/^[\\pL\\pN_-]+$/u'', $arg0 ) and !file_exists( $dir[''root''] . $arg0 ) );', 1, '', 1, 0, 0, 17, 1, 17, 1, 17, 1, 17, 1, 0, NULL, 17, 2, 17, 2, 0, NULL, '', 17, 1, 17, 1, 0, NULL, 0, 0); 
     2815INSERT INTO `sys_profile_fields` VALUES(3, 'Password', 'pass', NULL, '', 5, 16, '', 'LKey', '', 0, '', 1, 0, 0, 17, 3, 17, 4, 17, 4, 17, 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2816INSERT INTO `sys_profile_fields` VALUES(4, 'Email', 'text', NULL, '', 6, NULL, '', 'LKey', 'return (bool)preg_match( ''/^[a-z0-9_\\-]+(\\.[_a-z0-9\\-]+)*@([_a-z0-9\\-]+\\.)+([a-z]{2}|aero|arpa|asia|biz|cat|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel)$/i'', $arg0 );', 1, '', 1, 0, 0, 17, 2, 17, 2, 17, 2, 17, 2, 0, NULL, 21, 1, 21, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2817INSERT INTO `sys_profile_fields` VALUES(5, 'DateReg', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 2, 21, 2, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2818INSERT INTO `sys_profile_fields` VALUES(6, 'DateLastEdit', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 4, 21, 4, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2819INSERT INTO `sys_profile_fields` VALUES(7, 'Status', 'system', NULL, '', NULL, NULL, 'Unconfirmed\nApproval\nActive\nRejected\nSuspended', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 1, 21, 1, 0, NULL, 17, 3, 17, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2820INSERT INTO `sys_profile_fields` VALUES(8, 'DateLastLogin', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 21, 3, 21, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2821INSERT INTO `sys_profile_fields` VALUES(9, 'Featured', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 2, 21, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2822INSERT INTO `sys_profile_fields` VALUES(10, 'Sex', 'select_one', 'radio', '', NULL, NULL, '#!Sex', 'LKey', '', 0, 'male', 1, 0, 0, 20, 1, 17, 3, 17, 3, 17, 3, 17, 1, 17, 4, 17, 4, 17, 1, '', 20, 2, 20, 2, 17, 2, 11, 40); 
     2823INSERT INTO `sys_profile_fields` VALUES(11, 'LookingFor', 'select_set', 'checkbox', '', NULL, NULL, '#!Sex', 'LKey2', '', 0, '', 0, 0, 0, 20, 2, 20, 1, 20, 1, 20, 1, 17, 5, 17, 5, 17, 5, 17, 4, '', 20, 1, 20, 1, 0, NULL, 10, 40); 
     2824INSERT INTO `sys_profile_fields` VALUES(12, 'DescriptionMe', 'area', NULL, '', 20, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 20, 5, 20, 4, 20, 4, 20, 4, 17, 7, 22, 2, 22, 2, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2825INSERT INTO `sys_profile_fields` VALUES(13, 'DateOfBirth', 'date', NULL, '', 18, 75, '', 'LKey', '', 0, '', 1, 1, 0, 20, 3, 20, 2, 20, 2, 20, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 20, 3, 20, 3, 17, 3, 0, 0); 
     2826INSERT INTO `sys_profile_fields` VALUES(14, 'Headline', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 4, 20, 3, 20, 3, 20, 3, 17, 6, 22, 1, 22, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2827INSERT INTO `sys_profile_fields` VALUES(15, 'Country', 'select_one', 'select', '', NULL, NULL, '#!Country', 'LKey', '', 0, 'US', 0, 0, 0, 20, 6, 20, 5, 20, 5, 20, 5, 17, 3, 20, 2, 20, 2, 17, 2, '', 20, 4, 20, 4, 20, 1, 15, 20); 
     2828INSERT INTO `sys_profile_fields` VALUES(16, 'City', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 7, 20, 6, 20, 6, 20, 6, 17, 4, 20, 3, 20, 3, 17, 3, '', 0, NULL, 0, NULL, 20, 2, 0, 0); 
     2829INSERT INTO `sys_profile_fields` VALUES(17, 'General Info', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 2, 0, 1, 0, 2, 0, 2, 0, 1, 0, 2, 0, 1, 0, 1, '', 0, 1, 0, 1, 0, 1, 0, 0); 
     2830INSERT INTO `sys_profile_fields` VALUES(18, 'Location', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 5, 0, 0); 
     2831INSERT INTO `sys_profile_fields` VALUES(19, 'Keyword', 'system', NULL, 'DescriptionMe\nHeadline', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 3, 0, 0); 
     2832INSERT INTO `sys_profile_fields` VALUES(20, 'Misc Info', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 3, 0, 2, 0, 3, 0, 3, 0, NULL, 0, 3, 0, 2, 0, NULL, '', 0, 2, 0, 2, 0, 2, 0, 0); 
     2833INSERT INTO `sys_profile_fields` VALUES(21, 'Admin Controls', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, NULL, 0, NULL, 0, 1, 0, 1, 0, NULL, 0, 5, 0, 4, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2834INSERT INTO `sys_profile_fields` VALUES(22, 'Description', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, 4, 0, 3, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2835INSERT INTO `sys_profile_fields` VALUES(23, 'Couple', 'system', NULL, 'Country\nCity', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 30, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 17, 1, 0, 0); 
     2836INSERT INTO `sys_profile_fields` VALUES(24, 'Captcha', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 25, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2837INSERT INTO `sys_profile_fields` VALUES(25, 'Security Image', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2838INSERT INTO `sys_profile_fields` VALUES(30, 'Profile Type', 'block', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 1, 0, 0, 1, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2839INSERT INTO `sys_profile_fields` VALUES(41, 'EmailNotify', 'system', NULL, '', NULL, NULL, 'NotifyMe\nNotNotifyMe', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2840INSERT INTO `sys_profile_fields` VALUES(39, 'zip', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 8, 20, 7, 20, 7, 20, 7, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2841INSERT INTO `sys_profile_fields` VALUES(34, 'DateLastNav', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2842INSERT INTO `sys_profile_fields` VALUES(35, 'PrimPhoto', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2843INSERT INTO `sys_profile_fields` VALUES(36, 'Picture', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2844INSERT INTO `sys_profile_fields` VALUES(37, 'aff_num', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2845INSERT INTO `sys_profile_fields` VALUES(38, 'Tags', 'text', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 9, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 20, 4, 0, 0); 
     2846INSERT INTO `sys_profile_fields` VALUES(42, 'TermsOfUse', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 1, 0, 0, 25, 2, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2847INSERT INTO `sys_profile_fields` VALUES(43, 'Membership', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 21, 3, 21, 3, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2848INSERT INTO `sys_profile_fields` VALUES(44, 'Age', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '0', 0, 1, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 17, 2, 20, 1, 20, 1, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2849INSERT INTO `sys_profile_fields` VALUES(45, 'ProfilePhoto', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 20, 10, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2850INSERT INTO `sys_profile_fields` VALUES(46, 'UserStatus', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2851INSERT INTO `sys_profile_fields` VALUES(47, 'UserStatusMessage', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2852INSERT INTO `sys_profile_fields` VALUES(48, 'UserStatusMessageWhen', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
     2853INSERT INTO `sys_profile_fields` VALUES(49, 'Avatar', 'system', NULL, '', NULL, NULL, '', 'LKey', '', 0, '', 0, 0, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, '', 0, NULL, 0, NULL, 0, NULL, 0, 0); 
    28542854 
    28552855-- -------------------------------------------------------- 
    … …  
    40394039('3', '0', '0', 'Friends', 'communicator.php?communicator_mode=friends_list', '', 'SELECT `tp`.`ID` AS `id` FROM `sys_friend_list` AS `tf` LEFT JOIN `Profiles` AS `tp` ON (`tf`.`ID`=`tp`.`ID` AND `tf`.`Profile`=\'{owner_id}\') OR (`tf`.`Profile`=`tp`.`ID` AND `tf`.`ID`=\'{owner_id}\') WHERE 1', 0), 
    40404040('4', '0', '0', 'Faves', 'communicator.php?&communicator_mode=hotlist_requests', '', 'SELECT `Profile` AS `id` FROM `sys_fave_list` WHERE `ID`=\'{owner_id}\'', 0), 
    4041 ('5', '0', '0', 'Contacts', 'mail.php?&mode=inbox&contacts_mode=Contacted', '', 'SELECT `tp`.`ID` AS `id` FROM `Messages` AS `tm` LEFT JOIN `Profiles` AS `tp` ON (`tm`.`Sender`=`tp`.`ID` AND `tm`.`Recipient`=\'{owner_id}\') OR (`tm`.`Recipient`=`tp`.`ID` AND `tm`.`Sender`=\'{owner_id}\')', 0); 
     4041('5', '0', '0', 'Contacts', 'mail.php?&mode=inbox&contacts_mode=Contacted', '', 'SELECT `tp`.`ID` AS `id` FROM `sys_messages` AS `tm` LEFT JOIN `Profiles` AS `tp` ON (`tm`.`Sender`=`tp`.`ID` AND `tm`.`Recipient`=\'{owner_id}\') OR (`tm`.`Recipient`=`tp`.`ID` AND `tm`.`Sender`=\'{owner_id}\')', 0); 
    40424042 
    40434043-- 

  • trunk/links.php

    r7196 r9985  
    5757    global $tmpl; 
    5858 
    59     $links_res = db_res( "SELECT * FROM `Links`" ); 
     59    $links_res = db_res( "SELECT * FROM `sys_links`" ); 
    6060     
    6161    if ( !mysql_num_rows( $links_res ) ) 

  • trunk/member.php

    r9984 r9985  
    104104 
    105105        // new messages attention 
    106         $new_mess_arr = db_arr( "SELECT ID FROM `Messages` WHERE Recipient = {$iChMemberID} AND New = '1' ORDER BY Date DESC LIMIT 1" ); 
     106        $new_mess_arr = db_arr( "SELECT ID FROM `sys_messages` WHERE Recipient = {$iChMemberID} AND New = '1' ORDER BY Date DESC LIMIT 1" ); 
    107107        if ( $new_mess_arr ) 
    108108            $mess = $new_mess_arr[ID]; 

  • trunk/modules/boonex/blogs/install/sql/install.sql

    r9984 r9985  
    123123INSERT INTO `sys_admin_menu` (`ID`, `Title`, `Url`, `Desc`, `Check`, `Order`, `Categ`, `Icon`) VALUES(NULL, 'Articles', '../modules/boonex/blogs/post_mod_blog.php?action=show_member_blog&ownerID=0', 'Admin blogs (as articles)', '', @iAMOrder3+1, 4, 'modules/boonex/blogs/|blogs.gif'); 
    124124 
    125 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Baby Blogs', 0, 'bx_blogs', 0, 'active'); 
    126 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Blogging for Money', 0, 'bx_blogs', 0, 'active'); 
    127 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Books', 0, 'bx_blogs', 0, 'active'); 
    128 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('City Blogs', 0, 'bx_blogs', 0, 'active'); 
    129 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Dating and Personals', 0, 'bx_blogs', 0, 'active'); 
    130 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Entertainment Blogs', 0, 'bx_blogs', 0, 'active'); 
    131 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Food Blogs', 0, 'bx_blogs', 0, 'active'); 
    132 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Games', 0, 'bx_blogs', 0, 'active'); 
    133 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Health', 0, 'bx_blogs', 0, 'active'); 
    134 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Holidays', 0, 'bx_blogs', 0, 'active'); 
    135 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Lifestyle', 0, 'bx_blogs', 0, 'active'); 
    136 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Movies', 0, 'bx_blogs', 0, 'active'); 
    137 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Music', 0, 'bx_blogs', 0, 'active'); 
    138 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Politics', 0, 'bx_blogs', 0, 'active'); 
    139 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Tech News', 0, 'bx_blogs', 0, 'active'); 
    140 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Videos', 0, 'bx_blogs', 0, 'active'); 
    141  
    142  
    143 INSERT INTO `sys_objects_categories` (`ID`, `ObjectName`, `Query`) VALUES(NULL, 'bx_blogs', 'SELECT `Categories` FROM `[db_prefix]_posts` WHERE `PostID` = {iID} AND `PostStatus` = ''approval'''); 
     125INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Baby Blogs', 0, 'bx_blogs', 0, 'active'); 
     126INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Blogging for Money', 0, 'bx_blogs', 0, 'active'); 
     127INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Books', 0, 'bx_blogs', 0, 'active'); 
     128INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('City Blogs', 0, 'bx_blogs', 0, 'active'); 
     129INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Dating and Personals', 0, 'bx_blogs', 0, 'active'); 
     130INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Entertainment Blogs', 0, 'bx_blogs', 0, 'active'); 
     131INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Food Blogs', 0, 'bx_blogs', 0, 'active'); 
     132INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Games', 0, 'bx_blogs', 0, 'active'); 
     133INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Health', 0, 'bx_blogs', 0, 'active'); 
     134INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Holidays', 0, 'bx_blogs', 0, 'active'); 
     135INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Lifestyle', 0, 'bx_blogs', 0, 'active'); 
     136INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Movies', 0, 'bx_blogs', 0, 'active'); 
     137INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Music', 0, 'bx_blogs', 0, 'active'); 
     138INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Politics', 0, 'bx_blogs', 0, 'active'); 
     139INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Tech News', 0, 'bx_blogs', 0, 'active'); 
     140INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Videos', 0, 'bx_blogs', 0, 'active'); 
     141 
     142 
     143INSERT INTO `sys_objects_categories` (`ID`, `ObjectName`, `Query`) VALUES(NULL, 'bx_blogs', 'SELECT `sys_categories` FROM `[db_prefix]_posts` WHERE `PostID` = {iID} AND `PostStatus` = ''approval'''); 
    144144 
    145145INSERT INTO `sys_options_cats` VALUES(NULL, 'Blogs', 9); 

  • trunk/modules/boonex/blogs/install/sql/uninstall.sql

    r9984 r9985  
    1313DELETE FROM `sys_admin_menu` WHERE `Url` = '../modules/boonex/blogs/post_mod_blog.php?action=show_member_blog&ownerID=0'; 
    1414 
    15 DELETE FROM `Categories` WHERE `Type`='bx_blogs'; 
     15DELETE FROM `sys_categories` WHERE `Type`='bx_blogs'; 
    1616DELETE FROM `sys_objects_categories` WHERE `ObjectName`='bx_blogs'; 
    1717 

  • trunk/modules/boonex/board/install/sql/install.sql

    r9979 r9985  
    1515INSERT INTO `sys_options` (`Name`, `VALUE`, `kateg`, `desc`, `Type`, `check`, `err_text`, `order_in_kateg`) VALUES('permalinks_module_board', 'on', 26, 'Enable friendly board permalink', 'checkbox', '', '', 0); 
    1616 
    17 INSERT INTO `Categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Board', 0, 'shared_photo', 0, 'active'); 
     17INSERT INTO `sys_categories` (`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES('Board', 0, 'shared_photo', 0, 'active'); 
    1818 
    1919INSERT INTO `sys_objects_actions` VALUES(NULL, '{evalResult}', 'palette.png', '', 'window.open(''{url}m/board/index/{ID}'',''_self'')', 'if ({medProfId} == {iViewer} AND strtolower({medTags}) == ''board'')\r\nreturn _t( ''_board_action_paint'' );\r\nelse\r\nreturn null;', 4, 'shared_photo'); 

  • trunk/modules/boonex/board/install/sql/uninstall.sql

    r9979 r9985  
    88DELETE FROM `sys_options` WHERE `Name`='permalinks_module_board'; 
    99 
    10 DELETE FROM `Categories` WHERE `Category`='Board' AND `Type`='shared_photo' AND `Owner`=0; 
     10DELETE FROM `sys_categories` WHERE `Category`='Board' AND `Type`='shared_photo' AND `Owner`=0; 
    1111 
    1212DELETE FROM `sys_objects_actions` WHERE `Script`='window.open(''{url}m/board/index/{ID}'',''_self'')'; 

  • trunk/modules/boonex/events/classes/BxEventsDb.php

    r9968 r9985  
    115115        $a = array_merge($a, $this->getAllWithKey ("SELECT `p`.`NickName`, `p`.`ID` FROM `sys_fave_list` AS `o` INNER JOIN `Profiles` AS `p` ON (`p`.`ID` = `o`.`ID` AND `o`.`Profile` = '$iProfileId')", 'NickName')); 
    116116        $a = array_merge($a, $this->getAllWithKey ("SELECT `p`.`NickName`, `p`.`ID` FROM `sys_fave_list` AS `o` INNER JOIN `Profiles` AS `p` ON (`p`.`ID` = `o`.`Profile` AND `o`.`ID` = '$iProfileId')", 'NickName')); 
    117         $a = array_merge($a, $this->getAllWithKey ("SELECT `p`.`NickName`, `p`.`ID` FROM `Messages` AS `o` INNER JOIN `Profiles` AS `p` ON (`p`.`ID` = `o`.`Recipient` AND `o`.`Sender` = '$iProfileId')", 'NickName')); 
     117        $a = array_merge($a, $this->getAllWithKey ("SELECT `p`.`NickName`, `p`.`ID` FROM `sys_messages` AS `o` INNER JOIN `Profiles` AS `p` ON (`p`.`ID` = `o`.`Recipient` AND `o`.`Sender` = '$iProfileId')", 'NickName')); 
    118118        foreach ($a as $k => $r) { 
    119119            if ($iProfileId == $r['ID']) { 

  • trunk/modules/boonex/events/install/sql/install.sql

    r9984 r9985  
    152152 
    153153-- category objects 
    154 INSERT INTO `sys_objects_categories` VALUES (NULL, 'bx_events', 'SELECT `Categories` FROM `[db_prefix]main` WHERE `ID` = {iID} AND `Status` = ''approved'''); 
    155  
    156 INSERT INTO `Categories` VALUES ('Events', '0', 'shared_photo', '0', 'active'); 
    157  
    158 INSERT INTO `Categories` VALUES ('Party', '0', 'bx_events', '0', 'active'); 
    159 INSERT INTO `Categories` VALUES ('Expedition', '0', 'bx_events', '0', 'active'); 
    160 INSERT INTO `Categories` VALUES ('Presentation', '0', 'bx_events', '0', 'active'); 
    161 INSERT INTO `Categories` VALUES ('Last Friday', '0', 'bx_events', '0', 'active'); 
    162 INSERT INTO `Categories` VALUES ('Birthday', '0', 'bx_events', '0', 'active'); 
    163 INSERT INTO `Categories` VALUES ('Exhibition', '0', 'bx_events', '0', 'active'); 
    164 INSERT INTO `Categories` VALUES ('Bushwalking', '0', 'bx_events', '0', 'active'); 
     154INSERT INTO `sys_objects_categories` VALUES (NULL, 'bx_events', 'SELECT `sys_categories` FROM `[db_prefix]main` WHERE `ID` = {iID} AND `Status` = ''approved'''); 
     155 
     156INSERT INTO `sys_categories` VALUES ('Events', '0', 'shared_photo', '0', 'active'); 
     157 
     158INSERT INTO `sys_categories` VALUES ('Party', '0', 'bx_events', '0', 'active'); 
     159INSERT INTO `sys_categories` VALUES ('Expedition', '0', 'bx_events', '0', 'active'); 
     160INSERT INTO `sys_categories` VALUES ('Presentation', '0', 'bx_events', '0', 'active'); 
     161INSERT INTO `sys_categories` VALUES ('Last Friday', '0', 'bx_events', '0', 'active'); 
     162INSERT INTO `sys_categories` VALUES ('Birthday', '0', 'bx_events', '0', 'active'); 
     163INSERT INTO `sys_categories` VALUES ('Exhibition', '0', 'bx_events', '0', 'active'); 
     164INSERT INTO `sys_categories` VALUES ('Bushwalking', '0', 'bx_events', '0', 'active'); 
    165165 
    166166-- users actions 

  • trunk/modules/boonex/events/install/sql/uninstall.sql

    r9984 r9985  
    2020DELETE FROM `sys_objects_views` WHERE `name` = 'bx_events'; 
    2121DELETE FROM `sys_objects_categories` WHERE `ObjectName` = 'bx_events'; 
    22 DELETE FROM `Categories` WHERE `Type` = 'bx_events'; 
    23 DELETE FROM `Categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Events'; 
     22DELETE FROM `sys_categories` WHERE `Type` = 'bx_events'; 
     23DELETE FROM `sys_categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Events'; 
    2424DELETE FROM `sys_objects_tag` WHERE `ObjectName` = 'bx_events'; 
    2525DELETE FROM `sys_objects_search` WHERE `ObjectName` = 'bx_events'; 

  • trunk/modules/boonex/shared_files/classes/BxShFilesUploader.php

    r9983 r9985  
    3636        if(!empty($_REQUEST)) 
    3737            $this->_aExtras = $this->_getExtraParams($_REQUEST); 
     38 
     39        $this->initModuleInstance(); 
    3840    } 
    3941 

  • trunk/modules/boonex/shared_files/install/sql/install.sql

    r9984 r9985  
    118118SET @iTMParentId = LAST_INSERT_ID( ); 
    119119INSERT INTO `sys_menu_top` (`Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Strict`, `Picture`, `BQuickLink`, `Statistics`) VALUES 
    120 (@iTMParentId, 'SharedFilesHome', '_bx_shared_files_top_menu_home', 'modules/?r=shared_files/', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    121 (@iTMParentId, 'SharedFilesAll', '_bx_shared_files_top_menu_all', 'modules/?r=shared_files/browse/all', 1, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    122 (@iTMParentId, 'SharedFilesProfile', '_bx_shared_files_top_menu_profile', 'modules/?r=shared_files/browse/owner', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    123 (@iTMParentId, 'SharedFilesTop', '_bx_shared_files_top_menu_top', 'modules/?r=shared_files/browse/top', 3, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    124 (@iTMParentId, 'SharedFilesPopular', '_bx_shared_files_top_menu_popular', 'modules/?r=shared_files/browse/popular', 4, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    125 (@iTMParentId, 'SharedFilesFeatured', '_bx_shared_files_top_menu_featured', 'modules/?r=shared_files/browse/featured', 5, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    126 (@iTMParentId, 'SharedFilesTags', '_bx_shared_files_tags_top_menu', 'tags.php?tags_mode=bx_sites', 6, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    127 (@iTMParentId, 'SharedFilesCalendar', '_bx_shared_files_top_menu_calendar', 'modules/?r=shared_files/calendar', 7, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
    128 (@iTMParentId, 'SharedFilesSearch', '_bx_shared_files_top_menu_search', 'searchKeyword.php?type=bx_shared_files', 8, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''); 
     120(@iTMParentId, 'SharedFilesHome', '_bx_shared_files_home_top_menu_sitem', 'modules/?r=shared_files/', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     121(@iTMParentId, 'SharedFilesAll', '_bx_shared_files_all_top_menu_sitem', 'modules/?r=shared_files/browse/all', 1, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     122(@iTMParentId, 'SharedFilesProfile', '_bx_shared_files_profile_top_menu_sitem', 'modules/?r=shared_files/browse/owner', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     123(@iTMParentId, 'SharedFilesTop', '_bx_shared_files_top_top_menu_sitem', 'modules/?r=shared_files/browse/top', 3, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     124(@iTMParentId, 'SharedFilesPopular', '_bx_shared_files_popular_top_menu_sitem', 'modules/?r=shared_files/browse/popular', 4, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     125(@iTMParentId, 'SharedFilesFeatured', '_bx_shared_files_featured_top_menu_sitem', 'modules/?r=shared_files/browse/featured', 5, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     126(@iTMParentId, 'SharedFilesTags', '_bx_shared_files_tags_top_menu_sitem', 'tags.php?tags_mode=bx_sites', 6, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     127(@iTMParentId, 'SharedFilesCalendar', '_bx_shared_files_calendar_top_menu_sitem', 'modules/?r=shared_files/calendar', 7, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''), 
     128(@iTMParentId, 'SharedFilesSearch', '_bx_shared_files_search_top_menu_sitem', 'modules/?r=shared_files/search', 8, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''); 
    129129 
    130130SET @iCatProfileOrder := (SELECT MAX(`Order`)+1 FROM `sys_menu_top` WHERE `Parent` = 9 ORDER BY `Order` DESC LIMIT 1); 
    131 INSERT INTO `sys_menu_top` VALUES(NULL, 9, 'SharedFiles', '_bx_shared_files_menu_profile', 'modules/?r=shared_files/browse/owner/{profileNick}', @iCatProfileOrder, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
     131INSERT INTO `sys_menu_top` VALUES(NULL, 9, 'SharedFiles', '_bx_shared_files_menu_my_sites_profile', 'modules/?r=shared_files/browse/owner/{profileNick}', @iCatProfileOrder, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
    132132SET @iCatProfileOrder := (SELECT MAX(`Order`)+1 FROM `sys_menu_top` WHERE `Parent` = 4 ORDER BY `Order` DESC LIMIT 1); 
    133 INSERT INTO `sys_menu_top` VALUES(NULL, 4, 'SharedFiles', '_bx_shared_files_menu_profile', 'modules/?r=shared_files/browse/my', @iCatProfileOrder, 'memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
    134  
     133INSERT INTO `sys_menu_top` VALUES(NULL, 4, 'SharedFiles', '_bx_shared_files_menu_my_sites_profile', 'modules/?r=shared_files/browse/my', @iCatProfileOrder, 'memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
    135134 
    136135INSERT INTO `sys_permalinks`(`standard`, `permalink`, `check`) VALUES('modules/?r=shared_files/', 'm/shared_files/', 'permalinks_module_shared_files'); 

  • trunk/modules/boonex/shared_music/install/sql/install.sql

    r9984 r9985  
    4545INSERT INTO `sys_objects_browse` VALUES('', 'shared_music', '_All Music', 'BxShMusicMain', 'modules/boonex/shared_music/classes/BxShMusicMain.php', 'BxShMusicSearch', 'modules/boonex/shared_music/classes/BxShMusicSearch.php'); 
    4646 
    47 -- Categories 
    48 INSERT INTO `Categories` VALUES 
     47-- sys_categories 
     48INSERT INTO `sys_categories` VALUES 
    4949('Profile music', 0, 'shared_music', 0, 'active'), 
    5050('Classical', 0, 'shared_music', 0, 'active'), 

  • trunk/modules/boonex/shared_music/install/sql/uninstall.sql

    r9984 r9985  
    77DELETE FROM `sys_albums` WHERE `Type`='shared_music'; 
    88 
    9 DELETE FROM `Categories` WHERE `Type` = 'shared_music'; 
     9DELETE FROM `sys_categories` WHERE `Type` = 'shared_music'; 
    1010 
    1111SET @iKatID = (SELECT  `ID` FROM `sys_options_cats` WHERE `name` = 'Shared Music' LIMIT 1); 

  • trunk/modules/boonex/shared_photo/install/sql/install.sql

    r9984 r9985  
    7272INSERT INTO `sys_objects_browse` VALUES(NULL, 'shared_photo', '_All Photos', 'BxShPhotoMain', 'modules/boonex/shared_photo/classes/BxShPhotoMain.php', 'BxShPhotoSearch', 'modules/boonex/shared_photo/classes/BxShPhotoSearch.php'); 
    7373 
    74 -- Categories for photo 
    75 INSERT INTO `Categories` VALUES 
     74-- sys_categories for photo 
     75INSERT INTO `sys_categories` VALUES 
    7676('Profile photos', 0, 'shared_photo', 0, 'active'), 
    7777('Family', 0, 'shared_photo', 0, 'active'), 
    … …  
    120120INSERT INTO `sys_page_compose` VALUES 
    121121(NULL, 'index', '960px', 'Photos Shared By Members', '_Photo Gallery', 1, 7, 'PHP', 'require_once(BX_DIRECTORY_PATH_MODULES . ''/boonex/shared_photo/classes/BxShPhotoSearch.php'');\r\n$oMedia = new BxShPhotoSearch();\r\n$oMedia->aCurrent[''paginate''][''perPage''] = getParam($oMedia->aGlParamsSettings[''maxTopFilesNum'']);\r\n$sCode = $oMedia->displayResultBlock();\r\n     if (strlen($sCode) > 0) {\r\n$aMenu = $oMedia->displayMenu();\r\n\r\n$iWidth = (int)getParam($oMedia->aGlParamsSettings[''maxSharedFileThumbWidth'']) + 16;\r\n$ret = $this->GenFormWrap($sCode, ''index'', ''_Photo Gallery'', $iWidth, $oMedia->aCurrent[''paginate''][''totalNum'']);\r\n\r\nreturn array($ret, $aMenu[0], $aMenu[1]);\r\n}\r\nelse\r\nreturn;', 1, 70, 'non,memb', 0), 
    122 (NULL, 'index', '960px', 'Profile Photos By Members', '_Profile Photos', 1, 2, 'PHP',  'require_once(BX_DIRECTORY_PATH_MODULES . ''/boonex/shared_photo/classes/BxShPhotoSearch.php'');\r\n$oMedia = new BxShPhotoSearch();\r\n$oMedia->aCurrent[''paginate''][''perPage''] = getParam($oMedia->aGlParamsSettings[''maxTopFilesNum'']);\r\n$oMedia->aCurrent[''join''][''category''] = array(''type'' => ''left'',''table'' => ''Categories'',''mainField'' => $oMedia->aPseud[''id''],''onField'' => ''ID'',''joinFields'' => '''');\r\n$oMedia->aCurrent[''restriction''][''category''] = array(''value'' => PROFILE_PHOTO_CATEGORY,''field'' => ''Category'',''operator'' => ''='',''table'' => ''Categories'');\r\n 
     122(NULL, 'index', '960px', 'Profile Photos By Members', '_Profile Photos', 1, 2, 'PHP',  'require_once(BX_DIRECTORY_PATH_MODULES . ''/boonex/shared_photo/classes/BxShPhotoSearch.php'');\r\n$oMedia = new BxShPhotoSearch();\r\n$oMedia->aCurrent[''paginate''][''perPage''] = getParam($oMedia->aGlParamsSettings[''maxTopFilesNum'']);\r\n$oMedia->aCurrent[''join''][''category''] = array(''type'' => ''left'',''table'' => ''sys_categories'',''mainField'' => $oMedia->aPseud[''id''],''onField'' => ''ID'',''joinFields'' => '''');\r\n$oMedia->aCurrent[''restriction''][''category''] = array(''value'' => PROFILE_PHOTO_CATEGORY,''field'' => ''Category'',''operator'' => ''='',''table'' => ''sys_categories'');\r\n 
    123123$sCode = $oMedia->displayResultBlock(); if (strlen($sCode) > 0) { $aMenu = $oMedia->displayMenu();\r\n$iWidth = (int)getParam($oMedia->aGlParamsSettings[''maxSharedFileThumbWidth'']) + 16;\r\n$ret = $this->GenFormWrap($sCode, ''index'', ''_Photo Gallery'', $iWidth, $oMedia->aCurrent[''paginate''][''totalNum'']); return array($ret, $aMenu[0], $aMenu[1]);\r\n} else return;', 1, 70, 'non,memb', 0), 
    124124(NULL, 'member', '960px', '', '_My Photo Gallery', 2, 6, 'PHP', 'require_once(BX_DIRECTORY_PATH_MODULES . ''boonex/shared_photo/classes/BxShPhotoSearch.php'');\r\n$oMedia = new BxShPhotoSearch();\r\n$oMedia->aCurrent[''paginate''][''perPage''] = getParam($oMedia->aGlParamsSettings[''maxTopFilesNum'']);\r\n $oMedia->aCurrent[''restriction''][''owner''][''value''] = $this->iMember;\r\n      $sCode = $oMedia->displayResultBlock();\r\nif (strlen($sCode) > 0) {\r\n$aMenu = $oMedia->displayMenu();\r\n\r\n$iWidth = (int)getParam($oMedia->aGlParamsSettings[''maxSharedFileThumbWidth'']) + 16;\r\n$ret = $this->GenFormWrap($sCode, ''member'', ''_My Photo Gallery'', $iWidth, $oMedia->aCurrent[''paginate''][''totalNum'']);\r\n \r\nreturn array($ret, $aMenu[0], $aMenu[1]);\r\n}\r\nelse\r\nreturn;', 1, 70, 'non,memb', 0), 

  • trunk/modules/boonex/shared_photo/install/sql/uninstall.sql

    r9984 r9985  
    77DELETE FROM `sys_albums` WHERE `Type`='shared_photo'; 
    88 
    9 DELETE FROM `Categories` WHERE `Type` = 'shared_photo'; 
     9DELETE FROM `sys_categories` WHERE `Type` = 'shared_photo'; 
    1010 
    1111SET @iKatID = (SELECT  `ID` FROM `sys_options_cats` WHERE `name` = 'Shared Photos' LIMIT 1); 

  • trunk/modules/boonex/shared_video/install/sql/install.sql

    r9984 r9985  
    4545INSERT INTO `sys_objects_browse` VALUES(NULL, 'shared_video', '_All Videos', 'BxShVideoMain', 'modules/boonex/shared_video/classes/BxShVideoMain.php', 'BxShVideoSearch', 'modules/boonex/shared_video/classes/BxShVideoSearch.php'); 
    4646 
    47 -- Categories 
    48 INSERT INTO `Categories` VALUES 
     47-- sys_categories 
     48INSERT INTO `sys_categories` VALUES 
    4949('Profile videos', 0, 'shared_video', 0, 'active'), 
    5050('Our lovely kids', 0, 'shared_video', 0, 'active'), 

  • trunk/modules/boonex/shared_video/install/sql/uninstall.sql

    r9984 r9985  
    77DELETE FROM `sys_albums` WHERE `Type`='shared_video'; 
    88 
    9 DELETE FROM `Categories` WHERE `Type` = 'shared_video'; 
     9DELETE FROM `sys_categories` WHERE `Type` = 'shared_video'; 
    1010 
    1111SET @iKatID = (SELECT `ID` FROM `sys_options_cats` WHERE `name` = 'Shared Videos' LIMIT 1); 

  • trunk/modules/boonex/sites/install/sql/install.sql

    r9984 r9985  
    143143INSERT INTO `sys_objects_categories` VALUES (NULL, 'bx_sites', 'SELECT `categories` FROM `[db_prefix]main` WHERE `id` = {iID} AND `status` = ''approved'''); 
    144144 
    145 INSERT INTO `Categories` VALUES ('Sites', '0', 'shared_photo', '0', 'active'); 
     145INSERT INTO `sys_categories` VALUES ('Sites', '0', 'shared_photo', '0', 'active'); 
    146146 
    147 INSERT INTO `Categories` VALUES ('Technology', '0', 'bx_sites', '0', 'active'); 
    148 INSERT INTO `Categories` VALUES ('World & Business', '0', 'bx_sites', '0', 'active'); 
    149 INSERT INTO `Categories` VALUES ('Science', '0', 'bx_sites', '0', 'active'); 
    150 INSERT INTO `Categories` VALUES ('Gaming', '0', 'bx_sites', '0', 'active'); 
    151 INSERT INTO `Categories` VALUES ('Lifestyle', '0', 'bx_sites', '0', 'active'); 
    152 INSERT INTO `Categories` VALUES ('Entertainment', '0', 'bx_sites', '0', 'active'); 
    153 INSERT INTO `Categories` VALUES ('Sports', '0', 'bx_sites', '0', 'active'); 
     147INSERT INTO `sys_categories` VALUES ('Technology', '0', 'bx_sites', '0', 'active'); 
     148INSERT INTO `sys_categories` VALUES ('World & Business', '0', 'bx_sites', '0', 'active'); 
     149INSERT INTO `sys_categories` VALUES ('Science', '0', 'bx_sites', '0', 'active'); 
     150INSERT INTO `sys_categories` VALUES ('Gaming', '0', 'bx_sites', '0', 'active'); 
     151INSERT INTO `sys_categories` VALUES ('Lifestyle', '0', 'bx_sites', '0', 'active'); 
     152INSERT INTO `sys_categories` VALUES ('Entertainment', '0', 'bx_sites', '0', 'active'); 
     153INSERT INTO `sys_categories` VALUES ('Sports', '0', 'bx_sites', '0', 'active'); 
    154154 
    155155-- users actions 

  • trunk/modules/boonex/sites/install/sql/uninstall.sql

    r9984 r9985  
    2222DELETE FROM `sys_objects_views` WHERE `name` = 'bx_sites'; 
    2323DELETE FROM `sys_objects_categories` WHERE `ObjectName` = 'bx_sites'; 
    24 DELETE FROM `Categories` WHERE `Type` = 'bx_sites'; 
    25 DELETE FROM `Categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Sites'; 
     24DELETE FROM `sys_categories` WHERE `Type` = 'bx_sites'; 
     25DELETE FROM `sys_categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Sites'; 
    2626DELETE FROM `sys_objects_tag` WHERE `ObjectName` = 'bx_sites'; 
    2727DELETE FROM `Tags` WHERE `Type` = 'bx_sites'; 

  • trunk/modules/boonex/store/install/sql/install.sql

    r9984 r9985  
    127127INSERT INTO `sys_objects_categories` VALUES (NULL, 'bx_store', 'SELECT `Categories` FROM `[db_prefix]main` WHERE `id` = {iID} AND `status` = ''approved'''); 
    128128 
    129 INSERT INTO `Categories` VALUES ('Store', '0', 'shared_photo', '0', 'active'); 
    130  
    131 INSERT INTO `Categories` VALUES ('Templates', '0', 'bx_store', '0', 'active'); 
    132 INSERT INTO `Categories` VALUES ('Languages', '0', 'bx_store', '0', 'active'); 
    133 INSERT INTO `Categories` VALUES ('GEO', '0', 'bx_store', '0', 'active'); 
    134 INSERT INTO `Categories` VALUES ('Payments', '0', 'bx_store', '0', 'active'); 
    135 INSERT INTO `Categories` VALUES ('SEO', '0', 'bx_store', '0', 'active'); 
    136 INSERT INTO `Categories` VALUES ('Security', '0', 'bx_store', '0', 'active'); 
    137 INSERT INTO `Categories` VALUES ('Entertainment', '0', 'bx_store', '0', 'active'); 
    138 INSERT INTO `Categories` VALUES ('Media', '0', 'bx_store', '0', 'active'); 
    139 INSERT INTO `Categories` VALUES ('Performance', '0', 'bx_store', '0', 'active'); 
     129INSERT INTO `sys_categories` VALUES ('Store', '0', 'shared_photo', '0', 'active'); 
     130 
     131INSERT INTO `sys_categories` VALUES ('Templates', '0', 'bx_store', '0', 'active'); 
     132INSERT INTO `sys_categories` VALUES ('Languages', '0', 'bx_store', '0', 'active'); 
     133INSERT INTO `sys_categories` VALUES ('GEO', '0', 'bx_store', '0', 'active'); 
     134INSERT INTO `sys_categories` VALUES ('Payments', '0', 'bx_store', '0', 'active'); 
     135INSERT INTO `sys_categories` VALUES ('SEO', '0', 'bx_store', '0', 'active'); 
     136INSERT INTO `sys_categories` VALUES ('Security', '0', 'bx_store', '0', 'active'); 
     137INSERT INTO `sys_categories` VALUES ('Entertainment', '0', 'bx_store', '0', 'active'); 
     138INSERT INTO `sys_categories` VALUES ('Media', '0', 'bx_store', '0', 'active'); 
     139INSERT INTO `sys_categories` VALUES ('Performance', '0', 'bx_store', '0', 'active'); 
    140140 
    141141-- users actions 

  • trunk/modules/boonex/store/install/sql/uninstall.sql

    r9984 r9985  
    1717DELETE FROM `sys_objects_views` WHERE `name` = 'bx_store'; 
    1818DELETE FROM `sys_objects_categories` WHERE `ObjectName` = 'bx_store'; 
    19 DELETE FROM `Categories` WHERE `Type` = 'bx_store'; 
    20 DELETE FROM `Categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Store'; 
     19DELETE FROM `sys_categories` WHERE `Type` = 'bx_store'; 
     20DELETE FROM `sys_categories` WHERE `Type` = 'shared_photo' AND `Category` = 'Store'; 
    2121DELETE FROM `sys_objects_tag` WHERE `ObjectName` = 'bx_store'; 
    2222DELETE FROM `Tags` WHERE `Type` = 'bx_store'; 

  • trunk/modules/boonex/wall/install/sql/install.sql

    r9979 r9985  
    100100 
    101101 
    102 INSERT INTO `Categories`(`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES 
     102INSERT INTO `sys_categories`(`Category`, `ID`, `Type`, `Owner`, `Status`) VALUES 
    103103('wall', 0, 'shared_photo', 0, 'active'), 
    104104('wall', 0, 'shared_music', 0, 'active'), 

  • trunk/modules/boonex/wall/install/sql/uninstall.sql

    r9979 r9985  
    1717DELETE FROM `sys_acl_actions` WHERE `Name` IN ('Wall Post', 'Wall Post Comment'); 
    1818 
    19 DELETE FROM `Categories` WHERE `Category`='wall'; 
     19DELETE FROM `sys_categories` WHERE `Category`='wall'; 
    2020 
    2121DELETE FROM `sys_permalinks` WHERE `check`='permalinks_module_wall'; 

  • trunk/periodic/cmd.php

    r9984 r9985  
    5252    $iDbCleanAlert = getParam('dbCleanAlert'); 
    5353 
    54     // clear from `messages` 
    55     db_res("DELETE FROM `Messages` WHERE FIND_IN_SET('sender', `Trash`) AND FIND_IN_SET('recipient', `Trash`)"); 
     54    // clear from `sys_messages` 
     55    db_res("DELETE FROM `sys_messages` WHERE FIND_IN_SET('sender', `Trash`) AND FIND_IN_SET('recipient', `Trash`)"); 
    5656 
    5757    // profile_delete 
    … …  
    7979    if ( $db_clean_msg > 0 ) 
    8080    { 
    81         $res = db_res("DELETE FROM `Messages` WHERE (TO_DAYS(NOW()) - TO_DAYS(`Date`)) > $db_clean_msg"); 
     81        $res = db_res("DELETE FROM `sys_messages` WHERE (TO_DAYS(NOW()) - TO_DAYS(`Date`)) > $db_clean_msg"); 
    8282        if ( $res ) 
    8383            $db_clean_msg_num = mysql_affected_rows(); 
    … …  
    9595        // number of seconds from now to clean date 
    9696        $iThen = time() - $iDbCleanAlert*24*60*60; 
    97         $sqlQuery = "DELETE FROM `alerts` WHERE `actionDate` NOT BETWEEN $iNow AND $iThen"; 
     97        $sqlQuery = "DELETE FROM `sys_notifications` WHERE `actionDate` NOT BETWEEN $iNow AND $iThen"; 
    9898        $rRes = db_res($sqlQuery); 
    9999        if ($rRes) 

  • trunk/templates/base/scripts/BxBaseMailBox.php

    r9889 r9985  
    183183                    `Sender`, `Recipient` 
    184184                FROM  
    185                     `Messages`  
     185                    `sys_messages`  
    186186                WHERE  
    187187                    `ID` = {$this -> aMailBoxSettings['messageID']} 
    … …  
    316316                    DATE_FORMAT(`Date`, '%d.%m.%Y %H:%i') AS `Date` 
    317317                FROM  
    318                     `Messages`  
     318                    `sys_messages`  
    319319                WHERE  
    320320                    `ID` = {$this -> aMailBoxSettings['messageID']}  
    … …  
    12621262                                `Subject`  
    12631263                            FROM  
    1264                                 `Messages`  
     1264                                `sys_messages`  
    12651265                            WHERE  
    12661266                                `ID` = {$iMessageID}  
    … …  
    13551355                    COUNT(*)  
    13561356                FROM  
    1357                     `Messages`  
     1357                    `sys_messages`  
    13581358                WHERE  
    13591359                    `Sender` = {$iMemberId} 
    … …  
    13691369                    COUNT(*)  
    13701370                FROM  
    1371                     `Messages`  
     1371                    `sys_messages`  
    13721372                WHERE  
    13731373                    ( 
    … …  
    13901390                COUNT( DISTINCT if(`Recipient` = {$iMemberId}, `Sender`, `Recipient`) ) AS `Contacts`  
    13911391            FROM  
    1392                 `Messages`  
     1392                `sys_messages`  
    13931393            WHERE 
    13941394                `Sender` = {$iMemberId}  
    … …  
    14091409                        `ID`, `Sender`, `Subject` 
    14101410                    FROM  
    1411                         `Messages`  
     1411                        `sys_messages`  
    14121412                    WHERE  
    14131413                        `Recipient`={$iMemberId}  

  • trunk/xmlrpc/BxDolXMLRPCMedia.php

    r9551 r9985  
    6666        if (!($r = db_res (" 
    6767            SELECT `c`.`Category`, COUNT(`f`.`$sFieldId`) AS `Num` 
    68             FROM `Categories` AS `c` 
     68            FROM `sys_categories` AS `c` 
    6969            LEFT JOIN `$sTable` AS `f` ON (`f`.`$sFieldId` = `c`.`ID` AND `f`.`$sFieldOwner` = '$iIdProfile') 
    7070            WHERE `c`.`Type` = '$sType' AND (`c`.`Owner` = '0' OR `c`.`Owner` = '$iIdProfile') 

  • trunk/xmlrpc/BxDolXMLRPCMessages.php

    r8596 r9985  
    5959                `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`Text`, `m`.`New`,  
    6060                `p`.`NickName` AS `Nick`  
    61             FROM `Messages` AS `m` 
     61            FROM `sys_messages` AS `m` 
    6262            LEFT JOIN `Profiles` AS `p` ON ($sJoinOn) 
    6363            WHERE `m`.`ID` = '$iMsgId'"); 
    … …  
    7777            ); 
    7878            if ($isInbox && $aRow['New']) 
    79                 db_res("UPDATE `Messages` SET `New` = 0 WHERE `ID` = '$iMsgId'"); 
     79                db_res("UPDATE `sys_messages` SET `New` = 0 WHERE `ID` = '$iMsgId'"); 
    8080        } 
    8181        else 
    … …  
    9898                `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`New`,  
    9999                `p`.`NickName` AS `Nick`  
    100             FROM `Messages` AS `m` 
     100            FROM `sys_messages` AS `m` 
    101101            LEFT JOIN `Profiles` AS `p` ON ($sJoinOn) 
    102102            WHERE $sWhere  

  • trunk/xmlrpc/BxDolXMLRPCProfileView.php

    r9975 r9985  
    1313    { 
    1414        $aRet = array(); 
    15         $r = db_res ("SELECT `pc`.`Caption`, `pc`.`Content` FROM `ProfileFields` AS `pf` INNER JOIN `sys_page_compose` AS `pc` ON (`pc`.`Func` = 'PFBlock' AND `pc`.`Content` = `pf`.`ID`) WHERE `pf`.`Type` = 'block' AND `pc`.`Column` != 0 ORDER BY `pc`.`Column`, `pc`.`Order`"); 
     15        $r = db_res ("SELECT `pc`.`Caption`, `pc`.`Content` FROM `sys_profile_fields` AS `pf` INNER JOIN `sys_page_compose` AS `pc` ON (`pc`.`Func` = 'PFBlock' AND `pc`.`Content` = `pf`.`ID`) WHERE `pf`.`Type` = 'block' AND `pc`.`Column` != 0 ORDER BY `pc`.`Column`, `pc`.`Order`"); 
    1616        while ($a = mysql_fetch_array($r)) 
    1717        { 

  • trunk/xmlrpc/BxDolXMLRPCUtil.php

    r9968 r9985  
    2121        // mail contacts received 
    2222        $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p` 
    23             INNER JOIN `Messages` AS `m` ON (`m`.`Sender` = `p`.`ID`)  
     23            INNER JOIN `sys_messages` AS `m` ON (`m`.`Sender` = `p`.`ID`)  
    2424            WHERE `p`.`ID` != $iId AND `m`.`Recipient` = $iId"); 
    2525        while ($aRow = mysql_fetch_array ($r)) 
    … …  
    2828        // mail contacts sent 
    2929        $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p` 
    30             INNER JOIN `Messages` AS `m` ON (`m`.`Recipient` = `p`.`ID`) 
     30            INNER JOIN `sys_messages` AS `m` ON (`m`.`Recipient` = `p`.`ID`) 
    3131            WHERE `p`.`ID` != $iId AND `m`.`Sender` = $iId"); 
    3232        while ($aRow = mysql_fetch_array ($r)) 
Note: See TracChangeset for help on using the changeset viewer.
 
 

Site Search

Market

Notes

Websites

About BoonEx• Contacts• © BoonEx (ACN 127966581)