Home›Help›Trac

Changeset 9969


Ignore:
Timestamp:
04/06/09 03:52:46 (3 years ago)
Author:
Andrey Prikaznov
Message:
 
Location:
trunk
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/manage_subscribers.php

    r9395 r9969  
    158158EOF; 
    159159 
    160         $sCntSQL = "SELECT COUNT(*) FROM `NotifyEmails`"; 
     160        $sCntSQL = "SELECT COUNT(*) FROM `sys_subscriptions`"; 
    161161        //////////////////////////// 
    162162        $iTotalNum = db_value( $sCntSQL ); 
    … …  
    178178        //////////////////////////// 
    179179 
    180         $sSQL = "SELECT * FROM `NotifyEmails` ORDER BY `EmailFlag` ASC, `ID` {$sqlLimit}"; 
     180        $sSQL = "SELECT * FROM `sys_subscriptions` ORDER BY `EmailFlag` ASC, `ID` {$sqlLimit}"; 
    181181        $vSubscribers = db_res( $sSQL ); 
    182182 
    … …  
    255255        $sName = process_db_input($_REQUEST['name']); 
    256256        if ($iID>0) { 
    257             $sDeleteSQL = "UPDATE `NotifyEmails` SET `Email`='{$sName}' WHERE `ID`='{$iID}' LIMIT 1"; 
     257            $sDeleteSQL = "UPDATE `sys_subscriptions` SET `Email`='{$sName}' WHERE `ID`='{$iID}' LIMIT 1"; 
    258258            db_res($sDeleteSQL); 
    259259        } 
    … …  
    263263        $iID = (int)$_REQUEST['id']; 
    264264        if ($iID>0) { 
    265             $sDeleteSQL = "DELETE FROM `NotifyEmails` WHERE `ID`='{$iID}' LIMIT 1"; 
     265            $sDeleteSQL = "DELETE FROM `sys_subscriptions` WHERE `ID`='{$iID}' LIMIT 1"; 
    266266            db_res($sDeleteSQL); 
    267267        } 
    … …  
    274274        } 
    275275        $sInArr = implode(",", $aKeys); 
    276         $sDeleteSQL = "DELETE FROM `NotifyEmails` WHERE `ID` IN ({$sInArr})"; 
     276        $sDeleteSQL = "DELETE FROM `sys_subscriptions` WHERE `ID` IN ({$sInArr})"; 
    277277        db_res($sDeleteSQL); 
    278278    } 

  • trunk/admin/memb_levels.php

    r9968 r9969  
    135135    if(!get_magic_quotes_gpc()) $membershipName = addslashes($membershipName); 
    136136 
    137     @mysql_query("INSERT INTO MemLevels (Name) VALUES ('$membershipName')"); 
     137    @mysql_query("INSERT INTO `sys_acl_levels` (Name) VALUES ('$membershipName')"); 
    138138 
    139139    if(mysql_affected_rows() > 0) { 
    … …  
    151151    if($membershipID <= 0) return ''; 
    152152 
    153     $resMemLevel = mysql_query("SELECT Removable FROM MemLevels WHERE ID = $membershipID"); 
     153    $resMemLevel = mysql_query("SELECT Removable FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    154154 
    155155    if(mysql_num_rows($resMemLevel) < 1) { 
    … …  
    186186    } 
    187187 
    188     @mysql_query("DELETE FROM MemLevelPrices WHERE IDLevel = $membershipID"); 
    189     @mysql_query("DELETE FROM MemLevelActions WHERE IDLevel = $membershipID"); 
    190     @mysql_query("DELETE FROM MemLevels WHERE ID = $membershipID"); 
     188    @mysql_query("DELETE FROM `sys_acl_level_prices` WHERE IDLevel = $membershipID"); 
     189    @mysql_query("DELETE FROM `sys_acl_matrix` WHERE IDLevel = $membershipID"); 
     190    @mysql_query("DELETE FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    191191 
    192192    if(mysql_affected_rows() > 0) { 
    … …  
    204204    if($membershipID <= 0) return ''; 
    205205 
    206     $resMemLevel = mysql_query("SELECT Purchasable FROM MemLevels WHERE ID = $membershipID"); 
     206    $resMemLevel = mysql_query("SELECT Purchasable FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    207207 
    208208    if(mysql_num_rows($resMemLevel) < 1) { 
    … …  
    219219    } 
    220220 
    221     @mysql_query("UPDATE MemLevels SET Active = '$active' WHERE ID = $membershipID"); 
     221    @mysql_query("UPDATE `sys_acl_levels` SET Active = '$active' WHERE ID = $membershipID"); 
    222222 
    223223    if(mysql_affected_rows() <= 0){ 
    … …  
    262262        </tr> 
    263263<? 
    264     $resMemLevels = db_res ( "SELECT ID, Name, Active, Purchasable, Removable FROM MemLevels ORDER BY ID" ); 
     264    $resMemLevels = db_res ( "SELECT ID, Name, Active, Purchasable, Removable FROM `sys_acl_levels` ORDER BY ID" ); 
    265265 
    266266    if (mysql_num_rows($resMemLevels) <= 0) { 
    … …  
    357357    if($days < 0 || $price <= 0) return "\n<div class=\"actionFailure\">Error: payment option has not been added</div>"; 
    358358 
    359     @mysql_query("INSERT INTO MemLevelPrices (IDLevel, Days, Price) VALUES ($membershipID, $days, $price)"); 
     359    @mysql_query("INSERT INTO `sys_acl_level_prices` (IDLevel, Days, Price) VALUES ($membershipID, $days, $price)"); 
    360360 
    361361    if(mysql_affected_rows() > 0) 
    … …  
    381381    if($membershipID <= 0 || $days < 0) return ''; 
    382382 
    383     @mysql_query("DELETE FROM MemLevelPrices WHERE IDLevel = $membershipID AND Days = $days"); 
     383    @mysql_query("DELETE FROM `sys_acl_level_prices` WHERE IDLevel = $membershipID AND Days = $days"); 
    384384 
    385385    if(mysql_affected_rows() > 0) 
    … …  
    405405    //check if membership can be purchased 
    406406 
    407     $resMemLevel = mysql_query("SELECT Purchasable FROM MemLevels WHERE ID = $membershipID"); 
     407    $resMemLevel = mysql_query("SELECT Purchasable FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    408408 
    409409    if(mysql_num_rows($resMemLevel) < 1) { 
    … …  
    430430    if($_POST['delete_payment_option']) echo deletePaymentOption($membershipID, $_POST['delete_payment_days']); 
    431431 
    432     $resLevelPrices = db_res("SELECT Days, Price FROM MemLevelPrices WHERE IDLevel = $membershipID ORDER BY Days"); 
     432    $resLevelPrices = db_res("SELECT Days, Price FROM `sys_acl_level_prices` WHERE IDLevel = $membershipID ORDER BY Days"); 
    433433?> 
    434434    <div align="right"> 
    … …  
    510510    if($membershipID <= 0 || $actionID <= 0) return ''; 
    511511 
    512     @mysql_query("INSERT INTO MemLevelActions 
     512    @mysql_query("INSERT INTO `sys_acl_matrix` 
    513513                  (IDLevel, IDAction, AllowedCount, AllowedPeriodLen, AllowedPeriodStart, AllowedPeriodEnd) 
    514514                  VALUES ($membershipID, $actionID, NULL, NULL, NULL, NULL)"); 
    … …  
    530530    if($membershipID <= 0 || $actionID <= 0) return ''; 
    531531 
    532     @mysql_query("DELETE FROM MemLevelActions WHERE IDLevel = $membershipID AND IDAction = $actionID"); 
     532    @mysql_query("DELETE FROM `sys_acl_matrix` WHERE IDLevel = $membershipID AND IDAction = $actionID"); 
    533533 
    534534    if(mysql_affected_rows() > 0) 
    … …  
    577577 
    578578    @mysql_query(" 
    579         UPDATE  MemLevelActions 
     579        UPDATE  `sys_acl_matrix` 
    580580        SET     AllowedCount = $cnt, 
    581581                AllowedPeriodLen = $periodLen, 
    … …  
    608608<div class="sectionBody"><div style="padding: 10px"> --> 
    609609<? 
    610     $resActions = db_res("SELECT ID, Name FROM MemActions ORDER BY Name"); 
     610    $resActions = db_res("SELECT ID, Name FROM `sys_acl_actions` ORDER BY Name"); 
    611611 
    612612    $arrActions = array(); 
    … …  
    639639                AdditionalParamName, 
    640640                AdditionalParamValue 
    641         FROM    MemLevelActions 
    642                 INNER JOIN MemActions 
    643                 ON MemLevelActions.IDAction = MemActions.ID 
    644         WHERE MemLevelActions.IDLevel = $membershipID 
    645         ORDER BY MemActions.Name"); 
     641        FROM    `sys_acl_matrix` 
     642                INNER JOIN `sys_acl_actions` 
     643                ON `sys_acl_matrix`.IDAction = `sys_acl_actions`.ID 
     644        WHERE `sys_acl_matrix`.IDLevel = $membershipID 
     645        ORDER BY `sys_acl_actions`.Name"); 
    646646 
    647647    $arrLevelActions = array(); 

  • trunk/admin/notifies.php

    r7128 r9969  
    3939 
    4040    // Select count of emails in queue per one message 
    41     $query = "SELECT NotifyMsgs.ID, NotifyMsgs.Subj, COUNT(NotifyQueue.Email) AS `count_per_msg` FROM NotifyMsgs INNER JOIN NotifyQueue ON (NotifyQueue.Msg = NotifyMsgs.ID) GROUP BY NotifyMsgs.ID"; 
     41    $query = "SELECT `sys_mass_messages`.ID, `sys_mass_messages`.Subj, COUNT(`sys_mail_queue`.Email) AS `count_per_msg` FROM `sys_mass_messages` INNER JOIN `sys_mail_queue` ON (`sys_mail_queue`.Msg = `sys_mass_messages`.ID) GROUP BY `sys_mass_messages`.ID"; 
    4242    $res = db_res($query); 
    4343    if ( !mysql_num_rows($res) ) 
    … …  
    7070 
    7171    // Select count of messages in queue for cupid mails 
    72     $arr_count = db_arr("SELECT COUNT(*) `count` FROM `NotifyQueue` WHERE `From` = 'ProfilesMsgText'"); 
     72    $arr_count = db_arr("SELECT COUNT(*) `count` FROM `sys_mail_queue` WHERE `From` = 'ProfilesMsgText'"); 
    7373    $numrows = $arr_count['count']; 
    7474    if ( !$numrows ) 
    … …  
    116116    $ret = ""; 
    117117 
    118     $query = "SELECT `ID` FROM `NotifyMsgs` WHERE `ID` = $msg_id"; 
     118    $query = "SELECT `ID` FROM `sys_mass_messages` WHERE `ID` = $msg_id"; 
    119119    $arr_arr = db_arr( $query ); 
    120120    if ( !$arr_arr ) 
    … …  
    126126    $emails = 0; 
    127127 
    128     // Send to all emails in NotifyEmails table 
     128    // Send to all emails in sys_subscriptions table 
    129129    if ( $_POST['send_to_subscribers'] == 'on' ) 
    130130    { 
    131         $res_eml = db_res( "SELECT `ID` FROM `NotifyEmails`" ); 
     131        $res_eml = db_res( "SELECT `ID` FROM `sys_subscriptions`" ); 
    132132        while ($arr_eml = mysql_fetch_array($res_eml)) 
    133133        { 
    134             $res = db_res("SELECT `NotifyEmails`.`Email` FROM `NotifyQueue` INNER JOIN `NotifyEmails` ON (`NotifyQueue`.`Email` = `NotifyEmails`.`ID`) WHERE `NotifyQueue`.`Email` = {$arr_eml['ID']} AND `NotifyQueue`.`Msg` = $msg_id AND `From` = 'NotifyEmails'"); 
     134            $res = db_res("SELECT `sys_subscriptions`.`Email` FROM `sys_mail_queue` INNER JOIN `sys_subscriptions` ON (`sys_mail_queue`.`Email` = `sys_subscriptions`.`ID`) WHERE `sys_mail_queue`.`Email` = {$arr_eml['ID']} AND `sys_mail_queue`.`Msg` = $msg_id AND `From` = 'sys_subscriptions'"); 
    135135            if ( $res && ($arr = mysql_fetch_array($res)) ) 
    136136            { 
    … …  
    139139            } 
    140140 
    141             $res = db_res("INSERT INTO `NotifyQueue` SET `Email` = {$arr_eml['ID']}, `Msg` = $msg_id, `From` = 'NotifyEmails', `Creation` = NOW()"); 
     141            $res = db_res("INSERT INTO `sys_mail_queue` SET `Email` = {$arr_eml['ID']}, `Msg` = $msg_id, `From` = 'sys_subscriptions', `Creation` = NOW()"); 
    142142            if ( !$res ) 
    143143            { 
    … …  
    222222                continue; 
    223223 
    224             $res = db_res("SELECT `Profiles`.`Email` FROM `NotifyQueue` INNER JOIN `Profiles` ON (`NotifyQueue`.`Email` = `Profiles`.`ID`) WHERE `NotifyQueue`.`Email` = {$arr_eml['ID']} AND `NotifyQueue`.`Msg` = $msg_id  AND `From` = 'Profiles' "); 
     224            $res = db_res("SELECT `Profiles`.`Email` FROM `sys_mail_queue` INNER JOIN `Profiles` ON (`sys_mail_queue`.`Email` = `Profiles`.`ID`) WHERE `sys_mail_queue`.`Email` = {$arr_eml['ID']} AND `sys_mail_queue`.`Msg` = $msg_id  AND `From` = 'Profiles' "); 
    225225            if ( $res && ($arr = mysql_fetch_array($res)) ) 
    226226            { 
    … …  
    229229            } 
    230230 
    231             $res = db_res("INSERT INTO `NotifyQueue` SET `Email` = {$arr_eml['ID']}, `Msg` = $msg_id, `From` = 'Profiles', `Creation` = NOW()"); 
     231            $res = db_res("INSERT INTO `sys_mail_queue` SET `Email` = {$arr_eml['ID']}, `Msg` = $msg_id, `From` = 'Profiles', `Creation` = NOW()"); 
    232232            if ( !$res ) 
    233233            { 
    … …  
    247247function AddMessage() 
    248248{ 
    249     $query = "INSERT INTO `NotifyMsgs` SET `Subj` = '". process_db_input($_POST['subj']) ."', `Text` = '". process_db_input(html2txt($_POST['body_html'])) ."',`HTML` = '". process_db_input($_POST['body_html']) ."'"; 
     249    $query = "INSERT INTO `sys_mass_messages` SET `Subj` = '". process_db_input($_POST['subj']) ."', `Text` = '". process_db_input(html2txt($_POST['body_html'])) ."',`HTML` = '". process_db_input($_POST['body_html']) ."'"; 
    250250 
    251251    $res = db_res( $query ); 
    … …  
    258258function UpdateMessage() 
    259259{ 
    260     $query = "UPDATE `NotifyMsgs` SET `Subj` = '". process_db_input($_POST['subj']) ."', `Text` = '". process_db_input(html2txt($_POST['body_html'])) ."', `HTML` = '". process_db_input($_POST['body_html']) ."' WHERE ID = '". (int)$_POST['msgs_id'] ."'"; 
     260    $query = "UPDATE `sys_mass_messages` SET `Subj` = '". process_db_input($_POST['subj']) ."', `Text` = '". process_db_input(html2txt($_POST['body_html'])) ."', `HTML` = '". process_db_input($_POST['body_html']) ."' WHERE ID = '". (int)$_POST['msgs_id'] ."'"; 
    261261 
    262262    $res = db_res( $query ); 
    … …  
    293293function DeleteMessage() 
    294294{ 
    295     $query = "DELETE FROM `NotifyMsgs` WHERE `ID` = ". (int)$_POST['msgs_id']; 
     295    $query = "DELETE FROM `sys_mass_messages` WHERE `ID` = ". (int)$_POST['msgs_id']; 
    296296    if ( !($res = db_res( $query )) ) 
    297297        return $res; 
    … …  
    299299    $_POST['msgs_id'] = 0; 
    300300 
    301     $query = "DELETE FROM `NotifyQueue` WHERE `Msg` = ". (int)$_POST['msgs_id']; 
     301    $query = "DELETE FROM `sys_mail_queue` WHERE `Msg` = ". (int)$_POST['msgs_id']; 
    302302    $res = db_res( $query ); 
    303303 
    … …  
    307307function EmptyQueue() 
    308308{ 
    309     return db_res("TRUNCATE TABLE `NotifyQueue`"); 
     309    return db_res("TRUNCATE TABLE `sys_mail_queue`"); 
    310310} 
    311311 
    … …  
    384384<? 
    385385 
    386 $res_msgs = db_res("SELECT `ID`, `Subj`, `Text`, `HTML`, (`ID` = ". (int)$_POST['msgs_id'] ." OR `Subj` = '". process_db_input($_POST['subj']) ."' ) AS `Selected` FROM `NotifyMsgs`"); 
     386$res_msgs = db_res("SELECT `ID`, `Subj`, `Text`, `HTML`, (`ID` = ". (int)$_POST['msgs_id'] ." OR `Subj` = '". process_db_input($_POST['subj']) ."' ) AS `Selected` FROM `sys_mass_messages`"); 
    387387while ( $arr_msgs = mysql_fetch_array($res_msgs) ) 
    388388{ 
    … …  
    413413elseif ( $_POST['msgs_id'] ) 
    414414{ 
    415     $arr = db_arr( "SELECT * FROM `NotifyMsgs` WHERE `ID` = ". (int)$_POST['msgs_id'] ); 
     415    $arr = db_arr( "SELECT * FROM `sys_mass_messages` WHERE `ID` = ". (int)$_POST['msgs_id'] ); 
    416416    $body_html = $arr['HTML']; 
    417417    $body_text = $arr['Text']; 

  • trunk/admin/profiles.php

    r9959 r9969  
    256256 
    257257if (getParam("free_mode") != 'on') { 
    258     $sMemField = ", `IDLevel`, IF(ISNULL(`MemLevels`.`Name`),'', `MemLevels`.`Name`) AS `MemName`"; 
     258    $sMemField = ", `IDLevel`, IF(ISNULL(`sys_acl_levels`.`Name`),'', `sys_acl_levels`.`Name`) AS `MemName`"; 
    259259    $sMemJoin  = "LEFT JOIN `ProfileMemLevels` ON `ProfileMemLevels`.`IDMember` = `Profiles`.`ID`  
    260                   LEFT JOIN `MemLevels` ON `ProfileMemLevels`.`IDLevel` = `MemLevels`.`ID` "; 
     260                  LEFT JOIN `sys_acl_levels` ON `ProfileMemLevels`.`IDLevel` = `sys_acl_levels`.`ID` "; 
    261261    $sMemLevelShow = 'style="display:block;"'; 
    262262    $sGroup = "GROUP BY `Profiles`.`ID`"; 

  • trunk/explanation.php

    r8016 r9969  
    6060                AdditionalParamName, 
    6161                AdditionalParamValue 
    62         FROM    MemLevelActions 
    63                 INNER JOIN MemActions 
    64                 ON MemLevelActions.IDAction = MemActions.ID 
    65         WHERE MemLevelActions.IDLevel = '{$membershipID}' 
    66         ORDER BY MemActions.Name"); 
     62        FROM    `sys_acl_matrix` 
     63                INNER JOIN `sys_acl_actions` 
     64                ON `sys_acl_matrix`.IDAction = `sys_acl_actions`.ID 
     65        WHERE `sys_acl_matrix`.IDLevel = '{$membershipID}' 
     66        ORDER BY `sys_acl_actions`.Name"); 
    6767 
    6868          ob_start(); 

  • trunk/inc/admin.inc.php

    r9968 r9969  
    10671067        return 0; 
    10681068 
    1069     $arr = db_arr("SELECT ID FROM NotifyEmails WHERE Email LIKE '$email' LIMIT 1"); 
     1069    $arr = db_arr("SELECT ID FROM `sys_subscriptions` WHERE Email LIKE '$email' LIMIT 1"); 
    10701070    if ( $arr['ID'] ) 
    10711071        return 0; 
    10721072 
    1073     return db_res("INSERT INTO NotifyEmails SET Email = '$email', Name = '$Name', EmailFlag = '$EmailFlag', EmailText = '$EmailText'"); 
     1073    return db_res("INSERT INTO `sys_subscriptions` SET Email = '$email', Name = '$Name', EmailFlag = '$EmailFlag', EmailText = '$EmailText'"); 
    10741074} 
    10751075 

  • trunk/inc/match.inc.php

    r8641 r9969  
    131131    $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/html; charset=UTF-8\r\n" . $headers; 
    132132 
    133     $sql = "INSERT INTO `NotifyQueue` SET `Email` = {$aAnyProf['ID']}, Msg = 0, `From` = 'ProfilesMsgText', Creation = NOW(), MsgText = '$message', MsgSubj = '$subject'"; 
     133    $sql = "INSERT INTO `sys_mail_queue` SET `Email` = {$aAnyProf['ID']}, Msg = 0, `From` = 'ProfilesMsgText', Creation = NOW(), MsgText = '$message', MsgSubj = '$subject'"; 
    134134    $res = db_res($sql); 
    135135    return true; 

  • trunk/inc/membership_levels.inc.php

    r9126 r9969  
    162162    $arrMemLevel =& $GLOBALS['MySQL']->fromMemory($sCacheName, 'getRow', " 
    163163        SELECT  ProfileMemLevels.IDLevel as ID, 
    164                 MemLevels.Name as Name, 
     164                `sys_acl_levels`.Name as Name, 
    165165                UNIX_TIMESTAMP(ProfileMemLevels.DateStarts) as DateStarts, 
    166166                UNIX_TIMESTAMP(ProfileMemLevels.DateExpires) as DateExpires 
    … …  
    173173                    AND (ProfileMemLevels.DateExpires IS NULL 
    174174                        OR ProfileMemLevels.DateExpires > FROM_UNIXTIME($time)) 
    175                 LEFT JOIN MemLevels 
    176                 ON ProfileMemLevels.IDLevel = MemLevels.ID 
     175                LEFT JOIN `sys_acl_levels` 
     176                ON ProfileMemLevels.IDLevel = `sys_acl_levels`.ID 
    177177 
    178178        WHERE   Profiles.ID = $memberID 
    … …  
    187187    { 
    188188        //fetch info about Non-member membership 
    189         $arrMemLevel =& $GLOBALS['MySQL']->fromCache('MemLevels'.MEMBERSHIP_ID_NON_MEMBER, 'getRow', "SELECT ID, Name FROM MemLevels WHERE ID = ".MEMBERSHIP_ID_NON_MEMBER); 
     189        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('sys_acl_levels'.MEMBERSHIP_ID_NON_MEMBER, 'getRow', "SELECT ID, Name FROM `sys_acl_levels` WHERE ID = ".MEMBERSHIP_ID_NON_MEMBER); 
    190190        if (!$arrMemLevel || !count($arrMemLevel)) 
    191191        { 
    … …  
    205205    if(is_null($arrMemLevel['ID'])) 
    206206    { 
    207         $arrMemLevel =& $GLOBALS['MySQL']->fromCache('MemLevels'.MEMBERSHIP_ID_STANDARD, 'getRow', "SELECT ID, Name FROM MemLevels WHERE ID = ".MEMBERSHIP_ID_STANDARD); 
     207        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('sys_acl_levels'.MEMBERSHIP_ID_STANDARD, 'getRow', "SELECT ID, Name FROM `sys_acl_levels` WHERE ID = ".MEMBERSHIP_ID_STANDARD); 
    208208        if (!$arrMemLevel || !count($arrMemLevel)) 
    209209        { 
    … …  
    436436                UNIX_TIMESTAMP(AllowedPeriodEnd) as AllowedPeriodEnd, 
    437437                AdditionalParamValue 
    438         FROM    MemActions 
    439                 LEFT JOIN MemLevelActions 
    440                 ON  MemLevelActions.IDAction = MemActions.ID 
    441                     AND MemLevelActions.IDLevel = {$arrMembership['ID']} 
    442         WHERE   MemActions.ID = $actionID"); 
     438        FROM    `sys_acl_actions` 
     439                LEFT JOIN `sys_acl_matrix` 
     440                ON  `sys_acl_matrix`.IDAction = `sys_acl_actions`.ID 
     441                    AND `sys_acl_matrix`.IDLevel = {$arrMembership['ID']} 
     442        WHERE   `sys_acl_actions`.ID = $actionID"); 
    443443 
    444444    //no such action 
    … …  
    515515        $actionTrack = db_res("SELECT ActionsLeft, 
    516516                                      UNIX_TIMESTAMP(ValidSince) as ValidSince 
    517                                FROM MemActionsTrack 
     517                               FROM `sys_acl_actions_track` 
    518518                               WHERE IDAction = $actionID AND IDMember = $memberID"); 
    519519 
    … …  
    522522 
    523523        //member is requesting/performing this action for the first time, 
    524         //and there is no corresponding record in MemActionsTrack table 
     524        //and there is no corresponding record in sys_acl_actions_track table 
    525525 
    526526        if(mysql_num_rows($actionTrack) <= 0) 
    527527        { 
    528             //add action to MemActionsTrack table 
     528            //add action to sys_acl_actions_track table 
    529529 
    530530            db_res(" 
    531                 INSERT INTO MemActionsTrack (IDAction, IDMember, ActionsLeft, ValidSince) 
     531                INSERT INTO `sys_acl_actions_track` (IDAction, IDMember, ActionsLeft, ValidSince) 
    532532                VALUES ($actionID, $memberID, $actionsLeft, FROM_UNIXTIME($validSince))"); 
    533533 
    … …  
    537537 
    538538        //action has been requested/performed at least once at this point 
    539         //and there is a corresponding record in MemActionsTrack table 
     539        //and there is a corresponding record in sys_acl_actions_track table 
    540540 
    541541        $actionTrack = mysql_fetch_assoc($actionTrack); 
    542542 
    543         //action record in MemActionsTrack table is out of date 
     543        //action record in sys_acl_actions_track table is out of date 
    544544 
    545545        $periodEnd = (int)$actionTrack['ValidSince'] + $periodLen * 3600; //ValidSince is in seconds, PeriodLen is in hours 
    … …  
    548548        { 
    549549            db_res(" 
    550                 UPDATE  MemActionsTrack 
     550                UPDATE  `sys_acl_actions_track` 
    551551                SET     ActionsLeft = $actionsLeft, ValidSince = FROM_UNIXTIME($validSince) 
    552552                WHERE   IDAction = $actionID AND IDMember = $memberID"); 
    … …  
    581581 
    582582            db_res(" 
    583                 UPDATE MemActionsTrack 
     583                UPDATE `sys_acl_actions_track` 
    584584                SET ActionsLeft = $actionsLeft 
    585585                WHERE IDAction = $actionID AND IDMember = $memberID"); 
    … …  
    626626    //check if membership is active and purchasable 
    627627 
    628     $resMemLevels = db_res("SELECT Active, Purchasable FROM MemLevels WHERE ID = $membershipID"); 
     628    $resMemLevels = db_res("SELECT Active, Purchasable FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    629629 
    630630    if(mysql_num_rows($resMemLevels) <= 0) return false;    //membership not found 
    … …  
    696696 
    697697    //check if membership exists 
    698     $res = db_res("SELECT COUNT(ID) FROM MemLevels WHERE ID = $membershipID"); 
     698    $res = db_res("SELECT COUNT(ID) FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    699699    $res = mysql_fetch_row($res); 
    700700    if($res[0]!=1) return false; 
    … …  
    811811    if($purchasableOnly) 
    812812    { 
    813         $queryPurchasable = "INNER JOIN MemLevelPrices ON MemLevelPrices.IDLevel = MemLevels.ID WHERE Purchasable = 'yes' AND Active = 'yes'"; 
    814     } 
    815  
    816     $resMemLevels = db_res("SELECT DISTINCT ID, Name FROM MemLevels $queryPurchasable"); 
     813        $queryPurchasable = "INNER JOIN `sys_acl_level_prices` ON `sys_acl_level_prices`.IDLevel = `sys_acl_levels`.ID WHERE Purchasable = 'yes' AND Active = 'yes'"; 
     814    } 
     815 
     816    $resMemLevels = db_res("SELECT DISTINCT ID, Name FROM `sys_acl_levels` $queryPurchasable"); 
    817817 
    818818    while(list($id, $name) = mysql_fetch_row($resMemLevels)) 
    … …  
    838838    $result = array(); 
    839839 
    840     $resMemLevelPrices = db_res("SELECT Days, Price FROM MemLevelPrices WHERE IDLevel = $membershipID ORDER BY Days ASC"); 
     840    $resMemLevelPrices = db_res("SELECT Days, Price FROM `sys_acl_level_prices` WHERE IDLevel = $membershipID ORDER BY Days ASC"); 
    841841 
    842842    while(list($days, $price) = mysql_fetch_row($resMemLevelPrices)) 
    … …  
    865865    $result = array(); 
    866866 
    867     $resMemLevels = db_res("SELECT Name, Active, Purchasable, Removable FROM MemLevels WHERE ID = $membershipID"); 
     867    $resMemLevels = db_res("SELECT Name, Active, Purchasable, Removable FROM `sys_acl_levels` WHERE ID = $membershipID"); 
    868868 
    869869    if(mysql_num_rows($resMemLevels) > 0) 
    … …  
    880880 *  my action => BX_MY_ACTION 
    881881 * 
    882  * @param $aActions array of actions from MemActions table, with default array keys (starting from 0) and text values 
     882 * @param $aActions array of actions from sys_acl_actions table, with default array keys (starting from 0) and text values 
    883883 */ 
    884884function defineMembershipActions ($aActions, $sPrefix = 'BX_') 
    … …  
    887887        return; 
    888888    $sActions = implode("','", $aActions);         
    889     $res = db_res("SELECT `ID`, `Name` FROM `MemActions` WHERE `Name` IN('$sActions')"); 
     889    $res = db_res("SELECT `ID`, `Name` FROM `sys_acl_actions` WHERE `Name` IN('$sActions')"); 
    890890    while ($r = mysql_fetch_array($res)) { 
    891891        define ($sPrefix . strtoupper(str_replace(' ', '_', $r['Name'])), $r['ID']); 

  • trunk/install/sql/v70.sql

    r9968 r9969  
    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`, `Admins`, `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`, `GlParams`, `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`, `IPList`, `IPMembersVisits`, `Links`, `LocalizationCategories`, `LocalizationKeys`, `LocalizationLanguages`, `LocalizationStringParams`, `LocalizationStrings`, `MemActions`, `MemActionsTrack`, `members_as_aff`, `MemLevelActions`, `MemLevelPrices`, `MemLevels`, `Messages`, `moderators`, `Modules`, `News`, `NotifyEmails`, `NotifyMsgs`, `NotifyQueue`, `PageCompose`, `PageComposePages`, `PaymentParameters`, `PaymentProviders`, `PaymentSubscriptions`, `PQStatistics`, `PreValues`, `ProfileFields`, `ProfileMemLevels`, `Profiles`, `profile_views_track`, `ProfilesMatch`, `ProfilesSettings`, `ProfilesTrack`, `profile_rating`, `profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayGlobalTrackUsers`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideo_commentsFiles`, `SearchObjects`, `sharedSites`, `SiteStat`, `smiles`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `Stories`, `Tags`, `TagObjects`, `TopMenu`, `Transactions`, `UsersActions`, `Greetings`, `Votes`, `ZIPCodes`, `VoteObjects`, `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`, `Admins`, `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`, `GlParams`, `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`, `IPList`, `IPMembersVisits`, `Links`, `LocalizationCategories`, `LocalizationKeys`, `LocalizationLanguages`, `LocalizationStringParams`, `LocalizationStrings`, `sys_acl_actions`, `sys_acl_actions_track`, `members_as_aff`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `Messages`, `moderators`, `Modules`, `News`, `sys_subscriptions`, `sys_mass_messages`, `sys_mail_queue`, `PageCompose`, `PageComposePages`, `PaymentParameters`, `PaymentProviders`, `PaymentSubscriptions`, `PQStatistics`, `PreValues`, `ProfileFields`, `ProfileMemLevels`, `Profiles`, `profile_views_track`, `ProfilesMatch`, `ProfilesSettings`, `ProfilesTrack`, `profile_rating`, `profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayGlobalTrackUsers`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideo_commentsFiles`, `SearchObjects`, `sharedSites`, `SiteStat`, `smiles`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `Stories`, `Tags`, `TagObjects`, `TopMenu`, `Transactions`, `UsersActions`, `Greetings`, `Votes`, `ZIPCodes`, `VoteObjects`, `sys_objects_views`, `sys_box_download`; 
    99ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; 
    1010 
    … …  
    18291829-- -------------------------------------------------------- 
    18301830-- 
    1831 -- Table structure for table `MemActions` 
    1832 -- 
    1833  
    1834 CREATE TABLE `MemActions` ( 
     1831-- Table structure for table `sys_acl_actions` 
     1832-- 
     1833 
     1834CREATE TABLE `sys_acl_actions` ( 
    18351835  `ID` smallint(5) unsigned NOT NULL auto_increment, 
    18361836  `Name` varchar(255) NOT NULL default '', 
    … …  
    18401840 
    18411841-- 
    1842 -- Dumping data for table `MemActions` 
    1843 -- 
    1844  
    1845 INSERT INTO `MemActions` VALUES(1, 'send greetings', NULL); 
    1846 INSERT INTO `MemActions` VALUES(4, 'view profiles', NULL); 
    1847 INSERT INTO `MemActions` VALUES(5, 'use forum', NULL); 
    1848 INSERT INTO `MemActions` VALUES(6, 'make search', 'Max. number of profiles shown in search result (0 = unlimited)'); 
    1849 INSERT INTO `MemActions` VALUES(7, 'vote', NULL); 
    1850 INSERT INTO `MemActions` VALUES(8, 'send messages', NULL); 
    1851 INSERT INTO `MemActions` VALUES(9, 'view photos', NULL); 
    1852 INSERT INTO `MemActions` VALUES(15, 'get other members'' emails', NULL); 
    1853 INSERT INTO `MemActions` VALUES(16, 'use gallery', NULL); 
    1854 INSERT INTO `MemActions` VALUES(17, 'view other members'' galleries', NULL); 
    1855 INSERT INTO `MemActions` VALUES(18, 'use Ray mp3 player', NULL); 
    1856 INSERT INTO `MemActions` VALUES(21, 'use Ray video player', NULL); 
    1857 INSERT INTO `MemActions` VALUES(24, 'rate photos', NULL); 
    1858 INSERT INTO `MemActions` VALUES(25, 'use Orca public forums', NULL); 
    1859 INSERT INTO `MemActions` VALUES(26, 'use Orca private forums', NULL); 
    1860 INSERT INTO `MemActions` VALUES(27, 'upload Music (Music Gallery)', NULL); 
    1861 INSERT INTO `MemActions` VALUES(28, 'upload Photos (Photo Gallery)', NULL); 
    1862 INSERT INTO `MemActions` VALUES(29, 'upload Video (Video Gallery)', NULL); 
    1863 INSERT INTO `MemActions` VALUES(30, 'play Music (Music Gallery)', NULL); 
    1864 INSERT INTO `MemActions` VALUES(31, 'view Photos (Photo Gallery)', NULL); 
    1865 INSERT INTO `MemActions` VALUES(32, 'play Video (Video Gallery)', NULL); 
    1866 INSERT INTO `MemActions` VALUES(33, 'comments post', NULL); 
    1867 INSERT INTO `MemActions` VALUES(34, 'comments vote', NULL); 
    1868 INSERT INTO `MemActions` VALUES(35, 'comments edit own', NULL); 
    1869 INSERT INTO `MemActions` VALUES(36, 'comments remove own', NULL); 
    1870  
    1871 -- -------------------------------------------------------- 
    1872  
    1873 -- 
    1874 -- Table structure for table `MemActionsTrack` 
    1875 -- 
    1876  
    1877 CREATE TABLE `MemActionsTrack` ( 
     1842-- Dumping data for table `sys_acl_actions` 
     1843-- 
     1844 
     1845INSERT INTO `sys_acl_actions` VALUES(1, 'send greetings', NULL); 
     1846INSERT INTO `sys_acl_actions` VALUES(4, 'view profiles', NULL); 
     1847INSERT INTO `sys_acl_actions` VALUES(5, 'use forum', NULL); 
     1848INSERT INTO `sys_acl_actions` VALUES(6, 'make search', 'Max. number of profiles shown in search result (0 = unlimited)'); 
     1849INSERT INTO `sys_acl_actions` VALUES(7, 'vote', NULL); 
     1850INSERT INTO `sys_acl_actions` VALUES(8, 'send messages', NULL); 
     1851INSERT INTO `sys_acl_actions` VALUES(9, 'view photos', NULL); 
     1852INSERT INTO `sys_acl_actions` VALUES(15, 'get other members'' emails', NULL); 
     1853INSERT INTO `sys_acl_actions` VALUES(16, 'use gallery', NULL); 
     1854INSERT INTO `sys_acl_actions` VALUES(17, 'view other members'' galleries', NULL); 
     1855INSERT INTO `sys_acl_actions` VALUES(18, 'use Ray mp3 player', NULL); 
     1856INSERT INTO `sys_acl_actions` VALUES(21, 'use Ray video player', NULL); 
     1857INSERT INTO `sys_acl_actions` VALUES(24, 'rate photos', NULL); 
     1858INSERT INTO `sys_acl_actions` VALUES(25, 'use Orca public forums', NULL); 
     1859INSERT INTO `sys_acl_actions` VALUES(26, 'use Orca private forums', NULL); 
     1860INSERT INTO `sys_acl_actions` VALUES(27, 'upload Music (Music Gallery)', NULL); 
     1861INSERT INTO `sys_acl_actions` VALUES(28, 'upload Photos (Photo Gallery)', NULL); 
     1862INSERT INTO `sys_acl_actions` VALUES(29, 'upload Video (Video Gallery)', NULL); 
     1863INSERT INTO `sys_acl_actions` VALUES(30, 'play Music (Music Gallery)', NULL); 
     1864INSERT INTO `sys_acl_actions` VALUES(31, 'view Photos (Photo Gallery)', NULL); 
     1865INSERT INTO `sys_acl_actions` VALUES(32, 'play Video (Video Gallery)', NULL); 
     1866INSERT INTO `sys_acl_actions` VALUES(33, 'comments post', NULL); 
     1867INSERT INTO `sys_acl_actions` VALUES(34, 'comments vote', NULL); 
     1868INSERT INTO `sys_acl_actions` VALUES(35, 'comments edit own', NULL); 
     1869INSERT INTO `sys_acl_actions` VALUES(36, 'comments remove own', NULL); 
     1870 
     1871-- -------------------------------------------------------- 
     1872 
     1873-- 
     1874-- Table structure for table `sys_acl_actions_track` 
     1875-- 
     1876 
     1877CREATE TABLE `sys_acl_actions_track` ( 
    18781878  `IDAction` smallint(5) unsigned NOT NULL default '0', 
    18791879  `IDMember` int(10) unsigned NOT NULL default '0', 
    … …  
    18841884 
    18851885-- 
    1886 -- Dumping data for table `MemActionsTrack` 
     1886-- Dumping data for table `sys_acl_actions_track` 
    18871887-- 
    18881888 
    … …  
    19101910 
    19111911-- 
    1912 -- Table structure for table `MemLevelActions` 
    1913 -- 
    1914  
    1915 CREATE TABLE `MemLevelActions` ( 
     1912-- Table structure for table `sys_acl_matrix` 
     1913-- 
     1914 
     1915CREATE TABLE `sys_acl_matrix` ( 
    19161916  `IDLevel` smallint(5) unsigned NOT NULL default '0', 
    19171917  `IDAction` smallint(5) unsigned NOT NULL default '0', 
    … …  
    19251925 
    19261926-- 
    1927 -- Dumping data for table `MemLevelActions` 
    1928 -- 
    1929  
    1930 INSERT INTO `MemLevelActions` VALUES(1, 6, NULL, NULL, NULL, NULL, '10'); 
    1931 INSERT INTO `MemLevelActions` VALUES(1, 7, NULL, NULL, NULL, NULL, NULL); 
    1932 INSERT INTO `MemLevelActions` VALUES(1, 14, NULL, NULL, NULL, NULL, NULL); 
    1933 INSERT INTO `MemLevelActions` VALUES(2, 1, 4, 24, NULL, NULL, NULL); 
    1934 INSERT INTO `MemLevelActions` VALUES(2, 4, 2, 24, NULL, NULL, NULL); 
    1935 INSERT INTO `MemLevelActions` VALUES(2, 6, 5, 24, NULL, NULL, '0'); 
    1936 INSERT INTO `MemLevelActions` VALUES(2, 7, 15, 24, NULL, NULL, NULL); 
    1937 INSERT INTO `MemLevelActions` VALUES(2, 8, 2, 24, NULL, NULL, NULL); 
    1938 INSERT INTO `MemLevelActions` VALUES(3, 1, NULL, NULL, NULL, NULL, NULL); 
    1939 INSERT INTO `MemLevelActions` VALUES(3, 2, NULL, NULL, NULL, NULL, NULL); 
    1940 INSERT INTO `MemLevelActions` VALUES(3, 3, NULL, NULL, NULL, NULL, NULL); 
    1941 INSERT INTO `MemLevelActions` VALUES(3, 4, NULL, NULL, NULL, NULL, NULL); 
    1942 INSERT INTO `MemLevelActions` VALUES(3, 5, NULL, NULL, NULL, NULL, NULL); 
    1943 INSERT INTO `MemLevelActions` VALUES(3, 6, NULL, NULL, NULL, NULL, NULL); 
    1944 INSERT INTO `MemLevelActions` VALUES(3, 7, NULL, NULL, NULL, NULL, NULL); 
    1945 INSERT INTO `MemLevelActions` VALUES(3, 8, NULL, NULL, NULL, NULL, NULL); 
    1946 INSERT INTO `MemLevelActions` VALUES(3, 9, NULL, NULL, NULL, NULL, NULL); 
    1947 INSERT INTO `MemLevelActions` VALUES(3, 10, NULL, NULL, NULL, NULL, NULL); 
    1948 INSERT INTO `MemLevelActions` VALUES(3, 11, NULL, NULL, NULL, NULL, NULL); 
    1949 INSERT INTO `MemLevelActions` VALUES(3, 12, NULL, NULL, NULL, NULL, NULL); 
    1950 INSERT INTO `MemLevelActions` VALUES(3, 13, NULL, NULL, NULL, NULL, NULL); 
    1951 INSERT INTO `MemLevelActions` VALUES(3, 14, NULL, NULL, NULL, NULL, NULL); 
    1952 INSERT INTO `MemLevelActions` VALUES(3, 15, NULL, NULL, NULL, NULL, NULL); 
    1953 INSERT INTO `MemLevelActions` VALUES(3, 16, NULL, NULL, NULL, NULL, NULL); 
    1954 INSERT INTO `MemLevelActions` VALUES(3, 17, NULL, NULL, NULL, NULL, NULL); 
    1955 INSERT INTO `MemLevelActions` VALUES(2, 9, NULL, NULL, NULL, NULL, NULL); 
    1956 INSERT INTO `MemLevelActions` VALUES(2, 23, NULL, NULL, NULL, NULL, NULL); 
    1957 INSERT INTO `MemLevelActions` VALUES(2, 24, NULL, NULL, NULL, NULL, NULL); 
    1958 INSERT INTO `MemLevelActions` VALUES(1, 25, NULL, NULL, NULL, NULL, NULL); 
    1959 INSERT INTO `MemLevelActions` VALUES(2, 25, NULL, NULL, NULL, NULL, NULL); 
    1960 INSERT INTO `MemLevelActions` VALUES(3, 25, NULL, NULL, NULL, NULL, NULL); 
    1961 INSERT INTO `MemLevelActions` VALUES(3, 26, NULL, NULL, NULL, NULL, NULL); 
    1962 INSERT INTO `MemLevelActions` VALUES(2, 33, NULL, NULL, NULL, NULL, NULL); 
    1963 INSERT INTO `MemLevelActions` VALUES(2, 34, NULL, NULL, NULL, NULL, NULL); 
    1964  
    1965 -- -------------------------------------------------------- 
    1966  
    1967 -- 
    1968 -- Table structure for table `MemLevelPrices` 
    1969 -- 
    1970  
    1971 CREATE TABLE `MemLevelPrices` ( 
     1927-- Dumping data for table `sys_acl_matrix` 
     1928-- 
     1929 
     1930INSERT INTO `sys_acl_matrix` VALUES(1, 6, NULL, NULL, NULL, NULL, '10'); 
     1931INSERT INTO `sys_acl_matrix` VALUES(1, 7, NULL, NULL, NULL, NULL, NULL); 
     1932INSERT INTO `sys_acl_matrix` VALUES(1, 14, NULL, NULL, NULL, NULL, NULL); 
     1933INSERT INTO `sys_acl_matrix` VALUES(2, 1, 4, 24, NULL, NULL, NULL); 
     1934INSERT INTO `sys_acl_matrix` VALUES(2, 4, 2, 24, NULL, NULL, NULL); 
     1935INSERT INTO `sys_acl_matrix` VALUES(2, 6, 5, 24, NULL, NULL, '0'); 
     1936INSERT INTO `sys_acl_matrix` VALUES(2, 7, 15, 24, NULL, NULL, NULL); 
     1937INSERT INTO `sys_acl_matrix` VALUES(2, 8, 2, 24, NULL, NULL, NULL); 
     1938INSERT INTO `sys_acl_matrix` VALUES(3, 1, NULL, NULL, NULL, NULL, NULL); 
     1939INSERT INTO `sys_acl_matrix` VALUES(3, 2, NULL, NULL, NULL, NULL, NULL); 
     1940INSERT INTO `sys_acl_matrix` VALUES(3, 3, NULL, NULL, NULL, NULL, NULL); 
     1941INSERT INTO `sys_acl_matrix` VALUES(3, 4, NULL, NULL, NULL, NULL, NULL); 
     1942INSERT INTO `sys_acl_matrix` VALUES(3, 5, NULL, NULL, NULL, NULL, NULL); 
     1943INSERT INTO `sys_acl_matrix` VALUES(3, 6, NULL, NULL, NULL, NULL, NULL); 
     1944INSERT INTO `sys_acl_matrix` VALUES(3, 7, NULL, NULL, NULL, NULL, NULL); 
     1945INSERT INTO `sys_acl_matrix` VALUES(3, 8, NULL, NULL, NULL, NULL, NULL); 
     1946INSERT INTO `sys_acl_matrix` VALUES(3, 9, NULL, NULL, NULL, NULL, NULL); 
     1947INSERT INTO `sys_acl_matrix` VALUES(3, 10, NULL, NULL, NULL, NULL, NULL); 
     1948INSERT INTO `sys_acl_matrix` VALUES(3, 11, NULL, NULL, NULL, NULL, NULL); 
     1949INSERT INTO `sys_acl_matrix` VALUES(3, 12, NULL, NULL, NULL, NULL, NULL); 
     1950INSERT INTO `sys_acl_matrix` VALUES(3, 13, NULL, NULL, NULL, NULL, NULL); 
     1951INSERT INTO `sys_acl_matrix` VALUES(3, 14, NULL, NULL, NULL, NULL, NULL); 
     1952INSERT INTO `sys_acl_matrix` VALUES(3, 15, NULL, NULL, NULL, NULL, NULL); 
     1953INSERT INTO `sys_acl_matrix` VALUES(3, 16, NULL, NULL, NULL, NULL, NULL); 
     1954INSERT INTO `sys_acl_matrix` VALUES(3, 17, NULL, NULL, NULL, NULL, NULL); 
     1955INSERT INTO `sys_acl_matrix` VALUES(2, 9, NULL, NULL, NULL, NULL, NULL); 
     1956INSERT INTO `sys_acl_matrix` VALUES(2, 23, NULL, NULL, NULL, NULL, NULL); 
     1957INSERT INTO `sys_acl_matrix` VALUES(2, 24, NULL, NULL, NULL, NULL, NULL); 
     1958INSERT INTO `sys_acl_matrix` VALUES(1, 25, NULL, NULL, NULL, NULL, NULL); 
     1959INSERT INTO `sys_acl_matrix` VALUES(2, 25, NULL, NULL, NULL, NULL, NULL); 
     1960INSERT INTO `sys_acl_matrix` VALUES(3, 25, NULL, NULL, NULL, NULL, NULL); 
     1961INSERT INTO `sys_acl_matrix` VALUES(3, 26, NULL, NULL, NULL, NULL, NULL); 
     1962INSERT INTO `sys_acl_matrix` VALUES(2, 33, NULL, NULL, NULL, NULL, NULL); 
     1963INSERT INTO `sys_acl_matrix` VALUES(2, 34, NULL, NULL, NULL, NULL, NULL); 
     1964 
     1965-- -------------------------------------------------------- 
     1966 
     1967-- 
     1968-- Table structure for table `sys_acl_level_prices` 
     1969-- 
     1970 
     1971CREATE TABLE `sys_acl_level_prices` ( 
    19721972  `IDLevel` smallint(5) unsigned NOT NULL default '0', 
    19731973  `Days` int(10) unsigned NOT NULL default '1', 
    … …  
    19771977 
    19781978-- 
    1979 -- Dumping data for table `MemLevelPrices` 
    1980 -- 
    1981  
    1982  
    1983 -- -------------------------------------------------------- 
    1984  
    1985 -- 
    1986 -- Table structure for table `MemLevels` 
    1987 -- 
    1988  
    1989 CREATE TABLE `MemLevels` ( 
     1979-- Dumping data for table `sys_acl_level_prices` 
     1980-- 
     1981 
     1982 
     1983-- -------------------------------------------------------- 
     1984 
     1985-- 
     1986-- Table structure for table `sys_acl_levels` 
     1987-- 
     1988 
     1989CREATE TABLE `sys_acl_levels` ( 
    19901990  `ID` smallint(6) NOT NULL auto_increment, 
    19911991  `Name` varchar(100) NOT NULL default '', 
    … …  
    19981998 
    19991999-- 
    2000 -- Dumping data for table `MemLevels` 
    2001 -- 
    2002  
    2003 INSERT INTO `MemLevels` VALUES(1, 'Non-member', 'yes', 'no', 'no'); 
    2004 INSERT INTO `MemLevels` VALUES(2, 'Standard', 'yes', 'no', 'no'); 
    2005 INSERT INTO `MemLevels` VALUES(3, 'Promotion', 'yes', 'no', 'no'); 
     2000-- Dumping data for table `sys_acl_levels` 
     2001-- 
     2002 
     2003INSERT INTO `sys_acl_levels` VALUES(1, 'Non-member', 'yes', 'no', 'no'); 
     2004INSERT INTO `sys_acl_levels` VALUES(2, 'Standard', 'yes', 'no', 'no'); 
     2005INSERT INTO `sys_acl_levels` VALUES(3, 'Promotion', 'yes', 'no', 'no'); 
    20062006 
    20072007-- -------------------------------------------------------- 
    … …  
    21042104 
    21052105-- 
    2106 -- Table structure for table `NotifyEmails` 
    2107 -- 
    2108  
    2109 CREATE TABLE `NotifyEmails` ( 
     2106-- Table structure for table `sys_subscriptions` 
     2107-- 
     2108 
     2109CREATE TABLE `sys_subscriptions` ( 
    21102110  `ID` int(10) unsigned NOT NULL auto_increment, 
    21112111  `Name` varchar(64) NOT NULL default '', 
    … …  
    21172117 
    21182118-- 
    2119 -- Dumping data for table `NotifyEmails` 
    2120 -- 
    2121  
    2122  
    2123 -- -------------------------------------------------------- 
    2124  
    2125 -- 
    2126 -- Table structure for table `NotifyMsgs` 
    2127 -- 
    2128  
    2129 CREATE TABLE `NotifyMsgs` ( 
     2119-- Dumping data for table `sys_subscriptions` 
     2120-- 
     2121 
     2122 
     2123-- -------------------------------------------------------- 
     2124 
     2125-- 
     2126-- Table structure for table `sys_mass_messages` 
     2127-- 
     2128 
     2129CREATE TABLE `sys_mass_messages` ( 
    21302130  `ID` int(10) unsigned NOT NULL auto_increment, 
    21312131  `Subj` varchar(128) NOT NULL default '', 
    … …  
    21362136 
    21372137-- 
    2138 -- Dumping data for table `NotifyMsgs` 
    2139 -- 
    2140  
    2141  
    2142 -- -------------------------------------------------------- 
    2143  
    2144 -- 
    2145 -- Table structure for table `NotifyQueue` 
    2146 -- 
    2147  
    2148 CREATE TABLE `NotifyQueue` ( 
     2138-- Dumping data for table `sys_mass_messages` 
     2139-- 
     2140 
     2141 
     2142-- -------------------------------------------------------- 
     2143 
     2144-- 
     2145-- Table structure for table `sys_mail_queue` 
     2146-- 
     2147 
     2148CREATE TABLE `sys_mail_queue` ( 
    21492149  `Email` int(10) unsigned NOT NULL auto_increment, 
    21502150  `Msg` int(10) unsigned NOT NULL default '0', 
    … …  
    21582158 
    21592159-- 
    2160 -- Dumping data for table `NotifyQueue` 
     2160-- Dumping data for table `sys_mail_queue` 
    21612161-- 
    21622162 

  • trunk/modules/boonex/ads/classes/BxAdsDb.php

    r9703 r9969  
    3636 
    3737    /*function getMembershipActions() { 
    38         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='can add ads'"; 
     38        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='can add ads'"; 
    3939        return $this->getAll($sSql); 
    4040    }*/ 

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

    r9964 r9969  
    299299SET @iLevelPromotion := 3; 
    300300 
    301 INSERT INTO `MemActions` VALUES (NULL, 'ads view', NULL); 
     301INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads view', NULL); 
    302302SET @iAction := LAST_INSERT_ID(); 
    303 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     303INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    304304    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    305305 
    306 INSERT INTO `MemActions` VALUES (NULL, 'ads browse', NULL); 
     306INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads browse', NULL); 
    307307SET @iAction := LAST_INSERT_ID(); 
    308 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     308INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    309309    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    310310 
    311 INSERT INTO `MemActions` VALUES (NULL, 'ads search', NULL); 
     311INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads search', NULL); 
    312312SET @iAction := LAST_INSERT_ID(); 
    313 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     313INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    314314    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    315315 
    316 INSERT INTO `MemActions` VALUES (NULL, 'ads add', NULL); 
     316INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads add', NULL); 
    317317SET @iAction := LAST_INSERT_ID(); 
    318 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     318INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    319319    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    320320 
    321 INSERT INTO `MemActions` VALUES (NULL, 'ads edit any ad', NULL); 
    322 INSERT INTO `MemActions` VALUES (NULL, 'ads delete any ad', NULL); 
    323 INSERT INTO `MemActions` VALUES (NULL, 'ads approving', NULL); 
     321INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads edit any ad', NULL); 
     322INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads delete any ad', NULL); 
     323INSERT INTO `sys_acl_actions` VALUES (NULL, 'ads approving', NULL); 
    324324 
    325325INSERT INTO  

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

    r9964 r9969  
    6767DELETE FROM `sys_objects_views` WHERE `name` = 'ads'; 
    6868 
    69 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('ads view', 'ads browse', 'ads search', 'ads add', 'ads edit any ad', 'ads delete any ad', 'ads approving'); 
    70 DELETE FROM `MemActions` WHERE `Name` IN('ads view', 'ads browse', 'ads search', 'ads add', 'ads edit any ad', 'ads delete any ad', 'ads approving'); 
     69DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('ads view', 'ads browse', 'ads search', 'ads add', 'ads edit any ad', 'ads delete any ad', 'ads approving'); 
     70DELETE FROM `sys_acl_actions` WHERE `Name` IN('ads view', 'ads browse', 'ads search', 'ads add', 'ads edit any ad', 'ads delete any ad', 'ads approving'); 
    7171 
    7272DELETE FROM  

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

    r9968 r9969  
    3939SET @iLevelPromotion := 3; 
    4040 
    41 INSERT INTO `MemActions` VALUES (NULL, 'avatar upload', NULL); 
     41INSERT INTO `sys_acl_actions` VALUES (NULL, 'avatar upload', NULL); 
    4242SET @iAction := LAST_INSERT_ID(); 
    43 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     43INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    4444    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    4545 
    46 INSERT INTO `MemActions` VALUES (NULL, 'avatar edit any', NULL); 
    47 INSERT INTO `MemActions` VALUES (NULL, 'avatar delete any', NULL); 
     46INSERT INTO `sys_acl_actions` VALUES (NULL, 'avatar edit any', NULL); 
     47INSERT INTO `sys_acl_actions` VALUES (NULL, 'avatar delete any', NULL); 
    4848 
    4949-- alert handlers 

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

    r9968 r9969  
    1919 
    2020-- membership levels 
    21 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('avatar upload', 'avatar edit any', 'avatar delete any'); 
    22 DELETE FROM `MemActions` WHERE `Name` IN('avatar upload', 'avatar edit any', 'avatar delete any'); 
     21DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('avatar upload', 'avatar edit any', 'avatar delete any'); 
     22DELETE FROM `sys_acl_actions` WHERE `Name` IN('avatar upload', 'avatar edit any', 'avatar delete any'); 
    2323 
    2424-- alerts 

  • trunk/modules/boonex/blogs/classes/BxBlogsDb.php

    r9933 r9969  
    3636 
    3737    function getMembershipActions() { 
    38         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use blog' OR `Name`='view blog'"; 
     38        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use blog' OR `Name`='view blog'"; 
    3939        return $this->getAll($sSql); 
    4040    } 

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

    r9968 r9969  
    232232SET @iLevelPromotion := 3; 
    233233 
    234 INSERT INTO `MemActions` VALUES (NULL, 'blog view', NULL); 
    235 SET @iAction := LAST_INSERT_ID(); 
    236 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
    237     (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    238  
    239 INSERT INTO `MemActions` VALUES (NULL, 'blog post view', NULL); 
    240 SET @iAction := LAST_INSERT_ID(); 
    241 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
    242     (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    243  
    244 INSERT INTO `MemActions` VALUES (NULL, 'blogs browse', NULL); 
    245 SET @iAction := LAST_INSERT_ID(); 
    246 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
    247     (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    248  
    249 INSERT INTO `MemActions` VALUES (NULL, 'blogs posts browse', NULL); 
    250 SET @iAction := LAST_INSERT_ID(); 
    251 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
    252     (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    253  
    254 INSERT INTO `MemActions` VALUES (NULL, 'blog post search', NULL); 
    255 SET @iAction := LAST_INSERT_ID(); 
    256 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
    257     (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    258  
    259 INSERT INTO `MemActions` VALUES (NULL, 'blog post add', NULL); 
    260 SET @iAction := LAST_INSERT_ID(); 
    261 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     234INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog view', NULL); 
     235SET @iAction := LAST_INSERT_ID(); 
     236INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
     237    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
     238 
     239INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog post view', NULL); 
     240SET @iAction := LAST_INSERT_ID(); 
     241INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
     242    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
     243 
     244INSERT INTO `sys_acl_actions` VALUES (NULL, 'blogs browse', NULL); 
     245SET @iAction := LAST_INSERT_ID(); 
     246INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
     247    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
     248 
     249INSERT INTO `sys_acl_actions` VALUES (NULL, 'blogs posts browse', NULL); 
     250SET @iAction := LAST_INSERT_ID(); 
     251INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
     252    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
     253 
     254INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog post search', NULL); 
     255SET @iAction := LAST_INSERT_ID(); 
     256INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
     257    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
     258 
     259INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog post add', NULL); 
     260SET @iAction := LAST_INSERT_ID(); 
     261INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    262262    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    263263 
    264 INSERT INTO `MemActions` VALUES (NULL, 'blog posts edit any post', NULL); 
    265 INSERT INTO `MemActions` VALUES (NULL, 'blog posts delete any post', NULL); 
    266 INSERT INTO `MemActions` VALUES (NULL, 'blog posts approving', NULL); 
     264INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog posts edit any post', NULL); 
     265INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog posts delete any post', NULL); 
     266INSERT INTO `sys_acl_actions` VALUES (NULL, 'blog posts approving', NULL); 
    267267 
    268268-- member menu 

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

    r9968 r9969  
    7171DELETE FROM `sys_objects_views` WHERE `name` = 'blogposts'; 
    7272 
    73 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('blog view', 'blog post view', 'blogs browse', 'blogs posts browse', 'blog post search', 'blog post add', 'blog posts edit any post', 'blog posts delete any post', 'blog posts approving'); 
    74 DELETE FROM `MemActions` WHERE `Name` IN('blog view', 'blog post view', 'blogs browse', 'blogs posts browse', 'blog post search', 'blog post add', 'blog posts edit any post', 'blog posts delete any post', 'blog posts approving'); 
     73DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('blog view', 'blog post view', 'blogs browse', 'blogs posts browse', 'blog post search', 'blog post add', 'blog posts edit any post', 'blog posts delete any post', 'blog posts approving'); 
     74DELETE FROM `sys_acl_actions` WHERE `Name` IN('blog view', 'blog post view', 'blogs browse', 'blogs posts browse', 'blog post search', 'blog post add', 'blog posts edit any post', 'blog posts delete any post', 'blog posts approving'); 
    7575 
    7676-- member menu 

  • trunk/modules/boonex/board/classes/BxBoardDb.php

    r8263 r9969  
    3434    } 
    3535    function getMembershipActions() { 
    36         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use board'"; 
     36        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use board'"; 
    3737        return $this->getAll($sSql); 
    3838    } 

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

    r9847 r9969  
    99(@iTMParentId, 'BoardSaved', '_board_saved_top_menu_sitem', 'photo/gallery/category/Board', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, '', 0, ''); 
    1010 
    11 INSERT INTO `MemActions` SET `Name`='use board'; 
     11INSERT INTO `sys_acl_actions` SET `Name`='use board'; 
    1212 
    1313INSERT INTO `sys_permalinks`(`standard`, `permalink`, `check`) VALUES('modules/?r=board/', 'm/board/', 'permalinks_module_board'); 

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

    r9541 r9969  
    22DELETE FROM `TopMenu` WHERE `Name`='Board' OR `Parent`=@iTMParentId; 
    33 
    4 DELETE FROM `MemActions` WHERE `Name`='use board' LIMIT 1; 
     4DELETE FROM `sys_acl_actions` WHERE `Name`='use board' LIMIT 1; 
    55 
    66DELETE FROM `sys_permalinks` WHERE `check`='permalinks_module_board'; 

  • trunk/modules/boonex/chat/classes/BxChatDb.php

    r8263 r9969  
    3434    } 
    3535    function getMembershipActions() { 
    36         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use chat'"; 
     36        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use chat'"; 
    3737        return $this->getAll($sSql); 
    3838    } 

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

    r9625 r9969  
    99(@iTMParentId, 'ChatModerators', '_chat_moderators_top_menu_sitem', 'search.php?show=moderators', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
    1010 
    11 INSERT INTO `MemActions` SET `Name`='use chat'; 
     11INSERT INTO `sys_acl_actions` SET `Name`='use chat'; 
    1212 
    1313INSERT INTO `sys_permalinks`(`standard`, `permalink`, `check`) VALUES('modules/?r=chat/', 'm/chat/', 'permalinks_module_chat'); 

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

    r9241 r9969  
    22DELETE FROM `TopMenu` WHERE `Name`='Chat' OR `Parent`=@iTMParentId; 
    33 
    4 DELETE FROM `MemActions` WHERE `Name`='use chat' LIMIT 1; 
     4DELETE FROM `sys_acl_actions` WHERE `Name`='use chat' LIMIT 1; 
    55 
    66DELETE FROM `sys_permalinks` WHERE `check`='permalinks_module_chat'; 

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

    r9968 r9969  
    215215SET @iLevelPromotion := 3; 
    216216 
    217 INSERT INTO `MemActions` VALUES (NULL, 'events view', NULL); 
    218 SET @iAction := LAST_INSERT_ID(); 
    219 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     217INSERT INTO `sys_acl_actions` VALUES (NULL, 'events view', NULL); 
     218SET @iAction := LAST_INSERT_ID(); 
     219INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    220220    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    221221 
    222 INSERT INTO `MemActions` VALUES (NULL, 'events browse', NULL); 
    223 SET @iAction := LAST_INSERT_ID(); 
    224 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     222INSERT INTO `sys_acl_actions` VALUES (NULL, 'events browse', NULL); 
     223SET @iAction := LAST_INSERT_ID(); 
     224INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    225225    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    226226 
    227 INSERT INTO `MemActions` VALUES (NULL, 'events search', NULL); 
    228 SET @iAction := LAST_INSERT_ID(); 
    229 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     227INSERT INTO `sys_acl_actions` VALUES (NULL, 'events search', NULL); 
     228SET @iAction := LAST_INSERT_ID(); 
     229INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    230230    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    231231 
    232 INSERT INTO `MemActions` VALUES (NULL, 'events add', NULL); 
    233 SET @iAction := LAST_INSERT_ID(); 
    234 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     232INSERT INTO `sys_acl_actions` VALUES (NULL, 'events add', NULL); 
     233SET @iAction := LAST_INSERT_ID(); 
     234INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    235235    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    236236 
    237 INSERT INTO `MemActions` VALUES (NULL, 'events edit any event', NULL); 
    238 INSERT INTO `MemActions` VALUES (NULL, 'events delete any event', NULL); 
    239 INSERT INTO `MemActions` VALUES (NULL, 'events mark as featured', NULL); 
    240 INSERT INTO `MemActions` VALUES (NULL, 'events approve', NULL); 
     237INSERT INTO `sys_acl_actions` VALUES (NULL, 'events edit any event', NULL); 
     238INSERT INTO `sys_acl_actions` VALUES (NULL, 'events delete any event', NULL); 
     239INSERT INTO `sys_acl_actions` VALUES (NULL, 'events mark as featured', NULL); 
     240INSERT INTO `sys_acl_actions` VALUES (NULL, 'events approve', NULL); 
    241241 
    242242-- alert handlers 

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

    r9968 r9969  
    5252 
    5353-- membership levels 
    54 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('events view', 'events browse', 'events search', 'events add', 'events edit any event', 'events delete any event', 'events mark as featured', 'events approve'); 
    55 DELETE FROM `MemActions` WHERE `Name` IN('events view', 'events browse', 'events search', 'events add', 'events edit any event', 'events delete any event', 'events mark as featured', 'events approve'); 
     54DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('events view', 'events browse', 'events search', 'events add', 'events edit any event', 'events delete any event', 'events mark as featured', 'events approve'); 
     55DELETE FROM `sys_acl_actions` WHERE `Name` IN('events view', 'events browse', 'events search', 'events add', 'events edit any event', 'events delete any event', 'events mark as featured', 'events approve'); 
    5656 
    5757-- alerts 

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

    r9965 r9969  
    143143SET @iLevelPromotion := 3; 
    144144 
    145 INSERT INTO `MemActions` VALUES (NULL, 'forum public read', NULL); 
     145INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum public read', NULL); 
    146146SET @iAction := LAST_INSERT_ID(); 
    147 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     147INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    148148    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    149149 
    150 INSERT INTO `MemActions` VALUES (NULL, 'forum public post', NULL); 
     150INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum public post', NULL); 
    151151SET @iAction := LAST_INSERT_ID(); 
    152 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     152INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    153153    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    154154 
    155 INSERT INTO `MemActions` VALUES (NULL, 'forum private read', NULL); 
     155INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum private read', NULL); 
    156156SET @iAction := LAST_INSERT_ID(); 
    157 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     157INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    158158    (@iLevelPromotion, @iAction); 
    159159 
    160 INSERT INTO `MemActions` VALUES (NULL, 'forum private post', NULL); 
     160INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum private post', NULL); 
    161161SET @iAction := LAST_INSERT_ID(); 
    162 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     162INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    163163    (@iLevelPromotion, @iAction); 
    164164 
    165 INSERT INTO `MemActions` VALUES (NULL, 'forum search', NULL); 
     165INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum search', NULL); 
    166166SET @iAction := LAST_INSERT_ID(); 
    167 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     167INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    168168    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    169169 
    170 INSERT INTO `MemActions` VALUES (NULL, 'forum edit all', NULL); 
    171 INSERT INTO `MemActions` VALUES (NULL, 'forum delete all', NULL); 
    172 INSERT INTO `MemActions` VALUES (NULL, 'forum make sticky', NULL); 
     170INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum edit all', NULL); 
     171INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum delete all', NULL); 
     172INSERT INTO `sys_acl_actions` VALUES (NULL, 'forum make sticky', NULL); 
    173173 
    174174INSERT INTO `sys_email_templates` VALUES(NULL, 'bx_forum_notifier', 'New post in topic: <TopicTitle>', '<html><head></head><body style="font: 12px Verdana; color:#000000">\r\n    <p>Hello <Recipient>,</p> \r\n    <p><a href="<PosterUrl>"><PosterNickName></a> has posted new reply in "<TopicTitle>" topic:</p> \r\n    <p> <ReplyText> </p> \r\n    <p>--</p> \r\n    <p>You have received this notification because you have flagged one or more topics in <SiteName> forum</p> \r\n    <p style="font: bold 10px Verdana; color:red"><SiteName> mail delivery system!!! <br />Auto-generated e-mail, please, do not reply!!!</p>\r\n</body></html>', 'Notification about new post in flagged topic', 1); 

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

    r9965 r9969  
    22DELETE FROM `sys_email_templates` WHERE `Name` = 'bx_forum_notifier'; 
    33 
    4 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('forum public read', 'forum public post', 'forum private read', 'forum private post', 'forum search', 'forum edit all', 'forum delete all', 'forum make sticky'); 
    5 DELETE FROM `MemActions` WHERE `Name` IN('forum public read', 'forum public post', 'forum private read', 'forum private post', 'forum search', 'forum edit all', 'forum delete all', 'forum make sticky'); 
     4DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('forum public read', 'forum public post', 'forum private read', 'forum private post', 'forum search', 'forum edit all', 'forum delete all', 'forum make sticky'); 
     5DELETE FROM `sys_acl_actions` WHERE `Name` IN('forum public read', 'forum public post', 'forum private read', 'forum private post', 'forum search', 'forum edit all', 'forum delete all', 'forum make sticky'); 
    66 
    77DELETE FROM `sys_account_custom_stat_elements` WHERE `Label` = '_Forums'; 

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

    r9968 r9969  
    174174SET @iLevelPromotion := 3; 
    175175 
    176 INSERT INTO `MemActions` VALUES (NULL, 'map view', NULL); 
     176INSERT INTO `sys_acl_actions` VALUES (NULL, 'map view', NULL); 
    177177SET @iAction := LAST_INSERT_ID(); 
    178 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     178INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    179179    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    180180 

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

    r9968 r9969  
    3131DELETE FROM `sys_options_cats` WHERE `ID` = @iCategId; 
    3232 
    33 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('map view'); 
    34 DELETE FROM `MemActions` WHERE `Name` IN('map view'); 
     33DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('map view'); 
     34DELETE FROM `sys_acl_actions` WHERE `Name` IN('map view'); 
    3535 
    3636SET @iHandler := (SELECT `id` FROM `sys_alerts_handlers` WHERE `name` = 'bx_map' LIMIT 1); 

  • trunk/modules/boonex/messenger/classes/BxMsgDb.php

    r8296 r9969  
    3434    } 
    3535    function getMembershipActions() { 
    36         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use messenger'"; 
     36        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use messenger'"; 
    3737        return $this->getAll($sSql); 
    3838    } 

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

    r8296 r9969  
    33INSERT INTO `sys_injections` (`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES ('messenger_invitation', '0', 'injection_header', 'php', 'return BxDolService::call(''messenger'', ''get_invitation'');', '0', '1'); 
    44 
    5 INSERT INTO `MemActions` SET `Name`='use messenger'; 
     5INSERT INTO `sys_acl_actions` SET `Name`='use messenger'; 

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

    r8296 r9969  
    33DELETE FROM `sys_injections` WHERE `name`='messenger_invitation'; 
    44 
    5 DELETE FROM `MemActions` WHERE `Name`='use messenger'; 
     5DELETE FROM `sys_acl_actions` WHERE `Name`='use messenger'; 

  • trunk/modules/boonex/presence/classes/BxPrcDb.php

    r8616 r9969  
    3434    } 
    3535    function getMembershipActions() { 
    36         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use presence'"; 
     36        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use presence'"; 
    3737        return $this->getAll($sSql); 
    3838    } 

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

    r9705 r9969  
    66('_presence_ext_menu_item', 'Presence', 'modules/boonex/presence/|presence.png', '', 'window.open( ''modules/boonex/presence/popup.php'', ''Presence'',''width=250,height=600,toolbar=0,directories=0,menubar=0,status=0,location=0,scrollbars=0,resizable=1'');return false', '', 2, '1', 0, 0, '', 'memb', 'top_extra', 'link'); 
    77 
    8 INSERT INTO `MemActions` SET `Name`='use presence'; 
     8INSERT INTO `sys_acl_actions` SET `Name`='use presence'; 

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

    r9705 r9969  
    33DELETE FROM `sys_menu_member` WHERE `Name`='Presence'; 
    44 
    5 DELETE FROM `MemActions` WHERE `Name`='use presence' LIMIT 1; 
     5DELETE FROM `sys_acl_actions` WHERE `Name`='use presence' LIMIT 1; 

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

    r9964 r9969  
    5555 
    5656-- GlParams settings 
    57 INSERT INTO `GlParamsKateg` VALUES('', 'Shared Videos', ''); 
     57INSERT INTO `sys_options_cats` VALUES('', 'Shared Videos', ''); 
    5858SET @iKatID = LAST_INSERT_ID(); 
    5959 

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

    r9964 r9969  
    99DELETE FROM `Categories` WHERE `Type` = 'shared_video'; 
    1010 
    11 SET @iKatID = (SELECT `ID` FROM `GlParamsKateg` WHERE `name` = 'Shared Videos' LIMIT 1); 
     11SET @iKatID = (SELECT `ID` FROM `sys_options_cats` WHERE `name` = 'Shared Videos' LIMIT 1); 
    1212 
    1313DELETE FROM `GlParams` WHERE `kateg` = @iKatID; 
    … …  
    1616DELETE FROM `GlParams` WHERE `Name` = 'category_auto_app_shared_video'; 
    1717 
    18 DELETE FROM `GlParamsKateg` WHERE `name` = 'Shared Videos'; 
     18DELETE FROM `sys_options_cats` WHERE `name` = 'Shared Videos'; 
    1919 
    2020DELETE FROM `PageComposePages` WHERE `Name` IN('shared_video', 'browse_shared_video', 'home_shared_video', 'rate_shared_video', 'albums_shared_video', 'user_shared_video'); 

  • trunk/modules/boonex/shoutbox/classes/BxSboxDb.php

    r8263 r9969  
    3434    } 
    3535    function getMembershipActions() { 
    36         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use shoutbox'"; 
     36        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use shoutbox'"; 
    3737        return $this->getAll($sSql); 
    3838    } 

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

    r8347 r9969  
    1 INSERT INTO `MemActions` SET `Name`='use shoutbox'; 
     1INSERT INTO `sys_acl_actions` SET `Name`='use shoutbox'; 
    22 
    33INSERT INTO `PageCompose` (`Page`, `PageWidth`, `Desc`, `Caption`, `Column`, `Order`, `Func`, `Content`, `DesignBox`, `ColWidth`, `Visible`, `MinWidth`) VALUES 

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

    r8265 r9969  
    1 DELETE FROM `MemActions` WHERE `Name`='use shoutbox' LIMIT 1; 
     1DELETE FROM `sys_acl_actions` WHERE `Name`='use shoutbox' LIMIT 1; 
    22 
    33DELETE FROM `PageCompose` WHERE `Caption`='_shoutbox_box_caption'; 

  • trunk/modules/boonex/sites/classes/BxSitesDb.php

    r9821 r9969  
    3838    function getMembershipActions()  
    3939    { 
    40         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name`='use sites'"; 
     40        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name`='use sites'"; 
    4141        return $this->getAll($sSql); 
    4242    } 

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

    r9964 r9969  
    101101INSERT INTO `TopMenu` VALUES(NULL, 4, 'Sites', '_bx_sites_menu_my_sites_profile', 'modules/?r=sites/browse/my', @iCatProfileOrder, 'memb', '', '', '', 1, 1, 1, 'custom', 0, '', 0, ''); 
    102102 
    103 INSERT INTO `MemActions` SET `Name`='use sites'; 
     103INSERT INTO `sys_acl_actions` SET `Name`='use sites'; 
    104104 
    105105INSERT INTO `sys_permalinks`(`standard`, `permalink`, `check`) VALUES('modules/?r=sites/', 'm/sites/', 'permalinks_module_sites'); 

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

    r9964 r9969  
    99DELETE FROM `TopMenu` WHERE `Name`='Sites' OR `Parent`=@iTMParentId; 
    1010 
    11 DELETE FROM `MemActions` WHERE `Name`='use sites' LIMIT 1; 
     11DELETE FROM `sys_acl_actions` WHERE `Name`='use sites' LIMIT 1; 
    1212 
    1313DELETE FROM `sys_permalinks` WHERE `check`='permalinks_module_sites'; 

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

    r9968 r9969  
    184184SET @iLevelPromotion := 3; 
    185185 
    186 INSERT INTO `MemActions` VALUES (NULL, 'store view product', NULL); 
    187 SET @iAction := LAST_INSERT_ID(); 
    188 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     186INSERT INTO `sys_acl_actions` VALUES (NULL, 'store view product', NULL); 
     187SET @iAction := LAST_INSERT_ID(); 
     188INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    189189    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    190190 
    191 INSERT INTO `MemActions` VALUES (NULL, 'store browse', NULL); 
    192 SET @iAction := LAST_INSERT_ID(); 
    193 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     191INSERT INTO `sys_acl_actions` VALUES (NULL, 'store browse', NULL); 
     192SET @iAction := LAST_INSERT_ID(); 
     193INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    194194    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    195195 
    196 INSERT INTO `MemActions` VALUES (NULL, 'store search', NULL); 
    197 SET @iAction := LAST_INSERT_ID(); 
    198 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     196INSERT INTO `sys_acl_actions` VALUES (NULL, 'store search', NULL); 
     197SET @iAction := LAST_INSERT_ID(); 
     198INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    199199    (@iLevelNonMember, @iAction), (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    200200 
    201 INSERT INTO `MemActions` VALUES (NULL, 'store add product', NULL); 
    202 SET @iAction := LAST_INSERT_ID(); 
    203 INSERT INTO `MemLevelActions` (`IDLevel`, `IDAction`) VALUES  
     201INSERT INTO `sys_acl_actions` VALUES (NULL, 'store add product', NULL); 
     202SET @iAction := LAST_INSERT_ID(); 
     203INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES  
    204204    (@iLevelStandard, @iAction), (@iLevelPromotion, @iAction); 
    205205 
    206 INSERT INTO `MemActions` VALUES (NULL, 'store edit any product', NULL); 
    207 INSERT INTO `MemActions` VALUES (NULL, 'store delete any product', NULL); 
    208 INSERT INTO `MemActions` VALUES (NULL, 'store mark as featured', NULL); 
    209 INSERT INTO `MemActions` VALUES (NULL, 'store approve product', NULL); 
     206INSERT INTO `sys_acl_actions` VALUES (NULL, 'store edit any product', NULL); 
     207INSERT INTO `sys_acl_actions` VALUES (NULL, 'store delete any product', NULL); 
     208INSERT INTO `sys_acl_actions` VALUES (NULL, 'store mark as featured', NULL); 
     209INSERT INTO `sys_acl_actions` VALUES (NULL, 'store approve product', NULL); 
    210210 
    211211-- alert handlers 

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

    r9968 r9969  
    4848 
    4949-- membership levels 
    50 DELETE `MemActions`, `MemLevelActions` FROM `MemActions`, `MemLevelActions` WHERE `MemLevelActions`.`IDAction` = `MemActions`.`ID` AND `MemActions`.`Name` IN('store view product', 'store browse', 'store search', 'store add product', 'store edit any product', 'store delete any product', 'store mark as featured', 'store approve product'); 
    51 DELETE FROM `MemActions` WHERE `Name` IN('store view product', 'store browse', 'store search', 'store add product', 'store edit any product', 'store delete any product', 'store mark as featured', 'store approve product'); 
     50DELETE `sys_acl_actions`, `sys_acl_matrix` FROM `sys_acl_actions`, `sys_acl_matrix` WHERE `sys_acl_matrix`.`IDAction` = `sys_acl_actions`.`ID` AND `sys_acl_actions`.`Name` IN('store view product', 'store browse', 'store search', 'store add product', 'store edit any product', 'store delete any product', 'store mark as featured', 'store approve product'); 
     51DELETE FROM `sys_acl_actions` WHERE `Name` IN('store view product', 'store browse', 'store search', 'store add product', 'store edit any product', 'store delete any product', 'store mark as featured', 'store approve product'); 
    5252 
    5353-- alerts 

  • trunk/modules/boonex/wall/classes/BxWallDb.php

    r9682 r9969  
    9393    } 
    9494    function getMembershipActions() { 
    95         $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `MemActions` WHERE `Name` LIKE 'Wall_%'"; 
     95        $sSql = "SELECT `ID` AS `id`, `Name` AS `name` FROM `sys_acl_actions` WHERE `Name` LIKE 'Wall_%'"; 
    9696        return $this->getAll($sSql); 
    9797    } 

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

    r9968 r9969  
    9696 
    9797 
    98 INSERT INTO `MemActions`(`Name`, `AdditionalParamName`) VALUES 
     98INSERT INTO `sys_acl_actions`(`Name`, `AdditionalParamName`) VALUES 
    9999('Wall Post Comment', ''); 
    100100 

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

    r9968 r9969  
    1515DELETE FROM `GlParams` WHERE `kateg`=@iCategoryId OR `Name`='permalinks_module_wall'; 
    1616 
    17 DELETE FROM `MemActions` WHERE `Name` IN ('Wall Post', 'Wall Post Comment'); 
     17DELETE FROM `sys_acl_actions` WHERE `Name` IN ('Wall Post', 'Wall Post Comment'); 
    1818 
    1919DELETE FROM `Categories` WHERE `Category`='wall'; 

  • trunk/periodic/notifies.php

    r7299 r9969  
    4848$msgs_per_start = getParam( 'msgs_per_start' ); 
    4949 
    50 $iFullCount = (int)db_value( 'SELECT COUNT(*) FROM NotifyQueue', 0 ); 
     50$iFullCount = (int)db_value( 'SELECT COUNT(*) FROM `sys_mail_queue`', 0 ); 
    5151if ( !$iFullCount ) exit; 
    5252 
    … …  
    6565        $nfs_res = db_res(" 
    6666            SELECT 
    67                 NotifyQueue.Email as ID1, 
    68                 NotifyQueue.Msg as ID2, 
    69                 NotifyEmails.Name as Name, 
    70                 NotifyEmails.Email, 
    71                 NotifyMsgs.Subj, 
    72                 NotifyMsgs.HTML as Body 
    73             FROM NotifyQueue 
    74             INNER JOIN NotifyMsgs ON 
    75                 (NotifyMsgs.ID =  NotifyQueue.Msg) 
    76             INNER JOIN NotifyEmails ON 
    77                 (NotifyEmails.ID = NotifyQueue.Email) 
     67                `sys_mail_queue`.Email as ID1, 
     68                `sys_mail_queue`.Msg as ID2, 
     69                `sys_subscriptions`.Name as Name, 
     70                `sys_subscriptions`.Email, 
     71                `sys_mass_messages`.Subj, 
     72                `sys_mass_messages`.HTML as Body 
     73            FROM `sys_mail_queue` 
     74            INNER JOIN `sys_mass_messages` ON 
     75                (`sys_mass_messages`.ID =  `sys_mail_queue`.Msg) 
     76            INNER JOIN `sys_subscriptions` ON 
     77                (`sys_subscriptions`.ID = `sys_mail_queue`.Email) 
    7878            WHERE 
    79                 NotifyQueue.`From` = 'NotifyEmails' AND 
    80                 NotifyEmails.EmailFlag = 'NotifyMe' 
     79                `sys_mail_queue`.`From` = 'NotifyEmails' AND 
     80                `sys_subscriptions`.EmailFlag = 'NotifyMe' 
    8181            LIMIT $total_per_query 
    8282        ",0 ); 
    … …  
    8989                ++$err; 
    9090            if ( $row[ID1] && $row[ID2] ) 
    91                 db_res("DELETE FROM NotifyQueue WHERE `Email` = $row[ID1] AND `Msg` = $row[ID2] AND `From` = 'NotifyEmails'", 0 ); 
     91                db_res("DELETE FROM `sys_mail_queue` WHERE `Email` = $row[ID1] AND `Msg` = $row[ID2] AND `From` = 'NotifyEmails'", 0 ); 
    9292            else 
    93                 echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
     93                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
    9494            ++$count_ok; 
    9595            if ( $count_ok >= $total_count ) break; 
    … …  
    102102        $nfs_res = db_res(" 
    103103            SELECT 
    104                 NotifyQueue.Email as ID1, 
    105                 NotifyQueue.Msg as ID2, 
     104                `sys_mail_queue`.Email as ID1, 
     105                `sys_mail_queue`.Msg as ID2, 
    106106                Profiles.NickName as Name, 
    107107                Profiles.Email, 
    108                 NotifyMsgs.Subj, 
    109                 NotifyMsgs.HTML as Body 
    110             FROM NotifyQueue             
    111             INNER JOIN NotifyMsgs ON 
    112                 (NotifyMsgs.ID =  NotifyQueue.Msg) 
     108                `sys_mass_messages`.Subj, 
     109                `sys_mass_messages`.HTML as Body 
     110            FROM `sys_mail_queue`            
     111            INNER JOIN `sys_mass_messages` ON 
     112                (`sys_mass_messages`.ID =  `sys_mail_queue`.Msg) 
    113113            INNER JOIN Profiles ON 
    114                 (Profiles.ID = NotifyQueue.Email) 
     114                (Profiles.ID = `sys_mail_queue`.Email) 
    115115            WHERE 
    116                 NotifyQueue.`From` = 'Profiles' AND 
     116                `sys_mail_queue`.`From` = 'Profiles' AND 
    117117                Profiles.EmailNotify = 1 
    118118            ",0 ); 
    … …  
    125125                ++$err; 
    126126            if ( $row[ID1] && $row[ID2] ) 
    127                 db_res("DELETE FROM NotifyQueue WHERE Email = $row[ID1] AND Msg = $row[ID2] AND NotifyQueue.`From` = 'Profiles'", 0 ); 
     127                db_res("DELETE FROM `sys_mail_queue` WHERE Email = $row[ID1] AND Msg = $row[ID2] AND `sys_mail_queue`.`From` = 'Profiles'", 0 ); 
    128128            else 
    129                 echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
     129                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
    130130            ++$count_ok; 
    131131            if ( $count_ok >= $total_count ) break; 
    … …  
    139139        $nfs_res = db_res(" 
    140140            SELECT 
    141                 NotifyQueue.Email as ID1, 
    142                 NotifyQueue.Msg as ID2, 
    143                 NotifyQueue.MsgText as Body, 
    144                 NotifyQueue.MsgSubj as Subj, 
     141                `sys_mail_queue`.Email as ID1, 
     142                `sys_mail_queue`.Msg as ID2, 
     143                `sys_mail_queue`.MsgText as Body, 
     144                `sys_mail_queue`.MsgSubj as Subj, 
    145145                Profiles.NickName as Name, 
    146146                Profiles.Email 
    147             FROM NotifyQueue 
     147            FROM `sys_mail_queue` 
    148148            INNER JOIN Profiles ON 
    149                 (Profiles.ID = NotifyQueue.Email) 
     149                (Profiles.ID = `sys_mail_queue`.Email) 
    150150            WHERE 
    151                 NotifyQueue.`From` = 'ProfilesMsgText' AND 
     151                `sys_mail_queue`.`From` = 'ProfilesMsgText' AND 
    152152                Profiles.EmailNotify = 1 
    153153            ",0); 
    … …  
    162162            if ( !mail( $row['Email'], $row['Subj'], $body, $headers, "-f{$site['email_notify']}") ) 
    163163                ++$err; 
    164             if ( !db_res("DELETE FROM NotifyQueue WHERE Email = $row[ID1] AND NotifyQueue.`From` = 'ProfilesMsgText'", 0 ) ) 
    165                 echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
     164            if ( !db_res("DELETE FROM `sys_mail_queue` WHERE Email = $row[ID1] AND `sys_mail_queue`.`From` = 'ProfilesMsgText'", 0 ) ) 
     165                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n"; 
    166166            ++$count_ok; 
    167167            if ( $count_ok >= $total_count ) break; 
Note: See TracChangeset for help on using the changeset viewer.
 
 

Site Search

Market

Notes

Websites

About BoonEx• Contacts• © BoonEx (ACN 127966581)