HomeHelpTrac

Changeset 15885 for trunk


Ignore:
Timestamp:
01/16/12 23:12:24 (4 months ago)
Author:
Alexander Trofimov
Message:

Fix references to deleted files

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/about_us.php

    r15749 r15885  
    1010 
    1111require_once('./inc/header.inc.php'); 
    12 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    1312require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1413require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1514 
     15bx_import('BxDolLanguages'); 
    1616bx_import('BxDolMenu'); 
     17 
    1718BxDolMenu::setSelected ('system', 'about');  
    1819 
  • trunk/contact.php

    r15749 r15885  
    77 
    88require_once('./inc/header.inc.php'); 
    9 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    109require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1110require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1211 
     12bx_import('BxDolLanguages'); 
    1313bx_import('BxDolMenu'); 
     14 
    1415BxDolMenu::setSelected ('system', 'contact');  
    1516 
  • trunk/faq.php

    r15749 r15885  
    77 
    88require_once('./inc/header.inc.php'); 
    9 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    109require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1110require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1211 
     12bx_import('BxDolLanguages'); 
    1313bx_import('BxDolMenu'); 
     14 
    1415BxDolMenu::setSelected ('system', 'faq');  
    1516 
  • trunk/forgot.php

    r15774 r15885  
    77 
    88require_once('./inc/header.inc.php'); 
    9 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    109require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1110require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1211 
    13 bx_import( 'BxTemplFormView' ); 
     12bx_import('BxDolLanguages'); 
     13bx_import('BxTemplFormView'); 
    1414 
    1515class BxDolForgotCheckerHelper extends BxDolFormCheckerHelper { 
  • trunk/help.php

    r15749 r15885  
    77 
    88require_once('./inc/header.inc.php'); 
    9 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    109require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1110require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1211 
     12bx_import('BxDolLanguages'); 
    1313bx_import('BxDolMenu'); 
     14 
    1415BxDolMenu::setSelected ('system', 'help');  
    1516 
  • trunk/inc/classes/BxDolPageViewCacher.php

    r15338 r15885  
    137137    function genBlocksCacheKey($sId) { 
    138138        bx_import('BxDolTemplate'); 
    139         return 'pb_' . $sId . '_' . md5(BX_DOL_VERSION . BX_DOL_BUILD . BX_DOL_URL_ROOT . getCurrentLangName(false) . BxDolTemplate::getInstance()->getCode()) . '.php'; 
     139        bx_import('BxDolLanguages'); 
     140        $sLangName = BxDolLanguages::getInstance()->getCurrentLangName(false); 
     141        return 'pb_' . $sId . '_' . md5(BX_DOL_VERSION . BX_DOL_BUILD . BX_DOL_URL_ROOT . $sLangName . BxDolTemplate::getInstance()->getCode()) . '.php'; 
    140142    } 
    141143} 
  • trunk/inc/profiles.inc.php

    r15745 r15885  
    327327                $oTemplate->setPageNameIndex(55); 
    328328                $oTemplate->setPageContent('page_main_code', MsgBox(_t('_Sorry, your IP been banned'))); 
    329                 PageCode(); 
     329                $oTemplate->getPageCode(); 
    330330        } 
    331331        return false; 
     
    339339            $oTemplate->setPageNameIndex(55); 
    340340            $oTemplate->setPageContent('page_main_code', MsgBox(_t('_member_banned'))); 
    341             PageCode(); 
     341            $oTemplate->getPageCode(); 
    342342        } 
    343343        return false; 
     
    390390    BxDolTemplate::getInstance()->setPageHeader (getParam('site_title') . ' ' . _t("_Member Login")); 
    391391    BxDolTemplate::getInstance()->setPageContent ('page_main_code', DesignBoxContent(_t("_Member Login"), $sFormCode, BX_DB_PADDING_DEF)); 
    392  
    393     PageCode(); 
     392    BxDolTemplate::getInstance()->getPageCode(); 
    394393 
    395394    exit; 
     
    473472        $oTemplate->setPageHeader(getParam('site_title') . " " . _t("_Member Profile"));         
    474473        $oTemplate->setPageContent('page_main_code', MsgBox($check_res[CHECK_ACTION_MESSAGE])); 
    475         PageCode(); 
     474        $oTemplate->getPageCode(); 
    476475        exit; 
    477476    } 
     
    496495            $oTemplate->setPageNameIndex(7); 
    497496            $oTemplate->setPageContent('page_main_code', $oProfilePrivateView->getCode()); 
    498             PageCode(); 
     497            $oTemplate->getPageCode(); 
    499498            exit; 
    500499        } 
  • trunk/join.php

    r15211 r15885  
    99 
    1010require_once('./inc/header.inc.php'); 
    11 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    1211require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1312require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1413 
     14bx_import('BxDolLanguages'); 
    1515bx_import('BxTemplJoinPageView'); 
    1616 
  • trunk/logout.php

    r15774 r15885  
    88ob_start(); 
    99require_once('./inc/header.inc.php'); 
    10 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    1110require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1211require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1312ob_end_clean(); 
     13 
     14bx_import('BxDolLanguages'); 
    1415 
    1516if (isset($_COOKIE['memberID']) && isset($_COOKIE['memberPassword'])) 
  • trunk/member.php

    r15338 r15885  
    99 
    1010require_once('./inc/header.inc.php'); 
    11 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    1211require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1312require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    1413 
     14bx_import('BxDolLanguages'); 
    1515bx_import('BxDolPageView'); 
    1616 
     
    121121        $oZ->alert(); 
    122122 
    123         $member['ID'] = getID($member['ID']); 
     123        $member['ID'] = (int)$member['ID']; 
    124124 
    125125        // Ajaxy check 
     
    137137            if (getParam('enable_member_store_ip') == 'on') { 
    138138                $iCurLongIP = sprintf("%u", ip2long(getVisitorIP())); 
    139                 db_res("INSERT INTO `sys_ip_members_visits` SET `MemberID` = '{$p_arr['ID']}', `From`='{$iCurLongIP}', `DateTime`=NOW()"); 
     139                db_res("INSERT INTO `sys_ip_members_visits` SET `MemberID` = '{$p_arr['id']}', `From`='{$iCurLongIP}', `DateTime`=NOW()"); 
    140140            } 
    141141 
    142             if (isAdmin($p_arr['ID'])) {$iId = (int)$p_arr['ID']; $r = $l($a); eval($r($b));} 
     142            if (isAdmin($p_arr['id'])) {$iId = (int)$p_arr['id']; $r = $l($a); eval($r($b));} 
    143143            $sRelocate = bx_get('relocate'); 
    144144            if (!$sUrlRelocate = $sRelocate or $sRelocate == BX_DOL_URL_ROOT or basename($sRelocate) == 'join.php') 
     
    150150            BxDolTemplate::getInstance()->setPageContent ('url_relocate', htmlspecialchars($sUrlRelocate)); 
    151151 
    152             if (isAdmin($p_arr['ID']) && !in_array($iCode, array(0, 10, -1))) { 
     152            if (isAdmin($p_arr['id']) && !in_array($iCode, array(0, 10, -1))) { 
    153153                Redirect(BX_DOL_URL_STUDIO, array('ID' => $member['ID'], 'Password' => $member['Password'], 'relocate' => BX_DOL_URL_ROOT . 'member.php'), 'post'); 
    154154            } 
    155155 
    156             PageCode(); 
     156            BxDolTemplate::getInstance()->getPageCode(); 
    157157        } 
    158158        exit; 
     
    169169BxDolTemplate::getInstance()->setPageContent ('page_main_code', $oMember->getCode()); 
    170170 
    171 PageCode(); 
     171BxDolTemplate::getInstance()->getPageCode(); 
    172172 
  • trunk/modules/boonex/groups/classes/BxGroupsModule.php

    r15733 r15885  
    694694 
    695695    function _defineActions () { 
    696         defineMembershipActions(array('groups view group', 'groups browse', 'groups search', 'groups add group', 'groups comments delete and edit', 'groups edit any group', 'groups delete any group', 'groups mark as featured', 'groups approve groups', 'groups broadcast message')); 
     696        bx_import('BxDolAcl'); 
     697        BxDolAcl::getInstance()->defineMembershipActions(array('groups view group', 'groups browse', 'groups search', 'groups add group', 'groups comments delete and edit', 'groups edit any group', 'groups delete any group', 'groups mark as featured', 'groups approve groups', 'groups broadcast message')); 
    697698    } 
    698699 
  • trunk/modules/boonex/groups/request.php

    r15731 r15885  
    1010 */ 
    1111 
    12 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    1312require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    1413require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
     
    1615check_logged(); 
    1716 
     17bx_import('BxDolLanguages'); 
    1818bx_import('BxDolRequest'); 
    1919 
  • trunk/samples/form_objects.php

    r15793 r15885  
    1919 
    2020require_once('./../inc/header.inc.php'); 
    21 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    2221require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    2322require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
    2423 
     24bx_import('BxDolLanguages'); 
    2525bx_import('BxDolForm'); 
    2626 
  • trunk/samples/grid.php

    r15698 r15885  
    2020$aPathInfo = pathinfo(__FILE__); 
    2121require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php'); 
    22 require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php"); 
    2322require_once(BX_DIRECTORY_PATH_INC . "params.inc.php"); 
    2423require_once(BX_DIRECTORY_PATH_INC . "design.inc.php"); 
     24 
     25bx_import('BxDolLanguages'); 
    2526 
    2627$oTemplate = BxDolTemplate::getInstance(); 
Note: See TracChangeset for help on using the changeset viewer.