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
Push — develop ( 6d6c9c...eb5d2b )
by gyeong-won
08:55
created
modules/file/file.class.php 2 patches
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -57,32 +57,32 @@  discard block
 block discarded – undo
57 57
 		$oModuleModel = getModel('module');
58 58
 		$oModuleController = getController('module');
59 59
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
60
-		if($oModuleModel->needUpdate($version_update_id))
60
+		if ($oModuleModel->needUpdate($version_update_id))
61 61
 		{
62 62
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
63
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
64
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
65
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
66
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
67
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
68
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
69
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
70
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
71
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
72
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
63
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
64
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
65
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
66
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
67
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
68
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
69
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
70
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
71
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
72
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
73 73
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
74
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
74
+			if (!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
75 75
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
76
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
76
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
77 77
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
78
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
78
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
79 79
 			// A column to determine a target type
80
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
80
+			if (!$oDB->isColumnExists('files', 'upload_target_type')) return true;
81 81
 
82 82
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
83
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
83
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
84 84
 
85
-			if(!$oDB->isColumnExists('files', 'cover_image')) return true;
85
+			if (!$oDB->isColumnExists('files', 'cover_image')) return true;
86 86
 
87 87
 			$oModuleController->insertUpdatedLog($version_update_id);
88 88
 		}
@@ -101,57 +101,57 @@  discard block
 block discarded – undo
101 101
 		$oModuleModel = getModel('module');
102 102
 		$oModuleController = getController('module');
103 103
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
104
-		if($oModuleModel->needUpdate($version_update_id))
104
+		if ($oModuleModel->needUpdate($version_update_id))
105 105
 		{
106 106
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
107
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
107
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
108 108
 				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
109 109
 
110
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
110
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
111 111
 				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
112 112
 
113
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
113
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
114 114
 				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
115 115
 
116
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
116
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
117 117
 				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
118 118
 
119
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
119
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
120 120
 				$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
121 121
 
122
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
122
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
123 123
 				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
124 124
 
125
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
125
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
126 126
 				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
127 127
 
128
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
128
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
129 129
 				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
130 130
 
131
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
131
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
132 132
 				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
133 133
 
134
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
134
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
135 135
 				$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
136 136
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
137
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
137
+			if (!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
138 138
 				$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
139 139
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
140
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
140
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
141 141
 				$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
142 142
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
143
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
143
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
144 144
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
145 145
 			// A column to determine a target type
146
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
146
+			if (!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
147 147
 
148 148
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
149
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
149
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
150 150
 			{
151 151
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after');
152 152
 			}
153 153
 
154
-			if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
154
+			if (!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
155 155
 
156 156
 			$oModuleController->insertUpdatedLog($version_update_id);
157 157
 		}
Please login to merge, or discard this patch.
Braces   +93 added lines, -44 removed lines patch added patch discarded remove patch
@@ -60,29 +60,61 @@  discard block
 block discarded – undo
60 60
 		if($oModuleModel->needUpdate($version_update_id))
61 61
 		{
62 62
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
63
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
64
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
65
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
66
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
67
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
68
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
69
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
70
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
71
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
72
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
63
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
64
+				return true;
65
+			}
66
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
67
+				return true;
68
+			}
69
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
70
+				return true;
71
+			}
72
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
73
+				return true;
74
+			}
75
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
76
+				return true;
77
+			}
78
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
79
+				return true;
80
+			}
81
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
82
+				return true;
83
+			}
84
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
85
+				return true;
86
+			}
87
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
88
+				return true;
89
+			}
90
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) {
91
+				return true;
92
+			}
73 93
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
74
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
94
+			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
95
+				return true;
96
+			}
75 97
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
76
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
98
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) {
99
+				return true;
100
+			}
77 101
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
78
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
102
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) {
103
+				return true;
104
+			}
79 105
 			// A column to determine a target type
80
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
106
+			if(!$oDB->isColumnExists('files', 'upload_target_type')) {
107
+				return true;
108
+			}
81 109
 
82 110
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
83
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
111
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) {
112
+				return true;
113
+			}
84 114
 
85
-			if(!$oDB->isColumnExists('files', 'cover_image')) return true;
115
+			if(!$oDB->isColumnExists('files', 'cover_image')) {
116
+				return true;
117
+			}
86 118
 
87 119
 			$oModuleController->insertUpdatedLog($version_update_id);
88 120
 		}
@@ -104,46 +136,61 @@  discard block
 block discarded – undo
104 136
 		if($oModuleModel->needUpdate($version_update_id))
105 137
 		{
106 138
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
107
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
108
-				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
139
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
140
+							$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
141
+			}
109 142
 
110
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
111
-				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
143
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
144
+							$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
145
+			}
112 146
 
113
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
114
-				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
147
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
148
+							$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
149
+			}
115 150
 
116
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
117
-				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
151
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
152
+							$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
153
+			}
118 154
 
119
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
120
-				$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
155
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
156
+							$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
157
+			}
121 158
 
122
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
123
-				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
159
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
160
+							$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
161
+			}
124 162
 
125
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
126
-				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
163
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
164
+							$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
165
+			}
127 166
 
128
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
129
-				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
167
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
168
+							$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
169
+			}
130 170
 
131
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
132
-				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
171
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
172
+							$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
173
+			}
133 174
 
134
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
135
-				$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
175
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) {
176
+							$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
177
+			}
136 178
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
137
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
138
-				$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
179
+			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
180
+							$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
181
+			}
139 182
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
140
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
141
-				$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
183
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) {
184
+							$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
185
+			}
142 186
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
143
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
144
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
187
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) {
188
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
189
+			}
145 190
 			// A column to determine a target type
