Changeset 1021634
- Timestamp:
- 11/07/2014 05:39:07 PM (11 years ago)
- Location:
- copify/trunk
- Files:
-
- 5 edited
- 1 moved
-
Lib/CopifyApi.php (moved) (moved from copify/trunk/Lib/Api.php) (1 diff)
-
Lib/CopifyWordpress.php (modified) (4 diffs)
-
Test/Lib/CopifyWordpressTest.php (modified) (18 diffs)
-
Views/CopifyViewJob.php (modified) (1 diff)
-
copify.php (modified) (1 diff)
-
readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
copify/trunk/Lib/CopifyApi.php
r1007319 r1021634 7 7 // Copyright 2012 Rob Mcvey. All rights reserved. 8 8 // 9 class Api {9 class CopifyApi { 10 10 11 11 /** -
copify/trunk/Lib/CopifyWordpress.php
r1007319 r1021634 82 82 $CopifyApiKey = $CopifyLoginDetails['CopifyApiKey']; 83 83 $CopifyLocale = $CopifyLoginDetails['CopifyLocale']; 84 } 84 } else { 85 $CopifyEmail = ''; 86 $CopifyApiKey = ''; 87 } 85 88 // All available locales 86 89 $CopifyAvailableLocales = array( … … 118 121 // Initialise the Copify API helper class 119 122 if (!$this->Api) { 120 $this->Api = new Api($CopifyLoginDetails['CopifyEmail'], $CopifyLoginDetails['CopifyApiKey']);123 $this->Api = new CopifyApi($CopifyLoginDetails['CopifyEmail'], $CopifyLoginDetails['CopifyApiKey']); 121 124 } 122 125 // Set the correct end point for the API … … 492 495 public function CopifyAddToPosts($job_id, $newPost) { 493 496 // Create the post 494 $new_wp_id = $this->wordpress('wp_insert_post', $newPost, $wp_error);497 $new_wp_id = $this->wordpress('wp_insert_post', $newPost, true); 495 498 // Check for errors 496 499 if ($this->wordpress('is_wp_error', $new_wp_id)) { … … 1066 1069 **/ 1067 1070 protected function _wp_get_attachment_metadata() { 1068 $attach_id = get_post_thumbnail_id( $post->ID);1071 $attach_id = get_post_thumbnail_id(); 1069 1072 return wp_get_attachment_metadata($attach_id); 1070 1073 } -
copify/trunk/Test/Lib/CopifyWordpressTest.php
r1007319 r1021634 1 1 <?php 2 2 require_once(__DIR__ . '/../../basics.php'); 3 require_once(__DIR__ . '/../../Lib/ Api.php');3 require_once(__DIR__ . '/../../Lib/CopifyApi.php'); 4 4 require_once(__DIR__ . '/../../Lib/CopifyWordpress.php'); 5 5 // … … 323 323 public function testCopifyRequestMissingCopy() { 324 324 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists')); 325 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));325 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 326 326 $mockVal = array( 327 327 'CopifyEmail' => 'foo@bar.com', … … 369 369 public function testCopifyRequestNotComplete() { 370 370 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists')); 371 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));371 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 372 372 $mockVal = array( 373 373 'CopifyEmail' => 'foo@bar.com', … … 415 415 public function testCopifyRequestOrderPublished() { 416 416 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts')); 417 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));417 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 418 418 $mockVal = array( 419 419 'CopifyEmail' => 'foo@bar.com', … … 535 535 public function testCopifyPostFeedbackEmptyPost() { 536 536 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 537 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));537 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 538 538 $_POST = null; 539 539 $this->CopifyWordpress->expects($this->never()) … … 555 555 public function testCopifyPostFeedbackMain() { 556 556 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 557 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView', 'jobFeedback'), array('foo@bar.com', '324532452345324'));557 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView', 'jobFeedback'), array('foo@bar.com', '324532452345324')); 558 558 $_POST = array( 559 559 'type' => 'post', … … 629 629 public function testCopifyPostFeedbackImage() { 630 630 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 631 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView', 'jobFeedback'), array('foo@bar.com', '324532452345324'));631 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView', 'jobFeedback'), array('foo@bar.com', '324532452345324')); 632 632 $_POST = array( 633 633 'type' => 'post', … … 1092 1092 public function testSetImage() { 1093 1093 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1094 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1094 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1095 1095 $mockVal = array( 1096 1096 'CopifyEmail' => 'foo@bar.com', … … 1128 1128 public function testSetImageWithMeta() { 1129 1129 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1130 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1130 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1131 1131 $mockVal = array( 1132 1132 'CopifyEmail' => 'foo@bar.com', … … 1178 1178 public function testSetImageMissingParams() { 1179 1179 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1180 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1180 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1181 1181 $mockVal = array( 1182 1182 'CopifyEmail' => 'foo@bar.com', … … 1209 1209 public function testDeleteImageMissingParams() { 1210 1210 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1211 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1211 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1212 1212 $mockVal = array( 1213 1213 'CopifyEmail' => 'foo@bar.com', … … 1237 1237 public function testDeleteImage() { 1238 1238 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1239 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1239 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1240 1240 $mockVal = array( 1241 1241 'CopifyEmail' => 'foo@bar.com', … … 1271 1271 public function testUnpublishPostMissingParams() { 1272 1272 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1273 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1273 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1274 1274 $mockVal = array( 1275 1275 'CopifyEmail' => 'foo@bar.com', … … 1300 1300 public function testUnpublishPostFails() { 1301 1301 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl')); 1302 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1302 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1303 1303 $mockVal = array( 1304 1304 'CopifyEmail' => 'foo@bar.com', … … 1333 1333 public function testUnpublishPost() { 1334 1334 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'setheader', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts', 'CopifySetPostThumbnailFromUrl', 'CopifyBeforeDeletePost')); 1335 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1335 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1336 1336 $mockVal = array( 1337 1337 'CopifyEmail' => 'foo@bar.com', … … 1477 1477 $_POST['post_type'] = 'post'; 1478 1478 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts')); 1479 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1479 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1480 1480 // Job we want to post 1481 1481 $job = array( … … 1531 1531 $_POST = array(); 1532 1532 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts')); 1533 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1533 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1534 1534 // Correct response 1535 1535 $response = array( … … 1556 1556 $_POST['post_type'] = 'hello'; 1557 1557 $this->CopifyWordpress = $this->getMock('CopifyWordpress', array('wordpress', 'outputJson', 'CopifySetApiClass', 'CopifyJobIdExists', 'CopifyAddToPosts')); 1558 $this->CopifyWordpress->Api = $this->getMock(' Api', array('jobsView'), array('foo@bar.com', '324532452345324'));1558 $this->CopifyWordpress->Api = $this->getMock('CopifyApi', array('jobsView'), array('foo@bar.com', '324532452345324')); 1559 1559 // Correct response 1560 1560 $response = array( -
copify/trunk/Views/CopifyViewJob.php
r1004461 r1021634 245 245 $copify_image_orig = $image_option['source']; 246 246 } 247 if (! $copify_image_thumb&& isset($image_option['width']) && $image_option['width'] > 100 && $image_option['width'] < 600) {247 if (!isset($copify_image_thumb) && isset($image_option['width']) && $image_option['width'] > 100 && $image_option['width'] < 600) { 248 248 $copify_image_thumb = $image_option['source']; 249 249 } -
copify/trunk/copify.php
r1007319 r1021634 26 26 require_once('basics.php'); 27 27 require_once(ABSPATH . 'wp-admin/includes/plugin.php'); 28 require_once(COPIFY_PATH . COPIFY_DS . 'Lib/ Api.php');28 require_once(COPIFY_PATH . COPIFY_DS . 'Lib/CopifyApi.php'); 29 29 require_once(COPIFY_PATH . COPIFY_DS . 'Lib/CopifyWordpress.php'); 30 30 -
copify/trunk/readme.txt
r1007319 r1021634 39 39 == Changelog == 40 40 41 = 1.0.9 = 42 * Fixes undefined var in CopifyAddToPosts 43 * Fixes undefined var in CopifyViewJob 44 * Fix missing $post variable in _wp_get_attachment_metadata 45 * Fixes undefined vars in CopifySettings 46 41 47 = 1.0.8 = 42 48 * When moving an already approved order to drafts, offer selection of "Post" or "Page"
Note: See TracChangeset
for help on using the changeset viewer.