Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/components/com_content/content.php

-revision 213, Tue Jan 31 12:11:42 2006 UTC
+revision 1042, Fri Apr 13 13:15:00 2007 UTC
 Line 1
  <?php
  /**
- * @version $Id: content.php,v 1.7 2005/11/24 04:28:51 csouza Exp $
  * @package Mambo
  * @subpackage Content
- * @copyright (C) 2000 - 2005 Miro International Pty Ltd
+ * @copyright  Refer to copyright.php
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * Mambo is Free Software
+ * @author Mambo Foundation Inc see README.php
  */
  /** ensure this file is being included by a parent file */
-Line 145
+Line 144
          $params =& new mosParameters( $menu->params );
          $orderby_sec = $params->def( 'orderby_sec', '' );
          $orderby_pri = $params->def( 'orderby_pri', '' );
+         $header = $params->def( 'header', $menu->name );
+         $page_title = $params->def( 'page_title', 0 );
          // Ordering control
          $order_sec = _orderby_sec( $orderby_sec );
          $order_pri = _orderby_pri( $orderby_pri );
          $now = date( "Y-m-d H:i:s", time()+$mosConfig_offset*60*60 );
+         // temporary workaround for special access - alwarren 20070207
+         global $acl;
+         $viewAccess = ($gid >= $acl->get_group_id( 'Registered', 'ARO' ) ? 1 : 0) + ($gid >= $acl->get_group_id( 'Author', 'ARO' ) ? 1 : 0);
+         // end special access workaround
          // query records
          $query = "SELECT a.*, ROUND( v.rating_sum / v.rating_count ) AS rating, v.rating_count, u.name AS author, u.usertype, s.name AS section, cc.name AS category, g.name AS groups"
          . "\n FROM #__content AS a"
          . "\n INNER JOIN #__content_frontpage AS f ON f.content_id = a.id"
-         . "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
+         . "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
-         . "\n INNER JOIN #__sections AS s ON s.id = a.sectionid"
+         . "\n LEFT JOIN #__sections AS s ON s.id = a.sectionid"
          . "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
          . "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
          . "\n LEFT JOIN #__groups AS g ON a.access = g.id"
-Line 165
+Line 169
          . ( $noauth ? "\n AND a.access <= '". $my->gid ."'" : '' )
          . "\n AND ( publish_up = '0000-00-00 00:00:00' OR publish_up <= '$now'  )"
          . "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
+         // temporary workaround for special access - alwarren 20070207
+         . "\n AND a.access <= ". $viewAccess
+         // end special access workaround
          . "\n ORDER BY ". $order_pri . $order_sec
          ;
  //      $database->setQuery( $query );
-Line 172
+Line 179
          $rows = $database->doSQLget($query, 'mosExtendedContent');
          // Dynamic Page Title
-         $mainframe->SetPageTitle( $menu->name );
+         $mainframe->SetPageTitle( $header );
          BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
  }
-Line 205
+Line 212
          $params->def( 'empty_cat', 0 );
          $params->def( 'cat_items', 1 );
          $params->def( 'cat_description', 1 );
+         $params->def( 'description', 1 );
+         $params->def( 'description-image', 1 );
          $params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
          $params->def( 'pageclass_sfx', '' );
-Line 304
+Line 313
          $params->def( 'empty_cat', 0 );
          $params->def( 'cat_items', 1 );
          $params->def( 'cat_description', 0 );
+         $params->def( 'description', 1 );
+         $params->def( 'description-image', 1 );
          $params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
          $params->def( 'pageclass_sfx', '' );
          $params->def( 'headings', 1 );
-Line 321
+Line 332
                  $sectionid = $category->section;
          }
