Skip to content

Commit

Permalink
feature 657: permalinks for categories
Browse files Browse the repository at this point in the history
git-svn-id: http://piwigo.org/svn/trunk@1866 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
rvelices committed Feb 28, 2007
1 parent 30e2599 commit ea56d7b
Show file tree
Hide file tree
Showing 22 changed files with 650 additions and 89 deletions.
4 changes: 1 addition & 3 deletions admin.php
Expand Up @@ -4,7 +4,6 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
Expand Down Expand Up @@ -107,10 +106,9 @@
'U_THUMBNAILS'=> $link_start.'thumbnail',
'U_USERS'=> $link_start.'user_list',
'U_GROUPS'=> $link_start.'group_list',
'U_PERMALINKS'=> $link_start.'permalinks',
'U_RETURN'=> make_index_url(),
'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
'L_ADMIN' => $lang['admin'],
'L_ADMIN_HINT' => $lang['hint_admin']
)
);
if ($conf['ws_access_control']) // Do we need to display ws_checker
Expand Down
28 changes: 1 addition & 27 deletions admin/cat_list.php
Expand Up @@ -137,32 +137,6 @@ function save_categories_order($categories)
);
}

// +-----------------------------------------------------------------------+
// | Cache management |
// +-----------------------------------------------------------------------+
$query = '
SELECT *
FROM '.CATEGORIES_TABLE;
if (!isset($_GET['parent_id']))
{
$query.= '
WHERE id_uppercat IS NULL';
}
else
{
$query.= '
WHERE id_uppercat = '.$_GET['parent_id'];
}
$query.= '
ORDER BY rank ASC
;';
$result = pwg_query($query);
while ($row = mysql_fetch_assoc($result))
{
$categories[$row['rank']] = $row;
$categories[$row['rank']]['nb_subcats'] = 0;
}

// +-----------------------------------------------------------------------+
// | Navigation path |
// +-----------------------------------------------------------------------+
Expand Down Expand Up @@ -209,7 +183,7 @@ function save_categories_order($categories)
$categories = array();

