Mambo > Projects > Mambo CMS > SVN

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

-revision 1000, Sat Mar  3 17:59:39 2007 UTC
+revision 1717, Tue May 20 19:34:52 2008 UTC
 Line 2
  /**
  * @package Mambo
  * @subpackage Content
- * @copyright  Refer to copyright.php
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @author Mambo Foundation Inc see README.php
+ * @copyright Mambo Foundation Inc.
+ * See COPYRIGHT.php for copyright notices and details.
+ * @license GNU/GPL Version 2, see LICENSE.php
+ * Mambo is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License.
  */
  /** ensure this file is being included by a parent file */
-Line 34
+Line 38
  // loads function for frontpage component
  if ( $option == 'com_frontpage' ) {
          //frontpage( $option, $gid, $pop, $now );
-         $cache->call( 'frontpage', $gid, $access, $pop, $now );
+         $cache->call( 'frontpage', $gid, $access, $pop, $limit, $limitstart);
          return;
  }
-Line 48
+Line 52
                  break;
          case 'section':
-                 $cache->call( 'showSection', $id, $gid, $access, $now );
+                 $cache->call( 'showSection', $id, $gid, $access );
                  break;
          case 'category':
-                 $cache->call( 'showCategory', $id, $gid, $access, $sectionid, $limit, $limitstart, $now );
+                 $cache->call( 'showCategory', $id, $gid, $access, $sectionid, $limit, $limitstart );
                  break;
          case 'blogsection':
-                 $cache->call('showBlogSection', $id, $gid, $access, $pop, $now );
+                 $cache->call('showBlogSection', $id, $gid, $access, $pop, $limit, $limitstart );
                  break;
          case 'blogcategorymulti':
          case 'blogcategory':
-                 $cache->call( 'showBlogCategory', $id, $gid, $access, $pop, $now );
+                 $cache->call( 'showBlogCategory', $id, $gid, $access, $pop, $limit, $limitstart );
                  break;
          case 'archivesection':
-Line 98
+Line 102
                  break;
          case 'vote':
-                 recordVote ( $url , $user_rating , $cid , $database);
+                 recordVote (  $user_rating , $cid , $database);
                  break;
          default:
-                 $cache->call('showBlogSection', 0, $gid, $access, $pop, $now );
+                 $cache->call('showBlogSection', 0, $gid, $access, $pop, $limit, $limitstart );
                  break;
  }
-Line 132
+Line 136
          }
  }
