Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed short open tags #91

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 5 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
tmp/*
config/database.php
app/tmp/*
app/tmp/
app/config/database.php
!empty
.buildpath
.project
.settings/*
.settings/

app/webroot/img/thumbs/*
app/webroot/img/uploads/*
app/webroot/img/thumbs/
app/webroot/img/uploads/
nbproject
4 changes: 3 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The following extra message details are needed:
-Hash

Take the following example in PHP:
<?
<?php
/*
* Remote authentication for PHP
*
Expand Down Expand Up @@ -90,4 +90,6 @@ Contributors - Thank you!
* cybervirax
* ultramundane
* datawalke
* JoeRobles

Don't see yourself Just edit the Readme!
Binary file removed app/.DS_Store
Binary file not shown.
Binary file removed app/config/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion app/config/core.php
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
*/
Cache::config('default', array('engine' => 'File'));

Configure::write('Coordino.version', '1.0');
Configure::write('Coordino.version', '1.3');

Configure::write('recaptcha.publickey', '6LcgswkAAAAAAC15Pg3j8YDKFCi-mHYO_qHpoPH6');
Configure::write('recaptcha.privatekey', '6LcgswkAAAAAAApN8RkAjBhu2RgDGXGwh5onuUpW');
Expand Down
18 changes: 9 additions & 9 deletions app/config/database_sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@
*
*/
class DATABASE_CONFIG {
var $default = array(
'driver' => 'mysql',
'host' => 'localhost',
'login' => 'username',
'password' => '',
'database' => '',
'encoding' => 'utf8',
);

var $default = array(
'driver' => 'mysql',
'host' => 'localhost',
'login' => 'username',
'password' => '',
'database' => '',
'encoding' => 'utf8',
);

}
?>
Binary file removed app/controllers/.DS_Store
Binary file not shown.
3 changes: 1 addition & 2 deletions app/controllers/components/htmlfilter.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?
class HtmlfilterComponent extends Object {
<?php class HtmlfilterComponent extends Object {
public $htmlFilter;
/**
* Import the HTML Filter vendor files and instantiate the object.
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/components/markdown.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?
<?php
class MarkdownComponent extends Object {

/**
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/components/markdownify.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?
<?php
class MarkdownifyComponent extends Object {

/**
Expand Down
12 changes: 3 additions & 9 deletions app/controllers/installer_controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ class InstallerController extends AppController {

var $name = 'Installer';
var $helpers = array('Form', 'Time', 'Html', 'Javascript', 'Session');
var $components = array('Session');

public function beforeFilter() {
$this->layout = 'install';
//$this->Auth->allow('*');
}

public function start() {
Expand Down Expand Up @@ -48,7 +46,6 @@ public function database() {

$filePath = APP.'/config/database.php';

if(filesize($filePath) <= 0) {

$file = fopen($filePath, "w");
$data = "
Expand All @@ -70,11 +67,7 @@ class DATABASE_CONFIG {
fclose($file);
$this->Session->setFlash('Connection to database established.', 'success');
$this->redirect('/install/run-sql');
} else {
$this->Session->setFlash($filePath . ' already exists. Please clear the contents of this file and ensure
it is writable.', 'error');
$this->redirect('/install/database-config');
}

}
}

Expand Down Expand Up @@ -113,10 +106,11 @@ public function run_sql() {

public function admin_account() {
if(!empty($this->data['User'])) {
App::import('Component', 'Auth');
App::import('Component', 'Session');
App::import('Component', 'Auth');
$this->Session = new SessionComponent();
$this->Auth = new AuthComponent();
$this->Auth->Session = $this->Session;
$this->Auth->allow('*');
$user = $this->__userSave($this->Auth->hashPasswords($this->data));
file_put_contents(TMP.'installed.txt', date('Y-m-d, H:i:s'));
Expand Down
8 changes: 4 additions & 4 deletions app/controllers/posts_controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@ public function ask() {
$this->set('title_for_layout', __('Ask a question',true));

if(!empty($this->data)) {

$this->__validatePost($this->data, '/questions/ask', true);

/**
* reCAPTCHA Check
*/
$this->data['reCAPTCHA'] = $this->params['form'];
$this->__validatePost($this->data, '/questions/ask', true);
$this->data['reCAPTCHA'] = $this->params['form'];

/**
* If the user is not logged in create an account for them.
Expand Down Expand Up @@ -385,8 +386,7 @@ public function view($public_key) {
array('hasMany' => array('Answer'))
);
$question = $this->Post->findByPublicKey($public_key);



/*
* Look up the flag limit.
*/
Expand Down
10 changes: 4 additions & 6 deletions app/controllers/users_controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,7 @@ public function register() {
* If the user has an unregistered account update the password and set them to registered.
*/
if(!empty($this->data)) {

if($this->Recaptcha->valid($this->params['form']) || $this->Session->read('Auth.User.id')) {

/**
* If the user is logged in via Session or Cookie
*/
Expand Down Expand Up @@ -243,12 +241,12 @@ public function register() {
$this->redirect('/');
}
}
} else {
$this->Session->setFlash('Invalid reCAPTCHA entered.', 'error');
}

} else {
$this->Session->setFlash('Invalid reCAPTCHA entered.', 'error');
}

}

}

public function admin() {
Expand Down
Binary file removed app/models/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion app/models/setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function repCheck($user_id, $setting_name) {
)
), false
);
$this->Setting->recursive = -1;
$this->recursive = -1;
$this->User->recursive = -1;
$user_rep = $this->User->find(
'first', array(
Expand Down
Binary file removed app/tmp/.DS_Store
Binary file not shown.
Binary file removed app/vendors/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion app/vendors/markdown/markdown.php
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ function hashHTMLBlocks($text) {
[ ]*
(?=\n{2,}|\Z) # followed by a blank line or end of document

| # PHP and ASP-style processor instructions (<? and <%)
| # PHP and ASP-style processor instructions (<?php and <%)

[ ]{0,'.$less_than_tab.'}
(?s:
Expand Down
2 changes: 1 addition & 1 deletion app/vendors/markdownify/parsehtml/parsehtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ function nextNode() {

if ($this->html[0] == '<') {
$token = substr($this->html, 0, 9);
if (substr($token, 0, 2) == '<?') {
if (substr($token, 0, 2) == '<?php' || substr($token, 0, 2) == '<?') {
# xml prolog or other pi's
/** TODO **/
#trigger_error('this might need some work', E_USER_NOTICE);
Expand Down
Loading