Skip to content

Commit

Permalink
subdomain upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
@voitto
voitto committed Sep 1, 2009
1 parent 9d59294 commit 75ec45e
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 8 deletions.
9 changes: 8 additions & 1 deletion app/omb/plugins/security.php
View file
Expand Up @@ -679,7 +679,14 @@ function _oauth( &$vars ) {
$sql = "SELECT data FROM ".$b->prefix."_db_sessions WHERE data LIKE '%".$db->escape_string($_REQUEST['oauth_token'])."%'";
$result = $db->get_result( $sql );
if ($db->num_rows($result) == 1) {
$auth_url = $request->base."?twitter/".$b->nickname."/oauth_login&oauth_token=".$_REQUEST['oauth_token'];
// XXX subdomain upgrade
//$auth_url = $request->base."?twitter/".$b->nickname."/oauth_login&oauth_token=".$_REQUEST['oauth_token'];
$auth_url = $request->url_for('oauth_login');
if (strpos($auth_url, '?') === false)
$auth_url .= '?';
else
$auth_url .= '&';
$auth_url .= "oauth_token=".$_REQUEST['oauth_token'];
$content = '<script type="text/javascript">'."\n";
$content .= ' // <![CDATA['."\n";
$content .= " location.replace('".$auth_url."');"."\n";
Expand Down
5 changes: 3 additions & 2 deletions app/omb/views/blogs/_index.html
View file
Expand Up @@ -20,8 +20,9 @@
<?php print $Member->title; ?>
</b>
</td>
<td><b><a href="<?php url_for( array( 'resource'=>'twitter/'.$Member->nickname.'/' )); ?>">
<?php url_for( array( 'resource'=>'twitter/'.$Member->nickname.'/' )); ?></a></b></td>
<!--XXX subdomain upgrade-->
<td><b><a href="<?php echo blog_url($Member->nickname); ?>">
<?php echo blog_url($Member->nickname); ?></a></b></td>
</tr>

<?php endwhile; ?>
Expand Down
7 changes: 4 additions & 3 deletions app/omb/views/blogs/_mystreams.html
View file
Expand Up @@ -21,10 +21,11 @@
<?php print $Member->title; ?>
</b>
</td>
<td><b><a href="<?php url_for( array( 'resource'=>'twitter/'.$Member->nickname.'/' )); ?>">
<?php url_for( array( 'resource'=>'twitter/'.$Member->nickname.'/' )); ?></a></b>
<!--XXX subdomain upgrade-->
<td><b><a href="<?php echo blog_url($Member->nickname); ?>">
<?php echo blog_url($Member->nickname); ?></a></b>
<a href="<?php url_for( array( 'resource'=>'blogs', 'id'=>$Member->id, 'action'=>'remove' )); ?>">
<img src='<?php base_path(); ?>resource/cancel.png'></a>
<img src='<?php blog_url(); ?>resource/cancel.png'></a>
</td>
</tr>

Expand Down
3 changes: 3 additions & 0 deletions db/boot.php
View file
Expand Up @@ -382,16 +382,19 @@

$stream = false;
list($subdomain, $rest) = explode('.', $_SERVER['SERVER_NAME'], 2);
// XXX subdomain upgrade
if ($pretty_url_base && !strpos($request->uri, 'twitter/') && !('http://'.$subdomain.".".$rest == $pretty_url_base)) {
$request->base = 'http://'.$subdomain.".".$rest;
$request->domain = $subdomain.".".$rest;
$pretty_url_base = $request->base;
$stream = $subdomain;
// XXX subdomain upgrade
} elseif (!strpos($request->uri, 'ak_twitter/') && strpos($request->uri, 'twitter/')) {
$pattern='/(\?)?twitter\/([a-z]+)(\/?)/';
if ( 1 <= preg_match_all( $pattern, $request->uri, $found )) {
$uri = $request->uri;
$tags[] = $found;
// XXX subdomain upgrade
$repl = 'twitter/'.$tags[0][2][0].$tags[0][3][0];
$request->uri = str_replace($repl,'',$uri);
$request->prefix = $repl;
Expand Down
18 changes: 18 additions & 0 deletions db/library/dbscript/_functions.php
View file
Expand Up @@ -709,6 +709,7 @@ function base_url($return = false) {
global $request;
global $pretty_url_base;

// XXX subdomain upgrade
if (isset($pretty_url_base) && !empty($pretty_url_base))
$base = $pretty_url_base."/".$request->prefix;
else
Expand All @@ -722,6 +723,23 @@ function base_url($return = false) {

echo $base;

}

// XXX subdomain upgrade
function blog_url($nickname,$return = false) {

global $request;

if (pretty_urls() && environment('subdomains'))
return 'http://'.$nickname . '.' . $request->domain;

$q = '?';

if (pretty_urls())
$q = '';

return base_url(true).$q.'twitter/'.$nickname;

}

/**
Expand Down
6 changes: 4 additions & 2 deletions db/library/dbscript/mapper.php
View file
Expand Up @@ -215,6 +215,7 @@ function setup() {

session_set_cookie_params( $expiry, $this->path );

// XXX subdomain upgrade
if (strpos($this->base,"twitter\/"))
$this->path = $this->path.$this->prefix;

Expand Down Expand Up @@ -286,12 +287,13 @@ function url_for( $params, $altparams = NULL ) {
// a named route was found
if ($altparams == NULL)
$params = $r->defaults;
// XXX subdomain upgrade
return $r->build_url( $params, $this->base, $this->prefix );
}
// } elseif ( is_array($params) && count( array_intersect( array_keys($vars), array_keys($params) ) ) == count( $vars ) && count($vars) == count($params) && count($r->patterns) == count($params) ) {
} elseif ( is_array($params) && count( array_intersect( array_keys($vars), array_keys($params) ) ) == count( $vars ) && count($vars) == count($params) ) {
// every pattern in the route exists in the requested params

// XXX subdomain upgrade
return $r->build_url( $params, $this->base, $this->prefix );
} else {
// eh
Expand All @@ -317,7 +319,7 @@ function url_for( $params, $altparams = NULL ) {
}

if ( count( array_intersect( array_keys($vars), array_keys($params) ) ) == count( $vars ) && count($vars) == count($params) ) {

// XXX subdomain upgrade
return $r->build_url( $params, $this->base, $this->prefix );
}

Expand Down
2 changes: 2 additions & 0 deletions db/library/dbscript/route.php
View file
Expand Up @@ -69,10 +69,12 @@ function build_url( $params, $base, $prefix = '' ) {
}
}
global $pretty_url_base,$request;
// XXX subdomain upgrade
if (isset($pretty_url_base) && !empty($pretty_url_base))
$base = $pretty_url_base."/".$request->prefix;
if ( !( substr( $base, -1 ) == '/' ))
$base = $base . "/";
// XXX subdomain upgrade
if (!empty($prefix)) $q = "";
else $q = "?";
if (isset($pretty_url_base) && !empty($pretty_url_base))
Expand Down

0 comments on commit 75ec45e

Please sign in to comment.