Removed some deprecated files. Moved news_alt shortcode.

e107_files/def_e107_prefs.php

@@ -1,211 +0,0 @@
-<?php
-
-/*
-* e107 website system
-*
-* Copyright (C) 2001-2008 e107 Inc (e107.org)
-* Released under the terms and conditions of the
-* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-*
-* Default preferences
-*
-* $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $
-* $Revision: 1.27 $
-* $Date: 2009-08-31 02:00:51 $
-* $Author: e107coders $
-*
-*/
-
-//TODO - discuss deprecating this file. 
-
-if (!defined('e107_INIT')) { exit(); }
-
-$pref = array (
-  'install_date' => time(),
-  'sitename' => LAN_PREF_1,
-  'siteurl' => $e_HTTP,
-  'sitebutton' => 'button.png',
-  'sitetag' => LAN_PREF_2,
-  'sitedescription' => '',
-  'siteadmin' => 'admin',
-  'siteadminemail' => 'admin@email.com',
-  'sitecontactinfo' => '[b]My Company[/b]
-13 My Address St.
-City, State, Country
-[b]Phone:[/b] 555-555-5555
-[b]Email:[/b] sales@mydomain.com',
-  'sitetheme' => 'jayya',
-  'themecss' => 'style.css',
-
-  // Add some new needed prefs to test the install
-  // @TODO: clean me up
-  'sitetheme_deflayout' => '3_column',
-  'sitetheme_pref' => '',
-  'admin_separate_plugins' => '',
-  'sitetheme_layouts' =>
-  array (
-    '3_column' =>
-    array ( '@attributes' => array ( 'title' => '3 Columns',
-        'preview' => 'preview.jpg',
-        'default' => 'true',
-      ),
-      0 => '',
-    ),
-    '2_column' =>
-    array ( '@attributes' =>
-      array ( 'title' => '2 Columns',
-        'preview' => 'preview.jpg',
-      ),
-      0 => '',
-    ),
-  ),
-  'sitetheme_custompages' => '',
-  // add login_menu in the list
-  'menuconfig_list' => array('login_menu' => array('name' => 'Login', 'link' => 'login_menu/config.php')),
-	// end of temporary prefs
-
-  'image_preload' => '0',
-  'admintheme' => 'jayya',
-  'admincss' => 'style.css',
-  'adminstyle' => 'classis',
-  'sitedisclaimer' => LAN_PREF_3,
-  'newsposts' => '10',
-
-  'flood_protect' => '1',
-  'flood_timeout' => '5',
-  'flood_time' => '30',
-  'flood_hits' => '100',
-  'anon_post' => '0',
-
-  'user_reg' => '1',
-  'membersonly_enabled' => '0',
-
-  'use_coppa' => '1',
-  'signcode' => '0',
-  'user_reg_veri' => '1',
-  'user_reg_secureveri' => '1',
-  'autologinpostsignup' => '0',
-  'signup_pass_len' => '4',
-  'signup_maxip' => '3',
-  'signup_disallow_text' => '',
-  'disable_emailcheck' => 0,
-  'signup_text' => '',
-  'signup_text_after' => '',
-  'signup_option_realname' => '1',
-  'signup_option_signature' => '1',
-  'signup_option_image' => '1',
-  'signup_option_class' => '1',
-  'signup_remote_emailcheck' => 0,
-
-  'displayname_class' => 255,
-  'displayname_maxlength' => 15,
-  'loginname_maxlength' => 30,
-
-  'profanity_filter' => '0',
-  'profanity_replace' => '[censored]',
-  'smiley_activate' => '',
-  'log_refertype' => '1',
-  'longdate' => '%A %d %B %Y - %H:%M:%S',
-  'shortdate' => '%d %b : %H:%M',
-  'forumdate' => '%a %b %d %Y, %I:%M%p',
-  'sitelanguage' => 'English',
-  'maintainance_flag' => '0',
-  'time_offset' => '0',
-  'meta_tag' => '',
-  'email_notify' => '0',
-  'resize_method' => 'gd2',
-  'image_post' => '1',
-  'image_post_class' => '0',
-  'im_path' => '/usr/X11R6/bin/',
-  'im_width' => '120',
-  'im_height' => '100',
-  'upload_enabled' => '0',
-  'upload_storagetype' => '1',
-  'upload_maxfilesize' => '',
-  'upload_class' => '255',
-  'cachestatus' => '',
-  'displayrendertime' => '0',
-  'displaysql' => '0',
-  'displaythemeinfo' => '0',
-  'timezone' => 'GMT',
-  'search_restrict' => '0',
-  'antiflood1' => '1',
-  'antiflood_timeout' => '10',
-  'autoban' => '1',
-  'sitelang_init' => 'English',
-  'linkpage_screentip' => '0',
-  'wmessage_sc' => '0',
-  'frontpage_force' => array(e_UC_PUBLIC => ''),
-  'frontpage' => array(e_UC_PUBLIC => 'news.php'),
-
-  'admin_alerts_ok' => '1',
-  'link_replace' => '0',
-  'link_text' => '',
-  'logcode' => '0',
-  'newsposts_archive' => '0',
-  'newsposts_archive_title' => '',
-  'news_cats' => '',
-  'nbr_cols' => '1',
-  'subnews_attach' => '',
-  'subnews_resize' => '',
-  'subnews_class' => '0',
-  'subnews_htmlarea' => '0',
-  'news_newdateheader' => '0',
-  'email_text' => '',
-  'useGeshi' => '0',
-  'wysiwyg' => '0',
-  'old_np' => '0',
-  'make_clickable' => '0',
-  'track_online' => '1',
-  'emotepack' => 'default',
-  'xup_enabled' => '1',
-  'mailer' => 'php',
-  'ue_upgrade' => '1',
-  'search_highlight' => '1',
-  'mail_pause' => '3',
-  'mail_pausetime' => '4',
-  'themecss' => 'canvas.css',
-  'auth_method' => '',
-  'post_html' => '254',
-  'redirectsiteurl' => '0',
-  'admin_alerts_uniquemenu' => '0',
-  'admin_slidedown_subs' => '1',
-  'null' => '',
-  'links_new_window' => '1',
-  'main_wordwrap' => '',
-  'menu_wordwrap' => '',
-  'php_bbcode' => '255',
-  'ssl_enabled' => '0',
-  'fpwcode' => '0',
-  'disallowMultiLogin' => '0',
-  'profanity_words' => '',
-  'adminpwordchange' => '0',
-  'comments_icon' => '0',
-  'nested_comments' => '1',
-  'allowCommentEdit' => '0',
-  'admincss' => 'style.css',
-  'developer' => '0',
-  'download_email' => '0',
-  'log_page_accesses' => '0',
-  'comments_disabled' => '0',
-  'memberlist_access' => '253',
-  'check_updates' => '0',
-
-  'enable_rdns' => '0',
-  'enable_rdns_on_ban' => '0',
-  'ban_max_online_access' => '100,200',
-  'ban_retrigger' => '0',
-
-  'multilanguage' => '0',
-  'noLanguageSubs' => '0',
-
-  'user_tracking' => 'cookie',
-  'cookie_name' => 'e107cookie',
-  'passwordEncoding' => 0,			// Legacy encoding
-  'allowEmailLogin' => 0,			// Disabled by default
-  'password_CHAP' => '0',			// Disabled by default
-  'predefinedLoginName' => ''		// Allow user to define own login name by default
-
-);
-
-?>

