diff options
| -rw-r--r-- | admin/cat_modify.php | 33 | ||||
| -rw-r--r-- | admin/include/functions.php | 19 | ||||
| -rw-r--r-- | admin/themes/default/template/cat_modify.tpl | 80 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 7 | ||||
| -rw-r--r-- | include/dblayer/functions_mysql.inc.php | 2 | ||||
| -rw-r--r-- | include/dblayer/functions_mysqli.inc.php | 6 | ||||
| -rw-r--r-- | include/functions_url.inc.php | 4 | ||||
| -rw-r--r-- | include/ws_functions/pwg.categories.php | 92 | ||||
| -rw-r--r-- | include/ws_functions/pwg.php | 2 | ||||
| -rw-r--r-- | ws.php | 22 |
10 files changed, 222 insertions, 45 deletions
diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 3cf8239c1..2b0f37833 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -172,21 +172,6 @@ UPDATE '.CATEGORIES_TABLE.' $_SESSION['page_infos'][] = l10n('Album updated successfully'); $redirect = true; } -elseif (isset($_POST['set_random_representant'])) -{ - set_random_representant(array($_GET['cat_id'])); - $redirect = true; -} -elseif (isset($_POST['delete_representant'])) -{ - $query = ' -UPDATE '.CATEGORIES_TABLE.' - SET representative_picture_id = NULL - WHERE id = '.$_GET['cat_id'].' -;'; - pwg_query($query); - $redirect = true; -} if (isset($redirect)) { @@ -336,8 +321,7 @@ else } // representant management -if ($category['has_images'] - or !empty($category['representative_picture_id'])) +if ($category['has_images'] or !empty($category['representative_picture_id'])) { $tpl_representant = array(); @@ -345,20 +329,7 @@ if ($category['has_images'] // representant ? if (!empty($category['representative_picture_id'])) { - $query = ' -SELECT id,representative_ext,path - FROM '.IMAGES_TABLE.' - WHERE id = '.$category['representative_picture_id'].' -;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $src = DerivativeImage::thumb_url($row); - $url = get_root_url().'admin.php?page=photo-'.$category['representative_picture_id']; - - $tpl_representant['picture'] = - array( - 'SRC' => $src, - 'URL' => $url - ); + $tpl_representant['picture'] = get_category_representant_properties($category['representative_picture_id']); } // can the admin choose to set a new random representant ? diff --git a/admin/include/functions.php b/admin/include/functions.php index 903267153..5ad436b71 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -922,6 +922,25 @@ SELECT uppercats } /** + */ +function get_category_representant_properties($image_id) +{ + $query = ' +SELECT id,representative_ext,path + FROM '.IMAGES_TABLE.' + WHERE id = '.$image_id.' +;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $src = DerivativeImage::thumb_url($row); + $url = get_root_url().'admin.php?page=photo-'.$image_id; + + return array( + 'src' => $src, + 'url' => $url + ); +} + +/** * Set a new random representant to the categories. * * @param int[] $categories diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index d71ad0528..013cf9553 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -28,6 +28,69 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), { return filtered; } }); + +jQuery(document).ready(function() { + jQuery(document).on('click', '.refreshRepresentative', function(e) { + var $this = jQuery(this); + var method = 'pwg.categories.refreshRepresentative'; + + jQuery.ajax({ + url: "ws.php?format=json&method="+method, + type:"POST", + data: { + category_id: $this.data("category_id") + }, + success:function(data) { + var data = jQuery.parseJSON(data); + if (data.stat == 'ok') { + jQuery(".albumThumbnailImage") + .attr('href', data.result.url) + .find("img").attr('src', data.result.src) + .end().show(); + + jQuery(".albumThumbnailRandom").hide(); + } + else { + alert("error on "+method); + } + }, + error:function(XMLHttpRequest, textStatus, errorThrows) { + alert("serious error on "+method); + } + }); + + e.preventDefault(); + }); + + jQuery(document).on('click', '.deleteRepresentative', function(e) { + var $this = jQuery(this); + var method = 'pwg.categories.deleteRepresentative'; + + jQuery.ajax({ + url: "ws.php?format=json&method="+method, + type:"POST", + data: { + category_id: $this.data("category_id") + }, + success:function(data) { + var data = jQuery.parseJSON(data); + if (data.stat == 'ok') { + jQuery(".albumThumbnailImage").hide(); + jQuery(".albumThumbnailRandom").show(); + } + else { + alert("error on "+method); + } + }, + error:function(XMLHttpRequest, textStatus, errorThrows) { + alert("serious error on "+method); + } + }); + + e.preventDefault(); + }); +}); + {/footer_script} @@ -35,7 +98,7 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), { <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> › {'Edit album'|@translate} {$TABSHEET_TITLE}</h2> </div> -<form action="{$F_ACTION}" method="POST" id="catModify"> +<div id="catModify"> <fieldset> <legend>{'Informations'|@translate}</legend> @@ -44,19 +107,18 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), { <tr> <td id="albumThumbnail"> {if isset($representant) } - {if isset($representant.picture) } - <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt=""></a> - {else} - <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}"> - {/if} + <a class="albumThumbnailImage" style="{if !isset($representant.picture)}display:none{/if}" href="{$representant.picture.url}"><img src="{$representant.picture.src}"></a> + <img class="albumThumbnailRandom" style="{if isset($representant.picture)}display:none{/if}" src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}"> +<p class="albumThumbnailActions"> {if $representant.ALLOW_SET_RANDOM } - <p style="text-align:center;"><input class="submit" type="submit" name="set_random_representant" value="{'Refresh'|@translate}" title="{'Find a new representant by random'|@translate}"></p> + <a href="#refresh" data-category_id="{$CAT_ID}" class="refreshRepresentative" title="{'Find a new representant by random'|@translate}">{'Refresh'|@translate}</a> {/if} {if isset($representant.ALLOW_DELETE) } - <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p> + | <a href="#delete" data-category_id="{$CAT_ID}" class="deleteRepresentative" title="{'Delete Representant'|@translate}">{'Delete'|translate}</a> {/if} +</p> {/if} </td> @@ -90,6 +152,7 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), { </fieldset> +<form action="{$F_ACTION}" method="POST"> <fieldset> <legend>{'Properties'|@translate}</legend> <p> @@ -137,3 +200,4 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), { </fieldset> </form> +</div> {* #catModify *}
\ No newline at end of file diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 4a151b9a4..509aff377 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -213,7 +213,7 @@ LI.menuLi { } /* */ -FORM#catModify TABLE { width: auto; } +#catModify TABLE { width: auto; } #catModify p { line-height: 20px; @@ -221,6 +221,11 @@ FORM#catModify TABLE { width: auto; } text-align: left; } +#catModify p.albumThumbnailActions { + text-align:center; + white-space:nowrap; +} + FIELDSET.elementEdit .thumb { display: block; float: right; diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php index a1853b223..9cf25e76f 100644 --- a/include/dblayer/functions_mysql.inc.php +++ b/include/dblayer/functions_mysql.inc.php @@ -53,7 +53,7 @@ function pwg_db_check_charset() { $db_charset = DB_CHARSET; } - pwg_query('SET NAMES "'.$db_charset.'"'); + mysql_set_charset($db_charset); } function pwg_db_check_version() diff --git a/include/dblayer/functions_mysqli.inc.php b/include/dblayer/functions_mysqli.inc.php index 390cf2e06..f9590c1d1 100644 --- a/include/dblayer/functions_mysqli.inc.php +++ b/include/dblayer/functions_mysqli.inc.php @@ -80,12 +80,14 @@ function pwg_db_connect($host, $user, $password, $database) */ function pwg_db_check_charset() { + global $mysqli; + $db_charset = 'utf8'; if (defined('DB_CHARSET') and DB_CHARSET != '') { $db_charset = DB_CHARSET; } - pwg_query('SET NAMES "'.$db_charset.'"'); + $mysqli->set_charset($db_charset); } /** @@ -901,4 +903,4 @@ function query2array($query, $key_name=null, $value_name=null) return $data; } -?>
\ No newline at end of file +?> diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index 138a895e1..e0f09a28c 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -379,7 +379,7 @@ function make_section_in_url($params) $section_string.= '/'.$tag['id']; break; case 'tag': - if (isset($tag['url_name']) and !is_numeric($tag['url_name']) ) + if (isset($tag['url_name'])) { $section_string.= '/'.$tag['url_name']; break; @@ -824,4 +824,4 @@ function url_is_remote($url) return false; } -?>
\ No newline at end of file +?> diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php index b2cfc2dd4..07e64c803 100644 --- a/include/ws_functions/pwg.categories.php +++ b/include/ws_functions/pwg.categories.php @@ -663,6 +663,98 @@ UPDATE '. USER_CACHE_CATEGORIES_TABLE .' /** * API method + * + * Deletes the album thumbnail. Only possible if + * $conf['allow_random_representative'] + * + * @param mixed[] $params + * @option int category_id + */ +function ws_categories_deleteRepresentative($params, &$service) +{ + global $conf; + + // does the category really exist? + $query = ' +SELECT id + FROM '. CATEGORIES_TABLE .' + WHERE id = '. $params['category_id'] .' +;'; + $result = pwg_query($query); + if (pwg_db_num_rows($result) == 0) + { + return new PwgError(404, 'category_id not found'); + } + + if (!$conf['allow_random_representative']) + { + return new PwgError(401, 'not permitted'); + } + + $query = ' +UPDATE '.CATEGORIES_TABLE.' + SET representative_picture_id = NULL + WHERE id = '.$params['category_id'].' +;'; + pwg_query($query); +} + +/** + * API method + * + * Find a new album thumbnail. + * + * @param mixed[] $params + * @option int category_id + */ +function ws_categories_refreshRepresentative($params, &$service) +{ + global $conf; + + // does the category really exist? + $query = ' +SELECT id + FROM '. CATEGORIES_TABLE .' + WHERE id = '. $params['category_id'] .' +;'; + $result = pwg_query($query); + if (pwg_db_num_rows($result) == 0) + { + return new PwgError(404, 'category_id not found'); + } + + $query = ' +SELECT + DISTINCT category_id + FROM '.IMAGE_CATEGORY_TABLE.' + WHERE category_id = '.$params['category_id'].' + LIMIT 1 +;'; + $result = pwg_query($query); + $has_images = pwg_db_num_rows($result) > 0 ? true : false; + + if (!$has_images) + { + return new PwgError(401, 'not permitted'); + } + + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + + set_random_representant(array($params['category_id'])); + + // return url of the new representative + $query = ' +SELECT * + FROM '.CATEGORIES_TABLE.' + WHERE id = '.$params['category_id'].' +;'; + $category = pwg_db_fetch_assoc(pwg_query($query)); + + return get_category_representant_properties($category['representative_picture_id']); +} + +/** + * API method * Deletes a category * @param mixed[] $params * @option string|int[] category_id diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index b96338eaf..6d9d49fcc 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -339,6 +339,8 @@ function ws_session_getStatus($params, &$service) ) ) ); + + $res['upload_form_chunk_size'] = $conf['upload_form_chunk_size']; } return $res; @@ -570,6 +570,28 @@ function ws_addDefaultMethods( $arr ) $ws_functions_root . 'pwg.categories.php', array('admin_only'=>true, 'post_only'=>true) ); + + $service->addMethod( + 'pwg.categories.deleteRepresentative', + 'ws_categories_deleteRepresentative', + array( + 'category_id' => array('type'=>WS_TYPE_ID), + ), + 'Deletes the album thumbnail. Only possible if $conf[\'allow_random_representative\']', + $ws_functions_root . 'pwg.categories.php', + array('admin_only'=>true, 'post_only'=>true) + ); + + $service->addMethod( + 'pwg.categories.refreshRepresentative', + 'ws_categories_refreshRepresentative', + array( + 'category_id' => array('type'=>WS_TYPE_ID), + ), + 'Find a new album thumbnail.', + $ws_functions_root . 'pwg.categories.php', + array('admin_only'=>true, 'post_only'=>true) + ); $service->addMethod( 'pwg.tags.getAdminList', |