Skip to content

Commit

Permalink
die if ABS_PATH does not exist and I have formatted a bit some files
Browse files Browse the repository at this point in the history
  • Loading branch information
juanramon committed Apr 19, 2011
1 parent dc6ec5b commit 5fc77b6
Show file tree
Hide file tree
Showing 91 changed files with 7,922 additions and 7,812 deletions.
4 changes: 2 additions & 2 deletions ajax.php
@@ -1,4 +1,4 @@
<?php
<?php if ( ! defined('ABS_PATH')) exit('ABS_PATH is not loaded. Direct access is not allowed.');

/*
* OSCLass – software for creating and publishing online classified
Expand Down Expand Up @@ -155,4 +155,4 @@ function doView($file) {
}
}

?>
?>
4 changes: 2 additions & 2 deletions contact.php
@@ -1,4 +1,4 @@
<?php
<?php if ( ! defined('ABS_PATH')) exit('ABS_PATH is not loaded. Direct access is not allowed.');

/**
* OSClass – software for creating and publishing online classified advertising platforms
Expand Down Expand Up @@ -72,4 +72,4 @@ function doView($file) {
}
}

?>
?>
168 changes: 94 additions & 74 deletions generate_rules.php
@@ -1,89 +1,109 @@
<?php

require_once 'oc-load.php' ;
/*
* OSCLass – software for creating and publishing online classified
* advertising platforms
*
* Copyright (C) 2010 OSCLASS
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

//create object
$rewrite = Rewrite::newInstance() ;
$rewrite->clearRules() ;
require_once 'oc-load.php' ;

/*****************************
********* Add rules *********
*****************************/
//create object
$rewrite = Rewrite::newInstance() ;
$rewrite->clearRules() ;

// Clean archive files
$rewrite->addRule('^(.+?).php(.*)$', '$1.php$2');
/*****************************
********* Add rules *********
*****************************/

// Contact rules
$rewrite->addRule('^contact/?$', 'index.php?page=contact');
// Clean archive files
$rewrite->addRule('^(.+?).php(.*)$', '$1.php$2');

// Feed rules
$rewrite->addRule('^feed$', 'index.php?page=search&sFeed=rss');
$rewrite->addRule('^feed/(.+)$', 'index.php?page=search&sFeed=$1');
// Contact rules
$rewrite->addRule('^contact/?$', 'index.php?page=contact');

// Language rules
$rewrite->addRule('^language/(.*?)/?$', 'index.php?page=language&locale=$1');
// Feed rules
$rewrite->addRule('^feed$', 'index.php?page=search&sFeed=rss');
$rewrite->addRule('^feed/(.+)$', 'index.php?page=search&sFeed=$1');

// Search rules
$rewrite->addRule('^search/(.*)$', 'index.php?page=search&sPattern=$1');
$rewrite->addRule('^s/(.*)$', 'index.php?page=search&sPattern=$1');
// Language rules
$rewrite->addRule('^language/(.*?)/?$', 'index.php?page=language&locale=$1');

