Changeset 737

Show
Ignore:
Timestamp:
10/03/2007 06:03:13 AM (3 years ago)
Author:
JavaWoman
Message:

Cleanup

  • (where I spotted it) removed double role of # EOL comment and ticket number
  • (minor) whitespace
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/wikka.php

    r729 r737  
    1 <?php 
     1<?php 
    22/** 
    33 * The Wikka mainscript. 
     
    8080        else 
    8181        { 
    82                 error_reporting (E_ALL ^ E_NOTICE);     // production mode 
     82                error_reporting(E_ALL ^ E_NOTICE);      // production mode 
    8383        } 
    8484} 
     
    219219  reasons: 
    220220  1. Like a core path, these represent paths to components that might be 
    221     shared between installations, so we use the same override mechanism here. 
     221        shared between installations, so we use the same override mechanism here. 
    222222  2. While the paths are configurable, the defaults defined here can be overridden 
    223     <i>before</i> they get to the configuration file (and seen by the installer), 
    224     so they effectively become the defaults used during the installation process. 
    225     This enhances consistency between "sister" installations. 
     223        <i>before</i> they get to the configuration file (and seen by the installer), 
     224        so they effectively become the defaults used during the installation process. 
     225        This enhances consistency between "sister" installations. 
    226226  3. A (filesystem) file or directory path needs to take the local directory 
    227     separator into account but in PHP4 a class variable (as used in the default 
    228     configuration file) can only be initialized with a literal or a constant, 
    229     not a concatenation. 
     227        separator into account but in PHP4 a class variable (as used in the default 
     228        configuration file) can only be initialized with a literal or a constant, 
     229        not a concatenation. 
    230230*/ 
    231231 
     
    356356                ? $canon_path 
    357357                : DEFAULT_TEMPLATE_PATH 
    358         );       
     358        ); 
    359359/** 
    360360 * Effective (configurable) <b>directory</b> for 3rd-party components; these components 
     
    758758        $htaccessLocation = str_replace('\\', '/', dirname(__FILE__)).DIRECTORY_SEPARATOR.'.htaccess'; 
    759759        #if (file_exists('setup'.DIRECTORY_SEPARATOR.'index.php'))      #89 
    760         if (file_exists(WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php'))      #89 
     760        if (file_exists(WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php'))      # #89 
    761761        { 
    762762                // run the installer 
    763763                #include 'setup'.DIRECTORY_SEPARATOR.'index.php';               #89 
    764                 include WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php';               #89 
     764                include WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php';               # #89 
    765765                return;                         // prevent "fall-through" 
    766766        } 
     
    814814session_name(md5(BASIC_SESSION_NAME.$wakkaConfig['wiki_suffix'])); 
    815815session_set_cookie_params(0, $wikka_cookie_path);       // default path is '/' - we don't want that! this call overrides php.ini settings 
    816 session_cache_limiter(''); #279 
     816session_cache_limiter(''); # #279 
    817817session_start(); 
    818818 
     
    823823 * @todo use different name - $wakka clashes with $wakka object (which should be #Wakka) 
    824824 */ 
    825 $wakka_request = $_GET['wakka']; #312 
     825$wakka_request = $_GET['wakka']; # #312 
    826826 
    827827/** 
     
    855855 
    856856//Fix lowercase mod_rewrite bug: URL rewriting makes pagename lowercase. #135 
    857 if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) #38 
     857if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) # #38 
    858858{ 
    859859        $pattern = preg_quote($page, '/'); 
     
    956956if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && 
    957957        strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && 
    958         function_exists('gzencode') #38 
     958        function_exists('gzencode') # #38 
    959959   ) 
    960960{ 
     
    974974 
    975975if (!isset($wakka->do_not_send_anticaching_headers) || 
    976         (!$wakka->do_not_send_anticaching_headers) #279 
     976        (!$wakka->do_not_send_anticaching_headers) # #279 
    977977   ) 
    978978{