Mambo > Projects > Mambo CMS > SVN

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

-revision 234, Sun Feb  5 16:08:28 2006 UTC
+revision 802, Fri Dec  1 14:24:11 2006 UTC
 Line 1
  <?php
  /**
- * @version $Id: content.php,v 1.7 2005/11/24 04:28:51 csouza Exp $
+ * @package Mambo Open Source
- * @package Mambo
  * @subpackage Content
- * @copyright (C) 2000 - 2005 Miro International Pty Ltd
+ * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+ *
+ * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+ * that Mambo remained free Open Source software owned and managed by the community.
  * Mambo is Free Software
  */
-Line 156
+Line 158
          $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 205
+Line 207
          $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 308
          $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 327
                  $sectionid = $category->section;
          }
-         $pathway = mosPathway::getInstance();
+         $pathway =& mosPathway::getInstance();
          $pathway->addItem($category->title, categoryURL($sectionid, $id));
          if ( $access->canEdit ) {
-Line 365
+Line 371
          // get the total number of published items in the category
          // filter functionality
-         $and = '';
+         $_and = '';
          if ($filter = mosGetParam($_POST, 'filter', '')) {
                  $filter = strtolower( $filter );
                  $filter = $database->getEscaped($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 407
          . "\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 427
          . "\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 652
+Line 658
          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 740
          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 997
+Line 1005
          $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 1105
+Line 1113
          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 1130
                  $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 1254
                  $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 1281
          . "\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 1304
                  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 1385
          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 1397
+Line 1416
          $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 1456
          $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

 Legend:



Removed from v.234
 


changed lines


 
Added in v.802
 Legend:



Removed from v.234
 


changed lines


 
Added in v.802
-Removed from v.234
+Added in v.802

	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