e107_files/shortcode/news_alt.sc

@@ -1,3 +0,0 @@
-require_once(e_PLUGIN."alt_news/alt_news.php");
-alt_news($parm);
-return "";

e107_handlers/plugin_class.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
-|     $Revision: 1.97 $
+|     $Revision: 1.98 $
-|     $Date: 2009-09-25 20:14:29 $
+|     $Date: 2009-09-26 16:54:09 $
-|     $Author: secretr $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -719,8 +719,6 @@ class e107plugin
 		e107::getConfig('core')->setPref($pref);
 		e107::getConfig('core')->save();
 
-	//	save_prefs(); //FIXME - should be a better way to do this. 
-		// e107::getConfig()->loadData($pref, false)->save(false, true);
 	}
 
 

e107_plugins/news/e_shortcode.php

@@ -1,24 +1,14 @@
 <?php
 /*
- * e107 website system
+* Copyright (c) e107 Inc 2009 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+* $Id: e_shortcode.php,v 1.1 2009-09-26 16:54:15 e107coders Exp $
 *
- * Copyright (C) 2001-2008 e107 Inc (e107.org)
+* news shortcode batch class - shortcodes available site-wide. ie. equivalent to multiple .sc files.
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * Alternate News
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/alt_news/alt_news.php,v $
- * $Revision: 1.6 $
- * $Date: 2009-09-24 00:11:19 $
- * $Author: e107coders $
 */
-//TODO should be moved into the shortcode, and the shortcode moved into the 'news' plugin folder. 
-if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."news_class.php");
+class news_shortcodes // must match the plugin's folder name. ie. [PLUGIN_FOLDER]_shortcodes
-
+{	
-function alt_news($news_category) {
+	function sc_alt_news($news_category) {
 	global $sql, $aj, $ns;
 	$ix = new news;
 	if (strstr(e_QUERY, "cat")) {
@@ -126,4 +116,5 @@ function alt_news($news_category) {
 	}
 }
 
+}
 ?>

e107_plugins/news/plugin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Id: plugin.xml,v 1.1 2009-09-26 16:54:15 e107coders Exp $ -->
+<e107Plugin name="News" version="1.0" compatibility="0.8" installRequired="false" >
+	<category>menu</category>
+</e107Plugin>