[Phpbbproject-svn] SF.net SVN: phpbbproject: [270] trunk
phpBB download manager, mainly aimed at MOD authors
Status: Planning
Brought to you by:
lord_le_brand
Menu
▾
▴
[Phpbbproject-svn] SF.net SVN: phpbbproject: [270] trunk
|
From: <lor...@us...> - 2008-04-24 15:16:09
|
Revision: 270
http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=270&view=rev
Author: lord_le_brand
Date: 2008-04-24 08:16:16 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Fixed some nubs in create project and installer
Both now work =) (at least for me =P)
Modified Paths:
--------------
trunk/develop/autopost_test.php
trunk/phpbb3/root/includes/project/project_main.php
trunk/phpbb3/root/includes/sources_project/create_project.php
trunk/phpbb3/root/includes/sources_project/extensions.php
trunk/phpbb3/root/includes/sources_project/functions_create.php
trunk/phpbb3/root/project.php
trunk/phpbb3/root/project_install/install_install.php
trunk/phpbb3/root/project_install/schemas/schema_data.sql
trunk/phpbb3/root/styles/prosilver/template/project_create.html
Modified: trunk/develop/autopost_test.php
===================================================================
--- trunk/develop/autopost_test.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/develop/autopost_test.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -26,8 +26,8 @@
require("{$phpbb_root_path}includes/sources_project/extensions.$phpEx");
// phpBB Project Auth extension
-unset($auth);
-$auth = new project_auth();
+//unset($auth);
+//$auth = new project_auth();
// Basic parameter data
$id = request_var('i', '');
Modified: trunk/phpbb3/root/includes/project/project_main.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_main.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/includes/project/project_main.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -65,7 +65,7 @@
$project_ids = $db->sql_in_set('project_id', $acl_projects, false, true);
$optional_fields = ($config['project_autopost_enable']) ? ', topic_id' : '';
- $sql = "SELECT project_id, project_title, project_downloads $optional_fields
+ $sql = "SELECT project_id, project_title, project_description, project_downloads $optional_fields
FROM " . PROJECT_PROJECTS_TABLE . "
WHERE $project_ids
ORDER BY project_downloads DESC";
@@ -140,8 +140,9 @@
$folder_image = 'project_cat';
$folder_image .= ($categories[$i]['right_id'] != ($categories[$i]['left_id'] + 1)) ? '_subcats' : '';
- $last_update_id = $categories[$i]['last_update_id'];
- $last_update_time = ($last_update_id) ? $user->format_date($categories[$i]['last_update_time']) : 0;
+ $last_update_id = $categories[$i]['last_update_id'];
+ $last_update_time = ($last_update_id) ? $user->format_date($categories[$i]['last_update_time']) : 0;
+ $last_update_title = '';
if ($last_update_id)
{
@@ -345,6 +346,9 @@
if (isset($_POST['submit']))
{
+ include_once("{$phpbb_root_path}includes/sources_project/functions_create.$phpEx");
+ include_once("{$phpbb_root_path}includes/sources_project/create_project.$phpEx");
+
$error = array();
if (!check_form_key('project_create'))
@@ -357,7 +361,7 @@
* @todo target_version generation
*/
$data = array(
- 'project_category' => request_var('project_category', 0),
+ 'category_id' => request_var('project_category', 0),
'project_title' => utf8_normalize_nfc(request_var('project_title', '', true)),
'project_description' => utf8_normalize_nfc(request_var('project_description', '', true)),
'project_notes' => utf8_normalize_nfc(request_var('project_notes', '', true)),
@@ -438,14 +442,14 @@
for ($i = 0, $size = sizeof($categories); $i < $size; $i++)
{
- if ($parent_id != $categories[$i]['category_id'])
+ if ($parent_id != $categories[$i]['parent_id'])
{
- $padding += ($categories[$i]['left_id'] > $categories[$i-1]['left_id']) ? 1 : -1;
+ $padding += ($categories[$i]['parent_id'] == $categories[$i-1]['category_id']) ? 1 : -1;
}
$template->assign_block_vars('category', array(
- 'CATEGORY_ID' => $categories[$i]['category_id'],
- 'CATEGORY_NAME' => str_repeat($padding_delimiter, $padding) . $categories[$i]['category_name'],
+ 'CATEGORY_ID' => $categories[$i]['category_id'],
+ 'CATEGORY_TITLE' => str_repeat($padding_delimiter, $padding) . $categories[$i]['category_title'],
));
}
Modified: trunk/phpbb3/root/includes/sources_project/create_project.php
===================================================================
--- trunk/phpbb3/root/includes/sources_project/create_project.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/includes/sources_project/create_project.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -60,7 +60,7 @@
global $config, $user;
$this->data = array_merge($data, array(
- 'project_clean_title' => utf8_clean_string($data['project_title']),
+ 'project_title_clean' => utf8_clean_string($data['project_title']),
'project_install_time' => 0,
'project_level' => PROJECT_LEVEL_EASY,
'project_stage' => PROJECT_STAGE_DEV,
@@ -95,7 +95,7 @@
$db->sql_query('INSERT INTO ' . PROJECT_PROJECT_AUTHORS_TABLE . $db->sql_build_array('INSERT', array(
'project_id' => $project_id,
'author_id' => $this->authors[$i]['author_id'],
- 'author_role' => $this->authors[$i]['author_role_id']
+ 'author_role' => $this->authors[$i]['author_role']
)));
}
@@ -173,7 +173,7 @@
global $config, $user;
$this->data = array_merge($data, array(
- 'project_clean_title' => utf8_clean_string($data['project_title']),
+ 'project_title_clean' => utf8_clean_string($data['project_title']),
'project_install_time' => project_generate_install_time($this->actions),
'project_level' => project_generate_level('actions', $this->actions),
'project_last_update' => $this->current_time,
@@ -186,6 +186,7 @@
* Process project creation
*
* @return integer Project ID
+ * @todo Change project_project_authors table to acl_roles table
*/
public function process()
{
@@ -204,7 +205,7 @@
$db->sql_query('INSERT INTO ' . PROJECT_PROJECT_AUTHORS_TABLE . $db->sql_build_array('INSERT', array(
'project_id' => $project_id,
'author_id' => $this->authors[$i]['author_id'],
- 'author_role' => $this->authors[$i]['author_role_id']
+ 'author_role' => $this->authors[$i]['author_role']
)));
}
Modified: trunk/phpbb3/root/includes/sources_project/extensions.php
===================================================================
--- trunk/phpbb3/root/includes/sources_project/extensions.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/includes/sources_project/extensions.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -33,6 +33,8 @@
*/
function module_auth($module_auth, $forum_id = false, $category_id = false, $project_id = false)
{
+ global $auth;
+
$module_auth = trim($module_auth);
// Generally allowed to access module if module_auth is empty
Modified: trunk/phpbb3/root/includes/sources_project/functions_create.php
===================================================================
--- trunk/phpbb3/root/includes/sources_project/functions_create.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/includes/sources_project/functions_create.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -28,12 +28,12 @@
}
// Check the length
- if ($config['project_title_min_chars'] && $project_title < $config['project_title_min_chars'])
+ if ($config['project_title_min_chars'] && utf8_strlen($project_title) < $config['project_title_min_chars'])
{
return 'PROJECT_TITLE_TOO_SHORT';
}
- if ($config['project_title_max_chars'] && $project_title > $config['project_title_max_chars'])
+ if ($config['project_title_max_chars'] && utf8_strlen($project_title) > $config['project_title_max_chars'])
{
return 'PROJECT_TITLE_TOO_LONG';
}
Modified: trunk/phpbb3/root/project.php
===================================================================
--- trunk/phpbb3/root/project.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/project.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -17,9 +17,9 @@
$phpEx = substr(strrchr(__FILE__, '.'), 1);
require("{$phpbb_root_path}common.$phpEx");
require("{$phpbb_root_path}includes/functions_module.$phpEx");
-require("{$phpbb_root_path}includes/functions_project.$phpEx");
require("{$phpbb_root_path}includes/sources_project/constants.$phpEx");
require("{$phpbb_root_path}includes/sources_project/extensions.$phpEx");
+require("{$phpbb_root_path}includes/sources_project/functions_project.$phpEx");
// phpBB Project Auth extension
//unset($auth);
Modified: trunk/phpbb3/root/project_install/install_install.php
===================================================================
--- trunk/phpbb3/root/project_install/install_install.php 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/project_install/install_install.php 2008-04-24 15:16:16 UTC (rev 270)
@@ -174,7 +174,7 @@
$team_group_id = 0;
$error_message_ary = group_create($team_group_id, GROUP_SPECIAL, 'PROJECT_TEAM', '', array('group_colour' => 'E67300', 'group_receive_pm' => 1, 'group_legend' => 1));
- if (sizeof($error_message_ary))
+ if ($error_message_ary !== false)
{
trigger_error(implode("<br />\n", $error_message_ary));
}
Modified: trunk/phpbb3/root/project_install/schemas/schema_data.sql
===================================================================
--- trunk/phpbb3/root/project_install/schemas/schema_data.sql 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/project_install/schemas/schema_data.sql 2008-04-24 15:16:16 UTC (rev 270)
@@ -154,11 +154,8 @@
INSERT INTO phpbb_project_categories (parent_id, left_id, right_id, category_title, category_description) VALUES (0, 0, 1, '{L_PROJECT_TEST_CAT_TITLE}', '{L_PROJECT_TEST_CAT_DESC}');
# Project
-INSERT INTO phpbb_project_projects (category_id, topic_id, project_title, project_title_clean, project_description, project_level, project_install_time, project_notes, project_license, project_target_version, project_version, project_stage, project_target, project_logo, project_logo_type, project_logo_width, project_logo_height, project_start_time, project_owner, project_last_update, project_status, file_only, project_downloads) VALUES (1, 1, 0, 'Forum prune move', 'forum prune move', 'Add an option to move posts instead of delete them on pruning.', 1, 180, 'Requested by bulldogg597, one of the best MOD requests i''ve seen.', 1, '3.0.0', '1.0.1', 4, '', '', 0, 0, 0, 1203634800, 2, 1207951200, 1, 0, 0);
+INSERT INTO phpbb_project_projects (category_id, topic_id, project_title, project_title_clean, project_description, project_level, project_install_time, project_notes, project_license, project_target_version, project_version, project_stage, project_target, project_logo, project_logo_type, project_logo_width, project_logo_height, project_start_time, project_owner, project_last_update, project_status, file_only, project_downloads) VALUES (1, 0, 'Forum prune move', 'forum prune move', 'Add an option to move posts instead of delete them on pruning.', 1, 180, 'Requested by bulldogg597, one of the best MOD requests i''ve seen.', 1, '3.0.0', '1.0.1', 4, '', '', 0, 0, 0, 1203634800, 2, 1207951200, 1, 0, 0);
-# Author - acutally Igor but meh...
-INSERT INTO phpbb_project_project_authors (project_id, author_id, author_role) SELECT 1, 2, role_id FROM phpbb_acl_roles WHERE role_name = 'ROLE_PROJECT_MANAGER';
-
# Versions
INSERT INTO phpbb_project_versions (version_id, project_id, previous_id, version_time, version_major, version_minor, version_revision, version_stage, version_release, version_changelog) VALUES (1, 1, 0, 1203634800, 1, 0, 0, 4, '', 'Initial release');
INSERT INTO phpbb_project_versions (version_id, project_id, previous_id, version_time, version_major, version_minor, version_revision, version_stage, version_release, version_changelog) VALUES (2, 1, 1, 1207432800, 1, 0, 0, 4, 'a', 'MODX file');
Modified: trunk/phpbb3/root/styles/prosilver/template/project_create.html
===================================================================
--- trunk/phpbb3/root/styles/prosilver/template/project_create.html 2008-04-24 13:20:07 UTC (rev 269)
+++ trunk/phpbb3/root/styles/prosilver/template/project_create.html 2008-04-24 15:16:16 UTC (rev 270)
@@ -12,7 +12,7 @@
<dl>
<dt><label for="project_category">{L_PROJECT_CATEGORY}</label></dt>
<dd><select tabindex="1" name="project_category" id="project_category" title="{L_PROJECT_CATEGORY}"><!-- BEGIN category -->
- <option value="{category.CATEGORY_ID}"<!-- IF category.CATEGORY_ID == CATEGORY_ID --> selected="selected"<!-- ENDIF -->>{category.CATEGORY_NAME}</option><!-- END -->
+ <option value="{category.CATEGORY_ID}"<!-- IF category.CATEGORY_ID == CATEGORY_ID --> selected="selected"<!-- ENDIF -->>{category.CATEGORY_TITLE}</option><!-- END -->
</select></dd>
</dl>
<dl>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