$query = '
SELECT id, name, dir, rank, nb_images, status
SELECT id, name, permalink, dir, rank, nb_images, status
FROM '.CATEGORIES_TABLE;
if (!isset($_GET['parent_id']))
{
Expand Down
5 changes: 5 additions & 0 deletions admin/include/functions.php
Expand Up @@ -118,6 +118,11 @@ function delete_categories($ids)
WHERE id IN (
'.wordwrap(implode(', ', $ids), 80, "\n").')
;';
pwg_query($query);

$query='
DELETE FROM '.OLD_PERMALINKS_TABLE.'
WHERE cat_id IN ('.implode(',',$cat_ids).')';
pwg_query($query);

if (isset($counts['del_categories']))
Expand Down
170 changes: 170 additions & 0 deletions admin/include/functions_permalinks.php
@@ -0,0 +1,170 @@
<?php
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id: admin/function_permalinks.inc.php$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+

/** deletes the permalink associated with a category
* returns true on success
* @param int cat_id the target category id
* @param boolean save if true, the current category-permalink association
* is saved in the old permalinks table in case external links hit it
*/
function delete_cat_permalink( $cat_id, $save )
{
global $page, $cache;
$query = '
SELECT permalink
FROM '.CATEGORIES_TABLE.'
WHERE id="'.$cat_id.'"
;';
$result = pwg_query($query);
if ( mysql_num_rows($result) )
{
list($permalink) = mysql_fetch_array($result);
}
if ( !isset($permalink) )
{// no permalink; nothing to do
return true;
}
if ($save)
{
$old_cat_id = get_cat_id_from_old_permalink($permalink, false);
if ( isset($old_cat_id) and $old_cat_id!=$cat_id )
{
$page['errors'][] =
sprintf(
l10n('Permalink_%s_histo_used_by_%s'),
$permalink, $old_cat_id
);
return false;
}
}
$query = '
UPDATE '.CATEGORIES_TABLE.'
SET permalink=NULL
WHERE id='.$cat_id.'
LIMIT 1';
pwg_query($query);

unset( $cache['cat_names'] ); //force regeneration
if ($save)
{
if ( isset($old_cat_id) )
{
$query = '
UPDATE '.OLD_PERMALINKS_TABLE.'
SET date_deleted=NOW()
WHERE cat_id='.$cat_id.' AND permalink="'.$permalink.'"';
}
else
{
$query = '
INSERT INTO '.OLD_PERMALINKS_TABLE.'
(permalink, cat_id, date_deleted)
VALUES
( "'.$permalink.'",'.$cat_id.',NOW() )';
}
pwg_query( $query );
}
return true;
}

/** sets a new permalink for a category
* returns true on success
* @param int cat_id the target category id
* @param string permalink the new permalink
* @param boolean save if true, the current category-permalink association
* is saved in the old permalinks table in case external links hit it
*/
function set_cat_permalink( $cat_id, $permalink, $save )
{
global $page, $cache;

$sanitized_permalink = preg_replace( '#[^a-zA-Z0-9_-]#', '' ,$permalink);
if ( $sanitized_permalink != $permalink
or preg_match( '#^(\d)+-?#', $permalink) )
{
$page['errors'][] = l10n('Permalink_name_rule');
return false;
}

$existing_cat_id = get_cat_id_from_permalink( $permalink );
if ( isset($existing_cat_id) )
{
if ( $existing_cat_id==$cat_id )
{// no change required
return true;
}
else
{
$page['errors'][] =
sprintf(
l10n('Permalink %s is already used by category %s'),
$permalink, $existing_cat_id
);
return false;
}
}

if ($save)
{
$old_cat_id = get_cat_id_from_old_permalink($permalink, false);
if ( isset($old_cat_id) )
{
if ( $old_cat_id!=$cat_id )
{
$page['errors'][] =
sprintf(
l10n('Permalink_%s_histo_used_by_%s'),
$permalink, $old_cat_id
);
return false;
}
else
{
$query = '
DELETE FROM '.OLD_PERMALINKS_TABLE.'
WHERE cat_id='.$cat_id.' AND permalink="'.$permalink.'"';
pwg_query($query);
}
}
}

if ( !delete_cat_permalink($cat_id, $save ) )
{
return false;
}

$query = '
UPDATE '.CATEGORIES_TABLE.'
SET permalink="'.$permalink.'"
WHERE id='.$cat_id.'
LIMIT 1';
pwg_query($query);

unset( $cache['cat_names'] ); //force regeneration

return true;
}

?>
97 changes: 97 additions & 0 deletions admin/permalinks.php
@@ -0,0 +1,97 @@
<?php
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+

if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');

include_once(PHPWG_ROOT_PATH.'admin/include/functions_permalinks.php');

$selected_cat = array();
if ( isset($_POST['set_permalink']) and $_POST['cat_id']>0 )
{
$permalink = $_POST['permalink'];
if ( empty($permalink) )
delete_cat_permalink($_POST['cat_id'], isset($_POST['save']) );
else
set_cat_permalink($_POST['cat_id'], $permalink, isset($_POST['save']) );
$selected_cat = array( $_POST['cat_id'] );
}
elseif ( isset($_GET['delete_permanent']) )
{
$query = '
DELETE FROM '.OLD_PERMALINKS_TABLE.'
WHERE permalink="'.$_GET['delete_permanent'].'"
LIMIT 1';
pwg_query($query);
if (mysql_affected_rows()==0)
array_push($page['errors'], 'Cannot delete the old permalink !');
}

$template->set_filename('permalinks', 'admin/permalinks.tpl' );

$query = '
SELECT
id,
CONCAT(id, " - ", name, IF(permalink IS NULL, "", " &radic;") ) AS name,
uppercats, global_rank
FROM '.CATEGORIES_TABLE;

display_select_cat_wrapper( $query, $selected_cat, 'categories', false );

$query = '
SELECT id, name, permalink
FROM '.CATEGORIES_TABLE.'
WHERE permalink IS NOT NULL';
$result=pwg_query($query);
while ( $row=mysql_fetch_assoc($result) )
{
$display_name = get_cat_display_name( array($row) );
$template->assign_block_vars( 'permalink',
array(
'CAT_ID' => $row['id'],
'CAT' => $display_name,
'PERMALINK' => $row['permalink'],
)
);
}

$url_del_base = get_root_url().'admin.php?page=permalinks';

$query = 'SELECT * FROM '.OLD_PERMALINKS_TABLE;
$result = pwg_query($query);
while ( $row=mysql_fetch_assoc($result) )
{
$row['display_name'] = get_cat_display_name_cache($row['cat_id']);
$row['U_DELETE'] =
add_url_params(
$url_del_base,
array( 'delete_permanent'=> $row['permalink'] )
);
$template->assign_block_vars( 'deleted_permalink', $row );
}

$template->assign_var('U_HELP', get_root_url().'popuphelp.php?page=permalinks');

$template->assign_var_from_handle('ADMIN_CONTENT', 'permalinks');
?>
3 changes: 1 addition & 2 deletions admin/plugin.php
Expand Up @@ -49,8 +49,7 @@
}

$plugin_id = $sections[0];
$check_db_plugin = get_db_plugins('active', $plugin_id );
if (empty($check_db_plugin))
if ( !isset($pwg_loaded_plugins[$plugin_id]) )
{
die('Invalid URL - plugin '.$plugin_id.' not active');
}
Expand Down
9 changes: 2 additions & 7 deletions comments.php
Expand Up @@ -369,17 +369,12 @@
}

// retrieving category informations
$categories = array();
$query = '
SELECT id, name, uppercats
SELECT id, name, permalink, uppercats
FROM '.CATEGORIES_TABLE.'
WHERE id IN ('.implode(',', $category_ids).')
;';
$result = pwg_query($query);
while ($row = mysql_fetch_assoc($result))
{
$categories[$row['id']] = $row;
}
$categories = hash_from_query($query, 'id');

foreach ($comments as $comment)
{
Expand Down
4 changes: 2 additions & 2 deletions include/category_cats.inc.php
Expand Up @@ -35,7 +35,7 @@
// $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
$query = '
SELECT
id, name, representative_picture_id, comment, nb_images, uppercats,
id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
date_last, max_date_last, count_images, count_categories, global_rank
FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
ON id = cat_id and user_id = '.$user['id'].'
Expand All @@ -57,7 +57,7 @@
// $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
$query = '
SELECT
id, name, representative_picture_id, comment, nb_images,
id, name, permalink, representative_picture_id, comment, nb_images,
date_last, max_date_last, count_images, count_categories
FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
ON id = cat_id and user_id = '.$user['id'].'
Expand Down

0 comments on commit ea56d7b

Please sign in to comment.