remove unnecessary modules and get mod_articles up to speed

12 files changed, 23 insertions, 168 deletions

diff --git a/modules/mod_articles.php b/modules/mod_articles.php
index 66dcdde..fc0ba0f 100644
--- a/modules/mod_articles.php
+++ b/modules/mod_articles.php
@@ -1,28 +1,21 @@
 <?php 
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/mod_articles.php,v 1.1 2005/06/30 01:10:46 bitweaver Exp $
-include_once( ARTICLES_PKG_PATH . 'art_lib.php' );
-global $artlib, $gQueryUsername, $module_rows, $module_params;
+// $Header: /cvsroot/bitweaver/_bit_articles/modules/mod_articles.php,v 1.2 2005/08/30 22:24:00 squareing Exp $
+include_once( ARTICLES_PKG_PATH . 'BitArticle.php' );
+global $module_rows, $module_params, $module_title;
 
-$smarty->assign( 'title', isset( $module_params["title"] ) ? $module_params["title"] : 'Articles' );
-
-if ( isset( $module_params["type"] ) ) {
-    $type = $module_params["type"];
-} else {
-    $type = '';
-} 
-if ( isset( $module_params["topic_id"] ) ) {
-    $topic_id = $module_params["topic_id"];
+$articles = new BitArticle();
+$stati = array( 'pending', 'approved' );
+if( !empty( $module_params['status'] ) && in_array( $module_params['status'], $stati ) ) {
+	$status_id = constant( 'ARTICLE_STATUS_'.strtoupper( $module_params['status'] ) );
 } else {
-    $topic_id = '';
-} 
-/*
-$smarty->assign('type', isset($module_params["type"]) ? $module_params["type"] : '');
-$smarty->assign('topic_id', isset($module_params["topic_id"]) ? $module_params["topic_id"] : '');
-
-function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publish_date_desc', $find = '', $date = '', $user, $type = '', $topic_id = '') {
-*/
+	$status_id = ARTICLE_STATUS_APPROVED;
+}
 
-$ranking = $artlib->list_articles( 0, $module_rows, 'publish_date_desc', '', '', $user, $type, $topic_id, $gQueryUsername );
-$smarty->assign( 'modArticles', $ranking["data"] );
+vd($status_id);
+$getHash['status_id']     = $status_id;
+$getHash['max_records']   = !empty( $module_rows ) ? $module_rows : $gBitSystem->mPrefs['max_articles'];
+$getHash['sort_mode']     = !empty( $module_params['sort_mode'] ) ? $module_params['sort_mode'] : 'last_modified_desc';
+$articles = $articles->getList( $getHash );
 
+$smarty->assign( 'modArticles', $articles['data'] );
 ?>
diff --git a/modules/mod_articles.tpl b/modules/mod_articles.tpl
index fcb15f3..0e68772 100644
--- a/modules/mod_articles.tpl
+++ b/modules/mod_articles.tpl
@@ -1,16 +1,10 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/mod_articles.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_articles eq 'y'}
+{* $Header: /cvsroot/bitweaver/_bit_articles/modules/mod_articles.tpl,v 1.2 2005/08/30 22:24:00 squareing Exp $ *}
+{strip}
 {bitmodule title="$moduleTitle" name="articles"}
-  <table class="mother">
-    {section name=ix loop=$modArticles}
-    <tr>
-      {if $nonums != 'y'}
-        <td width="1%">{$smarty.section.ix.index_next}</td>
-      {/if}
-      <td><a href="{$gBitLoc.ARTICLES_PKG_URL}read.php?article_id={$modArticles[ix].article_id}">{$modArticles[ix].title}</a></td>
-    </tr>
-    {/section}
-  </table>
+	<ol>
+		{foreach item=modArt from=$modArticles}
+			<li><a href="{$gBitLoc.ARTICLES_PKG_URL}read.php?article_id={$modArt.article_id}">{$modArt.title}</a></li>
+		{/foreach}
+	</ol>
 {/bitmodule}