146
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
191
+			if(!$oDB->isColumnExists('files', 'upload_target_type')) {
192
+				$oDB->addColumn('files', 'upload_target_type', 'char', '3');
193
+			}
147 194
 
148 195
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
149 196
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
@@ -151,7 +198,9 @@  discard block
 block discarded – undo
151 198
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after');
152 199
 			}
153 200
 
154
-			if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
201
+			if(!$oDB->isColumnExists('files', 'cover_image')) {
202
+				$oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
203
+			}
155 204
 
156 205
 			$oModuleController->insertUpdatedLog($version_update_id);
157 206
 		}
Please login to merge, or discard this patch.
modules/spamfilter/spamfilter.class.php 2 patches
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -36,25 +36,25 @@  discard block
 block discarded – undo
36 36
 		$oModuleModel = getModel('module');
37 37
 		$oModuleController = getController('module');
38 38
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
39
-		if($oModuleModel->needUpdate($version_update_id))
39
+		if ($oModuleModel->needUpdate($version_update_id))
40 40
 		{
41 41
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
42
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
43
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
44
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
42
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
43
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
44
+			if (!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
45 45
 			// 2008-12-17 Add a spamfilter for post modification actions
46
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
47
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
46
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
47
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
48 48
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
49
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
49
+			if (!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
50 50
 
51 51
 			/**
52 52
 			 * Add the hit count field (hit)
53 53
 			 */
54
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
55
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
54
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
55
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
56 56
 
57
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
57
+			if (!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
58 58
 
59 59
 			$oModuleController->insertUpdatedLog($version_update_id);
60 60
 		}
@@ -71,27 +71,27 @@  discard block
 block discarded – undo
71 71
 		$oModuleModel = getModel('module');
72 72
 		$oModuleController = getController('module');
73 73
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
74
-		if($oModuleModel->needUpdate($version_update_id))
74
+		if ($oModuleModel->needUpdate($version_update_id))
75 75
 		{
76 76
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
77
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
77
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
78 78
 				$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
79
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
79
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
80 80
 				$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
81
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
81
+			if (!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
82 82
 				$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
83 83
 			// 2008-12-17 Add a spamfilter for post modification actions
84
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
84
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
85 85
 			{
86 86
 				$oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
87 87
 			}
88 88
 			// 2008-12-17 Add a spamfilter for post modification actions
89
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
89
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
90 90
 			{
91 91
 				$oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
92 92
 			}
93 93
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
94
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before'))
94
+			if (!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before'))
95 95
 			{
96 96
 				$oModuleController->insertTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before');
97 97
 			}
@@ -99,26 +99,26 @@  discard block
 block discarded – undo
99 99
 			/**
100 100
 			 * Add the hit count field (hit)
101 101
 			 */
102
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit'))
102
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'hit'))
103 103
 			{
104
-				$oDB->addColumn('spamfilter_denied_word','hit','number',12,0,true);
105
-				$oDB->addIndex('spamfilter_denied_word','idx_hit', 'hit');
104
+				$oDB->addColumn('spamfilter_denied_word', 'hit', 'number', 12, 0, true);
105
+				$oDB->addIndex('spamfilter_denied_word', 'idx_hit', 'hit');
106 106
 			}
107
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit'))
107
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit'))
108 108
 			{
109
-				$oDB->addColumn('spamfilter_denied_word','latest_hit','date');
110
-				$oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit');
109
+				$oDB->addColumn('spamfilter_denied_word', 'latest_hit', 'date');
110
+				$oDB->addIndex('spamfilter_denied_word', 'idx_latest_hit', 'latest_hit');
111 111
 			}
112 112
 
113
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description'))
113
+			if (!$oDB->isColumnExists('spamfilter_denied_ip', 'description'))
114 114
 			{
115
-				$oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
115
+				$oDB->addColumn('spamfilter_denied_ip', 'description', 'varchar', 250);
116 116
 			}
117 117
 
118 118
 			$oModuleController->insertUpdatedLog($version_update_id);
119 119
 		}
120 120
 
121
-		return new Object(0,'success_updated');
121
+		return new Object(0, 'success_updated');
122 122
 	}
123 123
 
124 124
 	/**
Please login to merge, or discard this patch.
Braces   +36 added lines, -15 removed lines patch added patch discarded remove patch
@@ -39,22 +39,40 @@  discard block
 block discarded – undo
39 39
 		if($oModuleModel->needUpdate($version_update_id))
40 40
 		{
41 41
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
42
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
43
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
44
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
42
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
43
+				return true;
44
+			}
45
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
46
+				return true;
47
+			}
48
+			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) {
49
+				return true;
50
+			}
45 51
 			// 2008-12-17 Add a spamfilter for post modification actions
46
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
47
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
52
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
53
+				return true;
54
+			}
55
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
56
+				return true;
57
+			}
48 58
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
49
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
59
+			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) {
60
+				return true;
61
+			}
50 62
 
51 63
 			/**
52 64
 			 * Add the hit count field (hit)
53 65
 			 */
54
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
55
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
66
+			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) {
67
+				return true;
68
+			}
69
+			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) {
70
+				return true;
71
+			}
56 72
 
57
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
73
+			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) {
74
+				return true;
75
+			}
58 76
 
59 77
 			$oModuleController->insertUpdatedLog($version_update_id);
60 78
 		}
@@ -74,12 +92,15 @@  discard block
 block discarded – undo
