[phpws-comm-commits] modules/article/inc editconfig.php,1.4,1.5 importANN.php,1.2,1.3 importPM.php,1.3,1.4

[<ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv22121/inc

Modified Files:
	editconfig.php importANN.php importPM.php 
Log Message:
2.0 Release

Index: editconfig.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/editconfig.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editconfig.php	31 Jul 2003 22:30:55 -0000	1.4
--- editconfig.php	21 Oct 2003 21:14:28 -0000	1.5
***************
*** 26,30 ****
      $GLOBALS['core']->formSelect('CONFIG_default_article_template', $article_tpl_array, $this->val['default_article_template'], true, NULL, NULL) 
      . ' ' . $_SESSION['translate']->it('Default page template')
!     . $_SESSION['OBJ_help']->show_link('article', 'article_template');
  }
  
--- 26,30 ----
      $GLOBALS['core']->formSelect('CONFIG_default_article_template', $article_tpl_array, $this->val['default_article_template'], true, NULL, NULL) 
      . ' ' . $_SESSION['translate']->it('Default page template')
!     . CLS_help::show_link('article', 'article_template');
  }
  
***************
*** 40,44 ****
      $GLOBALS['core']->formSelect('CONFIG_default_section_template', $sect_tpl_array, $this->val['default_section_template'], true, NULL, NULL) 
      . ' ' . $_SESSION['translate']->it('Default section template')
!     . $_SESSION['OBJ_help']->show_link('article', 'section_template');
  }
  
--- 40,44 ----
      $GLOBALS['core']->formSelect('CONFIG_default_section_template', $sect_tpl_array, $this->val['default_section_template'], true, NULL, NULL) 
      . ' ' . $_SESSION['translate']->it('Default section template')
!     . CLS_help::show_link('article', 'section_template');
  }
  