// Item rules
$rewrite->addRule('^item/mark/(.*?)/([0-9]+)$', 'index.php?page=item&action=mark&as=$1&id=$2');
$rewrite->addRule('^item/send-friend/([0-9]+)$', 'index.php?page=item&action=send_friend&id=$1');
//$rewrite->addRule('^item/send-friend/done$', 'index.php?page=item&action=send_friend_post'); // juanramon: not used
$rewrite->addRule('^item/contact/([0-9]+)$', 'index.php?page=item&action=contact&id=$1'); // juanramon: not used
//$rewrite->addRule('^item/contact/done$', 'index.php?page=item&action=contact_post'); // juanramon: not used
$rewrite->addRule('^item/comment$', 'index.php?page=item&action=add_comment'); // juanramon: not used
$rewrite->addRule('^item/new$', 'index.php?page=item&action=item_add');
$rewrite->addRule('^item/new/([0-9]+)$', 'index.php?page=item&action=item_add&catId=$1');
//$rewrite->addRule('^item/new/done$', 'index.php?page=item&action=post_item'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^item/activate/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=activate&id=$1&secret=$2');
$rewrite->addRule('^item/edit/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=item_edit&id=$1&secret=$2');
$rewrite->addRule('^item/delete/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=item_delete&id=$1&secret=$2');
$rewrite->addRule('^item/resource/delete/([0-9]+)/([0-9]+)/([0-9A-Za-z]+)/?(.*?)/?$', 'index.php?page=item&action=deleteResource&id=$1&item=$2&code=$3&secret=$4');
$rewrite->addRule('^item/update/stats$', 'index.php?page=item&action=update_cat_stats'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^item/([0-9]+)$', 'index.php?page=item&id=$1');
$rewrite->addRule('^item/([a-zA-Z_]+)/([0-9]+)$', 'index.php?page=item&id=$2&lang=$1');
$rewrite->addRule('^item/(.*)$', 'index.php?page=item&action=$1'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^item$', 'index.php?page=item'); // juanramon: not used
$rewrite->addRule('^([a-zA-Z_]{5})_(.+)_([0-9]+)$', 'index.php?page=item&id=$3&lang=$1');
$rewrite->addRule('^(.+)_([0-9]+)$', 'index.php?page=item&id=$2');
// Search rules
$rewrite->addRule('^search/(.*)$', 'index.php?page=search&sPattern=$1');
$rewrite->addRule('^s/(.*)$', 'index.php?page=search&sPattern=$1');

// User rules
$rewrite->addRule('^user/login$', 'index.php?page=login');
//$rewrite->addRule('^user/login/done$', 'index.php?page=user&action=login_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/dashboard/?$', 'index.php?page=user&action=dashboard');
$rewrite->addRule('^user/logout$', 'index.php?page=main&action=logout');
$rewrite->addRule('^user/register$', 'index.php?page=register&action=register');
//$rewrite->addRule('^user/register/done$', 'index.php?page=register&action=register_post'); // juanramon: not used
$rewrite->addRule('^user/send-validation$', 'index.php?page=user&action=send_validation'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/activate/([0-9]+)/(.*?)/?$', 'index.php?page=register&action=validate&id=$1&code=$2');
$rewrite->addRule('^user/profile$', 'index.php?page=user&action=profile');
$rewrite->addRule('^user/profile/done$', 'index.php?page=user&action=profile_post'); // juanramon: not used
$rewrite->addRule('^user/items$', 'index.php?page=user&action=items');
$rewrite->addRule('^user/alerts$', 'index.php?page=user&action=alerts');
$rewrite->addRule('^user/account$', 'index.php?page=user&action=account'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/item/delete$', 'index.php?page=user&action=item_delete'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/item/edit$', 'index.php?page=user&action=item_edit'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/item/edit/done$', 'index.php?page=user&action=item_edit_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/recover/?$', 'index.php?page=login&action=recover');
$rewrite->addRule('^user/forgot/([0-9]+)/(.*)$', 'index.php?page=login&action=forgot&userId=$1&code=$2');
$rewrite->addRule('^user/change/password$', 'index.php?page=user&action=forgot_change'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/change/password/done$', 'index.php?page=user&action=forgot_change_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/change_email_confirm/([0-9]+)/(.*?)/?$', 'index.php?page=user&action=change_email_confirm&userId=$1&code=$2');
//$rewrite->addRule('^user/options/(.*)', 'index.php?page=user&action=options&option=$1'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/options_post/(.*)$', 'index.php?page=user&action=options_post&option=$1'); // juanramon: not used ## it doesn'e exist
$rewrite->addRule('^user/(.*)$', 'index.php?page=user&action=$1'); // juanramon: not used ## doesn't exist
//$rewrite->addRule('^user$', 'index.php?page=user'); // juanramon: not used ## doesn't exist (no default action)
// Item rules
$rewrite->addRule('^item/mark/(.*?)/([0-9]+)$', 'index.php?page=item&action=mark&as=$1&id=$2');
$rewrite->addRule('^item/send-friend/([0-9]+)$', 'index.php?page=item&action=send_friend&id=$1');
//$rewrite->addRule('^item/send-friend/done$', 'index.php?page=item&action=send_friend_post'); // juanramon: not used
$rewrite->addRule('^item/contact/([0-9]+)$', 'index.php?page=item&action=contact&id=$1'); // juanramon: not used
//$rewrite->addRule('^item/contact/done$', 'index.php?page=item&action=contact_post'); // juanramon: not used
$rewrite->addRule('^item/comment$', 'index.php?page=item&action=add_comment'); // juanramon: not used
$rewrite->addRule('^item/new$', 'index.php?page=item&action=item_add');
$rewrite->addRule('^item/new/([0-9]+)$', 'index.php?page=item&action=item_add&catId=$1');
//$rewrite->addRule('^item/new/done$', 'index.php?page=item&action=post_item'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^item/activate/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=activate&id=$1&secret=$2');
$rewrite->addRule('^item/edit/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=item_edit&id=$1&secret=$2');
$rewrite->addRule('^item/delete/([0-9]+)/(.*?)/?$', 'index.php?page=item&action=item_delete&id=$1&secret=$2');
$rewrite->addRule('^item/resource/delete/([0-9]+)/([0-9]+)/([0-9A-Za-z]+)/?(.*?)/?$', 'index.php?page=item&action=deleteResource&id=$1&item=$2&code=$3&secret=$4');
$rewrite->addRule('^item/update/stats$', 'index.php?page=item&action=update_cat_stats'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^item/([0-9]+)$', 'index.php?page=item&id=$1');
$rewrite->addRule('^item/([a-zA-Z_]+)/([0-9]+)$', 'index.php?page=item&id=$2&lang=$1');
$rewrite->addRule('^item/(.*)$', 'index.php?page=item&action=$1'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^item$', 'index.php?page=item'); // juanramon: not used
$rewrite->addRule('^([a-zA-Z_]{5})_(.+)_([0-9]+)$', 'index.php?page=item&id=$3&lang=$1');
$rewrite->addRule('^(.+)_([0-9]+)$', 'index.php?page=item&id=$2');

// Page rules
$rewrite->addRule('^(.*?)-p([0-9]*)$', 'index.php?page=page&id=$2');
$rewrite->addRule('^(.*?)-p([0-9]*)-([a-zA-Z_]*)$', 'index.php?page=page&id=$2&lang=$3');
// User rules
$rewrite->addRule('^user/login$', 'index.php?page=login');
//$rewrite->addRule('^user/login/done$', 'index.php?page=user&action=login_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/dashboard/?$', 'index.php?page=user&action=dashboard');
$rewrite->addRule('^user/logout$', 'index.php?page=main&action=logout');
$rewrite->addRule('^user/register$', 'index.php?page=register&action=register');
//$rewrite->addRule('^user/register/done$', 'index.php?page=register&action=register_post'); // juanramon: not used
$rewrite->addRule('^user/send-validation$', 'index.php?page=user&action=send_validation'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/activate/([0-9]+)/(.*?)/?$', 'index.php?page=register&action=validate&id=$1&code=$2');
$rewrite->addRule('^user/profile$', 'index.php?page=user&action=profile');
$rewrite->addRule('^user/profile/done$', 'index.php?page=user&action=profile_post'); // juanramon: not used
$rewrite->addRule('^user/items$', 'index.php?page=user&action=items');
$rewrite->addRule('^user/alerts$', 'index.php?page=user&action=alerts');
$rewrite->addRule('^user/account$', 'index.php?page=user&action=account'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/item/delete$', 'index.php?page=user&action=item_delete'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/item/edit$', 'index.php?page=user&action=item_edit'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/item/edit/done$', 'index.php?page=user&action=item_edit_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/recover/?$', 'index.php?page=login&action=recover');
$rewrite->addRule('^user/forgot/([0-9]+)/(.*)$', 'index.php?page=login&action=forgot&userId=$1&code=$2');
$rewrite->addRule('^user/change/password$', 'index.php?page=user&action=forgot_change'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/change/password/done$', 'index.php?page=user&action=forgot_change_post'); // juanramon: not used ## it doesn't exist
$rewrite->addRule('^user/change_email_confirm/([0-9]+)/(.*?)/?$', 'index.php?page=user&action=change_email_confirm&userId=$1&code=$2');
//$rewrite->addRule('^user/options/(.*)', 'index.php?page=user&action=options&option=$1'); // juanramon: not used ## it doesn't exist
//$rewrite->addRule('^user/options_post/(.*)$', 'index.php?page=user&action=options_post&option=$1'); // juanramon: not used ## it doesn'e exist
$rewrite->addRule('^user/(.*)$', 'index.php?page=user&action=$1'); // juanramon: not used ## doesn't exist
//$rewrite->addRule('^user$', 'index.php?page=user'); // juanramon: not used ## doesn't exist (no default action)

// Category rules
$rewrite->addRule('^(.+)$', 'index.php?page=search&sCategory=$1');
// Page rules
$rewrite->addRule('^(.*?)-p([0-9]*)$', 'index.php?page=page&id=$2');
$rewrite->addRule('^(.*?)-p([0-9]*)-([a-zA-Z_]*)$', 'index.php?page=page&id=$2&lang=$3');

//Write rule to DB
$rewrite->setRules();
// Category rules
$rewrite->addRule('^(.+)$', 'index.php?page=search&sCategory=$1');

?>
//Write rule to DB
$rewrite->setRules();

?>
3 changes: 2 additions & 1 deletion index.php
@@ -1,4 +1,5 @@
<?php

/*
* OSCLass – software for creating and publishing online classified
* advertising platforms
Expand Down Expand Up @@ -85,4 +86,4 @@
break;
}

?>
?>

0 comments on commit 5fc77b6

Please sign in to comment.