Changeset 3953

Show
Ignore:
Timestamp:
Mon Oct 3 00:26:08 2005
Author:
paul
Message:

Fix for #1444 - reorganize language files, and fix for #1119 - Icons are too far away from names in lists. Still need to fix localizer to deal with new language files.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/implementation/management/priv/lib_campsite.php

    r3951 r3953  
    417 417  * @return void  
    418 418  */  
    419   function selectLanguageFile($p_path, $p_name)  
      419 function selectLanguageFile($p_name)  
    419 419 {  
    420 420     require_once('localizer/Localizer.php');  
    421       Localizer::LoadLanguageFilesAbs($p_path, $p_name);  
      421     Localizer::LoadLanguageFiles($p_name);  
    421 421 } // fn selectLanguageFile  
    422 422  

  • trunk/campsite/implementation/management/priv/imagearchive/do_add.php

    r3916 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/imagearchive/edit.php

    r3933 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/imagearchive/include.inc.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  
    66 66 </table>  
    67 67  
    68   <CENTER>  
    69   <IMG SRC="<?php echo $imageObj->getImageUrl(); ?>" BORDER="0" ALT="<?php echo htmlspecialchars($imageObj->getDescription()); ?>">  
    70   </CENTER>  
      68 <IMG SRC="<?php echo $imageObj->getImageUrl(); ?>" BORDER="0" ALT="<?php echo htmlspecialchars($imageObj->getDescription()); ?>" style="padding-left:15px">  
    71 69 <P>  
    72 70 <?php if ($User->hasPermission('ChangeImage')) { ?>  

  • trunk/campsite/implementation/management/priv/imagearchive/view_thumbnail.inc.php

    r3933 r3953  
    1   <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="0" WIDTH="100%" class="table_list">  
      1 <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="0" class="table_list">  
    1 1     <TR class="table_list_header">  
    2           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="5%">  
      2         <TD ALIGN="LEFT" VALIGN="TOP">  
    2 2           <table border="0" cellspacing="0" cellpadding="0">  
    3 3           <tr>  
    …… 
    13 13             </table>  
    14 14         </TD>  
    15           <TD ALIGN="LEFT" VALIGN="TOP" width="35%">  
      15         <TD ALIGN="LEFT" VALIGN="TOP">  
    15 15           <table border="0" cellspacing="0" cellpadding="0">  
    16 16           <tr>  
    …… 
    25 25             </table>  
    26 26         </TD>  
    27           <TD ALIGN="LEFT" VALIGN="TOP" width="20%">  
      27         <TD ALIGN="LEFT" VALIGN="TOP">  
    27 27           <table border="0" cellspacing="0" cellpadding="0" >  
    28 28           <tr>  
    …… 
    37 37             </table>  
    38 38         </TD>  
    39           <TD ALIGN="LEFT" VALIGN="TOP" width="20%">  
      39         <TD ALIGN="LEFT" VALIGN="TOP">  
    39 39           <table border="0" cellspacing="0" cellpadding="0">  
    40 40           <tr>  
    …… 
    49 49             </table>  
    50 50         </TD>  
    51           <TD ALIGN="LEFT" VALIGN="TOP" width="15%">  
      51         <TD ALIGN="LEFT" VALIGN="TOP">  
    51 51           <table border="0" cellspacing="0" cellpadding="0">  
    52 52           <tr>  
    …… 
    61 61             </table>  
    62 62         </TD>  
    63           <TD ALIGN="LEFT" VALIGN="TOP" width="5%">  
      63         <TD ALIGN="LEFT" VALIGN="TOP">  
    63 63           <table border="0" cellspacing="0" cellpadding="0">  
    64 64           <tr>  
    75 75         <?php  
    76 76         if ($User->hasPermission('DeleteImage')) { ?>  
    77           <TD ALIGN="center" VALIGN="TOP" WIDTH="5%" style="padding: 3px;"><B><?php  putGS("Delete"); ?></B></TD>  
      77         <TD ALIGN="center" VALIGN="TOP" style="padding: 3px;"><B><?php  putGS("Delete"); ?></B></TD>  
    77 77     <?php  } ?>  
    78 78     </TR>   

  • trunk/campsite/implementation/management/priv/imagearchive/do_del.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/imagearchive/include.inc.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/imagearchive/do_edit.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/imagearchive/include.inc.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/imagearchive/index.php

    r3933 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/imagearchive/add.php

    r3916 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/imagearchive");  
      3 load_common_include_files("imagearchive");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/imagearchive/view_flat.inc.php

    r3933 r3953  
    1   <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      1 <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" class="table_list">  
    1 1     <TR class="table_list_header">  
    2           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="5%">  
      2         <TD ALIGN="LEFT" VALIGN="TOP">  
    2 2           <table border="0" cellspacing="0" cellpadding="0">  
    3 3           <tr>  
    …… 
    13 13           </table>  
    14 14         </TD>  
    15           <TD ALIGN="LEFT" VALIGN="TOP" width="35%">  
      15         <TD ALIGN="LEFT" VALIGN="TOP">  
    15 15           <table border="0" cellspacing="0" cellpadding="0">  
    16 16           <tr>  
    …… 
    25 25             </table>  
    26 26         </TD>  
    27           <TD ALIGN="LEFT" VALIGN="TOP" width="35%">  
      27         <TD ALIGN="LEFT" VALIGN="TOP">  
    27 27           <table border="0" cellspacing="0" cellpadding="0">  
    28 28           <tr>  
    …… 
    37 37           </table>  
    38 38         </TD>  
    39           <TD ALIGN="LEFT" VALIGN="TOP" width="15%">  
      39         <TD ALIGN="LEFT" VALIGN="TOP">  
    39 39           <table border="0" cellspacing="0" cellpadding="0">  
    40 40           <tr>  
    …… 
    49 49           </table>  
    50 50         </TD>  
    51           <TD ALIGN="LEFT" VALIGN="TOP" width="5%">  
      51         <TD ALIGN="LEFT" VALIGN="TOP">  
    51 51           <table border="0" cellspacing="0" cellpadding="0">  
    52 52           <tr>  
    63 63         <?php  
    64 64         if ($User->hasPermission('DeleteImage')) { ?>  
    65           <TD ALIGN="center" VALIGN="TOP" WIDTH="5%" ><B><?php  putGS("Delete"); ?></B></TD>  
      65         <TD ALIGN="center" VALIGN="TOP"><B><?php  putGS("Delete"); ?></B></TD>  
    65 65     <?php  } ?>  
    66 66     </TR>  

  • trunk/campsite/implementation/management/priv/localizer/LocalizerConfig.php

    r3933 r3953  
    36 36 $g_localizerConfig['BASE_DIR'] = $_SERVER['DOCUMENT_ROOT'].'/admin-files';  
    37 37  
      38 // The top-level directory to the set of directories  
      39 // that need translation files.  
      40 $g_localizerConfig['TRANSLATION_DIR'] = $_SERVER['DOCUMENT_ROOT'].'/admin-files/lang';  
      41  
    38 42 // Name of the XML file that contains the list of supported languages.  
    39 43 $g_localizerConfig['LANGUAGE_METADATA_FILENAME'] = 'languages.xml';  

  • trunk/campsite/implementation/management/priv/localizer/upgrade_localizer.php

    r3502 r3953  
    33 33             if ($lang['Code'] == $filenameParts[1]) {  
    34 34                 $twoLetterCode = $lang['Code'];  
    35                   $sourceFile =& new LocalizerLanguage($prefix, $directory, $twoLetterCode);  
      35                 $sourceFile =& new LocalizerLanguage($prefix, $twoLetterCode);  
    35 35                 $sourceFile->loadGsFile();  
    36 36                 switch ($twoLetterCode) {  
    74 74                  
    75 75                 // Verify that the saved file is the same as the original.  
    76                   $copyLanguage =& new LocalizerLanguage($prefix, $directory, $languageCode);  
      76                 $copyLanguage =& new LocalizerLanguage($prefix, $languageCode);  
    76 76                 $loadSuccess = $copyLanguage->loadXmlFile();  
    77 77  

  • trunk/campsite/implementation/management/priv/localizer/LocalizerFileFormat.php

    r3531 r3953  
    14 14     function getFilePath($p_localizerLanguage) { }  
    15 15     function getFilePattern($p_languageId = null) { }  
    16       function getLanguagesInDirectory($p_prefix, $p_directory) { }     
    17 16 } // class LocalizerFileFormat  
    18 17  
    …… 
    113 112     {  
    114 113         global $g_localizerConfig;  
    115           return $g_localizerConfig['BASE_DIR'].$p_localizerLanguage->getDirectory()  
    116               .'/'.$p_localizerLanguage->getPrefix()  
    117               .'.'.$p_localizerLanguage->getLanguageCode().'.php';         
      114         return $g_localizerConfig['TRANSLATION_DIR'].'/'.$p_localizerLanguage->getLanguageCode()  
      115             .'/'.$p_localizerLanguage->getPrefix().'.php';       
    118 116     } // fn getFilePath  
    119 117      
    …… 
    148 146     } // fn getLanguages  
    149 147      
    150       /**  
    151        * @return array  
    152        */  
    153       function getLanguagesInDirectory($p_prefix, $p_directory)  
    154       {  
    155           global $g_localizerConfig;  
    156           // Detect files directly  
    157           $files = File_Find::mapTreeMultiple($g_localizerConfig['BASE_DIR'].$p_directory, 1);  
    158           $languageDefs = array();  
    159           foreach ($files as $key => $filename) {  
    160               if (preg_match("/$p_prefix\.[a-z]{2}\.php/", $filename)) {  
    161                   list($lost, $id, $lost) = explode('.', $filename);  
    162                   $languageDef =& new LanguageMetadata();  
    163                   $languageDef->m_languageId = $id;  
    164                   $languageDef->m_languageCode = $id;  
    165                   $languageDefs[] = $languageDef;  
    166               }  
    167           }  
    168           return $languageDefs;  
    169       }  
    170 148 } // class LocalizerFileFormat_GS  
    171 149  
    …… 
    274 252     {  
    275 253         global $g_localizerConfig;  
    276           return $g_localizerConfig['BASE_DIR'].$p_localizerLanguage->getDirectory()  
    277               .'/'.$p_localizerLanguage->getPrefix()  
    278               .'.'.$p_localizerLanguage->getLanguageCode()  
    279               .'_'.$p_localizerLanguage->getCountryCode().'.php';  
      254         return $g_localizerConfig['TRANSLATION_DIR'].'/'  
      255             .$p_localizerLanguage->getLanguageCode()  
      256             .'_'.$p_localizerLanguage->getCountryCode()  
      257             .'/'.$p_localizerLanguage->getPrefix().'.php';  
    280 258     } // fn getFilePath  
    281 259  
    …… 
    309 287     {  
    310 288         global $g_localizerConfig;  
    311           $fileName = $g_localizerConfig['BASE_DIR']  
      289         $fileName = $g_localizerConfig['TRANSLATION_DIR']  
    311 289                    .$g_localizerConfig['LANGUAGE_METADATA_FILENAME'];  
    312 290         if (file_exists($fileName)) {  
    328 306         }  
    329 307         else {  
    330               return LocalizerFileFormat_XML::getLanguagesInDirectory('locals', '/');  
      308             return Localizer::GetLanguages('locals');  
    330 308         }  
    331 309     } // fn getLanguages  
    332 310      
    333 311      
    334       /**  
    335        * @param string $p_prefix  
    336        * @param string $p_directory  
    337        * @return array  
    338        */  
    339       function getLanguagesInDirectory($p_prefix, $p_directory)  
    340       {  
    341           global $g_localizerConfig;  
    342           // Detect files directly  
    343           $files = File_Find::mapTreeMultiple($g_localizerConfig['BASE_DIR'].$p_directory, 1);  
    344           $languageDefs = array();  
    345           foreach ($files as $key => $filename) {  
    346               if (preg_match("/$p_prefix\.[a-z]{2}_[^.]*\.xml/", $filename)) {  
    347                   list($lost, $id, $lost, $lost) = explode('.', $filename);  
    348                   list($languageCode, $countryCode) = explode('_', $id);  
    349                   $languageDef =& new LanguageMetadata();  
    350                   $languageDef->m_languageId = $id;  
    351                   $languageDef->m_languageCode = $languageCode;  
    352                   $languageDef->m_countryCode = $countryCode;  
    353                   $languageDefs[] = $code;  
    354               }  
    355           }  
    356           return $languageDefs;  
    357       }  
    358        
    359 312 } // class LocalizerFileFormat_XML  
    360 313 ?>  

  • trunk/campsite/implementation/management/priv/localizer/translate.php

    r3903 r3953  
    36 36                                           '', true);  
    37 37     if (empty($localizerSourceLanguage)) {  
    38           $tmpLanguage =& new LocalizerLanguage(null, null, $p_request['TOL_Language']);  
      38         $tmpLanguage =& new LocalizerLanguage(null, $p_request['TOL_Language']);  
    38 38         $localizerSourceLanguage = $tmpLanguage->getLanguageId();  
    39 39     }  
    40 40      
    41       $directory = Input::Get('dir', 'string', '', true);  
    42       $base = 'locals';  
    43       $screenDropDownSelection = $directory;  
    44        
    45       // Special case for 'globals' file.  
    46       if (($directory == '') || ($directory == '/globals')) {  
    47           $base = 'globals';  
    48           $directory = '/';  
    49           $screenDropDownSelection = '/globals';  
    50       }  
    51    
      41     $prefix = Input::Get('prefix', 'string', '', true);  
      42     $screenDropDownSelection = $prefix;  
      43      
    52 44     // Load the language files.  
    53       //echo "Base: $base, Directory: $directory<br>";  
    54       $sourceLang =& new LocalizerLanguage($base, $directory, $localizerSourceLanguage);  
    55       $targetLang =& new LocalizerLanguage($base, $directory, $localizerTargetLanguage);  
    56       $defaultLang =& new LocalizerLanguage($base, $directory, $g_localizerConfig['DEFAULT_LANGUAGE']);  
      45     //echo "Prefix: $prefix<br>";  
      46     $sourceLang =& new LocalizerLanguage($prefix, $localizerSourceLanguage);  
      47     $targetLang =& new LocalizerLanguage($prefix, $localizerTargetLanguage);  
      48     $defaultLang =& new LocalizerLanguage($prefix, $g_localizerConfig['DEFAULT_LANGUAGE']);  
    57 49      
    58 50     // If the language files do not exist, create them.  
    …… 
    94 86     $screens = array();  
    95 87     $screens[] = "";  
    96       $screens["/globals"] = getGS("Globals");  
    97       $screens["/"] = getGS("Home");  
    98       $screens["/pub"] = getGS("Publications");  
    99       $screens["/issues"] = getGS("Issues");  
    100       $screens["/sections"] = getGS("Sections");  
    101       $screens["/articles"] = getGS("Articles");  
    102       $screens["/articles/images"] = getGS("Article Images");  
    103       $screens["/articles/topics"] = getGS("Article Topics");  
    104       $screens["/imagearchive"] = getGS("Image Archive");  
    105       $screens["/templates"] = getGS("Templates");  
    106       $screens["/a_types"] = getGS("Article Types");  
    107       $screens["/a_types/fields"] = getGS("Article Type Fields");  
    108       $screens["/topics"] = getGS("Topics");  
    109       $screens["/languages"] = getGS("Languages");  
    110       $screens["/country"] = getGS("Countries");  
    111       $screens["/localizer"] = getGS("Localizer");  
    112       $screens["/logs"] = getGS("Logs");  
    113       $screens["/users"] = getGS("Users");  
    114       $screens["/u_types"] = getGS("User Types");  
    115       $screens["/users/subscriptions"] = getGS("User Subscriptions");  
    116       $screens["/users/subscriptions/sections"] = getGS("User Subscriptions Sections");             
      88     $screens["globals"] = getGS("Globals");  
      89     $screens["home"] = getGS("Home");  
      90     $screens["pub"] = getGS("Publications");  
      91     $screens["issues"] = getGS("Issues");  
      92     $screens["sections"] = getGS("Sections");  
      93     $screens["articles"] = getGS("Articles");  
      94     $screens["article_images"] = getGS("Article Images");  
      95     $screens["article_topics"] = getGS("Article Topics");  
      96     $screens["imagearchive"] = getGS("Image Archive");  
      97     $screens["templates"] = getGS("Templates");  
      98     $screens["article_types"] = getGS("Article Types");  
      99     $screens["article_type_fields"] = getGS("Article Type Fields");  
      100     $screens["topics"] = getGS("Topics");  
      101     $screens["languages"] = getGS("Languages");  
      102     $screens["country"] = getGS("Countries");  
      103     $screens["localizer"] = getGS("Localizer");  
      104     $screens["logs"] = getGS("Logs");  
      105     $screens["users"] = getGS("Users");  
      106     $screens["user_types"] = getGS("User Types");  
      107     $screens["user_subscriptions"] = getGS("User Subscriptions");  
      108     $screens["user_subscription_sections"] = getGS("User Subscriptions Sections");           
    117 109      
    118 110     // Whether to show translated strings or not.  
    …… 
    129 121         <form action="index.php" method="post">  
    130 122         <INPUT TYPE="hidden" name="action" value="translate">  
    131           <INPUT TYPE="hidden" name="base" value="<?php echo $base; ?>">  
    132 123         <INPUT TYPE="hidden" name="localizer_lang_id" value="<?php echo $targetLang->getLanguageId(); ?>">  
    133 124         <input type="hidden" name="search_string" value="<?php echo htmlspecialchars($searchString); ?>">  
    …… 
    145 136                         $extras = ' onchange="this.form.submit();" ';  
    146 137                         $extras .= ' class="input_select"';  
    147                           camp_html_create_select('dir', $screens, $screenDropDownSelection, $extras, true);  
      138                         camp_html_create_select('prefix', $screens, $screenDropDownSelection, $extras, true);  
    147 138                         ?>  
    148 139                     </td>  
    …… 
    210 201             <form>  
    211 202             <input type="hidden" name="action" value="translate">  
    212               <input type="hidden" name="base" value="<?php echo $base; ?>">  
    213               <input type="hidden" name="dir" value="<?php echo $screenDropDownSelection; ?>">  
      203             <input type="hidden" name="prefix" value="<?php echo $screenDropDownSelection; ?>">  
    214 204             <?php if (!empty($hideTranslated)) { ?>  
    215 205             <input type="hidden" name="hide_translated" value="on">  
    …… 
    240 230      
    241 231     <?PHP  
    242       $missingStrings = Localizer::FindMissingStrings($directory);  
      232     $missingStrings = Localizer::FindMissingStrings($prefix);  
    242 232     if ((count($missingStrings) > 0)  && ($screenDropDownSelection != '/globals')) {  
    243 233         ?>  
    …… 
    246 236         <form action="index.php" method="post">  
    247 237         <input type="hidden" name="action" value="add_missing_translation_strings">  
    248           <input type="hidden" name="base" value="<?php echo $base; ?>">  
    249           <input type="hidden" name="dir" value="<?php echo $screenDropDownSelection; ?>">  
      238         <input type="hidden" name="prefix" value="<?php echo $screenDropDownSelection; ?>">  
    250 239         <?php if (!empty($hideTranslated)) { ?>  
    251 240         <input type="hidden" name="hide_translated" value="on">  
    …… 
    278 267     }  
    279 268      
    280       $unusedStrings = Localizer::FindUnusedStrings($directory);  
      269     $unusedStrings = Localizer::FindUnusedStrings($prefix);  
    280 269     if ((count($unusedStrings) > 0) && ($screenDropDownSelection != '/globals')) {  
    281 270         ?>  
    …… 
    284 273         <form action="index.php" method="post">  
    285 274         <input type="hidden" name="action" value="delete_unused_translation_strings">  
    286           <input type="hidden" name="base" value="<?php echo $base; ?>">  
    287           <input type="hidden" name="dir" value="<?php echo $screenDropDownSelection; ?>">  
      275         <input type="hidden" name="prefix" value="<?php echo $screenDropDownSelection; ?>">  
    288 276         <?php if (!empty($hideTranslated)) { ?>  
    289 277         <input type="hidden" name="hide_translated" value="on">  
    …… 
    321 309     <form action="index.php" method="post">  
    322 310     <INPUT TYPE="hidden" name="action" value="save_translation">  
    323       <INPUT TYPE="hidden" name="base" value="<?php echo $g_localizerConfig['FILENAME_PREFIX']; ?>">  
    324       <INPUT TYPE="hidden" name="dir" value="<?php echo $screenDropDownSelection; ?>">  
      311     <INPUT TYPE="hidden" name="prefix" value="<?php echo $screenDropDownSelection; ?>">  
    325 312     <?php if (!empty($hideTranslated)) { ?>  
    326 313     <input type="hidden" name="hide_translated" value="on">  
    388 375                 $fileparms = "localizer_target_language=".$targetLang->getLanguageId()  
    389 376                     ."&localizer_source_language=".$sourceLang->getLanguageId()  
    390                       ."&base=".$base  
    391                       ."&dir=".urlencode($screenDropDownSelection)  
      377                     ."&prefix=".urlencode($screenDropDownSelection)  
    392 378                     ."&search_string=".urlencode($searchString);  
    393 379                 if (!empty($hideTranslated)) {  

  • trunk/campsite/implementation/management/priv/localizer/test_localizer.php

    r3499 r3953  
    2 2 require_once('Localizer.php');  
    3 3  
    4   $localizerLanguage =& new LocalizerLanguage('locals', '/localizer', 'xx');  
      4 $localizerLanguage =& new LocalizerLanguage('locals', 'xx');  
    4 4 $localizerLanguage->setMode('xml');  
    5 5 echo "Add some strings...<br>";  
    …… 
    61 61  
    62 62 echo "Load XML...<br>";  
    63   $xmlLang =& new LocalizerLanguage('locals', '/localizer', 'xx');  
      63 $xmlLang =& new LocalizerLanguage('locals', 'xx');  
    63 63 $result = $xmlLang->loadFile('xml');  
    64 64 if (!$result) {  
    …… 
    71 71  
    72 72 echo "<br>Load GS...<br>";  
    73   $gsLang =& new LocalizerLanguage('locals', '/localizer', 'xx');  
      73 $gsLang =& new LocalizerLanguage('locals', 'xx');  
    73 73 $result = $gsLang->loadFile('gs');  
    74 74 if (!$result) {  
    93 93  
    94 94 echo "Testing ability to get languages in the base directory...<br>";  
    95   $languages = Localizer::GetLanguagesInDirectory('locals', '/');  
      95 $languages = Localizer::GetLanguages('locals');  
    95 95 echo "<pre>";  
    96 96 print_r($languages);  

  • trunk/campsite/implementation/management/priv/localizer/Localizer.php

    r3939 r3953  
    108 108         }  
    109 109         $defaultLang =& new LocalizerLanguage($g_localizerConfig['FILENAME_PREFIX'],  
    110                                                 '',  
    111 110                                               $g_localizerConfig['DEFAULT_LANGUAGE']);  
    112 111         if ($defaultLang->loadGsFile()) {  
    …… 
    125 124      * Load the translation strings into a global variable.  
    126 125      *  
    127        * @param string $p_path -  
    128        *      Path to directory where the translation files are located  
    129        *  
    130 126      * @param string $p_prefix -  
    131        *      Beginning of the file name, either 'locals' or 'globals'.  
      127      *      Beginning of the file name, before the ".php" extension.  
    131 127      *  
    132 128      * @return void  
    133 129      */  
    134       function LoadLanguageFiles($p_path, $p_prefix)  
      130     function LoadLanguageFiles($p_prefix)  
    134 130     {  
    135 131         global $g_translationStrings;  
    …… 
    141 137         }  
    142 138          
    143           $defaultLang =& new LocalizerLanguage($p_prefix, $p_path, $g_localizerConfig['DEFAULT_LANGUAGE']);  
    144           $userLang =& new LocalizerLanguage($p_prefix, $p_path, $_REQUEST['TOL_Language']);  
      139         $defaultLang =& new LocalizerLanguage($p_prefix, $g_localizerConfig['DEFAULT_LANGUAGE']);  
      140         $userLang =& new LocalizerLanguage($p_prefix, $_REQUEST['TOL_Language']);  
    145 141          
    146 142         // Load language files  
    …… 
    160 156  
    161 157      
    162       /**  
    163        * To remove admin install path on calls from other admin scripts using asolute path.  
    164        *  
    165        * @param string $p_path -  
    166        *      Path to directory where the translation files are located  
    167        *  
    168        * @param string $p_prefix -  
    169        *      Beginning of the file name, either 'locals' or 'globals'.  
    170        *  
    171        * @return void  
    172        */  
    173       function LoadLanguageFilesAbs($p_path, $p_prefix)  
    174       {  
    175           global $g_localizerConfig;  
    176           //echo $p_path."<br>";  
    177           $relativePath = str_replace(realpath($g_localizerConfig['BASE_DIR']), '', realpath($p_path));  
    178           //echo $relativePath."<br>";  
    179           Localizer::LoadLanguageFiles($relativePath, $p_prefix);  
    180       } // fn LoadLanguageFileAbs  
    181        
    182    
    183 158     /**  
    184 159      * Compare a particular language's keys with the default language set.  
    …… 
    200 175         global $g_localizerConfig;  
    201 176         $localData =& new LocalizerLanguage($g_localizerConfig['FILENAME_PREFIX'],  
    202                                               $p_directory,  
    203 177                                             $g_localizerConfig['DEFAULT_LANGUAGE']);  
    204 178         $localData->loadFile(Localizer::GetMode());  
    205 179         $globaldata =& new LocalizerLanguage($g_localizerConfig['FILENAME_PREFIX_GLOBAL'],  
    206                                                '/',  
    207 180                                              $g_localizerConfig['DEFAULT_LANGUAGE']);  
    208 181         $globaldata->loadFile(Localizer::GetMode());  
    …… 
    225 198      
    226 199     /**  
    227        * Return an array of localizer languages codes, discovered by looking at the file  
    228        * name in the given directory.  
      200      * Return an array of localizer languages codes, discovered by looking at the directory  
      201      * names in the /lang directory.  
    229 202      *  
    230 203      * @return array  
    231 204      */  
    232       function GetLanguagesInDirectory($p_prefix, $p_directory)  
      205     function GetLanguages($p_prefix)  
    232 205     {  
    233 206         global $g_localizerConfig;  
    234           $files = File_Find::mapTreeMultiple($g_localizerConfig['BASE_DIR'].$p_directory, 1);  
    235           $className = "LocalizerFileFormat_".strtoupper(Localizer::GetMode());  
    236           $fileFormat = new $className();  
    237           $languages = $fileFormat->getLanguagesInDirectory($p_prefix, $p_directory);  
      207         $languages = array();  
      208         if (is_dir($g_localizerConfig['TRANSLATION_DIR'])) {  
      209             if ($dirHandle = opendir($g_localizerConfig['TRANSLATION_DIR'])) {  
      210                 while (($file = readdir($dirHandle)) !== false) {  
      211                     if ( ($file != '.') && ($file != '..')  
      212                          && (filetype($g_localizerConfig['TRANSLATION_DIR'] . $file) == "dir")) {  
      213                         //if (preg_match("/$p_prefix\.[a-z]{2}_[^.]*\.xml/", $filename)) {  
      214                         list($prefix, $lost) = explode('.', $file);  
      215                         $languageDef =& new LanguageMetadata();  
      216                         $languageDef->m_languageId = $id;  
      217                         $languageDef->m_languageCode = $id;  
      218                         $languages[] = $languageDef;  
      219                     }  
      220                 }  
      221             }  
      222         }  
    238 223         return $languages;  
    239       } // fn GetLanguagesInDirectory  
      224     } // fn GetLanguages  
    239 224  
    240 225      
    …… 
    359 344         // then all the language files must be updated with the new key.  
    360 345         if ($p_languageId == $g_localizerConfig['DEFAULT_LANGUAGE']) {  
    361               $languages = Localizer::GetLanguagesInDirectory($p_prefix, $p_directory);  
      346             $languages = Localizer::GetLanguages($p_prefix);  
    361 346             foreach ($languages as $language) {  
    362 347                  
    363 348                 // Load the language file  
    364                   $source =& new LocalizerLanguage($p_prefix, $p_directory, $language->getLanguageId());  
      349                 $source =& new LocalizerLanguage($p_prefix, $language->getLanguageId());  
    364 349                 $source->loadFile(Localizer::GetMode());  
    365 350                  
    …… 
    386 371         else {  
    387 372             // Load the language file  
    388               $source =& new LocalizerLanguage($p_prefix, $p_directory, $p_languageId);  
      373             $source =& new LocalizerLanguage($p_prefix, $p_languageId);  
    388 373             $source->loadFile(Localizer::GetMode());  
    389 374             foreach ($p_data as $pair) {  
    …… 
    406 391     {  
    407 392         global $g_localizerConfig;  
    408           $defaultLanguage =& new LocalizerLanguage($p_prefix, $p_directory, $g_localizerConfig['DEFAULT_LANGUAGE']);  
      393         $defaultLanguage =& new LocalizerLanguage($p_prefix, $g_localizerConfig['DEFAULT_LANGUAGE']);  
    408 393         $defaultLanguage->loadFile(Localizer::GetMode());  
    409 394         $defaultTranslationTable = $defaultLanguage->getTranslationTable();  
    …… 
    413 398              
    414 399             // Load the language file  
    415               $source =& new LocalizerLanguage($p_prefix, $p_directory, $languageId);  
      400             $source =& new LocalizerLanguage($p_prefix, $languageId);  
    415 400             $source->loadFile(Localizer::GetMode());  
    416 401  
    …… 
    441 426     {  
    442 427         global $g_localizerConfig;  
    443           $languages = Localizer::GetLanguagesInDirectory($p_prefix, $p_directory);  
      428         $languages = Localizer::GetLanguages($p_prefix);  
    443 428         foreach ($languages as $language) {  
    444               $source =& new LocalizerLanguage($p_prefix, $p_directory, $language->getLanguageId());  
      429             $source =& new LocalizerLanguage($p_prefix, $language->getLanguageId());  
    444 429             $source->loadFile(Localizer::GetMode());  
    445 430             if (is_array($p_newKey)) {  
    …… 
    478 463     function RemoveString($p_prefix, $p_directory, $p_key)  
    479 464     {  
    480           $languages = Localizer::GetLanguagesInDirectory($p_prefix, $p_directory);  
      465         $languages = Localizer::GetLanguages($p_prefix);  
    480 465  
    481 466         foreach ($languages as $language) {  
    482               $target =& new LocalizerLanguage($p_prefix, $p_directory, $language->getLanguageId());  
      467             $target =& new LocalizerLanguage($p_prefix, $language->getLanguageId());  
    482 467             $target->loadFile(Localizer::GetMode());  
    483 468             if (is_array($p_key)) {  
    …… 
    508 493     function MoveString($p_prefix, $p_directory, $p_pos1, $p_pos2)  
    509 494     {  
    510           $languages = Localizer::GetLanguagesInDirectory($p_prefix, $p_directory);  
      495         $languages = Localizer::GetLanguages($p_prefix);  
    510 495         foreach ($languages as $language) {  
    511               $target =& new LocalizerLanguage($p_prefix, $p_directory, $language->getLanguageId());  
      496             $target =& new LocalizerLanguage($p_prefix, $language->getLanguageId());  
    511 496             $target->loadFile(Localizer::GetMode());  
    512 497             $success = $target->moveString($p_pos1, $p_pos2);  
    …… 
    582 567      * @return void  
    583 568      */  
    584       function CreateLanguageFilesRecursive($p_languageId)  
      569     function CreateLanguageFiles($p_languageId)  
    584 569     {  
    585 570         global $g_localizerConfig;  
      571          
      572         // Make new directory  
      573         if (!mkdir($g_localizerConfig['TRANSLATION_DIR']."/".$p_languageId)) {  
      574             return;  
      575         }  
      576          
      577         // Copy files from reference language  
      578          
    586 579         $className = "LocalizerFileFormat_".strtoupper(Localizer::GetMode());  
    587           $fileFormat = new $className();         
    588           $searchPattern = '/'.$fileFormat->getFilePattern($g_localizerConfig['DEFAULT_LANGUAGE']).'/';  
    589           $files = Localizer::SearchFilesRecursive($g_localizerConfig['BASE_DIR'], $searchPattern);  
    590 580         foreach ($files as $pathname) {  
    591 581             if ($pathname) {  
    …… 
    595 585                 $dir = str_replace($g_localizerConfig['BASE_DIR'], '', dirname($pathname));  
    596 586                 // read the default file  
    597                   $defaultLang =& new LocalizerLanguage($base, $dir, $g_localizerConfig['DEFAULT_LANGUAGE']);  
      587                 $defaultLang =& new LocalizerLanguage($base, $g_localizerConfig['DEFAULT_LANGUAGE']);  
    597 587                 $defaultLang->loadFile(Localizer::GetMode());  
    598 588                 $defaultLang->clearValues();  
    605 595             }  
    606 596         }  
    607       } // fn CreateLanguageFilesRecursive  
    608        
    609        
    610       /**  
    611        * Go through subdirectorys and delete language files for given Id.  
    612        * @param string $p_languageId  
    613        * @return void  
    614        */  
    615       function DeleteLanguageFilesRecursive($p_languageId)  
    616       {  
    617           global $g_localizerConfig;  
    618           $className = "LocalizerFileFormat_".strtoupper(Localizer::GetMode());  
    619           $fileFormat = new $className();         
    620           $searchPattern = '/'.$fileFormat->getFilePattern($g_localizerConfig['DEFAULT_LANGUAGE']).'/';  
    621           $files = Localizer::SearchFilesRecursive($g_localizerConfig['BASE_DIR'], $searchPattern);  
    622           //echo "<pre>";print_r($files);echo "</pre>";  
    623           foreach ($files as $pathname) {  
    624               if ($pathname) {  
    625                   $fileNameParts = explode('.', basename($pathname));  
    626                   $base = $fileNameParts[0];  
    627                   $dir = str_replace($g_localizerConfig['BASE_DIR'], '', dirname($pathname));  
    628                   $languageFile =& new LocalizerLanguage($base, $dir, $p_languageId);  
    629                   if (file_exists($languageFile->getFilePath())) {  
    630                       //echo 'deleteing '.$languageFile->getFilePath().'<br>';  
    631                       unlink($languageFile->getFilePath());  
    632                   }  
    633               }  
    634           }  
    635       } // fn CreateLanguageFilesRecursive  
    636        
      597     } // fn CreateLanguageFiles  
      598          
    637 599 } // class Localizer  
    638 600 ?>  

  • trunk/campsite/implementation/management/priv/localizer/index.php

    r3903 r3953  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/classes/Input.php");  
    5 5 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    6   load_common_include_files("$ADMIN_DIR/localizer");  
      6 load_common_include_files("localizer");  
    6 6 require_once('Localizer.php');  
    7 7  

  • trunk/campsite/implementation/management/priv/localizer/LocalizerLanguage.php

    r3531 r3953  
    22 22     var $m_mode = '';  
    23 23     var $m_prefix = '';  
    24       var $m_directory = '';  
    25 24     var $m_filePath = '';  
    26 25      
    …… 
    43 42      *         (e.g. "en_US")  
    44 43      */  
    45       function LocalizerLanguage($p_prefix, $p_directory, $p_languageId = null)  
      44     function LocalizerLanguage($p_prefix, $p_languageId = null)  
    45 44     {  
    46 45         if (!is_null($p_languageId)) {  
    …… 
    49 48         }  
    50 49         $this->m_prefix = $p_prefix;  
    51           $this->m_directory = $p_directory;  
    52 50     } // constructor  
    53 51      
    …… 
    64 62      
    65 63     /**  
    66        * Return the directory where the translation file is stored.  
    67        * @return string  
    68        */  
    69       function getDirectory()  
    70       {  
    71           return $this->m_directory;  
    72       } // fn getDirectory  
    73        
    74        
    75       /**  
    76 64      * This will return 'gs' or 'xml'  
    77 65      * @return string  
    …… 
    247 235         }         
    248 236         if ($p_mode == 'xml') {  
    249               $relativePath = $this->m_directory.'/'.$this->m_prefix.'.'.$this->m_languageId.'.xml';  
      237             $relativePath = '/'.$this->m_languageId.'/'.$this->m_prefix.'.xml';  
    249 237         }  
    250 238         else {  
    251               $relativePath = $this->m_directory.'/'.$this->m_prefix.'.'.$this->m_languageCode.'.php';  
      239             $relativePath = '/'.$this->m_languageCode.'/'.$this->m_prefix.'.php';  
    251 239         }  
    252           return $g_localizerConfig['BASE_DIR'].$relativePath;  
      240         return $g_localizerConfig['TRANSLATION_DIR'].$relativePath;  
    252 240     } // fn getFilePath  
    253 241  
    …… 
    519 507         global $g_localizerConfig;  
    520 508         $defaultLanguage =& new LocalizerLanguage($this->m_prefix,  
    521                                                     $this->m_directory,  
    522 509                                                   $g_localizerConfig['DEFAULT_LANGUAGE']);  
    523 510         $defaultLanguage->loadFile(Localizer::GetMode());  
    545 532         global $g_localizerConfig;  
    546 533         $defaultLanguage =& new LocalizerLanguage($this->m_prefix,  
    547                                                     $this->m_directory,  
    548 534                                                   $g_localizerConfig['DEFAULT_LANGUAGE']);  
    549 535         $defaultLanguage->loadFile(Localizer::GetMode());  

  • trunk/campsite/implementation/management/priv/pub/edit_alias.php

    r3936 r3953  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    6 6 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    7   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    8   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      7 $globalfile=selectLanguageFile('globals');  
      8 $localfile=selectLanguageFile("pub");  
    9 9 @include_once($globalfile);  
    10 10 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_del_alias.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/add_alias.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/deldeftime.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/del.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_editdeftime.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/countryadd.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/deftime.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_edit_alias.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/aliases.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  
    87 87         $i = 10;  
    88 88         $color = 0;  
    89   ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      89 ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" class="table_list">  
    89 89     <TR class="table_list_header">  
    90 90         <TD ALIGN="LEFT" VALIGN="TOP"  ><B><?php  putGS("Alias (click to edit)"); ?></B></TD>  
    91           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Delete"); ?></B></TD>  
      91         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Delete"); ?></B></TD>  
    91 91     </TR>  
    92 92 <?php   

  • trunk/campsite/implementation/management/priv/pub/do_add_alias.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_deldeftime.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/edit.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_del.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/add.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/add_article.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  
    82 82     $i=10;  
    83 83     $color=0;  
    84   ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      84 ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" class="table_list">  
    84 84     <TR class="table_list_header">  
    85 85         <TD ALIGN="LEFT" VALIGN="TOP"  ><B><?php  putGS("Name<BR><SMALL>(click to select the publication)</SMALL>"); ?></B></TD>  

  • trunk/campsite/implementation/management/priv/pub/do_countryadd.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_edit.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/index.php

    r3941 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/do_add.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/del_alias.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/pub/editdeftime.php

    r3936 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/pub","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("pub");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/sections/add_article.php

    r3933 r3953  
    58 58     $color= 0;  
    59 59     ?>  
    60       <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      60     <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3"class="table_list">  
    60 60     <TR class="table_list_header">  
    61           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Nr"); ?></B></TD>  
      61         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Nr"); ?></B></TD>  
    61 61         <TD ALIGN="LEFT" VALIGN="TOP">  
    62 62             <B><?php  putGS("Name<BR><SMALL>(click to add article)</SMALL>");?></B>  

  • trunk/campsite/implementation/management/priv/sections/section_common.php

    r3940 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/sections");  
      4 load_common_include_files("sections");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Section.php');  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Issue.php');  

  • trunk/campsite/implementation/management/priv/u_types/utypes_common.php

    r3903 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']. '/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/u_types");  
      4 load_common_include_files("user_types");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']. '/classes/Input.php');  
    5 5 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  

  • trunk/campsite/implementation/management/priv/u_types/index.php

    r3933 r3953  
    37 37     $color= 0;  
    38 38 ?>  
    39   <table border="0" cellspacing="1" cellpadding="3" width="100%" class="table_list">  
      39 <table border="0" cellspacing="1" cellpadding="3" class="table_list">  
    39 39     <tr class="table_list_header">  
    40 40         <td align="left" valign="top"><B><?php putGS("Type"); ?></b></td>  
    41 41     <?php if ($canManage) { ?>  
    42           <td align="left" valign="top" width="1%"><b><?php putGS("Access"); ?></b></td>  
    43           <td align="left" valign="top" width="1%"><b><?php putGS("Delete"); ?></b></td>  
      42         <td align="left" valign="top"><b><?php putGS("Access"); ?></b></td>  
      43         <td align="left" valign="top"><b><?php putGS("Delete"); ?></b></td>  
    44 44     <?php } ?>  
    45 45     </tr>  

  • trunk/campsite/implementation/management/priv/u_types/add.php

    r3903 r3953  
    96 96  
    97 97 <form name="dialog" method="post" action="do_add.php" >  
    98   <p><table border="0" cellspacing="0" cellpadding="1" class="table_input" align="center">  
      98 <p><table border="0" cellspacing="0" cellpadding="1" class="table_input">  
    98 98     <tr>  
    99 99         <td colspan="2" style="padding-top: 5px; padding-left: 10px;">  

  • trunk/campsite/implementation/management/priv/menu.php

    r3952 r3953  
    6 6 require_once($_SERVER['DOCUMENT_ROOT']."/classes/Section.php");  
    7 7 require_once($_SERVER['DOCUMENT_ROOT']."/classes/DynMenuItem.php");  
    8   load_common_include_files("$ADMIN_DIR");  
      8 load_common_include_files("home");  
    8 8 list($access, $User) = check_basic_access($_REQUEST);  
    9 9 if (!$access) {  

  • trunk/campsite/implementation/management/priv/index.php

    r3890 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files($ADMIN_DIR);  
      3 load_common_include_files("home");  
    3 3 list($access, $User) = check_basic_access($_REQUEST);  
    4 4 if (!$access) {  

  • trunk/campsite/implementation/management/priv/ad_popup.php

    r3903 r3953  
    3 3 require_once('camp_html.php');  
    4 4 require_once('classes/common.php');  
    5   load_common_include_files($ADMIN_DIR);  
      5 load_common_include_files("home");  
    5 5 require_once('classes/Input.php');  
    6 6 $ADReason = Input::Get('ADReason', 'string', getGS('You do not have the right to access this page.'), true);  

  • trunk/campsite/implementation/management/priv/login.php

    r3933 r3953  
    58 58  
    59 59 // Load the language files.  
    60   selectLanguageFile("/", "globals");  
    61   selectLanguageFile("/", "locals");  
      60 selectLanguageFile("globals");  
      61 selectLanguageFile("home");  
    62 62  
    63 63 ?>  

  • trunk/campsite/implementation/management/priv/templates/del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)  
      1 INCLUDE_PHP_LIB(<*templates*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/edit_template.m4

    r2920 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)dnl  
      1 INCLUDE_PHP_LIB(<*templates*>)dnl  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/new_template.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)  
      1 INCLUDE_PHP_LIB(<*templates*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/upload_templ.m4

    r3015 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)  
      1 INCLUDE_PHP_LIB(<*templates*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/new_dir.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)  
      1 INCLUDE_PHP_LIB(<*templates*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/dup.m4

    r2829 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/templates*>)  
      1 INCLUDE_PHP_LIB(<*templates*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/templates/template_common.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files("$ADMIN_DIR/templates");  
      3 load_common_include_files("templates");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/classes/Language.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/classes/User.php");  

  • trunk/campsite/implementation/management/priv/topics/del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/edit.m4

    r3634 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/do_del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/do_edit.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/index.m4

    r3933 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/add.m4

    r3634 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/topics/do_add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/topics*>)  
      1 INCLUDE_PHP_LIB(<*topics*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/users/users_common.php

    r3903 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']. '/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/users");  
      4 load_common_include_files("users");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']. '/classes/Input.php');  
    5 5 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  

  • trunk/campsite/implementation/management/priv/users/subscriptions/do_status.m4

    r3698 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      2 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/do_del.m4

    r3607 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      2 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/index.m4

    r3933 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      2 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/add.m4

    r3693 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      1 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/change.m4

    r3695 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      1 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/do_del.m4

    r3611 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      2 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/do_change.m4

    r3611 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      2 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/index.m4

    r3933 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      2 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/add.m4

    r3693 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      1 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/users/subscriptions/sections/do_add.m4

    r3611 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions/sections*>)  
      2 INCLUDE_PHP_LIB(<*user_subscription_sections*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/do_add.m4

    r3607 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      2 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/subscriptions/topay.m4

    r3607 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      1 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/users/subscriptions/do_topay.m4

    r3607 r3953  
    1 1 B_HTML  
    2   INCLUDE_PHP_LIB(<*$ADMIN_DIR/users/subscriptions*>)  
      2 INCLUDE_PHP_LIB(<*user_subscriptions*>)  
    2 2 B_DATABASE  
    3 3  

  • trunk/campsite/implementation/management/priv/users/edit.php

    r3903 r3953  
    54 54 <?php } ?>  
    55 55  
    56   <table border="0" align="center">  
      56 <table border="0">  
    56 56 <tr>  
    57       <td rowspan="2" valign="top" align="center" height="1%">  
      57     <td rowspan="2" valign="top" height="1%">  
    57 57         <?php require_once($_SERVER['DOCUMENT_ROOT']. "/$ADMIN_DIR/users/info.php"); ?>  
    58 58     </td>  

  • trunk/campsite/implementation/management/priv/users/index.php

    r3933 r3953  
    34 34 </table>  
    35 35  
    36   <table border="0" cellspacing="0" cellpadding="3" class="table_input" style="margin-bottom: 10px; margin-top: 5px;" align="center">  
      36 <table border="0" cellspacing="0" cellpadding="3" class="table_input" style="margin-bottom: 10px; margin-top: 5px; margin-left: 10px;">  
    36 36 <form method="POST" action="index.php">  
    37 37 <input type="hidden" name="uType" value="<?php pencHTML($uType); ?>">  
    …… 
    147 147     $nr = $res->NumRows();  
    148 148     $last = $nr > $lpp ? $lpp : $nr;  
    149   ?><table border="0" cellspacing="1" cellpadding="3" width="100%" class="table_list">  
      149 ?><table border="0" cellspacing="1" cellpadding="3" class="table_list">  
    149 149     <tr class="table_list_header">  
    150 150         <td align="left" valign="top"><b><?php putGS("Full Name"); ?></b></td>  
    156 156 <?php } ?>  
    157 157 <?php if ($canDelete) { ?>  
    158           <td align="left" valign="top" width="1%"><b><?php putGS("Delete"); ?></b></td>  
      158         <td align="left" valign="top"><b><?php putGS("Delete"); ?></b></td>  
    158 158 <?php } ?>  
    159 159     </TR>  

  • trunk/campsite/implementation/management/priv/country/del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/edit.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/do_del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/do_edit.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/index.m4

    r3933 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/do_add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/translate.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/country/do_translate.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/country*>)  
      1 INCLUDE_PHP_LIB(<*country*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/macros.m4

    r3933 r3953  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    6 6 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    7   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    8   $localfile=selectLanguageFile("$1","locals");  
      7 $globalfile=selectLanguageFile('globals');  
      8 $localfile=selectLanguageFile("$1");  
    9 9 @include_once($globalfile);  
    10 10 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/a_types/del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types*>)  
      1 INCLUDE_PHP_LIB(<*article_types*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/do_del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types*>)  
      1 INCLUDE_PHP_LIB(<*article_types*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/fields/del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types/fields*>)  
      1 INCLUDE_PHP_LIB(<*article_type_fields*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/fields/do_del.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types/fields*>)  
      1 INCLUDE_PHP_LIB(<*article_type_fields*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/fields/index.m4

    r3933 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types/fields*>)  
      1 INCLUDE_PHP_LIB(<*article_type_fields*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/fields/add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types/fields*>)  
      1 INCLUDE_PHP_LIB(<*article_type_fields*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/fields/do_add.m4

    r3701 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types/fields*>)  
      1 INCLUDE_PHP_LIB(<*article_type_fields*>)  
    1 1 B_DATABASE  
    2 2 <?php  

  • trunk/campsite/implementation/management/priv/a_types/index.m4

    r3933 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types*>)  
      1 INCLUDE_PHP_LIB(<*article_types*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types*>)  
      1 INCLUDE_PHP_LIB(<*article_types*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/a_types/do_add.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/a_types*>)  
      1 INCLUDE_PHP_LIB(<*article_types*>)  
    1 1 B_DATABASE  
    2 2 <?php  todef('cName');  

  • trunk/campsite/implementation/management/priv/logs/index.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/logs*>)  
      1 INCLUDE_PHP_LIB(<*logs*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/languages/add_modify.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/languages");  
      3 load_common_include_files("languages");  
    3 3 require_once($Campsite['HTML_DIR'] . "/$ADMIN_DIR/languages.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/localizer/Localizer.php");  

  • trunk/campsite/implementation/management/priv/languages/modify.m4

    r2681 r3953  
    1   INCLUDE_PHP_LIB(<*$ADMIN_DIR/languages*>)  
      1 INCLUDE_PHP_LIB(<*languages*>)  
    1 1 B_DATABASE  
    2 2  

  • trunk/campsite/implementation/management/priv/languages/do_add_modify.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/languages");  
      3 load_common_include_files("languages");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/localizer/Localizer.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Language.php');  

  • trunk/campsite/implementation/management/priv/languages/do_del.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/languages");  
      3 load_common_include_files("languages");  
    3 3 require_once($Campsite['HTML_DIR'] . "/$ADMIN_DIR/languages.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Language.php');  

  • trunk/campsite/implementation/management/priv/languages/index.php

    r3933 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/languages");  
      3 load_common_include_files("languages");  
    3 3 require_once($Campsite['HTML_DIR'] . "/$ADMIN_DIR/languages.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Language.php');  
    …… 
    42 42 if (count($languages) > 0) {  
    43 43     $color= 0; ?>  
    44       <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      44     <TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" class="table_list">  
    44 44     <TR class="table_list_header">  
    45 45         <TD ALIGN="LEFT" VALIGN="TOP"><?php  putGS("Language"); ?></TD>  
    49 49         <TD ALIGN="LEFT" VALIGN="TOP"><?php  putGS("Code page"); ?></TD>  
    50 50         <?php if ($User->hasPermission('ManageLanguages')) { ?>  
    51           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Edit"); ?></B></TD>  
      51         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Edit"); ?></B></TD>  
    51 51         <?php  }  
    52 52         if ($User->hasPermission('DeleteLanguages')) { ?>  
    53           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Delete"); ?></B></TD>  
      53         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Delete"); ?></B></TD>  
    53 53         <?php  } ?>  
    54 54     </TR>  

  • trunk/campsite/implementation/management/priv/articles/article_common.php

    r3933 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles");  
      3 load_common_include_files("articles");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Section.php');  

  • trunk/campsite/implementation/management/priv/articles/topics/topic_common.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files("$ADMIN_DIR/articles/topics");  
      3 load_common_include_files("article_topics");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/classes/Article.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/classes/Section.php");  

  • trunk/campsite/implementation/management/priv/articles/images/do_add.php

    r3916 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/articles/images");  
      4 load_common_include_files("article_images");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/do_link.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/do_unlink.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/edit.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/articles/article_common.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/search.php

    r3933 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/articles/article_common.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/do_del.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/do_edit.php

    r3903 r3953  
    1 1 <?php   
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Article.php');  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Image.php');  

  • trunk/campsite/implementation/management/priv/articles/images/index.php

    r3933 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/articles/article_common.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/ArticleImage.php');  

  • trunk/campsite/implementation/management/priv/articles/images/add.php

    r3916 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files("$ADMIN_DIR/articles/images");  
      3 load_common_include_files("article_images");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/articles/article_common.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/classes/ArticleImage.php");  

  • trunk/campsite/implementation/management/priv/ad.php

    r3903 r3953  
    3 3 require_once('camp_html.php');  
    4 4 require_once('classes/common.php');  
    5   load_common_include_files($ADMIN_DIR);  
      5 load_common_include_files("home");  
    5 5 require_once('classes/Input.php');  
    6 6 $ADReason = Input::Get('ADReason', 'string', getGS('You do not have the right to access this page.'), true);  

  • trunk/campsite/implementation/management/priv/issues/autopublish_do_add.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/add_article.php

    r3935 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  
    95 95                         if($nr < $lpp) $i = $nr;  
    96 96     $color= 0;  
    97   ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" WIDTH="100%" class="table_list">  
      97 ?><TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" class="table_list">  
    97 97     <TR class="table_list_header">  
    98           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Nr"); ?></B></TD>  
    99           <TD ALIGN="LEFT" VALIGN="TOP"  ><B><?php  putGS("Name"); ?></B></TD>  
    100           <TD ALIGN="LEFT" VALIGN="TOP"  ><B><?php  putGS("Language"); ?></B></TD>  
    101           <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="1%" ><B><?php  putGS("Published<BR><SMALL>(yyyy-mm-dd)</SMALL>"); ?></B></TD>  
      98         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Nr"); ?></B></TD>  
      99         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Name"); ?></B></TD>  
      100         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Language"); ?></B></TD>  
      101         <TD ALIGN="LEFT" VALIGN="TOP"><B><?php  putGS("Published<BR><SMALL>(yyyy-mm-dd)</SMALL>"); ?></B></TD>  
    102 102     </TR>  
    103 103  

  • trunk/campsite/implementation/management/priv/issues/translate.php

    r3940 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/autopublish.php

    r3933 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/issues");  
      4 load_common_include_files("issues");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/add_new.php

    r3935 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  
    94 94 ?><P>  
    95 95 <FORM NAME="dialog" METHOD="POST" ACTION="do_add_new.php"  >  
    96   <CENTER><TABLE BORDER="0" CELLSPACING="0" CELLPADDING="6" CLASS="table_input" ALIGN="CENTER">  
      96 <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="6" CLASS="table_input">  
    96 96     <TR>  
    97 97         <TD COLSPAN="2">  

  • trunk/campsite/implementation/management/priv/issues/do_status.php

    r3903 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/issues");  
      4 load_common_include_files("issues");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/do_add_prev.php

    r3935 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/issues/do_edit.php

    r3940 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/index.php

    r3941 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/issues");  
      4 load_common_include_files("issues");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/qadd.php

    r3935 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/issues/do_translate.php

    r3941 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/preview.php

    r3903 r3953  
    2 2  
    3 3 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    4   load_common_include_files("$ADMIN_DIR/issues");  
      4 load_common_include_files("issues");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    5 5 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/do_add_new.php

    r3940 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/issues/autopublish_del.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT']."/classes/common.php");  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/status.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  
    …… 
    43 43  
    44 44 <P>  
    45   <CENTER>  
    46   <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="8" class="message_box" ALIGN="CENTER">  
      45 <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="8" class="message_box">  
    47 46 <TR>  
    48 47     <TD COLSPAN="2">  
    71 70     </TD>  
    72 71 </TR>  
    73   </TABLE></CENTER>  
      72 </TABLE>  
    73 72 <P>  
    74 73 <?php camp_html_copyright_notice(); ?>  

  • trunk/campsite/implementation/management/priv/issues/add_prev.php

    r3935 r3953  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/db_connect.php');  
    3 3 require_once($Campsite['HTML_DIR']."/$ADMIN_DIR/lib_campsite.php");  
    4   $globalfile=selectLanguageFile($Campsite['HTML_DIR'] . "/$ADMIN_DIR",'globals');  
    5   $localfile=selectLanguageFile("$ADMIN_DIR/issues","locals");  
      4 $globalfile=selectLanguageFile('globals');  
      5 $localfile=selectLanguageFile("issues");  
    6 6 @include_once($globalfile);  
    7 7 @include_once($localfile);  

  • trunk/campsite/implementation/management/priv/issues/edit.php

    r3903 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/issues/do_del.php

    r3941 r3953  
    1 1 <?php  
    2 2 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/common.php');  
    3   load_common_include_files("$ADMIN_DIR/issues");  
      3 load_common_include_files("issues");  
    3 3 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    4 4 require_once($_SERVER['DOCUMENT_ROOT'].'/classes/Input.php');  

  • trunk/campsite/implementation/management/priv/home.php

    r3952 r3953  
    12 12 require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/camp_html.php");  
    13 13  
    14   load_common_include_files("$ADMIN_DIR");  
      14 load_common_include_files("home");  
    14 14 list($access, $User) = check_basic_access($_REQUEST);     
    15 15 if (!$access) {  

  • trunk/campsite/implementation/management/css/admin_stylesheet.css

    r3938 r3953  
    149 149     background-color: #d5e2ee;  
    150 150     border: 1px solid #8baed1;  
      151     margin-left: 15px;  
    151 152 }  
    152 153  
    …… 
    154 155     background-color: #d5e2ee;  
    155 156     border: 1px solid #8baed1;  
      157     margin-left: 15px;  
    156 158 }  
    157 159  
    …… 
    162 164  
    163 165 .breadcrumb {  
    164       color: #2F667F; /* #35738F;*/ /*#3c81a0;*/  
      166     color: #2F667F;  
      167     font-weight: bold;  
    165 168 }  
    166 169  
    167 170 .breadcrumb:visited {  
    168       color: #2F667F; /*#3c81a0;*/  
      171     color: #2F667F;  
      172     font-weight: bold;  
    169 173 }  
    170 174  
    …… 
    172 176     color: #d95022;  
    173 177     font-weight: bold;  
    174       /*font-size: larger;*/  
      178     font-size: larger;  
    174 178 }  
    175 179  
    178 182     color: #d95022;  
    179 183     font-weight: bold;  
      184     font-size: larger;  
    180 185 }  
    181 186  

  • trunk/campsite/implementation/management/classes/common.php

    r3578 r3953  
    10 10     require_once($_SERVER['DOCUMENT_ROOT'].'/configuration.php');  
    11 11     require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/lib_campsite.php");  
    12       selectLanguageFile($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR",'globals');  
    13       selectLanguageFile($_SERVER['DOCUMENT_ROOT']."/$p_currentDir",'locals');  
      12     selectLanguageFile('globals');  
      13     selectLanguageFile("$p_currentDir");  
    14 14     require_once($_SERVER['DOCUMENT_ROOT']."/$ADMIN_DIR/languages.php");  
    15 15 } // fn load_common_include_files