***************
*** 48,52 ****
            , $this->val['summaries_on_homepage'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of summaries to show on the Home Page')
!   . $_SESSION['OBJ_help']->show_link('article', 'summaries_on_homepage');
  
  /* popular_articles */
--- 48,52 ----
            , $this->val['summaries_on_homepage'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of summaries to show on the Home Page')
!   . CLS_help::show_link('article', 'summaries_on_homepage');
  
  /* popular_articles */
***************
*** 55,59 ****
            , $this->val['popular_articles'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of links in the "Popular Articles" Block')
!   . $_SESSION['OBJ_help']->show_link('article', 'popular_articles');
  
  /* prev_n_articles */
--- 55,59 ----
            , $this->val['popular_articles'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of links in the "Popular Articles" Block')
!   . CLS_help::show_link('article', 'popular_articles');
  
  /* prev_n_articles */
***************
*** 62,66 ****
            , $this->val['prev_n_articles'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of links in the "Previous Articles" Block')
!   . $_SESSION['OBJ_help']->show_link('article', 'prev_n_articles');
  
  /* listings_per_page */
--- 62,66 ----
            , $this->val['prev_n_articles'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of links in the "Previous Articles" Block')
!   . CLS_help::show_link('article', 'prev_n_articles');
  
  /* listings_per_page */
***************
*** 69,73 ****
            , $this->val['listings_per_page'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of listings to show per page under the Main Menu')
!   . $_SESSION['OBJ_help']->show_link('article', 'listings_per_page');
  
  /* need_approval */
--- 69,73 ----
            , $this->val['listings_per_page'], NULL, NULL, NULL) 
    . ' ' . $_SESSION['translate']->it('Number of listings to show per page under the Main Menu')
!   . CLS_help::show_link('article', 'listings_per_page');
  
  /* need_approval */
***************
*** 75,79 ****
    $GLOBALS['core']->formCheckBox('CONFIG_need_approval',1,$this->val['need_approval'],NULL
        ,$_SESSION['translate']->it('Articles need approval before publication'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'need_approval');
  
  /* default_allow_comments */
--- 75,79 ----
    $GLOBALS['core']->formCheckBox('CONFIG_need_approval',1,$this->val['need_approval'],NULL
        ,$_SESSION['translate']->it('Articles need approval before publication'))
!   . CLS_help::show_link('configmanager', 'need_approval');
  
  /* default_allow_comments */
***************
*** 81,85 ****
        ,$this->val['default_allow_comments'],NULL
        ,$_SESSION['translate']->it('Comments are allowed by default'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'default_allow_comments');
  
  /* default_allow_anon */
--- 81,85 ----
        ,$this->val['default_allow_comments'],NULL
        ,$_SESSION['translate']->it('Comments are allowed by default'))
!   . CLS_help::show_link('configmanager', 'default_allow_comments');
  
  /* default_allow_anon */
***************
*** 87,91 ****
        ,$this->val['default_allow_anon'],NULL
        ,$_SESSION['translate']->it('Comments by unregistered users are allowed by default'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'default_allow_anon');
  
  $tags['USERS_LABEL'] = $_SESSION['translate']->it('Registered users can');
--- 87,91 ----
        ,$this->val['default_allow_anon'],NULL
        ,$_SESSION['translate']->it('Comments by unregistered users are allowed by default'))
!   . CLS_help::show_link('configmanager', 'default_allow_anon');
  
  $tags['USERS_LABEL'] = $_SESSION['translate']->it('Registered users can');
***************
*** 95,99 ****
        ,$this->val['users_can_submit'],NULL
        ,$_SESSION['translate']->it('Submit articles'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'users_can_submit');
  
  /* users_select_article_tpl */
--- 95,99 ----
        ,$this->val['users_can_submit'],NULL
        ,$_SESSION['translate']->it('Submit articles'))
!   . CLS_help::show_link('configmanager', 'users_can_submit');
  
  /* users_select_article_tpl */
***************
*** 101,105 ****
        ,$this->val['users_select_article_tpl'],NULL
        ,$_SESSION['translate']->it('Select article templates'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'users_select_article_tpl');
  
  /* users_select_section_tpl */
--- 101,105 ----
        ,$this->val['users_select_article_tpl'],NULL
        ,$_SESSION['translate']->it('Select article templates'))
!   . CLS_help::show_link('configmanager', 'users_select_article_tpl');
  
  /* users_select_section_tpl */
***************
*** 107,111 ****
        ,$this->val['users_select_section_tpl'],NULL
        ,$_SESSION['translate']->it('Select section templates'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'users_select_section_tpl');
  
  /* users_allow_comments */
--- 107,111 ----
        ,$this->val['users_select_section_tpl'],NULL
        ,$_SESSION['translate']->it('Select section templates'))
!   . CLS_help::show_link('configmanager', 'users_select_section_tpl');
  
  /* users_allow_comments */
***************
*** 113,117 ****
        ,$this->val['users_allow_comments'],NULL
        ,$_SESSION['translate']->it('Allow/Disallow comments'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'users_allow_comments');
  
  /* users_change_dates */
--- 113,117 ----
        ,$this->val['users_allow_comments'],NULL
        ,$_SESSION['translate']->it('Allow/Disallow comments'))
!   . CLS_help::show_link('configmanager', 'users_allow_comments');
  
  /* users_change_dates */
***************
*** 119,123 ****
        ,$this->val['users_change_dates'],NULL
        ,$_SESSION['translate']->it('Set Publication Dates'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'users_change_dates');
  
  /* user_images_in_article */
--- 119,123 ----
        ,$this->val['users_change_dates'],NULL
        ,$_SESSION['translate']->it('Set Publication Dates'))
!   . CLS_help::show_link('configmanager', 'users_change_dates');
  
  /* user_images_in_article */
***************
*** 125,129 ****
        ,$this->val['user_images_in_article'],NULL
        ,$_SESSION['translate']->it('Place images in articles'))
!     . $_SESSION['OBJ_help']->show_link('configmanager', 'user_images_in_article');
  
  /* user_upload_images */
