Changeset 1073 in ExiteCMS


Ignore:
Timestamp:
11/06/07 18:08:26 (4 years ago)
Author:
root
Message:

removed old website root file. No longer used.
Updated the advertising module to use the new locale_load() function

Location:
modules/common/advertising/php-files
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • modules/common/advertising/php-files/modules/advertising/advertising.php

    r1000 r1073  
    1717 
    1818// load the locale for this panel 
    19 if (file_exists(PATH_MODULES."advertising/locale/".$settings['locale'].".php")) { 
    20         $locale_file = PATH_MODULES."advertising/locale/".$settings['locale'].".php"; 
    21 } else { 
    22         $locale_file = PATH_MODULES."advertising/locale/English.php"; 
    23 } 
    24 include $locale_file; 
     19locale_load("modules.advertising"); 
    2520 
    2621// include the sendmail module 
    … …  
    263258 
    264259// define the body panel variables 
    265 $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising', 'template' => 'modules.advertising.tpl', 'locale' => $locale_file); 
     260$template_panels[] = array('type' => 'body', 'name' => 'modules.advertising', 'template' => 'modules.advertising.tpl', 'locale' => "modules.advertising"); 
    266261$template_variables['modules.advertising'] = $variables; 
    267262 

  • modules/common/advertising/php-files/modules/advertising/advertising_admin.php

    r1051 r1073  
    1414 
    1515// load the locale for this panel 
    16 if (file_exists(PATH_MODULES."advertising/locale/".$settings['locale'].".php")) { 
    17         $locale_file = PATH_MODULES."advertising/locale/".$settings['locale'].".php"; 
    18 } else { 
    19         $locale_file = PATH_MODULES."advertising/locale/English.php"; 
    20 } 
    21 include $locale_file; 
     16locale_load("modules.advertising"); 
    2217 
    2318// temp storage for template variables 
    … …  
    438433            $variables['errortitle'] = $errortitle; 
    439434        } 
    440         $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.delclient', 'template' => 'modules.advertising.delclient.tpl', 'locale' => $locale_file); 
     435        $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.delclient', 'template' => 'modules.advertising.delclient.tpl', 'locale' => "modules.advertising"); 
    441436        $template_variables['modules.advertising.delclient'] = $variables; 
    442437        break; 
    … …  
    449444            $variables['errortitle'] = $errortitle; 
    450445        } 
    451         $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.addclient', 'template' => 'modules.advertising.addclient.tpl', 'locale' => $locale_file); 
     446        $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.addclient', 'template' => 'modules.advertising.addclient.tpl', 'locale' => "modules.advertising"); 
    452447        $template_variables['modules.advertising.addclient'] = $variables; 
    453448        break; 
    … …  
    532527            $variables['errortitle'] = $errortitle; 
    533528        } 
    534         $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.edit', 'template' => 'modules.advertising.edit.tpl', 'locale' => $locale_file); 
     529        $template_panels[] = array('type' => 'body', 'title' => $title, 'name' => 'modules.advertising.edit', 'template' => 'modules.advertising.edit.tpl', 'locale' => "modules.advertising"); 
    535530        $template_variables['modules.advertising.edit'] = $variables; 
    536531        break; 
    … …  
    554549        $variables['errortitle'] = $errortitle; 
    555550    } 
    556     $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.images', 'template' => 'modules.advertising.images.tpl', 'locale' => $locale_file); 
     551    $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.images', 'template' => 'modules.advertising.images.tpl', 'locale' => "modules.advertising"); 
    557552    $template_variables['modules.advertising.images'] = $variables; 
    558553} 
    … …  
    566561        $variables['errortitle'] = $errortitle; 
    567562    } 
    568     $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.admin', 'template' => 'modules.advertising.admin.tpl', 'locale' => $locale_file); 
     563    $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.admin', 'template' => 'modules.advertising.admin.tpl', 'locale' => "modules.advertising"); 
    569564    $template_variables['modules.advertising.admin'] = $variables; 
    570565 
    … …  
    636631        $variables['ads2'] = $ads2; 
    637632        $c++; 
    638         $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.overview'.$c, 'template' => 'modules.advertising.overview.tpl', 'locale' => $locale_file); 
     633        $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.overview'.$c, 'template' => 'modules.advertising.overview.tpl', 'locale' => "modules.advertising"); 
    639634        $template_variables['modules.advertising.overview'.$c] = $variables; 
    640635    } 

  • modules/common/advertising/php-files/modules/advertising/module_installer.php

    r999 r1073  
    1616+----------------------------------------------------*/ 
    1717 
    18 if (file_exists(PATH_MODULES."advertising/locale/".$settings['locale'].".php")) { 
    19         include PATH_MODULES."advertising/locale/".$settings['locale'].".php"; 
    20 } else { 
    21         include PATH_MODULES."advertising/locale/English.php"; 
    22 } 
     18locale_load("modules.advertising"); 
    2319 
    2420/*---------------------------------------------------+ 
Note: See TracChangeset for help on using the changeset viewer.