Changeset 9984

Timestamp:

04/06/09 22:50:09 (3 years ago)

Author:

Andrey Prikaznov

Message:

 

Location:

trunk

Files:

• admin/finance.php (modified) (5 diffs)
• admin/global_settings.php (modified) (2 diffs)
• admin/index.php (modified) (1 diff)
• aff/finance.php (modified) (6 diffs)
• aff/index.php (modified) (1 diff)
• aff/partners.php (modified) (6 diffs)
• checkout/2checkoutv2.php (modified) (1 diff)
• checkout/authorizenet.php (modified) (4 diffs)
• checkout/ccbill.php (modified) (1 diff)
• checkout/paypal.php (modified) (2 diffs)
• communicator.php (modified) (1 diff)
• flash/modules/chat/inc/customFunctions.inc.php (modified) (1 diff)
• flash/modules/global/inc/customFunctions.inc.php (modified) (2 diffs)
• greet.php (modified) (1 diff)
• inc/admin.inc.php (modified) (6 diffs)
• inc/admin_design.inc.php (modified) (2 diffs)
• inc/checkout.inc.php (modified) (9 diffs)
• inc/classes/BxDolInstaller.php (modified) (1 diff)
• inc/classes/BxDolVoting.php (modified) (2 diffs)
• inc/design.inc.php (modified) (2 diffs)
• install/index.php (modified) (1 diff)
• install/sql/v70.sql (modified) (10 diffs)
• join.php (modified) (1 diff)
• join_aff.php (modified) (3 diffs)
• member.php (modified) (1 diff)
• membership.php (modified) (2 diffs)
• modules/boonex/ads/install/sql/install.sql (modified) (1 diff)
• modules/boonex/ads/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/blogs/install/sql/install.sql (modified) (1 diff)
• modules/boonex/blogs/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/events/install/sql/install.sql (modified) (1 diff)
• modules/boonex/events/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/feedback/install/sql/install.sql (modified) (1 diff)
• modules/boonex/feedback/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/news/install/sql/install.sql (modified) (1 diff)
• modules/boonex/news/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/shared_files/install/sql/install.sql (modified) (1 diff)
• modules/boonex/shared_files/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/shared_music/install/sql/install.sql (modified) (1 diff)
• modules/boonex/shared_music/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/shared_photo/install/sql/install.sql (modified) (1 diff)
• modules/boonex/shared_photo/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/shared_video/install/sql/install.sql (modified) (1 diff)
• modules/boonex/shared_video/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/sites/install/sql/install.sql (modified) (1 diff)
• modules/boonex/sites/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/store/install/sql/install.sql (modified) (1 diff)
• modules/boonex/store/install/sql/uninstall.sql (modified) (1 diff)
• periodic/cmd.php (modified) (1 diff)
• templates/base/scripts/BxBaseCommunicator.php (modified) (1 diff)
• templates/base/scripts/BxBaseProfileView.php (modified) (2 diffs)

trunk/admin/finance.php

