Changeset 1027 in ExiteCMS


Ignore:
Timestamp:
10/27/07 11:28:20 (4 years ago)
Author:
root
Message:

Merged trunk revision 1018:1026 into the PLi-Fusion branch

Location:
branches/PLi-Fusion
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/PLi-Fusion

    • Property svn:ignore

      •  

        old new  
        22config.backup.php 
        33config.php 
         4_revision_.svn 

  • branches/PLi-Fusion/administration/index.php

    r1018 r1027  
    6565    while ($data = dbarray($result)) { 
    6666        if (checkrights($data['admin_rights']) && $data['admin_link'] != "reserved") { 
    67             // check the location of the admin image, and add the correct path to it 
     67            // check the location and the existence of the admin image, and pass the full path to the template 
    6868            $path = explode("/", $data['admin_link']); 
    69             if (isset($path[2])) { 
     69            if (isset($path[2]) && file_exists(PATH_MODULES.$path[2]."/images/".$data['admin_image'])) { 
    7070                $data['admin_image'] = MODULES.$path[2]."/images/".$data['admin_image']; 
    7171            } else { 
    72                 $data['admin_image'] = ADMIN."images/".$data['admin_image']; 
     72                if (file_exists(PATH_ADMIN."images/".$data['admin_image'])) { 
     73                    $data['admin_image'] = ADMIN."images/".$data['admin_image']; 
     74                } else { 
     75                    $data['admin_image'] = ADMIN."images/module_panel.gif"; 
     76                } 
    7377            } 
    7478            // store the record 

  • branches/PLi-Fusion/edit_profile.php

    r989 r1027  
    1414+----------------------------------------------------*/ 
    1515require_once dirname(__FILE__)."/includes/core_functions.php"; 
    16 require_once PATH_ROOT."/includes/theme_functions.php"; 
     16require_once PATH_INCLUDES."theme_functions.php"; 
    1717 
    1818// temp storage for template variables 
    1919$variables = array(); 
     20 
     21// load the DNS functions include 
     22include PATH_INCLUDES."dns_functions.php"; 
    2023 
    2124// load the locates for this module 
    … …  
    7073                $email = $_POST['user_email']; 
    7174                $email_domain = substr(strrchr($email, "@"), 1); 
    72                 if (getmxrr($email_domain, $mxhosts)) { 
     75                if (CMS_getmxrr($email_domain, $mxhosts)) { 
    7376                    // Get the hostname the MX record points to 
    7477                    $mailhost = $mxhosts[0]; 

  • branches/PLi-Fusion/images/advertising

    • Property svn:ignore

      •  

        old new  
        11WanWizard_Exite_logo.png 
         2webmaster_Exite_logo.png 

  • branches/PLi-Fusion/register.php

    r954 r1027  
    1414+----------------------------------------------------*/ 
    1515require_once dirname(__FILE__)."/includes/core_functions.php"; 
    16 require_once PATH_ROOT."/includes/theme_functions.php"; 
     16require_once PATH_INCLUDES."theme_functions.php"; 
    1717 
    1818// temp storage for template variables 
    … …  
    2121// no point registering when you're already a member 
    2222if (iMEMBER) fallback(BASEDIR."index.php"); 
     23 
     24// include the DNS functions include 
     25include PATH_INCLUDES."dns_functions.php"; 
    2326 
    2427// load the locales for this module 
    … …  
    7477         
    7578        $email_domain = substr(strrchr($email, "@"), 1); 
    76         if (getmxrr($email_domain, $mxhosts)) { 
     79        if (CMS_getmxrr($email_domain, $mxhosts)) { 
    7780            // Get the hostname the MX record points to 
    7881            $mailhost = $mxhosts[0]; 

  • branches/PLi-Fusion/robots.txt

    r787 r1027  
    1 # /robots.txt file for http://www.pli-images.org/ 
    2 # mail webmaster@pli-images.org for constructive criticism 
     1# /robots.txt file 
    32 
    43User-agent: * 
Note: See TracChangeset for help on using the changeset viewer.