This will be a lot easier for me, coz I don’t know how to make diff
Heheee..
Anyway, I commented the line that I modified with capital word on the first few words of the comments.
<?php
function cleanDocumentIdentifier($qOrig) { // modx updates
$q = $qOrig;
// First remove any / before or after
if ($q[ strlen( $q) - 1] == '/') $q = substr( $q,0,-1);
if ($q[ 0 ] == '/') $q = substr($q,1);
// Save path if any
$this->virtualDir = dirname($q);
$this->virtualDir = ($this->virtualDir == '.' ? '' : $this->virtualDir);
$q = basename($q);
// BEGIN FIXED - Fixed problem with alias that contains the same word with suffix or prefix (by Wendy Novianto)
$qprefix = $this->config['friendly_url_prefix'];
$qsuffix = $this->config['friendly_url_suffix'];
$qslength = strlen($qsuffix);
$plength = strlen($q) - $qslength;
if($qprefix != null && trim($qprefix) != '' && strpos($q, $qprefix) == 0) $q = substr($q, strlen($qprefix));
if($qsuffix != null && trim($qsuffix) != '' && substr($q, $plength) == $qsuffix) $q = substr($q, 0, $plength);
//$q = str_replace($this->config['friendly_url_prefix'], "", $q);
//$q = str_replace($this->config['friendly_url_suffix'], "", $q);
// ENDED FIXED
// ADDED $this->virtualDir == '' in if statement, and add else if statement, instead of else
if(is_numeric($q) && !$this->documentListing[$q] && $this->virtualDir == '') { // we got an ID returned, check to make sure it;s no an alias
$this->documentMethod = 'id';
return $q;
}
else if($q != ((string) ((int) $q))) { // we didn't get an ID back, so instead we assume it's an alias
if($this->config['friendly_alias_urls']!=1) {
$q = $qOrig;
}
$this->documentMethod = 'alias';
return $q;
}
}
?>
<?php
/**
* name: getDocumentObject - used by parser
* desc: returns a document object - $method: alias, id
*/
function getDocumentObject($method,$identifier){
$tblsc = $this->getFullTableName("site_content");
$tbldg = $this->getFullTableName("document_groups");
// BEGIN FIXED - Check document id validity - Added by Wendy Novianto
if($method == 'id' && (!is_numeric($identifier) || $identifier != ((int)$identifier))) {
$this->sendErrorPage();
exit; // stop here
}
// ENDED FIXED
// get document groups for current user
if($docgrp = $this->getUserDocGroups()) $docgrp = implode(",",$docgrp);
// get document
$access = ($this->isFrontend() ? "sc.privateweb=0":"1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").
(!$docgrp ? "":" OR dg.document_group IN ($docgrp)");
$sql = "SELECT sc.*
FROM $tblsc sc
LEFT JOIN $tbldg dg ON dg.document = sc.id
WHERE sc.".$method." = '".$identifier."'
AND ($access) LIMIT 1;";
$result = $this->db->query($sql);
$rowCount = $this->recordCount($result);
if($rowCount<1) {
if ($this->config['unauthorized_page']) {
// check if file is not public
$secrs = $this->dbQuery("SELECT id FROM $tbldg WHERE document = '".$identifier."' LIMIT 1;");
if($secrs) $seclimit = mysql_num_rows($secrs);
}
if ($seclimit>0) {
// match found but not publicly accessible, send the visitor to the unauthorized_page
$this->sendUnauthorizedPage();
exit; // stop here
}
else {
// no match found, send the visitor to the error_page
$this->sendErrorPage();
exit; // stop here
}
}
if($rowCount>1) {
// too many matches found, send the visitor to the error page
$this->messageQuit("More than one result returned when attempting to translate `alias` to `id` - there are multiple documents using the same alias");
}
# this is now the document :) #
$documentObject = $this->fetchRow($result);
// load TVs and merge with document - Orig by Apodigm - Docvars
$tbn = $this->dbConfig['dbase'].".".$this->dbConfig['table_prefix'];
$sql = "SELECT tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value ";
$sql.= "FROM ".$tbn."site_tmplvars tv ";
$sql.= "INNER JOIN ".$tbn."site_tmplvar_templates tvtpl ON tvtpl.tmplvarid = tv.id ";
$sql.= "LEFT JOIN ".$tbn."site_tmplvar_contentvalues tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '".$this->documentIdentifier."' ";
$sql.= "WHERE tvtpl.templateid = '".$documentObject['template']."'";
$rs = $this->dbQuery($sql);
$rowCount = $this->recordCount($rs);
if($rowCount>0) {
for($i=0;$i<$rowCount;$i++) {
$row = $this->fetchRow($rs);
$tmplvars[$row['name']] = array($row['name'],$row['value'],$row['display'],$row['display_params'],$row['type']);
}
$documentObject = array_merge($documentObject,$tmplvars);
}
return $documentObject;
}
?>