- function frontpage( $gid, &$access, $pop, $now ) {
+ function frontpage( $gid, &$access, $pop, $limit, $limitstart) {
          global $database, $mainframe, $my, $Itemid;
          global $mosConfig_offset;
-Line 144
+Line 148
          $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"
-Line 168
+Line 171
          . ( $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 );
- //      $rows = $database->loadObjectList();
          $rows = $database->doSQLget($query, 'mosExtendedContent');
          // Dynamic Page Title
-         $mainframe->SetPageTitle( $menu->name );
+         $mainframe->SetPageTitle( $header );
-         BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+         BlogOutput( $rows, $params, $gid, $access, $pop, $menu, null, $limit, $limitstart );
  }
- function showSection( $id, $gid, &$access, $now ) {
+ function showSection( $id, $gid, &$access ) {
          global $database, $mainframe, $mosConfig_offset, $Itemid;
          $noauth = !$mainframe->getCfg( 'shownoauth' );
+     $now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
          // Paramters
          $params = new stdClass();
          if ( $Itemid ) {
-Line 197
+Line 196
                  $params =& new mosParameters( $menu->params );
          } else {
                  $menu = "";
-                 $params =& new mosEmpty();
+                 $params =& new mosParameters( $menu->params );
          }
          $orderby = $params->get( 'orderby', '' );
-Line 273
+Line 272
  * @param int The number of items to dislpay
  * @param int The offset for pagination
  */
- function showCategory( $id, $gid, &$access, $sectionid, $limit, $limitstart, $now  ) {
+ function showCategory( $id, $gid, &$access, $sectionid, $limit, $limitstart ) {
          global $database, $mainframe, $Itemid, $mosConfig_offset, $mosConfig_list_limit;
          $noauth = !$mainframe->getCfg( 'shownoauth' );
          $selected = mosGetParam( $_POST, 'order', '' );
+     $now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
          // Paramters
          $params = new stdClass();
          if ( $Itemid ) {
-Line 476
+Line 475
  } // showCategory
- function showBlogSection( $id=0, $gid, &$access, $pop, $now=NULL ) {
+ function showBlogSection( $id=0, $gid, &$access, $pop, $limit, $limitstart  ) {
-         global $database, $mainframe, $mosConfig_offset, $Itemid;
+         global $database, $mainframe, $mosConfig_offset, $Itemid, $option, $task;
          $noauth = !$mainframe->getCfg( 'shownoauth' );
+     $now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
          // Parameters
-         $params = new stdClass();
+         $pageTitle = '';
          if ( $Itemid ) {
                  $menu = new mosMenu( $database );
                  $menu->load( $Itemid );
-                 $params =& new mosParameters( $menu->params );
+                 if ( strpos(strtolower($menu->link), 'blogsection') === false ) {
+                         $menu = '';
          } else {
-                 $menu = "";
+                         // only load params and set title if the menu item loaded is a blog section
-                 $params =& new mosParameters( '' );
+                         $pageTitle = $menu->name;
+                 $params =& new mosParameters( $menu->params );
          }
+         }
+         // no Itemid OR menu item loaded is not a blog section
+         // try to find a blog entry in the menu database
+         if (!$menu) {
+                 $database->setQuery("SELECT * FROM #__menu WHERE link LIKE '%blogsection%'");
+                 $rows = $database->loadObjectList();
+                 if (count($rows)) {
+                         $params =& new mosParameters( $rows[0]->params );
+                 }
+         }
+         // no menu item found and no params loaded so create a default params object
+         if (!$params) $params =& new mosParameters( $menu->params );
          // new blog multiple section handling
          if ( !$id ) {
-Line 506
+Line 521
          $order_pri      = _orderby_pri( $orderby_pri );
          // Main data query
-         $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, g.name AS groups"
+         $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, g.name AS groups, s.title AS section"
          . "\n FROM #__content AS a"
          . "\n INNER JOIN #__categories AS cc ON cc.id = a.catid"
          . "\n LEFT JOIN #__users AS u ON u.id = a.created_by"
-Line 522
+Line 537
          $rows = $database->doSQLget($query, 'mosExtendedContent');
          // Dynamic Page Title
-         if ($menu) {
+         // do we have multiple sections?
-                 $mainframe->setPageTitle( $menu->name );
+         $multiple_sections = false;
+         if (count($rows)) {
+                 $temp = array();
+                 foreach($rows as $row) {
+                         $temp[$row->section] = '';
+                 }
+                 if (count($temp) > 1) {
+                         $multiple_sections = true;
+                 }
+                 unset($temp);
+         }
+         if (!$pageTitle) {
+                 // set the page title
+                 if ($rows[0]->section && !$multiple_sections){
+                         $pageTitle = $rows[0]->section;
+                 } else {
+                         $pageTitle = T_('Blog');
+                 }
+                 // fudge the pathway
+                 $mainframe->appendPathway($pageTitle);
+         }
+         $mainframe->setPageTitle( $pageTitle );
+         // restore borrowed $row->section to null - IMPORTANT
+         if (count($rows)) {
+                 for($i=0; $i<count($rows); $i++) $rows[$i]->section = '';
          }
-         BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+         BlogOutput( $rows, $params, $gid, $access, $pop, $menu, null, $limit, $limitstart  );
  }
- function showBlogCategory( $id=0, $gid, &$access, $pop, $now ) {
+ function showBlogCategory( $id=0, $gid, &$access, $pop, $limit, $limitstart ) {
          global $database, $mainframe, $mosConfig_offset, $Itemid;
          $noauth = !$mainframe->getCfg( 'shownoauth' );
+     $now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
          // Paramters
          $params = new stdClass();
          if ( $Itemid ) {
-Line 577
+Line 617
          // Dynamic Page Title
          $mainframe->SetPageTitle( $menu->name );
-         BlogOutput( $rows, $params, $gid, $access, $pop, $menu );
+         BlogOutput( $rows, $params, $gid, $access, $pop, $menu, null, $limit, $limitstart );
  }
  function showArchiveSection( $id=NULL, $gid, &$access, $pop, $option ) {
-Line 749
+Line 789
  }
- function BlogOutput ( &$rows, &$params, $gid, &$access, $pop, &$menu, $archive=NULL ) {
+ function BlogOutput ( &$rows, &$params, $gid, &$access, $pop, &$menu, $archive=NULL, $limit = 0, $limitstart = 0  ) {
          global $mainframe, $Itemid, $task, $id, $option, $database, $mosConfig_live_site;
          // parameters
-Line 780
+Line 820
          $total = count( $rows );
          // pagination support
+         if (!$limitstart){
          $limitstart = intval( mosGetParam( $_REQUEST, 'limitstart', 0 ) );
+     }
          $limit = $intro + $leading + $links;
          if ( $total <= $limit ) {
                  $limitstart = 0;
-Line 994
+Line 1036
                  ;
          }
-         // 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 1006
+Line 1046
          . "\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
-         // 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 ) ) {
-Line 1075
+Line 1111
  function show( $row, $params, $gid, &$access, $pop, $option, $ItemidCount=NULL ) {
          global $database, $mainframe, $Itemid;
          global $mosConfig_live_site, $mosConfig_absolute_path;
-         global $options, $cache;
+         global $options, $task;
+         $cache = mosCache::getCache('com_content','Output');
          $noauth = !$mainframe->getCfg( 'shownoauth' );
-Line 1181
+Line 1219
                  $obj = new mosContent( $database );
                  $obj->hit( $row->id );
          }
+     if(!($cache->start($task.$row->id.$page,'com_content'))){
-         $cache->call( 'HTML_content::show', $row, $params, $access, $page, $option, $ItemidCount );
+         HTML_content::show( $row, $params, $access, $page, $option, $ItemidCount );
+         $cache->end();
+     }
  }
-Line 1300
+Line 1340
          $lists['catid']                 = mosAdminMenus::ComponentCategory( 'catid', $sectionid, intval( $row->catid ) );
          // build the select list for the image positions
          $lists['_align']                = mosAdminMenus::Positions( '_align' );
+     // build the select list for the image caption alignment
+     $lists['_caption_align']     = mosAdminMenus::Positions( '_caption_align' );
          // build the html select list for the group access
          $lists['access']                = mosAdminMenus::Access( $row );
+         // build the select list for the image caption position
+         $pos[] = mosHTML::makeOption( 'bottom', _CMN_BOTTOM );
+         $pos[] = mosHTML::makeOption( 'top', _CMN_TOP );
+         $lists['_caption_position'] = mosHTML::selectList( $pos, '_caption_position', 'class="inputbox" size="1"', 'value', 'text' );
          HTML_content::editContent( $row, $section, $lists, $images, $access, $my->id, $sectionid, $task, $Itemid );
  }
-Line 1473
+Line 1520
          $subject_default = sprintf(T_('Item sent by %s'), $yourname);
          $subject = trim( mosGetParam( $_POST, 'subject', $subject_default ) );
-         session_start();
+         mos_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 1509
+Line 1556
  }
  function recordVote() {
-         global $database;
+     global $database, $mosConfig_live_site, $mosConfig_offset, $acl, $gid;
          $user_rating = mosGetParam( $_REQUEST, 'user_rating', 0 );
-         $url = mosGetParam( $_REQUEST, 'url', '' );
          $cid = mosGetParam( $_REQUEST, 'cid', 0 );
          $cid = intval( $cid );
+     $Itemid = mosGetParam( $_REQUEST, 'Itemid', 0 );
+     $Itemid = intval( $Itemid );
          $user_rating = intval( $user_rating );
+     $now = date( 'Y-m-d H:i:s', time() + $mosConfig_offset * 60 * 60 );
+     $viewAccess = ($gid >= $acl->get_group_id( 'Registered', 'ARO' ) ? 1 : 0) + ($gid >= $acl->get_group_id( 'Author', 'ARO' ) ? 1 : 0);
+     $url = sefReltoAbs("index.php?option=com_content&task=view&id={$cid}&Itemid={$Itemid}");
          if ( ( $user_rating >= 1 ) and ( $user_rating <= 5 ) ) {
                  $currip = getenv( 'REMOTE_ADDR' );
+         $query = "SELECT * FROM #__content as c WHERE id = $cid AND (c.state = '1' OR c.state = '-1')"
+         . "\n   AND (c.publish_up = '0000-00-00 00:00:00' OR c.publish_up <= '$now')"
+         . "\n   AND (c.publish_down = '0000-00-00 00:00:00' OR c.publish_down >= '$now')"
+         . "\n AND access <= ". $viewAccess;
+         ;
+         $database->setQuery( $query );
+         $database->loadObject( $row );
+         if ( $row != NULL){
                  $query = "SELECT * FROM #__content_rating WHERE content_id = $cid";
                  $database->setQuery( $query );
                  $votesdb = NULL;
-Line 1543
+Line 1602
                          }
                  }
                  mosRedirect ( $url, T_('Thanks for your vote!') );
+         } else {
+             mosRedirect ( $url, T_('The rating for this item is not allowed!') );
+         }
          }
  }
-Line 1657
+Line 1719
  }
  function sectionURL ($sectionid) {
-         global $Itemid;
+     $menuHandler = mosMenuHandler::getInstance();
+         $Itemid = $menuHandler->getSectionItemId($sectionid);
          return "index.php?option=com_content&task=section&id=$sectionid&Itemid=$Itemid";
  }
  function categoryURL ($sectionid, $catid) {
-         global $Itemid;
+     $menuHandler = mosMenuHandler::getInstance();
+         $Itemid = $menuHandler->getCategoryItemId($catid);
          return "index.php?option=com_content&task=category&sectionid=$sectionid&id=$catid&Itemid=$Itemid";
  }

 Legend:



Removed from v.1000
 


changed lines


 
Added in v.1717
 Legend:



Removed from v.1000
 


changed lines


 
Added in v.1717
-Removed from v.1000
+Added in v.1717

	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