--- 125,129 ----
        ,$this->val['user_images_in_article'],NULL
        ,$_SESSION['translate']->it('Place images in articles'))
!     . CLS_help::show_link('configmanager', 'user_images_in_article');
  
  /* user_upload_images */
***************
*** 131,135 ****
        ,$this->val['user_upload_images'],NULL
        ,$_SESSION['translate']->it('Upload images to the site'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'user_upload_images');
  
  /* can_expire */
--- 131,135 ----
        ,$this->val['user_upload_images'],NULL
        ,$_SESSION['translate']->it('Upload images to the site'))
!   . CLS_help::show_link('configmanager', 'user_upload_images');
  
  /* can_expire */
***************
*** 137,141 ****
        ,$this->val['can_expire'],NULL
        ,$_SESSION['translate']->it('Articles can expire on a predefined date'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'can_expire');
  
  /* expiration_years */
--- 137,141 ----
        ,$this->val['can_expire'],NULL
        ,$_SESSION['translate']->it('Articles can expire on a predefined date'))
!   . CLS_help::show_link('configmanager', 'can_expire');
  
  /* expiration_years */
***************
*** 146,150 ****
        , $GLOBALS['core']->formSelect('CONFIG_expiration_months', range(0,11), $this->val['expiration_months'], NULL, NULL, NULL)
        , $GLOBALS['core']->formSelect('CONFIG_expiration_days', range(0,31), $this->val['expiration_days'], NULL, NULL, NULL))
!   . $_SESSION['OBJ_help']->show_link('article', 'expiration_default');
  
  /* default_year_count*/
--- 146,150 ----
        , $GLOBALS['core']->formSelect('CONFIG_expiration_months', range(0,11), $this->val['expiration_months'], NULL, NULL, NULL)
        , $GLOBALS['core']->formSelect('CONFIG_expiration_days', range(0,31), $this->val['expiration_days'], NULL, NULL, NULL))
!   . CLS_help::show_link('article', 'expiration_default');
  
  /* default_year_count*/
***************
*** 158,162 ****
    , $GLOBALS['core']->formTextField('CONFIG_max_image_size'
        , $this->val['max_image_size'], 4, 4)) 
!   . $_SESSION['OBJ_help']->show_link('article', 'max_image_size');
  
  /* max_image_height */
--- 158,162 ----
    , $GLOBALS['core']->formTextField('CONFIG_max_image_size'
        , $this->val['max_image_size'], 4, 4)) 
!   . CLS_help::show_link('article', 'max_image_size');
  
  /* max_image_height */
***************
*** 174,178 ****
  //      ,$this->val['restricted_viewing'],NULL
  //      ,$_SESSION['translate']->it('Users can only see articles that belong to a group that they are members of'))
! //  . $_SESSION['OBJ_help']->show_link('configmanager', 'restricted_viewing');
  
  /* lock_expiration_time */
--- 174,178 ----
  //      ,$this->val['restricted_viewing'],NULL
  //      ,$_SESSION['translate']->it('Users can only see articles that belong to a group that they are members of'))
! //  . CLS_help::show_link('configmanager', 'restricted_viewing');
  
  /* lock_expiration_time */
***************
*** 180,184 ****
      ,$GLOBALS['core']->formTextField('CONFIG_lock_expiration_time'
        , $this->val['lock_expiration_time'], 4, 4)) 
!   . $_SESSION['OBJ_help']->show_link('article', 'lock_expiration_time');
  
  /* make_metatags */
--- 180,184 ----
      ,$GLOBALS['core']->formTextField('CONFIG_lock_expiration_time'
        , $this->val['lock_expiration_time'], 4, 4)) 
!   . CLS_help::show_link('article', 'lock_expiration_time');
  
  /* make_metatags */
***************
*** 186,190 ****
        ,$this->val['make_metatags'],NULL
        ,$_SESSION['translate']->it('Let Article Manager automatically generate meta descriptions'))
