Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.5.3h/administrator/components/com_content/admin.content.php

-revision 92, Sat Dec 31 19:14:38 2005 UTC
+revision 93, Sat Dec 31 19:32:07 2005 UTC
 Line 1
  <?php
  /**
- * @version $Id: admin.content.php,v 1.3 2005/11/23 23:47:03 counterpoint Exp $
+ * @version $Id: admin.content.php,v 1.24 2005/02/15 14:09:21 kochp Exp $
  * @package Mambo
  * @subpackage Content
  * @copyright (C) 2000 - 2005 Miro International Pty Ltd
 Line 14
  require_once( $mainframe->getPath( 'admin_html' ) );
  $sectionid = mosGetParam( $_REQUEST, 'sectionid', 0 );
- $id = mosGetParam( $_REQUEST, 'id', 0 );
+ $id = mosGetParam( $_REQUEST, 'id', '' );
  $cid = mosGetParam( $_POST, 'cid', array(0) );
  if (!is_array( $cid )) {
          $cid = array(0);
 Line 165
                  "c.catid=cc.id",
                  "cc.section=s.id",
                  "s.scope='content'",
-                 "c.sectionid=$sectionid"
+                 "c.sectionid='$sectionid'"
                  );
                  $order = "\n ORDER BY cc.ordering, cc.title, c.ordering";
                  $all = NULL;
 Line 176
          // used by filter
          if ( $filter_sectionid > 0 ) {
-                 $where[] = "c.sectionid = $filter_sectionid";
+                 $where[] = "c.sectionid = '$filter_sectionid'";
          }
          if ( $catid > 0 ) {
-                 $where[] = "c.catid = $catid";
+                 $where[] = "c.catid = '$catid'";
          }
          if ( $filter_authorid > 0 ) {
-                 $where[] = "c.created_by = $filter_authorid";
+                 $where[] = "c.created_by = '$filter_authorid'";
          }
          if ( $search ) {
 Line 198
          $pageNav = new mosPageNav( $total, $limitstart, $limit );
          $query = "SELECT c.*, g.name AS groupname, cc.name, u.name AS editor, f.content_id AS frontpage, s.title AS section_name, v.name AS author"
-         . "\n FROM #__categories AS cc, #__sections AS s, #__content AS c"
+         . "\n FROM #__content AS c, #__categories AS cc, #__sections AS s"
          . "\n LEFT JOIN #__groups AS g ON g.id = c.access"
          . "\n LEFT JOIN #__users AS u ON u.id = c.checked_out"
          . "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
 Line 233
          . "\n FROM #__content AS c"
          . "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
          . "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
-         . "\n WHERE c.state <> -1"
+         . "\n WHERE c.state <> '-1'"
-         . "\n AND c.state <> -2"
+         . "\n AND c.state <> '-2'"
          . "\n GROUP BY u.name"
          . "\n ORDER BY u.name"
          ;
 Line 277
                  "c.catid=cc.id",
                  "cc.section=s.id",
                  "s.scope='content'",
-                 "c.sectionid=$sectionid"
+                 "c.sectionid='$sectionid'"
                  );
                  $filter = "\n WHERE section = '$sectionid'";
                  $all = NULL;
 Line 285
          // used by filter
          if ( $filter_sectionid > 0 ) {
-                 $where[] = "c.sectionid = $filter_sectionid";
+                 $where[] = "c.sectionid = '$filter_sectionid'";
          }
          if ( $filter_authorid > 0 ) {
-                 $where[] = "c.created_by = $filter_authorid";
+                 $where[] = "c.created_by = '$filter_authorid'";
          }
          if ($catid > 0) {
-                 $where[] = "c.catid=$catid";
+                 $where[] = "c.catid='$catid'";
          }
          if ($search) {
                  $where[] = "LOWER(c.title) LIKE '%$search%'";
 Line 309
          $pageNav = new mosPageNav( $total, $limitstart, $limit  );
          $query = "SELECT c.*, g.name AS groupname, cc.name, v.name AS author"
-         . "\n FROM #__categories AS cc, #__sections AS s, #__content AS c"
+         . "\n FROM #__content AS c, #__categories AS cc, #__sections AS s"
          . "\n LEFT JOIN #__groups AS g ON g.id = c.access"
          . "\n LEFT JOIN #__users AS v ON v.id = c.created_by"
          . ( count( $where ) ? "\nWHERE " . implode( ' AND ', $where ) : '' )
 Line 343
          . "\n FROM #__content AS c"
          . "\n INNER JOIN #__sections AS s ON s.id = c.sectionid"
          . "\n LEFT JOIN #__users AS u ON u.id = c.created_by"
-         . "\n WHERE c.state = -1"
+         . "\n WHERE c.state = '-1'"
          . "\n GROUP BY u.name"
          . "\n ORDER BY u.name"
          ;
 Line 379
                  if ($row->state < 0) {
                          mosRedirect( 'index2.php?option=com_content&sectionid='. $row->sectionid, 'You cannot edit an archived item' );
                  }
-                 // fail if checked out not by 'me'
-                 if ($row->checked_out AND $row->checked_out <> $my->id) {
-                         mosRedirect( 'index2.php?option=com_content', 'The module '. $row->title .' is currently being edited by another administrator' );
                  }
+         if ( $sectionid == 0 ) {
+                 $where = "\n WHERE section NOT LIKE '%com_%'";
+         } else {
+                 $where = "\n WHERE section='$sectionid'";
          }
-         if ( $sectionid == 0 ) $where = "\n WHERE section NOT LIKE '%com_%'";
-         else $where = "\n WHERE section='$sectionid'";
          // get the type name - which is a special category
-         if ($row->sectionid) $query = "SELECT name FROM #__sections WHERE id=$row->sectionid";
+          if ($row->sectionid){
-         else $query = "SELECT name FROM #__sections WHERE id=$sectionid";
+                 $query = "SELECT name FROM #__sections WHERE id=$row->sectionid";
          $database->setQuery( $query );
-         $contentSection = $database->loadResult();
+                 $section = $database->loadResult();
+                 $contentSection = $section;
+         } else {
+                 $query = "SELECT name FROM #__sections WHERE id=$sectionid";
+                 $database->setQuery( $query );
+                 $section = $database->loadResult();
+                 $contentSection = $section;
+         }
+         // fail if checked out not by 'me'
+         if ($row->checked_out && $row->checked_out <> $my->id) {
+                 mosRedirect( 'index2.php?option=com_content', 'The module '. $row->title .' is currently being edited by another administrator' );
+         }
          if ($uid) {
                  $row->checkout( $my->id );
-Line 454
+Line 464
          . "\n FROM #__sections AS s"
          . "\n ORDER BY s.ordering";
          $database->setQuery( $query );
-         $sections = $database->loadObjectList();
          if ( $sectionid == 0 ) {
-                 array_unshift($sections, mosHTML::makeOption( '-1', 'Select Section' ));
+                 $sections[] = mosHTML::makeOption( '-1', 'Select Section' );
+                 $sections = array_merge( $sections, $database->loadObjectList() );
                  $lists['sectionid'] = mosHTML::selectList( $sections, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text' );
          } else {
-                 $lists['sectionid'] = mosHTML::selectList( $sections, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text', intval( $row->sectionid) );
+             $intval = intval( $row->sectionid);
+       $dbLoadObjectList = $database->loadObjectList();
+                         $lists['sectionid'] = mosHTML::selectList( $dbLoadObjectList, 'sectionid', 'class="inputbox" size="1" '. $javascript, 'value', 'text', $intval );
          }
+         $sections = $database->loadObjectList();
          $sectioncategories                      = array();
          $sectioncategories[-1]          = array();
          $sectioncategories[-1][]        = mosHTML::makeOption( '-1', 'Select Category' );
-Line 496
+Line 510
          // build the html select list for ordering
          $query = "SELECT ordering AS value, title AS text"
          . "\n FROM #__content"
-         . "\n WHERE catid=$row->catid"
+         . "\n WHERE catid='$row->catid'"
          . "\n AND state >= 0"
          . "\n ORDER BY ordering"
          ;
-Line 560
+Line 574
          $isNew = ( $row->id < 1 );
          if ($isNew) {
                  //$row->created         = $row->created ? $row->created : date( "Y-m-d H:i:s" );
-                 $row->created           = $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset) : date( 'Y-m-d H:i:s' );
+                 $row->created           = $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset * 60 * 60 ) : date( "Y-m-d H:i:s" );
                  $row->created_by        = $row->created_by ? $row->created_by : $my->id;
          } else {
-                 $row->modified          = date('Y-m-d H:i:s');
+                 $row->modified          = date( "Y-m-d H:i:s" );
                  $row->modified_by       = $my->id;
                  //$row->created         = $row->created ? $row->created : date( "Y-m-d H:i:s" );
-                 $row->created           = $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset ) : date( 'Y-m-d H:i:s' );
+                 $row->created           = $row->created ? mosFormatDate( $row->created, '%Y-%m-%d %H:%M:%S', -$mosConfig_offset ) : date( "Y-m-d H:i:s" );
                  $row->created_by        = $row->created_by ? $row->created_by : $my->id;
          }
-Line 620
+Line 634
                  // toggles go to first place
                  if (!$fp->load( $row->id )) {
                          // new entry
-                         $database->setQuery( "INSERT INTO #__content_frontpage VALUES ($row->id,1)" );
+                         $database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$row->id','1')" );
                          if (!$database->query()) {
                                  echo "<script> alert('".$database->stderr()."');</script>\n";
                                  exit();
-Line 637
+Line 651
          $fp->updateOrder();
          $row->checkin();
-         $row->updateOrder( "catid=$row->catid AND state >= 0" );
+         $row->updateOrder( "catid='$row->catid' AND state >= 0" );
          $redirect = mosGetParam( $_POST, 'redirect', $sectionid );
          switch ( $task ) {
-Line 690
+Line 704
          $total = count ( $cid );
          $cids = implode( ',', $cid );
-         $database->setQuery( "UPDATE #__content SET state=$state"
+         $database->setQuery( "UPDATE #__content SET state='$state'"
-         . "\nWHERE id IN ($cids) AND (checked_out=0 OR checked_out=$my->id)"
+         . "\nWHERE id IN ($cids) AND (checked_out=0 OR (checked_out='".$my->id."'))"
          );
          if (!$database->query()) {
                  echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-Line 731
+Line 745
  * @param string The name of the current user
  */
  function toggleFrontPage( $cid, $section, $option ) {
-         global $database, $mainframe;
+         global $database, $my, $mainframe;
          if (count( $cid ) < 1) {
                  echo "<script> alert('Select an item to toggle'); window.history.go(-1);</script>\n";
-Line 751
+Line 765
                          $fp->ordering = 0;
                  } else {
                          // new entry
-                         $database->setQuery( "INSERT INTO #__content_frontpage VALUES ($id,0)" );
+                         $database->setQuery( "INSERT INTO #__content_frontpage VALUES ('$id','0')" );
                          if (!$database->query()) {
                                  echo "<script> alert('".$database->stderr()."');</script>\n";
                                  exit();
-Line 765
+Line 779
  }
  function removeContent( &$cid, $sectionid, $option ) {
-         global $database;
+         global $database, $mainframe;
          $total = count( $cid );
          if ( $total < 1) {
-Line 777
+Line 791
          $ordering = '0';
          //seperate contentids
          $cids = implode( ',', $cid );
-         $query =        "UPDATE #__content SET state = $state, ordering = $ordering "
+         $query =        "UPDATE #__content SET state = '". $state ."', ordering = '". $ordering ."'"
          . "\n WHERE id IN ( ". $cids ." )"
          ;
          $database->setQuery( $query );
-Line 814
+Line 828
          $row = new mosContent( $database );
          $row->load( $uid );
-         $row->move( $inc, "catid=$row->catid AND state >= 0" );
+         $row->move( $inc, "catid='$row->catid' AND state >= 0" );
          $redirect = mosGetParam( $_POST, 'redirect', $row->sectionid );
-Line 837
+Line 851
          // Content Items query
          $query =        "SELECT a.title"
          . "\n FROM #__content AS a"
-         . "\n WHERE a.id IN ($cids) "
+         . "\n WHERE ( a.id IN (". $cids .") )"
          . "\n ORDER BY a.title"
          ;
          $database->setQuery( $query );
-Line 873
+Line 887
          // find section name
          $query = "SELECT a.name"
          . "\n FROM #__sections AS a"
-         . "\n WHERE a.id = $newsect"
+         . "\n WHERE a.id = ". $newsect .""
          ;
          $database->setQuery( $query );
          $section = $database->loadResult();
-Line 881
+Line 895
          // find category name
          $query = "SELECT  a.name"
          . "\n FROM #__categories AS a"
-         . "\n WHERE a.id = $newcat"
+         . "\n WHERE a.id = ". $newcat .""
          ;
          $database->setQuery( $query );
          $category = $database->loadResult();
-Line 895
+Line 909
                  $row->load( intval( $id ) );
                  $row->ordering = 0;
                  $row->store();
-                 $row->updateOrder( "catid=$row->catid AND state >= 0" );
+                 $row->updateOrder( "catid='$row->catid' AND state >= 0" );
          }
-         $query = "UPDATE #__content SET sectionid = $newsect, catid=$newcat"
+         $query = "UPDATE #__content SET sectionid = '". $newsect ."', catid='". $newcat ."'"
          . "\n WHERE id IN ($cids)"
-         . "\n AND (checked_out=0 OR checked_out=$my->id)"
+         . "\n AND ( checked_out='0' OR ( checked_out='". $my->id ."') )"
          ;
          $database->setQuery( $query );
          if ( !$database->query() ) {
-Line 913
+Line 927
                  $row->load( intval( $id ) );
                  $row->ordering = 0;
                  $row->store();
-                 $row->updateOrder( "catid=$row->catid AND state >= 0" );
+                 $row->updateOrder( "catid='". $row->catid ."' AND state >= 0" );
          }
          $msg = $total. ' Item(s) successfully moved to Section: '. $section .', Category: '. $category;
-Line 937
+Line 951
          ## Content Items query
          $query =        "SELECT a.title"
          . "\n FROM #__content AS a"
-         . "\n WHERE a.id IN ($cids) "
+         . "\n WHERE ( a.id IN (". $cids .") )"
          . "\n ORDER BY a.title"
          ;
          $database->setQuery( $query );
-Line 963
+Line 977
  * saves Copies of items
  **/
  function copyItemSave( $cid, $sectionid, $option ) {
-         global $database;
+         global $database, $my;
          $sectcat = mosGetParam( $_POST, 'sectcat', '' );
          //seperate sections and categories from selection
-Line 1020
+Line 1034
                  $row->modified_by               = $item[0]->modified_by;
                  $row->checked_out               = $item[0]->checked_out;
                  $row->checked_out_time  = $item[0]->checked_out_time;
+                 $row->frontpage_up              = $item[0]->frontpage_up;
+                 $row->frontpage_down    = $item[0]->frontpage_down;
                  $row->publish_up                = $item[0]->publish_up;
                  $row->publish_down              = $item[0]->publish_down;
                  $row->images                    = $item[0]->images;
-Line 1054
+Line 1070
          $row = new mosContent($database);
          $row->Load($id);
-         $row->hits = 0;
+         $row->hits = "0";
          $row->store();
          $row->checkin();
-Line 1122
+Line 1138
                  exit();
          }
          $row->checkin();
-         $row->updateOrder( "menutype='$row->menutype' AND parent=$row->parent" );
+         $row->updateOrder( "menutype='$row->menutype' AND parent='$row->parent'" );
          $msg = $link .' (Link - Static Content) in menu: '. $menu .' successfully created';
          mosRedirect( 'index2.php?option=com_content&sectionid='. $redirect .'&task=edit&hidemainmenu=1&id='. $id, $msg );
-Line 1161
+Line 1177
                      exit();
                  } // if
                  // remember to updateOrder this group
-                 $condition = "catid=$row->catid AND state>=0";
+                 $condition = "catid='$row->catid' AND state>=0";
                  $found = false;
                  foreach ( $conditions as $cond )
                      if ($cond[1]==$condition) {

 Legend:



Removed from v.92
 


changed lines


 
Added in v.93
 Legend:



Removed from v.92
 


changed lines


 
Added in v.93
-Removed from v.92
+Added in v.93

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.5.3h/administrator/components/com_content/admin.content.php