| @@ -45,22 +45,37 @@ | ||
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * put your comment there... |
| 48 | 48 | * |
| 49 | - * @param mixed $data | |
| 50 | - * @param mixed $pins | |
| 51 | - * @param mixed $customPins | |
| 49 | + * @param mixed $block | |
| 50 | + * @param mixed $forceAddCodeBlock | |
| 52 | 51 | */ |
| 53 | - public function add($block) { | |
| 52 | + public function add($block, $forceAddCodeBlock = false) { | |
| 54 | 53 | // Make sure it array and not stdClass as it has been used from various areas! |
| 55 | 54 | $block = (array) $block; |
| 56 | 55 | // Create Tables objects. |
| 57 | 56 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 57 | + $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 58 | 58 | // Get new id if not specified. |
| 59 | - if (!$block['id']) { | |
| 59 | + if (!isset($block['id']) || !$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. | |
| 62 | 76 | $blocks->insert($block); |
| 77 | + // Return Newly added block id. | |
| 63 | 78 | return $block['id']; |
| 64 | 79 | } |
| 65 | 80 | |
| 66 | 81 | /** |
| @@ -65,17 +80,21 @@ | ||
| 65 | 80 | |
| 66 | 81 | /** |
| 67 | 82 | * put your comment there... |
| 68 | 83 | * |
| 69 | - * @param mixed $id | |
| 84 | + * @param mixed $blockId | |
| 85 | + * @param mixed $activeFileId | |
| 70 | 86 | */ |
| 71 | - public function addRevision($blockId) { | |
| 87 | + public function addRevision($blockId, $activeFileId) { | |
| 72 | 88 | // Create Tables objects. |
| 73 | 89 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 74 | 90 | $pins = new CJTBlockPinsTable($this->dbDriver); |
| 75 | - // We allow only up to self::MAX_REVISIONS_PER_BLOCK revisions per block. | |
| 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) | |
| 76 | 95 | $revisions['fields'] = array('id'); |
| 77 | - $revisions['filters'] = array('type' => 'revision', 'parent' => $blockId); | |
| 96 | + $revisions['filters'] = array('type' => 'revision', 'parent' => $blockId, 'masterFile' => $activeFileId); | |
| 78 | 97 | $revisions = $blocks->get(null, $revisions['fields'], $revisions['filters']); |
| 79 | 98 | // If revisions reached self::MAX_REVISIONS_PER_BLOCK delete first one. |
| 80 | 99 | if (count($revisions) == self::MAX_REVISIONS_PER_BLOCK) { |
| 81 | 100 | $this->delete(array_shift($revisions)->id); |
| @@ -80,11 +99,12 @@ | ||
| 80 | 99 | if (count($revisions) == self::MAX_REVISIONS_PER_BLOCK) { |
| 81 | 100 | $this->delete(array_shift($revisions)->id); |
| 82 | 101 | } |
| 83 | 102 | // Get block data. |
| 84 | - $block['fields'] = array('lastModified', 'pinPoint', 'code', 'links', 'expressions'); | |
| 103 | + $block['fields'] = array('id', 'lastModified', 'pinPoint', 'links', 'expressions'); | |
| 85 | 104 | // get() developed to return multiple blocks, fetch the first. |
| 86 | - $block = array_shift($blocks->get($blockId, $block['fields'])); | |
| 105 | + $result = $blocks->get($blockId, $block['fields']); | |
| 106 | + $block = reset($result); | |
| 87 | 107 | // Set other fields. |
| 88 | 108 | $block->location = $block->state = ''; |
| 89 | 109 | $block->parent = $blockId; |
| 90 | 110 | $block->type = 'revision'; |
| @@ -89,8 +109,10 @@ | ||
| 89 | 109 | $block->parent = $blockId; |
| 90 | 110 | $block->type = 'revision'; |
| 91 | 111 | $block->created = current_time('mysql'); |
| 92 | 112 | $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! | |
| 93 | 115 | $block->id = $blocks->getNextId(); // Get new id for revision rrecord. |
| 94 | 116 | // Add block data. |
| 95 | 117 | $blocks->insert($block); |
| 96 | 118 | // Get block pins and insert pins for the revision block. |
| @@ -97,8 +119,16 @@ | ||
| 97 | 119 | $blockPins = $pins->get($blockId); |
| 98 | 120 | if (!empty($blockPins)) { |
| 99 | 121 | $pins->insertRaw($block->id, $blockPins); |
| 100 | 122 | } |
| 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); | |
| 101 | 131 | } |
| 102 | 132 | |
| 103 | 133 | /** |
| 104 | 134 | * Put your comments here... |
| @@ -115,11 +145,16 @@ | ||
| 115 | 145 | * |
| 116 | 146 | * @param mixed $ids |
| 117 | 147 | */ |
| 118 | 148 | public function delete($ids) { |
| 149 | + // Allow single or multiple Ids to be passed. | |
| 150 | + if (!is_array($ids)) { | |
| 151 | + $ids = array($ids); | |
| 152 | + } | |
| 119 | 153 | // Create Tables objects. |
| 120 | 154 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 121 | 155 | $pins = new CJTBlockPinsTable($this->dbDriver); |
| 156 | + $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 122 | 157 | // Get blocks revisions. |
| 123 | 158 | $revisions['fields'] = array('id'); |
| 124 | 159 | $revisions['filters']['parent'] = $ids; |
| 125 | 160 | $revisions['type'] = 'revision'; |
| @@ -130,12 +165,25 @@ | ||
| 130 | 165 | // only if there is at least one revision. |
| 131 | 166 | if (!empty($revisions)) { |
| 132 | 167 | $blocks->delete($revisions); |
| 133 | 168 | $pins->delete($revisions); |
| 169 | + // Delete code files. | |
| 170 | + $this->dbDriver->delete(sprintf('DELETE FROM #__cjtoolbox_block_files WHERE blockId IN(%s)', implode(',', $revisions))); | |
| 134 | 171 | } |
| 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); | |
| 135 | 181 | // Delete blocks. |
| 136 | 182 | $blocks->delete($ids); |
| 137 | 183 | $pins->delete($ids); |
| 184 | + // Delete code files. | |
| 185 | + $this->dbDriver->delete(sprintf('DELETE FROM #__cjtoolbox_block_files WHERE blockId IN(%s)', implode(',', $ids))); | |
| 138 | 186 | // Chaining! |
| 139 | 187 | return $this; |
| 140 | 188 | } |
| 141 | 189 | |
| @@ -144,10 +192,10 @@ | ||
| 144 | 192 | * |
| 145 | 193 | * @param mixed $id |
| 146 | 194 | * @param mixed $fields |
| 147 | 195 | */ |
| 148 | - public function getBlock($id, $filters = array(), $fields = array('*')) { | |
| 149 | - $blocks = $this->getBlocks($id, $filters, $fields); | |
| 196 | + public function getBlock($id, $filters = array(), $fields = array('*'), $useDefaultBackupFltr = true) { | |
| 197 | + $blocks = $this->getBlocks($id, $filters, $fields, OBJECT_K, array(), $useDefaultBackupFltr); | |
| 150 | 198 | $block = !empty($blocks) ? reset($blocks) : null; |
| 151 | 199 | return $block; |
| 152 | 200 | } |
| 153 | 201 | |
| @@ -155,15 +203,19 @@ | ||
| 155 | 203 | * put your comment there... |
| 156 | 204 | * |
| 157 | 205 | * @param mixed $ids |
| 158 | 206 | */ |
| 159 | - public function getBlocks($ids = array(), $filters = array(), $fields = array('*'), $returnType = OBJECT_K, $orderBy = array()) { | |
| 207 | + public function getBlocks($ids = array(), $filters = array(), $fields = array('*'), $returnType = OBJECT_K, $orderBy = array(), $useDefaultBackupFltr = true) { | |
| 208 | + // initialize. | |
| 160 | 209 | $blocks = array(); |
| 210 | + $returnCodeFile = isset($filters['returnCodeFile']) && ($filters['returnCodeFile'] == true); | |
| 211 | + unset($filters['returnCodeFile']); | |
| 161 | 212 | // Create Tables objects. |
| 162 | 213 | $blocksTable = new CJTBlocksTable($this->dbDriver); |
| 163 | 214 | $pinsTable = new CJTBlockPinsTable($this->dbDriver); |
| 215 | + $blockFiles = new CJTBlockFilesTable($this->dbDriver); | |
| 164 | 216 | // Read blocks. |
| 165 | - $blocks = $blocksTable->get($ids, $fields, $filters, $returnType, $orderBy); | |
| 217 | + $blocks = $blocksTable->get($ids, $fields, $filters, $returnType, $orderBy, $useDefaultBackupFltr); | |
| 166 | 218 | // Get only pins for retrieved blocks. |
| 167 | 219 | $ids = array_keys($blocks); |
| 168 | 220 | $pins = empty($ids) ? array() : $pinsTable->get($ids); |
| 169 | 221 | // Push pins into blocks. |
| @@ -172,8 +224,28 @@ | ||
| 172 | 224 | // Each pin is an array. |
| 173 | 225 | // e.g blocks[ID]->pages[] = PAGE-ID. |
| 174 | 226 | $blocks[$pin->blockId]->{$pin->pin}[] = $pin->value; |
| 175 | 227 | } |
| 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 | + } | |
| 176 | 248 | return $blocks; |
| 177 | 249 | } |
| 178 | 250 | |
| 179 | 251 | /** |
| @@ -178,8 +250,31 @@ | ||
| 178 | 250 | |
| 179 | 251 | /** |
| 180 | 252 | * put your comment there... |
| 181 | 253 | * |
| 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 | + * | |
| 182 | 277 | * @param mixed $id |
| 183 | 278 | */ |
| 184 | 279 | public function getInfo($id) { |
| 185 | 280 | // Info fields. |
| @@ -190,9 +285,9 @@ | ||
| 190 | 285 | // Get user object from id. |
| 191 | 286 | $info = reset($info); |
| 192 | 287 | $info->owner = get_userdata($info->owner); |
| 193 | 288 | // Set shortcode name. |
| 194 | - $info->shortcode = "[cjtoolbox id='{$info->id}']"; | |
| 289 | + $info->shortcode = "[cjtoolbox name='{$info->name}']"; | |
| 195 | 290 | return $info; |
| 196 | 291 | } |
| 197 | 292 | |
| 198 | 293 | /** |
| @@ -229,9 +324,10 @@ | ||
| 229 | 324 | * |
| 230 | 325 | * @param mixed $block |
| 231 | 326 | */ |
| 232 | 327 | public function update($block, $updatePins) { |
| 233 | - $block = (array) $block; // To be used by array_intersect_key. | |
| 328 | + // To be used by array_intersect_key. | |
| 329 | + $block = (array) $block; | |
| 234 | 330 | // Create Tables objects. |
| 235 | 331 | $blocks = new CJTBlocksTable($this->dbDriver); |
| 236 | 332 | $pins = new CJTBlockPinsTable($this->dbDriver); |
| 237 | 333 | // Update block pins if requested. |
| @@ -239,10 +335,18 @@ | ||
| 239 | 335 | // Isolate block pins freom native block data. |
| 240 | 336 | $pinsData = array_intersect_key($block, array_flip(array('pages', 'posts', 'categories'))); |
| 241 | 337 | $pins->update($block['id'], $pinsData); |
| 242 | 338 | } |
| 339 | + // Update code file | |
| 340 | + if (isset($block['activeFileId'])) { | |
| 341 | + $codeFile = new CJTBlockFilesTable($this->dbDriver); | |
| 342 | + $codeFile->set('blockId', $block['id']) | |
| 343 | + ->set('id', $block['activeFileId']) | |
| 344 | + ->set('code', $block['code']) | |
| 345 | + ->save(); | |
| 346 | + } | |
| 243 | 347 | // Isolate block fields. |
| 244 | - $block = array_intersect_key($block, $blocks->getFields()); | |
| 245 | - $blocks->update($block); | |
| 348 | + $blockData = array_intersect_key($block, $blocks->getFields()); | |
| 349 | + $blocks->update($blockData); | |
| 246 | 350 | } |
| 247 | 351 | |
| 248 | 352 | } // End class. |
