GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Completed
Pull Request — develop (#1782)
by
unknown
10:54
created
modules/tag/tag.class.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * @class  tag
5
- * @author NAVER ([email protected])
6
- * @brief high class of the tag module
7
- */
4
+	 * @class  tag
5
+	 * @author NAVER ([email protected])
6
+	 * @brief high class of the tag module
7
+	 */
8 8
 class tag extends ModuleObject
9 9
 {
10 10
 	/**
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		$oModuleController = getController('module');
16 16
 		$oDB = &DB::getInstance();
17 17
 
18
-		$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
18
+		$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
19 19
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
20 20
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
21 21
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
@@ -36,15 +36,15 @@  discard block
 block discarded – undo
36 36
 		$oModuleModel = getModel('module');
37 37
 		$oDB = &DB::getInstance();
38 38
 		// 2007. 10. 17 trigger registration, if registered upset
39
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
40
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
41
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
42
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
43
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
39
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
40
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
41
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
42
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
43
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
44 44
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
45
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
45
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
46 46
 		// tag in the index column of the table tag
47
-		if(!$oDB->isIndexExists("tags","idx_tag")) return true;
47
+		if (!$oDB->isIndexExists("tags", "idx_tag")) return true;
48 48
 
49 49
 		return false;
50 50
 	}
@@ -58,26 +58,26 @@  discard block
 block discarded – undo
58 58
 		$oModuleController = getController('module');
59 59
 		$oDB = &DB::getInstance();
60 60
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
61
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
61
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
62 62
 			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
63 63
 
64
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
64
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
65 65
 			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
66 66
 
67
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
67
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
68 68
 			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
69 69
 
70
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
70
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
71 71
 			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
72 72
 
73
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
73
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
74 74
 			$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
75 75
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
76
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
76
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
77 77
 			$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
78 78
 		// tag in the index column of the table tag
79
-		if(!$oDB->isIndexExists("tags","idx_tag")) 
80
-			$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
79
+		if (!$oDB->isIndexExists("tags", "idx_tag")) 
80
+			$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
81 81
 
82 82
 		return new Object(0, 'success_updated');
83 83
 	}
Please login to merge, or discard this patch.
Braces   +42 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,15 +36,29 @@  discard block
 block discarded – undo
36 36
 		$oModuleModel = getModel('module');
37 37
 		$oDB = &DB::getInstance();
38 38
 		// 2007. 10. 17 trigger registration, if registered upset
39
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
40
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
41
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
42
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
43
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
39
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
40
+			return true;
41
+		}
42
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
43
+			return true;
44
+		}
45
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
46
+			return true;
47
+		}
48
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
49
+			return true;
50
+		}
51
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
52
+			return true;
53
+		}
44 54
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
45
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
55
+		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
56
+			return true;
57
+		}
46 58
 		// tag in the index column of the table tag
47
-		if(!$oDB->isIndexExists("tags","idx_tag")) return true;
59
+		if(!$oDB->isIndexExists("tags","idx_tag")) {
60
+			return true;
61
+		}
48 62
 
49 63
 		return false;
50 64
 	}
@@ -58,26 +72,33 @@  discard block
 block discarded – undo
58 72
 		$oModuleController = getController('module');
59 73
 		$oDB = &DB::getInstance();
60 74
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
61
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
62
-			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
75
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
76
+					$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
77
+		}
63 78
 
64
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
65
-			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
79
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
80
+					$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
81
+		}
66 82
 
67
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
68
-			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
83
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
84
+					$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
85
+		}
69 86
 
70
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
71
-			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
87
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
88
+					$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
89
+		}
72 90
 
73
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
74
-			$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
91
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
92
+					$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
93
+		}
75 94
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
76
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
77
-			$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
95
+		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
96
+					$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
97
+		}
78 98
 		// tag in the index column of the table tag
79
-		if(!$oDB->isIndexExists("tags","idx_tag")) 
80
-			$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
99
+		if(!$oDB->isIndexExists("tags","idx_tag")) {
100
+					$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
101
+		}
81 102
 
82 103
 		return new Object(0, 'success_updated');
83 104
 	}
Please login to merge, or discard this patch.
modules/tag/tag.controller.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * @class  tagController
5
- * @author NAVER ([email protected])
6
- * @brief tag module's controller class
7
- */
4
+	 * @class  tagController
5
+	 * @author NAVER ([email protected])
6
+	 * @brief tag module's controller class
7
+	 */
8 8
 class tagController extends tag
9 9
 {
10 10
 	/**
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -19,20 +19,20 @@  discard block
 block discarded – undo
19 19
 	 */
20 20
 	function triggerArrangeTag(&$obj)
21 21
 	{
22
-		if(!$obj->tags) return new Object();
22
+		if (!$obj->tags) return new Object();
23 23
 		// tags by variable
24 24
 		$tag_list = explode(',', $obj->tags);
25 25
 		$tag_count = count($tag_list);
26 26
 		$tag_list = array_unique($tag_list);
27
-		if(!count($tag_list)) return new Object();
27
+		if (!count($tag_list)) return new Object();
28 28
 
29
-		foreach($tag_list as $tag)
29
+		foreach ($tag_list as $tag)
30 30
 		{
31
-			if(!trim($tag)) continue;
31
+			if (!trim($tag)) continue;
32 32
 			$arranged_tag_list[] = trim($tag); 
33 33
 		}
34
-		if(!count($arranged_tag_list)) $obj->tags = null;
35
-		else $obj->tags = implode(',',$arranged_tag_list);
34
+		if (!count($arranged_tag_list)) $obj->tags = null;
35
+		else $obj->tags = implode(',', $arranged_tag_list);
36 36
 		return new Object();
37 37
 	}
38 38
 
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
45 45
 		$module_srl = $obj->module_srl;
46 46
 		$document_srl = $obj->document_srl;
47 47
 		$tags = $obj->tags;
48
-		if(!$document_srl) return new Object();
48
+		if (!$document_srl) return new Object();
49 49
 		// Remove all tags that article
50 50
 		$output = $this->triggerDeleteTag($obj);
51
-		if(!$output->toBool()) return $output;
51
+		if (!$output->toBool()) return $output;
52 52
 		// Re-enter the tag
53 53
 		$args = new stdClass();
54 54
 		$args->module_srl = $module_srl;
55 55
 		$args->document_srl = $document_srl;
56 56
 
57
-		$tag_list = explode(',',$tags);
57
+		$tag_list = explode(',', $tags);
58 58
 		$tag_count = count($tag_list);
59
-		for($i=0;$i<$tag_count;$i++)
59
+		for ($i = 0; $i < $tag_count; $i++)
60 60
 		{
61 61
 			unset($args->tag);
62 62
 			$args->tag = trim($tag_list[$i]);
63
-			if(!$args->tag) continue;
63
+			if (!$args->tag) continue;
64 64
 			$output = executeQuery('tag.insertTag', $args);
65
-			if(!$output->toBool()) return $output;
65
+			if (!$output->toBool()) return $output;
66 66
 		}
67 67
 
68 68
 		return new Object();
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	function triggerDeleteTag(&$obj)
76 76
 	{
77 77
 		$document_srl = $obj->document_srl;
78
-		if(!$document_srl) return new Object();
78
+		if (!$document_srl) return new Object();
79 79
 
80 80
 		$args = new stdClass();
81 81
 		$args->document_srl = $document_srl;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	function triggerDeleteModuleTags(&$obj)
89 89
 	{
90 90
 		$module_srl = $obj->module_srl;
91
-		if(!$module_srl) return new Object();
91
+		if (!$module_srl) return new Object();
92 92
 
93 93
 		$oTagController = getAdminController('tag');
94 94
 		return $oTagController->deleteModuleTags($module_srl);
Please login to merge, or discard this patch.
Braces   +32 added lines, -11 removed lines patch added patch discarded remove patch
@@ -19,20 +19,29 @@  discard block
 block discarded – undo
19 19
 	 */
20 20
 	function triggerArrangeTag(&$obj)
21 21
 	{
22
-		if(!$obj->tags) return new Object();
22
+		if(!$obj->tags) {
23
+			return new Object();
24
+		}
23 25
 		// tags by variable
24 26
 		$tag_list = explode(',', $obj->tags);
25 27
 		$tag_count = count($tag_list);
26 28
 		$tag_list = array_unique($tag_list);
27
-		if(!count($tag_list)) return new Object();
29
+		if(!count($tag_list)) {
30
+			return new Object();
31
+		}
28 32
 
29 33
 		foreach($tag_list as $tag)
30 34
 		{
31
-			if(!trim($tag)) continue;
35
+			if(!trim($tag)) {
36
+				continue;
37
+			}
32 38
 			$arranged_tag_list[] = trim($tag); 
33 39
 		}
34
-		if(!count($arranged_tag_list)) $obj->tags = null;
35
-		else $obj->tags = implode(',',$arranged_tag_list);
40
+		if(!count($arranged_tag_list)) {
41
+			$obj->tags = null;
42
+		} else {
43
+			$obj->tags = implode(',',$arranged_tag_list);
44
+		}
36 45
 		return new Object();
37 46
 	}
38 47
 
@@ -45,10 +54,14 @@  discard block
 block discarded – undo
45 54
 		$module_srl = $obj->module_srl;
46 55
 		$document_srl = $obj->document_srl;
47 56
 		$tags = $obj->tags;
48
-		if(!$document_srl) return new Object();
57
+		if(!$document_srl) {
58
+			return new Object();
59
+		}
49 60
 		// Remove all tags that article
50 61
 		$output = $this->triggerDeleteTag($obj);
51
-		if(!$output->toBool()) return $output;
62
+		if(!$output->toBool()) {
63
+			return $output;
64
+		}
52 65
 		// Re-enter the tag
53 66
 		$args = new stdClass();
54 67
 		$args->module_srl = $module_srl;
@@ -60,9 +73,13 @@  discard block
 block discarded – undo
60 73
 		{
61 74
 			unset($args->tag);
62 75
 			$args->tag = trim($tag_list[$i]);
63
-			if(!$args->tag) continue;
76
+			if(!$args->tag) {
77
+				continue;
78
+			}
64 79
 			$output = executeQuery('tag.insertTag', $args);
65
-			if(!$output->toBool()) return $output;
80
+			if(!$output->toBool()) {
81
+				return $output;
82
+			}
66 83
 		}
67 84
 
68 85
 		return new Object();
@@ -75,7 +92,9 @@  discard block
 block discarded – undo
75 92
 	function triggerDeleteTag(&$obj)
76 93
 	{
77 94
 		$document_srl = $obj->document_srl;
78
-		if(!$document_srl) return new Object();
95
+		if(!$document_srl) {
96
+			return new Object();
97
+		}
79 98
 
80 99
 		$args = new stdClass();
81 100
 		$args->document_srl = $document_srl;
@@ -88,7 +107,9 @@  discard block
 block discarded – undo
88 107
 	function triggerDeleteModuleTags(&$obj)
89 108
 	{
90 109
 		$module_srl = $obj->module_srl;
91
-		if(!$module_srl) return new Object();
110
+		if(!$module_srl) {
111
+			return new Object();
112
+		}
92 113
 
93 114
 		$oTagController = getAdminController('tag');
94 115
 		return $oTagController->deleteModuleTags($module_srl);
Please login to merge, or discard this patch.
modules/trash/model/TrashVO.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 	function getTitle()
26 26
 	{
27
-		if(empty($this->title)) return $lang->untitle;
27
+		if (empty($this->title)) return $lang->untitle;
28 28
 		return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
29 29
 	}
30 30
 	function setTitle($title)
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 	function getOriginModule()
35 35
 	{
36
-		if(empty($this->originModule)) return 'document';
36
+		if (empty($this->originModule)) return 'document';
37 37
 		return $this->originModule;
38 38
 	}
39 39
 	function setOriginModule($originModule)
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 	function getRegdate()
100 100
 	{
101
-		if(empty($this->regdate)) return date('YmdHis');
101
+		if (empty($this->regdate)) return date('YmdHis');
102 102
 
103 103
 		return $this->regdate;
104 104
 	}
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,9 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 	function getTitle()
26 26
 	{
27
-		if(empty($this->title)) return $lang->untitle;
27
+		if(empty($this->title)) {
28
+			return $lang->untitle;
29
+		}
28 30
 		return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
29 31
 	}
30 32
 	function setTitle($title)
@@ -33,7 +35,9 @@  discard block
 block discarded – undo
33 35
 	}
34 36
 	function getOriginModule()
35 37
 	{
36
-		if(empty($this->originModule)) return 'document';
38
+		if(empty($this->originModule)) {
39
+			return 'document';
40
+		}
37 41
 		return $this->originModule;
38 42
 	}
39 43
 	function setOriginModule($originModule)
@@ -98,7 +102,9 @@  discard block
 block discarded – undo
98 102
 	}
99 103
 	function getRegdate()
100 104
 	{
101
-		if(empty($this->regdate)) return date('YmdHis');
105
+		if(empty($this->regdate)) {
106
+			return date('YmdHis');
107
+		}
102 108
 
103 109
 		return $this->regdate;
104 110
 	}
Please login to merge, or discard this patch.
modules/trash/trash.admin.view.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * trashAdminView class
5
- * Admin view class of the trash module
6
- *
7
- * @author NAVER ([email protected])
8
- * @package /modules/trash
9
- * @version 0.1
10
- */
4
+	 * trashAdminView class
5
+	 * Admin view class of the trash module
6
+	 *
7
+	 * @author NAVER ([email protected])
8
+	 * @package /modules/trash
9
+	 * @version 0.1
10
+	 */
11 11
 class trashAdminView extends trash
12 12
 {
13 13
 	/**
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	function init()
18 18
 	{
19 19
 		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
20
-		$template_path = sprintf("%stpl/",$this->module_path);
20
+		$template_path = sprintf("%stpl/", $this->module_path);
21 21
 		$this->setTemplatePath($template_path);
22 22
 	}
23 23
 
@@ -51,20 +51,20 @@  discard block
 block discarded – undo
51 51
 		$oModuleModel = getModel('module');
52 52
 		$module_list = array();
53 53
 		$mod_srls = array();
54
-		foreach($output->data as $oTrashVO)
54
+		foreach ($output->data as $oTrashVO)
55 55
 		{
56 56
 			$mod_srls[] = $oTrashVO->unserializedObject['module_srl'];
57 57
 		}
58 58
 		$mod_srls = array_unique($mod_srls);
59 59
 		// Module List
60 60
 		$mod_srls_count = count($mod_srls);
61
-		if($mod_srls_count)
61
+		if ($mod_srls_count)
62 62
 		{
63 63
 			$columnList = array('module_srl', 'mid', 'browser_title');
64 64
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
65
-			if($module_output && is_array($module_output))
65
+			if ($module_output && is_array($module_output))
66 66
 			{
67
-				foreach($module_output as $module)
67
+				foreach ($module_output as $module)
68 68
 				{
69 69
 					$module_list[$module->module_srl] = $module;
70 70
 				}
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$oTrashModel = getModel('trash');
88 88
 		$output = $oTrashModel->getTrash($trash_srl);
89
-		if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
89
+		if (!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
90 90
 
91 91
 		$originObject = unserialize($output->data->getSerializedObject());
92
-		if(is_array($originObject)) $originObject = (object)$originObject;
92
+		if (is_array($originObject)) $originObject = (object) $originObject;
93 93
 
94
-		Context::set('oTrashVO',$output->data);
95
-		Context::set('oOrigin',$originObject);
94
+		Context::set('oTrashVO', $output->data);
95
+		Context::set('oOrigin', $originObject);
96 96
 
97 97
 		$oMemberModel = &getModel('member');
98 98
 		$remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl());
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl);
103 103
 		Context::set('module_info', $module_info);
104 104
 
105
-		if($originObject) {
105
+		if ($originObject) {
106 106
 			$args_extra->module_srl = $originObject->module_srl;
107 107
 			$args_extra->document_srl = $originObject->document_srl;
108 108
 			$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);				
109
-			Context::set('oOriginExtraVars',$output_extra->data);
109
+			Context::set('oOriginExtraVars', $output_extra->data);
110 110
 		}
111 111
 		$this->setTemplateFile('trash_view');
112 112
 	}
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,10 +86,14 @@
 block discarded – undo
86 86
 
87 87
 		$oTrashModel = getModel('trash');
88 88
 		$output = $oTrashModel->getTrash($trash_srl);
89
-		if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
89
+		if(!$output->data->getTrashSrl()) {
90
+			return new Object(-1, 'msg_invalid_request');
91
+		}
90 92
 
91 93
 		$originObject = unserialize($output->data->getSerializedObject());
92
-		if(is_array($originObject)) $originObject = (object)$originObject;
94
+		if(is_array($originObject)) {
95
+			$originObject = (object)$originObject;
96
+		}
93 97
 
94 98
 		Context::set('oTrashVO',$output->data);
95 99
 		Context::set('oOrigin',$originObject);
Please login to merge, or discard this patch.
modules/trash/trash.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3
-require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
3
+require_once(_XE_PATH_ . 'modules/trash/model/TrashVO.php');
4 4
 
5 5
 /**
6 6
  * trash class
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 		//$oDB = &DB::getInstance();
43 43
 		//$oModuleModel = getModel('module');
44 44
 
45
-		return new Object(0,'success_updated');
45
+		return new Object(0, 'success_updated');
46 46
 	}
47 47
 }
48 48
 /* End of file trash.class.php */
Please login to merge, or discard this patch.
modules/trash/trash.controller.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * trashController
5
- * trash the module's controller class
6
- *
7
- * @author NAVER ([email protected])
8
- * @package /modules/trash
9
- * @version 0.1
10
- */
4
+	 * trashController
5
+	 * trash the module's controller class
6
+	 *
7
+	 * @author NAVER ([email protected])
8
+	 * @package /modules/trash
9
+	 * @version 0.1
10
+	 */
11 11
 class trashController extends trash
12 12
 {
13 13
 }
Please login to merge, or discard this patch.
modules/trash/trash.model.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	function getTrash($trashSrl, $columnList = array())
20 20
 	{
21 21
 		$oTrashVO = new TrashVO();
22
-		if(!$trashSrl) return $oTrashVO;
22
+		if (!$trashSrl) return $oTrashVO;
23 23
 
24 24
 		$args = new stdClass();
25 25
 		$args->trashSrl = $trashSrl;
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
 	{
42 42
 		$output = executeQueryArray('trash.getTrashList', $args, $columnList);
43 43
 
44
-		if(is_array($output->data))
44
+		if (is_array($output->data))
45 45
 		{
46
-			foreach($output->data AS $key=>$value)
46
+			foreach ($output->data AS $key=>$value)
47 47
 			{
48 48
 				$oTrashVO = new TrashVO();
49 49
 				$this->_setTrashObject($oTrashVO, $value);
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	{
64 64
 		$output = executeQueryArray('trash.getTrashAllList', $args, $columnList);
65 65
 
66
-		if(is_array($output->data))
66
+		if (is_array($output->data))
67 67
 		{
68
-			foreach($output->data AS $key=>$value)
68
+			foreach ($output->data AS $key=>$value)
69 69
 			{
70 70
 				$oTrashVO = new TrashVO();
71 71
 				$this->_setTrashObject($oTrashVO, $value);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,9 @@
 block discarded – undo
19 19
 	function getTrash($trashSrl, $columnList = array())
20 20
 	{
21 21
 		$oTrashVO = new TrashVO();
22
-		if(!$trashSrl) return $oTrashVO;
22
+		if(!$trashSrl) {
23
+			return $oTrashVO;
24
+		}
23 25
 
24 26
 		$args = new stdClass();
25 27
 		$args->trashSrl = $trashSrl;
Please login to merge, or discard this patch.
modules/widget/widget.admin.view.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * @class  widgetAdminView
5
- * @author NAVER ([email protected])
6
- * @brief admin view class for widget modules
7
- */
4
+	 * @class  widgetAdminView
5
+	 * @author NAVER ([email protected])
6
+	 * @brief admin view class for widget modules
7
+	 */
8 8
 class widgetAdminView extends widget
9 9
 {
10 10
 	/**
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 	 */
13 13
 	function init()
14 14
 	{
15
-		$this->setTemplatePath($this->module_path.'tpl');
15
+		$this->setTemplatePath($this->module_path . 'tpl');
16 16
 	}
17 17
 
18 18
 	/**
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 		$security = new Security($widget_list);
28 28
 		$widget_list = $security->encodeHTML('..', '..author..');
29 29
 
30
-		foreach($widget_list as $no => $widget)
30
+		foreach ($widget_list as $no => $widget)
31 31
 		{
32
-			if($widget->widget)
32
+			if ($widget->widget)
33 33
 			{
34 34
 				$widget_list[$no]->description = nl2br(trim($widget->description));
35 35
 			}
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	function dispWidgetAdminAddContent()
60 60
 	{
61 61
 		$module_srl = Context::get('module_srl');
62
-		if(!$module_srl) return $this->stop("msg_invalid_request");
62
+		if (!$module_srl) return $this->stop("msg_invalid_request");
63 63
 
64 64
 		$document_srl = Context::get('document_srl');
65 65
 		$oDocumentModel = getModel('document');
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		Context::set('module_info', $module_info);
73 73
 		// Editors settings of the module by calling getEditor
74 74
 		$oEditorModel = getModel('editor');
75
-		$editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
75
+		$editor = $oEditorModel->getModuleEditor('document', $module_srl, $module_srl, 'module_srl', 'content');
76 76
 		Context::set('editor', $editor);
77 77
 
78 78
 		$security = new Security();
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@  discard block
 block discarded – undo
32 32
 			if($widget->widget)
33 33
 			{
34 34
 				$widget_list[$no]->description = nl2br(trim($widget->description));
35
-			}
36
-			else
35
+			} else
37 36
 			{
38 37
 				unset($widget_list[$no]);
39 38
 			}
@@ -59,7 +58,9 @@  discard block
 block discarded – undo
59 58
 	function dispWidgetAdminAddContent()
60 59
 	{
61 60
 		$module_srl = Context::get('module_srl');
62
-		if(!$module_srl) return $this->stop("msg_invalid_request");
61
+		if(!$module_srl) {
62
+			return $this->stop("msg_invalid_request");
63
+		}
63 64
 
64 65
 		$document_srl = Context::get('document_srl');
65 66
 		$oDocumentModel = getModel('document');
Please login to merge, or discard this patch.
modules/widget/widget.class.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /* Copyright (C) NAVER <http://www.navercorp.com> */
3 3
 /**
4
- * @class  widget
5
- * @author NAVER ([email protected])
6
- * @brief widget module's high class
7
- */
4
+	 * @class  widget
5
+	 * @author NAVER ([email protected])
6
+	 * @brief widget module's high class
7
+	 */
8 8
 class widget extends ModuleObject
9 9
 {
10 10
 	/**
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	{
30 30
 		$oModuleModel = getModel('module');
31 31
 		// widget compile display.after trigger for further (04/14/2009)
32
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
32
+		if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
33 33
 
34 34
 		return false;
35 35
 	}
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 		$oModuleModel = getModel('module');
43 43
 		$oModuleController = getController('module');
44 44
 		// widget compile display.after trigger for further (04/14/2009)
45
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
45
+		if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
46 46
 		{
47 47
 			$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
48 48
 		}
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,9 @@
 block discarded – undo
29 29
 	{
30 30
 		$oModuleModel = getModel('module');
31 31
 		// widget compile display.after trigger for further (04/14/2009)
32
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
32
+		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
33
+			return true;
34
+		}
33 35
 
34 36
 		return false;
35 37
 	}
Please login to merge, or discard this patch.