Mambo > Projects > Mambo CMS > SVN

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

-revision 3, Tue Dec 13 03:49:45 2005 UTC
+revision 194, Thu Jan 26 20:11:56 2006 UTC
 Line 12
  defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
  require_once( $mainframe->getPath( 'front_html', 'com_content' ) );
+ require_once($mainframe->getPath('class'));
  $id                     = intval( mosGetParam( $_REQUEST, 'id', 0 ) );
  $sectionid      = intval( mosGetParam( $_REQUEST, 'sectionid', 0 ) );
-Line 319
+Line 320
                  $sectionid = $category->section;
          }
+         $pathway = mosPathway::getInstance();
+         $pathway->addItem($category->title, categoryURL($sectionid, $id));
          if ( $access->canEdit ) {
                  $xwhere = '';
                  $xwhere2 = "\n AND b.state >= '0'";
-Line 425
+Line 429
          $check = 0;
          if ( $params->get( 'date' ) ) {
-                 $order[] = mosHTML::makeOption( 'date', _ORDER_DROPDOWN_DA );
+                 $order[] = mosHTML::makeOption( 'date', T_('Date Asc') );
-                 $order[] = mosHTML::makeOption( 'rdate', _ORDER_DROPDOWN_DD );
+                 $order[] = mosHTML::makeOption( 'rdate', T_('Date Desc'));
                  $check .= 1;
          }
          if ( $params->get( 'title' ) ) {
-                 $order[] = mosHTML::makeOption( 'alpha', _ORDER_DROPDOWN_TA );
+                 $order[] = mosHTML::makeOption( 'alpha', T_('Title Asc') );
-                 $order[] = mosHTML::makeOption( 'ralpha', _ORDER_DROPDOWN_TD );
+                 $order[] = mosHTML::makeOption( 'ralpha', T_('Title Desc') );
                  $check .= 1;
          }
          if ( $params->get( 'hits' ) ) {
-                 $order[] = mosHTML::makeOption( 'hits', _ORDER_DROPDOWN_HA );
+                 $order[] = mosHTML::makeOption( 'hits', T_('Hits Asc') );
-                 $order[] = mosHTML::makeOption( 'rhits', _ORDER_DROPDOWN_HD );
+                 $order[] = mosHTML::makeOption( 'rhits', T_('Hits Desc') );
                  $check .= 1;
          }
          if ( $params->get( 'author' ) ) {
-                 $order[] = mosHTML::makeOption( 'author', _ORDER_DROPDOWN_AUA );
+                 $order[] = mosHTML::makeOption( 'author', T_('Author Asc') );
-                 $order[] = mosHTML::makeOption( 'rauthor', _ORDER_DROPDOWN_AUD );
+                 $order[] = mosHTML::makeOption( 'rauthor', T_('Author Desc') );
                  $check .= 1;
          }
-         $order[] = mosHTML::makeOption( 'order', _ORDER_DROPDOWN_O );
+         $order[] = mosHTML::makeOption( 'order', T_('Ordering') );
          $lists['order'] = mosHTML::selectList( $order, 'order', 'class="inputbox" size="1"  onchange="document.adminForm.submit();"', 'value', 'text', $selected );
          if ( $check < 1 ) {
                  $lists['order'] = '';
-Line 635
+Line 639
          if ( !$archives ) {
                  // if no archives for category, hides search and outputs empty message
-                 echo '<br /><div align="center">'. _CATEGORY_ARCHIVE_EMPTY .'</div>';
+                 echo '<br /><div align="center">'. T_('There are currently no Archived Entries for this Category') .'</div>';
          } else {
                  BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
          }
-Line 715
+Line 719
          if ( !$archives ) {
                  // if no archives for category, hides search and outputs empty message
-                 echo '<br /><div align="center">'. _CATEGORY_ARCHIVE_EMPTY .'</div>';
+                 echo '<br /><div align="center">'. T_('There are currently no Archived Entries for this Category') .'</div>';
          } else {
                  BlogOutput( $rows, $params, $gid, $access, $pop, $menu, 1 );
          }
-Line 767
+Line 771
          $i = $limitstart;
          // needed to reduce queries used by getItemid
-         $ItemidCount['bs']              = $mainframe->getBlogSectionCount();
+         require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
-         $ItemidCount['bc']              = $mainframe->getBlogCategoryCount();
+         $handler =& new contentHandler();
-         $ItemidCount['gbs']     = $mainframe->getGlobalBlogSectionCount();
+         $ItemidCount['bs']              = $handler->getBlogSectionCount();
+         $ItemidCount['bc']              = $handler->getBlogCategoryCount();
+         $ItemidCount['gbs']     = $handler->getGlobalBlogSectionCount();
          // used to display section/catagory description text and images
          // currently not supported in Archives
-Line 811
+Line 817
                  if ( $archive ) {
                          // Search Success message
-                         $msg = sprintf( _ARCHIVE_SEARCH_SUCCESS, $params->get( 'month' ), $params->get( 'year' ) );
+                         $msg = sprintf( T_('Here are the Archived entries for %s %s'), $params->get( 'month' ), $params->get( 'year' ) );
                          echo "<br /><br /><div align='center'>". $msg ."</div><br /><br />";
                  }
                  echo '<table class="blog' . $params->get( 'pageclass_sfx' ) . '" cellpadding="0" cellspacing="0">';
-Line 945
+Line 951
          } else if ( $archive && !$total ) {
                  // Search Failure message for Archives
-                 $msg = sprintf( _ARCHIVE_SEARCH_FAILURE, $params->get( 'month' ), $params->get( 'year' ) );
+                 $msg = sprintf( T_('There are no Archived entries for %s %s'), $params->get( 'month' ), $params->get( 'year' ) );
                  echo '<br /><br /><div align="center">'. $msg .'</div><br />';
          } else {
                  // Generic blog empty display
-                 echo _EMPTY_BLOG;
+                 echo T_('There are no items to display');
          }
          // Back Button
-Line 985
+Line 991
          $row = NULL;
          if ( $database->loadObject( $row ) ) {
+                 $pathway = mosPathway::getInstance();
+                 $pathway->addItem($row->category, categoryURL($row->sectionid, $row->catid));
+                 $pathway->addItem($row->title, '');
                  $params =& new mosParameters( $row->attribs );
                  $params->set( 'intro_only', 0 );
                  $params->def( 'back_button', $mainframe->getCfg( 'back_button' ) );
-Line 1149
+Line 1158
          // fail if checked out not by 'me'
          if ( $row->checked_out && $row->checked_out <> $my->id ) {
-                 echo"<script>alert('The module [ ".$row->title." ] is currently being edited by another person.'); window.history.go(-1); </script>";
+                 echo"<script>alert('".sprintf(T_('The module [ %s ] is currently being edited by another person.'), $row->title)."'); window.history.go(-1); </script>";
                  exit;
          }
-Line 1229
+Line 1238
          $images         = array();
          $folders        = array();
          $folders[]      = mosHTML::makeOption( '/' );
+         require_once($mosConfig_absolute_path.'/administrator/includes/mosAdminMenus.php');
          mosAdminMenus::ReadImages( $pathA, '/', $folders, $images );
          // list of folders in images/stories/
          $lists['folders']               = mosAdminMenus::GetImageFolders( $folders, $pathL );
-Line 1238
+Line 1248
          $lists['imagelist']     = mosAdminMenus::GetSavedImages( $row, $pathL );
          // make the select list for the states
-         $states[] = mosHTML::makeOption( 0, _CMN_UNPUBLISHED );
+         $states[] = mosHTML::makeOption( 0, T_('Unpublished') );
-         $states[] = mosHTML::makeOption( 1, _CMN_PUBLISHED );
+         $states[] = mosHTML::makeOption( 1, T_('Published') );
          $lists['state']                 = mosHTML::selectList( $states, 'state', 'class="inputbox" size="1"', 'value', 'text', intval( $row->state ) );
          // build the html select list for ordering
-Line 1355
+Line 1365
                  $users = $database->loadResultArray();
                  foreach ($users as $user_id) {
                          $msg = new mosMessage( $database );
-                         $msg->send( $my->id, $user_id, "New Item", sprintf( _ON_NEW_CONTENT, $my->username, $row->title, $section, $category ) );
+                         $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 ? _THANK_SUB : _E_ITEM_SAVED;
+         $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 1393
+Line 1403
  */
  function emailContentForm( $uid ) {
          global $database, $mainframe, $my;
          $row = new mosContent( $database );
          $row->load( $uid );
-Line 1423
+Line 1432
          $email = trim( mosGetParam( $_POST, 'email', '' ) );
          $yourname = trim( mosGetParam( $_POST, 'yourname', '' ) );
          $youremail = trim( mosGetParam( $_POST, 'youremail', '' ) );
-         $subject_default = _EMAIL_INFO ." $yourname";
+         $subject_default = sprintf(T_('Item sent by %s'), $yourname);
          $subject = trim( mosGetParam( $_POST, 'subject', $subject_default ) );
          $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
         exit;
      }
          if ( !$email || !$youremail || ( is_email( $email ) == false ) || ( is_email( $youremail ) == false ) ) {
-                 echo "<script>alert (\""._EMAIL_ERR_NOINFO."\"); window.history.go(-1);</script>";
+                 echo "<script>alert (\"".T_('You must enter valid e-mail addresses for both yourself and your recipient.')."\"); window.history.go(-1);</script>";
                  exit(0);
          }
-Line 1444
+Line 1451
          // link sent in email
          $link = sefRelToAbs( $mosConfig_live_site .'/index.php?option=com_content&task=view&id='. $uid .'&Itemid='. $_Itemid );
          // message text
-         $msg = sprintf( _EMAIL_MSG, $mosConfig_sitename, $yourname, $youremail, $link );
+         $msg = sprintf( T_(' The following page from the "%s" website has been sent to you by %s ( %s ).
+ You can access it at the following url:
+ %s'), $mosConfig_sitename, $yourname, $youremail, $link );
          // mail function
          mosMail( $mosConfig_mailfrom, $mosConfig_fromname, $email, $subject, $msg );
-Line 1494
+Line 1503
                                  $database->setQuery( $query );
                                  $database->query() or die( $database->stderr() );
                          } else {
-                                 mosRedirect ( $url, _ALREADY_VOTE );
+                                 mosRedirect ( $url, T_('You already voted for this poll today!') );
                          }
                  }
-                 mosRedirect ( $url, _THANKS );
+                 mosRedirect ( $url, T_('Thanks for your vote!') );
          }
  }
-Line 1610
+Line 1619
          return $where;
  }
+ function sectionURL ($sectionid) {
+         global $Itemid;
+         return "index.php?option=com_content&task=section&id=$sectionid&Itemid=$Itemid";
+ }
+ function categoryURL ($sectionid, $catid) {
+         global $Itemid;
+         return "index.php?option=com_content&task=category&sectionid=$sectionid&id=$catid&Itemid=$Itemid";
+ }
  ?>

 Legend:



Removed from v.3
 


changed lines


 
Added in v.194
 Legend:



Removed from v.3
 


changed lines


 
Added in v.194
-Removed from v.3
+Added in v.194

	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