github-migration/comicpress-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for per-image flags

Browse Source
This commit is contained in:
John Bintz 2009-11-08 23:13:34 -05:00
parent 4cfacec35f
commit 9cd98b98f1
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
classes/ComicPressComicPost.inc
View File

@ -113,10 +113,10 @@ class ComicPressComicPost {
if (!is_array($current_ordering)) { $current_ordering = array(); } if (!is_array($current_ordering)) { $current_ordering = array(); }
$all_current_ids = array(); $all_current_ids = array();
foreach ($current_ordering as $key => $children) { foreach ($current_ordering as $key => $properties) {
$all_current_ids[$key] = true; $all_current_ids[$key] = true;
if (is_array($children)) { if (isset($properties['children'])) {
foreach ($children as $type => $kids) { foreach ($properties['children'] as $type => $kids) {
$all_current_ids = array_merge($all_current_ids, $kids); $all_current_ids = array_merge($all_current_ids, $kids);
} }
} }
@ -130,22 +130,28 @@ class ComicPressComicPost {
$missing_attachments = array_diff($all_current_ids, $attachment_ids); $missing_attachments = array_diff($all_current_ids, $attachment_ids);
foreach ($new_attachments as $attachment_id) { foreach ($new_attachments as $attachment_id) {
$current_ordering[$attachment_id] = true; $current_ordering[$attachment_id] = array('enabled' => true);
} }
foreach ($missing_attachments as $attachment_id) { foreach ($missing_attachments as $attachment_id) {
if (isset($current_ordering[$attachment_id])) { if (isset($current_ordering[$attachment_id])) {
unset($current_ordering[$attachment_id]); unset($current_ordering[$attachment_id]);
} else { } else {
foreach ($current_ordering as $key => $children) { foreach ($current_ordering as $key => $properties) {
foreach ($children as $type => $kids) { if (isset($properties['children'])) {
foreach ($properties['children'] as $type => $kids) {
if (isset($kids[$attachment_id])) { unset($kids[$attachment_id]); } if (isset($kids[$attachment_id])) { unset($kids[$attachment_id]); }
$children[$type] = $kids; if (empty($kids)) {
} unset($properties['children'][$type]);
if (empty($children[$type])) {
$current_ordering[$key] = true;
} else { } else {
$current_ordering[$key] = $children; $properties['children'][$type] = $kids;
}
}
if (empty($properties['children'])) {
unset($current_ordering[$key]['children']);
} else {
$current_ordering[$key] = $properties;
}
} }
} }
} }

14
test/ComicPressComicPostTest.php
View File

@ -52,22 +52,22 @@ class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
array( array(
array('attachment-1'), array('attachment-1'),
array(), array(),
array('attachment-1' => true) array('attachment-1' => array('enabled' => true))
), ),
array( array(
array('attachment-1'), array('attachment-1'),
array('attachment-1' => true, 'attachment-2' => true), array('attachment-1' => array('enabled' => false), 'attachment-2' => array('enabled' => true)),
array('attachment-1' => true) array('attachment-1' => array('enabled' => false))
), ),
array( array(
array('attachment-1'), array('attachment-1'),
array('attachment-1' => array('rss' => array('attachment-2' => true))), array('attachment-1' => array('enabled' => true, 'children' => array('rss' => array('attachment-2' => true)))),
array('attachment-1' => true) array('attachment-1' => array('enabled' => true))
), ),
array( array(
array('attachment-1', 'attachment-2', 'attachment-3'), array('attachment-1', 'attachment-2', 'attachment-3'),
array('attachment-1' => array('rss' => array('attachment-2' => true))), array('attachment-1' => array('enabled' => false, 'children' => array('rss' => array('attachment-2' => true)))),
array('attachment-1' => array('rss' => array('attachment-2' => true)), 'attachment-3' => true) array('attachment-1' => array('enabled' => false, 'children' => array('rss' => array('attachment-2' => true))), 'attachment-3' => array('enabled' => true))
), ),
); );
} }