Changeset 4601

Show
Ignore:
Timestamp:
04/06/06 14:10:56
Author:
paul
Message:

Fixed bug #1824 - not all menu items are escaped for javascript. The french localization was broken.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CAMPSITE_2_5_BRANCH/campsite/implementation/management/classes/DynMenuItem.php

    r4261 r4601  
    11<?PHP 
    2  
    32/** 
    43 * PHP class to dynamically create a javascript menu. 
    …… 
    6867 * echo $root->createMenu('myMenu'); 
    6968 * 
     69 * Note: the JSCook menu requires camp_javascriptspecialchars() which  
     70 * escapes javascript strings. 
    7071 */ 
    71  
    7272class DynMenuItem { 
    7373    var $m_title = ''; 
    …… 
    274274            if ($subItem->m_title != "[[split]]") { 
    275275                $str .= str_repeat("\t", $p_level); 
    276                 $str .= "['" . $attrs['icon'] . "', '" . $subItem->m_title . "', '" 
     276                $str .= "['" . $attrs['icon'] . "', '" . camp_javascriptspecialchars($subItem->m_title) . "', '" 
    277277                             . $subItem->m_url . "', '" . $attrs['target'] . "', '" 
    278278                             . $attrs['description']. "'"; 

  • branches/CAMPSITE_2_5_BRANCH/campsite/implementation/management/priv/menu.php

    r4483 r4601  
    5151foreach ($Campsite["publications"] as $publication) { 
    5252    $pubId = $publication->getPublicationId(); 
    53     $menu_item_pub =& DynMenuItem::Create(camp_javascriptspecialchars($publication->getName()),  
     53    $menu_item_pub =& DynMenuItem::Create($publication->getName(),  
    5454                                          "/$ADMIN/issues/index.php?Pub=$pubId", 
    5555                                          array("icon" => $icon_bullet)); 
    …… 
    6060            $languageId = $issue->getLanguageId(); 
    6161            $issueIndexLink = "/$ADMIN/sections/index.php?Pub=$pubId&Issue=$issueId&Language=$languageId"; 
    62             $menu_item_issue =& DynMenuItem::Create(camp_javascriptspecialchars($issue->getName()." (".$issue->getLanguageName().")"), 
     62            $menu_item_issue =& DynMenuItem::Create($issue->getName()." (".$issue->getLanguageName().")", 
    6363                 $issueIndexLink, 
    6464                 array("icon" => $icon_bullet)); 
    …… 
    6868                    $sectionId = $section->getSectionNumber(); 
    6969                    $menu_item_section =& DynMenuItem::Create( 
    70                         camp_javascriptspecialchars($section->getName()), 
     70                        $section->getName(), 
    7171                        "/$ADMIN/articles/index.php" 
    7272                        ."?f_publication_id=$pubId"