Changeset 17434


Ignore:
Timestamp:
Aug 6, 2012, 5:34:23 PM (12 years ago)
Author:
mistic100
Message:

bug with albums with close names
bug with apostrophe in albums name and description

Location:
extensions/pbase2piwigo
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/pbase2piwigo/admin/import.php

    r17314 r17434  
    6565  FROM '.CATEGORIES_TABLE.'
    6666;';
    67     display_select_cat_wrapper($query, array(), 'associate_options');
    6867    display_select_cat_wrapper($query, array(), 'category_parent_options');
    6968   

  • extensions/pbase2piwigo/admin/template/import.analyze.tpl

    r17225 r17434  
    6767</form>
    6868
    69 <pre id="preview">
     69<pre id="preview" style="margin-left:10px;">
    7070</pre>

  • extensions/pbase2piwigo/admin/template/import.config.tpl

    r17314 r17434  
    3535    <select style="width:400px" name="parent_category" id="albumSelect" size="1">
    3636      <option value="0">------------</option>
    37       {html_options options=$associate_options}
     37      {html_options options=$category_parent_options}
    3838    </select>
    3939    {'... or '|@translate}<a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>

  • extensions/pbase2piwigo/admin/template/import.init_import.tpl

    r17314 r17434  
    8181        }
    8282       
    83         jQuery.jGrowl(data['message'], { theme: 'success', header: successHead, life: 2000, sticky: false });
     83        jQuery.jGrowl(data['message'], { theme: 'success', header: successHead, life: 4000, sticky: false });
    8484        queue.increment("categories");
    8585      } else {

  • extensions/pbase2piwigo/include/functions.inc.php

    r17314 r17434  
    1111  // html files are cached 10000 seconds
    1212  $cache_id_prefix = str_replace('http://www.pbase.com/', null, $url);
    13   $cache_id_prefix = preg_replace('#([^a-z0-9]+)#i', null, $cache_id_prefix);
     13  $cache_id_prefix = preg_replace('#([^a-z0-9-_]+)#i', null, $cache_id_prefix);
    1414  $cache_id = $cache_id_prefix.'-'.substr(time(), 0, -4);
    1515 

  • extensions/pbase2piwigo/include/ws_functions.inc.php

    r17314 r17434  
    111111  $category = &get_current_cat($tree, $params['path']);
    112112 
     113  $category['title'] = pwg_db_real_escape_string($category['title']);
     114 
    113115  // add category
    114116  $query = '
    … …  
    128130      'name' => $category['title'].' <!--pbase-->',
    129131      'parent' => $params['parent_id'],
    130       'comment' => $category['description'],
     132      'comment' => pwg_db_real_escape_string($category['description']),
    131133      ), $service);
    132134    $category_id = $category_id['id'];
Note: See TracChangeset for help on using the changeset viewer.