summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xadmin/admin_feed_inc.php4
-rwxr-xr-xadmin/schema_inc.php2
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/address_16.pngbin3307 -> 3307 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/address_32.pngbin4080 -> 4080 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/address_48.pngbin4894 -> 4894 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/address_64.pngbin6178 -> 6178 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/block_16.pngbin3519 -> 3519 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/block_32.pngbin5175 -> 5175 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/block_48.pngbin6697 -> 6697 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/block_64.pngbin8627 -> 8627 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bookmark_16.pngbin3285 -> 3285 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bookmark_32.pngbin3969 -> 3969 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bookmark_48.pngbin4895 -> 4895 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bookmark_64.pngbin6214 -> 6214 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/briefcase_16.pngbin3171 -> 3171 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/briefcase_32.pngbin4038 -> 4038 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/briefcase_48.pngbin5189 -> 5189 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/briefcase_64.pngbin6064 -> 6064 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bubble_16.pngbin3288 -> 3288 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bubble_32.pngbin4124 -> 4124 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bubble_48.pngbin5323 -> 5323 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/bubble_64.pngbin6395 -> 6395 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/buy_16.pngbin3208 -> 3208 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/buy_32.pngbin3860 -> 3860 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/buy_48.pngbin5429 -> 5429 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/buy_64.pngbin5863 -> 5863 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/calendar_16.pngbin3294 -> 3294 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/calendar_32.pngbin4176 -> 4176 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/calendar_48.pngbin5143 -> 5143 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/calendar_64.pngbin7123 -> 7123 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clipboard_16.pngbin3135 -> 3135 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clipboard_32.pngbin3745 -> 3745 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clipboard_48.pngbin4398 -> 4398 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clipboard_64.pngbin5122 -> 5122 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clock_16.pngbin3485 -> 3485 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clock_32.pngbin5061 -> 5061 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clock_48.pngbin6565 -> 6565 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/clock_64.pngbin8239 -> 8239 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/delete_16.pngbin3375 -> 3375 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/delete_32.pngbin4479 -> 4479 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/delete_48.pngbin5474 -> 5474 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/delete_64.pngbin6781 -> 6781 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/diagram_16.pngbin3231 -> 3231 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/diagram_32.pngbin3962 -> 3962 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/diagram_48.pngbin5491 -> 5491 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/diagram_64.pngbin6845 -> 6845 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/document_16.pngbin3217 -> 3217 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/document_32.pngbin3910 -> 3910 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/document_48.pngbin5057 -> 5057 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/document_64.pngbin6563 -> 6563 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/down_16.pngbin3284 -> 3284 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/down_32.pngbin4248 -> 4248 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/down_48.pngbin4955 -> 4955 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/down_64.pngbin6385 -> 6385 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/flag_16.pngbin3412 -> 3412 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/flag_32.pngbin4484 -> 4484 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/flag_48.pngbin5706 -> 5706 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/flag_64.pngbin6958 -> 6958 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/folder_16.pngbin3147 -> 3147 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/folder_32.pngbin3717 -> 3717 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/folder_48.pngbin4611 -> 4611 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/folder_64.pngbin6185 -> 6185 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/gear_16.pngbin3609 -> 3609 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/gear_32.pngbin4998 -> 4998 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/gear_48.pngbin6647 -> 6647 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/gear_64.pngbin8235 -> 8235 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/globe_16.pngbin3569 -> 3569 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/globe_32.pngbin5166 -> 5166 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/globe_48.pngbin7243 -> 7243 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/globe_64.pngbin9717 -> 9717 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/heart_16.pngbin3411 -> 3411 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/heart_32.pngbin4376 -> 4376 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/heart_48.pngbin5631 -> 5631 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/heart_64.pngbin6968 -> 6968 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/help_16.pngbin3571 -> 3571 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/help_32.pngbin5144 -> 5144 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/help_48.pngbin7120 -> 7120 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/help_64.pngbin9258 -> 9258 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/home_16.pngbin3242 -> 3242 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/home_32.pngbin4224 -> 4224 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/home_48.pngbin5183 -> 5183 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/home_64.pngbin6704 -> 6704 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/info_16.pngbin3466 -> 3466 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/info_32.pngbin4440 -> 4440 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/info_48.pngbin5516 -> 5516 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/info_64.pngbin6454 -> 6454 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/key_16.pngbin3395 -> 3395 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/key_32.pngbin4656 -> 4656 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/key_48.pngbin6018 -> 6018 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/key_64.pngbin7605 -> 7605 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/label_16.pngbin3352 -> 3352 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/label_32.pngbin4456 -> 4456 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/label_48.pngbin5504 -> 5504 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/label_64.pngbin7234 -> 7234 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/left_16.pngbin3301 -> 3301 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/left_32.pngbin4125 -> 4125 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/left_48.pngbin4594 -> 4594 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/left_64.pngbin6187 -> 6187 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/letter_16.pngbin3393 -> 3393 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/letter_32.pngbin4340 -> 4340 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/letter_48.pngbin5481 -> 5481 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/letter_64.pngbin7192 -> 7192 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/license.txt0
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/monitor_16.pngbin3106 -> 3106 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/monitor_32.pngbin3582 -> 3582 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/monitor_48.pngbin4241 -> 4241 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/monitor_64.pngbin5107 -> 5107 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/pencil_16.pngbin3350 -> 3350 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/pencil_32.pngbin4364 -> 4364 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/pencil_48.pngbin5207 -> 5207 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/pencil_64.pngbin6673 -> 6673 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/plus_16.pngbin3179 -> 3179 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/plus_32.pngbin3491 -> 3491 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/plus_48.pngbin3806 -> 3806 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/plus_64.pngbin5744 -> 5744 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/present_16.pngbin3325 -> 3325 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/present_32.pngbin4512 -> 4512 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/present_48.pngbin5684 -> 5684 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/present_64.pngbin7259 -> 7259 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/print_16.pngbin3181 -> 3181 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/print_32.pngbin3841 -> 3841 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/print_48.pngbin4610 -> 4610 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/print_64.pngbin5036 -> 5036 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/right_16.pngbin3310 -> 3310 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/right_32.pngbin4143 -> 4143 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/right_48.pngbin4544 -> 4544 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/right_64.pngbin6079 -> 6079 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/save_16.pngbin3258 -> 3258 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/save_32.pngbin3767 -> 3767 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/save_48.pngbin4499 -> 4499 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/save_64.pngbin5966 -> 5966 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/search_16.pngbin3501 -> 3501 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/search_32.pngbin4658 -> 4658 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/search_48.pngbin5830 -> 5830 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/search_64.pngbin7346 -> 7346 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/shield_16.pngbin3440 -> 3440 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/shield_32.pngbin4494 -> 4494 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/shield_48.pngbin5973 -> 5973 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/shield_64.pngbin7442 -> 7442 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/statistics_16.pngbin3225 -> 3225 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/statistics_32.pngbin3877 -> 3877 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/statistics_48.pngbin4624 -> 4624 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/statistics_64.pngbin5569 -> 5569 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/stop_16.pngbin3443 -> 3443 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/stop_32.pngbin4409 -> 4409 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/stop_48.pngbin5897 -> 5897 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/stop_64.pngbin7576 -> 7576 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/tick_16.pngbin3315 -> 3315 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/tick_32.pngbin4137 -> 4137 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/tick_48.pngbin4952 -> 4952 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/tick_64.pngbin5968 -> 5968 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/trash_16.pngbin3408 -> 3408 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/trash_32.pngbin4255 -> 4255 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/trash_48.pngbin5583 -> 5583 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/trash_64.pngbin6318 -> 6318 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/up_16.pngbin3230 -> 3230 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/up_32.pngbin4002 -> 4002 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/up_48.pngbin5229 -> 5229 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/up_64.pngbin6060 -> 6060 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/user_16.pngbin3209 -> 3209 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/user_32.pngbin3666 -> 3666 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/user_48.pngbin4299 -> 4299 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/user_64.pngbin4800 -> 4800 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/wallet_16.pngbin3052 -> 3052 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/wallet_32.pngbin3572 -> 3572 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/wallet_48.pngbin4326 -> 4326 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/wallet_64.pngbin5024 -> 5024 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/warning_16.pngbin3309 -> 3309 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/warning_32.pngbin3834 -> 3834 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/warning_48.pngbin4793 -> 4793 bytes
-rwxr-xr-x[-rw-r--r--]icons/pixelmixerbasic/warning_64.pngbin5247 -> 5247 bytes
-rwxr-xr-x[-rw-r--r--]icons/pkg_feed.pngbin5323 -> 5323 bytes
-rwxr-xr-xincludes/bit_setup_inc.php1
-rwxr-xr-xincludes/classes/FeedStatus.php11
-rw-r--r--includes/feed_lib.php23
-rwxr-xr-x[-rw-r--r--]modules/mod_feed.tpl0
-rwxr-xr-xmodules/mod_status.php7
-rwxr-xr-x[-rw-r--r--]modules/mod_status.tpl0
-rwxr-xr-x[-rw-r--r--]templates/admin_feed.tpl0
-rwxr-xr-xtemplates/center_feed.php1
-rwxr-xr-x[-rw-r--r--]templates/center_feed.tpl0
-rwxr-xr-x[-rw-r--r--]templates/master_feed.tpl0
-rwxr-xr-x[-rw-r--r--]templates/menu_feed.tpl0
-rwxr-xr-x[-rw-r--r--]templates/menu_feed_admin.tpl0
184 files changed, 23 insertions, 26 deletions
diff --git a/admin/admin_feed_inc.php b/admin/admin_feed_inc.php
index b3e2512..bef32ce 100755
--- a/admin/admin_feed_inc.php
+++ b/admin/admin_feed_inc.php
@@ -12,7 +12,7 @@ if( !empty( $_REQUEST['store_feed'] ) ) {
foreach ( array_keys( $contentTypes ) as $type ){
if( !empty( $_REQUEST[$type]['conjugation_phrase'] ) || !empty( $_REQUEST[$type]['is_target_linked'] ) ) {
$insertSql = "INSERT INTO feed_conjugation (content_type_guid, conjugation_phrase, is_target_linked) VALUES ( ?, ?, ?)";
- $gBitDb->query($insertSql, array( $type, $_REQUEST[$type]['conjugation_phrase'], empty($_REQUEST[$type]['is_target_linked'])?'y' : null ) );
+ $gBitDb->query($insertSql, [ $type, $_REQUEST[$type]['conjugation_phrase'], empty($_REQUEST[$type]['is_target_linked'])?'y' : null ] );
}
}
@@ -21,8 +21,6 @@ if( !empty( $_REQUEST['store_feed'] ) ) {
$contentTypes = get_content_types();
$gBitSmarty->assign('contentTypes',$contentTypes);
-
-
function get_content_types(){
global $gBitDb;
$selectSql = "SELECT lct.content_type_guid,conjugation_phrase, is_target_linked FROM liberty_content_types lct LEFT JOIN feed_conjugation fc ON (fc.content_type_guid = lct.content_type_guid)";
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index d61d542..8bb0c18 100755
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -5,7 +5,7 @@ $tables = [
conjugation_phrase C(255) NOTNULL,
feed_icon_url C(255),
is_target_linked C(1)
- "
+ ",
// CONSTRAINT ', CONSTRAINT `feed_conj_content_type_ref` FOREIGN KEY (`content_type_guid`) REFERENCES `".BIT_DB_PREFIX."liberty_content_types` ( `content_type_guid` )'
];
diff --git a/icons/pixelmixerbasic/address_16.png b/icons/pixelmixerbasic/address_16.png
index c07d7bd..c07d7bd 100644..100755
--- a/icons/pixelmixerbasic/address_16.png
+++ b/icons/pixelmixerbasic/address_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/address_32.png b/icons/pixelmixerbasic/address_32.png
index 6cb8247..6cb8247 100644..100755
--- a/icons/pixelmixerbasic/address_32.png
+++ b/icons/pixelmixerbasic/address_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/address_48.png b/icons/pixelmixerbasic/address_48.png
index 8b2976f..8b2976f 100644..100755
--- a/icons/pixelmixerbasic/address_48.png
+++ b/icons/pixelmixerbasic/address_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/address_64.png b/icons/pixelmixerbasic/address_64.png
index 72206bd..72206bd 100644..100755
--- a/icons/pixelmixerbasic/address_64.png
+++ b/icons/pixelmixerbasic/address_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/block_16.png b/icons/pixelmixerbasic/block_16.png
index f470123..f470123 100644..100755
--- a/icons/pixelmixerbasic/block_16.png
+++ b/icons/pixelmixerbasic/block_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/block_32.png b/icons/pixelmixerbasic/block_32.png
index ee46aba..ee46aba 100644..100755
--- a/icons/pixelmixerbasic/block_32.png
+++ b/icons/pixelmixerbasic/block_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/block_48.png b/icons/pixelmixerbasic/block_48.png
index f9e8e3c..f9e8e3c 100644..100755
--- a/icons/pixelmixerbasic/block_48.png
+++ b/icons/pixelmixerbasic/block_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/block_64.png b/icons/pixelmixerbasic/block_64.png
index 6311532..6311532 100644..100755
--- a/icons/pixelmixerbasic/block_64.png
+++ b/icons/pixelmixerbasic/block_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bookmark_16.png b/icons/pixelmixerbasic/bookmark_16.png
index ce3e830..ce3e830 100644..100755
--- a/icons/pixelmixerbasic/bookmark_16.png
+++ b/icons/pixelmixerbasic/bookmark_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bookmark_32.png b/icons/pixelmixerbasic/bookmark_32.png
index aba7c3e..aba7c3e 100644..100755
--- a/icons/pixelmixerbasic/bookmark_32.png
+++ b/icons/pixelmixerbasic/bookmark_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bookmark_48.png b/icons/pixelmixerbasic/bookmark_48.png
index 3481ed8..3481ed8 100644..100755
--- a/icons/pixelmixerbasic/bookmark_48.png
+++ b/icons/pixelmixerbasic/bookmark_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bookmark_64.png b/icons/pixelmixerbasic/bookmark_64.png
index b12db6f..b12db6f 100644..100755
--- a/icons/pixelmixerbasic/bookmark_64.png
+++ b/icons/pixelmixerbasic/bookmark_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/briefcase_16.png b/icons/pixelmixerbasic/briefcase_16.png
index 5406efd..5406efd 100644..100755
--- a/icons/pixelmixerbasic/briefcase_16.png
+++ b/icons/pixelmixerbasic/briefcase_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/briefcase_32.png b/icons/pixelmixerbasic/briefcase_32.png
index 8912ac2..8912ac2 100644..100755
--- a/icons/pixelmixerbasic/briefcase_32.png
+++ b/icons/pixelmixerbasic/briefcase_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/briefcase_48.png b/icons/pixelmixerbasic/briefcase_48.png
index ce1390e..ce1390e 100644..100755
--- a/icons/pixelmixerbasic/briefcase_48.png
+++ b/icons/pixelmixerbasic/briefcase_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/briefcase_64.png b/icons/pixelmixerbasic/briefcase_64.png
index 3febfd9..3febfd9 100644..100755
--- a/icons/pixelmixerbasic/briefcase_64.png
+++ b/icons/pixelmixerbasic/briefcase_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bubble_16.png b/icons/pixelmixerbasic/bubble_16.png
index 82f6f3a..82f6f3a 100644..100755
--- a/icons/pixelmixerbasic/bubble_16.png
+++ b/icons/pixelmixerbasic/bubble_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bubble_32.png b/icons/pixelmixerbasic/bubble_32.png
index 5efb453..5efb453 100644..100755
--- a/icons/pixelmixerbasic/bubble_32.png
+++ b/icons/pixelmixerbasic/bubble_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bubble_48.png b/icons/pixelmixerbasic/bubble_48.png
index a4117f1..a4117f1 100644..100755
--- a/icons/pixelmixerbasic/bubble_48.png
+++ b/icons/pixelmixerbasic/bubble_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/bubble_64.png b/icons/pixelmixerbasic/bubble_64.png
index 8f96ffc..8f96ffc 100644..100755
--- a/icons/pixelmixerbasic/bubble_64.png
+++ b/icons/pixelmixerbasic/bubble_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/buy_16.png b/icons/pixelmixerbasic/buy_16.png
index f8f24c3..f8f24c3 100644..100755
--- a/icons/pixelmixerbasic/buy_16.png
+++ b/icons/pixelmixerbasic/buy_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/buy_32.png b/icons/pixelmixerbasic/buy_32.png
index a5daa85..a5daa85 100644..100755
--- a/icons/pixelmixerbasic/buy_32.png
+++ b/icons/pixelmixerbasic/buy_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/buy_48.png b/icons/pixelmixerbasic/buy_48.png
index 54062db..54062db 100644..100755
--- a/icons/pixelmixerbasic/buy_48.png
+++ b/icons/pixelmixerbasic/buy_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/buy_64.png b/icons/pixelmixerbasic/buy_64.png
index 094705c..094705c 100644..100755
--- a/icons/pixelmixerbasic/buy_64.png
+++ b/icons/pixelmixerbasic/buy_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/calendar_16.png b/icons/pixelmixerbasic/calendar_16.png
index 12875d6..12875d6 100644..100755
--- a/icons/pixelmixerbasic/calendar_16.png
+++ b/icons/pixelmixerbasic/calendar_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/calendar_32.png b/icons/pixelmixerbasic/calendar_32.png
index f031c63..f031c63 100644..100755
--- a/icons/pixelmixerbasic/calendar_32.png
+++ b/icons/pixelmixerbasic/calendar_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/calendar_48.png b/icons/pixelmixerbasic/calendar_48.png
index 3660220..3660220 100644..100755
--- a/icons/pixelmixerbasic/calendar_48.png
+++ b/icons/pixelmixerbasic/calendar_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/calendar_64.png b/icons/pixelmixerbasic/calendar_64.png
index 3a1a097..3a1a097 100644..100755
--- a/icons/pixelmixerbasic/calendar_64.png
+++ b/icons/pixelmixerbasic/calendar_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clipboard_16.png b/icons/pixelmixerbasic/clipboard_16.png
index f747d8a..f747d8a 100644..100755
--- a/icons/pixelmixerbasic/clipboard_16.png
+++ b/icons/pixelmixerbasic/clipboard_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clipboard_32.png b/icons/pixelmixerbasic/clipboard_32.png
index 119464e..119464e 100644..100755
--- a/icons/pixelmixerbasic/clipboard_32.png
+++ b/icons/pixelmixerbasic/clipboard_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clipboard_48.png b/icons/pixelmixerbasic/clipboard_48.png
index 52d8e01..52d8e01 100644..100755
--- a/icons/pixelmixerbasic/clipboard_48.png
+++ b/icons/pixelmixerbasic/clipboard_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clipboard_64.png b/icons/pixelmixerbasic/clipboard_64.png
index 0530642..0530642 100644..100755
--- a/icons/pixelmixerbasic/clipboard_64.png
+++ b/icons/pixelmixerbasic/clipboard_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clock_16.png b/icons/pixelmixerbasic/clock_16.png
index e58a115..e58a115 100644..100755
--- a/icons/pixelmixerbasic/clock_16.png
+++ b/icons/pixelmixerbasic/clock_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clock_32.png b/icons/pixelmixerbasic/clock_32.png
index 2f29599..2f29599 100644..100755
--- a/icons/pixelmixerbasic/clock_32.png
+++ b/icons/pixelmixerbasic/clock_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clock_48.png b/icons/pixelmixerbasic/clock_48.png
index bc4c039..bc4c039 100644..100755
--- a/icons/pixelmixerbasic/clock_48.png
+++ b/icons/pixelmixerbasic/clock_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/clock_64.png b/icons/pixelmixerbasic/clock_64.png
index 2152ec3..2152ec3 100644..100755
--- a/icons/pixelmixerbasic/clock_64.png
+++ b/icons/pixelmixerbasic/clock_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/delete_16.png b/icons/pixelmixerbasic/delete_16.png
index 3e94d7c..3e94d7c 100644..100755
--- a/icons/pixelmixerbasic/delete_16.png
+++ b/icons/pixelmixerbasic/delete_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/delete_32.png b/icons/pixelmixerbasic/delete_32.png
index 4f1cde2..4f1cde2 100644..100755
--- a/icons/pixelmixerbasic/delete_32.png
+++ b/icons/pixelmixerbasic/delete_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/delete_48.png b/icons/pixelmixerbasic/delete_48.png
index 6b5fa3f..6b5fa3f 100644..100755
--- a/icons/pixelmixerbasic/delete_48.png
+++ b/icons/pixelmixerbasic/delete_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/delete_64.png b/icons/pixelmixerbasic/delete_64.png
index 700410d..700410d 100644..100755
--- a/icons/pixelmixerbasic/delete_64.png
+++ b/icons/pixelmixerbasic/delete_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/diagram_16.png b/icons/pixelmixerbasic/diagram_16.png
index 4f8dcc1..4f8dcc1 100644..100755
--- a/icons/pixelmixerbasic/diagram_16.png
+++ b/icons/pixelmixerbasic/diagram_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/diagram_32.png b/icons/pixelmixerbasic/diagram_32.png
index 31f2cd5..31f2cd5 100644..100755
--- a/icons/pixelmixerbasic/diagram_32.png
+++ b/icons/pixelmixerbasic/diagram_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/diagram_48.png b/icons/pixelmixerbasic/diagram_48.png
index e4d252e..e4d252e 100644..100755
--- a/icons/pixelmixerbasic/diagram_48.png
+++ b/icons/pixelmixerbasic/diagram_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/diagram_64.png b/icons/pixelmixerbasic/diagram_64.png
index 07a6aef..07a6aef 100644..100755
--- a/icons/pixelmixerbasic/diagram_64.png
+++ b/icons/pixelmixerbasic/diagram_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/document_16.png b/icons/pixelmixerbasic/document_16.png
index 398aa77..398aa77 100644..100755
--- a/icons/pixelmixerbasic/document_16.png
+++ b/icons/pixelmixerbasic/document_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/document_32.png b/icons/pixelmixerbasic/document_32.png
index a8a0179..a8a0179 100644..100755
--- a/icons/pixelmixerbasic/document_32.png
+++ b/icons/pixelmixerbasic/document_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/document_48.png b/icons/pixelmixerbasic/document_48.png
index ba272e7..ba272e7 100644..100755
--- a/icons/pixelmixerbasic/document_48.png
+++ b/icons/pixelmixerbasic/document_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/document_64.png b/icons/pixelmixerbasic/document_64.png
index 8f3d089..8f3d089 100644..100755
--- a/icons/pixelmixerbasic/document_64.png
+++ b/icons/pixelmixerbasic/document_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/down_16.png b/icons/pixelmixerbasic/down_16.png
index 8175898..8175898 100644..100755
--- a/icons/pixelmixerbasic/down_16.png
+++ b/icons/pixelmixerbasic/down_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/down_32.png b/icons/pixelmixerbasic/down_32.png
index 0a268ad..0a268ad 100644..100755
--- a/icons/pixelmixerbasic/down_32.png
+++ b/icons/pixelmixerbasic/down_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/down_48.png b/icons/pixelmixerbasic/down_48.png
index 34c5040..34c5040 100644..100755
--- a/icons/pixelmixerbasic/down_48.png
+++ b/icons/pixelmixerbasic/down_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/down_64.png b/icons/pixelmixerbasic/down_64.png
index 3583df4..3583df4 100644..100755
--- a/icons/pixelmixerbasic/down_64.png
+++ b/icons/pixelmixerbasic/down_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/flag_16.png b/icons/pixelmixerbasic/flag_16.png
index d14a538..d14a538 100644..100755
--- a/icons/pixelmixerbasic/flag_16.png
+++ b/icons/pixelmixerbasic/flag_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/flag_32.png b/icons/pixelmixerbasic/flag_32.png
index c558de2..c558de2 100644..100755
--- a/icons/pixelmixerbasic/flag_32.png
+++ b/icons/pixelmixerbasic/flag_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/flag_48.png b/icons/pixelmixerbasic/flag_48.png
index c6a6c7b..c6a6c7b 100644..100755
--- a/icons/pixelmixerbasic/flag_48.png
+++ b/icons/pixelmixerbasic/flag_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/flag_64.png b/icons/pixelmixerbasic/flag_64.png
index b75139a..b75139a 100644..100755
--- a/icons/pixelmixerbasic/flag_64.png
+++ b/icons/pixelmixerbasic/flag_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/folder_16.png b/icons/pixelmixerbasic/folder_16.png
index 3ce90a3..3ce90a3 100644..100755
--- a/icons/pixelmixerbasic/folder_16.png
+++ b/icons/pixelmixerbasic/folder_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/folder_32.png b/icons/pixelmixerbasic/folder_32.png
index 4432d61..4432d61 100644..100755
--- a/icons/pixelmixerbasic/folder_32.png
+++ b/icons/pixelmixerbasic/folder_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/folder_48.png b/icons/pixelmixerbasic/folder_48.png
index 3668ceb..3668ceb 100644..100755
--- a/icons/pixelmixerbasic/folder_48.png
+++ b/icons/pixelmixerbasic/folder_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/folder_64.png b/icons/pixelmixerbasic/folder_64.png
index 72124ac..72124ac 100644..100755
--- a/icons/pixelmixerbasic/folder_64.png
+++ b/icons/pixelmixerbasic/folder_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/gear_16.png b/icons/pixelmixerbasic/gear_16.png
index 0457f56..0457f56 100644..100755
--- a/icons/pixelmixerbasic/gear_16.png
+++ b/icons/pixelmixerbasic/gear_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/gear_32.png b/icons/pixelmixerbasic/gear_32.png
index 6b8f504..6b8f504 100644..100755
--- a/icons/pixelmixerbasic/gear_32.png
+++ b/icons/pixelmixerbasic/gear_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/gear_48.png b/icons/pixelmixerbasic/gear_48.png
index f1bff7f..f1bff7f 100644..100755
--- a/icons/pixelmixerbasic/gear_48.png
+++ b/icons/pixelmixerbasic/gear_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/gear_64.png b/icons/pixelmixerbasic/gear_64.png
index 1a828bf..1a828bf 100644..100755
--- a/icons/pixelmixerbasic/gear_64.png
+++ b/icons/pixelmixerbasic/gear_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/globe_16.png b/icons/pixelmixerbasic/globe_16.png
index 2866f4c..2866f4c 100644..100755
--- a/icons/pixelmixerbasic/globe_16.png
+++ b/icons/pixelmixerbasic/globe_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/globe_32.png b/icons/pixelmixerbasic/globe_32.png
index 0460ddc..0460ddc 100644..100755
--- a/icons/pixelmixerbasic/globe_32.png
+++ b/icons/pixelmixerbasic/globe_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/globe_48.png b/icons/pixelmixerbasic/globe_48.png
index 9fba391..9fba391 100644..100755
--- a/icons/pixelmixerbasic/globe_48.png
+++ b/icons/pixelmixerbasic/globe_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/globe_64.png b/icons/pixelmixerbasic/globe_64.png
index 3fb78ff..3fb78ff 100644..100755
--- a/icons/pixelmixerbasic/globe_64.png
+++ b/icons/pixelmixerbasic/globe_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/heart_16.png b/icons/pixelmixerbasic/heart_16.png
index f5a5a3d..f5a5a3d 100644..100755
--- a/icons/pixelmixerbasic/heart_16.png
+++ b/icons/pixelmixerbasic/heart_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/heart_32.png b/icons/pixelmixerbasic/heart_32.png
index 2c28f15..2c28f15 100644..100755
--- a/icons/pixelmixerbasic/heart_32.png
+++ b/icons/pixelmixerbasic/heart_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/heart_48.png b/icons/pixelmixerbasic/heart_48.png
index 14f7115..14f7115 100644..100755
--- a/icons/pixelmixerbasic/heart_48.png
+++ b/icons/pixelmixerbasic/heart_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/heart_64.png b/icons/pixelmixerbasic/heart_64.png
index 7329c67..7329c67 100644..100755
--- a/icons/pixelmixerbasic/heart_64.png
+++ b/icons/pixelmixerbasic/heart_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/help_16.png b/icons/pixelmixerbasic/help_16.png
index 4fb64bb..4fb64bb 100644..100755
--- a/icons/pixelmixerbasic/help_16.png
+++ b/icons/pixelmixerbasic/help_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/help_32.png b/icons/pixelmixerbasic/help_32.png
index f1a0666..f1a0666 100644..100755
--- a/icons/pixelmixerbasic/help_32.png
+++ b/icons/pixelmixerbasic/help_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/help_48.png b/icons/pixelmixerbasic/help_48.png
index edca01f..edca01f 100644..100755
--- a/icons/pixelmixerbasic/help_48.png
+++ b/icons/pixelmixerbasic/help_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/help_64.png b/icons/pixelmixerbasic/help_64.png
index 3881757..3881757 100644..100755
--- a/icons/pixelmixerbasic/help_64.png
+++ b/icons/pixelmixerbasic/help_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/home_16.png b/icons/pixelmixerbasic/home_16.png
index c9924bf..c9924bf 100644..100755
--- a/icons/pixelmixerbasic/home_16.png
+++ b/icons/pixelmixerbasic/home_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/home_32.png b/icons/pixelmixerbasic/home_32.png
index e8ccb64..e8ccb64 100644..100755
--- a/icons/pixelmixerbasic/home_32.png
+++ b/icons/pixelmixerbasic/home_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/home_48.png b/icons/pixelmixerbasic/home_48.png
index d19132b..d19132b 100644..100755
--- a/icons/pixelmixerbasic/home_48.png
+++ b/icons/pixelmixerbasic/home_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/home_64.png b/icons/pixelmixerbasic/home_64.png
index a25ebbb..a25ebbb 100644..100755
--- a/icons/pixelmixerbasic/home_64.png
+++ b/icons/pixelmixerbasic/home_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/info_16.png b/icons/pixelmixerbasic/info_16.png
index fc33de0..fc33de0 100644..100755
--- a/icons/pixelmixerbasic/info_16.png
+++ b/icons/pixelmixerbasic/info_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/info_32.png b/icons/pixelmixerbasic/info_32.png
index 2451ca2..2451ca2 100644..100755
--- a/icons/pixelmixerbasic/info_32.png
+++ b/icons/pixelmixerbasic/info_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/info_48.png b/icons/pixelmixerbasic/info_48.png
index d751a42..d751a42 100644..100755
--- a/icons/pixelmixerbasic/info_48.png
+++ b/icons/pixelmixerbasic/info_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/info_64.png b/icons/pixelmixerbasic/info_64.png
index 4d166f5..4d166f5 100644..100755
--- a/icons/pixelmixerbasic/info_64.png
+++ b/icons/pixelmixerbasic/info_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/key_16.png b/icons/pixelmixerbasic/key_16.png
index e98c9b2..e98c9b2 100644..100755
--- a/icons/pixelmixerbasic/key_16.png
+++ b/icons/pixelmixerbasic/key_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/key_32.png b/icons/pixelmixerbasic/key_32.png
index 0192e2d..0192e2d 100644..100755
--- a/icons/pixelmixerbasic/key_32.png
+++ b/icons/pixelmixerbasic/key_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/key_48.png b/icons/pixelmixerbasic/key_48.png
index 333b6de..333b6de 100644..100755
--- a/icons/pixelmixerbasic/key_48.png
+++ b/icons/pixelmixerbasic/key_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/key_64.png b/icons/pixelmixerbasic/key_64.png
index 5cbeba9..5cbeba9 100644..100755
--- a/icons/pixelmixerbasic/key_64.png
+++ b/icons/pixelmixerbasic/key_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/label_16.png b/icons/pixelmixerbasic/label_16.png
index c391f24..c391f24 100644..100755
--- a/icons/pixelmixerbasic/label_16.png
+++ b/icons/pixelmixerbasic/label_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/label_32.png b/icons/pixelmixerbasic/label_32.png
index 522c44a..522c44a 100644..100755
--- a/icons/pixelmixerbasic/label_32.png
+++ b/icons/pixelmixerbasic/label_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/label_48.png b/icons/pixelmixerbasic/label_48.png
index e04dac3..e04dac3 100644..100755
--- a/icons/pixelmixerbasic/label_48.png
+++ b/icons/pixelmixerbasic/label_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/label_64.png b/icons/pixelmixerbasic/label_64.png
index 9ca2275..9ca2275 100644..100755
--- a/icons/pixelmixerbasic/label_64.png
+++ b/icons/pixelmixerbasic/label_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/left_16.png b/icons/pixelmixerbasic/left_16.png
index 0556e02..0556e02 100644..100755
--- a/icons/pixelmixerbasic/left_16.png
+++ b/icons/pixelmixerbasic/left_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/left_32.png b/icons/pixelmixerbasic/left_32.png
index 8eff840..8eff840 100644..100755
--- a/icons/pixelmixerbasic/left_32.png
+++ b/icons/pixelmixerbasic/left_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/left_48.png b/icons/pixelmixerbasic/left_48.png
index 452c673..452c673 100644..100755
--- a/icons/pixelmixerbasic/left_48.png
+++ b/icons/pixelmixerbasic/left_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/left_64.png b/icons/pixelmixerbasic/left_64.png
index 0a38994..0a38994 100644..100755
--- a/icons/pixelmixerbasic/left_64.png
+++ b/icons/pixelmixerbasic/left_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/letter_16.png b/icons/pixelmixerbasic/letter_16.png
index b11ee3d..b11ee3d 100644..100755
--- a/icons/pixelmixerbasic/letter_16.png
+++ b/icons/pixelmixerbasic/letter_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/letter_32.png b/icons/pixelmixerbasic/letter_32.png
index f6f6349..f6f6349 100644..100755
--- a/icons/pixelmixerbasic/letter_32.png
+++ b/icons/pixelmixerbasic/letter_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/letter_48.png b/icons/pixelmixerbasic/letter_48.png
index 474b695..474b695 100644..100755
--- a/icons/pixelmixerbasic/letter_48.png
+++ b/icons/pixelmixerbasic/letter_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/letter_64.png b/icons/pixelmixerbasic/letter_64.png
index 1b57891..1b57891 100644..100755
--- a/icons/pixelmixerbasic/letter_64.png
+++ b/icons/pixelmixerbasic/letter_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/license.txt b/icons/pixelmixerbasic/license.txt
index 050a89e..050a89e 100644..100755
--- a/icons/pixelmixerbasic/license.txt
+++ b/icons/pixelmixerbasic/license.txt
diff --git a/icons/pixelmixerbasic/monitor_16.png b/icons/pixelmixerbasic/monitor_16.png
index f232850..f232850 100644..100755
--- a/icons/pixelmixerbasic/monitor_16.png
+++ b/icons/pixelmixerbasic/monitor_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/monitor_32.png b/icons/pixelmixerbasic/monitor_32.png
index b264fa3..b264fa3 100644..100755
--- a/icons/pixelmixerbasic/monitor_32.png
+++ b/icons/pixelmixerbasic/monitor_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/monitor_48.png b/icons/pixelmixerbasic/monitor_48.png
index 35fcc6f..35fcc6f 100644..100755
--- a/icons/pixelmixerbasic/monitor_48.png
+++ b/icons/pixelmixerbasic/monitor_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/monitor_64.png b/icons/pixelmixerbasic/monitor_64.png
index 3a8c820..3a8c820 100644..100755
--- a/icons/pixelmixerbasic/monitor_64.png
+++ b/icons/pixelmixerbasic/monitor_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/pencil_16.png b/icons/pixelmixerbasic/pencil_16.png
index 20ec92e..20ec92e 100644..100755
--- a/icons/pixelmixerbasic/pencil_16.png
+++ b/icons/pixelmixerbasic/pencil_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/pencil_32.png b/icons/pixelmixerbasic/pencil_32.png
index a99e841..a99e841 100644..100755
--- a/icons/pixelmixerbasic/pencil_32.png
+++ b/icons/pixelmixerbasic/pencil_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/pencil_48.png b/icons/pixelmixerbasic/pencil_48.png
index 9c134f9..9c134f9 100644..100755
--- a/icons/pixelmixerbasic/pencil_48.png
+++ b/icons/pixelmixerbasic/pencil_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/pencil_64.png b/icons/pixelmixerbasic/pencil_64.png
index 8544818..8544818 100644..100755
--- a/icons/pixelmixerbasic/pencil_64.png
+++ b/icons/pixelmixerbasic/pencil_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/plus_16.png b/icons/pixelmixerbasic/plus_16.png
index 1b21836..1b21836 100644..100755
--- a/icons/pixelmixerbasic/plus_16.png
+++ b/icons/pixelmixerbasic/plus_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/plus_32.png b/icons/pixelmixerbasic/plus_32.png
index e4fe053..e4fe053 100644..100755
--- a/icons/pixelmixerbasic/plus_32.png
+++ b/icons/pixelmixerbasic/plus_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/plus_48.png b/icons/pixelmixerbasic/plus_48.png
index 8ba5013..8ba5013 100644..100755
--- a/icons/pixelmixerbasic/plus_48.png
+++ b/icons/pixelmixerbasic/plus_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/plus_64.png b/icons/pixelmixerbasic/plus_64.png
index 7ed2c95..7ed2c95 100644..100755
--- a/icons/pixelmixerbasic/plus_64.png
+++ b/icons/pixelmixerbasic/plus_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/present_16.png b/icons/pixelmixerbasic/present_16.png
index 9cb7e5c..9cb7e5c 100644..100755
--- a/icons/pixelmixerbasic/present_16.png
+++ b/icons/pixelmixerbasic/present_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/present_32.png b/icons/pixelmixerbasic/present_32.png
index 28546b0..28546b0 100644..100755
--- a/icons/pixelmixerbasic/present_32.png
+++ b/icons/pixelmixerbasic/present_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/present_48.png b/icons/pixelmixerbasic/present_48.png
index f22c011..f22c011 100644..100755
--- a/icons/pixelmixerbasic/present_48.png
+++ b/icons/pixelmixerbasic/present_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/present_64.png b/icons/pixelmixerbasic/present_64.png
index 58275e8..58275e8 100644..100755
--- a/icons/pixelmixerbasic/present_64.png
+++ b/icons/pixelmixerbasic/present_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/print_16.png b/icons/pixelmixerbasic/print_16.png
index 5e9bf5d..5e9bf5d 100644..100755
--- a/icons/pixelmixerbasic/print_16.png
+++ b/icons/pixelmixerbasic/print_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/print_32.png b/icons/pixelmixerbasic/print_32.png
index 470522b..470522b 100644..100755
--- a/icons/pixelmixerbasic/print_32.png
+++ b/icons/pixelmixerbasic/print_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/print_48.png b/icons/pixelmixerbasic/print_48.png
index b33a775..b33a775 100644..100755
--- a/icons/pixelmixerbasic/print_48.png
+++ b/icons/pixelmixerbasic/print_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/print_64.png b/icons/pixelmixerbasic/print_64.png
index 3c2a27e..3c2a27e 100644..100755
--- a/icons/pixelmixerbasic/print_64.png
+++ b/icons/pixelmixerbasic/print_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/right_16.png b/icons/pixelmixerbasic/right_16.png
index c6c20d2..c6c20d2 100644..100755
--- a/icons/pixelmixerbasic/right_16.png
+++ b/icons/pixelmixerbasic/right_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/right_32.png b/icons/pixelmixerbasic/right_32.png
index 37f9932..37f9932 100644..100755
--- a/icons/pixelmixerbasic/right_32.png
+++ b/icons/pixelmixerbasic/right_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/right_48.png b/icons/pixelmixerbasic/right_48.png
index 49c155c..49c155c 100644..100755
--- a/icons/pixelmixerbasic/right_48.png
+++ b/icons/pixelmixerbasic/right_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/right_64.png b/icons/pixelmixerbasic/right_64.png
index 3f4e13e..3f4e13e 100644..100755
--- a/icons/pixelmixerbasic/right_64.png
+++ b/icons/pixelmixerbasic/right_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/save_16.png b/icons/pixelmixerbasic/save_16.png
index cd0162b..cd0162b 100644..100755
--- a/icons/pixelmixerbasic/save_16.png
+++ b/icons/pixelmixerbasic/save_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/save_32.png b/icons/pixelmixerbasic/save_32.png
index 05137c8..05137c8 100644..100755
--- a/icons/pixelmixerbasic/save_32.png
+++ b/icons/pixelmixerbasic/save_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/save_48.png b/icons/pixelmixerbasic/save_48.png
index 20352a4..20352a4 100644..100755
--- a/icons/pixelmixerbasic/save_48.png
+++ b/icons/pixelmixerbasic/save_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/save_64.png b/icons/pixelmixerbasic/save_64.png
index a3b4ce4..a3b4ce4 100644..100755
--- a/icons/pixelmixerbasic/save_64.png
+++ b/icons/pixelmixerbasic/save_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/search_16.png b/icons/pixelmixerbasic/search_16.png
index 7ff964f..7ff964f 100644..100755
--- a/icons/pixelmixerbasic/search_16.png
+++ b/icons/pixelmixerbasic/search_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/search_32.png b/icons/pixelmixerbasic/search_32.png
index 6adc65a..6adc65a 100644..100755
--- a/icons/pixelmixerbasic/search_32.png
+++ b/icons/pixelmixerbasic/search_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/search_48.png b/icons/pixelmixerbasic/search_48.png
index 1b5f255..1b5f255 100644..100755
--- a/icons/pixelmixerbasic/search_48.png
+++ b/icons/pixelmixerbasic/search_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/search_64.png b/icons/pixelmixerbasic/search_64.png
index 78cb0df..78cb0df 100644..100755
--- a/icons/pixelmixerbasic/search_64.png
+++ b/icons/pixelmixerbasic/search_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/shield_16.png b/icons/pixelmixerbasic/shield_16.png
index 5537df7..5537df7 100644..100755
--- a/icons/pixelmixerbasic/shield_16.png
+++ b/icons/pixelmixerbasic/shield_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/shield_32.png b/icons/pixelmixerbasic/shield_32.png
index 0ec892a..0ec892a 100644..100755
--- a/icons/pixelmixerbasic/shield_32.png
+++ b/icons/pixelmixerbasic/shield_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/shield_48.png b/icons/pixelmixerbasic/shield_48.png
index c36cd18..c36cd18 100644..100755
--- a/icons/pixelmixerbasic/shield_48.png
+++ b/icons/pixelmixerbasic/shield_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/shield_64.png b/icons/pixelmixerbasic/shield_64.png
index 9404ca5..9404ca5 100644..100755
--- a/icons/pixelmixerbasic/shield_64.png
+++ b/icons/pixelmixerbasic/shield_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/statistics_16.png b/icons/pixelmixerbasic/statistics_16.png
index f6ea87a..f6ea87a 100644..100755
--- a/icons/pixelmixerbasic/statistics_16.png
+++ b/icons/pixelmixerbasic/statistics_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/statistics_32.png b/icons/pixelmixerbasic/statistics_32.png
index 89e0aeb..89e0aeb 100644..100755
--- a/icons/pixelmixerbasic/statistics_32.png
+++ b/icons/pixelmixerbasic/statistics_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/statistics_48.png b/icons/pixelmixerbasic/statistics_48.png
index a712aa8..a712aa8 100644..100755
--- a/icons/pixelmixerbasic/statistics_48.png
+++ b/icons/pixelmixerbasic/statistics_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/statistics_64.png b/icons/pixelmixerbasic/statistics_64.png
index 0eca410..0eca410 100644..100755
--- a/icons/pixelmixerbasic/statistics_64.png
+++ b/icons/pixelmixerbasic/statistics_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/stop_16.png b/icons/pixelmixerbasic/stop_16.png
index 16810fe..16810fe 100644..100755
--- a/icons/pixelmixerbasic/stop_16.png
+++ b/icons/pixelmixerbasic/stop_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/stop_32.png b/icons/pixelmixerbasic/stop_32.png
index bfafbd3..bfafbd3 100644..100755
--- a/icons/pixelmixerbasic/stop_32.png
+++ b/icons/pixelmixerbasic/stop_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/stop_48.png b/icons/pixelmixerbasic/stop_48.png
index 61e5b15..61e5b15 100644..100755
--- a/icons/pixelmixerbasic/stop_48.png
+++ b/icons/pixelmixerbasic/stop_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/stop_64.png b/icons/pixelmixerbasic/stop_64.png
index 8397184..8397184 100644..100755
--- a/icons/pixelmixerbasic/stop_64.png
+++ b/icons/pixelmixerbasic/stop_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/tick_16.png b/icons/pixelmixerbasic/tick_16.png
index 6bd8724..6bd8724 100644..100755
--- a/icons/pixelmixerbasic/tick_16.png
+++ b/icons/pixelmixerbasic/tick_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/tick_32.png b/icons/pixelmixerbasic/tick_32.png
index fd847a5..fd847a5 100644..100755
--- a/icons/pixelmixerbasic/tick_32.png
+++ b/icons/pixelmixerbasic/tick_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/tick_48.png b/icons/pixelmixerbasic/tick_48.png
index 914dcf8..914dcf8 100644..100755
--- a/icons/pixelmixerbasic/tick_48.png
+++ b/icons/pixelmixerbasic/tick_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/tick_64.png b/icons/pixelmixerbasic/tick_64.png
index f7d4a49..f7d4a49 100644..100755
--- a/icons/pixelmixerbasic/tick_64.png
+++ b/icons/pixelmixerbasic/tick_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/trash_16.png b/icons/pixelmixerbasic/trash_16.png
index 459a9ca..459a9ca 100644..100755
--- a/icons/pixelmixerbasic/trash_16.png
+++ b/icons/pixelmixerbasic/trash_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/trash_32.png b/icons/pixelmixerbasic/trash_32.png
index c61e169..c61e169 100644..100755
--- a/icons/pixelmixerbasic/trash_32.png
+++ b/icons/pixelmixerbasic/trash_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/trash_48.png b/icons/pixelmixerbasic/trash_48.png
index 0d3f1eb..0d3f1eb 100644..100755
--- a/icons/pixelmixerbasic/trash_48.png
+++ b/icons/pixelmixerbasic/trash_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/trash_64.png b/icons/pixelmixerbasic/trash_64.png
index cebd6a5..cebd6a5 100644..100755
--- a/icons/pixelmixerbasic/trash_64.png
+++ b/icons/pixelmixerbasic/trash_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/up_16.png b/icons/pixelmixerbasic/up_16.png
index f12a7b6..f12a7b6 100644..100755
--- a/icons/pixelmixerbasic/up_16.png
+++ b/icons/pixelmixerbasic/up_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/up_32.png b/icons/pixelmixerbasic/up_32.png
index ac41e9c..ac41e9c 100644..100755
--- a/icons/pixelmixerbasic/up_32.png
+++ b/icons/pixelmixerbasic/up_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/up_48.png b/icons/pixelmixerbasic/up_48.png
index 41bf3aa..41bf3aa 100644..100755
--- a/icons/pixelmixerbasic/up_48.png
+++ b/icons/pixelmixerbasic/up_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/up_64.png b/icons/pixelmixerbasic/up_64.png
index 87b2a14..87b2a14 100644..100755
--- a/icons/pixelmixerbasic/up_64.png
+++ b/icons/pixelmixerbasic/up_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/user_16.png b/icons/pixelmixerbasic/user_16.png
index 12b8460..12b8460 100644..100755
--- a/icons/pixelmixerbasic/user_16.png
+++ b/icons/pixelmixerbasic/user_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/user_32.png b/icons/pixelmixerbasic/user_32.png
index 9550d9c..9550d9c 100644..100755
--- a/icons/pixelmixerbasic/user_32.png
+++ b/icons/pixelmixerbasic/user_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/user_48.png b/icons/pixelmixerbasic/user_48.png
index f53743c..f53743c 100644..100755
--- a/icons/pixelmixerbasic/user_48.png
+++ b/icons/pixelmixerbasic/user_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/user_64.png b/icons/pixelmixerbasic/user_64.png
index c0e33c7..c0e33c7 100644..100755
--- a/icons/pixelmixerbasic/user_64.png
+++ b/icons/pixelmixerbasic/user_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/wallet_16.png b/icons/pixelmixerbasic/wallet_16.png
index 8e96357..8e96357 100644..100755
--- a/icons/pixelmixerbasic/wallet_16.png
+++ b/icons/pixelmixerbasic/wallet_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/wallet_32.png b/icons/pixelmixerbasic/wallet_32.png
index 8151cbd..8151cbd 100644..100755
--- a/icons/pixelmixerbasic/wallet_32.png
+++ b/icons/pixelmixerbasic/wallet_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/wallet_48.png b/icons/pixelmixerbasic/wallet_48.png
index 9afa75d..9afa75d 100644..100755
--- a/icons/pixelmixerbasic/wallet_48.png
+++ b/icons/pixelmixerbasic/wallet_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/wallet_64.png b/icons/pixelmixerbasic/wallet_64.png
index 5246b94..5246b94 100644..100755
--- a/icons/pixelmixerbasic/wallet_64.png
+++ b/icons/pixelmixerbasic/wallet_64.png
Binary files differ
diff --git a/icons/pixelmixerbasic/warning_16.png b/icons/pixelmixerbasic/warning_16.png
index df16f8a..df16f8a 100644..100755
--- a/icons/pixelmixerbasic/warning_16.png
+++ b/icons/pixelmixerbasic/warning_16.png
Binary files differ
diff --git a/icons/pixelmixerbasic/warning_32.png b/icons/pixelmixerbasic/warning_32.png
index 6e1500b..6e1500b 100644..100755
--- a/icons/pixelmixerbasic/warning_32.png
+++ b/icons/pixelmixerbasic/warning_32.png
Binary files differ
diff --git a/icons/pixelmixerbasic/warning_48.png b/icons/pixelmixerbasic/warning_48.png
index 0b42778..0b42778 100644..100755
--- a/icons/pixelmixerbasic/warning_48.png
+++ b/icons/pixelmixerbasic/warning_48.png
Binary files differ
diff --git a/icons/pixelmixerbasic/warning_64.png b/icons/pixelmixerbasic/warning_64.png
index b1b5f0a..b1b5f0a 100644..100755
--- a/icons/pixelmixerbasic/warning_64.png
+++ b/icons/pixelmixerbasic/warning_64.png
Binary files differ
diff --git a/icons/pkg_feed.png b/icons/pkg_feed.png
index a4117f1..a4117f1 100644..100755
--- a/icons/pkg_feed.png
+++ b/icons/pkg_feed.png
Binary files differ
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index 65525f5..958e0fa 100755
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -12,7 +12,6 @@ define( 'FEED_PKG_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'
define( 'FEED_PKG_INCLUDE_URL', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/includes/');
$gBitSystem->registerPackage( $pRegisterHash );
-
if( $gBitSystem->isPackageActive( 'feed' ) ) {
if( $gBitUser->hasPermission( 'p_feed_view' )) {
$menuHash = [
diff --git a/includes/classes/FeedStatus.php b/includes/classes/FeedStatus.php
index 07d4b97..fb5f34a 100755
--- a/includes/classes/FeedStatus.php
+++ b/includes/classes/FeedStatus.php
@@ -12,6 +12,7 @@
* required setup
*/
namespace Bitweaver\Feed;
+
use Bitweaver\Liberty\LibertyComment;
use Bitweaver\Users\RoleUser;
@@ -27,15 +28,15 @@ class FeedStatus extends LibertyComment {
* During initialisation, be sure to call our base constructors
**/
public function FeedStatus($pCommentId = null, $pContentId = null, $pInfo = null) {
-
+
LibertyComment::LibertyComment($pCommentId,$pContentId,$pInfo);
-
+
/* // Permission setup
$this->mViewContentPerm = 'p_boards_read';
$this->mUpdateContentPerm = 'p_boards_post_update';
$this->mAdminContentPerm = 'p_boards_admin';
*/
-
+
$this->mContentTypeGuid = FEEDSTATUS_CONTENT_TYPE_GUID;
$this->registerContentType( FEEDSTATUS_CONTENT_TYPE_GUID, [
'content_type_guid' => FEEDSTATUS_CONTENT_TYPE_GUID,
@@ -43,7 +44,7 @@ class FeedStatus extends LibertyComment {
'handler_class' => 'FeedStatus',
'handler_package' => 'feed',
'handler_file' => 'FeedStatus.php',
- 'maintainer_url' => 'https://www.bitweaver.org'
+ 'maintainer_url' => 'https://www.bitweaver.org',
] );
/*
$this->mViewContentPerm = 'p_loc_view';
@@ -52,7 +53,7 @@ class FeedStatus extends LibertyComment {
$this->mAdminContentPerm = 'p_loc_admin';
*/
}
-
+
public function getThumbnailUrl( string $pSize = 'avatar', ?array $pInfoHash = null, ?int $pSecondaryId = null, ?int $pDefault = null ): string|null {
$rootUser = new RoleUser(null,$this->mInfo['root_id']);
$rootUser->load();
diff --git a/includes/feed_lib.php b/includes/feed_lib.php
index e4766c2..aafa5ba 100644
--- a/includes/feed_lib.php
+++ b/includes/feed_lib.php
@@ -13,6 +13,7 @@
* feed_get_actions
*/
namespace Bitweaver\Feed;
+
use Bitweaver\BitBase;
use Bitweaver\KernelTools;
use Bitweaver\Liberty\LibertyContent;
@@ -46,7 +47,7 @@ function feed_get_actions( $pListHash ) {
$overrides = $gBitDb->getAssoc( $conjugationQuery );
$actions = [];
-
+
//loop through directed actions
while ( $action = $res->fetchRow() ){
if( !empty($action['content_id']) ) { //indicates that this isn't a direct action, more of a "status update" ex. "Ronald is pleased with his artwork"
@@ -63,7 +64,7 @@ function feed_get_actions( $pListHash ) {
}
}else{
$action['real_log'] .= KernelTools::tra( 'edited' ).' <a href="'.$content->getDisplayUrl().'">'.$content->getTitle().'</a>';
- }
+ }
} else {
unset( $action ); //invalid content_id
}
@@ -106,22 +107,21 @@ function feed_get_status( $pListHash ){
$res = $gBitDb->query( $query, $bindVars, $pListHash['max_records'] );
- $user = new RoleUser($pListHash['user_id']);
+ $user = new RoleUser($pListHash['user_id']);
$user->load();
-
-
+
while ( $status = $res->fetchRow() ){
$avatarUrl = $user->getThumbnailUrl();
if(empty($avatarUrl)){
$avatarUrl = USERS_PKG_URI."icons/silhouette.png";
}
-
+
$status['feed_icon_url'] = $avatarUrl;
-
+
$comment = new LibertyComment(null,$status['content_id']);
$replies = $comment->getComments($status['content_id'],null,null,'commentDate_asc');
$status['replies'] = $replies;
-
+
foreach ( $status['replies'] as &$reply ){
$replyUser = new RoleUser($reply['user_id']);
$replyUser->load();
@@ -145,9 +145,9 @@ function feed_get_status( $pListHash ){
break;
}
$i++;
- }
+ }
}
- $statuses[] = $status;
+ $statuses[] = $status;
}
return $statuses;
@@ -155,13 +155,12 @@ function feed_get_status( $pListHash ){
function feed_get_status_and_actions( $pParamHash ) {
-
}
function feed_set_status( $pParamHash ){
global $gBitDb;
-
+
$status = new FeedStatus();
global $gBitUser;
diff --git a/modules/mod_feed.tpl b/modules/mod_feed.tpl
index c7513a5..c7513a5 100644..100755
--- a/modules/mod_feed.tpl
+++ b/modules/mod_feed.tpl
diff --git a/modules/mod_status.php b/modules/mod_status.php
index 192617e..a75caa8 100755
--- a/modules/mod_status.php
+++ b/modules/mod_status.php
@@ -13,6 +13,7 @@
* global defs
*/
namespace Bitweaver\Feed;
+
use Bitweaver\Liberty\LibertyComment;
global $gQueryUser,$gBitSmarty;
@@ -20,9 +21,9 @@ global $gQueryUser,$gBitSmarty;
require_once FEED_PKG_INCLUDE_PATH . 'feed_lib.php';
if( !empty( $_REQUEST['feed_status'] ) ){
-
+
$pParamHash['status_message'] = $_REQUEST['feed_status'];
- feed_set_status($pParamHash);
+ feed_set_status($pParamHash);
}
if( !empty( $moduleParams['module_params']['no_link_user'] ) ) {
@@ -53,7 +54,7 @@ foreach ($statuses as $status){
$pParamHash['title'] = substr($_REQUEST[$commentContentId],0,20);
$reply->storeComment($pParamHash);
-
+
$statuses = feed_get_status( $listHash );
$gBitSmarty->assign( 'statuses', $statuses);
diff --git a/modules/mod_status.tpl b/modules/mod_status.tpl
index e8a8940..e8a8940 100644..100755
--- a/modules/mod_status.tpl
+++ b/modules/mod_status.tpl
diff --git a/templates/admin_feed.tpl b/templates/admin_feed.tpl
index 4814e37..4814e37 100644..100755
--- a/templates/admin_feed.tpl
+++ b/templates/admin_feed.tpl
diff --git a/templates/center_feed.php b/templates/center_feed.php
index 82cd4e3..fd09438 100755
--- a/templates/center_feed.php
+++ b/templates/center_feed.php
@@ -17,5 +17,4 @@ if( !empty($gQueryUser) ){
$actions = feed_get_actions( $listHash );
$gBitSmarty->assign( 'actions', $actions);
-
}
diff --git a/templates/center_feed.tpl b/templates/center_feed.tpl
index 38d7852..38d7852 100644..100755
--- a/templates/center_feed.tpl
+++ b/templates/center_feed.tpl
diff --git a/templates/master_feed.tpl b/templates/master_feed.tpl
index 4bf8b08..4bf8b08 100644..100755
--- a/templates/master_feed.tpl
+++ b/templates/master_feed.tpl
diff --git a/templates/menu_feed.tpl b/templates/menu_feed.tpl
index 6d442d5..6d442d5 100644..100755
--- a/templates/menu_feed.tpl
+++ b/templates/menu_feed.tpl
diff --git a/templates/menu_feed_admin.tpl b/templates/menu_feed_admin.tpl
index dc658a7..dc658a7 100644..100755
--- a/templates/menu_feed_admin.tpl
+++ b/templates/menu_feed_admin.tpl