| @@ -45,37 +45,22 @@ | ||
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * put your comment there... |
| 48 | 48 | * |
| 49 | - * @param mixed $block | |
| 50 | - * @param mixed $forceAddCodeBlock | |
| 49 | + * @param mixed $data | |
| 50 | + * @param mixed $pins | |
| 51 | + * @param mixed $customPins | |
| 51 | 52 | */ |
| 52 | - public function add($block, $forceAddCodeBlock = false) { | |
| 53 | + public function add($block) { | |
| 53 | 54 | // Make sure it array and not stdClass as it has been used from various areas! |
| 54 | 55 | $block = (array) $block; |
| 55 | 56 | // Create Tables objects. |
| 56 | 57 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 57 | - $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 58 | 58 | // Get new id if not specified. |
| 59 | - if (!isset($block['id']) || !$block['id']) { | |
| 59 | + if (!$block['id']) { | |
| 60 | 60 | $block['id'] = $blocks->getNextId(); |
| 61 | 61 | } |
| 62 | - // Backward compatibility for old block style | |
| 63 | - // that has code field inside blocks table. | |
| 64 | - /// if passed create master code file for the code field. | |
| 65 | - if ($forceAddCodeBlock || isset($block['code'])) { | |
| 66 | - // Cache code for MASTER file. | |
| 67 | - $codeFile->set('code', $block['code']); | |
| 68 | - unset($block['code']); // If it passed it mist be removed from blocks data(avoid field not found) | |
| 69 | - // Add code files. | |
| 70 | - $codeFile->set('blockId', $block['id']) | |
| 71 | - ->set('id', 1) | |
| 72 | - ->set('name', 'Master') | |
| 73 | - ->save(true, true); | |
| 74 | - } | |
| 75 | - // Add new block. | |
| 76 | 62 | $blocks->insert($block); |
| 77 | - // Return Newly added block id. | |
| 78 | 63 | return $block['id']; |
| 79 | 64 | } |
| 80 | 65 | |
| 81 | 66 | /** |
| @@ -80,21 +65,17 @@ | ||
| 80 | 65 | |
| 81 | 66 | /** |
| 82 | 67 | * put your comment there... |
| 83 | 68 | * |
| 84 | - * @param mixed $blockId | |
| 85 | - * @param mixed $activeFileId | |
| 69 | + * @param mixed $id | |
| 86 | 70 | */ |
| 87 | - public function addRevision($blockId, $activeFileId) { | |
| 71 | + public function addRevision($blockId) { | |
| 88 | 72 | // Create Tables objects. |
| 89 | 73 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 90 | 74 | $pins = new CJTBlockPinsTable($this->dbDriver); |
| 91 | - $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 92 | - // We allow only up to self::MAX_REVISIONS_PER_BLOCK revisions per | |
| 93 | - // block code files So that a single block may has up to | |
| 94 | - // self::MAX_REVISIONS_PER_BLOCK * count(codeFiles) | |
| 75 | + // We allow only up to self::MAX_REVISIONS_PER_BLOCK revisions per block. | |
| 95 | 76 | $revisions['fields'] = array('id'); |
| 96 | - $revisions['filters'] = array('type' => 'revision', 'parent' => $blockId, 'masterFile' => $activeFileId); | |
| 77 | + $revisions['filters'] = array('type' => 'revision', 'parent' => $blockId); | |
| 97 | 78 | $revisions = $blocks->get(null, $revisions['fields'], $revisions['filters']); |
| 98 | 79 | // If revisions reached self::MAX_REVISIONS_PER_BLOCK delete first one. |
| 99 | 80 | if (count($revisions) == self::MAX_REVISIONS_PER_BLOCK) { |
| 100 | 81 | $this->delete(array_shift($revisions)->id); |
| @@ -99,12 +80,11 @@ | ||
| 99 | 80 | if (count($revisions) == self::MAX_REVISIONS_PER_BLOCK) { |
| 100 | 81 | $this->delete(array_shift($revisions)->id); |
| 101 | 82 | } |
| 102 | 83 | // Get block data. |
| 103 | - $block['fields'] = array('id', 'lastModified', 'pinPoint', 'links', 'expressions'); | |
| 84 | + $block['fields'] = array('id', 'lastModified', 'pinPoint', 'code', 'links', 'expressions'); | |
| 104 | 85 | // get() developed to return multiple blocks, fetch the first. |
| 105 | - $result = $blocks->get($blockId, $block['fields']); | |
| 106 | - $block = reset($result); | |
| 86 | + $block = array_shift($blocks->get($blockId, $block['fields'])); | |
| 107 | 87 | // Set other fields. |
| 108 | 88 | $block->location = $block->state = ''; |
| 109 | 89 | $block->parent = $blockId; |
| 110 | 90 | $block->type = 'revision'; |
| @@ -109,10 +89,8 @@ | ||
| 109 | 89 | $block->parent = $blockId; |
| 110 | 90 | $block->type = 'revision'; |
| 111 | 91 | $block->created = current_time('mysql'); |
| 112 | 92 | $block->owner = get_current_user_id(); |
| 113 | - $block->masterFile = $activeFileId; // Only the revisioned code file would be exists and must be | |
| 114 | - // used as the masterFile! | |
| 115 | 93 | $block->id = $blocks->getNextId(); // Get new id for revision rrecord. |
| 116 | 94 | // Add block data. |
| 117 | 95 | $blocks->insert($block); |
| 118 | 96 | // Get block pins and insert pins for the revision block. |
| @@ -119,16 +97,8 @@ | ||
| 119 | 97 | $blockPins = $pins->get($blockId); |
| 120 | 98 | if (!empty($blockPins)) { |
| 121 | 99 | $pins->insertRaw($block->id, $blockPins); |
| 122 | 100 | } |
| 123 | - // Revision current ActiveFileId code record. | |
| 124 | - // Simply, get a copy of it from the target block | |
| 125 | - // and assign the copy to the new created block revision. | |
| 126 | - $codeFile->set('id', $activeFileId) | |
| 127 | - ->set('blockId', $blockId) | |
| 128 | - ->load() | |
| 129 | - ->set('blockId', $block->id) | |
| 130 | - ->save(true, true); | |
| 131 | 101 | } |
| 132 | 102 | |
| 133 | 103 | /** |
| 134 | 104 | * Put your comments here... |
| @@ -145,16 +115,11 @@ | ||
| 145 | 115 | * |
| 146 | 116 | * @param mixed $ids |
| 147 | 117 | */ |
| 148 | 118 | public function delete($ids) { |
| 149 | - // Allow single or multiple Ids to be passed. | |
| 150 | - if (!is_array($ids)) { | |
| 151 | - $ids = array($ids); | |
| 152 | - } | |
| 153 | 119 | // Create Tables objects. |
| 154 | 120 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 155 | 121 | $pins = new CJTBlockPinsTable($this->dbDriver); |
| 156 | - $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 157 | 122 | // Get blocks revisions. |
| 158 | 123 | $revisions['fields'] = array('id'); |
| 159 | 124 | $revisions['filters']['parent'] = $ids; |
| 160 | 125 | $revisions['type'] = 'revision'; |
| @@ -165,25 +130,12 @@ | ||
| 165 | 130 | // only if there is at least one revision. |
| 166 | 131 | if (!empty($revisions)) { |
| 167 | 132 | $blocks->delete($revisions); |
| 168 | 133 | $pins->delete($revisions); |
| 169 | - // Delete code files. | |
| 170 | - $this->dbDriver->delete(sprintf('DELETE FROM #__cjtoolbox_block_files WHERE blockId IN(%s)', implode(',', $revisions))); | |
| 171 | 134 | } |
| 172 | - // Delete linked templates. | |
| 173 | - $linkedOnlyTemplatesQuery = 'DELETE FROM #__cjtoolbox_block_templates WHERE blockId IN(%s)'; | |
| 174 | - $this->dbDriver->delete(sprintf($linkedOnlyTemplatesQuery, implode(',', $ids))); | |
| 175 | - // Delete associated parameters. | |
| 176 | - $mdlParams = new CJT_Models_Parameters(); | |
| 177 | - $mdlParams->delete($ids); | |
| 178 | - // Delete form. | |
| 179 | - $mdlForm = new CJT_Models_Forms(); | |
| 180 | - $mdlForm->delete($ids); | |
| 181 | 135 | // Delete blocks. |
| 182 | 136 | $blocks->delete($ids); |
| 183 | 137 | $pins->delete($ids); |
| 184 | - // Delete code files. | |
| 185 | - $this->dbDriver->delete(sprintf('DELETE FROM #__cjtoolbox_block_files WHERE blockId IN(%s)', implode(',', $ids))); | |
| 186 | 138 | // Chaining! |
| 187 | 139 | return $this; |
| 188 | 140 | } |
| 189 | 141 | |
| @@ -192,10 +144,10 @@ | ||
| 192 | 144 | * |
| 193 | 145 | * @param mixed $id |
| 194 | 146 | * @param mixed $fields |
| 195 | 147 | */ |
| 196 | - public function getBlock($id, $filters = array(), $fields = array('*'), $useDefaultBackupFltr = true) { | |
| 197 | - $blocks = $this->getBlocks($id, $filters, $fields, OBJECT_K, array(), $useDefaultBackupFltr); | |
| 148 | + public function getBlock($id, $filters = array(), $fields = array('*')) { | |
| 149 | + $blocks = $this->getBlocks($id, $filters, $fields); | |
| 198 | 150 | $block = !empty($blocks) ? reset($blocks) : null; |
| 199 | 151 | return $block; |
| 200 | 152 | } |
| 201 | 153 | |
| @@ -203,19 +155,15 @@ | ||
| 203 | 155 | * put your comment there... |
| 204 | 156 | * |
| 205 | 157 | * @param mixed $ids |
| 206 | 158 | */ |
| 207 | - public function getBlocks($ids = array(), $filters = array(), $fields = array('*'), $returnType = OBJECT_K, $orderBy = array(), $useDefaultBackupFltr = true) { | |
| 208 | - // initialize. | |
| 159 | + public function getBlocks($ids = array(), $filters = array(), $fields = array('*'), $returnType = OBJECT_K, $orderBy = array()) { | |
| 209 | 160 | $blocks = array(); |
| 210 | - $returnCodeFile = isset($filters['returnCodeFile']) && ($filters['returnCodeFile'] == true); | |
| 211 | - unset($filters['returnCodeFile']); | |
| 212 | 161 | // Create Tables objects. |
| 213 | 162 | $blocksTable = new CJTBlocksTable($this->dbDriver); |
| 214 | 163 | $pinsTable = new CJTBlockPinsTable($this->dbDriver); |
| 215 | - $blockFiles = new CJTBlockFilesTable($this->dbDriver); | |
| 216 | 164 | // Read blocks. |
| 217 | - $blocks = $blocksTable->get($ids, $fields, $filters, $returnType, $orderBy, $useDefaultBackupFltr); | |
| 165 | + $blocks = $blocksTable->get($ids, $fields, $filters, $returnType, $orderBy); | |
| 218 | 166 | // Get only pins for retrieved blocks. |
| 219 | 167 | $ids = array_keys($blocks); |
| 220 | 168 | $pins = empty($ids) ? array() : $pinsTable->get($ids); |
| 221 | 169 | // Push pins into blocks. |
| @@ -224,28 +172,8 @@ | ||
| 224 | 172 | // Each pin is an array. |
| 225 | 173 | // e.g blocks[ID]->pages[] = PAGE-ID. |
| 226 | 174 | $blocks[$pin->blockId]->{$pin->pin}[] = $pin->value; |
| 227 | 175 | } |
| 228 | - // Get active file code. | |
| 229 | - // There always should be active file unless that the | |
| 230 | - // requested block is never switched by current author before. | |
| 231 | - // However we'll do that only if filters['returnCodeFile'] set to TRUE. | |
| 232 | - if ($returnCodeFile) { | |
| 233 | - foreach ($ids as $id) { | |
| 234 | - if(!$activeFileId = $this->getCurrentAuthorBlockActiveFileId($id)) { | |
| 235 | - // If first time use masterFile ID as he default. | |
| 236 | - $activeFileId = $blocks[$id]->masterFile; | |
| 237 | - } | |
| 238 | - // Retreive code for block code file. | |
| 239 | - $codeFile = (array) $blockFiles->setData(array('blockId' => $id, 'id' => $activeFileId)) | |
| 240 | - ->load() | |
| 241 | - ->getData(); | |
| 242 | - unset($codeFile['description']); | |
| 243 | - $blocks[$id]->file = (object) $codeFile; | |
| 244 | - // Also return the active file id withing the set. | |
| 245 | - $blocks[$id]->activeFileId = $activeFileId; | |
| 246 | - } | |
| 247 | - } | |
| 248 | 176 | return $blocks; |
| 249 | 177 | } |
| 250 | 178 | |
| 251 | 179 | /** |
| @@ -250,84 +178,8 @@ | ||
| 250 | 178 | |
| 251 | 179 | /** |
| 252 | 180 | * put your comment there... |
| 253 | 181 | * |
| 254 | - * @param mixed $blockId | |
| 255 | - * @param mixed $authorId | |
| 256 | - */ | |
| 257 | - public function getAuthorBlockActiveFileId($blockId, $authorId = null) { | |
| 258 | - // Get author active file for the requested block. | |
| 259 | - $activeFileId = (int) get_user_meta($authorId, "cjt_block_active_file_{$blockId}", true); | |
| 260 | - // Query block active file. | |
| 261 | - return $activeFileId; | |
| 262 | - } | |
| 263 | - | |
| 264 | - /** | |
| 265 | - * put your comment there... | |
| 266 | - * | |
| 267 | - * @param mixed $blockId | |
| 268 | - * @param mixed $authorId | |
| 269 | - */ | |
| 270 | - public function getCurrentAuthorBlockActiveFileId($blockId) { | |
| 271 | - return $this->getAuthorBlockActiveFileId($blockId, get_current_user_id()); | |
| 272 | - } | |
| 273 | - | |
| 274 | - /** | |
| 275 | - * put your comment there... | |
| 276 | - * | |
| 277 | - */ | |
| 278 | - public static function getCustomPostTypes() | |
| 279 | - { | |
| 280 | - | |
| 281 | - static $postTypes = null; | |
| 282 | - | |
| 283 | - if ( $postTypes !== null ) | |
| 284 | - { | |
| 285 | - return $postTypes; | |
| 286 | - } | |
| 287 | - | |
| 288 | - | |
| 289 | - $postTypes = array(); | |
| 290 | - | |
| 291 | - // Create tabs for every custom post under the custom posts tab. | |
| 292 | - // Get all registered custom posts. | |
| 293 | - $customPosts = get_post_types( array( 'public' => 1, 'show_ui' => true, '_builtin' => false ), 'objects' ); | |
| 294 | - | |
| 295 | - // Add tab for every custom post | |
| 296 | - // Exclude 'Empty' Custom Post Types. | |
| 297 | - foreach ( $customPosts as $typeName => $customPost ) | |
| 298 | - { | |
| 299 | - // Check if has posts. | |
| 300 | - $hasPosts = count( get_posts( array( 'post_type' => $typeName, 'offset' => 0, 'numberposts' => 1 ) ) ); | |
| 301 | - | |
| 302 | - // Add only types with at least one post exists. | |
| 303 | - if ( $hasPosts ) | |
| 304 | - { | |
| 305 | - $postTypes[ $typeName ] = array | |
| 306 | - ( | |
| 307 | - 'title' => $customPost->labels->name, | |
| 308 | - 'renderer' => 'objects-list', | |
| 309 | - 'type' => array | |
| 310 | - ( | |
| 311 | - 'type' => $typeName, | |
| 312 | - 'group' => 'posts', | |
| 313 | - 'targetType' => 'post' | |
| 314 | - ) | |
| 315 | - | |
| 316 | - ); | |
| 317 | - | |
| 318 | - } | |
| 319 | - | |
| 320 | - } | |
| 321 | - | |
| 322 | - do_action( CJTPluggableHelper::ACTION_BLOCK_CUSTOM_POST_TYPES, $postTypes ); | |
| 323 | - | |
| 324 | - return $postTypes; | |
| 325 | - } | |
| 326 | - | |
| 327 | - /** | |
| 328 | - * put your comment there... | |
| 329 | - * | |
| 330 | 182 | * @param mixed $id |
| 331 | 183 | */ |
| 332 | 184 | public function getInfo($id) { |
| 333 | 185 | // Info fields. |
| @@ -338,9 +190,9 @@ | ||
| 338 | 190 | // Get user object from id. |
| 339 | 191 | $info = reset($info); |
| 340 | 192 | $info->owner = get_userdata($info->owner); |
| 341 | 193 | // Set shortcode name. |
| 342 | - $info->shortcode = "[cjtoolbox name='{$info->name}']"; | |
| 194 | + $info->shortcode = "[cjtoolbox id='{$info->id}']"; | |
| 343 | 195 | return $info; |
| 344 | 196 | } |
| 345 | 197 | |
| 346 | 198 | /** |
| @@ -376,46 +228,21 @@ | ||
| 376 | 228 | * put your comment there... |
| 377 | 229 | * |
| 378 | 230 | * @param mixed $block |
| 379 | 231 | */ |
| 380 | - public function update( $block, $updatePins ) | |
| 381 | - { | |
| 382 | - | |
| 383 | - $block = ( array ) $block; | |
| 384 | - | |
| 385 | - $blocks = new CJTBlocksTable( $this->dbDriver ); | |
| 386 | - $pins = new CJTBlockPinsTable( $this->dbDriver ); | |
| 387 | - | |
| 232 | + public function update($block, $updatePins) { | |
| 233 | + $block = (array) $block; // To be used by array_intersect_key. | |
| 234 | + // Create Tables objects. | |
| 235 | + $blocks = new CJTBlocksTable($this->dbDriver); | |
| 236 | + $pins = new CJTBlockPinsTable($this->dbDriver); | |
| 388 | 237 | // Update block pins if requested. |
| 389 | - if ( $updatePins ) | |
| 390 | - { | |
| 238 | + if ($updatePins) { | |
| 391 | 239 | // Isolate block pins freom native block data. |
| 392 | - $pinsData = array_intersect_key( $block, array_flip( array_keys( CJTBlockModel::getCustomPins() ) ) ); | |
| 393 | - | |
| 394 | - do_action( CJTPluggableHelper::FILTER_BLOCK_MODEL_PRE_UPDATE_BLOCK_PINS, $block, $pinsData ); | |
| 395 | - | |
| 396 | - $pins->update( $block[ 'id' ], $pinsData ); | |
| 397 | - | |
| 240 | + $pinsData = array_intersect_key($block, array_flip(array('pages', 'posts', 'categories'))); | |
| 241 | + $pins->update($block['id'], $pinsData); | |
| 398 | 242 | } |
| 399 | - | |
| 400 | - // Update code file | |
| 401 | - if ( isset( $block[ 'activeFileId' ] ) ) | |
| 402 | - { | |
| 403 | - | |
| 404 | - $codeFile = new CJTBlockFilesTable( $this->dbDriver ); | |
| 405 | - | |
| 406 | - $codeFile->set( 'blockId', $block[ 'id' ] ) | |
| 407 | - ->set( 'id', $block[ 'activeFileId'] ) | |
| 408 | - ->set( 'code', $block[ 'code'] ) | |
| 409 | - ->save(); | |
| 410 | - } | |
| 411 | - | |
| 412 | 243 | // Isolate block fields. |
| 413 | - $blockData = array_intersect_key($block, $blocks->getFields()); | |
| 414 | - | |
| 415 | - do_action( CJTPluggableHelper::FILTER_BLOCK_MODEL_PRE_UPDATE_BLOCK, $updatePins, $blockData ); | |
| 416 | - | |
| 417 | - $blocks->update( $blockData ); | |
| 418 | - | |
| 244 | + $block = array_intersect_key($block, $blocks->getFields()); | |
| 245 | + $blocks->update($block); | |
| 419 | 246 | } |
| 420 | 247 | |
| 421 | 248 | } // End class. |
