Changeset 1378

Show
Ignore:
Timestamp:
12/06/07 02:32:15 (9 months ago)
Author:
rho
Message:

commited #194 also completes #124

Signed-off: Rolando Espinoza La fuente <rho@prosoftpeople.com>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/config-dist.php

    r1327 r1378  
    22// ELGG system configuration parameters. 
    33// You could override default values here, to see all available 
    4 // options see config-defaults.php 
     4// options see lib/config-defaults.php 
    55// Note: some values are override by the values stored in database 
    66// through admin manager 

  • devel/includes.php

    r1327 r1378  
    3333 
    3434    // Default config values 
    35         require_once(dirname(__FILE__).'/config-defaults.php'); 
     35        require_once(dirname(__FILE__).'/lib/config-defaults.php'); 
    3636    // override config values 
    3737        if (is_readable(dirname(__FILE__).'/config.php')) { 
    …… 
    8282 
    8383    // Check config values make sense 
    84         require_once(dirname(__FILE__).'/sanitychecks.php'); 
     84        require_once(dirname(__FILE__).'/lib/sanitychecks.php'); 
    8585 
    8686    /*************************************************************************** 
    …… 
    107107        require_once($CFG->dirroot.'lib/setup.php'); 
    108108 
    109     // Load required system files: do not edit this line. 
    110         require_once(dirname(__FILE__)."/includes_system.php"); 
     109    // Plug-in engine (must be loaded first) 
     110        require($CFG->dirroot . "lib/engine.php"); 
     111 
     112    // Language / internationalisation 
     113                //@todo All the libraries has a strong dependence with this 'plugin' 
     114        require_once($CFG->dirroot . "mod/gettext/lib.php"); 
     115 
     116    // XML parsing 
     117        require($CFG->dirroot . "lib/xmllib.php"); 
    111118 
    112119    // User functions 

  • devel/index.php

    r1343 r1378  
    44 
    55    require_once(dirname(__FILE__)."/includes.php"); 
     6 
     7    $context = isloggedin() ? 'frontpage_loggedin' : 'frontpage_loggedout'; 
     8    $title = $CFG->sitename; 
     9  
    610    templates_page_setup(); 
     11    templates_page_output($title, null, $context); 
    712 
    8     if (function_exists('pages_frontpage')) { 
    9         $page = pages_frontpage(isloggedin()); 
    10         $context = null; 
    11         $title = $page->title; 
    12         $body = $page->content; 
    13     } else { 
    14         $context = isloggedin() ? 'frontpage_loggedin' : 'frontpage_loggedout'; 
    15         $title = $CFG->sitename; 
    16         $body = null; 
    17     } 
    18              
    19     templates_page_output($title, $body, $context); 
    2013?> 

  • devel/lib/config-defaults.php

    r1327 r1378  
    2222// NB: **MUST** have a final slash at the end 
    2323 
    24     $CFG->dirroot = dirname(__FILE__) . '/'; // default current directory 
     24    $CFG->dirroot = dirname(dirname(__FILE__)) . '/'; // default current directory 
    2525 
    2626// Email address of the system (eg elgg-admin@bogton.edu)