Changeset 2491 for trunk/admin/site_update.php
- Timestamp:
- Aug 29, 2008, 2:35:16 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/site_update.php
r2344 r2491 43 43 SELECT galleries_url 44 44 FROM '.SITES_TABLE.' 45 WHERE id = '.$site_id.' 46 ;'; 45 WHERE id = '.$site_id; 47 46 list($site_url) = mysql_fetch_row(pwg_query($query)); 48 47 if (!isset($site_url)) … … 140 139 $start = get_moment(); 141 140 // which categories to update ? 142 $cat_ids = array();143 144 141 $query = ' 145 142 SELECT id, uppercats, global_rank, status, visible … … 162 159 } 163 160 } 164 $query.= ' 165 ;'; 166 $result = pwg_query($query); 167 168 $db_categories = array(); 169 while ($row = mysql_fetch_array($result)) 170 { 171 $db_categories[$row['id']] = $row; 172 } 161 $db_categories = hash_from_query($query, 'id'); 173 162 174 163 // get categort full directories in an array for comparison with file … … 195 184 $query = ' 196 185 SELECT id 197 FROM '.CATEGORIES_TABLE.' 198 ;'; 186 FROM '.CATEGORIES_TABLE; 199 187 $result = pwg_query($query); 200 188 while ($row = mysql_fetch_array($result)) … … 207 195 SELECT id_uppercat, MAX(rank)+1 AS next_rank 208 196 FROM '.CATEGORIES_TABLE.' 209 GROUP BY id_uppercat 210 ;'; 197 GROUP BY id_uppercat'; 211 198 $result = pwg_query($query); 212 199 while ($row = mysql_fetch_array($result)) … … 223 210 $query = ' 224 211 SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id 225 FROM '.CATEGORIES_TABLE.' 226 ;'; 212 FROM '.CATEGORIES_TABLE; 227 213 list($next_id) = mysql_fetch_array(pwg_query($query)); 228 214 … … 389 375 80, 390 376 "\n" 391 ).') 392 ;'; 393 $result = pwg_query($query); 394 while ($row = mysql_fetch_array($result)) 395 { 396 $db_elements[$row['id']] = $row['path']; 397 } 377 ).')'; 378 $db_elements = simple_hash_from_query($query, 'id', 'path'); 398 379 399 380 // searching the unvalidated waiting elements (they must not be taken into … … 404 385 WHERE storage_category_id IN ( 405 386 '.wordwrap(implode(', ', $cat_ids), 80, "\n").') 406 AND validated = \'false\' 407 ;'; 387 AND validated = \'false\''; 408 388 $result = pwg_query($query); 409 389 while ($row = mysql_fetch_array($result)) … … 422 402 $query = ' 423 403 SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id 424 FROM '.IMAGES_TABLE.' 425 ;'; 404 FROM '.IMAGES_TABLE; 426 405 list($next_element_id) = mysql_fetch_array(pwg_query($query)); 427 406 … … 565 544 WHERE storage_category_id IN ( 566 545 '.wordwrap(implode(', ', $cat_ids), 80, "\n").') 567 AND validated = \'true\' 568 ;'; 546 AND validated = \'true\''; 569 547 $result = pwg_query($query); 570 548 … … 586 564 FROM '.IMAGES_TABLE.' 587 565 WHERE storage_category_id = '.$row['storage_category_id'].' 588 AND file = \''.$row['file'].'\' 589 ;'; 566 AND file = \''.$row['file'].'\''; 590 567 list($data['id']) = mysql_fetch_array(pwg_query($query)); 591 568 … … 724 701 // | synchronize metadata | 725 702 // +-----------------------------------------------------------------------+ 726 if (isset($_POST['submit']) and preg_match('/^metadata/', $_POST['sync'])703 if (isset($_POST['submit']) and isset($_POST['sync_meta']) 727 704 and !$general_failure) 728 705 { 729 706 // sync only never synchronized files ? 730 if ($_POST['sync'] == 'metadata_new') 731 { 732 $opts['only_new'] = true; 733 } 734 else 735 { 736 $opts['only_new'] = false; 737 } 707 $opts['only_new'] = isset($_POST['meta_all']) ? false : true; 738 708 $opts['category_id'] = ''; 739 709 $opts['recursive'] = true; … … 777 747 AND id IN ( 778 748 '.wordwrap(implode(', ', $image_ids), 80, "\n").' 779 ) 780 ;'; 781 782 $result = pwg_query($query); 783 while ($row = mysql_fetch_array($result)) 784 { 785 array_push($has_high_images, $row['id']); 786 } 749 )'; 750 $has_high_images = array_from_query($query, 'id' ); 787 751 } 788 752 … … 844 808 ) 845 809 ), 846 $datas 810 $datas, 811 isset($_POST['meta_empty_overrides']) ? 0 : MASS_UPDATES_SKIP_EMPTY 847 812 ); 848 813 } … … 894 859 // | introduction : choices | 895 860 // +-----------------------------------------------------------------------+ 896 if (!isset($_POST['submit']) or (isset($simulate) and $simulate)) 897 { 898 if (isset($simulate) and $simulate) 899 { 900 $tpl_introduction = array( 901 'sync' => $_POST['sync'], 902 'display_info' => isset($_POST['display_info']) and $_POST['display_info']==1, 903 'add_to_caddie' => isset($_POST['add_to_caddie']) and $_POST['add_to_caddie']==1, 904 'subcats_included' => isset($_POST['subcats-included']) and $_POST['subcats-included']==1, 905 'privacy_level_selected' => (int)@$_POST['privacy_level'], 906 ); 907 908 if (isset($_POST['cat']) and is_numeric($_POST['cat'])) 909 { 910 $cat_selected = array($_POST['cat']); 911 } 912 else 913 { 914 $cat_selected = array(); 915 } 861 if (isset($_POST['submit'])) 862 { 863 $tpl_introduction = array( 864 'sync' => $_POST['sync'], 865 'sync_meta' => isset($_POST['sync_meta']) ? true : false, 866 'display_info' => isset($_POST['display_info']) and $_POST['display_info']==1, 867 'add_to_caddie' => isset($_POST['add_to_caddie']) and $_POST['add_to_caddie']==1, 868 'subcats_included' => isset($_POST['subcats-included']) and $_POST['subcats-included']==1, 869 'privacy_level_selected' => (int)@$_POST['privacy_level'], 870 'meta_all' => isset($_POST['meta_all']) ? true : false, 871 'meta_empty_overrides' => isset($_POST['meta_empty_overrides']) ? true : false, 872 ); 873 874 if (isset($_POST['cat']) and is_numeric($_POST['cat'])) 875 { 876 $cat_selected = array($_POST['cat']); 916 877 } 917 878 else 918 879 { 919 $tpl_introduction = array(920 'sync' => 'dirs',921 'display_info' => false,922 'add_to_caddie' => false,923 'subcats_included' => true,924 'privacy_level_selected' => 0,925 );926 927 880 $cat_selected = array(); 928 881 } 929 930 $tpl_introduction['privacy_level_options']=array(); 931 foreach ($conf['available_permission_levels'] as $level) 932 { 933 $tpl_introduction['privacy_level_options'][$level] = l10n( sprintf('Level %d', $level) ); 934 } 935 936 $template->assign('introduction', $tpl_introduction); 937 938 $query = ' 882 } 883 else 884 { 885 $tpl_introduction = array( 886 'sync' => 'dirs', 887 'sync_meta' => true, 888 'display_info' => false, 889 'add_to_caddie' => false, 890 'subcats_included' => true, 891 'privacy_level_selected' => 0, 892 'meta_all' => false, 893 'meta_empty_overrides' => false, 894 ); 895 896 $cat_selected = array(); 897 } 898 899 $tpl_introduction['privacy_level_options']=array(); 900 foreach ($conf['available_permission_levels'] as $level) 901 { 902 $tpl_introduction['privacy_level_options'][$level] = l10n( sprintf('Level %d', $level) ); 903 } 904 905 $template->assign('introduction', $tpl_introduction); 906 907 $query = ' 939 908 SELECT id,name,uppercats,global_rank 940 909 FROM '.CATEGORIES_TABLE.' 941 WHERE site_id = '.$site_id.' 942 ;'; 943 display_select_cat_wrapper($query, 944 $cat_selected, 945 'category_options', 946 false); 947 } 910 WHERE site_id = '.$site_id; 911 display_select_cat_wrapper($query, 912 $cat_selected, 913 'category_options', 914 false); 915 948 916 949 917 if (count($errors) > 0)
Note: See TracChangeset
for help on using the changeset viewer.