@@ -46 +46 @@
 {
     case 'total':
-        $tr_query = "SELECT * FROM `Transactions` WHERE `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT * FROM `sys_transactions` WHERE `Status` = 'approved' ORDER BY `Date` DESC";
         break;
 
@@ -52 +52 @@
         $order_id = process_db_input( $_POST['tr_order_num'] );
         $tr['order_num'] = process_pass_data( $_POST['tr_order_num'] );
-        $tr_query = "SELECT * FROM `Transactions` WHERE `gtwTransactionID` = '$order_id' AND `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT * FROM `sys_transactions` WHERE `gtwTransactionID` = '$order_id' AND `Status` = 'approved' ORDER BY `Date` DESC";
         $order_num_disabled = "";
         break;
@@ -59 +59 @@
         $last_days = (int)$_POST['tr_last_days'];
         $tr['last_days'] = process_pass_data( $_POST['tr_last_days'] );
-        $tr_query = "SELECT * FROM `Transactions` WHERE ( TO_DAYS( NOW() ) - TO_DAYS( `Date` ) <= $last_days ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT * FROM `sys_transactions` WHERE ( TO_DAYS( NOW() ) - TO_DAYS( `Date` ) <= $last_days ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         $last_disabled = "";
         break;
@@ -68 +68 @@
         if ( $exact_date != -1 )
         {
-            $tr_query = "SELECT * FROM `Transactions` WHERE TO_DAYS( FROM_UNIXTIME($exact_date) ) = TO_DAYS( `Date` ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+            $tr_query = "SELECT * FROM `sys_transactions` WHERE TO_DAYS( FROM_UNIXTIME($exact_date) ) = TO_DAYS( `Date` ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         }
         else
@@ -98 +98 @@
         if ( $between_date1 != -1 && $between_date2 != -1 )
         {
-            $tr_query = "SELECT * FROM `Transactions` WHERE ( TO_DAYS( FROM_UNIXTIME($between_date1) ) <= TO_DAYS( `Date` ) AND TO_DAYS( FROM_UNIXTIME($between_date2) ) >= TO_DAYS( `Date` ) ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+            $tr_query = "SELECT * FROM `sys_transactions` WHERE ( TO_DAYS( FROM_UNIXTIME($between_date1) ) <= TO_DAYS( `Date` ) AND TO_DAYS( FROM_UNIXTIME($between_date2) ) >= TO_DAYS( `Date` ) ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         }
         else

trunk/admin/global_settings.php

@@ -577 +577 @@
 {
     // Get previous admin password from database.
-    $q_str = "SELECT Password FROM Admins WHERE Name = '$admin_name'";
+    $q_str = "SELECT Password FROM `sys_admins` WHERE Name = '$admin_name'";
     $row = db_arr($q_str);
     // Check password and save it if check conditions are met.
@@ -595 +595 @@
     {
         // Write new password to database.
-        $q_str = "UPDATE Admins SET Password = md5('$pwd_new') WHERE Name = '$admin_name'";
+        $q_str = "UPDATE `sys_admins` SET Password = md5('$pwd_new') WHERE Name = '$admin_name'";
         mysql_query($q_str);
         $result = S_OK;

trunk/admin/index.php

@@ -37 +37 @@
     $admin_id = process_db_input( $_POST['ID'] );
     $admin_pass = process_db_input( $_POST['Password'] );
-    $result = db_res( "SELECT * FROM `Admins` WHERE `Name` = '$admin_id' AND `Password` = MD5('$admin_pass')" );
+    $result = db_res( "SELECT * FROM `sys_admins` WHERE `Name` = '$admin_id' AND `Password` = MD5('$admin_pass')" );
     if ( mysql_num_rows( $result ) != 1 )
         login_form( 'Login failed. Please, try again.', 1, true );

trunk/aff/finance.php

@@ -41 +41 @@
 {
     $affID = (int)$AFF;
-    $aff_arr = db_arr("SELECT `Percent` FROM `aff` WHERE `ID` = $affID");
+    $aff_arr = db_arr("SELECT `Percent` FROM `sys_aff` WHERE `ID` = $affID");
 }
 else
 {
     $AFF = process_db_input($AFF);
-    $aff_arr = db_arr("SELECT `ID`, `Percent` FROM `aff` WHERE `email` = '$AFF'");
+    $aff_arr = db_arr("SELECT `ID`, `Percent` FROM `sys_aff` WHERE `email` = '$AFF'");
     $affID = (int)$aff_arr['ID'];
 }
@@ -63 +63 @@
 {
     case 'total':
-        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND `Status` = 'approved' ORDER BY `Date` DESC";
         break;
 
@@ -69 +69 @@
         $order_id = process_db_input( $_POST['tr_order_num'] );
         $tr['order_num'] = process_pass_data( $_POST['tr_order_num'] );
-        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND `gtwTransactionID` = '$order_id' AND `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND `gtwTransactionID` = '$order_id' AND `Status` = 'approved' ORDER BY `Date` DESC";
         $order_num_disabled = "";
         break;
@@ -76 +76 @@
         $last_days = (int)$_POST['tr_last_days'];
         $tr['last_days'] = process_pass_data( $_POST['tr_last_days'] );
-        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND ( TO_DAYS( NOW() ) - TO_DAYS( `Date` ) <= $last_days ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+        $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND ( TO_DAYS( NOW() ) - TO_DAYS( `Date` ) <= $last_days ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         $last_disabled = "";
         break;
@@ -85 +85 @@
         if ( $exact_date != -1 )
         {
-            $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND TO_DAYS( FROM_UNIXTIME($exact_date) ) = TO_DAYS( `Date` ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+            $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND TO_DAYS( FROM_UNIXTIME($exact_date) ) = TO_DAYS( `Date` ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         }
         else
@@ -115 +115 @@
         if ( $between_date1 != -1 && $between_date2 != -1 )
         {
-            $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND ( TO_DAYS( FROM_UNIXTIME($between_date1) ) <= TO_DAYS( `Date` ) AND TO_DAYS( FROM_UNIXTIME($between_date2) ) >= TO_DAYS( `Date` ) ) AND `Status` = 'approved' ORDER BY `Date` DESC";
+            $tr_query = "SELECT `ID`, `IDMember`, `IDProvider`, `gtwTransactionID`, DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description`, `Note` FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE `idAff` = $affID AND ( TO_DAYS( FROM_UNIXTIME($between_date1) ) <= TO_DAYS( `Date` ) AND TO_DAYS( FROM_UNIXTIME($between_date2) ) >= TO_DAYS( `Date` ) ) AND `Status` = 'approved' ORDER BY `Date` DESC";
         }
         else

trunk/aff/index.php

@@ -44 +44 @@
     if ( !strstr( $_POST['ID'], "@") )
     {
-        $result = db_res( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM `aff` WHERE `ID` = '$aff_id' AND `Password` = '$aff_password'" );
+        $result = db_res( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM `sys_aff` WHERE `ID` = '$aff_id' AND `Password` = '$aff_password'" );
         $aff_arr = mysql_fetch_array( $result );
     }
     else
     {
-        $result = db_res( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM `aff` WHERE `email` = '$aff_id' AND `Password` = '$aff_password'" );
+        $result = db_res( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM `sys_aff` WHERE `email` = '$aff_id' AND `Password` = '$aff_password'" );
         $aff_arr = mysql_fetch_array( $result );
         $_POST['ID'] = $aff_arr['ID'];

trunk/aff/partners.php

@@ -106 +106 @@
             if ( (int)$key && $val == "on" )
             {
-                $res = db_res("DELETE FROM aff WHERE ID='$key'");
+                $res = db_res("DELETE FROM `sys_aff` WHERE ID='$key'");
                 if (!$res)
                 {
@@ -134 +134 @@
         $aff_percent = process_db_input( $_POST['Percent'] );
         $aff_status = process_db_input( $_POST['Status'] );
-        $res = db_res("INSERT INTO `aff` (`Name`,`email`,`Password`,`Percent`,`Status`) VALUES ('$aff_name', '$aff_email', md5( '$aff_password' ), '$aff_percent', '$aff_status')");
+        $res = db_res("INSERT INTO `sys_aff` (`Name`,`email`,`Password`,`Percent`,`Status`) VALUES ('$aff_name', '$aff_email', md5( '$aff_password' ), '$aff_percent', '$aff_status')");
         if (!$res)
         {
@@ -152 +152 @@
     if ( !$demo_mode && (int)$_GET[editdis] )
     {
-        $editdis_arr = db_arr( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM aff WHERE ID='".$_GET[editdis]."'" );
+        $editdis_arr = db_arr( "SELECT `ID`, `Name`, `email`, `Password`, `Percent`, `seed`, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, `Status`, `www1`, `www2` FROM `sys_aff` WHERE ID='".$_GET[editdis]."'" );
     }
 
@@ -161 +161 @@
         else
             $sPassword = "`Password`=md5( '$_POST[Password]' ),";
-        $res = db_res("UPDATE aff SET `Name`='$_POST[Name]',`email`='$_POST[email]'," . $sPassword . "`Percent`='$_POST[Percent]',`Status`='$_POST[Status]' WHERE ID=$_POST[ID]");
+        $res = db_res("UPDATE `sys_aff` SET `Name`='$_POST[Name]',`email`='$_POST[email]'," . $sPassword . "`Percent`='$_POST[Percent]',`Status`='$_POST[Status]' WHERE ID=$_POST[ID]");
         if ( $res )
             $status_text = "Partner was successfully updated.";
@@ -184 +184 @@
 // ------------------------------
 
-$p_num = db_arr( "SELECT COUNT(*) FROM aff" );
+$p_num = db_arr( "SELECT COUNT(*) FROM `sys_aff`" );
 $p_num = $p_num[0];
 $pages_num = ceil( $p_num / $p_per_page );
@@ -191 +191 @@
 $page_first_p = $real_first_p + 1;
 
-$result = db_res( "SELECT ID, Name, email, Password, Percent, www1, www2, Status, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, COUNT(idProfile) AS m_count FROM aff LEFT JOIN `sys_aff_members` ON (ID=idAff) GROUP BY ID $part_addon ORDER BY ID ASC LIMIT $real_first_p, $p_per_page" );
+$result = db_res( "SELECT ID, Name, email, Password, Percent, www1, www2, Status, DATE_FORMAT(`RegDate`, '$date_format' ) AS RegDate, COUNT(idProfile) AS m_count FROM `sys_aff` LEFT JOIN `sys_aff_members` ON (ID=idAff) GROUP BY ID $part_addon ORDER BY ID ASC LIMIT $real_first_p, $p_per_page" );
 $page_p_num = mysql_num_rows( $result );
 

trunk/checkout/2checkoutv2.php

@@ -181 +181 @@
     $recurringDays = (int)$recurringDays;
     
-    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `Transactions`
+    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}
                             AND `Status` = 'pending'

trunk/checkout/authorizenet.php

@@ -246 +246 @@
         
         $localTranID = (int)$dataArr[7];
-        $tranArr = db_arr( "SELECT `Data` FROM `Transactions`
+        $tranArr = db_arr( "SELECT `Data` FROM `sys_transactions`
                                 WHERE `ID` = {$localTranID}" );
         $tranData = transStringToData( $tranArr['Data'] );
@@ -291 +291 @@
         
         $localTranID = (int)$dataArr['x_invoice_num'];
-        $tranArr = db_arr( "SELECT `Data` FROM `Transactions`
+        $tranArr = db_arr( "SELECT `Data` FROM `sys_transactions`
                                 WHERE `ID` = {$localTranID}" );
         $tranData = transStringToData( $tranArr['Data'] );
@@ -349 +349 @@
     $recurringDays = (int)$recurringDays;
     
-    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `Transactions`
+    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}
                             AND `Status` = 'pending'
@@ -501 +501 @@
         
         $localTranID = (int)$transactionData['auth_tran_id'];
-        $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `Transactions`
+        $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `sys_transactions`
                                 WHERE `ID` = {$localTranID}
                                 AND `Status` = 'pending'

trunk/checkout/ccbill.php

@@ -166 +166 @@
     $recurringDays = (int)$recurringDays;
     
-    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `Transactions`
+    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}
                             AND `Status` = 'pending'

trunk/checkout/paypal.php

@@ -151 +151 @@
     $date_format = getParam('date_format');
     
-    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Data` FROM `Transactions`
+    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Data` FROM `sys_transactions`
                             WHERE `ID` = {$dataArr['item_number']}" );
     $tranArr = mysql_fetch_assoc( $tranRes );
@@ -436 +436 @@
     $recurringDays = (int)$recurringDays;
     
-    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `Transactions`
+    $tranRes = db_res( "SELECT DATE_FORMAT(`Date`,  '$date_format' ) AS 'Date', `Amount`, `Currency`, `Status`, `Data`, `Description` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}
                             AND `Status` = 'pending'

trunk/communicator.php

@@ -114 +114 @@
         break;
 
-        // function will delete the received members from 'greetings' ;
+        // function will delete the received members from 'sys_greetings' ;
         case 'delete_greetings' :
             if ( $aCommunicatorSettings['person_switcher'] == 'from' )
             {
-                $oCommunicator -> execFunction( '_deleteRequest', 'Greetings', $aMembersList, array(1) );
+                $oCommunicator -> execFunction( '_deleteRequest', 'sys_greetings', $aMembersList, array(1) );
             }
             else
             {
-                $oCommunicator -> execFunction('_deleteRequest', 'Greetings', $aMembersList);
+                $oCommunicator -> execFunction('_deleteRequest', 'sys_greetings', $aMembersList);
             }
         break;

trunk/flash/modules/chat/inc/customFunctions.inc.php

@@ -10 +10 @@
 function getAdminNick()
 {
-    return getValue("SELECT `Name` FROM `Admins` LIMIT 1");
+    return getValue("SELECT `Name` FROM `sys_admins` LIMIT 1");
 }
 ?>

trunk/flash/modules/global/inc/customFunctions.inc.php

@@ -35 +35 @@
 {
         /**
-         * You might change this query. This query searches for a record in admins' db with specified login and password.
+         * You might change this query. This query searches for a record in sys_admins' db with specified login and password.
          * If your admin table has different structure/format, your should change the query.
          */
@@ -44 +44 @@
 
         //--- Dolphin version.
-        $sName = getValue("SELECT `Name` FROM `Admins` WHERE `Name`='" . $sLogin . "' AND `Password`='" . $sPassword . "' LIMIT 1");
+        $sName = getValue("SELECT `Name` FROM `sys_admins` WHERE `Name`='" . $sLogin . "' AND `Password`='" . $sPassword . "' LIMIT 1");
         $bResult = !empty($sName) ? TRUE_VAL : FALSE_VAL;
         //end of changes

trunk/greet.php

@@ -227 +227 @@
 
     // Insert kiss into database
-    $kiss_arr = db_arr( "SELECT `ID` FROM `Greetings` WHERE `ID` = {$member['ID']} AND `Profile` = {$recipient['ID']} LIMIT 1", 0 );
+    $kiss_arr = db_arr( "SELECT `ID` FROM `sys_greetings` WHERE `ID` = {$member['ID']} AND `Profile` = {$recipient['ID']} LIMIT 1", 0 );
     if ( !$kiss_arr )
-        $result = db_res( "INSERT INTO `Greetings` ( `ID`, `Profile`, `Number`, `When`, `New` ) VALUES ( {$member['ID']}, {$recipient['ID']}, 1, NOW(), '1' )", 0 );
+        $result = db_res( "INSERT INTO `sys_greetings` ( `ID`, `Profile`, `Number`, `When`, `New` ) VALUES ( {$member['ID']}, {$recipient['ID']}, 1, NOW(), '1' )", 0 );
     else
-        $result = db_res( "UPDATE `Greetings` SET `Number` = `Number` + 1, `New` = '1' WHERE `ID` = {$member['ID']} AND `Profile` = {$recipient['ID']}", 0 );
+        $result = db_res( "UPDATE `sys_greetings` SET `Number` = `Number` + 1, `New` = '1' WHERE `ID` = {$member['ID']} AND `Profile` = {$recipient['ID']}", 0 );
 
     // If success then perform actions

trunk/inc/admin.inc.php

@@ -72 +72 @@
         case 1:
             $mem         = 'Admin';
-            $table       = 'Admins';
+            $table       = 'sys_admins';
             $login_page  = BX_DOL_URL_ADMIN . "index.php";
             $join_page   = '';
@@ -81 +81 @@
         case 2:
             $mem         = "Affiliate";
-            $table       = 'aff';
+            $table       = 'sys_aff';
             $login_page  = "{$site['url_aff']}index.php";
             $join_page   = '';
@@ -825 +825 @@
     {
         case 'Profiles': $member = 0; break;
-        case 'Admins': $member = 1; break;
-        case 'aff': $member = 2; break;
+        case 'sys_admins': $member = 1; break;
+        case 'sys_aff': $member = 2; break;
         case 'sys_moderators': $member = 3; break;
     }
@@ -837 +837 @@
     }
 
-    if ( strcmp( $db, 'Admins' ) == 0 )
+    if ( strcmp( $db, 'sys_admins' ) == 0 )
     {
         $ID = process_db_input( $ID );
@@ -925 +925 @@
         case 1:
             $mem        = 'admin';
-            $table      = 'Admins';
+            $table      = 'sys_admins';
             $login_page = BX_DOL_URL_ADMIN . "index.php";
         break;
         case 2:
             $mem        = 'aff';
-            $table      = 'aff';
+            $table      = 'sys_aff';
             $login_page = "{$site['url_aff']}index.php";
         break;
@@ -971 +971 @@
         return false;   
 
-    db_res( "DELETE FROM `Greetings` WHERE `ID` = '{$ID}' OR `Profile` = '{$ID}'" );
+    db_res( "DELETE FROM `sys_greetings` WHERE `ID` = '{$ID}' OR `Profile` = '{$ID}'" );
     
     if ( !mysql_affected_rows() )

trunk/inc/admin_design.inc.php

@@ -151 +151 @@
             $onclick = 'onclick="' . $aItem['Url'] . '"';
             
-            $aAdmin = db_arr( "SELECT * FROM `Admins` LIMIT 1" );
+            $aAdmin = db_arr( "SELECT * FROM `sys_admins` LIMIT 1" );
             $onclick = str_replace( '{adminLogin}', $aAdmin['Name'],       $onclick );
             $onclick = str_replace( '{adminPass}',  $aAdmin['Password'], $onclick );
@@ -458 +458 @@
             $onclick = 'onclick="' . $aItem['Url'] . '"';
             
-            $aAdmin = db_arr( "SELECT * FROM `Admins` LIMIT 1" );
+            $aAdmin = db_arr( "SELECT * FROM `sys_admins` LIMIT 1" );
             $onclick = str_replace( '{adminLogin}', $aAdmin['Name'],       $onclick );
             $onclick = str_replace( '{adminPass}',  $aAdmin['Password'], $onclick );

trunk/inc/checkout.inc.php

@@ -211 +211 @@
     $transactionString = transDataToString( $transactionData );
     $transactionDesc = process_db_input( $checkoutData['description'], 0, 1 );
-    $res = db_res( "INSERT INTO `Transactions` SET
+    $res = db_res( "INSERT INTO `sys_transactions` SET
                         `IDMember` = {$memberID},
                         `IDProvider` = {$providerID},
@@ -252 +252 @@
     $status = ($approved ? 'approved' : 'declined');
 
-    $res = db_res( "UPDATE `Transactions` SET
+    $res = db_res( "UPDATE `sys_transactions` SET
                         `Status` = '{$status}',
                         `Date` = NOW(),
@@ -283 +283 @@
     $localTranID = (int)$localTranID;
 
-    $tranRes = db_res( "SELECT `Data` FROM `Transactions`
+    $tranRes = db_res( "SELECT `Data` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}" );
     if ( !$tranRes || mysql_num_rows($tranRes) == 0 )
@@ -353 +353 @@
 
     // delete dummy transaction
-    $res = db_res( "DELETE FROM `Transactions`
+    $res = db_res( "DELETE FROM `sys_transactions`
                         WHERE `ID` = {$localTranID}" );
     if ( $res && mysql_affected_rows( $MySQL->link ) > 0 )
@@ -382 +382 @@
 
     // select dummy transaction info
-    $tranRes = db_res( "SELECT `IDProvider`, `Data` FROM `Transactions`
+    $tranRes = db_res( "SELECT `IDProvider`, `Data` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}" );
     if ( !$tranRes || mysql_num_rows($tranRes) == 0 )
@@ -506 +506 @@
     if ( $localTranID )
     {
-        $tranRes = db_res( "SELECT `Data` FROM `Transactions`
+        $tranRes = db_res( "SELECT `Data` FROM `sys_transactions`
                                 WHERE `ID` = {$localTranID}" );
         if ( $tranRes && mysql_num_rows($tranRes) > 0 )
@@ -698 +698 @@
     $localTranID = (int)$localTranID;
 
-    $tranRes = db_res( "SELECT `Data` FROM `Transactions`
+    $tranRes = db_res( "SELECT `Data` FROM `sys_transactions`
                             WHERE `ID` = {$localTranID}" );
     if ( !$tranRes || mysql_num_rows($tranRes) == 0 )
@@ -852 +852 @@
     // Fill the array
     $fin = array();
-    $arr = db_arr( "SELECT `Percent` FROM `aff` WHERE `ID` = $affID");
+    $arr = db_arr( "SELECT `Percent` FROM `sys_aff` WHERE `ID` = $affID");
     $percent = (float)$arr['Percent'] / 100.0;
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}membership{$separator}%' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}membership{$separator}%' AND `Currency` = '{$currency_code}'" );
     $fin['membership_amount'] = sprintf( "%.2f", $percent * (float)$arr[0] );
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}profiles{$separator}%' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}profiles{$separator}%' AND `Currency` = '{$currency_code}'" );
     $fin['sales_amount'] = sprintf( "%.2f", $percent * (float)$arr[0] );
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` INNER JOIN `sys_aff_members` ON (`idProfile` = `IDMember`) WHERE {$tranFilter} AND `idAff` = {$affID} AND `Status` = 'approved' AND `Currency` = '{$currency_code}'" );
     $fin['total'] = sprintf( "%.2f", $percent * (float)$arr[0] );
 
@@ -930 +930 @@
     // Fill the array
     $fin = array();
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}membership{$separator}%' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}membership{$separator}%' AND `Currency` = '{$currency_code}'" );
     $fin['membership_amount'] = sprintf( "%.2f", (float)$arr[0] );
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}profiles{$separator}%' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Data` LIKE '%{$separator}profiles{$separator}%' AND `Currency` = '{$currency_code}'" );
     $fin['sales_amount'] = sprintf( "%.2f", (float)$arr[0] );
-    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `Transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Currency` = '{$currency_code}'" );
+    $arr = db_arr( "SELECT SUM( `Amount` ) FROM `sys_transactions` WHERE {$tranFilter} AND `Status` = 'approved' AND `Currency` = '{$currency_code}'" );
     $fin['total'] = sprintf( "%.2f", (float)$arr[0] );
 

trunk/inc/classes/BxDolInstaller.php

@@ -405 +405 @@
     function actionRecompileVotes($bInstall = true) {
         ob_start();
-        $bResult = clearCacheFile(BX_DIRECTORY_PATH_DBCACHE . 'VoteObjects.inc');
+        $bResult = clearCacheFile(BX_DIRECTORY_PATH_DBCACHE . 'sys_objects_vote.inc');
         ob_get_clean();
         

trunk/inc/classes/BxDolVoting.php

@@ -23 +23 @@
 
 define( 'BX_PERIOD_PER_VOTE', 7 * 86400 );
-define( 'VOTE_CACHE_FILE', BX_DIRECTORY_PATH_DBCACHE . 'VoteObjects.inc' );
+define( 'VOTE_CACHE_FILE', BX_DIRECTORY_PATH_DBCACHE . 'sys_objects_vote.inc' );
 
 class BxDolVoting extends BxDolMistake
@@ -83 +83 @@
             // cache is empty | load data from DB
 
-            $sQuery  = "SELECT * FROM `VoteObjects`";
+            $sQuery  = "SELECT * FROM `sys_objects_vote`";
             $rResult = db_res($sQuery);
 

trunk/inc/design.inc.php

@@ -224 +224 @@
         {
             $_GET['idAff'] = (int)$_GET['idAff'];
-            $res = db_res("SELECT ID FROM aff WHERE ID={$_GET['idAff']} AND `Status`='active'");
+            $res = db_res("SELECT ID FROM `sys_aff` WHERE ID={$_GET['idAff']} AND `Status`='active'");
         }
         else
-            $res = db_res("SELECT ID FROM aff WHERE email='{$_GET['idAff']}' AND `Status`='active'");
+            $res = db_res("SELECT ID FROM `sys_aff` WHERE email='{$_GET['idAff']}' AND `Status`='active'");
 
         if ( mysql_num_rows($res) )
@@ -495 +495 @@
                 $sOnclick = 'onclick="' . $aVal['adm_link'] . '"';
                     
-                $aAdmin = db_arr( "SELECT * FROM `Admins` LIMIT 1" );
+                $aAdmin = db_arr( "SELECT * FROM `sys_admins` LIMIT 1" );
                 $sOnclick = str_replace( '{adminLogin}', $aAdmin['Name'], $sOnclick );
                 $sOnclick = str_replace( '{adminPass}',  $aAdmin['Password'], $sOnclick );

trunk/install/index.php

@@ -1428 +1428 @@
     }
 
-    mysql_query("UPDATE `Admins` SET `Name`='{$sAdminName}', `Password`=md5('{$sAdminPassword}') WHERE `Name`='admin'", $vLink);
+    mysql_query("UPDATE `sys_admins` SET `Name`='{$sAdminName}', `Password`=md5('{$sAdminPassword}') WHERE `Name`='admin'", $vLink);
     if (! $res)
         $errorMes .= 'Error while executing: ' . $s_sql  . '<br />' . mysql_error() . '<hr />';

trunk/install/sql/v70.sql

@@ -6 +6 @@
 
 SET NAMES 'utf8';
-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`, `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`, `Transactions`, `sys_objects_actions`, `Greetings`, `Votes`, `ZIPCodes`, `VoteObjects`, `sys_objects_views`, `sys_box_download`;
+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`;
 ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
@@ -170 +170 @@
 
 --
--- Table structure for table `Admins`
---
-
-CREATE TABLE `Admins` (
+-- Table structure for table `sys_admins`
+--
+
+CREATE TABLE `sys_admins` (
   `Name` varchar(10) NOT NULL default '',
   `Password` varchar(32) NOT NULL default '',
@@ -180 +180 @@
 
 --
--- Dumping data for table `Admins`
---
-
-INSERT INTO `Admins` VALUES('admin', '36cdf8b887a5cffc78dcd5c08991b993');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `aff`
---
-
-CREATE TABLE `aff` (
+-- Dumping data for table `sys_admins`
+--
+
+INSERT INTO `sys_admins` VALUES('admin', '36cdf8b887a5cffc78dcd5c08991b993');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `sys_aff`
+--
+
+CREATE TABLE `sys_aff` (
   `ID` bigint(8) NOT NULL auto_increment,
   `Name` varchar(10) NOT NULL default '',
@@ -206 +206 @@
 
 --
--- Dumping data for table `aff`
+-- Dumping data for table `sys_aff`
 --
 
@@ -2350 +2350 @@
 INSERT INTO `sys_stat_member` VALUES('mfr', 'SELECT COUNT(*) FROM `sys_friend_list` WHERE `Profile` = ''__member_id__'' AND  `Check` = ''0''');
 INSERT INTO `sys_stat_member` VALUES('mfa', 'SELECT COUNT(*) FROM `sys_friend_list` WHERE ( `ID`=''__member_id__'' OR `Profile`=''__member_id__'' ) AND `Check`=''1''');
-INSERT INTO `sys_stat_member` VALUES('mgc', 'SELECT COUNT(*) FROM `Greetings` WHERE `ID` = ''__member_id__'' AND New = ''1''');
+INSERT INTO `sys_stat_member` VALUES('mgc', 'SELECT COUNT(*) FROM `sys_greetings` WHERE `ID` = ''__member_id__'' AND New = ''1''');
 INSERT INTO `sys_stat_member` VALUES('mbc', 'SELECT COUNT(*) FROM `sys_block_list` WHERE `ID` = ''__member_id__''');
 INSERT INTO `sys_stat_member` VALUES('mvc', 'SELECT COUNT(*) FROM `sys_profiles_track` WHERE `ID` = ''__member_id__''');
 INSERT INTO `sys_stat_member` VALUES('mg', 'SELECT COUNT(*) FROM `Groups` WHERE `creatorID` = ''__member_id__'' AND `status`=''Active''');
 INSERT INTO `sys_stat_member` VALUES('mgj', 'SELECT COUNT(*) FROM `GroupsMembers` WHERE `memberID` = ''__member_id__'' AND `status`=''Active''');
-INSERT INTO `sys_stat_member` VALUES('mgmc', 'SELECT COUNT(*) FROM `Greetings` WHERE `Profile` = ''__member_id__'' AND New = ''1''');
+INSERT INTO `sys_stat_member` VALUES('mgmc', 'SELECT COUNT(*) FROM `sys_greetings` WHERE `Profile` = ''__member_id__'' AND New = ''1''');
 INSERT INTO `sys_stat_member` VALUES('mrc', 'SELECT COUNT(*) FROM `sys_block_list` WHERE `ID` = ''__member_id__''');
 INSERT INTO `sys_stat_member` VALUES('mvmc', 'SELECT COUNT(*) FROM `sys_profiles_track` WHERE `Profile` = ''__member_id__''');
@@ -3710 +3710 @@
 
 --
--- Table structure for table `Transactions`
---
-
-CREATE TABLE `Transactions` (
+-- Table structure for table `sys_transactions`
+--
+
+CREATE TABLE `sys_transactions` (
   `ID` bigint(20) unsigned NOT NULL auto_increment,
   `IDMember` int(10) unsigned NOT NULL default '0',
@@ -3732 +3732 @@
 
 --
--- Dumping data for table `Transactions`
+-- Dumping data for table `sys_transactions`
 --
 
@@ -3769 +3769 @@
 
 --
--- Table structure for table `Greetings`
---
-
-CREATE TABLE `Greetings` (
+-- Table structure for table `sys_greetings`
+--
+
+CREATE TABLE `sys_greetings` (
   `ID` int(10) unsigned NOT NULL default '0',
   `Profile` int(10) unsigned NOT NULL default '0',
@@ -3782 +3782 @@
 
 --
--- Dumping data for table `Greetings`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `Votes`
---
-
-CREATE TABLE `Votes` (
-  `Member` int(10) unsigned NOT NULL default '0',
-  `Mark` int(11) NOT NULL default '0',
-  `IP` varchar(18) NOT NULL default '',
-  `Date` date NOT NULL default '0000-00-00',
-  UNIQUE KEY `Member` (`Member`,`IP`,`Date`),
-  KEY `Member_2` (`Member`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `Votes`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `VoteObjects`
---
-
-CREATE TABLE `VoteObjects` (
+-- Dumping data for table `sys_greetings`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `sys_objects_vote`
+--
+
+CREATE TABLE `sys_objects_vote` (
   `ID` int(10) unsigned NOT NULL auto_increment,
   `ObjectName` varchar(50) NOT NULL,
@@ -3834 +3813 @@
 
 --
--- Dumping data for table `VoteObjects`
---
-
-INSERT INTO `VoteObjects` VALUES(1, 'profile', 'sys_profile_rating', 'sys_profile_voting_track', 'pr_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'Profiles', 'Rate', 'RateCount', 'ID', '', '');
-
---
--- Table structure for table `ZIPCodes`
---
-
-CREATE TABLE `ZIPCodes` (
+-- Dumping data for table `sys_objects_vote`
+--
+
+INSERT INTO `sys_objects_vote` VALUES(1, 'profile', 'sys_profile_rating', 'sys_profile_voting_track', 'pr_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'Profiles', 'Rate', 'RateCount', 'ID', '', '');
+
+--
+-- Table structure for table `sys_zip_codes`
+--
+
+CREATE TABLE `sys_zip_codes` (
   `ZIPCode` varchar(8) default NULL,
   `ZIPCodeType` char(1) default NULL,

trunk/join.php

@@ -294 +294 @@
         // Affiliate and friend checking
         if ( $bEnAff && $_COOKIE['idAff'] ) {
-            $vRes = db_res("SELECT `ID` FROM `aff` WHERE `ID` = {$_COOKIE['idAff']} AND `Status` = 'active'");
+            $vRes = db_res("SELECT `ID` FROM `sys_aff` WHERE `ID` = {$_COOKIE['idAff']} AND `Status` = 'active'");
             if ( mysql_num_rows( $vRes ) ) {
                 $vRes = db_res("INSERT INTO `sys_aff_members` (`idAff`,`idProfile`) VALUES ('{$_COOKIE['idAff']}', '{$iMemID}')");

trunk/join_aff.php

@@ -90 +90 @@
         $page = 1;
     }
-        if ( !strcmp($Email,$Email2) && (!eregi("^[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,4}$", $Email) || db_arr("SELECT ID FROM aff WHERE UPPER(email) = UPPER('$Email')")) )
+        if ( !strcmp($Email,$Email2) && (!eregi("^[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,4}$", $Email) || db_arr("SELECT ID FROM `sys_aff` WHERE UPPER(email) = UPPER('$Email')")) )
         {
             $add_on .= report_err( _t("_EMAIL_INVALID_AFF") );
@@ -122 +122 @@
     // new profile creation
 
-    $cl_values = "INSERT INTO aff SET ";
+    $cl_values = "INSERT INTO `sys_aff` SET ";
 
     $seed = rand();
@@ -138 +138 @@
     if ($create_result)
     {
-        $arr = db_arr("SELECT ID FROM aff WHERE `seed` = $seed");
+        $arr = db_arr("SELECT ID FROM `sys_aff` WHERE `seed` = $seed");
         if ( $arr )
-            db_res("UPDATE aff SET `seed` = 0 WHERE ID = $arr[ID]");
+            db_res("UPDATE `sys_aff` SET `seed` = 0 WHERE ID = $arr[ID]");
         $ID_New_Aff = $arr[ID];
     }

trunk/member.php

@@ -109 +109 @@
     
         // new kisses attention
-        $new_kiss_arr = db_arr( "SELECT ID FROM `Greetings` WHERE `Profile` = {$iChMemberID} AND New = '1' LIMIT 1" );
+        $new_kiss_arr = db_arr( "SELECT ID FROM `sys_greetings` WHERE `Profile` = {$iChMemberID} AND New = '1' LIMIT 1" );
         if ( $new_kiss_arr )
             $vkiss = 1;

trunk/membership.php

@@ -54 +54 @@
         case 'cancel_subscription':
             $transactionID = (int)$_REQUEST['tran_id'];
-            $subscriptionArr = db_arr( "SELECT `sys_payment_subscriptions`.`TransactionID`, DATE_FORMAT(`sys_payment_subscriptions`.`StartDate`,  '$date_format' ) AS StartDate, `sys_payment_subscriptions`.`Period`, `Transactions`.`Description`, `sys_payment_providers`.`Caption` AS `ProviderCaption` FROM `sys_payment_subscriptions`
-                                            LEFT JOIN `Transactions` ON `sys_payment_subscriptions`.`TransactionID` = `Transactions`.`ID`
-                                            LEFT JOIN `sys_payment_providers` ON `Transactions`.`IDProvider` = `sys_payment_providers`.`ID`
+            $subscriptionArr = db_arr( "SELECT `sys_payment_subscriptions`.`TransactionID`, DATE_FORMAT(`sys_payment_subscriptions`.`StartDate`,  '$date_format' ) AS StartDate, `sys_payment_subscriptions`.`Period`, `sys_transactions`.`Description`, `sys_payment_providers`.`Caption` AS `ProviderCaption` FROM `sys_payment_subscriptions`
+                                            LEFT JOIN `sys_transactions` ON `sys_payment_subscriptions`.`TransactionID` = `sys_transactions`.`ID`
+                                            LEFT JOIN `sys_payment_providers` ON `sys_transactions`.`IDProvider` = `sys_payment_providers`.`ID`
                                             WHERE `sys_payment_subscriptions`.`TransactionID` = {$transactionID}" );
 
@@ -149 +149 @@
     ob_start();
 
-    $subscriptionsRes = db_res( "SELECT `sys_payment_subscriptions`.`TransactionID`, DATE_FORMAT(`sys_payment_subscriptions`.`StartDate`, '$date_format' ) AS StartDate, `sys_payment_subscriptions`.`Period`, `sys_payment_subscriptions`.`ChargesNumber`, `Transactions`.`Description` FROM `sys_payment_subscriptions`
-                                    LEFT JOIN `Transactions` ON `sys_payment_subscriptions`.`TransactionID` = `Transactions`.`ID`
-                                    WHERE `Transactions`.`IDMember` = {$memberID}
-                                        AND `Transactions`.`Status` = 'declined'" );
+    $subscriptionsRes = db_res( "SELECT `sys_payment_subscriptions`.`TransactionID`, DATE_FORMAT(`sys_payment_subscriptions`.`StartDate`, '$date_format' ) AS StartDate, `sys_payment_subscriptions`.`Period`, `sys_payment_subscriptions`.`ChargesNumber`, `sys_transactions`.`Description` FROM `sys_payment_subscriptions`
+                                    LEFT JOIN `sys_transactions` ON `sys_payment_subscriptions`.`TransactionID` = `sys_transactions`.`ID`
+                                    WHERE `sys_transactions`.`IDMember` = {$memberID}
+                                        AND `sys_transactions`.`Status` = 'declined'" );
     $daysLangString = _t('_days');
     $cancelLangString = _t('_Cancel');

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

@@ -262 +262 @@
 INSERT INTO `sys_menu_top` (`ID`, `Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Strict`, `Picture`, `BQuickLink`, `Statistics`) VALUES(NULL, @menu_id, 'Ads Home', '_bx_ads_Ads_Home', 'modules/boonex/ads/classifieds.php?Browse=1', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 1, 'modules/boonex/ads/|bx_ads.png', 1, '');
 
-INSERT INTO `VoteObjects` (`ID`, `ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`, `OverrideClassName`, `OverrideClassFile`) VALUES(NULL, 'ads', 'classifieds_rating', 'classifieds_voting_track', 'ads_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', 'ClassifiedsAdvertisements', 'Rate', 'RateCount', 'ID', '', '');
+INSERT INTO `sys_objects_vote` (`ID`, `ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`, `OverrideClassName`, `OverrideClassFile`) VALUES(NULL, 'ads', 'classifieds_rating', 'classifieds_voting_track', 'ads_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', 'ClassifiedsAdvertisements', 'Rate', 'RateCount', 'ID', '', '');
 
 INSERT INTO `sys_options` (`Name`, `VALUE`, `kateg`, `desc`, `Type`, `check`, `err_text`, `order_in_kateg`) VALUES('permalinks_module_ads', 'on', 26, 'Enable friendly ads permalink', 'checkbox', '', '', 0);

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

@@ -52 +52 @@
 DELETE FROM `sys_menu_top` WHERE `Name` = 'Ads Home' AND `Caption` = '_bx_ads_Ads_Home';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName`='ads' AND `TableRating`='classifieds_rating';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName`='ads' AND `TableRating`='classifieds_rating';
 
 DELETE FROM `sys_options` WHERE `Name` = 'permalinks_module_ads';

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

@@ -194 +194 @@
 
 INSERT INTO `sys_objects_cmts` (`ID`, `ObjectName`, `TableCmts`, `TableTrack`, `AllowTags`, `Nl2br`, `SecToEdit`, `PerView`, `IsRatable`, `ViewingThreshold`, `AnimationEffect`, `AnimationSpeed`, `IsOn`, `IsMood`, `RootStylePrefix`, `TriggerTable`, `TriggerFieldId`, `TriggerFieldComments`, `ClassName`, `ClassFile`) VALUES(NULL, 'blogposts', '[db_prefix]_cmts', 'sys_cmts_track', 0, 1, 90, 5, 1, -3, 'slide', 2000, 1, 1, 'cmt', '[db_prefix]_posts', 'PostID', 'CommentsCount', '', '');
-INSERT INTO `VoteObjects` (`ID`, `ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`, `OverrideClassName`, `OverrideClassFile`) VALUES(NULL, 'blogposts', '[db_prefix]_rating', '[db_prefix]_voting_track', 'blogp_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', '[db_prefix]_posts', 'Rate', 'RateCount', 'PostID', '', '');
+INSERT INTO `sys_objects_vote` (`ID`, `ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`, `OverrideClassName`, `OverrideClassFile`) VALUES(NULL, 'blogposts', '[db_prefix]_rating', '[db_prefix]_voting_track', 'blogp_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', '[db_prefix]_posts', 'Rate', 'RateCount', 'PostID', '', '');
 
 ALTER TABLE `[db_prefix]_posts` ADD FULLTEXT (`PostCaption`, `PostText`, `Tags`);

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

@@ -57 +57 @@
 DELETE FROM `sys_menu_top` WHERE `Name` = 'Blogs Home' AND `Caption` = '_bx_blog_Posts';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName`='blogposts' AND `TableRating`='[db_prefix]_rating';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName`='blogposts' AND `TableRating`='[db_prefix]_rating';
 
 DELETE FROM `sys_options` WHERE `Name` = 'permalinks_module_blogs';

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

@@ -140 +140 @@
 
 -- vote objects
-INSERT INTO `VoteObjects` VALUES (NULL, 'bx_events', 'bx_events_rating', 'bx_events_rating_track', 'gal_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'bx_events_main', 'Rate', 'RateCount', 'ID', '', '');
+INSERT INTO `sys_objects_vote` VALUES (NULL, 'bx_events', 'bx_events_rating', 'bx_events_rating_track', 'gal_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'bx_events_main', 'Rate', 'RateCount', 'ID', '', '');
 
 -- comments objects

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

@@ -16 +16 @@
 -- system objects
 DELETE FROM `sys_permalinks` WHERE `standard` = 'modules/?r=events/';
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'bx_events';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'bx_events';
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName` = 'bx_events';
 DELETE FROM `sys_objects_views` WHERE `name` = 'bx_events';

trunk/modules/boonex/feedback/install/sql/install.sql

@@ -107 +107 @@
 ('bx_feedback', '[db_prefix]comments', '[db_prefix]comments_track', 0, 1, 90, 20, 1, -3, 'slide', 2000, 1, 0, 'cmt', '[db_prefix]entries', 'id', 'cmts_count', 'BxFdbCmts', 'modules/boonex/feedback/classes/BxFdbCmts.php');
 
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) VALUES
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) VALUES
 ('bx_feedback', '[db_prefix]voting', '[db_prefix]voting_track', 'fdb_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', '[db_prefix]entries', 'rate', 'rate_count', 'id');
 

trunk/modules/boonex/feedback/install/sql/uninstall.sql

@@ -17 +17 @@
 
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName`='bx_feedback' LIMIT 1;
-DELETE FROM `VoteObjects` WHERE `ObjectName`='bx_feedback' LIMIT 1;
+DELETE FROM `sys_objects_vote` WHERE `ObjectName`='bx_feedback' LIMIT 1;
 DELETE FROM `sys_objects_tag` WHERE `ObjectName`='bx_feedback' LIMIT 1;
 DELETE FROM `sys_objects_search` WHERE `ObjectName`='bx_feedback' LIMIT 1;

trunk/modules/boonex/news/install/sql/install.sql

@@ -133 +133 @@
 ('bx_news', '[db_prefix]comments', '[db_prefix]comments_track', 0, 1, 90, 10, 1, -3, 'slide', 2000, 1, 0, 'cmt', '[db_prefix]entries', 'id', 'cmts_count', 'BxNewsCmts', 'modules/boonex/news/classes/BxNewsCmts.php');
 
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) VALUES
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) VALUES
 ('bx_news', '[db_prefix]voting', '[db_prefix]voting_track', 'news_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', '[db_prefix]entries', 'rate', 'rate_count', 'id');
 

trunk/modules/boonex/news/install/sql/uninstall.sql

@@ -18 +18 @@
 
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName`='bx_news' LIMIT 1;
-DELETE FROM `VoteObjects` WHERE `ObjectName`='bx_news' LIMIT 1;
+DELETE FROM `sys_objects_vote` WHERE `ObjectName`='bx_news' LIMIT 1;
 DELETE FROM `sys_objects_tag` WHERE `ObjectName`='bx_news' LIMIT 1;
 DELETE FROM `sys_objects_search` WHERE `ObjectName`='bx_news' LIMIT 1;

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

@@ -108 +108 @@
 VALUES ('bx_shared_files', '[db_prefix]_cmts', 'sys_cmts_track', 0, 1, 90, 5, 1, -3, 'slide', 2000, 1, 1, 'cmt', '[db_prefix]_main', 'ID', 'CommentsCount');
 
--- VoteObjects
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) 
+-- sys_objects_vote
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) 
 VALUES ('bx_shared_files', '[db_prefix]_rating', '[db_prefix]_voting_track', 'gal_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, '', '', '[db_prefix]_main', 'Rate', 'RateCount', 'ID');
 

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

@@ -16 +16 @@
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName` = 'bx_shared_files';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'bx_shared_files';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'bx_shared_files';
 
 SET @iTMParentId = (SELECT `ID` FROM `sys_menu_top` WHERE `Name`='Files' AND `Parent`=0 LIMIT 1);

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

@@ -186 +186 @@
 (NULL, 'Music RSS', 'rss.png', 'rss_factory.php?action=shared_music&pid={ownerID}', '', '', 6, 'shared_music');
 
--- VoteObjects
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`)
+-- sys_objects_vote
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`)
 VALUES('shared_music', '[db_prefix]rating', '[db_prefix]voting_track', 'gal_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, 'BxShMusicRate', 'modules/boonex/shared_music/classes/BxShMusicRate.php', 'RayMp3Files', 'Rate', 'RateCount', 'ID');
 

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

@@ -38 +38 @@
 DELETE FROM `sys_objects_actions` WHERE `Type`='shared_music';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'shared_music';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'shared_music';
 
 SET @iKatID = (SELECT  `id` FROM `sys_alerts_handlers` WHERE `name` = 'shared_music' LIMIT 1);

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

@@ -225 +225 @@
 (NULL, '{evalResult}', 'image_link.png', '', 'getHtmlData( ''ajaxy_popup_result_div_{ID}'', ''{url}mediaActions.php?action=set_thumb&fileID={ID}&type={file_type}&mode=ajax'');return false;', 'if ({medProfId} == {iViewer}) \r\nreturn _t( ''_Set as thumbnail'' );\r\nelse\r\nreturn null;', 6, 'shared_photo');
 
--- VoteObjects
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) 
+-- sys_objects_vote
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`) 
 VALUES ('shared_photo', '[db_prefix]rating', '[db_prefix]voting_track', 'gal_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1, 'BxShPhotoRate', 'modules/boonex/shared_photo/classes/BxShPhotoRate.php', '[db_prefix]files', 'Rate', 'RateCount', 'medID');
 

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

@@ -38 +38 @@
 DELETE FROM `sys_objects_actions` WHERE `Type`='shared_photo';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'shared_photo';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'shared_photo';
 
 SET @iKatID = (SELECT  `id` FROM `sys_alerts_handlers` WHERE `name` = 'shared_photo' LIMIT 1);

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

@@ -185 +185 @@
 (NULL, '{evalResult}', 'action_block.png', '', 'getHtmlData( ''ajaxy_popup_result_div_{ID}'', ''{url}mediaActions.php?action=delete&fileID={ID}&type={file_type}'');return false;', 'if ({medProfId} == {iViewer} )\r\nreturn _t( ''_Delete'' );\r\nelse\r\nreturn null;', 7, 'shared_video');
 
--- VoteObjects
-INSERT INTO `VoteObjects` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`)
+-- sys_objects_vote
+INSERT INTO `sys_objects_vote` (`ObjectName`, `TableRating`, `TableTrack`, `RowPrefix`, `MaxVotes`, `PostName`, `IsDuplicate`, `IsOn`, `className`, `classFile`, `TriggerTable`, `TriggerFieldRate`, `TriggerFieldRateCount`, `TriggerFieldId`)
 VALUES('shared_video', '[db_prefix]rating', '[db_prefix]voting_track', 'gal_', 5, 'vote_send_result', 'BX_PERIOD_PER_VOTE', 1,'BxShVideoRate', 'modules/boonex/shared_video/classes/BxShVideoRate.php', 'RayVideoFiles', 'Rate', 'RateCount', 'ID');
 

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

@@ -39 +39 @@
 DELETE FROM `sys_objects_actions` WHERE `Type` = 'shared_video';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'shared_video';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'shared_video';
 
 SET @iKatID = (SELECT  `id` FROM `sys_alerts_handlers` WHERE `name` = 'shared_video' LIMIT 1);

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

@@ -129 +129 @@
 
 -- vote objects
-INSERT INTO `VoteObjects` VALUES (NULL, 'bx_sites', 'bx_sites_rating', 'bx_sites_rating_track', 'sites_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'bx_sites_main', 'rate', 'rateCount', 'id', '', '');
+INSERT INTO `sys_objects_vote` VALUES (NULL, 'bx_sites', 'bx_sites_rating', 'bx_sites_rating_track', 'sites_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', 'bx_sites_main', 'rate', 'rateCount', 'id', '', '');
 
 -- comments objects

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

@@ -18 +18 @@
 DELETE FROM `sys_page_compose` WHERE `Page` = 'bx_sites_main' OR `Page` = 'bx_sites_profile' OR `Page` = 'bx_sites_view';
 
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'bx_sites';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'bx_sites';
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName` = 'bx_sites';
 DELETE FROM `sys_objects_views` WHERE `name` = 'bx_sites';

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

@@ -113 +113 @@
 
 -- vote objects
-INSERT INTO `VoteObjects` VALUES (NULL, 'bx_store', '[db_prefix]rating', '[db_prefix]rating_track', 'gal_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', '[db_prefix]main', 'rate', 'rate_count', 'id', '', '');
+INSERT INTO `sys_objects_vote` VALUES (NULL, 'bx_store', '[db_prefix]rating', '[db_prefix]rating_track', 'gal_', '5', 'vote_send_result', 'BX_PERIOD_PER_VOTE', '1', '', '', '[db_prefix]main', 'rate', 'rate_count', 'id', '', '');
 
 -- comments objects

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

@@ -13 +13 @@
 -- system objects
 DELETE FROM `sys_permalinks` WHERE `standard` = 'modules/?r=store/';
-DELETE FROM `VoteObjects` WHERE `ObjectName` = 'bx_store';
+DELETE FROM `sys_objects_vote` WHERE `ObjectName` = 'bx_store';
 DELETE FROM `sys_objects_cmts` WHERE `ObjectName` = 'bx_store';
 DELETE FROM `sys_objects_views` WHERE `name` = 'bx_store';

trunk/periodic/cmd.php

@@ -72 +72 @@
     if ( $db_clean_vkiss > 0 )
     {
-        $res = db_res("DELETE FROM `Greetings` WHERE (TO_DAYS(NOW()) - TO_DAYS(`When`)) > $db_clean_vkiss");
+        $res = db_res("DELETE FROM `sys_greetings` WHERE (TO_DAYS(NOW()) - TO_DAYS(`When`)) > $db_clean_vkiss");
         if ( $res )
             $db_clean_vkiss_num = mysql_affected_rows();

trunk/templates/base/scripts/BxBaseCommunicator.php

@@ -192 +192 @@
                         'specific_key'  => '_N times',
                     );
-                    $aRows = $this -> getRequests( 'Greetings', $aTypes, null, 'Number' );
+                    $aRows = $this -> getRequests( 'sys_greetings', $aTypes, null, 'Number' );
                 break;
 

trunk/templates/base/scripts/BxBaseProfileView.php

@@ -722 +722 @@
 
             $zip = process_db_input( strtoupper( str_replace(' ', '', $zip) ), 1);
-            $aZipInfo = db_arr("SELECT `Latitude`, `Longitude` FROM `ZIPCodes` WHERE REPLACE(`ZIPCode`,' ','') = '{$sZip}'");
+            $aZipInfo = db_arr("SELECT `Latitude`, `Longitude` FROM `sys_zip_codes` WHERE REPLACE(`ZIPCode`,' ','') = '{$sZip}'");
             //echoDbg($aZipInfo);
             if ( $aZipInfo ) {
@@ -739 +739 @@
                 $maxLong = $zcdRadius->MaxLongitude();
 
-                $sJoin .= " LEFT JOIN `ZIPCodes` ON UPPER( REPLACE(`Profiles`.`zip`, ' ', '') ) = REPLACE(`ZIPCodes`.`ZIPCode`,' ', '') ";
-                $aWhere[] = "`ZIPCodes`.`ZIPCode` IS NOT NULL AND `ZIPCodes`.`Latitude` >= {$minLat} AND `ZIPCodes`.`Latitude` <= {$maxLat} AND `ZIPCodes`.`Longitude` >= {$minLong} AND `ZIPCodes`.`Longitude` <= {$maxLong} ";
+                $sJoin .= " LEFT JOIN `sys_zip_codes` ON UPPER( REPLACE(`Profiles`.`zip`, ' ', '') ) = REPLACE(`sys_zip_codes`.`ZIPCode`,' ', '') ";
+                $aWhere[] = "`sys_zip_codes`.`ZIPCode` IS NOT NULL AND `sys_zip_codes`.`Latitude` >= {$minLat} AND `sys_zip_codes`.`Latitude` <= {$maxLat} AND `sys_zip_codes`.`Longitude` >= {$minLong} AND `sys_zip_codes`.`Longitude` <= {$maxLong} ";
             }
         }