- Timestamp:
- Oct 19, 2013, 8:17:10 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/cat_modify.php
r25005 r25019 115 115 if (isset($_POST['submit'])) 116 116 { 117 $data = 118 array( 119 'id' => $_GET['cat_id'], 120 'name' => @$_POST['name'], 121 'comment' => 122 $conf['allow_html_descriptions'] ? 123 @$_POST['comment'] : strip_tags(@$_POST['comment']), 124 ); 117 $data = array( 118 'id' => $_GET['cat_id'], 119 'name' => @$_POST['name'], 120 'comment' => 121 $conf['allow_html_descriptions'] ? 122 @$_POST['comment'] : strip_tags(@$_POST['comment']), 123 ); 125 124 126 125 if ($conf['activate_comments']) … … 128 127 $data['commentable'] = isset($_POST['commentable'])?$_POST['commentable']:'false'; 129 128 } 130 131 mass_updates(129 130 single_update( 132 131 CATEGORIES_TABLE, 133 array( 134 'primary' => array('id'), 135 'update' => array_diff(array_keys($data), array('id')) 136 ), 137 array($data) 132 $data, 133 array('id' => $data['id']) 138 134 ); 139 135 -
trunk/admin/include/functions.php
r25018 r25019 1817 1817 if (count($existing_tags) == 0) 1818 1818 { 1819 mass_inserts(1819 single_insert( 1820 1820 TAGS_TABLE, 1821 array('name', 'url_name'),1822 1821 array( 1823 array( 1824 'name' => $tag_name, 1825 'url_name' => trigger_event('render_tag_url', $tag_name), 1826 ) 1822 'name' => $tag_name, 1823 'url_name' => trigger_event('render_tag_url', $tag_name), 1827 1824 ) 1828 1825 ); … … 1831 1828 1832 1829 return array( 1833 'info' => sprintf( 1834 l10n('Tag "%s" was added'), 1835 stripslashes($tag_name) 1836 ), 1830 'info' => l10n('Tag "%s" was added', stripslashes($tag_name)), 1837 1831 'id' => $inserted_id, 1838 1832 ); … … 1841 1835 { 1842 1836 return array( 1843 'error' => sprintf( 1844 l10n('Tag "%s" already exists'), 1845 stripslashes($tag_name) 1846 ) 1837 'error' => l10n('Tag "%s" already exists', stripslashes($tag_name)) 1847 1838 ); 1848 1839 } -
trunk/admin/picture_modify.php
r25018 r25019 155 155 } 156 156 157 mass_updates(157 single_update( 158 158 IMAGES_TABLE, 159 array( 160 'primary' => array('id'), 161 'update' => array_diff(array_keys($data), array('id')) 162 ), 163 array($data) 159 $data, 160 array('id' => $data['id']) 164 161 ); 165 162 -
trunk/admin/tags.php
r25018 r25019 130 130 else if (!empty($tag_name)) 131 131 { 132 mass_inserts(132 single_insert( 133 133 TAGS_TABLE, 134 array('name', 'url_name'),135 134 array( 136 array( 137 'name' => $tag_name, 138 'url_name' => trigger_event('render_tag_url', $tag_name), 139 ) 135 'name' => $tag_name, 136 'url_name' => trigger_event('render_tag_url', $tag_name), 140 137 ) 141 138 ); 139 142 140 $query = ' 143 141 SELECT id … … 147 145 $destination_tag = array_from_query($query, 'id'); 148 146 $destination_tag_id = $destination_tag[0]; 147 149 148 $query = ' 150 149 SELECT … … 154 153 ;'; 155 154 $destination_tag_image_ids = array_from_query($query, 'image_id'); 155 156 156 $inserts = array(); 157 157 foreach ($destination_tag_image_ids as $image_id) … … 180 180 } 181 181 } 182 182 183 mass_updates( 183 184 TAGS_TABLE, … … 324 325 if (isset($_POST['add']) and !empty($_POST['add_tag'])) 325 326 { 326 $tag_name = $_POST['add_tag']; 327 328 // does the tag already exists? 329 $query = ' 330 SELECT id 331 FROM '.TAGS_TABLE.' 332 WHERE name = \''.$tag_name.'\' 333 ;'; 334 $existing_tags = array_from_query($query, 'id'); 335 336 if (count($existing_tags) == 0) 337 { 338 mass_inserts( 339 TAGS_TABLE, 340 array('name', 'url_name'), 341 array( 342 array( 343 'name' => $tag_name, 344 'url_name' => trigger_event('render_tag_url', $tag_name), 345 ) 346 ) 347 ); 348 349 $page['infos'][] = l10n('Tag "%s" was added', stripslashes($tag_name)); 327 $ret = create_tag($_POST['add_tag']); 328 329 if (isset($ret['error'])) 330 { 331 $page['errors'][] = $ret['error']; 350 332 } 351 333 else 352 334 { 353 $page[' errors'][] = l10n('Tag "%s" already exists', stripslashes($tag_name));335 $page['infos'][] = $ret['info']; 354 336 } 355 337 } -
trunk/include/functions_user.inc.php
r22879 r25019 187 187 ); 188 188 189 mass_inserts(USERS_TABLE, array_keys($insert), array($insert));189 single_insert(USERS_TABLE, $insert); 190 190 191 191 // Assign by default groups … … 436 436 // insert. This may happen when cache needs refresh and that Piwigo is 437 437 // called "very simultaneously". 438 mass_inserts 439 ( 438 mass_inserts( 440 439 USER_CACHE_CATEGORIES_TABLE, 441 array 442 ( 440 array( 443 441 'user_id', 'cat_id', 444 442 'date_last', 'max_date_last', 'nb_images', 'count_images', 'nb_categories', 'count_categories' 445 ),443 ), 446 444 $user_cache_cats, 447 445 array('ignore' => true) -
trunk/include/ws_functions.inc.php
r25018 r25019 406 406 if (count($datas)) 407 407 { 408 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 409 mass_inserts(CADDIE_TABLE, array('element_id','user_id'), $datas); 408 mass_inserts( 409 CADDIE_TABLE, 410 array('element_id','user_id'), 411 $datas 412 ); 410 413 } 411 414 return count($datas); … … 1727 1730 if ($params['image_id'] > 0) 1728 1731 { 1729 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');1730 1731 1732 $query=' 1732 1733 SELECT * … … 1885 1886 if ($params['image_id'] > 0) 1886 1887 { 1887 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');1888 1889 1888 $query=' 1890 1889 SELECT * … … 1936 1935 { 1937 1936 $update['id'] = $image_id; 1938 1937 1938 single_update( 1939 IMAGES_TABLE, 1940 $update, 1941 array('id', $update['id']) 1942 ); 1943 } 1944 1945 1946 if (isset($params['tags']) and !empty($params['tags'])) 1947 { 1939 1948 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 1940 mass_updates( 1941 IMAGES_TABLE, 1942 array( 1943 'primary' => array('id'), 1944 'update' => array_diff(array_keys($update), array('id')) 1945 ), 1946 array($update) 1947 ); 1948 } 1949 1950 1951 if (isset($params['tags']) and !empty($params['tags'])) 1952 { 1949 1953 1950 $tag_ids = array(); 1954 1951 if (is_array($params['tags'])) … … 2565 2562 $update['id'] = $params['image_id']; 2566 2563 2567 mass_updates(2564 single_update( 2568 2565 IMAGES_TABLE, 2569 array( 2570 'primary' => array('id'), 2571 'update' => array_diff(array_keys($update), array('id')) 2572 ), 2573 array($update) 2566 $update, 2567 array('id', $update['id']) 2574 2568 ); 2575 2569 } … … 2806 2800 } 2807 2801 2808 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');2809 2802 mass_inserts( 2810 2803 IMAGE_CATEGORY_TABLE, … … 2813 2806 ); 2814 2807 2808 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 2815 2809 update_category($new_cat_ids); 2816 2810 } … … 2861 2855 if ($perform_update) 2862 2856 { 2863 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 2864 mass_updates( 2857 single_update( 2865 2858 CATEGORIES_TABLE, 2866 array( 2867 'primary' => array('id'), 2868 'update' => array_diff(array_keys($update), array('id')) 2869 ), 2870 array($update) 2859 $update, 2860 array('id', $update['id']) 2871 2861 ); 2872 2862 } 2873 2874 2863 } 2875 2864
Note: See TracChangeset
for help on using the changeset viewer.