Changeset 3374 for branches

Show
Ignore:
Timestamp:
08/27/2008 09:40:47 PM (3 months ago)
Author:
Shadowhand
Message:

Updated website branch to match r3366 and friends.

Location:
branches/website/application
Files:
3 added
11 modified
10 moved

Legend:

Unmodified
Added
Removed

  • branches/website/application/classes/controller/admin.php

    r2777 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
    2  
    3 class Admin_Controller extends Website_Controller { 
     1<?php 
     2 
     3class Controller_Admin extends Controller_Website { 
    44 
    55        public $auto_render = TRUE; 
    … …  
    291291        } 
    292292 
    293 } // End Admin 
     293} // End Controller_Admin 

  • branches/website/application/classes/controller/donate.php

    r3357 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    3 class Donate_Controller extends Website_Controller { 
     3class Controller_Donate extends Controller_Website { 
    44 
    55        protected $auth_required = 'developer'; 
    … …  
    116116        } 
    117117 
    118 } // End Donate 
     118} // End Controller_Donate 

  • branches/website/application/classes/controller/download.php

    r3315 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
    2  
    3 class Download_Controller extends Website_Controller { 
     1<?php 
     2 
     3class Controller_Download extends Controller_Website { 
    44 
    55        public $auto_render = TRUE; 
    … …  
    244244        } 
    245245 
    246 } // End Download_Controller 
     246} // End Controller_Download 

  • branches/website/application/classes/controller/home.php

    r3309 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    3 class Home_Controller extends Website_Controller { 
     3class Controller_Home extends Controller_Website { 
    44 
    55        public $auto_render = TRUE; 
    … …  
    1111        } 
    1212 
    13 } // End Kohana Website Controller 
     13} // End Controller_Home 

  • branches/website/application/classes/controller/license.php

    r3309 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33class License_Controller extends Website_Controller { 

  • branches/website/application/classes/controller/news.php

    r3309 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33class News_Controller extends Website_Controller { 

  • branches/website/application/classes/controller/tutorials.php

    r3309 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33class Tutorials_Controller extends Website_Controller { 

  • branches/website/application/classes/controller/website.php

    r2777 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    3 class Website_Controller extends Template_Controller { 
     3class Controller_Website extends Controller_Template { 
    44 
    55        // Use auto-rendering, defaults to false 
    … …  
    3636                parent::__construct(); 
    3737 
    38                 // Need the first segment so that the main menu has an active tab 
    39                 $this->uri->segment(1) or url::redirect('home'); 
     38                if (Router::$current_uri === '') 
     39                { 
     40                        // Need the first segment so that the main menu has an active tab 
     41                        url::redirect('home'); 
     42                } 
    4043 
    4144                if ($this->auto_render === TRUE) 
    … …  
    143146        } 
    144147 
    145 } // End Website Controller 
     148} // End Controller_Website 

  • branches/website/application/classes/model/donation.php

    r1356 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    3 class Donation_Model extends ORM {} 
     3class Model_Donation extends ORM {} 

  • branches/website/application/classes/model/video_tutorial.php

    r1651 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    3 class Video_tutorial_Model extends ORM { 
     3class Model_Video_Tutorial extends ORM { 
    44 
    55        public function save() 

  • branches/website/application/config/auth.php

    r2761 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33$config = array 

  • branches/website/application/config/cache.php

    r1480 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33$config['params'] = APPPATH.'cache'; 

  • branches/website/application/config/config.php

    r3363 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22/** 
    33 * Base path of the web site. If this includes a domain, eg: localhost/kohana/ 
    … …  
    100100$config['modules'] = array 
    101101( 
     102        MODPATH.'archive',   // Archive utility 
    102103        MODPATH.'auth',      // Authentication 
    103         MODPATH.'forge',     // Form generation 
    104104        // MODPATH.'kodoc',     // Self-generating documentation 
    105105        // MODPATH.'media',     // Media caching and compression 
    106106        // MODPATH.'gmaps',     // Google Maps integration 
    107         MODPATH.'archive',   // Archive utility 
    108107        MODPATH.'payment',   // Online payments 
    109108        // MODPATH.'unit_test', // Unit testing 

  • branches/website/application/config/database.php

    r2761 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33$config['website'] = array 

  • branches/website/application/config/encryption.php

    r2761 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33$config['key'] = 'kohana rocks your socks!'; 

  • branches/website/application/config/hooks.php

    r2786 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33$config['enable'] = TRUE; 

  • branches/website/application/config/locale.php

    r2895 r3374  
    1 <?php defined('SYSPATH') or die('No direct access allowed.'); 
     1<?php 
    22 
    33/** 

  • branches/website/application/config/payment.php

    r2819 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22/* 
    33 * Settings related to the Payment library. 

  • branches/website/application/config/routes.php

    r2064 r3374  
    1 <?php defined('SYSPATH') or die('No direct access allowed.'); 
    2 $config = array 
     1<?php 
     2 
     3$config['default']['controller'] = 'home'; 
     4 
     5$config['gophp5'] = array 
    36( 
    4         '_default' => 'home', 
    5         'gophp5'   => 'news/gophp5', 
    6         'auth.+'   => 'home' 
     7        'gophp5', 
     8         
     9        'controller' => 'news', 
     10        'method' => 'gophp5', 
    711); 
     12 

  • branches/website/application/config/session.php

    r2761 r3374  
    1 <?php defined('SYSPATH') or die('No direct script access.'); 
     1<?php 
    22 
    33// Enable session encryption 

  • branches/website/application/views/layout.php

    r3309 r3374  
    9494<ul> 
    9595<?php foreach($menu as $link => $title): ?> 
    96 <li<?php if ($link == $this->uri->segment(1)): ?> class="active"<?php endif; ?>><?php echo html::anchor($link, $title) ?></li> 
     96<li<?php if (strpos(Router::$current_uri, $link) === 0): ?> class="active"<?php endif; ?>><?php echo html::anchor($link, $title) ?></li> 
    9797<?php endforeach; ?> 
    9898</ul>