74 92
 		if($oModuleModel->needUpdate($version_update_id))
75 93
 		{
76 94
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
77
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
78
-				$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
79
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
80
-				$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
81
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
82
-				$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
95
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
96
+							$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
97
+			}
98
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
99
+							$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
100
+			}
101
+			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) {
102
+							$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
103
+			}
83 104
 			// 2008-12-17 Add a spamfilter for post modification actions
84 105
 			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
85 106
 			{
Please login to merge, or discard this patch.
modules/addon/addon.class.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 		$oModuleController = getController('module');
43 43
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
44 44
 		{
45
-			if(!$oDB->isColumnExists("addons", "is_used_m"))
45
+			if (!$oDB->isColumnExists("addons", "is_used_m"))
46 46
 			{
47 47
 				return TRUE;
48 48
 			}
49
-			if(!$oDB->isColumnExists("addons_site", "is_used_m"))
49
+			if (!$oDB->isColumnExists("addons_site", "is_used_m"))
50 50
 			{
51 51
 				return TRUE;
52 52
 			}
53 53
 
54 54
 			// 2011. 7. 29. add is_fixed column
55
-			if(!$oDB->isColumnExists('addons', 'is_fixed'))
55
+			if (!$oDB->isColumnExists('addons', 'is_fixed'))
56 56
 			{
57 57
 				return TRUE;
58 58
 			}
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 		$oModuleModel = getModel('module');
76 76
 		$oModuleController = getController('module');
77 77
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
78
-		if($oModuleModel->needUpdate($version_update_id))
78
+		if ($oModuleModel->needUpdate($version_update_id))
79 79
 		{
80
-			if(!$oDB->isColumnExists("addons", "is_used_m"))
80
+			if (!$oDB->isColumnExists("addons", "is_used_m"))
81 81
 			{
82 82
 				$oDB->addColumn("addons", "is_used_m", "char", 1, "N", TRUE);
83 83
 			}
84
-			if(!$oDB->isColumnExists("addons_site", "is_used_m"))
84
+			if (!$oDB->isColumnExists("addons_site", "is_used_m"))
85 85
 			{
86 86
 				$oDB->addColumn("addons_site", "is_used_m", "char", 1, "N", TRUE);
87 87
 			}
88 88
 
89 89
 			// 2011. 7. 29. add is_fixed column
90
-			if(!$oDB->isColumnExists('addons', 'is_fixed'))
90
+			if (!$oDB->isColumnExists('addons', 'is_fixed'))
91 91
 			{
92 92
 				$oDB->addColumn('addons', 'is_fixed', 'char', 1, 'N', TRUE);
93 93
 
94 94
 				// move addon info to addon_site table
95 95
 				$output = executeQueryArray('addon.getAddons');
96
-				if($output->data)
96
+				if ($output->data)
97 97
 				{
98
-					foreach($output->data as $row)
98
+					foreach ($output->data as $row)
99 99
 					{
100 100
 						$args = new stdClass();
101 101
 						$args->site_srl = 0;
Please login to merge, or discard this patch.
modules/tag/tag.class.php 2 patches
Spacing   +18 added lines, -18 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');
@@ -37,18 +37,18 @@  discard block
 block discarded – undo
37 37
 		$oModuleModel = getModel('module');
38 38
 		$oModuleController = getController('module');
39 39
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
40
-		if($oModuleModel->needUpdate($version_update_id))
40
+		if ($oModuleModel->needUpdate($version_update_id))
41 41
 		{
42 42
 			// 2007. 10. 17 trigger registration, if registered upset
43
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
44
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
45
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
46
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
47
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
43
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
44
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
45
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
46
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
47
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
48 48
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
49
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
49
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
50 50
 			// tag in the index column of the table tag
51
-			if(!$oDB->isIndexExists("tags","idx_tag")) return true;
51
+			if (!$oDB->isIndexExists("tags", "idx_tag")) return true;
52 52
 
53 53
 			$oModuleController->insertUpdatedLog($version_update_id);
54 54
 		}
@@ -65,29 +65,29 @@  discard block
 block discarded – undo
65 65
 		$oModuleModel = getModel('module');
66 66
 		$oModuleController = getController('module');
67 67
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
68
-		if($oModuleModel->needUpdate($version_update_id))
68
+		if ($oModuleModel->needUpdate($version_update_id))
69 69
 		{
70 70
 			// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
71
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
71
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
72 72
 				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
73 73
 
74
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
74
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
75 75
 				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
76 76
 
77
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
77
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
78 78
 				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
79 79
 
80
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
80
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
81 81
 				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
82 82
 
83
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
83
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
84 84
 				$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
85 85
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
86
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
86
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
87 87
 				$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
88 88
 			// tag in the index column of the table tag
89
-			if(!$oDB->isIndexExists("tags","idx_tag"))
90
-				$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
89
+			if (!$oDB->isIndexExists("tags", "idx_tag"))
90
+				$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
91 91
 
92 92
 			$oModuleController->insertUpdatedLog($version_update_id);
93 93
 		}
Please login to merge, or discard this patch.
Braces   +42 added lines, -21 removed lines patch added patch discarded remove patch
@@ -40,15 +40,29 @@  discard block
 block discarded – undo
40 40
 		if($oModuleModel->needUpdate($version_update_id))
41 41
 		{
42 42
 			// 2007. 10. 17 trigger registration, if registered upset
43
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
44
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
45
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
46
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
47
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
43
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
44
+				return true;
45
+			}
46
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
47
+				return true;
48
+			}
49
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
50
+				return true;
51
+			}
52
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
53
+				return true;
54
+			}
55
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
56
+				return true;
57
+			}
48 58
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
49
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
59
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
60
+				return true;
61
+			}
50 62
 			// tag in the index column of the table tag
51
-			if(!$oDB->isIndexExists("tags","idx_tag")) return true;
63
+			if(!$oDB->isIndexExists("tags","idx_tag")) {
64
+				return true;
65
+			}
52 66
 
53 67
 			$oModuleController->insertUpdatedLog($version_update_id);
54 68
 		}
