Changeset 4420

Show
Ignore:
Timestamp:
Wed Feb 1 22:58:41 2006
Author:
paul
Message:

Implemented feature #1618 - Use a dash instead of a comma for the keywords separator. Also removed the old add_article screens.

Files:

Legend:

Unmodified
Added
Removed
Modified

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

    r4418 r4420  
    178 178     $menu_root->addItem($menu_config);  
    179 179      
      180     if ($User->hasPermission("ChangeSystemPreferences")) {  
      181         $menu_item =& DynMenuItem::Create(getGS("System Preferences"),  
      182             "/$ADMIN/system_pref/",  
      183             array("icon" => sprintf($iconTemplateStr, "preferences.png")));  
      184         $menu_config->addItem($menu_item);  
      185     }  
    180 186     if ($User->hasPermission("ManageTempl") || $User->hasPermission("DeleteTempl")) {  
    181 187         $menu_item =& DynMenuItem::Create(getGS("Templates"),  

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

    r4418 r4420  
    30 30         'DeleteTempl'=>getGS('User may delete templates'));  
    31 31      
    32       $administrative_group = array('InitializeTemplateEngine'=>getGS('User may restart the template engine'));  
      32     $administrative_group = array('InitializeTemplateEngine'=>getGS('User may restart the template engine'),  
      33                                   'ChangeSystemPreferences'=>getGS('User may change system preferences'));  
    33 34      
    34 35     $users_group = array(  

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

    r4418 r4420  
    128 128         'EditorSubhead'=>'N',  
    129 129         'InitializeTemplateEngine'=>'N',  
      130         'ChangeSystemPreferences'=>'N',  
    130 131         'AddFile'=>'N',  
    131 132         'ChangeFile'=>'N',  
    …… 
    346 347                            ." AND varname='".mysql_real_escape_string($p_varName)."'";  
    347 348                     $Campsite['db']->Execute($sql);  
      349                     $this->m_config[$p_varName] = $p_value;  
    348 350                 }  
    349 351             } else {  
    353 355                        ." value='".mysql_real_escape_string($p_value)."'";  
    354 356                 $Campsite['db']->Execute($sql);           
      357                 $this->m_config[$p_varName] = $p_value;  
    355 358             }  
    356 359         }  

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

    r4418 r4420  
    23 23 require_once($g_documentRoot.'/classes/Language.php');  
    24 24 require_once($g_documentRoot.'/classes/Log.php');  
      25 require_once($g_documentRoot.'/classes/SystemPref.php');  
    25 26  
    26 27 /**  
    …… 
    1073 1074     function getKeywords()  
    1074 1075     {  
    1075           return $this->getProperty('Keywords');  
      1076         $keywords = $this->getProperty('Keywords');  
      1077         $keywordSeparator = SystemPref::Get("KeywordSeparator");  
      1078         return str_replace(",", $keywordSeparator, $keywords);  
    1076 1079     } // fn getKeywords  
    1077 1080      
    1082 1085     function setKeywords($p_value)  
    1083 1086     {  
      1087         $keywordsSeparator = SystemPref::Get('KeywordSeparator');  
      1088         $p_value = str_replace($keywordsSeparator, ",", $p_value);  
    1084 1089         return parent::setProperty('Keywords', $p_value);  
    1085 1090     } // fn setKeywords