!   . $_SESSION['OBJ_help']->show_link('configmanager', 'make_metatags');
  
  /* make_metatags */
--- 186,190 ----
        ,$this->val['make_metatags'],NULL
        ,$_SESSION['translate']->it('Let Article Manager automatically generate meta descriptions'))
!   . CLS_help::show_link('configmanager', 'make_metatags');
  
  /* make_metatags */

Index: importANN.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importANN.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** importANN.php	31 Aug 2003 22:50:15 -0000	1.2
--- importANN.php	21 Oct 2003 21:14:28 -0000	1.3
***************
*** 40,44 ****
  	$_SESSION['SES_ART_article']->created_date = $old_ann->_dateCreated;
  	$_SESSION['SES_ART_article']->updated_date = $old_ann->_dateUpdated;
! 	$_SESSION['SES_ART_article']->summary = $old_ann->_summary;
  	$_SESSION['SES_ART_article']->allow_comments = $old_ann->_comments;
  	$_SESSION['SES_ART_article']->allow_anonymous = $old_ann->_anonymous;
--- 40,44 ----
  	$_SESSION['SES_ART_article']->created_date = $old_ann->_dateCreated;
  	$_SESSION['SES_ART_article']->updated_date = $old_ann->_dateUpdated;
! 	$_SESSION['SES_ART_article']->summary = PHPWS_Core::parseOutput($old_ann->_summary);
  	$_SESSION['SES_ART_article']->allow_comments = $old_ann->_comments;
  	$_SESSION['SES_ART_article']->allow_anonymous = $old_ann->_anonymous;
***************
*** 56,60 ****
    
    if ($old_ann->_body)
!     $current_section->text = $old_ann->_body;
    
    if ($DefaultSectionTemplate)
--- 56,60 ----
    
    if ($old_ann->_body)
!     $current_section->text = PHPWS_Core::parseOutput($old_ann->_body);
    
    if ($DefaultSectionTemplate)
***************
*** 73,77 ****
  
    /* Add the section to the page */
!   $current_section->changed = true;
    $_SESSION['SES_ART_article']->sections[$current_section->id] = $current_section;
    $_SESSION['SES_ART_article']->order[] = $current_section->id;
--- 73,77 ----
  
    /* Add the section to the page */
!   $current_section->edited = true;
    $_SESSION['SES_ART_article']->sections[$current_section->id] = $current_section;
    $_SESSION['SES_ART_article']->order[] = $current_section->id;

Index: importPM.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importPM.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** importPM.php	31 Aug 2003 22:50:15 -0000	1.3
--- importPM.php	21 Oct 2003 21:14:28 -0000	1.4
***************
*** 52,59 ****
        
        if ($old_page->sections[$x]->title)
!         $current_section->title = $old_page->sections[$x]->title;
  
        if ($old_page->sections[$x]->text)
!         $current_section->text = $old_page->sections[$x]->text;
        
        if ($old_page->sections[$x]->template=='image_center.tpl')
--- 52,59 ----
        
        if ($old_page->sections[$x]->title)
!         $current_section->title = PHPWS_Core::parseOutput($old_page->sections[$x]->title);
  
        if ($old_page->sections[$x]->text)
!         $current_section->text = PHPWS_Core::parseOutput($old_page->sections[$x]->text);
        
        if ($old_page->sections[$x]->template=='image_center.tpl')
***************
*** 86,90 ****
  
        /* Add the section to the page */
!       $current_section->changed = true;
        $_SESSION['SES_ART_article']->sections[$current_section->id] = $current_section;
        $_SESSION['SES_ART_article']->order[] = $current_section->id;
--- 86,90 ----
  
        /* Add the section to the page */
!       $current_section->edited = true;
        $_SESSION['SES_ART_article']->sections[$current_section->id] = $current_section;
        $_SESSION['SES_ART_article']->order[] = $current_section->id;