@@ -68,26 +82,33 @@  discard block
 block discarded – undo
68 82
 		if($oModuleModel->needUpdate($version_update_id))
69 83
 		{
70 84
 			// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
71
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
72
-				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
85
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
86
+							$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
87
+			}
73 88
 
74
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
75
-				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
89
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
90
+							$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
91
+			}
76 92
 
77
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
78
-				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
93
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
94
+							$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
95
+			}
79 96
 
80
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
81
-				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
97
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
98
+							$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
99
+			}
82 100
 
83
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
84
-				$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
101
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
102
+							$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
103
+			}
85 104
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
86
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
87
-				$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
105
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
106
+							$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
107
+			}
88 108
 			// tag in the index column of the table tag
89
-			if(!$oDB->isIndexExists("tags","idx_tag"))
90
-				$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
109
+			if(!$oDB->isIndexExists("tags","idx_tag")) {
110
+							$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
111
+			}
91 112
 
92 113
 			$oModuleController->insertUpdatedLog($version_update_id);
93 114
 		}
Please login to merge, or discard this patch.
modules/layout/layout.class.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -29,30 +29,30 @@  discard block
 block discarded – undo
29 29
 		$oModuleModel = getModel('module');
30 30
 		$oModuleController = getController('module');
31 31
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
32
-		if($oModuleModel->needUpdate($version_update_id))
32
+		if ($oModuleModel->needUpdate($version_update_id))
33 33
 		{
34 34
 			// 2009. 02. 11 Add site_srl to layout table
35
-			if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
35
+			if (!$oDB->isColumnExists('layouts', 'site_srl')) return true;
36 36
 			// 2009. 02. 26 Move the previous layout for faceoff
37 37
 			$files = FileHandler::readDir('./files/cache/layout');
38
-			for($i=0,$c=count($files);$i<$c;$i++)
38
+			for ($i = 0, $c = count($files); $i < $c; $i++)
39 39
 			{
40 40
 				$filename = $files[$i];
41
-				if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
41
+				if (preg_match('/([0-9]+)\.html/i', $filename)) return true;
42 42
 			}
43 43
 
44
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
44
+			if (!$oDB->isColumnExists('layouts', 'layout_type')) return true;
45 45
 
46 46
 			$args = new stdClass();
47 47
 			$args->layout = '.';
48 48
 			$output = executeQueryArray('layout.getLayoutDotList', $args);
49
-			if($output->data && count($output->data) > 0)
49
+			if ($output->data && count($output->data) > 0)
50 50
 			{
51
-				foreach($output->data as $layout)
51
+				foreach ($output->data as $layout)
52 52
 				{
53 53
 					$layout_path = explode('.', $layout->layout);
54
-					if(count($layout_path) != 2) continue;
55
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
54
+					if (count($layout_path) != 2) continue;
55
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
56 56
 				}
57 57
 			}
58 58
 
@@ -74,39 +74,39 @@  discard block
 block discarded – undo
74 74
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
75 75
 		{
76 76
 			// 2009. 02. 11 Add site_srl to menu table
77
-			if(!$oDB->isColumnExists('layouts', 'site_srl'))
77
+			if (!$oDB->isColumnExists('layouts', 'site_srl'))
78 78
 			{
79
-				$oDB->addColumn('layouts','site_srl','number',11,0,true);
79
+				$oDB->addColumn('layouts', 'site_srl', 'number', 11, 0, true);
80 80
 			}
81 81
 			// 2009. 02. 26 Move the previous layout for faceoff
82 82
 			$oLayoutModel = getModel('layout');
83 83
 			$files = FileHandler::readDir('./files/cache/layout');
84
-			for($i=0,$c=count($files);$i<$c;$i++)
84
+			for ($i = 0, $c = count($files); $i < $c; $i++)
85 85
 			{
86 86
 				$filename = $files[$i];
87
-				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
87
+				if (!preg_match('/([0-9]+)\.html/i', $filename, $match)) continue;
88 88
 				$layout_srl = $match[1];
89
-				if(!$layout_srl) continue;
89
+				if (!$layout_srl) continue;
90 90
 				$path = $oLayoutModel->getUserLayoutPath($layout_srl);
91
-				if(!is_dir($path)) FileHandler::makeDir($path);
91
+				if (!is_dir($path)) FileHandler::makeDir($path);
92 92
 				FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
93 93
 				@unlink('./files/cache/layout/'.$filename);
94 94
 			}
95 95
 
96
-			if(!$oDB->isColumnExists('layouts', 'layout_type'))
96
+			if (!$oDB->isColumnExists('layouts', 'layout_type'))
97 97
 			{
98
-				$oDB->addColumn('layouts','layout_type','char',1,'P',true);
98
+				$oDB->addColumn('layouts', 'layout_type', 'char', 1, 'P', true);
99 99
 			}
100 100
 
101 101
 			$args->layout = '.';
102 102
 			$output = executeQueryArray('layout.getLayoutDotList', $args);
103
-			if($output->data && count($output->data) > 0)
103
+			if ($output->data && count($output->data) > 0)
104 104
 			{
105
-				foreach($output->data as $layout)
105
+				foreach ($output->data as $layout)
106 106
 				{
107 107
 					$layout_path = explode('.', $layout->layout);
108
-					if(count($layout_path) != 2) continue;
109
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
108
+					if (count($layout_path) != 2) continue;
109
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
110 110
 					{
111 111
 						$args->layout = implode('|@|', $layout_path);
112 112
 						$args->layout_srl = $layout->layout_srl;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	function recompileCache()
128 128
 	{
129 129
 		$path = './files/cache/layout';
130
-		if(!is_dir($path))
130
+		if (!is_dir($path))
131 131
 		{
132 132
 			FileHandler::makeDir($path);
133 133
 			return;
Please login to merge, or discard this patch.
Braces   +27 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,16 +32,22 @@  discard block
 block discarded – undo
32 32
 		if($oModuleModel->needUpdate($version_update_id))
33 33
 		{
34 34
 			// 2009. 02. 11 Add site_srl to layout table
35
-			if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
35
+			if(!$oDB->isColumnExists('layouts', 'site_srl')) {
36
+				return true;
37
+			}
36 38
 			// 2009. 02. 26 Move the previous layout for faceoff
37 39
 			$files = FileHandler::readDir('./files/cache/layout');
38 40
 			for($i=0,$c=count($files);$i<$c;$i++)
39 41
 			{
40 42
 				$filename = $files[$i];
41
-				if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
43
+				if(preg_match('/([0-9]+)\.html/i',$filename)) {
44
+					return true;
45
+				}
42 46
 			}
43 47
 
44
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
48
+			if(!$oDB->isColumnExists('layouts', 'layout_type')) {
49
+				return true;
50
+			}
45 51
 
46 52
 			$args = new stdClass();
47 53
 			$args->layout = '.';
@@ -51,8 +57,12 @@  discard block
 block discarded – undo
51 57
 				foreach($output->data as $layout)
52 58
 				{
53 59
 					$layout_path = explode('.', $layout->layout);
54
-					if(count($layout_path) != 2) continue;
55
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
60
+					if(count($layout_path) != 2) {
61
+						continue;
62
+					}
63
+					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) {
64
+						return true;
65
+					}
56 66
 				}
57 67
 			}
58 68
 
@@ -84,11 +94,17 @@  discard block
 block discarded – undo
84 94
 			for($i=0,$c=count($files);$i<$c;$i++)
85 95
 			{
86 96
 				$filename = $files[$i];
87
-				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
97
+				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) {
98
+					continue;
99
+				}
88 100
 				$layout_srl = $match[1];
89
-				if(!$layout_srl) continue;
101
+				if(!$layout_srl) {
102
+					continue;
103
+				}
90 104
 				$path = $oLayoutModel->getUserLayoutPath($layout_srl);
91
-				if(!is_dir($path)) FileHandler::makeDir($path);
105
+				if(!is_dir($path)) {
106
+					FileHandler::makeDir($path);
107
+				}
92 108
 				FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
93 109
 				@unlink('./files/cache/layout/'.$filename);
94 110
 			}
@@ -105,7 +121,9 @@  discard block
 block discarded – undo
105 121
 				foreach($output->data as $layout)
106 122
 				{
107 123
 					$layout_path = explode('.', $layout->layout);
108
-					if(count($layout_path) != 2) continue;
124
+					if(count($layout_path) != 2) {
125
+						continue;
126
+					}
109 127
 					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
110 128
 					{
111 129
 						$args->layout = implode('|@|', $layout_path);
Please login to merge, or discard this patch.
modules/rss/rss.class.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
 		$oModuleModel = getModel('module');
39 39
 		$oModuleController = getController('module');
40 40
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
41
-		if($oModuleModel->needUpdate($version_update_id))
41
+		if ($oModuleModel->needUpdate($version_update_id))
42 42
 		{
43 43
 			// Add the Action forward for atom
44
-			if(!$oModuleModel->getActionForward('atom')) return true;
44
+			if (!$oModuleModel->getActionForward('atom')) return true;
45 45
 			// 2007. 10. Add a trigger for participating additional configurations of the service module
46
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
46
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
47 47
 			// 2007. 10. 19 Call the trigger to set RSS URL before outputing
48
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
48
+			if (!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
49 49
 
50
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
50
+			if ($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
51 51
 
52 52
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
53
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
53
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
54 54
 
55 55
 			$oModuleController->insertUpdatedLog($version_update_id);
56 56
 		}
@@ -68,22 +68,22 @@  discard block
 block discarded – undo
68 68
 		$oModuleModel = getModel('module');
69 69
 		$oModuleController = getController('module');
70 70
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
71
-		if($oModuleModel->needUpdate($version_update_id))
71
+		if ($oModuleModel->needUpdate($version_update_id))
72 72
 		{
73 73
 			// Add atom act
74
-			if(!$oModuleModel->getActionForward('atom'))
74
+			if (!$oModuleModel->getActionForward('atom'))
75 75
 				$oModuleController->insertActionForward('rss', 'view', 'atom');
76 76
 			// 2007. 10. An additional set of 18 to participate in a service module, add a trigger
77
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
77
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
78 78
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
79 79
 			// 2007. 10. 19 outputs the trigger before you call to set up rss url
80
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
80
+			if (!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
81 81
 				$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
82
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
82
+			if ($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
83 83
 				$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
84 84
 
85 85
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
86
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
86
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
87 87
 			{
88 88
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after');
89 89
 			}
Please login to merge, or discard this patch.
Braces   +27 added lines, -13 removed lines patch added patch discarded remove patch
@@ -41,16 +41,26 @@  discard block
 block discarded – undo
41 41
 		if($oModuleModel->needUpdate($version_update_id))
42 42
 		{
43 43
 			// Add the Action forward for atom
44
-			if(!$oModuleModel->getActionForward('atom')) return true;
44
+			if(!$oModuleModel->getActionForward('atom')) {
45
+				return true;
46
+			}
45 47
 			// 2007. 10. Add a trigger for participating additional configurations of the service module
46
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
48
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) {
49
+				return true;
50
+			}
47 51
 			// 2007. 10. 19 Call the trigger to set RSS URL before outputing
48
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
52
+			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) {
53
+				return true;
54
+			}
49 55
 
50
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
56
+			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) {
57
+				return true;
58
+			}
51 59
 
52 60
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
53
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
61
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) {
62
+				return true;
63
+			}
54 64
 
55 65
 			$oModuleController->insertUpdatedLog($version_update_id);
56 66
 		}
@@ -71,16 +81,20 @@  discard block
 block discarded – undo
71 81
 		if($oModuleModel->needUpdate($version_update_id))
72 82
 		{
73 83
 			// Add atom act
74
-			if(!$oModuleModel->getActionForward('atom'))
75
-				$oModuleController->insertActionForward('rss', 'view', 'atom');
84
+			if(!$oModuleModel->getActionForward('atom')) {
85
+							$oModuleController->insertActionForward('rss', 'view', 'atom');
86
+			}
76 87
 			// 2007. 10. An additional set of 18 to participate in a service module, add a trigger
77
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
78
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
88
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) {
89
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
90
+			}
79 91
 			// 2007. 10. 19 outputs the trigger before you call to set up rss url
80
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
81
-				$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
82
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
83
-				$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
92
+			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) {
93
+							$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
94
+			}
95
+			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) {
96
+							$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
97
+			}
84 98
 
85 99
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
86 100
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
Please login to merge, or discard this patch.
modules/poll/poll.class.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 		$oModuleModel = getModel('module');
38 38
 		$oModuleController = getController('module');
39 39
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
40
-		if($oModuleModel->needUpdate($version_update_id))
40
+		if ($oModuleModel->needUpdate($version_update_id))
41 41
 		{
42 42
 			// 2007.10.17 When deleting posts/comments delete the poll as well
43
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
44
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
45
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
46
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
47
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
48
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
43
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
44
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
45
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
46
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
47
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
48
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
49 49
 
50 50
 			$oModuleController->insertUpdatedLog($version_update_id);
51 51
 		}
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
61 61
 		$oModuleModel = getModel('module');
62 62
 		$oModuleController = getController('module');
63 63
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
64
-		if($oModuleModel->needUpdate($version_update_id))
64
+		if ($oModuleModel->needUpdate($version_update_id))
65 65
 		{
66 66
 			// 2007.10.17 When deleting posts/comments delete the poll as well
67
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
67
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
68 68
 				$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
69
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
69
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
70 70
 				$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
71 71
 			// 2008.04.22 A poll connection to add posts/comments
72
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
72
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
73 73
 				$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
74
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
74
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
75 75
 				$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
76
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
76
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
77 77
 				$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
78
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
78
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
79 79
 				$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
80 80
 
81 81
 			$oModuleController->insertUpdatedLog($version_update_id);
Please login to merge, or discard this patch.
Braces   +36 added lines, -18 removed lines patch added patch discarded remove patch
@@ -40,12 +40,24 @@  discard block
 block discarded – undo
40 40
 		if($oModuleModel->needUpdate($version_update_id))
41 41
 		{
42 42
 			// 2007.10.17 When deleting posts/comments delete the poll as well
43
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
44
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
45
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
46
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
47
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
48
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
43
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) {
44
+				return true;
45
+			}
46
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) {
47
+				return true;
48
+			}
49
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) {
50
+				return true;
51
+			}
52
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) {
53
+				return true;
54
+			}
55
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) {
56
+				return true;
57
+			}
58
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) {
59
+				return true;
60
+			}
49 61
 
50 62
 			$oModuleController->insertUpdatedLog($version_update_id);
51 63
 		}
@@ -64,19 +76,25 @@  discard block
 block discarded – undo
64 76
 		if($oModuleModel->needUpdate($version_update_id))
65 77
 		{
66 78
 			// 2007.10.17 When deleting posts/comments delete the poll as well
67
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
68
-				$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
69
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
70
-				$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
79
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) {
80
+							$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
81
+			}
82
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) {
83
+							$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
84
+			}
71 85
 			// 2008.04.22 A poll connection to add posts/comments
