Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/v0.9.9.beta1'

  • Loading branch information...
commit 48adbda5467ba02cc96d24fb0b3bc83e2f536248 2 parents ed4271b + 3975105
@dleffler dleffler authored
View
16 CHANGELOG
@@ -2,6 +2,16 @@ Exponent Content Management System
Copyright (c) 2004-2007 OIC Group, Inc.
===============================================
+Added / Fixed / changed for 0.99.0 Beta 1
+-----------------------
+# Many, many minor bugs fixed
+# Many, many new features for most every module
+# Many, many tweaks to most every view
+
+Added / Fixed / changed for 0.98.0 GA
+-----------------------
+# This release is a maintenance and security release, patching a handful of bugs and other extraneous issues.
+
Added / Fixed / changed for 0.97.0 GA
-----------------------
# YAHOO! User Interface Library upgraded to version 2.5.2
@@ -11,7 +21,6 @@ Added / Fixed / changed for 0.97.0 GA
# Many bug fixes
# For a detailed commit log, please see https://code.launchpad.net/~exponent-core-dev/exponent-cms/0.97.0
-
Added / Fixed / changed for 0.97.0 Release Candidate 1
-----------------------
# YAHOO! User Interface Library upgraded to version 2.5.1
@@ -36,8 +45,6 @@ Added / Fixed / changed for 0.97.0 Release Candidate 1
# Made the global table header style apply to <th>'s as well as <td>'s
# The Image Gallery Module has been deprecated. A re-write will be out shortly.
-
-
Added / Fixed for 0.97.0 Beta
-----------------------
@@ -68,7 +75,6 @@ Added / Fixed for 0.97.0 Beta
# Action Maps to map certain actions to a specific subtheme
# The Image Gallery Module's views have been cleaned up slightly, and With Thumbnails view has been added taking advantage of YUI's panels as a popup
-
# Developments:
# Drastic speed improvements.
# Form control helpers. Generate forms in your views with new SMARTY tags which intelligently insert needed tags to save you time.
@@ -256,12 +262,10 @@ Added / Fixed in 0.96.5
0.96.5 Admin Module: No restore defaults for File Types (adam)
0.96.5 Upgrade scenario fails (adam)
-
Limitations in Exponent 0.96.5
You may enter content in whatever language you choose, but you can not enter multi-language content and switch between them as of yet - this is coming in a future release.
-
426 Admin Module: Spider Site complains about Exponent File Manager
431 The Exponent equivalent of "su - <someuser>"
432 Weekly view show events of whole month
View
4 RELEASE
@@ -6,6 +6,10 @@ Release Notes for Exponent Content Management System
For a complete list of the changes made from release to release, see the CHANGELOG
+0.99.0 - 2011
+========================
+- This release is a feature and maintenance release. It tweaks many of the views, adds many features, updates 3rd party libraries, and patches a handful of bugs and other extraneous issues.
+
0.98.0 - 2010
========================
- This release is a maintenance and security release, patching a handful of bugs and other extraneous issues.
View
1  datatypes/calendarmodule_config.php
@@ -26,6 +26,7 @@ function form($object) {
global $db;
$tag_collections = $db->selectObjects("tag_collections");
+ $tc_list = null;
foreach ($tag_collections as $tag_collections => $collection) {
$tc_list[$collection->id] = $collection->name;
}
View
6 datatypes/definitions/tag_collections.php
@@ -28,10 +28,10 @@
DB_FIELD_TYPE=>DB_DEF_STRING,
DB_FIELD_LEN=>100),
"description"=>array(
- DB_FIELD_TYPE=>DB_DEF_STRING,
- DB_FIELD_LEN=>10000),
+ DB_FIELD_TYPE=>DB_DEF_STRING,
+ DB_FIELD_LEN=>10000),
'allow_free_tags'=>array(
- DB_FIELD_TYPE=>DB_DEF_BOOLEAN),
+ DB_FIELD_TYPE=>DB_DEF_BOOLEAN),
);
?>
View
16 datatypes/definitions/tags.php
@@ -21,15 +21,15 @@
return array(
'id'=>array(
- DB_FIELD_TYPE=>DB_DEF_ID,
- DB_PRIMARY=>true,
- DB_INCREMENT=>true),
- 'name'=>array(
- DB_FIELD_TYPE=>DB_DEF_STRING,
- DB_FIELD_LEN=>100),
+ DB_FIELD_TYPE=>DB_DEF_ID,
+ DB_PRIMARY=>true,
+ DB_INCREMENT=>true),
+ 'name'=>array(
+ DB_FIELD_TYPE=>DB_DEF_STRING,
+ DB_FIELD_LEN=>100),
'collection_id'=>array(
- DB_FIELD_TYPE=>DB_DEF_ID,
- DB_INDEX=>10),
+ DB_FIELD_TYPE=>DB_DEF_ID,
+ DB_INDEX=>10),
);
?>
View
2  datatypes/definitions/weblog_post.php
@@ -49,6 +49,8 @@
DB_FIELD_TYPE=>DB_DEF_TIMESTAMP),
'editor'=>array(
DB_FIELD_TYPE=>DB_DEF_ID),
+ 'approved'=>array(
+ DB_FIELD_TYPE=>DB_DEF_INTEGER),
'location_data'=>array(
DB_FIELD_TYPE=>DB_DEF_STRING,
DB_FIELD_LEN=>200,
View
14 exponent_version.php
@@ -32,30 +32,28 @@
/* exdoc
* This is the major version number of Exponent; the first 0 in 0.97.0
*/
- define('EXPONENT_VERSION_MAJOR','%%MAJOR%%');
+ define('EXPONENT_VERSION_MAJOR','0');
/* exdoc
* This is the minor version number of Exponent; the 97 in 0.97.0
*/
- define('EXPONENT_VERSION_MINOR','%%MINOR%%');
+ define('EXPONENT_VERSION_MINOR','99');
/* exdoc
* This is the revision version number of Exponent; the second 0 in 0.97.0
*/
- define('EXPONENT_VERSION_REVISION','%%REVISION%%');
+ define('EXPONENT_VERSION_REVISION','0');
/* exdoc
* This is the date that this version of Exponent was exported from BZR and built.
*/
- define('EXPONENT_VERSION_BUILDDATE','%%BUILDDATE%%');
+ define('EXPONENT_VERSION_BUILDDATE','1314960719');
/* exdoc
* This specifies the type of release, either 'alpha','beta','rc' or 'ga' (for stable).
*/
- define('EXPONENT_VERSION_TYPE','%%TYPE%%');
+ define('EXPONENT_VERSION_TYPE','beta');
/* exdoc
* This number is bumped each time a distribution of a single version is
* released. For instance, the 3rd beta has an version type iteration of 3.
*/
- define('EXPONENT_VERSION_ITERATION','%%ITERATION%%'); // only applies to betas/alphas / rcs
+ define('EXPONENT_VERSION_ITERATION','1'); // only applies to betas/alphas / rcs
}
-//return '0.96'; uncomment this when full deprecation of exponent is complete
-
?>
View
0  install/not_configured
No changes.
View
358 install/sitetypes/db/_default.eql
84 additions, 274 deletions not shown
View
2  modules/imagegallerymodule/views/Slideshow.tpl
@@ -83,7 +83,7 @@
{if $overlap == ""}{assign var=overlap value=1}{/if}
{assign var=showtype value=$__viewconfig.showtype}
{if $showtype == ""}{assign var=showtype value=1}{/if}
-{assign var=commondir value='/themes/common/js/'}
+{assign var=commondir value="`$smarty.const.PATH_RELATIVE`themes/common/js/"}
<div class="imagegallerymodule default">
{if $moduletitle != ""}<h2>{$moduletitle}</h2>{/if}
View
4 modules/listingmodule/class.php
@@ -69,7 +69,7 @@ function show($view,$loc = null, $title = '') {
$config->enable_categories = 0;
$config->orderby = 'name';
$config->orderhow = 0; // Ascending
- $itemsperpage = 10;
+ $config->items_perpage = 10;
$config->recalc = 0; // No need to recalculate, no categories
} else if ($config->recalc == 1) {
// We need to recaculate the rankings.
@@ -217,7 +217,7 @@ function show($view,$loc = null, $title = '') {
$template->assign('data',$data);
$template->assign('moduletitle', $title);
$template->assign('config', $config);
- $template->assign('list', $config->id);
+ $template->assign('list', isset($config->id) ? $config->id : '');
$template->output();
}
View
2  modules/newsmodule/class.php
@@ -214,7 +214,7 @@ function show($view,$loc = null,$title = '') {
$total = $db->countObjects('newsitem', $locsql." AND (publish = 0 or publish <= " .
time() . ") AND (unpublish = 0 or unpublish > " . time() . ") AND approved != 0");
- if ($template->viewconfig['featured_only']) {
+ if (isset($template->viewconfig['featured_only'])) {
$locsql .= " AND is_featured=1 ";
}
if($config->enable_pagination == 0) {
View
4 modules/resourcesmodule/class.php
@@ -62,7 +62,7 @@ function show($view,$loc,$title = '') {
if (!defined('SYS_FILES')) require_once(BASE.'subsystems/files.php');
if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
if (!defined('SYS_USERS')) include_once(BASE.'subsystems/users.php');
- include(BASE.'external/mp3file.php');
+ include_once(BASE.'external/mp3file.php');
$template = new template('resourcesmodule',$view,$loc);
@@ -100,6 +100,8 @@ function show($view,$loc,$title = '') {
if ($config == null) {
$config->enable_categories = 0;
$config->recalc = 0; // No need to recalculate, no categories
+ $config->orderby = 'posted';
+ $config->orderhow = 0;
} else if ($config->recalc == 1) {
// We need to recaculate the rankings.
if ($config->enable_categories == 1) {
View
5 modules/weblogmodule/actions/view.php
@@ -21,7 +21,7 @@
exponent_flow_set(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
-if ($user->is_admin || $user->is_acting_admin) {
+if (isset($user->is_admin) || isset($user->is_acting_admin)) {
$where = '';
} else {
$where = " AND (is_draft = 0 OR poster = ".($user ? $user->id : -1).")";
@@ -39,6 +39,7 @@
$config = $db->selectObject('weblogmodule_config',"location_data='".$this_post->location_data."'");
if ($config == null) {
$config->allow_comments = 1;
+ $config->reply_title = '';
}
if ($this_post) {
@@ -84,7 +85,7 @@
'manage_approval'=>exponent_permissions_check('manage_approval',$ploc),
);
- if (!exponent_permissions_check('approve_comments',$ploc) && $config->approve_comments) {
+ if (!exponent_permissions_check('approve_comments',$ploc) && isset($config->approve_comments)) {
$this_post->comments = $db->selectObjects('weblog_comment','parent_id='.$this_post->id." AND approved=1");
} else {
$this_post->comments = $db->selectObjects('weblog_comment','parent_id='.$this_post->id);
View
6 modules/weblogmodule/class.php
@@ -170,7 +170,7 @@ function show($view,$loc = null, $title = '') {
$locsql .= ')';
$locsql .= " AND (publish = 0 or publish <= " . time() . " or poster=" . $user_id .
') AND (unpublish = 0 or unpublish > ' . time() . " or poster=" . $user_id . ') ';
- if ($user->is_admin || $user->is_acting_admin) {
+ if (isset($user->is_admin) || isset($user->is_acting_admin)) {
$where = $locsql;
} else {
$where = '(is_draft = 0 OR poster = '.$user_id.") AND ".$locsql;
@@ -307,7 +307,7 @@ function show($view,$loc = null, $title = '') {
'view_private'=>exponent_permissions_check('view_private',$ploc),
'manage_approval'=>exponent_permissions_check('manage_approval',$ploc),
);
- if (!exponent_permissions_check('approve_comments',$ploc) && $config->approve_comments) {
+ if (!exponent_permissions_check('approve_comments',$ploc) && isset($config->approve_comments)) {
$comments = $db->selectObjects('weblog_comment','parent_id='.$posts[$i]->id." AND approved=1");
} else {
$comments = $db->selectObjects('weblog_comment','parent_id='.$posts[$i]->id);
@@ -336,7 +336,7 @@ function show($view,$loc = null, $title = '') {
$monitoring = false;
if ($user && ($user->id!=0)) {
$weblog_monitor = null;
- $weblog_monitor = $db->selectObject("weblog_monitor","weblog_id=".$config->id." AND user_id=".$user->id);
+ $weblog_monitor = $db->selectObject("weblog_monitor","weblog_id=".isset($config->id) ? $config->id : ''." AND user_id=".isset($user->id) ? $user->id : '');
if ($weblog_monitor != null) $monitoring = true;
}
$template->assign("monitoring", $monitoring);
View
2  subsystems/theme.php
@@ -804,7 +804,7 @@ function exponent_theme_getTheme() {
$action_maps = exponent_theme_loadActionMaps();
if (exponent_theme_inAction() && (!empty($action_maps[$_REQUEST['module']]) || !empty($action_maps['*']))) {
- if (array_key_exists($_REQUEST['action'], $action_maps[$_REQUEST['module']])) {
+ if (isset($action_maps[$_REQUEST['module']]) && array_key_exists($_REQUEST['action'], $action_maps[$_REQUEST['module']])) {
if ($action_maps[$_REQUEST['module']][$_REQUEST['action']]=="default") {
$theme = BASE.'themes/'.DISPLAY_THEME.'/index.php';
} elseif (is_readable(BASE.'themes/'.DISPLAY_THEME.'/subthemes/'.$action_maps[$_REQUEST['module']][$_REQUEST['action']].'.php')) {
View
3  tmp/cache/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
View
3  tmp/css/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
View
3  tmp/js/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
View
3  tmp/minify/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
View
3  tmp/views_c/.htaccess
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI
Please sign in to comment.
Something went wrong with that request. Please try again.