Changeset 1719:b8c48f380463
- Timestamp:
- 09/04/13 14:57:03 (11 years ago)
- Branch:
- default
- Files:
-
- 1 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/blog_pref.php
r1698 r1719 60 60 61 61 # Language codes 62 $langs = l10n::getISOcodes(1,1); 63 foreach ($langs as $k => $v) { 64 $lang_avail = $v == 'en' || is_dir(DC_L10N_ROOT.'/'.$v); 65 $lang_combo[] = new formSelectOption($k,$v,$lang_avail ? 'avail10n' : ''); 66 } 62 $lang_combo = dcAdminCombos::getAdminLangsCombo(); 67 63 68 64 # Status combo 69 foreach ($core->getAllBlogStatus() as $k => $v) { 70 $status_combo[$v] = (string) $k; 71 } 65 $status_combo = dcAdminCombos::getBlogStatusescombo(); 72 66 73 67 # URL scan modes -
admin/categories.php
r1662 r1719 114 114 dcPage::success(__('Categories have been successfully reordered.')); 115 115 } 116 117 $categories_combo = array(); 118 if (!$rs->isEmpty()) 119 { 120 while ($rs->fetch()) { 121 $catparents_combo[] = $categories_combo[] = new formSelectOption( 122 str_repeat(' ',$rs->level-1).($rs->level-1 == 0 ? '' : '• ').html::escapeHTML($rs->cat_title), 123 $rs->cat_id 124 ); 125 } 126 } 116 $categories_combo = dcAdminCombos::getCategoriesCombo($rs); 127 117 128 118 echo … … 180 170 '<p class="col right" id="mov-cat">'. 181 171 '<label for="mov_cat" class="classic">'.__('Category which will receive entries of deleted categories:').'</label> '. 182 form::combo('mov_cat', array_merge(array(__('(No cat)') => ''),$categories_combo),'','').172 form::combo('mov_cat',$categories_combo,'',''). 183 173 '</p>'. 184 174 '<p class="right">'. -
admin/comment.php
r1553 r1719 26 26 $comment_spam_status = ''; 27 27 28 28 29 # Status combo 29 foreach ($core->blog->getAllCommentStatus() as $k => $v) { 30 $status_combo[$v] = (string) $k; 31 } 30 $status_combo = dcAdminCombos::getCommentStatusescombo(); 32 31 33 32 # Adding comment -
admin/comments.php
r1528 r1719 28 28 # Creating filter combo boxes 29 29 # Filter form we'll put in html_block 30 $status_combo = array( 31 '-' => '' 32 ); 33 foreach ($core->blog->getAllCommentStatus() as $k => $v) { 34 $status_combo[$v] = (string) $k; 35 } 30 $status_combo = array_merge( 31 array('-' => ''), 32 dcAdminCombos::getCommentStatusescombo() 33 ); 34 36 35 37 36 $type_combo = array( -
admin/index.php
r1718 r1719 364 364 { 365 365 # Getting categories 366 $categories_combo = array(__('(No cat)') => ''); 367 try { 368 $categories = $core->blog->getCategories(array('post_type'=>'post')); 369 if (!$categories->isEmpty()) { 370 while ($categories->fetch()) { 371 $catparents_combo[] = $categories_combo[] = new formSelectOption( 372 str_repeat(' ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title), 373 $categories->cat_id 374 ); 375 } 376 } 377 } catch (Exception $e) { } 366 $categories_combo = dcAdminCombos::getCategoriesCombo( 367 $core->blog->getCategories(array('post_type'=>'post')) 368 ); 378 369 379 370 echo -
admin/popup_link.php
r1399 r1719 25 25 # Languages combo 26 26 $rs = $core->blog->getLangs(array('order'=>'asc')); 27 $all_langs = l10n::getISOcodes(0,1); 28 $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1)); 29 while ($rs->fetch()) { 30 if (isset($all_langs[$rs->post_lang])) { 31 $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang; 32 unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]); 33 } else { 34 $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang; 35 } 36 } 37 unset($all_langs); 38 unset($rs); 27 $lang_combo = dcAdminCombos::getLangsCombo($rs,true); 39 28 40 29 echo -
admin/post.php
r1714 r1719 51 51 52 52 # Getting categories 53 $categories_combo = array(' ' => ''); 54 try { 55 $categories = $core->blog->getCategories(array('post_type'=>'post')); 56 while ($categories->fetch()) { 57 $categories_combo[] = new formSelectOption( 58 str_repeat(' ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title), 59 $categories->cat_id 60 ); 61 } 62 } catch (Exception $e) { } 63 64 # Status combo 65 foreach ($core->blog->getAllPostStatus() as $k => $v) { 66 $status_combo[$v] = (string) $k; 67 } 53 $categories_combo = dcAdminCombos::getCategoriesCombo( 54 $core->blog->getCategories(array('post_type'=>'post')) 55 ); 56 57 $status_combo = dcAdminCombos::getPostStatusesCombo(); 58 68 59 $img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />'; 69 60 70 61 # Formaters combo 71 foreach ($core->getFormaters() as $v) { 72 $formaters_combo[$v] = $v; 73 } 62 $formaters_combo = dcAdminCombos::getFormatersCombo(); 74 63 75 64 # Languages combo 76 65 $rs = $core->blog->getLangs(array('order'=>'asc')); 77 $all_langs = l10n::getISOcodes(0,1); 78 $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1)); 79 while ($rs->fetch()) { 80 if (isset($all_langs[$rs->post_lang])) { 81 $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang; 82 unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]); 83 } else { 84 $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang; 85 } 86 } 87 unset($all_langs); 88 unset($rs); 66 $lang_combo = dcAdminCombos::getLangsCombo($rs,true); 89 67 90 68 # Validation flag … … 305 283 306 284 # Getting categories 307 $categories_combo = array(__('(No cat)') => ''); 308 try { 309 $categories = $core->blog->getCategories(array('post_type'=>'post')); 310 if (!$categories->isEmpty()) { 311 while ($categories->fetch()) { 312 $catparents_combo[] = $categories_combo[] = new formSelectOption( 313 str_repeat(' ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title), 314 $categories->cat_id 315 ); 316 } 317 } 318 } catch (Exception $e) { } 319 285 $categories_combo = dcAdminCombos::getCategoriesCombo( 286 $core->blog->getCategories(array('post_type'=>'post')) 287 ); 320 288 /* DISPLAY 321 289 -------------------------------------------------------- */ -
admin/posts.php
r1596 r1719 47 47 { 48 48 # Filter form we'll put in html_block 49 $users_combo = $categories_combo = array(); 50 $users_combo['-'] = $categories_combo['-'] = ''; 51 while ($users->fetch()) 52 { 53 $user_cn = dcUtils::getUserCN($users->user_id,$users->user_name, 54 $users->user_firstname,$users->user_displayname); 55 56 if ($user_cn != $users->user_id) { 57 $user_cn .= ' ('.$users->user_id.')'; 58 } 59 60 $users_combo[$user_cn] = $users->user_id; 61 } 62 49 $users_combo = array_merge( 50 array('-' => ''), 51 dcAdminCombos::getUsersCombo($users) 52 ); 53 54 $categories_combo = array_merge( 55 array('-' => ''), 56 dcAdminCombos::getCategoriesCombo($categories) 57 ); 63 58 $categories_combo[__('(No cat)')] = 'NULL'; 64 while ($categories->fetch()) { 65 $categories_combo[str_repeat(' ',$categories->level-1).($categories->level-1 == 0 ? '' : '• '). 66 html::escapeHTML($categories->cat_title). 67 ' ('.$categories->nb_post.')'] = $categories->cat_id; 68 } 69 70 $status_combo = array( 71 '-' => '' 72 ); 73 foreach ($core->blog->getAllPostStatus() as $k => $v) { 74 $status_combo[$v] = (string) $k; 75 } 59 60 $status_combo = array_merge( 61 array('-' => ''), 62 dcAdminCombos::getPostStatusesCombo() 63 ); 76 64 77 65 $selected_combo = array( … … 82 70 83 71 # Months array 84 $dt_m_combo ['-'] = '';85 while ($dates->fetch()) {86 $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();87 }88 89 $lang_combo ['-'] = '';90 while ($langs->fetch()) {91 $lang_combo[$langs->post_lang] = $langs->post_lang;92 }72 $dt_m_combo = array_merge( 73 array('-' => ''), 74 dcAdminCombos::getDatesCombo($dates) 75 ); 76 77 $lang_combo = array_merge( 78 array('-' => ''), 79 dcAdminCombos::getLangsCombo($langs,false) 80 ); 93 81 94 82 $sortby_combo = array( -
admin/posts_actions.php
r1637 r1719 414 414 # categories list 415 415 # Getting categories 416 $categories_combo = array(__('(No cat)') => ''); 417 try { 418 $categories = $core->blog->getCategories(array('post_type'=>'post')); 419 if (!$categories->isEmpty()) { 420 while ($categories->fetch()) { 421 $catparents_combo[] = $categories_combo[] = new formSelectOption( 422 str_repeat(' ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title), 423 $categories->cat_id 424 ); 425 } 426 } 427 } catch (Exception $e) { } 416 $categories_combo = dcAdminCombos::getCategoriesCombo( 417 $core->blog->getCategories(array('post_type'=>'post')) 418 ); 428 419 429 420 echo … … 465 456 # Languages combo 466 457 $rs = $core->blog->getLangs(array('order'=>'asc')); 467 $all_langs = l10n::getISOcodes(0,1); 468 $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1)); 469 while ($rs->fetch()) { 470 if (isset($all_langs[$rs->post_lang])) { 471 $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang; 472 unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]); 473 } else { 474 $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang; 475 } 476 } 477 unset($all_langs); 478 unset($rs); 458 $lang_combo = dcAdminCombos::getLangsCombo($rs,true); 479 459 480 460 echo -
admin/preferences.php
r1609 r1719 56 56 } 57 57 58 foreach ($core->getFormaters() as $v) { 59 $formaters_combo[$v] = $v; 60 } 61 62 foreach ($core->blog->getAllPostStatus() as $k => $v) { 63 $status_combo[$v] = $k; 64 } 58 # Formaters combo 59 $formaters_combo = dcAdminCombos::getFormatersCombo(); 60 61 $status_combo = dcAdminCombos::getPostStatusescombo(); 65 62 66 63 $iconsets_combo = array(__('Default') => ''); … … 77 74 78 75 # Language codes 79 $langs = l10n::getISOcodes(1,1); 80 foreach ($langs as $k => $v) { 81 $lang_avail = $v == 'en' || is_dir(DC_L10N_ROOT.'/'.$v); 82 $lang_combo[] = new formSelectOption($k,$v,$lang_avail ? 'avail10n' : ''); 83 } 76 $lang_combo = dcAdminCombos::getAdminLangsCombo(); 84 77 85 78 # Add or update user -
admin/user.php
r1621 r1719 32 32 $user_options = $core->userDefaults(); 33 33 34 foreach ($core->getFormaters() as $v) { 35 $formaters_combo[$v] = $v; 36 } 37 38 foreach ($core->blog->getAllPostStatus() as $k => $v) { 39 $status_combo[$v] = $k; 40 } 34 # Formaters combo 35 $formaters_combo = dcAdminCombos::getFormatersCombo(); 36 37 $status_combo = dcAdminCombos::getPostStatusesCombo(); 41 38 42 39 # Language codes 43 $langs = l10n::getISOcodes(1,1); 44 foreach ($langs as $k => $v) { 45 $lang_avail = $v == 'en' || is_dir(DC_L10N_ROOT.'/'.$v); 46 $lang_combo[] = new formSelectOption($k,$v,$lang_avail ? 'avail10n' : ''); 47 } 40 $lang_combo = dcAdminCombos::getAdminLangsCombo(); 48 41 49 42 # Get user if we have an ID -
inc/prepend.php
r1694 r1719 59 59 $__autoload['adminCommentList'] = dirname(__FILE__).'/admin/lib.pager.php'; 60 60 $__autoload['adminUserList'] = dirname(__FILE__).'/admin/lib.pager.php'; 61 $__autoload['dcAdminCombos'] = dirname(__FILE__).'/admin/lib.admincombos.php'; 61 62 62 63 $__autoload['dcTemplate'] = dirname(__FILE__).'/public/class.dc.template.php'; -
plugins/importExport/inc/class.dc.import.wp.php
r1622 r1719 80 80 $this->post_limit = $this->vars['post_limit']; 81 81 } 82 83 foreach ($this->core->getFormaters() as $v) { 84 $this->formaters[$v] = $v; 85 } 82 83 $this->formaters = dcAdminCombos::getFormatersCombo(); 86 84 } 87 85 -
plugins/pages/page.php
r1713 r1719 53 53 54 54 # Status combo 55 foreach ($core->blog->getAllPostStatus() as $k => $v) { 56 $status_combo[$v] = (string) $k; 57 } 55 $status_combo = dcAdminCombos::getPostStatusesCombo(); 56 58 57 $img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />'; 59 58 60 59 # Formaters combo 61 foreach ($core->getFormaters() as $v) { 62 $formaters_combo[$v] = $v; 63 } 60 $formaters_combo = dcAdminCombos::getFormatersCombo(); 64 61 65 62 # Languages combo 66 63 $rs = $core->blog->getLangs(array('order'=>'asc')); 67 $all_langs = l10n::getISOcodes(0,1); 68 $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1)); 69 while ($rs->fetch()) { 70 if (isset($all_langs[$rs->post_lang])) { 71 $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang; 72 unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]); 73 } else { 74 $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang; 75 } 76 } 77 unset($all_langs); 78 unset($rs); 64 $lang_combo = dcAdminCombos::getLangsCombo($rs,true); 65 79 66 80 67 # Validation flag
Note: See TracChangeset
for help on using the changeset viewer.