72
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
73
-				$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
74
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
75
-				$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
76
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
77
-				$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
78
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
79
-				$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
86
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) {
87
+							$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
88
+			}
89
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) {
90
+							$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
91
+			}
92
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) {
93
+							$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
94
+			}
95
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) {
96
+							$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
97
+			}
80 98
 
81 99
 			$oModuleController->insertUpdatedLog($version_update_id);
82 100
 		}
Please login to merge, or discard this patch.
modules/autoinstall/autoinstall.class.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -17,13 +17,13 @@  discard block
 block discarded – undo
17 17
 	function generate(&$params)
18 18
 	{
19 19
 		$xmlDoc = '<?xml version="1.0" encoding="utf-8" ?><methodCall><params>';
20
-		if(!is_array($params))
20
+		if (!is_array($params))
21 21
 		{
22 22
 			return NULL;
23 23
 		}
24 24
 
25 25
 		$params["module"] = "resourceapi";
26
-		foreach($params as $key => $val)
26
+		foreach ($params as $key => $val)
27 27
 		{
28 28
 			$xmlDoc .= sprintf("<%s><![CDATA[%s]]></%s>", $key, $val, $key);
29 29
 		}
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	{
42 42
 		$body = XmlGenerater::generate($params);
43 43
 		$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
44
-		if(!$buff)
44
+		if (!$buff)
45 45
 		{
46 46
 			return;
47 47
 		}
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	{
75 75
 		$oModuleModel = getModel('module');
76 76
 		$config = $oModuleModel->getModuleConfig('autoinstall');
77
-		if($config->downloadServer != _XE_DOWNLOAD_SERVER_)
77
+		if ($config->downloadServer != _XE_DOWNLOAD_SERVER_)
78 78
 		{
79 79
 			$this->stop('msg_not_match_server');
80 80
 		}
@@ -105,34 +105,34 @@  discard block
 block discarded – undo
105 105
 		$oModuleModel = getModel('module');
106 106
 		$oModuleController = getController('module');
107 107
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
108
-		if($oModuleModel->needUpdate($version_update_id))
108
+		if ($oModuleModel->needUpdate($version_update_id))
109 109
 		{
110
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
110
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
111 111
 				&& $oDB->isTableExists("autoinstall_installed_packages"))
112 112
 			{
113 113
 				return TRUE;
114 114
 			}
115
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
115
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
116 116
 				&& $oDB->isTableExists("autoinstall_remote_categories"))
117 117
 			{
118 118
 				return TRUE;
119 119
 			}
120 120
 
121 121
 			// 2011.08.08 add column 'list_order' in ai_remote_categories
122
-			if(!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
122
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
123 123
 			{
124 124
 				return TRUE;
125 125
 			}
126 126
 
127 127
 			// 2011.08.08 set _XE_DOWNLOAD_SERVER_ at module config
128 128
 			$config = $oModuleModel->getModuleConfig('autoinstall');
129
-			if(!isset($config->downloadServer))
129
+			if (!isset($config->downloadServer))
130 130
 			{
131 131
 				return TRUE;
132 132
 			}
133 133
 
134 134
 			// 2012.11.12 add column 'have_instance' in autoinstall_packages
135
-			if(!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
135
+			if (!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
136 136
 			{
137 137
 				return TRUE;
138 138
 			}
@@ -154,21 +154,21 @@  discard block
 block discarded – undo
154 154
 		$oModuleModel = getModel('module');
155 155
 		$oModuleController = getController('module');
156 156
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
157
-		if($oModuleModel->needUpdate($version_update_id))
157
+		if ($oModuleModel->needUpdate($version_update_id))
158 158
 		{
159
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
159
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
160 160
 				&& $oDB->isTableExists("autoinstall_installed_packages"))
161 161
 			{
162 162
 				$oDB->dropTable("autoinstall_installed_packages");
163 163
 			}
164
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
164
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
165 165
 				&& $oDB->isTableExists("autoinstall_remote_categories"))
166 166
 			{
167 167
 				$oDB->dropTable("autoinstall_remote_categories");
168 168
 			}
169 169
 
170 170
 			// 2011.08.08 add column 'list_order' in 'ai_remote_categories
171
-			if(!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
171
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
172 172
 			{
173 173
 				$oDB->addColumn('ai_remote_categories', 'list_order', 'number', 11, NULL, TRUE);
174 174
 				$oDB->addIndex('ai_remote_categories', 'idx_list_order', array('list_order'));
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
 
177 177
 			// 2011. 08. 08 set _XE_DOWNLOAD_SERVER_ at module config
178 178
 			$config = $oModuleModel->getModuleConfig('autoinstall');
179
-			if(!isset($config->downloadServer))
179
+			if (!isset($config->downloadServer))
180 180
 			{
181 181
 				$config->downloadServer = _XE_DOWNLOAD_SERVER_;
182 182
 				$oModuleController->insertModuleConfig('autoinstall', $config);
183 183
 			}
184 184
 
185 185
 			// 2012.11.12 add column 'have_instance' in autoinstall_packages
186
-			if(!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
186
+			if (!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
187 187
 			{
188 188
 				$oDB->addColumn('autoinstall_packages', 'have_instance', 'char', '1', 'N', TRUE);
189 189
 			}
Please login to merge, or discard this patch.
modules/editor/editor.class.php 2 patches
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
 		$oModuleController = getController('module');
17 17
 		// Add the default editor component
18 18
 		$oEditorController = getAdminController('editor');
19
-		$oEditorController->insertComponent('colorpicker_text',true);
20
-		$oEditorController->insertComponent('colorpicker_bg',true);
21
-		$oEditorController->insertComponent('emoticon',true);
22
-		$oEditorController->insertComponent('url_link',true);
23
-		$oEditorController->insertComponent('image_link',true);
24
-		$oEditorController->insertComponent('multimedia_link',true);
25
-		$oEditorController->insertComponent('quotation',true);
26
-		$oEditorController->insertComponent('table_maker',true);
27
-		$oEditorController->insertComponent('poll_maker',true);
28
-		$oEditorController->insertComponent('image_gallery',true);
19
+		$oEditorController->insertComponent('colorpicker_text', true);
20
+		$oEditorController->insertComponent('colorpicker_bg', true);
21
+		$oEditorController->insertComponent('emoticon', true);
22
+		$oEditorController->insertComponent('url_link', true);
23
+		$oEditorController->insertComponent('image_link', true);
24
+		$oEditorController->insertComponent('multimedia_link', true);
25
+		$oEditorController->insertComponent('quotation', true);
26
+		$oEditorController->insertComponent('table_maker', true);
27
+		$oEditorController->insertComponent('poll_maker', true);
28
+		$oEditorController->insertComponent('image_gallery', true);
29 29
 		// Create a directory to use in the editor module
30 30
 		FileHandler::makeDir('./files/cache/editor');
31 31
 		// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
@@ -48,24 +48,24 @@  discard block
 block discarded – undo
48 48
 		$oModuleModel = getModel('module');
49 49
 		$oModuleController = getController('module');
50 50
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
51
-		if($oModuleModel->needUpdate($version_update_id))
51
+		if ($oModuleModel->needUpdate($version_update_id))
52 52
 		{
53 53
 			// 2009. 06. 15 Save module_srl when auto-saving
54
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
55
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
54
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) return true;
55
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) return true;
56 56
 
57 57
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
58
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
59
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
58
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
59
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
60 60
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
61
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
61
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
62 62
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
63
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
63
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
64 64
 			// 2009. 06. 19 Remove unused trigger
65
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
65
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
66 66
 
67 67
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
68
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
68
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
69 69
 
70 70
 			$oModuleController->insertUpdatedLog($version_update_id);
71 71
 		}
@@ -82,32 +82,32 @@  discard block
 block discarded – undo
82 82
 		$oModuleModel = getModel('module');
83 83
 		$oModuleController = getController('module');
84 84
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
85
-		if($oModuleModel->needUpdate($version_update_id))
85
+		if ($oModuleModel->needUpdate($version_update_id))
86 86
 		{
87 87
 			// Save module_srl when auto-saving 15/06/2009
88
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
89
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
88
+			if (!$oDB->isColumnExists("editor_autosave", "module_srl")) 
89
+				$oDB->addColumn("editor_autosave", "module_srl", "number", 11);
90 90
 
91 91
 			// create an index on module_srl
92
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
92
+			if (!$oDB->isIndexExists("editor_autosave", "idx_module_srl")) $oDB->addIndex("editor_autosave", "idx_module_srl", "module_srl");
93 93
 
94 94
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
95
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
95
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
96 96
 				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
97
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
97
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
98 98
 				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
99 99
 			// 2007. 10. Add an editor trigger on the module addition setup
100
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
100
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
101 101
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
102 102
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
103
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
103
+			if (!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
104 104
 				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
105 105
 			// 2009. 06. 19 Remove unused trigger
106
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
106
+			if ($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
107 107
 				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
108 108
 
109 109
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
110
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
110
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
111 111
 			{
112 112
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after');
113 113
 			}
Please login to merge, or discard this patch.
Braces   +45 added lines, -21 removed lines patch added patch discarded remove patch
@@ -51,21 +51,37 @@  discard block
 block discarded – undo
51 51
 		if($oModuleModel->needUpdate($version_update_id))
52 52
 		{
53 53
 			// 2009. 06. 15 Save module_srl when auto-saving
54
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
55
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
54
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
55
+				return true;
56
+			}
57
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
58
+				return true;
59
+			}
56 60
 
57 61
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
58
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
59
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
62
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
63
+				return true;
64
+			}
65
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
66
+				return true;
67
+			}
60 68
 			// 2007. 10. 23 Add an editor trigger on the module addition setup
61
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
69
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
70
+				return true;
71
+			}
62 72
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
63
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
73
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
74
+				return true;
75
+			}
64 76
 			// 2009. 06. 19 Remove unused trigger
65
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
77
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
78
+				return true;
79
+			}
66 80
 
67 81
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
68
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) return true;
82
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after')) {
83
+				return true;
84
+			}
69 85
 
70 86
 			$oModuleController->insertUpdatedLog($version_update_id);
71 87
 		}
