diff --git a/README b/README index 0387efc..3b3bec6 100755 --- a/README +++ b/README @@ -1,9 +1,9 @@ -OpenReviewScript 2011 - Version 1.0rc2b ----------------------------------------- +OpenReviewScript 2011-2012 - Version 1.0.0 +------------------------------------------- OpenReviewScript is free, open source software for creating product or service review websites, written in PHP using the CodeIgniter framework (http://codeigniter.com) and released under the GPLv2 license (see the 'LICENSE' file for more details). Contact us at: help@openreviewscript.org or http://openreviewscript.org/contact -Support available at: http://openreviewscript.org/support +Support available at: http://openreviewscript.org/forums Server Requirements =================== diff --git a/application/config/config.php b/application/config/config.php index b4ef1cc..802e774 100755 --- a/application/config/config.php +++ b/application/config/config.php @@ -131,7 +131,7 @@ $config['subclass_prefix'] = 'MY_'; | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | */ -$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; +$config['permitted_uri_chars'] = '[А-Яа-яЁё]a-z 0-9~%.:_\-'; /* diff --git a/application/config/production/config.php b/application/config/production/config.php index 697c794..e35dec2 100755 --- a/application/config/production/config.php +++ b/application/config/production/config.php @@ -130,7 +130,7 @@ $config['subclass_prefix'] = 'MY_'; | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!! | */ -$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; +$config['permitted_uri_chars'] = 'ЀАРарѐѠѰҀҐҠҰӀӐӠӰЁБСбсёѡѱҁґҡұӁӑӡӱЂВТвтђѢѲ҂ҒҢҲӂӒӢӲЃГУгуѓѣѳ$҃ғңҳӃӓӣӳЄДФдфєѤѴ$҄ҔҤҴӄӔӤӴЅЕХехѕѥѵ$҅ҕҥҵӅӕӥӵІЖЦжціѦѶ$҆ҖҦҶӆӖӦӶЇЗЧзчїѧѷ$҇җҧҷӇӗӧӷЈИШишјѨѸ$҈ҘҨҸӈӘӨӸЉЙЩйщљѩѹ$҉ҙҩҹӉәөӹЊКЪкъњѪѺҊҚҪҺӊӚӪӺЋЛЫлыћѫѻҋқҫһӋӛӫӻЌМЬмьќѬѼҌҜҬҼӌӜӬӼЍНЭнэѝѭѽҍҝҭҽӍӝӭӽЎОЮоюўѮѾҎҞҮҾӎӞӮӾЏПЯпяџѯѿҏҟүҿӏӟӯӿa-z0-9~%.:_\-'; /* diff --git a/application/controllers/article.php b/application/controllers/article.php index fd75bd5..db0fecd 100755 --- a/application/controllers/article.php +++ b/application/controllers/article.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/articles.php b/application/controllers/articles.php index 040fc14..1851278 100755 --- a/application/controllers/articles.php +++ b/application/controllers/articles.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license OpenReviewScript is free software licensed under the GNU General Public License version 2 - This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/contact.php b/application/controllers/contact.php index 297e2bc..de30626 100755 --- a/application/controllers/contact.php +++ b/application/controllers/contact.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -198,7 +198,7 @@ class Contact extends CI_Controller { } else { // form not submitted so just show the page debug('form not submitted'); - $data[] = ''; + $data['error_message'] = ''; debug('loading "contact/form" view'); $sections = array('content' => 'site/' . $this->setting['current_theme'] . '/template/contact/form', 'sidebar' => 'site/' . $this->setting['current_theme'] . '/template/page/page_sidebar'); $this->template->load('site/' . $this->setting['current_theme'] . '/template/template.tpl', $sections, $data); diff --git a/application/controllers/error.php b/application/controllers/error.php index 170b1d8..b6b7c2c 100755 --- a/application/controllers/error.php +++ b/application/controllers/error.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/home.php b/application/controllers/home.php index f68bd90..405d449 100755 --- a/application/controllers/home.php +++ b/application/controllers/home.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -53,6 +53,7 @@ class Home extends CI_Controller { $this->load->model('Review_model'); $this->load->model('Category_model'); $this->load->model('Ad_model'); + $this->load->model('Comment_model'); $this->load->helper('directory'); // load all settings into an array $this->setting = $this->Setting_model->getEverySetting(); @@ -75,6 +76,11 @@ class Home extends CI_Controller { $data['featured_minimum'] = $this->setting['featured_minimum']; $data['featured_reviews'] = $this->setting['featured_section_home'] == 1 ? count($data['featured']) : 0; $data['latest'] = $this->Review_model->getLatestReviews($this->setting['perpage_site_home'], $this->uri->segment(3)); + if ($data['latest']) { + foreach ($data['latest'] as $key => $review) { + $data['latest'][$key]->rating_image = $this->Comment_model->GetVisitorRatingForReviewById($data['latest'][$key]->id); + } + } $data['categories'] = $this->Category_model->getAllCategories(0); $data['show_categories'] = $this->setting['categories_sidebar']; $data['show_search'] = $this->setting['search_sidebar']; diff --git a/application/controllers/manager/ad.php b/application/controllers/manager/ad.php index 65028b6..1430866 100755 --- a/application/controllers/manager/ad.php +++ b/application/controllers/manager/ad.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -230,7 +230,7 @@ class Ad extends CI_Controller { $this->Ad_model->addAd($name, $orig_file_name, $remote_image_url, $height, $width, $text, $link, $visible_in_sidebar, $visible_in_lists, $visible_on_review_page); $data['message'] = lang('manager_ad_add_success'); // clear form validation data - $this->form_validation->field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/ad/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/ad/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/ads.php b/application/controllers/manager/ads.php index 68c0211..5245017 100755 --- a/application/controllers/manager/ads.php +++ b/application/controllers/manager/ads.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/article.php b/application/controllers/manager/article.php index a8021c8..57bc3cd 100755 --- a/application/controllers/manager/article.php +++ b/application/controllers/manager/article.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -135,7 +135,7 @@ class Article extends CI_Controller { // message displayed when page reloads $data['message'] = lang('manager_article_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // display the form debug('loading "manager/article/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/article/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/articles.php b/application/controllers/manager/articles.php index c7cbfa1..cc0ecb5 100755 --- a/application/controllers/manager/articles.php +++ b/application/controllers/manager/articles.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/categories.php b/application/controllers/manager/categories.php index c2eaa23..0df218c 100755 --- a/application/controllers/manager/categories.php +++ b/application/controllers/manager/categories.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/category.php b/application/controllers/manager/category.php index 59d2121..85c47ce 100755 --- a/application/controllers/manager/category.php +++ b/application/controllers/manager/category.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -103,7 +103,7 @@ class Category extends CI_Controller { $seo_name = $this->Category_model->addCategory($name); $data['message'] = lang('manager_category_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/category/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/category/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/comment.php b/application/controllers/manager/comment.php index 2f69f87..06db59e 100755 --- a/application/controllers/manager/comment.php +++ b/application/controllers/manager/comment.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -113,7 +113,7 @@ class Comment extends CI_Controller { $data['review'] = $review; $data['message'] = lang('manager_comment_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // display the form debug('loading "manager/comment/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/comment/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/comments.php b/application/controllers/manager/comments.php index 19428ed..38a1d7c 100755 --- a/application/controllers/manager/comments.php +++ b/application/controllers/manager/comments.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/feature.php b/application/controllers/manager/feature.php index 7427492..5567354 100755 --- a/application/controllers/manager/feature.php +++ b/application/controllers/manager/feature.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -99,7 +99,7 @@ class Feature extends CI_Controller { $this->Feature_model->addFeature($name); $data['message'] = lang('manager_feature_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/feature/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/feature/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/features.php b/application/controllers/manager/features.php index 66e22fd..8d68dcf 100755 --- a/application/controllers/manager/features.php +++ b/application/controllers/manager/features.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/forgot_login.php b/application/controllers/manager/forgot_login.php index 5634d21..a3b39c3 100755 --- a/application/controllers/manager/forgot_login.php +++ b/application/controllers/manager/forgot_login.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -105,7 +105,7 @@ class Forgot_login extends CI_Controller { $email_message .= lang('manager_login_forgot_email_message_1d') . "\n\n"; // include a link with the key so we can identify the user when they confirm the password reset request $email_message .= base_url() . 'manager/reset_password/do_reset/' . urlencode($temporary_key); - $this->email->from($this->setting['site_email'], $this->setting['site_name']); + $this->email->from($this->setting['site_email']); $this->email->to($this->input->post('login_email')); $this->email->subject(lang('manager_login_forgot_password_reset_subject') . $this->setting['site_name']); $this->email->message($email_message); diff --git a/application/controllers/manager/home.php b/application/controllers/manager/home.php index 002800d..6357802 100755 --- a/application/controllers/manager/home.php +++ b/application/controllers/manager/home.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/login.php b/application/controllers/manager/login.php index 9a9e5cb..eea41d6 100755 --- a/application/controllers/manager/login.php +++ b/application/controllers/manager/login.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/logout.php b/application/controllers/manager/logout.php index 61b7daf..f0dfc38 100755 --- a/application/controllers/manager/logout.php +++ b/application/controllers/manager/logout.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/maintenance.php b/application/controllers/manager/maintenance.php index 9c5a19c..b4a8df2 100755 --- a/application/controllers/manager/maintenance.php +++ b/application/controllers/manager/maintenance.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/page.php b/application/controllers/manager/page.php index f9ce1ab..32d5ce5 100755 --- a/application/controllers/manager/page.php +++ b/application/controllers/manager/page.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -120,7 +120,7 @@ class Page extends CI_Controller { $new_page_id = $this->Page_model->addPage($name, $content, $meta_keywords, $meta_description); $data['message'] = lang('manager_page_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/page/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/page/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/pages.php b/application/controllers/manager/pages.php index a8277e1..26162e5 100755 --- a/application/controllers/manager/pages.php +++ b/application/controllers/manager/pages.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/rating.php b/application/controllers/manager/rating.php index 6cedba2..fc9f9b3 100755 --- a/application/controllers/manager/rating.php +++ b/application/controllers/manager/rating.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -100,7 +100,7 @@ class Rating extends CI_Controller { $this->Rating_model->addRating($name); $data['message'] = lang('manager_rating_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/rating/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/rating/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/ratings.php b/application/controllers/manager/ratings.php index fb3489d..b881322 100755 --- a/application/controllers/manager/ratings.php +++ b/application/controllers/manager/ratings.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/reset_password.php b/application/controllers/manager/reset_password.php index 1a4eaea..5ab3d48 100755 --- a/application/controllers/manager/reset_password.php +++ b/application/controllers/manager/reset_password.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -77,7 +77,7 @@ class Reset_password extends CI_Controller { $email_message = lang('manager_login_forgot_email_message_2a') . "\n\n"; $email_message .= $newPassword . "\n\n"; $email_message .= lang('manager_login_forgot_email_message_2b') . ' ' . base_url() . 'manager/login'; - $this->email->from($this->setting['site_email'], $this->setting['site_name']); + $this->email->from($this->setting['site_email']); $this->email->to($user_email); $this->email->subject(lang('manager_login_forgot_new_password_subject')); $this->email->message($email_message); diff --git a/application/controllers/manager/review.php b/application/controllers/manager/review.php index 27c28bd..03a6633 100755 --- a/application/controllers/manager/review.php +++ b/application/controllers/manager/review.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -301,7 +301,7 @@ class Review extends CI_Controller { } } $data['message'] = lang('manager_review_add_success'); - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); debug('loading "manager/review/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/review/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); $this->template->load('manager/' . $this->setting['current_manager_theme'] . '/template/manager_template', $sections, $data); diff --git a/application/controllers/manager/review_feature.php b/application/controllers/manager/review_feature.php index f55134c..7a9db03 100755 --- a/application/controllers/manager/review_feature.php +++ b/application/controllers/manager/review_feature.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -122,7 +122,7 @@ class Review_feature extends CI_Controller { $data['review'] = $review; $data['message'] = lang('manager_review_feature_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/review_feature/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/review_feature/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/review_features.php b/application/controllers/manager/review_features.php index 08f7787..4160fb3 100755 --- a/application/controllers/manager/review_features.php +++ b/application/controllers/manager/review_features.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/review_rating.php b/application/controllers/manager/review_rating.php index 8ac47b0..6ceb314 100755 --- a/application/controllers/manager/review_rating.php +++ b/application/controllers/manager/review_rating.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -125,7 +125,7 @@ class Review_rating extends CI_Controller { $data['review'] = $review; $data['message'] = lang('manager_review_rating_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // reload the form debug('loading "manager/review_rating/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/review_rating/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/review_ratings.php b/application/controllers/manager/review_ratings.php index ff46714..45f412a 100755 --- a/application/controllers/manager/review_ratings.php +++ b/application/controllers/manager/review_ratings.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/reviews.php b/application/controllers/manager/reviews.php index a230084..2357c0d 100755 --- a/application/controllers/manager/reviews.php +++ b/application/controllers/manager/reviews.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/site_settings.php b/application/controllers/manager/site_settings.php index b9b68fa..70d156b 100755 --- a/application/controllers/manager/site_settings.php +++ b/application/controllers/manager/site_settings.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/sitemap.php b/application/controllers/manager/sitemap.php index af4f562..c48d3f8 100755 --- a/application/controllers/manager/sitemap.php +++ b/application/controllers/manager/sitemap.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/manager/theme_settings.php b/application/controllers/manager/theme_settings.php index b7e0733..c002f0d 100755 --- a/application/controllers/manager/theme_settings.php +++ b/application/controllers/manager/theme_settings.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -190,9 +190,11 @@ class Theme_settings extends CI_Controller { debug('uploading the file'); // attempt to upload the file if (!$this->upload->do_upload()) { + $file_data = array('upload_data' => $this->upload->data()); + $mimetype= $file_data['upload_data']['file_type']; // if there was an error uploading, set the error message debug('there was a file uploading error... ' . $this->upload->display_errors()); - $data['upload_error'] = lang('manager_theme_settings_form_upload_error') . $this->upload->display_errors(); + $data['upload_error'] = lang('manager_theme_settings_form_upload_error') . $this->upload->display_errors().' Your file type is '.$mimetype.""; $file_error = 1; } else { // upload successful @@ -316,4 +318,4 @@ class Theme_settings extends CI_Controller { } /* End of file theme_settings.php */ -/* Location: ./application/controllers/manager/theme_settings.php */ \ No newline at end of file +/* Location: ./application/controllers/manager/theme_settings.php */ diff --git a/application/controllers/manager/user.php b/application/controllers/manager/user.php index a5a68cf..4f792da 100755 --- a/application/controllers/manager/user.php +++ b/application/controllers/manager/user.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -127,7 +127,7 @@ class User extends CI_Controller { $new_user_id = $this->User_model->addUser($name, $password, $email, $level); $data['message'] = lang('manager_user_add_success'); // clear form validation data - $this->form_validation->_field_data = array(); + $this->form_validation->clear_fields(); // display the form debug('loading "manager/user/add" view'); $sections = array('content' => 'manager/' . $this->setting['current_manager_theme'] . '/template/user/add', 'sidebar' => 'manager/' . $this->setting['current_manager_theme'] . '/template/sidebar'); diff --git a/application/controllers/manager/users.php b/application/controllers/manager/users.php index cde9661..bd31b86 100755 --- a/application/controllers/manager/users.php +++ b/application/controllers/manager/users.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/not_found.php b/application/controllers/not_found.php index dedb715..8692e52 100755 --- a/application/controllers/not_found.php +++ b/application/controllers/not_found.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/page.php b/application/controllers/page.php index ba99ce9..b67d3aa 100755 --- a/application/controllers/page.php +++ b/application/controllers/page.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -106,4 +106,4 @@ class Page extends CI_Controller { } /* End of file page.php */ -/* Location: ./application/controllers/page.php */ \ No newline at end of file +/* Location: ./application/controllers/page.php */ diff --git a/application/controllers/recommends.php b/application/controllers/recommends.php index a19415f..faddfb7 100755 --- a/application/controllers/recommends.php +++ b/application/controllers/recommends.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/results.php b/application/controllers/results.php index 857229f..b1c290f 100755 --- a/application/controllers/results.php +++ b/application/controllers/results.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/review.php b/application/controllers/review.php index 7ada431..95ff444 100755 --- a/application/controllers/review.php +++ b/application/controllers/review.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/controllers/rss.php b/application/controllers/rss.php index fb3a736..424591c 100755 --- a/application/controllers/rss.php +++ b/application/controllers/rss.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/core/MY_Exceptions.php b/application/core/MY_Exceptions.php deleted file mode 100755 index 86f2011..0000000 --- a/application/core/MY_Exceptions.php +++ /dev/null @@ -1,76 +0,0 @@ -. - */ -class MY_Exceptions extends CI_Exceptions { - - var $CI; - - function MY_Exceptions() { - parent::__construct(); - } - - function show_404($page='') { - if (isset($log_error)) { - if ($log_error) - log_message('error', '404 Page Not Found --> ' . $page); - } - $this->config = & get_config(); - $base_url = $this->config['base_url']; - header("location: " . $base_url . "not_found"); - exit; - } - - function show_error($heading, $message, $template = 'error_general', $status_code = 500) { - $this->config = & get_config(); - $base_url = $this->config['base_url']; - $errors = array('error_message' => lang('error_message') . $message); - $CI = & get_instance(); - $CI->load->library('session'); - //If something really bad has happened like a failed database connection - //show the error directly. If we didn't do this, we would get a PHP error - //saying we're trying to access a non-object. - if (!is_object($CI->session)) { - if (is_array($message)) { - foreach ($message as $item) { - echo $item . "
"; - } - } else { - echo $message . "
"; - } - die (); - } - //Store the errors in the session - $CI->session->set_userdata($errors); - header("location: " . $base_url . "error"); - } - -} \ No newline at end of file diff --git a/application/core/MY_Loader.php b/application/core/MY_Loader.php index 436aa4d..14505fb 100755 --- a/application/core/MY_Loader.php +++ b/application/core/MY_Loader.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/helpers/MY_captcha_helper.php b/application/helpers/MY_captcha_helper.php new file mode 100755 index 0000000..8be19e6 --- /dev/null +++ b/application/helpers/MY_captcha_helper.php @@ -0,0 +1,233 @@ +. + */ +function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '') +{ + $defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200); + + foreach ($defaults as $key => $val) + { + if ( ! is_array($data)) + { + if ( ! isset($$key) OR $$key == '') + { + $$key = $val; + } + } + else + { + $$key = ( ! isset($data[$key])) ? $val : $data[$key]; + } + } + + if ($img_path == '' OR $img_url == '') + { + return FALSE; + } + + if ( ! @is_dir($img_path)) + { + return FALSE; + } + + if ( ! is_writable($img_path)) + { + return FALSE; + } + + if ( ! extension_loaded('gd')) + { + return FALSE; + } + + // ----------------------------------- + // Remove old images + // ----------------------------------- + + list($usec, $sec) = explode(" ", microtime()); + $now = ((float)$usec + (float)$sec); + + $current_dir = @opendir($img_path); + + while ($filename = @readdir($current_dir)) + { + if ($filename != "." and $filename != ".." and $filename != "index.html") + { + $name = str_replace(".jpg", "", $filename); + + if (($name + $expiration) < $now) + { + @unlink($img_path.$filename); + } + } + } + + @closedir($current_dir); + + // ----------------------------------- + // Do we have a "word" yet? + // ----------------------------------- + + if ($word == '') + { + $pool = '0123456789'; + + $str = ''; + for ($i = 0; $i < 8; $i++) + { + $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); + } + + $word = $str; + } + + // ----------------------------------- + // Determine angle and position + // ----------------------------------- + + $length = strlen($word); + $angle = ($length >= 6) ? rand(-($length-6), ($length-6)) : 0; + $x_axis = rand(6, (360/$length)-16); + $y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height); + + // ----------------------------------- + // Create image + // ----------------------------------- + + // PHP.net recommends imagecreatetruecolor(), but it isn't always available + if (function_exists('imagecreatetruecolor')) + { + $im = imagecreatetruecolor($img_width, $img_height); + } + else + { + $im = imagecreate($img_width, $img_height); + } + + // ----------------------------------- + // Assign colors + // ----------------------------------- + + $bg_color = imagecolorallocate ($im, 255, 255, 255); + $border_color = imagecolorallocate ($im, 153, 102, 102); + $text_color = imagecolorallocate ($im, 204, 153, 153); + $grid_color = imagecolorallocate($im, 255, 182, 182); + $shadow_color = imagecolorallocate($im, 255, 240, 240); + + // ----------------------------------- + // Create the rectangle + // ----------------------------------- + + ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color); + + // ----------------------------------- + // Create the spiral pattern + // ----------------------------------- + + $theta = 1; + $thetac = 7; + $radius = 16; + $circles = 20; + $points = 32; + + for ($i = 0; $i < ($circles * $points) - 1; $i++) + { + $theta = $theta + $thetac; + $rad = $radius * ($i / $points ); + $x = ($rad * cos($theta)) + $x_axis; + $y = ($rad * sin($theta)) + $y_axis; + $theta = $theta + $thetac; + $rad1 = $radius * (($i + 1) / $points); + $x1 = ($rad1 * cos($theta)) + $x_axis; + $y1 = ($rad1 * sin($theta )) + $y_axis; + imageline($im, $x, $y, $x1, $y1, $grid_color); + $theta = $theta - $thetac; + } + + // ----------------------------------- + // Write the text + // ----------------------------------- + + $use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE; + + if ($use_font == FALSE) + { + $font_size = 5; + $x = rand(0, $img_width/($length/3)); + $y = 0; + } + else + { + $font_size = 16; + $x = rand(0, $img_width/($length/1.5)); + $y = $font_size+2; + } + + for ($i = 0; $i < strlen($word); $i++) + { + if ($use_font == FALSE) + { + $y = rand(0 , $img_height/2); + imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); + $x += ($font_size*2); + } + else + { + $y = rand($img_height/2, $img_height-3); + imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); + $x += $font_size; + } + } + + + // ----------------------------------- + // Create the border + // ----------------------------------- + + imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color); + + // ----------------------------------- + // Generate the image + // ----------------------------------- + + $img_name = $now.'.jpg'; + + ImageJPEG($im, $img_path.$img_name); + + $img = "\""; + + ImageDestroy($im); + + return array('word' => $word, 'time' => $now, 'image' => $img); +} +/* End of file MY_captcha_helper.php */ +/* Location: ./application/helpers/MY_captcha_helper.php */ \ No newline at end of file diff --git a/application/helpers/MY_date_helper.php b/application/helpers/MY_date_helper.php index 85395b4..81ffee6 100755 --- a/application/helpers/MY_date_helper.php +++ b/application/helpers/MY_date_helper.php @@ -9,7 +9,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -121,4 +121,6 @@ function timespan($seconds = 1, $time = '') { $str .= $seconds . ' ' . $CI->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')) . ', '; } return substr(trim($str), 0, -1); -} \ No newline at end of file +} +/* End of file MY_date_helper.php */ +/* Location: ./application/helpers/MY_date_helper.php */ \ No newline at end of file diff --git a/application/helpers/MY_url_helper.php b/application/helpers/MY_url_helper.php new file mode 100644 index 0000000..7edabf6 --- /dev/null +++ b/application/helpers/MY_url_helper.php @@ -0,0 +1,34 @@ + '', + '&\S+?;' => '', + '\s+|/+' => $separator, + '[^\p{L}\p{Nd}0-9\-\._]' => '', + $separator.'+' => $separator, + '^[-_]+|[-_]+$' => '', + '\.+$' => '' + ); + $str = strip_tags($str); + foreach ($trans as $key => $val) + { + $str = preg_replace("#".$key."#iu", $val, $str); + } + if ($lowercase === TRUE) + { + $str = strtolower($str); + } + return trim(stripslashes($str)); + } diff --git a/application/helpers/log_helper.php b/application/helpers/log_helper.php index 2571f5a..29082c2 100755 --- a/application/helpers/log_helper.php +++ b/application/helpers/log_helper.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/helpers/menu_helper.php b/application/helpers/menu_helper.php index 6cfdec9..8593125 100755 --- a/application/helpers/menu_helper.php +++ b/application/helpers/menu_helper.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/helpers/results_helper.php b/application/helpers/results_helper.php index a55e1ea..572af0e 100755 --- a/application/helpers/results_helper.php +++ b/application/helpers/results_helper.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/helpers/tagcloud_helper.php b/application/helpers/tagcloud_helper.php index 5989c7d..3daf18b 100755 --- a/application/helpers/tagcloud_helper.php +++ b/application/helpers/tagcloud_helper.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/helpers/template_helper.php b/application/helpers/template_helper.php index 5a3ae29..972cb8c 100755 --- a/application/helpers/template_helper.php +++ b/application/helpers/template_helper.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/language/english/ORS_lang.php b/application/language/english/ORS_lang.php index 39f0ea8..b54e43d 100755 --- a/application/language/english/ORS_lang.php +++ b/application/language/english/ORS_lang.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php new file mode 100644 index 0000000..3418f29 --- /dev/null +++ b/application/language/english/form_validation_lang.php @@ -0,0 +1,29 @@ +_field_data = array(); + } + +} \ No newline at end of file diff --git a/application/libraries/Simplelogin.php b/application/libraries/Simplelogin.php index ba2c2a4..75cd71e 100755 --- a/application/libraries/Simplelogin.php +++ b/application/libraries/Simplelogin.php @@ -1 +1,171 @@ -CI =& get_instance(); } /** * Create a user account * * @access public * @param string * @param string * @param bool * @return bool */ function create($user = '', $password = '', $level = 1, $auto_login = true) { //Put here for PHP 4 users $this->CI = & get_instance(); //Make sure account info was sent if ($user === '' OR $password === '') { return false; } //Check against user table $this->CI->db->where('name', $user); $query = $this->CI->db->getwhere($this->user_table); if ($query->num_rows() > 0) { //name already exists return false; } else { //Encrypt password $password = md5($password); //Insert account into the database $data = array( 'name' => $user, 'password' => $password ); $this->CI->db->set($data); if (!$this->CI->db->insert($this->user_table)) { //There was a problem! return false; } $user_id = $this->CI->db->insert_id(); //Automatically login to created account if ($auto_login) { //Destroy old session $this->CI->session->sess_destroy(); //Create a fresh, brand new session $this->CI->session->sess_create(); //Set session data $this->CI->session->set_userdata(array('id' => $user_id, 'name' => $user)); //Set logged_in to true $this->CI->session->set_userdata(array('logged_in' => true)); } //Login was successful return true; } } /** * Delete user * * @access public * @param integer * @return bool */ function delete($user_id) { //Put here for PHP 4 users $this->CI = & get_instance(); if (!is_numeric($user_id)) { //There was a problem return false; } if ($this->CI->db->delete($this->user_table, array('id' => $user_id))) { //Database call was successful, user is deleted return true; } else { //There was a problem return false; } } /** * Login and sets session variables * * @access public * @param string * @param string * @return bool */ function login($user = '', $password = '', $min_level = 0) { //Put here for PHP 4 users $this->CI = & get_instance(); //Make sure login info was sent if ($user === '' OR $password === '') { return false; } //Check if already logged in if ($this->CI->session->userdata('name') == $user) { //User is already logged in. return false; } //Check against user table $this->CI->db->where('name', $user); $query = $this->CI->db->get_where($this->user_table); if ($query->num_rows() > 0) { $row = $query->row_array(); //Check against password if (md5($password) != $row['password']) { return false; } //Check user level is high enough if ($row['level'] < $min_level) { return false; } //Destroy old session $this->CI->session->sess_destroy(); //Create a fresh, brand new session $this->CI->session->sess_create(); //Remove the password field unset($row['password']); //Set session data $this->CI->session->set_userdata($row); //Set logged_in to true $this->CI->session->set_userdata(array('logged_in' => true)); $this->CI->session->set_userdata('level', $row['level']); //Login was successful return true; } else { //No database result found return false; } } /** * Logout user * * @access public * @return void */ function logout() { //Put here for PHP 4 users $this->CI = & get_instance(); //Destroy session $this->CI->session->sess_destroy(); }} \ No newline at end of file +CI =& get_instance(); + } + + /** + * Create a user account + * + * @access public + * @param string + * @param string + * @param bool + * @return bool + */ + function create($user = '', $password = '', $level = 1, $auto_login = true) { + //Put here for PHP 4 users + $this->CI = & get_instance(); + //Make sure account info was sent + if ($user === '' OR $password === '') { + return false; + } + //Check against user table + $this->CI->db->where('name', $user); + $query = $this->CI->db->getwhere($this->user_table); + if ($query->num_rows() > 0) { + //name already exists + return false; + } else { + //Encrypt password + $password = md5($password); + //Insert account into the database + $data = array( + 'name' => $user, + 'password' => $password + ); + $this->CI->db->set($data); + if (!$this->CI->db->insert($this->user_table)) { + //There was a problem! + return false; + } + $user_id = $this->CI->db->insert_id(); + //Automatically login to created account + if ($auto_login) { + //Destroy old session + $this->CI->session->sess_destroy(); + //Create a fresh, brand new session + $this->CI->session->sess_create(); + //Set session data + $this->CI->session->set_userdata(array('id' => $user_id, 'name' => $user)); + //Set logged_in to true + $this->CI->session->set_userdata(array('logged_in' => true)); + } + //Login was successful + return true; + } + } + + /** + * Delete user + * + * @access public + * @param integer + * @return bool + */ + function delete($user_id) { + //Put here for PHP 4 users + $this->CI = & get_instance(); + if (!is_numeric($user_id)) { + //There was a problem + return false; + } + if ($this->CI->db->delete($this->user_table, array('id' => $user_id))) { + //Database call was successful, user is deleted + return true; + } else { + //There was a problem + return false; + } + } + + /** + * Login and sets session variables + * + * @access public + * @param string + * @param string + * @return bool + */ + function login($user = '', $password = '', $min_level = 0) { + //Put here for PHP 4 users + $this->CI = & get_instance(); + //Make sure login info was sent + if ($user === '' OR $password === '') { + return false; + } + //Check if already logged in + if ($this->CI->session->userdata('name') == $user) { + //User is already logged in. + return false; + } + //Check against user table + $this->CI->db->where('name', $user); + $query = $this->CI->db->get_where($this->user_table); + if ($query->num_rows() > 0) { + $row = $query->row_array(); + //Check against password + if (md5($password) != $row['password']) { + return false; + } + //Check user level is high enough + if ($row['level'] < $min_level) { + + return false; + } + //Destroy old session + $this->CI->session->sess_destroy(); + //Create a fresh, brand new session + $this->CI->session->sess_create(); + //Remove the password field + unset($row['password']); + //Set session data + $this->CI->session->set_userdata($row); + //Set logged_in to true + $this->CI->session->set_userdata(array('logged_in' => true)); + $this->CI->session->set_userdata('level', $row['level']); + //Login was successful + return true; + } else { + //No database result found + return false; + } + } + + /** + * Logout user + * + * @access public + * @return void + */ + function logout() { + //Put here for PHP 4 users + $this->CI = & get_instance(); + //Destroy session + $this->CI->session->sess_destroy(); + }} \ No newline at end of file diff --git a/application/libraries/secure.php b/application/libraries/secure.php index d3741bf..53b162b 100755 --- a/application/libraries/secure.php +++ b/application/libraries/secure.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -22,7 +22,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/ad_model.php b/application/models/ad_model.php index 199f575..880355d 100755 --- a/application/models/ad_model.php +++ b/application/models/ad_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/article_model.php b/application/models/article_model.php index 0145f9d..2754374 100755 --- a/application/models/article_model.php +++ b/application/models/article_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/category_default_feature_model.php b/application/models/category_default_feature_model.php index 0bdfd1b..eb8eac5 100755 --- a/application/models/category_default_feature_model.php +++ b/application/models/category_default_feature_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/category_default_rating_model.php b/application/models/category_default_rating_model.php index 083c65c..bb157d3 100755 --- a/application/models/category_default_rating_model.php +++ b/application/models/category_default_rating_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/category_model.php b/application/models/category_model.php index 2d4094b..db544d4 100755 --- a/application/models/category_model.php +++ b/application/models/category_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/comment_model.php b/application/models/comment_model.php index 6b23eae..e49f3ac 100755 --- a/application/models/comment_model.php +++ b/application/models/comment_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license OpenReviewScript is free software licensed under the GNU General Public License version 2 - This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/feature_model.php b/application/models/feature_model.php index 1c61d08..a0114b1 100755 --- a/application/models/feature_model.php +++ b/application/models/feature_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/maintenance_model.php b/application/models/maintenance_model.php index cd145e8..ed03a07 100755 --- a/application/models/maintenance_model.php +++ b/application/models/maintenance_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/page_model.php b/application/models/page_model.php index 037f8db..1f8e85f 100755 --- a/application/models/page_model.php +++ b/application/models/page_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/rating_model.php b/application/models/rating_model.php index 9aa4bb9..a0a8a1e 100755 --- a/application/models/rating_model.php +++ b/application/models/rating_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/review_feature_model.php b/application/models/review_feature_model.php index bdee430..aafefe8 100755 --- a/application/models/review_feature_model.php +++ b/application/models/review_feature_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/review_model.php b/application/models/review_model.php index 7a9a57f..eb82959 100755 --- a/application/models/review_model.php +++ b/application/models/review_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/review_rating_model.php b/application/models/review_rating_model.php index 12ccd3a..0da4b43 100755 --- a/application/models/review_rating_model.php +++ b/application/models/review_rating_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/setting_model.php b/application/models/setting_model.php index f723a90..1acda7b 100755 --- a/application/models/setting_model.php +++ b/application/models/setting_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/application/models/user_model.php b/application/models/user_model.php index 6080665..88f12cc 100755 --- a/application/models/user_model.php +++ b/application/models/user_model.php @@ -8,7 +8,7 @@ * @package OpenReviewScript * @subpackage site * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/index.php b/index.php index 9bbdb84..42780e8 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,5 @@ '; $gd_fail = FALSE; diff --git a/install/install.sql b/install/install.sql index 6023f60..8840cb6 100755 --- a/install/install.sql +++ b/install/install.sql @@ -1,21 +1,21 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -CREATE TABLE IF NOT EXISTS `ad` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(256) NOT NULL, `local_image_name` varchar(256) NOT NULL, `remote_image_url` varchar(512) NOT NULL, `image_height` int(11) NOT NULL DEFAULT '0', `image_width` int(11) NOT NULL DEFAULT '0', `text` text NOT NULL, `link` varchar(256) NOT NULL, `visible_in_sidebar` int(4) NOT NULL DEFAULT '1', `visible_in_lists` int(4) NOT NULL DEFAULT '1', `visible_on_review_page` int(4) NOT NULL DEFAULT '1', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `article` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(512) NOT NULL, `seo_title` varchar(512) NOT NULL, `description` text NOT NULL, `meta_keywords` varchar(1024) NOT NULL, `meta_description` varchar(1024) NOT NULL, `link_text` varchar(512) NOT NULL, `link_url` varchar(512) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `captcha` ( `captcha_id` bigint(13) unsigned NOT NULL AUTO_INCREMENT, `captcha_time` int(10) unsigned NOT NULL, `ip_address` varchar(16) NOT NULL DEFAULT '0', `word` varchar(20) NOT NULL, PRIMARY KEY (`captcha_id`), KEY `word` (`word`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `category` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `seo_name` varchar(255) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `ad` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(256) NOT NULL, `local_image_name` varchar(256) NOT NULL, `remote_image_url` varchar(512) NOT NULL, `image_height` int(11) NOT NULL DEFAULT '0', `image_width` int(11) NOT NULL DEFAULT '0', `text` text NOT NULL, `link` varchar(256) NOT NULL, `visible_in_sidebar` int(4) NOT NULL DEFAULT '1', `visible_in_lists` int(4) NOT NULL DEFAULT '1', `visible_on_review_page` int(4) NOT NULL DEFAULT '1', PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `article` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(512) NOT NULL, `seo_title` varchar(512) NOT NULL, `description` text NOT NULL, `meta_keywords` varchar(1000) NOT NULL, `meta_description` varchar(1000) NOT NULL, `link_text` varchar(512) NOT NULL, `link_url` varchar(512) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `captcha` ( `captcha_id` bigint(13) unsigned NOT NULL AUTO_INCREMENT, `captcha_time` int(10) unsigned NOT NULL, `ip_address` varchar(16) NOT NULL DEFAULT '0', `word` varchar(20) NOT NULL, PRIMARY KEY (`captcha_id`), KEY `word` (`word`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `category` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `seo_name` varchar(255) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; INSERT INTO `category` (`id`, `name`, `seo_name`, `last_modified`) VALUES(1, 'Main Category', 'main_category', '2025-11-22 13:31:01'); -CREATE TABLE IF NOT EXISTS `category_default_feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `category_id` int(11) NOT NULL, `feature_id` int(11) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `category_default_rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `category_id` int(11) NOT NULL, `rating_id` int(11) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `comment` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `quotation` varchar(512) NOT NULL, `source` varchar(512) NOT NULL, `site_link` varchar(512) NOT NULL, `approved` int(4) NOT NULL DEFAULT '0', `visitor_rating` int(11) NOT NULL, `visitor_ip_address` varchar(40) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `page` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(512) NOT NULL, `seo_name` varchar(512) NOT NULL, `content` text NOT NULL, `meta_keywords` varchar(1024) NOT NULL, `meta_description` varchar(1024) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; +CREATE TABLE IF NOT EXISTS `category_default_feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `category_id` int(11) NOT NULL, `feature_id` int(11) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `category_default_rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `category_id` int(11) NOT NULL, `rating_id` int(11) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `comment` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `quotation` varchar(512) NOT NULL, `source` varchar(512) NOT NULL, `site_link` varchar(512) NOT NULL, `approved` int(4) NOT NULL DEFAULT '0', `visitor_rating` int(11) NOT NULL, `visitor_ip_address` varchar(40) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `page` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(512) NOT NULL, `seo_name` varchar(512) NOT NULL, `content` text NOT NULL, `meta_keywords` varchar(1000) NOT NULL, `meta_description` varchar(1000) NOT NULL, `last_modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=3 ; INSERT INTO `page` (`id`, `name`, `seo_name`, `content`, `meta_keywords`, `meta_description`, `last_modified`) VALUES(1, 'Privacy Policy & Terms And Conditions', 'privacy_policy_terms_and_conditions', '

Privacy Policy & Terms And Conditions

You can edit this page in Manager. Select ‘Custom Pages’ from the menu.

', '', '', '0000-00-00 00:00:00'),(2, 'About Us', 'about_us', '

About Us

\n

You can edit this page in Manager. Select ‘Custom Pages’ from the menu.

', '', '', '0000-00-00 00:00:00'); -CREATE TABLE IF NOT EXISTS `rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `review` ( `id` int(11) NOT NULL AUTO_INCREMENT, `tags` varchar(1024) NOT NULL, `category_id` int(11) NOT NULL, `featured` tinyint(4) NOT NULL DEFAULT '0', `approved` int(4) NOT NULL DEFAULT '0', `title` varchar(512) NOT NULL, `seo_title` varchar(512) NOT NULL, `description` text NOT NULL, `image_name` varchar(512) DEFAULT NULL, `image_extension` varchar(10) DEFAULT NULL, `last_modified` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `meta_keywords` varchar(1024) NOT NULL, `meta_description` varchar(1024) DEFAULT NULL, `vendor` varchar(128) DEFAULT NULL, `link` varchar(512) DEFAULT NULL, `clicks` int(11) NOT NULL DEFAULT '0', `views` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `seo_title` (`seo_title`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `titledesc` (`title`,`description`), FULLTEXT KEY `tags` (`tags`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `review_feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `feature_id` int(11) NOT NULL, `value` varchar(512) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `review_rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `rating_id` int(11) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `session` ( `session_id` varchar(40) NOT NULL DEFAULT '0', `ip_address` varchar(16) NOT NULL DEFAULT '0', `user_agent` varchar(120) DEFAULT NULL, `last_activity` int(10) unsigned NOT NULL DEFAULT '0', `user_data` text NOT NULL, PRIMARY KEY (`session_id`), KEY `last_activity_idx` (`last_activity`)) ENGINE=MyISAM DEFAULT CHARSET=latin1; -CREATE TABLE IF NOT EXISTS `setting` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `value` varchar(2048) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=59 ; +CREATE TABLE IF NOT EXISTS `rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `review` ( `id` int(11) NOT NULL AUTO_INCREMENT, `tags` varchar(1000) NOT NULL, `category_id` int(11) NOT NULL, `featured` tinyint(4) NOT NULL DEFAULT '0', `approved` int(4) NOT NULL DEFAULT '0', `title` varchar(300) NOT NULL, `seo_title` varchar(300) NOT NULL, `description` text NOT NULL, `image_name` varchar(512) DEFAULT NULL, `image_extension` varchar(10) DEFAULT NULL, `last_modified` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `meta_keywords` varchar(1000) NOT NULL, `meta_description` varchar(1000) DEFAULT NULL, `vendor` varchar(128) DEFAULT NULL, `link` varchar(300) DEFAULT NULL, `clicks` int(11) NOT NULL DEFAULT '0', `views` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `seo_title` (`seo_title`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `titledesc` (`title`,`description`), FULLTEXT KEY `tags` (`tags`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `review_feature` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `feature_id` int(11) NOT NULL, `value` varchar(512) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `review_rating` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `rating_id` int(11) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `session` ( `session_id` varchar(40) NOT NULL DEFAULT '0', `ip_address` varchar(16) NOT NULL DEFAULT '0', `user_agent` varchar(120) DEFAULT NULL, `last_activity` int(10) unsigned NOT NULL DEFAULT '0', `user_data` text NOT NULL, PRIMARY KEY (`session_id`), KEY `last_activity_idx` (`last_activity`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +CREATE TABLE IF NOT EXISTS `setting` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `value` varchar(2048) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=59 ; INSERT INTO `setting` (`id`, `name`, `value`) VALUES(1, 'site_name', 'Open Review Script'),(2, 'site_email', ''),(3, 'captcha_verification', '1'),(4, 'thumbnail_is_link', '0'),(5, 'featured_section_home', '1'),(6, 'featured_section_review', '1'),(7, 'featured_section_article', '1'),(8, 'featured_section_search', '1'),(9, 'featured_count', '3'),(10, 'recent_review_sidebar', '1'),(11, 'tag_cloud_sidebar', '1'),(12, 'categories_sidebar', '1'),(13, 'max_ads_home_sidebar', '5'),(14, 'max_ads_review_sidebar', '5'),(15, 'max_ads_article_sidebar', '5'),(16, 'max_ads_search_sidebar', '5'),(17, 'max_ads_home_lists', '5'),(18, 'max_ads_articles_lists', '5'),(19, 'max_ads_results_lists', '5'),(20, 'review_approval', '0'),(21, 'review_auto', '1'),(22, 'comment_approval', '1'),(23, 'comment_auto', '1'),(24, 'current_theme', 'blue_black'),(25, 'featured_minimum', '3'),(26, 'max_ads_custom_page_sidebar', '5'),(27, 'perpage_site_home', '5'),(28, 'perpage_site_search', '5'),(29, 'perpage_site_category', '5'),(30, 'perpage_site_articles', '5'),(31, 'perpage_manager_reviews', '5'),(32, 'perpage_manager_reviews_pending', '5'),(33, 'perpage_manager_comments', '5'),(34, 'perpage_manager_categories', '5'),(35, 'perpage_manager_features', '5'),(36, 'perpage_manager_ratings', '5'),(37, 'perpage_manager_articles', '5'),(38, 'perpage_manager_custom_pages', '5'),(39, 'perpage_manager_ads', '5'),(40, 'perpage_manager_users', '5'),(41, 'perpage_manager_comments_pending', '5'),(42, 'site_summary_title', 'Welcome To Open Review Script'),(43, 'site_summary_text', 'You can edit this text in the Manager area under \'Site Settings\''),(44, 'number_of_reviews_sidebar', '3'),(45, 'current_manager_theme', 'manager_light'),(46, 'show_visitor_rating', '1'),(47, 'site_logo', 'orslogo_67257690.png'),(48, 'site_logo_name', 'orslogogray_38824462'),(49, 'site_logo_extension', 'png'),(50, 'max_upload_width', '2048'),(51, 'max_upload_height', '1536'),(52, 'max_upload_filesize', '20000'),(53, 'review_thumb_max_width', '210'),(54, 'review_thumb_max_height', '140'),(55, 'search_thumb_max_width', '150'),(56, 'search_thumb_max_height', '100'),(57, 'debug', '0'),(58, 'search_sidebar', '1'); -CREATE TABLE IF NOT EXISTS `tags` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `tag` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; -CREATE TABLE IF NOT EXISTS `user` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `email` varchar(128) NOT NULL, `password` varchar(255) NOT NULL, `level` int(4) NOT NULL DEFAULT '1', `key` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; \ No newline at end of file +CREATE TABLE IF NOT EXISTS `tags` ( `id` int(11) NOT NULL AUTO_INCREMENT, `review_id` int(11) NOT NULL, `tag` varchar(128) NOT NULL, PRIMARY KEY (`id`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +CREATE TABLE IF NOT EXISTS `user` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `email` varchar(128) NOT NULL, `password` varchar(255) NOT NULL, `level` int(4) NOT NULL DEFAULT '1', `key` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; \ No newline at end of file diff --git a/system/core/Router.php b/system/core/Router.php index 6da6674..8c883c8 100755 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -159,7 +159,6 @@ class CI_Router { { return $this->_set_default_controller(); } - // Do we need to remove the URL suffix? $this->uri->_remove_url_suffix(); @@ -519,4 +518,4 @@ class CI_Router { // END Router Class /* End of file Router.php */ -/* Location: ./system/core/Router.php */ \ No newline at end of file +/* Location: ./system/core/Router.php */ diff --git a/system/core/URI.php b/system/core/URI.php index a3ae20c..268f166 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -183,6 +183,7 @@ class CI_URI { } $uri = $_SERVER['REQUEST_URI']; + $uri = rawurldecode($uri); if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) { $uri = substr($uri, strlen($_SERVER['SCRIPT_NAME'])); @@ -255,7 +256,7 @@ class CI_URI { // preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards // compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern if ( ! preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $str)) - { + { show_error('The URI you submitted has disallowed characters.', 400); } } @@ -263,7 +264,7 @@ class CI_URI { // Convert programatic characters to entities $bad = array('$', '(', ')', '%28', '%29'); $good = array('$', '(', ')', '(', ')'); - + return str_replace($bad, $good, $str); } @@ -298,7 +299,6 @@ class CI_URI { { // Filter segments for security $val = trim($this->_filter_uri($val)); - if ($val != '') { $this->segments[] = $val; @@ -651,4 +651,4 @@ class CI_URI { // END URI Class /* End of file URI.php */ -/* Location: ./system/core/URI.php */ \ No newline at end of file +/* Location: ./system/core/URI.php */ diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 33d7fa2..e283989 100755 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -532,4 +532,4 @@ if ( ! function_exists('ellipsize')) } /* End of file text_helper.php */ -/* Location: ./system/helpers/text_helper.php */ \ No newline at end of file +/* Location: ./system/helpers/text_helper.php */ diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index a34809e..8d34c43 100755 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1097,7 +1097,7 @@ class CI_Form_validation { */ public function alpha($str) { - return ( ! preg_match("/^([a-z])+$/i", $str)) ? FALSE : TRUE; + return ( ! preg_match("/^([a-z\p{Cyrillic}])+$/i", $str)) ? FALSE : TRUE; } // -------------------------------------------------------------------- @@ -1111,7 +1111,7 @@ class CI_Form_validation { */ public function alpha_numeric($str) { - return ( ! preg_match("/^([a-z0-9])+$/i", $str)) ? FALSE : TRUE; + return ( ! preg_match("/^([a-z\p{Cyrillic}0-9])+$/i", $str)) ? FALSE : TRUE; } // -------------------------------------------------------------------- diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 05511b5..182b3fc 100755 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1018,47 +1018,104 @@ class CI_Upload { */ protected function _file_mime_type($file) { - // Use if the Fileinfo extension, if available (only versions above 5.3 support the FILEINFO_MIME_TYPE flag) - if ( (float) substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file')) + // We'll need this to validate the MIME info string (e.g. text/plain; charset=us-ascii) + $regexp = '/^([a-z\-]+\/[a-z0-9\-\.\+]+)(;\s.+)?$/'; + + /* Fileinfo extension - most reliable method + * + * Unfortunately, prior to PHP 5.3 - it's only available as a PECL extension and the + * more convenient FILEINFO_MIME_TYPE flag doesn't exist. + */ + if (function_exists('finfo_file')) { - $finfo = new finfo(FILEINFO_MIME_TYPE); - if ($finfo !== FALSE) // This is possible, if there is no magic MIME database file found on the system + $finfo = finfo_open(FILEINFO_MIME); + if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system { - $file_type = $finfo->file($file['tmp_name']); + $mime = @finfo_file($finfo, $file['tmp_name']); + finfo_close($finfo); /* According to the comments section of the PHP manual page, * it is possible that this function returns an empty string * for some files (e.g. if they don't exist in the magic MIME database) */ - if (strlen($file_type) > 1) + if (is_string($mime) && preg_match($regexp, $mime, $matches)) { - $this->file_type = $file_type; + $this->file_type = $matches[1]; return; } } } - // Fall back to the deprecated mime_content_type(), if available - if (function_exists('mime_content_type')) - { - $this->file_type = @mime_content_type($file['tmp_name']); - return; - } - - /* This is an ugly hack, but UNIX-type systems provide a native way to detect the file type, - * which is still more secure than depending on the value of $_FILES[$field]['type']. + /* This is an ugly hack, but UNIX-type systems provide a "native" way to detect the file type, + * which is still more secure than depending on the value of $_FILES[$field]['type'], and as it + * was reported in issue #750 (https://github.com/EllisLab/CodeIgniter/issues/750) - it's better + * than mime_content_type() as well, hence the attempts to try calling the command line with + * three different functions. * * Notes: - * - a 'W' in the substr() expression bellow, would mean that we're using Windows - * - many system admins would disable the exec() function due to security concerns, hence the function_exists() check + * - the DIRECTORY_SEPARATOR comparison ensures that we're not on a Windows system + * - many system admins would disable the exec(), shell_exec(), popen() and similar functions + * due to security concerns, hence the function_exists() checks */ - if (DIRECTORY_SEPARATOR !== '\\' && function_exists('exec')) + if (DIRECTORY_SEPARATOR !== '\\') + { + $cmd = 'file --brief --mime ' . escapeshellarg($file['tmp_name']) . ' 2>&1'; + + if (function_exists('exec')) + { + /* This might look confusing, as $mime is being populated with all of the output when set in the second parameter. + * However, we only neeed the last line, which is the actual return value of exec(), and as such - it overwrites + * anything that could already be set for $mime previously. This effectively makes the second parameter a dummy + * value, which is only put to allow us to get the return status code. + */ + $mime = @exec($cmd, $mime, $return_status); + if ($return_status === 0 && is_string($mime) && preg_match($regexp, $mime, $matches)) + { + $this->file_type = $matches[1]; + return; + } + } + + if ( (bool) @ini_get('safe_mode') === FALSE && function_exists('shell_exec')) + { + $mime = @shell_exec($cmd); + if (strlen($mime) > 0) + { + $mime = explode("\n", trim($mime)); + if (preg_match($regexp, $mime[(count($mime) - 1)], $matches)) + { + $this->file_type = $matches[1]; + return; + } + } + } + + if (function_exists('popen')) + { + $proc = @popen($cmd, 'r'); + if (is_resource($proc)) + { + $mime = @fread($test, 512); + @pclose($proc); + if ($mime !== FALSE) + { + $mime = explode("\n", trim($mime)); + if (preg_match($regexp, $mime[(count($mime) - 1)], $matches)) + { + $this->file_type = $matches[1]; + return; + } + } + } + } + } + + // Fall back to the deprecated mime_content_type(), if available (still better than $_FILES[$field]['type']) + if (function_exists('mime_content_type')) { - $output = array(); - @exec('file --brief --mime-type ' . escapeshellarg($file['tmp_path']), $output, $return_code); - if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution + $this->file_type = @mime_content_type($file['tmp_name']); + if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string { - $this->file_type = rtrim($output[0]); return; } } @@ -1073,3 +1130,4 @@ class CI_Upload { /* End of file Upload.php */ /* Location: ./system/libraries/Upload.php */ + diff --git a/themes/manager/manager_light/template/ad/add.tpl b/themes/manager/manager_light/template/ad/add.tpl index 73840fb..905fd07 100755 --- a/themes/manager/manager_light/template/ad/add.tpl +++ b/themes/manager/manager_light/template/ad/add.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ad/added.tpl b/themes/manager/manager_light/template/ad/added.tpl index c3b3b98..7f31f6d 100755 --- a/themes/manager/manager_light/template/ad/added.tpl +++ b/themes/manager/manager_light/template/ad/added.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ad/delete.tpl b/themes/manager/manager_light/template/ad/delete.tpl index 383a4b8..91ef4b1 100755 --- a/themes/manager/manager_light/template/ad/delete.tpl +++ b/themes/manager/manager_light/template/ad/delete.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ad/deleted.tpl b/themes/manager/manager_light/template/ad/deleted.tpl index c5e8b0f..b766a05 100755 --- a/themes/manager/manager_light/template/ad/deleted.tpl +++ b/themes/manager/manager_light/template/ad/deleted.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ad/edit.tpl b/themes/manager/manager_light/template/ad/edit.tpl index 57450a2..ceda2d6 100755 --- a/themes/manager/manager_light/template/ad/edit.tpl +++ b/themes/manager/manager_light/template/ad/edit.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ad/edited.tpl b/themes/manager/manager_light/template/ad/edited.tpl index 5626c24..a9801a8 100755 --- a/themes/manager/manager_light/template/ad/edited.tpl +++ b/themes/manager/manager_light/template/ad/edited.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ads/ads.tpl b/themes/manager/manager_light/template/ads/ads.tpl index 32f1d88..f341b7c 100755 --- a/themes/manager/manager_light/template/ads/ads.tpl +++ b/themes/manager/manager_light/template/ads/ads.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/ads/no_ads.tpl b/themes/manager/manager_light/template/ads/no_ads.tpl index 7a81d72..732ceea 100755 --- a/themes/manager/manager_light/template/ads/no_ads.tpl +++ b/themes/manager/manager_light/template/ads/no_ads.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/add.tpl b/themes/manager/manager_light/template/article/add.tpl index df60efe..d843963 100755 --- a/themes/manager/manager_light/template/article/add.tpl +++ b/themes/manager/manager_light/template/article/add.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/added.tpl b/themes/manager/manager_light/template/article/added.tpl index 0db6879..b3ae673 100755 --- a/themes/manager/manager_light/template/article/added.tpl +++ b/themes/manager/manager_light/template/article/added.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/delete.tpl b/themes/manager/manager_light/template/article/delete.tpl index 338c162..563fa91 100755 --- a/themes/manager/manager_light/template/article/delete.tpl +++ b/themes/manager/manager_light/template/article/delete.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/deleted.tpl b/themes/manager/manager_light/template/article/deleted.tpl index 63b7f0e..4157728 100755 --- a/themes/manager/manager_light/template/article/deleted.tpl +++ b/themes/manager/manager_light/template/article/deleted.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/edit.tpl b/themes/manager/manager_light/template/article/edit.tpl index 8df57bf..f0005f6 100755 --- a/themes/manager/manager_light/template/article/edit.tpl +++ b/themes/manager/manager_light/template/article/edit.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/article/edited.tpl b/themes/manager/manager_light/template/article/edited.tpl index 4e51732..2d23c00 100755 --- a/themes/manager/manager_light/template/article/edited.tpl +++ b/themes/manager/manager_light/template/article/edited.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/articles/articles.tpl b/themes/manager/manager_light/template/articles/articles.tpl index 6ae473f..30a479e 100755 --- a/themes/manager/manager_light/template/articles/articles.tpl +++ b/themes/manager/manager_light/template/articles/articles.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/articles/no_articles.tpl b/themes/manager/manager_light/template/articles/no_articles.tpl index 07638cb..be4affe 100755 --- a/themes/manager/manager_light/template/articles/no_articles.tpl +++ b/themes/manager/manager_light/template/articles/no_articles.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/categories/categories.tpl b/themes/manager/manager_light/template/categories/categories.tpl index 4785edb..e920e9e 100755 --- a/themes/manager/manager_light/template/categories/categories.tpl +++ b/themes/manager/manager_light/template/categories/categories.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/add.tpl b/themes/manager/manager_light/template/category/add.tpl index 412b36d..7e1d335 100755 --- a/themes/manager/manager_light/template/category/add.tpl +++ b/themes/manager/manager_light/template/category/add.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/added.tpl b/themes/manager/manager_light/template/category/added.tpl index 51ce80a..78cf994 100755 --- a/themes/manager/manager_light/template/category/added.tpl +++ b/themes/manager/manager_light/template/category/added.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/delete.tpl b/themes/manager/manager_light/template/category/delete.tpl index 0aa1cea..2dc5e1f 100755 --- a/themes/manager/manager_light/template/category/delete.tpl +++ b/themes/manager/manager_light/template/category/delete.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/deleted.tpl b/themes/manager/manager_light/template/category/deleted.tpl index c49180c..1c074d6 100755 --- a/themes/manager/manager_light/template/category/deleted.tpl +++ b/themes/manager/manager_light/template/category/deleted.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/edit.tpl b/themes/manager/manager_light/template/category/edit.tpl index 792d7f2..f4eaf0d 100755 --- a/themes/manager/manager_light/template/category/edit.tpl +++ b/themes/manager/manager_light/template/category/edit.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/edited.tpl b/themes/manager/manager_light/template/category/edited.tpl index bed17b8..056573b 100755 --- a/themes/manager/manager_light/template/category/edited.tpl +++ b/themes/manager/manager_light/template/category/edited.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/category/onlyone.tpl b/themes/manager/manager_light/template/category/onlyone.tpl index 7c235f7..19f874a 100755 --- a/themes/manager/manager_light/template/category/onlyone.tpl +++ b/themes/manager/manager_light/template/category/onlyone.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/add.tpl b/themes/manager/manager_light/template/comment/add.tpl index a02f8a3..2299f51 100755 --- a/themes/manager/manager_light/template/comment/add.tpl +++ b/themes/manager/manager_light/template/comment/add.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/added.tpl b/themes/manager/manager_light/template/comment/added.tpl index 9465784..0db892e 100755 --- a/themes/manager/manager_light/template/comment/added.tpl +++ b/themes/manager/manager_light/template/comment/added.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/delete.tpl b/themes/manager/manager_light/template/comment/delete.tpl index 21db912..b095bae 100755 --- a/themes/manager/manager_light/template/comment/delete.tpl +++ b/themes/manager/manager_light/template/comment/delete.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/deleted.tpl b/themes/manager/manager_light/template/comment/deleted.tpl index c669001..f14151c 100755 --- a/themes/manager/manager_light/template/comment/deleted.tpl +++ b/themes/manager/manager_light/template/comment/deleted.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/edit.tpl b/themes/manager/manager_light/template/comment/edit.tpl index 2668955..b86d983 100755 --- a/themes/manager/manager_light/template/comment/edit.tpl +++ b/themes/manager/manager_light/template/comment/edit.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comment/edited.tpl b/themes/manager/manager_light/template/comment/edited.tpl index 1a4f4cb..38fe7f8 100755 --- a/themes/manager/manager_light/template/comment/edited.tpl +++ b/themes/manager/manager_light/template/comment/edited.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comments/comments.tpl b/themes/manager/manager_light/template/comments/comments.tpl index faa2b73..43e7c07 100755 --- a/themes/manager/manager_light/template/comments/comments.tpl +++ b/themes/manager/manager_light/template/comments/comments.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comments/comments_pending.tpl b/themes/manager/manager_light/template/comments/comments_pending.tpl index 1d31362..f4d2efb 100755 --- a/themes/manager/manager_light/template/comments/comments_pending.tpl +++ b/themes/manager/manager_light/template/comments/comments_pending.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comments/no_comments.tpl b/themes/manager/manager_light/template/comments/no_comments.tpl index a1cb092..1ef2346 100755 --- a/themes/manager/manager_light/template/comments/no_comments.tpl +++ b/themes/manager/manager_light/template/comments/no_comments.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/comments/no_comments_pending.tpl b/themes/manager/manager_light/template/comments/no_comments_pending.tpl index bd82d38..6d48da0 100755 --- a/themes/manager/manager_light/template/comments/no_comments_pending.tpl +++ b/themes/manager/manager_light/template/comments/no_comments_pending.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/add.tpl b/themes/manager/manager_light/template/feature/add.tpl index 9fb09cf..e386694 100755 --- a/themes/manager/manager_light/template/feature/add.tpl +++ b/themes/manager/manager_light/template/feature/add.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/added.tpl b/themes/manager/manager_light/template/feature/added.tpl index 6a8f248..e320d7b 100755 --- a/themes/manager/manager_light/template/feature/added.tpl +++ b/themes/manager/manager_light/template/feature/added.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/delete.tpl b/themes/manager/manager_light/template/feature/delete.tpl index f094bce..7965aae 100755 --- a/themes/manager/manager_light/template/feature/delete.tpl +++ b/themes/manager/manager_light/template/feature/delete.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/deleted.tpl b/themes/manager/manager_light/template/feature/deleted.tpl index 3fa516b..7329da9 100755 --- a/themes/manager/manager_light/template/feature/deleted.tpl +++ b/themes/manager/manager_light/template/feature/deleted.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/edit.tpl b/themes/manager/manager_light/template/feature/edit.tpl index d7f8bc5..a772082 100755 --- a/themes/manager/manager_light/template/feature/edit.tpl +++ b/themes/manager/manager_light/template/feature/edit.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/feature/edited.tpl b/themes/manager/manager_light/template/feature/edited.tpl index d19bd89..9911238 100755 --- a/themes/manager/manager_light/template/feature/edited.tpl +++ b/themes/manager/manager_light/template/feature/edited.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/features/features.tpl b/themes/manager/manager_light/template/features/features.tpl index f9f300a..ec3478a 100755 --- a/themes/manager/manager_light/template/features/features.tpl +++ b/themes/manager/manager_light/template/features/features.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/features/no_features.tpl b/themes/manager/manager_light/template/features/no_features.tpl index d43a6f2..c9eb0d0 100755 --- a/themes/manager/manager_light/template/features/no_features.tpl +++ b/themes/manager/manager_light/template/features/no_features.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/home/home.tpl b/themes/manager/manager_light/template/home/home.tpl index 9e520eb..b42ec63 100755 --- a/themes/manager/manager_light/template/home/home.tpl +++ b/themes/manager/manager_light/template/home/home.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/login/forgot_login.tpl b/themes/manager/manager_light/template/login/forgot_login.tpl index 68bebfb..030bac6 100755 --- a/themes/manager/manager_light/template/login/forgot_login.tpl +++ b/themes/manager/manager_light/template/login/forgot_login.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/login/login.tpl b/themes/manager/manager_light/template/login/login.tpl index ecf3ac7..db4d633 100755 --- a/themes/manager/manager_light/template/login/login.tpl +++ b/themes/manager/manager_light/template/login/login.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org -* @copyright Copyright (c) 2011, OpenReviewScript.org +* @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/login/login_sent.tpl b/themes/manager/manager_light/template/login/login_sent.tpl index 4c0e9ac..aeacdb4 100755 --- a/themes/manager/manager_light/template/login/login_sent.tpl +++ b/themes/manager/manager_light/template/login/login_sent.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/login/password_reset.tpl b/themes/manager/manager_light/template/login/password_reset.tpl index 3a1a9aa..cccc4d2 100755 --- a/themes/manager/manager_light/template/login/password_reset.tpl +++ b/themes/manager/manager_light/template/login/password_reset.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org - * @copyright Copyright (c) 2011, OpenReviewScript.org + * @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/maintenance/maintenance.tpl b/themes/manager/manager_light/template/maintenance/maintenance.tpl index 4eb69e3..1079e25 100755 --- a/themes/manager/manager_light/template/maintenance/maintenance.tpl +++ b/themes/manager/manager_light/template/maintenance/maintenance.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org -* @copyright Copyright (c) 2011, OpenReviewScript.org +* @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ diff --git a/themes/manager/manager_light/template/manager_template.tpl b/themes/manager/manager_light/template/manager_template.tpl index 1f3166c..586ad51 100755 --- a/themes/manager/manager_light/template/manager_template.tpl +++ b/themes/manager/manager_light/template/manager_template.tpl @@ -7,7 +7,7 @@ * @package OpenReviewScript * @subpackage manager * @author OpenReviewScript.org -* @copyright Copyright (c) 2011, OpenReviewScript.org +* @copyright Copyright (c) 2011-2012, OpenReviewScript.org * @license This file is part of OpenReviewScript - free software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * @link http://OpenReviewScript.org */ @@ -28,13 +28,13 @@ * You should have received a copy of the GNU General Public License * along with OpenReviewScript. If not, see . */ - $version="1.0"; + $version="1.0.0"; }} {{= lang('manager_page_title') }} - {{= $this->config->item('site_name') }} - + {{ endif }}

{{= lang('review_comment_heading') }}

{{ if ($show_visitor_rating > 0): }}

{{= lang('review_comment_rating') }}  

{{ endif }} {{ if ($comments_count > 0): }} {{ foreach ($comments as $index=>$comment): }}
{{ if ($show_visitor_rating > 0): }}
{{ if ($comment->rating_image != ''): }} {{ endif }}
{{ endif }} “{{= $comment->quotation }}” - {{= $comment->source }}   {{= timespan(strtotime($comment->last_modified),now()).' '.lang('review_ago') }}
{{ if ($index+1 != count($comments)): }}
{{ endif }} {{ endforeach }} {{ else: }}

{{= lang('review_no_comments') }}

{{ endif }} \ No newline at end of file +{{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * OpenReviewScript 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with OpenReviewScript. If not, see . */ }} {{ if (isset($message)): }}{{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * OpenReviewScript 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with OpenReviewScript. If not, see . */ }}
{{= $message }}
{{ endif }}

{{= lang('review_comment_heading') }}

{{ if ($show_visitor_rating > 0): }}

{{= lang('review_comment_rating') }}  

{{ endif }} {{ if ($comments_count > 0): }} {{ foreach ($comments as $index=>$comment): }}
{{ if ($show_visitor_rating > 0): }}
{{ if ($comment->rating_image != ''): }} {{ endif }}
{{ endif }} “{{= $comment->quotation }}” - {{= $comment->source }}   {{= timespan(strtotime($comment->last_modified),now()).' '.lang('review_ago') }}
{{ if ($index+1 != count($comments)): }}
{{ endif }} {{ endforeach }} {{ else: }}

{{= lang('review_no_comments') }}

{{ endif }} \ No newline at end of file diff --git a/themes/site/blue_black/template/review/review_content.tpl b/themes/site/blue_black/template/review/review_content.tpl index dda27a7..1776c6a 100755 --- a/themes/site/blue_black/template/review/review_content.tpl +++ b/themes/site/blue_black/template/review/review_content.tpl @@ -1,7 +1,7 @@ {{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license - * Copyright (c) 2011, OpenReviewScript.org + * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify diff --git a/themes/site/blue_black/template/review/review_pending.tpl b/themes/site/blue_black/template/review/review_pending.tpl index 3c0251f..a0ce7d5 100755 --- a/themes/site/blue_black/template/review/review_pending.tpl +++ b/themes/site/blue_black/template/review/review_pending.tpl @@ -1,7 +1,7 @@ {{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license - * Copyright (c) 2011, OpenReviewScript.org + * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify diff --git a/themes/site/blue_black/template/review/review_sidebar.tpl b/themes/site/blue_black/template/review/review_sidebar.tpl index 96a6d7c..f527a11 100755 --- a/themes/site/blue_black/template/review/review_sidebar.tpl +++ b/themes/site/blue_black/template/review/review_sidebar.tpl @@ -1,7 +1,7 @@ {{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license - * Copyright (c) 2011, OpenReviewScript.org + * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify diff --git a/themes/site/blue_black/template/review/review_visitor_rating.tpl b/themes/site/blue_black/template/review/review_visitor_rating.tpl index 0be2148..87f2134 100755 --- a/themes/site/blue_black/template/review/review_visitor_rating.tpl +++ b/themes/site/blue_black/template/review/review_visitor_rating.tpl @@ -1,7 +1,7 @@ {{ /** * This file is part of OpenReviewScript - free review software licensed under the GNU General Public License version 2 - http://OpenReviewScript.org/license - * Copyright (c) 2011, OpenReviewScript.org + * Copyright (c) 2011-2012, OpenReviewScript.org * http://OpenReviewScript.org * * OpenReviewScript is free software: you can redistribute it and/or modify diff --git a/themes/site/blue_black/template/template.tpl b/themes/site/blue_black/template/template.tpl index fe20d41..b179523 100755 --- a/themes/site/blue_black/template/template.tpl +++ b/themes/site/blue_black/template/template.tpl @@ -1,6 +1,6 @@