aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin.php2
-rw-r--r--admin/cat_list.php17
-rw-r--r--admin/cat_modify.php69
-rw-r--r--admin/include/functions.php79
-rw-r--r--admin/picture_modify.php24
5 files changed, 115 insertions, 76 deletions
diff --git a/admin.php b/admin.php
index d15fd1651..a965e2878 100644
--- a/admin.php
+++ b/admin.php
@@ -95,7 +95,7 @@ $template->assign_vars(
'U_THUMBNAILS'=> $link_start.'thumbnail',
'U_USERS'=> $link_start.'user_list',
'U_GROUPS'=> $link_start.'group_list',
- 'U_RETURN'=> PHPWG_ROOT_PATH.'category.php',
+ 'U_RETURN'=> make_index_url(),
'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
'L_ADMIN' => $lang['admin'],
'L_ADMIN_HINT' => $lang['hint_admin']
diff --git a/admin/cat_list.php b/admin/cat_list.php
index 4abc5b069..510f5e284 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -269,13 +269,18 @@ foreach ($categories as $category)
$template->assign_block_vars(
'category',
array(
- 'NAME'=>$category['name'],
- 'ID'=>$category['id'],
- 'RANK'=>$category['rank']*10,
+ 'NAME' => $category['name'],
+ 'ID' => $category['id'],
+ 'RANK' => $category['rank']*10,
- 'U_JUMPTO'=>PHPWG_ROOT_PATH.'category.php?cat='.$category['id'],
- 'U_CHILDREN'=>$cat_list_url.'&parent_id='.$category['id'],
- 'U_EDIT'=>$base_url.'cat_modify&cat_id='.$category['id']
+ 'U_JUMPTO' => make_index_url(
+ array(
+ 'category' => $category['id'],
+ )
+ ),
+
+ 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
+ 'U_EDIT' => $base_url.'cat_modify&cat_id='.$category['id'],
)
);
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index d1aad58c0..cfff0d31f 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -269,37 +269,44 @@ if (!empty($category['id_uppercat']))
$self_url.= '&parent_id='.$category['id_uppercat'];
}
-$template->assign_vars(array(
- 'CATEGORIES_NAV'=>$navigation,
- 'CAT_NAME'=>$category['name'],
- 'CAT_COMMENT'=>$category['comment'],
-
- $status=>'checked="checked"',
- $lock=>'checked="checked"',
- $commentable=>'checked="checked"',
- $uploadable=>'checked="checked"',
-
- 'L_EDIT_NAME'=>$lang['name'],
- 'L_STORAGE'=>$lang['storage'],
- 'L_REMOTE_SITE'=>$lang['remote_site'],
- 'L_EDIT_COMMENT'=>$lang['description'],
- 'L_EDIT_STATUS'=>$lang['conf_access'],
- 'L_STATUS_PUBLIC'=>$lang['public'],
- 'L_STATUS_PRIVATE'=>$lang['private'],
- 'L_EDIT_LOCK'=>$lang['lock'],
- 'L_EDIT_UPLOADABLE'=>$lang['editcat_uploadable'],
- 'L_EDIT_COMMENTABLE'=>$lang['comments'],
- 'L_YES'=>$lang['yes'],
- 'L_NO'=>$lang['no'],
- 'L_SUBMIT'=>$lang['submit'],
- 'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'],
-
- 'U_JUMPTO'=>PHPWG_ROOT_PATH.'category.php?cat='.$category['id'],
- 'U_CHILDREN'=>$cat_list_url.'&parent_id='.$category['id'],
- 'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify',
-
- 'F_ACTION'=>$form_action
- ));
+$template->assign_vars(
+ array(
+ 'CATEGORIES_NAV' => $navigation,
+ 'CAT_NAME' => $category['name'],
+ 'CAT_COMMENT' => $category['comment'],
+
+ $status => 'checked="checked"',
+ $lock => 'checked="checked"',
+ $commentable => 'checked="checked"',
+ $uploadable => 'checked="checked"',
+
+ 'L_EDIT_NAME' => $lang['name'],
+ 'L_STORAGE' => $lang['storage'],
+ 'L_REMOTE_SITE' => $lang['remote_site'],
+ 'L_EDIT_COMMENT' => $lang['description'],
+ 'L_EDIT_STATUS' => $lang['conf_access'],
+ 'L_STATUS_PUBLIC' => $lang['public'],
+ 'L_STATUS_PRIVATE' => $lang['private'],
+ 'L_EDIT_LOCK' => $lang['lock'],
+ 'L_EDIT_UPLOADABLE' => $lang['editcat_uploadable'],
+ 'L_EDIT_COMMENTABLE' => $lang['comments'],
+ 'L_YES' => $lang['yes'],
+ 'L_NO' => $lang['no'],
+ 'L_SUBMIT' => $lang['submit'],
+ 'L_SET_RANDOM_REPRESENTANT'=>$lang['cat_representant'],
+
+ 'U_JUMPTO' => make_index_url(
+ array(
+ 'category' => $category['id'],
+ )
+ ),
+
+ 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
+ 'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify',
+
+ 'F_ACTION' => $form_action,
+ )
+ );
if ('private' == $category['status'])
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 9a748ef44..076c69fb4 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -780,14 +780,22 @@ PRIMARY KEY ('.implode(',', $dbfields['primary']).')
// update of images table by joining with temporary table
$query = '
UPDATE '.$tablename.' AS t1, '.$temporary_tablename.' AS t2
- SET '.implode("\n , ",
- array_map(
- create_function('$s', 'return "t1.$s = t2.$s";')
- , $dbfields['update'])).'
- WHERE '.implode("\n AND ",
- array_map(
- create_function('$s', 'return "t1.$s = t2.$s";')
- , $dbfields['primary'])).'
+ SET '.
+ implode(
+ "\n , ",
+ array_map(
+ create_function('$s', 'return "t1.$s = t2.$s";'),
+ $dbfields['update']
+ )
+ ).'
+ WHERE '.
+ implode(
+ "\n AND ",
+ array_map(
+ create_function('$s', 'return "t1.$s = t2.$s";'),
+ $dbfields['primary']
+ )
+ ).'
;';
pwg_query($query);
$query = '
@@ -840,17 +848,27 @@ SELECT id,uppercats
$datas = array();
foreach ($uppercats_array as $id => $uppercats)
{
- $data = array();
- $data['id'] = $id;
- $global_rank = preg_replace('/(\d+)/e',
- "\$ranks_array['$1']",
- str_replace(',', '.', $uppercats));
- $data['global_rank'] = $global_rank;
- array_push($datas, $data);
+ array_push(
+ $datas,
+ array(
+ 'id' => $id,
+ 'global_rank' => preg_replace(
+ '/(\d+)/e',
+ "\$ranks_array['$1']",
+ str_replace(',', '.', $uppercats)
+ ),
+ )
+ );
}
- $fields = array('primary' => array('id'), 'update' => array('global_rank'));
- mass_updates(CATEGORIES_TABLE, $fields, $datas);
+ mass_updates(
+ CATEGORIES_TABLE,
+ array(
+ 'primary' => array('id'),
+ 'update' => array('global_rank')
+ ),
+ $datas
+ );
}
/**
@@ -1253,26 +1271,25 @@ SELECT user_id
// users present in user related tables must be present in the base user
// table
- $tables =
- array(
- USER_MAIL_NOTIFICATION_TABLE,
- USER_FEED_TABLE,
- USER_INFOS_TABLE,
- USER_ACCESS_TABLE,
- USER_CACHE_TABLE,
- USER_GROUP_TABLE
- );
+ $tables = array(
+ USER_MAIL_NOTIFICATION_TABLE,
+ USER_FEED_TABLE,
+ USER_INFOS_TABLE,
+ USER_ACCESS_TABLE,
+ USER_CACHE_TABLE,
+ USER_GROUP_TABLE
+ );
+
foreach ($tables as $table)
{
$query = '
SELECT user_id
FROM '.$table.'
;';
- $to_delete =
- array_diff(
- array_from_query($query, 'user_id'),
- $base_users
- );
+ $to_delete = array_diff(
+ array_from_query($query, 'user_id'),
+ $base_users
+ );
if (count($to_delete) > 0)
{
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 9e165b96b..0e20f9290 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -333,31 +333,41 @@ while ($row = mysql_fetch_array($result))
// 3. if URL category not available or reachable, use the first reachable
// linked category
// 4. if no category reachable, no jumpto link
-$base_url_img = PHPWG_ROOT_PATH.'picture.php';
-$base_url_img.= '?image_id='.$_GET['image_id'];
-$base_url_img.= '&cat=';
-unset($url_img);
$query = '
SELECT category_id
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE image_id = '.$_GET['image_id'].'
;';
+
$authorizeds = array_diff(
array_from_query($query, 'category_id'),
- explode(',', calculate_permissions($user['id'], $user['status']))
+ explode(
+ ',',
+ calculate_permissions($user['id'], $user['status'])
+ )
);
if (isset($_GET['cat_id'])
and in_array($_GET['cat_id'], $authorizeds))
{
- $url_img = $base_url_img.$_GET['cat_id'];
+ $url_img = make_picture_URL(
+ array(
+ 'image_id' => $_GET['image_id'],
+ 'category' => $_GET['cat_id'],
+ )
+ );
}
else
{
foreach ($authorizeds as $category)
{
- $url_img = $base_url_img.$category;
+ $url_img = make_picture_URL(
+ array(
+ 'image_id' => $_GET['image_id'],
+ 'category' => $category,
+ )
+ );
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 07:05:42 +0000