@@ -85,26 +101,34 @@  discard block
 block discarded – undo
85 101
 		if($oModuleModel->needUpdate($version_update_id))
86 102
 		{
87 103
 			// Save module_srl when auto-saving 15/06/2009
88
-			if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
89
-				$oDB->addColumn("editor_autosave","module_srl","number",11);
104
+			if(!$oDB->isColumnExists("editor_autosave","module_srl")) {
105
+							$oDB->addColumn("editor_autosave","module_srl","number",11);
106
+			}
90 107
 
91 108
 			// create an index on module_srl
92
-			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
109
+			if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) {
110
+				$oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
111
+			}
93 112
 
94 113
 			// 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
95
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
96
-				$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
97
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
98
-				$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
114
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
115
+							$oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
116
+			}
117
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) {
118
+							$oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
119
+			}
99 120
 			// 2007. 10. Add an editor trigger on the module addition setup
100
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
101
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
121
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) {
122
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
123
+			}
102 124
 			// 2009. 04. 14 Add a trigger from compiled codes of the editor component
103
-			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
104
-				$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
125
+			if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) {
126
+							$oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
127
+			}
105 128
 			// 2009. 06. 19 Remove unused trigger
106
-			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
107
-				$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
129
+			if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) {
130
+							$oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
131
+			}
108 132
 
109 133
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
110 134
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'editor', 'controller', 'triggerCopyModule', 'after'))
Please login to merge, or discard this patch.