Peter M. Groen / knowledgetree

Commit 937569ea116b9d5d3497a21297f96707214d9c5e

Authored by conradverm
1 parent 58664f71

KTS-1687 

"Double quote to single quote conversion"
Fixed.

Reviewed by: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6261 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 41 additions and 41 deletions
lib/browse/browseutil.inc.php
  View file @937569e
... ... @@ -54,7 +54,7 @@ class KTBrowseUtil {
54 54 return false;
55 55 }
56 56  
57   - $sQuery = "SELECT id FROM folders WHERE parent_id = ? AND name = ?";
  57 + $sQuery = 'SELECT id FROM folders WHERE parent_id = ? AND name = ?';
58 58 $aParams = array($iFolderID, $sFileName);
59 59 $id = DBUtil::getOneResultKey(array($sQuery, $aParams), 'id');
60 60 if (PEAR::isError($id)) {
... ... @@ -65,9 +65,9 @@ class KTBrowseUtil {
65 65 return array($id, null, null);
66 66 }
67 67  
68   - $sQuery = sprintf("SELECT d.id FROM %s AS d" .
69   - " LEFT JOIN %s AS dm ON (d.metadata_version_id = dm.id) LEFT JOIN %s AS dc ON (dm.content_version_id = dc.id)" .
70   - " WHERE d.folder_id = ? AND dc.filename = ?",
  68 + $sQuery = sprintf('SELECT d.id FROM %s AS d' .
  69 + ' LEFT JOIN %s AS dm ON (d.metadata_version_id = dm.id) LEFT JOIN %s AS dc ON (dm.content_version_id = dc.id)' .
  70 + ' WHERE d.folder_id = ? AND dc.filename = ?',
71 71 KTUtil::getTableName(documents),
72 72 KTUtil::getTableName('document_metadata_version'),
73 73 KTUtil::getTableName('document_content_version'));
... ... @@ -106,10 +106,10 @@ class KTBrowseUtil {
106 106 while (count($aRemaining)) {
107 107 $sFolderName = $aRemaining[0];
108 108 $aRemaining = array_slice($aRemaining, 1);
109   - if ($sFolderName === "") {
  109 + if ($sFolderName === '') {
110 110 continue;
111 111 }
112   - $sQuery = "SELECT id FROM folders WHERE parent_id = ? AND name = ?";
  112 + $sQuery = 'SELECT id FROM folders WHERE parent_id = ? AND name = ?';
113 113 $aParams = array($iFolderID, $sFolderName);
114 114 $id = DBUtil::getOneResultKey(array($sQuery, $aParams), 'id');
115 115 if (PEAR::isError($id)) {
... ... @@ -120,13 +120,13 @@ class KTBrowseUtil {
120 120 // Some intermediary folder path doesn't exist
121 121 return false;
122 122 }
123   - $default->log->error("iFolderID set to " . print_r($id, true));
  123 + $default->log->error('iFolderID set to ' . print_r($id, true));
124 124 $iFolderID = (int)$id;
125 125 }
126 126  
127   - $sQuery = sprintf("SELECT d.id FROM %s AS d" .
128   - " LEFT JOIN %s AS dm ON (d.metadata_version_id = dm.id) LEFT JOIN %s AS dc ON (dm.content_version_id = dc.id)" .
129   - " WHERE d.folder_id = ? AND dc.filename = ?",
  127 + $sQuery = sprintf('SELECT d.id FROM %s AS d' .
  128 + ' LEFT JOIN %s AS dm ON (d.metadata_version_id = dm.id) LEFT JOIN %s AS dc ON (dm.content_version_id = dc.id)' .
  129 + ' WHERE d.folder_id = ? AND dc.filename = ?',
130 130 KTUtil::getTableName(documents),
131 131 KTUtil::getTableName('document_metadata_version'),
132 132 KTUtil::getTableName('document_content_version'));
... ... @@ -139,7 +139,7 @@ class KTBrowseUtil {
139 139 }
140 140  
141 141 if ($iDocumentID === null) {
142   - $sQuery = "SELECT id FROM folders WHERE parent_id = ? AND name = ?";
  142 + $sQuery = 'SELECT id FROM folders WHERE parent_id = ? AND name = ?';
143 143 $aParams = array($iFolderID, $sFileName);
144 144 $id = DBUtil::getOneResultKey(array($sQuery, $aParams), 'id');
145 145  
... ... @@ -148,7 +148,7 @@ class KTBrowseUtil {
148 148 return false;
149 149 }
150 150 if (is_null($id)) {
151   - if ($sFileName === "") {
  151 + if ($sFileName === '') {
152 152 return array($iFolderID, null);
153 153 }
154 154 // XXX: log error
... ... @@ -167,16 +167,16 @@ class KTBrowseUtil {
167 167 $sAction = KTUtil::arrayGet($aOptions, 'folderaction');
168 168  
169 169 if(PEAR::isError($oFolder)) {
170   - $url = KTUtil::addQueryStringSelf("fFolderId=1");
  170 + $url = KTUtil::addQueryStringSelf('fFolderId=1');
171 171 if(!empty($sAction)) {
172   - $url = generateControllerUrl($sAction, "fFolderId=1");
  172 + $url = generateControllerUrl($sAction, 'fFolderId=1');
173 173 }
174 174 return array( array( 'url'=> $url, 'name' => '…'));
175 175 }
176 176  
177 177  
178 178 $bFinal = KTUtil::arrayGet($aOptions, 'final', true, false);
179   - $bFolderBrowseBase = KTUtil::arrayGet($aOptions, 'folderbase', "");
  179 + $bFolderBrowseBase = KTUtil::arrayGet($aOptions, 'folderbase', '');
180 180 $aBreadcrumbs = array();
181 181  
182 182 // skip root.
... ... @@ -187,50 +187,50 @@ class KTBrowseUtil {
187 187  
188 188 // we have made the "default" folder non-root, so we need to be able
189 189 // to reach "Root" (Folder::get(1)).
190   - $url = KTUtil::addQueryStringSelf("fFolderId=1");
  190 + $url = KTUtil::addQueryStringSelf('fFolderId=1');
191 191 if (!empty($sAction)) {
192   - $url = generateControllerUrl($sAction, "fFolderId=1");
  192 + $url = generateControllerUrl($sAction, 'fFolderId=1');
193 193 }
194   - $aBreadcrumbs[] = array("url" => $url, "name" => _kt('Folders'));
  194 + $aBreadcrumbs[] = array('url' => $url, 'name' => _kt('Folders'));
195 195 $oUser = User::get($_SESSION['userID']);
196 196  
197 197 if ($parents != 0) {
198 198 foreach (range(0, $parents - 1) as $index) {
199 199 $id = $folder_path_ids[$index];
200 200 $oThisFolder = Folder::get($id);
201   - $url = KTUtil::addQueryStringSelf("fFolderId=" . $id);
  201 + $url = KTUtil::addQueryStringSelf('fFolderId=' . $id);
202 202 if (!empty($sAction)) {
203   - $url = generateControllerUrl($sAction, "fFolderId=" . $id);
  203 + $url = generateControllerUrl($sAction, 'fFolderId=' . $id);
204 204 }
205 205 if (!KTPermissionUtil::userHasPermissionOnItem($oUser, 'ktcore.permissions.folder_details', $oThisFolder)) {
206 206 if (KTBrowseUtil::inAdminMode($oUser, $oThisFolder)) {
207   - $aBreadcrumbs[] = array("url" => $url, "name" => sprintf('(%s)', $folder_path_names[$index]));
  207 + $aBreadcrumbs[] = array('url' => $url, 'name' => sprintf('(%s)', $folder_path_names[$index]));
208 208 } else {
209 209 $aBreadcrumbs[] = array('name' => '...');
210 210 }
211 211 continue;
212 212 }
213   - $aBreadcrumbs[] = array("url" => $url, "name" => $folder_path_names[$index]);
  213 + $aBreadcrumbs[] = array('url' => $url, 'name' => $folder_path_names[$index]);
214 214 }
215 215 }
216 216  
217 217 // now add this folder, _if we aren't in 1_.
218 218 if ($oFolder->getId() != 1) {
219 219 $id = $oFolder->getId();
220   - $url = KTUtil::addQueryStringSelf("fFolderId=" . $id);
  220 + $url = KTUtil::addQueryStringSelf('fFolderId=' . $id);
221 221 if (!empty($sAction)) {
222   - $url = generateControllerUrl($sAction, "fFolderId=" . $id);
  222 + $url = generateControllerUrl($sAction, 'fFolderId=' . $id);
223 223 }
224 224 if (!KTPermissionUtil::userHasPermissionOnItem($oUser, 'ktcore.permissions.folder_details', $oFolder)) {
225 225 if (KTBrowseUtil::inAdminMode($oUser, $oFolder)) {
226   - $aBreadcrumbs[] = array("url" => $url, "name" => sprintf('(%s)', $oFolder->getName()));
  226 + $aBreadcrumbs[] = array('url' => $url, 'name' => sprintf('(%s)', $oFolder->getName()));
227 227 } else {
228 228 $aBreadcrumbs[] = array('name' => '...');
229 229 }
230 230 } else if ($bFinal) {
231   - $aBreadcrumbs[] = array("name" => $oFolder->getName());
  231 + $aBreadcrumbs[] = array('name' => $oFolder->getName());
232 232 } else {
233   - $aBreadcrumbs[] = array("url" => $url, "name" => $oFolder->getName());
  233 + $aBreadcrumbs[] = array('url' => $url, 'name' => $oFolder->getName());
234 234 }
235 235 }
236 236  
... ... @@ -256,7 +256,7 @@ class KTBrowseUtil {
256 256 function breadcrumbsForDocument($oDocument, $aOptions = null) {
257 257 $bFinal = KTUtil::arrayGet($aOptions, 'final', true, false);
258 258 $aOptions = KTUtil::meldOptions($aOptions, array(
259   - "final" => false,
  259 + 'final' => false,
260 260 ));
261 261  
262 262 $iFolderId = $oDocument->getFolderId();
... ... @@ -264,15 +264,15 @@ class KTBrowseUtil {
264 264  
265 265  
266 266 $sAction = KTUtil::arrayGet($aOptions, 'documentaction');
267   - $url = KTUtil::addQueryStringSelf("fDocumentId=" . $oDocument->getId());
  267 + $url = KTUtil::addQueryStringSelf('fDocumentId=' . $oDocument->getId());
268 268 if (!empty($sAction)) {
269   - $url = generateControllerUrl($sAction, "fDocumentId=" . $oDocument->getId());
  269 + $url = generateControllerUrl($sAction, 'fDocumentId=' . $oDocument->getId());
270 270 }
271 271  
272 272 if ($bFinal) {
273   - $aBreadcrumbs[] = array("name" => $oDocument->getName());
  273 + $aBreadcrumbs[] = array('name' => $oDocument->getName());
274 274 } else {
275   - $aBreadcrumbs[] = array("url" => $url, "name" => $oDocument->getName());
  275 + $aBreadcrumbs[] = array('url' => $url, 'name' => $oDocument->getName());
276 276 }
277 277 return $aBreadcrumbs;
278 278 }
... ... @@ -281,33 +281,33 @@ class KTBrowseUtil {
281 281 // {{{ getUrlForFolder
282 282 function getUrlForFolder($oFolder) {
283 283 $iFolderId = KTUtil::getId($oFolder);
284   - $sExt = ".php";
  284 + $sExt = '.php';
285 285 if (KTUtil::arrayGet($_SERVER, 'kt_no_extensions')) {
286   - $sExt = "";
  286 + $sExt = '';
287 287 }
288   - return sprintf("%s/browse%s?fFolderId=%d", $GLOBALS['KTRootUrl'], $sExt, $iFolderId);
  288 + return sprintf('%s/browse%s?fFolderId=%d', $GLOBALS['KTRootUrl'], $sExt, $iFolderId);
289 289 }
290 290 // }}}
291 291  
292 292 // {{{ getUrlForDocument
293 293 function getUrlForDocument($oDocument) {
294 294 $iDocumentId = KTUtil::getId($oDocument);
295   - $sExt = ".php";
  295 + $sExt = '.php';
296 296 if (KTUtil::arrayGet($_SERVER, 'kt_no_extensions')) {
297   - $sExt = "";
  297 + $sExt = '';
298 298 }
299   - return sprintf("%s/view%s?fDocumentId=%d", $GLOBALS['KTRootUrl'], $sExt, $iDocumentId);
  299 + return sprintf('%s/view%s?fDocumentId=%d', $GLOBALS['KTRootUrl'], $sExt, $iDocumentId);
300 300 }
301 301 // }}}
302 302  
303 303  
304 304  
305 305 function buildBaseUrl($sPage) {
306   - $sExt = ".php";
  306 + $sExt = '.php';
307 307 if (KTUtil::arrayGet($_SERVER, 'kt_no_extensions')) {
308   - $sExt = "";
  308 + $sExt = '';
309 309 }
310   - return sprintf("%s/%s%s", $GLOBALS['KTRootUrl'], $sPage, $sExt);
  310 + return sprintf('%s/%s%s', $GLOBALS['KTRootUrl'], $sPage, $sExt);
311 311 }
312 312 // }}}
313 313  
... ...