Commit c6965373f2f5a6bc2b3c8b14100264d4e22a0364

Authored by Jarrett Jordaan
1 parent 306cdda9

Code cleanup.

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
plugins/ktcore/KTBulkActions.php
@@ -259,16 +259,9 @@ class KTBulkDeleteAction extends KTBulkAction { @@ -259,16 +259,9 @@ class KTBulkDeleteAction extends KTBulkAction {
259 return parent::do_performaction(); 259 return parent::do_performaction();
260 } 260 }
261 261
262 - /* 262 + /**
263 * Bulk delete 263 * Bulk delete
264 - * Author : Jarrett Jordaan  
265 - * Modified : 28/04/09  
266 - *  
267 * @params : KTDocumentUtil/KTFolderUtil $oEntity 264 * @params : KTDocumentUtil/KTFolderUtil $oEntity
268 - *  
269 - * Description : Since its a bulk operation, the delete function needs to  
270 - * know that. Added extra boolean param to the delete  
271 - * function.  
272 */ 265 */
273 function perform_action($oEntity) { 266 function perform_action($oEntity) {
274 $sReason = $this->res['reason']; 267 $sReason = $this->res['reason'];
@@ -526,16 +519,10 @@ class KTBulkMoveAction extends KTBulkAction { @@ -526,16 +519,10 @@ class KTBulkMoveAction extends KTBulkAction {
526 return parent::do_performaction(); 519 return parent::do_performaction();
527 } 520 }
528 521
529 - /* 522 + /**
530 * Bulk move 523 * Bulk move
531 - * Author : Jarrett Jordaan  
532 - * Modified : 28/04/09  
533 - *  
534 * @params : KTDocumentUtil/KTFolderUtil $oEntity 524 * @params : KTDocumentUtil/KTFolderUtil $oEntity
535 * 525 *
536 - * Description : Since its a bulk operation, the move function needs to  
537 - * know that. Added extra boolean param to the move  
538 - * function.  
539 */ 526 */
540 function perform_action($oEntity) { 527 function perform_action($oEntity) {
541 if(is_a($oEntity, 'Document')) { 528 if(is_a($oEntity, 'Document')) {
@@ -771,16 +758,10 @@ class KTBulkCopyAction extends KTBulkAction { @@ -771,16 +758,10 @@ class KTBulkCopyAction extends KTBulkAction {
771 return parent::do_performaction(); 758 return parent::do_performaction();
772 } 759 }
773 760
774 - /* 761 + /**
775 * Bulk copy 762 * Bulk copy
776 - * Author : Jarrett Jordaan  
777 - * Modified : 28/04/09  
778 - *  
779 * @params : KTDocumentUtil/KTFolderUtil $oEntity 763 * @params : KTDocumentUtil/KTFolderUtil $oEntity
780 - *  
781 - * Description : Since its a bulk operation, the copy function needs to  
782 - * know that. Added extra boolean param to the copy  
783 - * function. 764 + *
784 */ 765 */
785 function perform_action($oEntity) { 766 function perform_action($oEntity) {
786 if(is_a($oEntity, 'Document')) { 767 if(is_a($oEntity, 'Document')) {
@@ -1029,16 +1010,10 @@ class KTBulkArchiveAction extends KTBulkAction { @@ -1029,16 +1010,10 @@ class KTBulkArchiveAction extends KTBulkAction {
1029 return parent::do_performaction(); 1010 return parent::do_performaction();
1030 } 1011 }
1031 1012
1032 - /* 1013 + /**
1033 * Bulk archive 1014 * Bulk archive
1034 - * Author : Jarrett Jordaan  
1035 - * Modified : 28/04/09  
1036 - *  
1037 * @params : KTDocumentUtil/KTFolderUtil $oEntity 1015 * @params : KTDocumentUtil/KTFolderUtil $oEntity
1038 * 1016 *
1039 - * Description : Since its a bulk operation, the archive function needs  
1040 - * to know that. Added extra boolean param to the archive  
1041 - * function.  
1042 */ 1017 */
1043 function perform_action($oEntity) { 1018 function perform_action($oEntity) {
1044 if(is_a($oEntity, 'Document')) { 1019 if(is_a($oEntity, 'Document')) {
@@ -1216,16 +1191,10 @@ class KTBrowseBulkExportAction extends KTBulkAction { @@ -1216,16 +1191,10 @@ class KTBrowseBulkExportAction extends KTBulkAction {
1216 return $str; 1191 return $str;
1217 } 1192 }
1218 1193
1219 - /* 1194 + /**
1220 * Bulk export 1195 * Bulk export
1221 - * Author : Jarrett Jordaan  
1222 - * Modified : 28/04/09  
1223 - *  
1224 * @params : KTDocumentUtil/KTFolderUtil $oEntity 1196 * @params : KTDocumentUtil/KTFolderUtil $oEntity
1225 * 1197 *
1226 - * Description : Since its a bulk operation, the export function needs  
1227 - * to know that. Added extra boolean param to the export  
1228 - * function.  
1229 */ 1198 */
1230 function perform_action($oEntity) { 1199 function perform_action($oEntity) {
1231 // TODO find a way to do bulk email 1200 // TODO find a way to do bulk email
@@ -1489,16 +1458,10 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction { @@ -1489,16 +1458,10 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
1489 return $result; 1458 return $result;
1490 } 1459 }
1491 1460
1492 - /* 1461 + /**
1493 * Bulk checkout 1462 * Bulk checkout
1494 - * Author : Jarrett Jordaan  
1495 - * Modified : 28/04/09  
1496 - *  
1497 * @params : KTDocumentUtil/KTFolderUtil $oEntity 1463 * @params : KTDocumentUtil/KTFolderUtil $oEntity
1498 * 1464 *
1499 - * Description : Since its a bulk operation, the checkout function needs  
1500 - * to know that. Added extra boolean param to the checkout  
1501 - * function.  
1502 */ 1465 */
1503 function perform_action($oEntity) { 1466 function perform_action($oEntity) {
1504 // checkout document 1467 // checkout document
plugins/ktcore/admin/workflowsv2.php
@@ -2365,8 +2365,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher { @@ -2365,8 +2365,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
2365 2365
2366 if (!empty($sFilter)) { 2366 if (!empty($sFilter)) {
2367 $allowed = array(); 2367 $allowed = array();
2368 - // Modified Jarrett Jordaan Only notify enabled users  
2369 - $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter)); 2368 + $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter)); // notify enabled users
2370 $aUsers = User::getList($q); 2369 $aUsers = User::getList($q);
2371 $q = sprintf('name like "%%%s%%"', DBUtil::escapeSimple($sFilter)); 2370 $q = sprintf('name like "%%%s%%"', DBUtil::escapeSimple($sFilter));
2372 $aGroups = Group::getList($q); 2371 $aGroups = Group::getList($q);
plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
@@ -519,8 +519,6 @@ function addFieldTypeSelection(groupid, fid, type, options) @@ -519,8 +519,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
519 default: 519 default:
520 html += 'unknown: ' + type; 520 html += 'unknown: ' + type;
521 } 521 }
522 - // Jarrett Jordaan  
523 - // Closing tags added  
524 html += "</nobr></td>"; 522 html += "</nobr></td>";
525 523
526 return {html: html, init: callback}; 524 return {html: html, init: callback};
templates/ktcore/search2/adv_query_builder.smarty
@@ -472,8 +472,6 @@ function addFieldTypeSelection(groupid, fid, type, options) @@ -472,8 +472,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
472 default: 472 default:
473 html += 'unknown: ' + type; 473 html += 'unknown: ' + type;
474 } 474 }
475 - // Jarrett Jordaan  
476 - // Closing tags added  
477 html += "</nobr></td>"; 475 html += "</nobr></td>";
478 476
479 return {html: html, init: callback}; 477 return {html: html, init: callback};