-         $pathway = mosPathway::getInstance();
+         $pathway =& mosPathway::getInstance();
          $pathway->addItem($category->title, categoryURL($sectionid, $id));
          if ( $access->canEdit ) {
-Line 365
+Line 376
          // get the total number of published items in the category
          // filter functionality
-         $filter = trim( mosGetParam( $_POST, 'filter', '' ) );
+         $_and = '';
+         if ($filter = mosGetParam($_POST, 'filter', '')) {
          $filter = strtolower( $filter );
-         $and = '';
+                 $filter = $database->getEscaped($filter);
-         if ( $filter ) {
                  if ( $params->get( 'filter' ) ) {
                          switch ( $params->get( 'filter_type' ) ) {
                                  case 'title':
-                                         $and = "\n AND LOWER( a.title ) LIKE '%". $filter ."%'";
+                                         $_and = "\n AND LOWER( a.title ) LIKE '%". $filter ."%'";
                                          break;
                                  case 'author':
-                                         $and = "\n AND ( ( LOWER( u.name ) LIKE '%". $filter ."%' ) OR ( LOWER( a.created_by_alias ) LIKE '%". $filter ."%' ) )";
+                                         $_and = "\n AND ( ( LOWER( u.name ) LIKE '%". $filter ."%' ) OR ( LOWER( a.created_by_alias ) LIKE '%". $filter ."%' ) )";
                                          break;
                                  case 'hits':
-                                         $and = "\n AND a.hits LIKE '%". $filter ."%'";
+                                         $_and = "\n AND a.hits LIKE '%". $filter ."%'";
                                          break;
                          }
                  }
-Line 401
+Line 412
          . "\n WHERE a.catid='". $category->id ."' ". $xwhere
          . ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
          . "\n AND '". $category->access ."'<='". $gid ."'"
-         . $and
+         . $_and
          . "\n ORDER BY ". $orderby .""
          ;
          $database->setQuery( $query );
-Line 421
+Line 432
          . "\n WHERE a.catid='". $category->id ."' ". $xwhere
          . ( $noauth ? "\n AND a.access<='". $gid ."'" : '' )
          . "\n AND '". $category->access ."'<='". $gid ."'"
-         . $and
+         . $_and
          . "\n ORDER BY ". $orderby .""
          . "\n LIMIT ". $limitstart .", ". $limit
          ;
-Line 576
+Line 587
          $noauth = !$mainframe->getCfg( 'shownoauth' );
-         // Paramters
+         // Parameters
          $year   = mosGetParam( $_REQUEST, 'year', date( 'Y' ) );
          $month  = mosGetParam( $_REQUEST, 'month', date( 'm' ) );
-Line 652
+Line 663
          echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
          echo '<input type="hidden" name="task" value="archivesection" />';
          echo '<input type="hidden" name="option" value="com_content" />';
+         echo '<input type="hidden" name="module" value="1" />';
          echo '</form>';
  }
-Line 733
+Line 745
          echo '<input type="hidden" name="Itemid" value="'. $Itemid .'" />';
          echo '<input type="hidden" name="task" value="archivecategory" />';
          echo '<input type="hidden" name="option" value="com_content" />';
+         echo '<input type="hidden" name="module" value="1" />';
          echo '</form>';
  }
-Line 982
+Line 995
                  ;
          }
+         // temporary workaround for special access - alwarren 20070207
+         global $acl;
+         $viewAccess = ($gid >= $acl->get_group_id( 'Registered', 'ARO' ) ? 1 : 0) + ($gid >= $acl->get_group_id( 'Author', 'ARO' ) ? 1 : 0);
+         // end special access workaraound
          $query = "SELECT a.*, ROUND(v.rating_sum/v.rating_count) AS rating, v.rating_count, u.name AS author, u.usertype, cc.name AS category, s.name AS section, g.name AS groups"
          . "\n FROM #__content AS a"
          . "\n LEFT JOIN #__categories AS cc ON cc.id = a.catid"
-Line 990
+Line 1007
          . "\n LEFT JOIN #__content_rating AS v ON a.id = v.content_id"
          . "\n LEFT JOIN #__groups AS g ON a.access = g.id"
          . "\n WHERE a.id='". $uid ."' ". $xwhere
-         . "\n AND a.access <= ". $gid
+         // temporary workaround for special access - alwarren 20070207
+         . "\n AND a.access <= ". $viewAccess
+ //      . "\n AND a.access <= ". $gid // original code
+         // end special access workaraound
          ;
          $database->setQuery( $query );
  //      $row = NULL;
          $row = new mosExtendedContent();
          if ( $database->loadObject( $row ) ) {
-                 $pathway = mosPathway::getInstance();
+                 $pathway =& mosPathway::getInstance();
                  $pathway->addItem($row->category, categoryURL($row->sectionid, $row->catid));
                  $pathway->addItem($row->title, '');
                  $params =& new mosParameters( $row->attribs );
-Line 1015
+Line 1035
                          . "\n WHERE a.catid = ". $row->catid.""
                          . "\n AND a.state = $row->state AND ordering < $row->ordering"
                          . ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+                         . "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+                         . "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
                          . "\n ORDER BY a.ordering DESC"
                          . "\n LIMIT 1"
                          ;
-Line 1026
+Line 1048
                          . "\n WHERE a.catid = ". $row->catid.""
                          . "\n AND a.state = $row->state AND ordering > $row->ordering"
                          . ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+                         . "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+                         . "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
                          . "\n ORDER BY a.ordering"
                          . "\n LIMIT 1"
                          ;
-Line 1105
+Line 1129
          if ( $params->get( 'section_link' ) ) {
                  $query =        "SELECT a.id"
                  . "\n FROM #__menu AS a"
-                 . "\n WHERE a.componentid = ". $row->sectionid.""
+                 . "\n WHERE a.componentid = '". $row->sectionid."'"
+                 . "\n AND a.type = 'content_section'"
+                 . "\n AND a.published = 1"
                  ;
                  $database->setQuery( $query );
                  $_Itemid = $database->loadResult();
+                 if (!intval($_Itemid))
+                 $_Itemid = intval($Itemid) ? intval($Itemid) : 1;
                  $link = sefRelToAbs( 'index.php?option=com_content&amp;task=section&amp;id='. $row->sectionid .'&amp;Itemid='.$_Itemid );
                  $row->section = '<a href="'. $link .'">'. $row->section .'</a>';
          }
-Line 1118
+Line 1146
                  $query =        "SELECT a.id"
                  . "\n FROM #__menu AS a"
                  . "\n WHERE a.componentid = ". $row->catid.""
+                 . "\n AND a.type = 'content_category'"
+                 . "\n AND a.published = 1"
                  ;
                  $database->setQuery( $query );
                  $_Itemid = $database->loadResult();
+                 if (!intval($_Itemid))
+                 $_Itemid = intval($Itemid) ? intval($Itemid) : 1;
+                 $link = sefRelToAbs( 'index.php?option=com_content&amp;task=section&amp;id='. $row->sectionid .'&amp;Itemid='.$_Itemid );
                  $link = sefRelToAbs( 'index.php?option=com_content&amp;task=category&amp;sectionid='. $row->sectionid .'&amp;id='. $row->catid .'&amp;Itemid='.$_Itemid );
                  $row->category = '<a href="'. $link .'">'. $row->category .'</a>';
          }
