[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.81,1.82

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv8826

Modified Files:
	story.php 
Log Message:
Added call to setMaxFileUploads() so that you can have more than 5 images per story.
Also fixed a problem with topic permissions being too restrictive.


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** story.php	2 Feb 2003 19:46:47 -0000	1.81
--- story.php	19 Mar 2003 17:14:52 -0000	1.82
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,18 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
! // |          Dirk Haun         - dirk at haun-online.de                          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 414,431 ****
      }
  
-     $groupList = '';
-     if (!empty ($_USER['uid'])) {
-         foreach ($_GROUPS as $grp) {
-             $groupList .= $grp . ',';
-         }
-         $groupList = substr ($groupList, 0, -1);
-     }
- 
      $excludetopics = '';
!     $topicsql = "SELECT tid FROM {$_TABLES['topics']} WHERE "
!               . "(owner_id = {$_USER['uid']} AND perm_owner >= 2) OR "     
!               . "(group_id IN ($groupList) AND perm_group >= 2) OR "
!               . "(perm_members >= 2) OR "
!               . "(perm_anon >= 2)";
      $tresult = DB_query( $topicsql );
      $trows = DB_numRows( $tresult );     
--- 415,420 ----
      }
  
      $excludetopics = '';
!     $topicsql = "SELECT tid FROM {$_TABLES['topics']}" . COM_getPermSQL ();
      $tresult = DB_query( $topicsql );
      $trows = DB_numRows( $tresult );     
***************
*** 656,660 ****
                  $perm_members, $perm_anon);
      }
!     if (($access < 3) || (SEC_hasTopicAccess ($tid) < 3) || !SEC_inGroup ($group_id)) {
          $display .= COM_siteHeader('menu');
          $display .= COM_startBlock($MESSAGE[30]);
--- 645,649 ----
                  $perm_members, $perm_anon);
      }
!     if (($access < 3) || (SEC_hasTopicAccess ($tid) < 2) || !SEC_inGroup ($group_id)) {
          $display .= COM_siteHeader('menu');
          $display .= COM_startBlock($MESSAGE[30]);
***************
*** 749,752 ****
--- 738,742 ----
  
              $upload->setDebug(true);
+             $upload->setMaxFileUploads ($_CONF['maximagesperarticle']);
              if (!empty($_CONF['image_lib'])) {
                  if ($_CONF['image_lib'] == 'imagemagick') {