-{/if}
+{/strip}
diff --git a/modules/mod_last_articles.php b/modules/mod_last_articles.php
deleted file mode 100644
index b773d26..0000000
--- a/modules/mod_last_articles.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_last_articles.php,v 1.2 2005/08/27 09:35:36 lsces Exp $
-include_once( ARTICLES_PKG_PATH.'art_lib.php' );
-global $artlib, $gQueryUsername, $module_rows, $module_params;
-
-$ranking = $artlib->list_articles(0,$module_rows,'publish_date_desc', '', $gBitSystem->getUTCTime(), '', '', '', $gQueryUsername);
-$smarty->assign('modLastArticles',$ranking["data"]);
-?>
diff --git a/modules/mod_last_articles.tpl b/modules/mod_last_articles.tpl
deleted file mode 100644
index 8476744..0000000
--- a/modules/mod_last_articles.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_last_articles.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_articles eq 'y'}
-{if $nonums eq 'y'}
-{eval var="{tr}Last `$module_rows` articles{/tr}" assign="tpl_module_title"}
-{else}
-{eval var="{tr}Last articles{/tr}" assign="tpl_module_title"}
-{/if}
-{bitmodule title="$moduleTitle" name="last_articles"}
-  <table class="mother">
-    {section name=ix loop=$modLastArticles}
-      <tr>
-        {if $nonums != 'y'}<td width="1%">{$smarty.section.ix.index_next}</td>{/if}
-        <td>
-          <a href="{$gBitLoc.ARTICLES_PKG_URL}read.php?article_id={$modLastArticles[ix].article_id}" title="{$modLastArticles[ix].publish_date|bit_short_datetime}, by {$modLastArticles[ix].author}">{$modLastArticles[ix].title}</a>
-        </td>
-      </tr>
-    {/section}
-  </table>
-{/bitmodule}
-{/if}
diff --git a/modules/mod_last_submissions.php b/modules/mod_last_submissions.php
deleted file mode 100644
index 61ee641..0000000
--- a/modules/mod_last_submissions.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_last_submissions.php,v 1.1 2005/06/30 01:10:46 bitweaver Exp $
-include_once( ARTICLES_PKG_PATH.'art_lib.php' );
-global $artlib, $gQueryUsername, $module_rows, $module_params;
-
-$ranking = $artlib->list_submissions(0, $module_rows, 'created_desc', '', '',$gQueryUsername);
-
-$smarty->assign('modLastSubmissions', $ranking["data"]);
-?>
diff --git a/modules/mod_last_submissions.tpl b/modules/mod_last_submissions.tpl
deleted file mode 100644
index eed7115..0000000
--- a/modules/mod_last_submissions.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_last_submissions.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_submissions eq 'y'}
-{if $nonums eq 'y'}
-{eval var="{tr}Last `$module_rows` submissions{/tr}" assign="tpl_module_title"}
-{else}
-{eval var="{tr}Last submissions{/tr}" assign="tpl_module_title"}
-{/if}
-{bitmodule title="$moduleTitle" name="last_submissions"}
-  <table class="mother">
-    {section name=ix loop=$modLastSubmissions}
-      <tr>
-        {if $nonums != 'y'}<td width="1%">{$smarty.section.ix.index_next}</td>{/if}
-        {if $bit_p_edit_submission eq 'y'}
-          <td><a href="{$gBitLoc.ARTICLES_PKG_URL}edit_submission.php?sub_id={$modLastSubmissions[ix].sub_id}">{$modLastSubmissions[ix].title}</a></td>
-        {else}
-          <td>{$modLastSubmissions[ix].title}</td>
-        {/if}
-      </tr>
-    {/section}
-  </table>
-{/bitmodule}
-{/if}
diff --git a/modules/mod_num_submissions.php b/modules/mod_num_submissions.php
deleted file mode 100644
index 84dc187..0000000
--- a/modules/mod_num_submissions.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_num_submissions.php,v 1.1 2005/06/30 01:10:46 bitweaver Exp $
-include_once( ARTICLES_PKG_PATH.'art_lib.php' );
-global $artlib, $gQueryUsername, $module_rows;
-
-$ranking = $artlib->list_submissions(0, -1, 'created_desc', '', '',$gQueryUsername);
-
-$smarty->assign('modNumSubmissions', $ranking["cant"]);
-
-?>
diff --git a/modules/mod_num_submissions.tpl b/modules/mod_num_submissions.tpl
deleted file mode 100644
index fa448f0..0000000
--- a/modules/mod_num_submissions.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_num_submissions.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_submissions eq 'y'}
-{bitmodule title="$moduleTitle" name="num_submissions"}
-  {tr}There are{/tr} {$modNumSubmissions} {tr}submissions to be examined{/tr}.
-{/bitmodule}
-{/if}
\ No newline at end of file
diff --git a/modules/mod_old_articles.php b/modules/mod_old_articles.php
deleted file mode 100644
index 6e67585..0000000
--- a/modules/mod_old_articles.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_old_articles.php,v 1.1 2005/06/30 01:10:46 bitweaver Exp $
-include_once( ARTICLES_PKG_PATH.'art_lib.php' );
-global $artlib, $gQueryUsername, $module_rows;
-
-if (!isset($maxArticles))
-	$maxArticles = 0;
-
-$ranking = $artlib->list_articles($maxArticles, $maxArticles + $module_rows, 'publish_date_desc', '', '', $gQueryUsername);
-$smarty->assign('modOldArticles', $ranking["data"]);
-
-?>
diff --git a/modules/mod_old_articles.tpl b/modules/mod_old_articles.tpl
deleted file mode 100644
index 289fec3..0000000
--- a/modules/mod_old_articles.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_old_articles.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_articles eq 'y'}
-{bitmodule title="$moduleTitle" name="old_articles"}
-  <table class="mother">
-    {section name=ix loop=$modOldArticles}
-      <tr>
-        {if $nonums != 'y'}<td width="1%">{$smarty.section.ix.index_next}</td>{/if}
-        <td><a href="{$gBitLoc.ARTICLES_PKG_URL}read.php?article_id={$modOldArticles[ix].article_id}">{$modOldArticles[ix].title}</a></td>
-      </tr>
-    {/section}
-  </table>
-{/bitmodule}
-{/if}
diff --git a/modules/mod_top_articles.php b/modules/mod_top_articles.php
deleted file mode 100644
index 2311c36..0000000
--- a/modules/mod_top_articles.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-// $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_top_articles.php,v 1.1 2005/06/30 01:10:46 bitweaver Exp $
-include_once( ARTICLES_PKG_PATH.'art_lib.php' );
-global $artlib;
-
-$ranking = $artlib->list_articles(0, $module_rows, 'reads_desc', '', '', $gQueryUsername);
-
-$smarty->assign('modTopArticles', $ranking["data"]);
-?>
diff --git a/modules/mod_top_articles.tpl b/modules/mod_top_articles.tpl
deleted file mode 100644
index 71cd276..0000000
--- a/modules/mod_top_articles.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_articles/modules/Attic/mod_top_articles.tpl,v 1.1 2005/06/30 01:10:46 bitweaver Exp $ *}
-
-{if $gBitSystemPrefs.feature_articles eq 'y'}
-{if $nonums eq 'y'}
-{eval var="{tr}Top `$module_rows` articles{/tr}" assign="tpl_module_title"}
-{else}
-{eval var="{tr}Top articles{/tr}" assign="tpl_module_title"}
-{/if}
-{bitmodule title="$moduleTitle" name="top_articles"}
-  <table class="mother">
-    {section name=ix loop=$modTopArticles}
-      <tr>
-        {if $nonums != 'y'}<td width="1%">{$smarty.section.ix.index_next}</td>{/if}
-        <td><a href="{$gBitLoc.ARTICLES_PKG_URL}read.php?article_id={$modTopArticles[ix].article_id}">{$modTopArticles[ix].title}</a></td>
-      </tr>
-    {/section}
-  </table>
-{/bitmodule}
-{/if}