-Line 1237
+Line 1270
                  $row->frontpage         = 0;
          }
          // calls function to read image from directory
          $pathA          = $mosConfig_absolute_path .'/images/stories';
          $pathL          = $mosConfig_live_site .'/images/stories';
-Line 1265
+Line 1297
          . "\n ORDER BY ordering"
          ;
          $lists['ordering']              = mosAdminMenus::SpecificOrdering( $row, $uid, $query, 1 );
          // build list of categories
          $lists['catid']                 = mosAdminMenus::ComponentCategory( 'catid', $sectionid, intval( $row->catid ) );
          // build the select list for the image positions
-Line 1289
+Line 1320
                  echo "<script> alert('".$row->getError()."'); window.history.go(-1); </script>\n";
                  exit();
          }
+         // sanitize
+         $row->id = intval($row->id);
+         $row->catid = intval($row->catid);
+         $row->sectionid = intval($row->sectionid);
          $isNew = $row->id < 1;
          if ( $isNew ) {
                  // new record
-Line 1366
+Line 1401
          if ( $isNew ) {
                  // messaging for new items
                  require_once( $mosConfig_absolute_path .'/components/com_messages/messages.class.php' );
                  $database->setQuery( "SELECT id FROM #__users WHERE sendEmail = '1'" );
                  $users = $database->loadResultArray();
+                 if ($users) {
                  foreach ($users as $user_id) {
                          $msg = new mosMessage( $database );
                          $msg->send( $my->id, $user_id, T_("New Item"), sprintf( T_('A new content item has been submitted by [ %s ]  titled [ %s ]  from section [ %s ]  and category  [ %s ]'), $my->username, $row->title, $section, $category ) );
                  }
          }
+         }
          $Itemid         = mosGetParam( $_POST, 'Returnid', '0' );
          $msg    = $isNew ? T_('Thanks for your submission; it will be reviewed before being posted to the site.') : T_('Item saved successfully.');
          mosRedirect( 'index.php', $msg );
-Line 1390
+Line 1425
          $row = new mosContent( $database );
          $row->bind( $_POST );
+         // sanitize
+         $row->id = intval($row->id);
          if ( $access->canEdit || ( $access->canEditOwn && $row->created_by == $my->id ) ) {
                  $row->checkin();
-Line 1397
+Line 1434
          $Itemid = mosGetParam( $_POST, 'Returnid', '0' );
-         if ( $Itemid ) {
-                 mosRedirect( 'index.php?option=com_content&task=view&id='. $row->id .'&Itemid='. $Itemid );
-         } else {
                  mosRedirect( 'index.php' );
          }
- }
  /**
  * Shows the email form for a given content item.
-Line 1441
+Line 1474
          $subject_default = sprintf(T_('Item sent by %s'), $yourname);
          $subject = trim( mosGetParam( $_POST, 'subject', $subject_default ) );
+         session_start();
          $form_check = mosGetParam( $_POST, 'form_check', '' );
      if (empty($_SESSION['_form_check_']['com_content']) || $form_check != $_SESSION['_form_check_']['com_content']) {
        // the form hasn't been generated by the server on this session
-Line 1458
+Line 1492
          // link sent in email
          $link = sefRelToAbs( $mosConfig_live_site .'/index.php?option=com_content&task=view&id='. $uid .'&Itemid='. $_Itemid );
          // message text
-         $msg = sprintf( T_(' The following page from the "%s" website has been sent to you by %s ( %s ).
+         $msg = sprintf( T_(' The following page from the \"%s\" website has been sent to you by %s ( %s ).\n\nYou can access it at the following url:\n%s'), $mosConfig_sitename, $yourname, $youremail, $link );
- You can access it at the following url:
- %s'), $mosConfig_sitename, $yourname, $youremail, $link );
          // mail function
          mosMail( $mosConfig_mailfrom, $mosConfig_fromname, $email, $subject, $msg );

 Legend:



Removed from v.213
 


changed lines


 
Added in v.1042
 Legend:



Removed from v.213
 


changed lines


 
Added in v.1042
-Removed from v.213
+Added in v.1042

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/components/com_content/content.php