This repository has been archived by the owner on Sep 28, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update common core code from recent changes to Commit-Digest.
* Remove survey functionality and map images generation (now done dynamically in frontend browser).
- Loading branch information
Showing
8 changed files
with
64 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| /*-------------------------------------------------------+ | ||
| | Enzyme | ||
| | Copyright 2010-2011 Danny Allen <[email protected]> | ||
| | Copyright 2010-2013 Danny Allen <[email protected]> | ||
| | http://www.enzyme-project.org/ | ||
| +--------------------------------------------------------+ | ||
| | This program is released as free software under the | ||
|
|
@@ -19,9 +19,8 @@ class Developer { | |
| public $data = null; | ||
| public $privacy = null; | ||
| public $access = null; | ||
| public $surveyDone = false; | ||
|
|
||
| public static $fieldSections = array('core' => array('account', 'name', 'email', 'nickname', 'dob', 'gender', 'motivation', 'employer', 'colour'), | ||
| public static $fieldSections = array('core' => array('account', 'name', 'email', 'nickname', 'dob', 'gender', 'nationality', 'motivation', 'employer', 'colour'), | ||
| 'geographic' => array('continent', 'country', 'location', 'latitude', 'longitude'), | ||
| 'social' => array('homepage', 'blog', 'lastfm', 'microblog_type', 'microblog_user'), | ||
| 'system' => array('access_ip', 'access_code', 'access_timeout')); | ||
|
|
@@ -54,6 +53,10 @@ class Developer { | |
| 'display' => 'all', | ||
| 'editable' => true, | ||
| 'privacy' => 'gender'), | ||
| 'nationality' => array('type' => 'string', | ||
| 'display' => 'all', | ||
| 'editable' => true, | ||
| 'privacy' => 'nationality'), | ||
| 'motivation' => array('type' => 'enum', | ||
| 'display' => 'all', | ||
| 'editable' => true, | ||
|
|
@@ -171,9 +174,6 @@ public function load($value = null, $field = 'account', $createBuffer = false) { | |
|
|
||
| // load developer data | ||
| if ($this->data = Db::load('developers', array('account' => $privacy['account']), 1)) { | ||
| // check if survey has been completed | ||
| $this->surveyDone = Db::exists('developer_survey', array('account' => $privacy['account'])); | ||
|
|
||
| // set privacy settings to each data value | ||
| foreach (self::$fields as $id => $spec) { | ||
| if (!isset($spec['privacy'])) { | ||
|
|
@@ -335,9 +335,10 @@ public static function getFieldStrings() { | |
| 'nickname' => _('Nickname'), | ||
| 'dob' => _('Date of Birth'), | ||
| 'gender' => _('Gender'), | ||
| 'nationality' => _('Nationality'), | ||
| 'motivation' => _('Motivation'), | ||
| 'employer' => _('Employer'), | ||
| 'colour' => _('Colour'), | ||
| 'colour' => _('Favourite colour'), | ||
|
|
||
| 'continent' => _('Continent'), | ||
| 'country' => _('Country'), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| /*-------------------------------------------------------+ | ||
| | Enzyme | ||
| | Copyright 2010-2012 Danny Allen <[email protected]> | ||
| | Copyright 2010-2013 Danny Allen <[email protected]> | ||
| | http://www.enzyme-project.org/ | ||
| +--------------------------------------------------------+ | ||
| | This program is released as free software under the | ||
|
|
@@ -220,16 +220,7 @@ public static function getAvailableSettings() { | |
| 'valid' => null, | ||
| 'default' => 0.1, | ||
| 'example' => null); | ||
| $tmp['SURVEY_ACTIVE'] = array('title' => _('Survey Active'), | ||
| 'valid' => array('0' => _('No'), | ||
| '1' => _('Yes')), | ||
| 'default' => '0', | ||
| 'example' => null); | ||
|
|
||
| $tmp['GENERATE_MAPS'] = array('title' => _('Map Generation Service URL'), | ||
| 'valid' => null, | ||
| 'default' => 'http://grafin.enzyme-project.org/index.php', | ||
| 'example' => 'http://grafin.enzyme-project.org/index.php'); | ||
| $tmp['RECENT_COMMITS'] = array('title' => _('Recent Commits RSS URL'), | ||
| 'valid' => null, | ||
| 'default' => null, | ||
|
|
@@ -309,12 +300,10 @@ public static function getGroupedSettings() { | |
| 'SMTP' => $tmp['SMTP'], | ||
| 'SHOW_INSERT' => $tmp['SHOW_INSERT'], | ||
| 'AUTO_REVIEW_COMMITS' => $tmp['AUTO_REVIEW_COMMITS'], | ||
| 'DATA_TERMS_VERSION' => $tmp['DATA_TERMS_VERSION'], | ||
| 'SURVEY_ACTIVE' => $tmp['SURVEY_ACTIVE'])); | ||
| 'DATA_TERMS_VERSION' => $tmp['DATA_TERMS_VERSION'])); | ||
|
|
||
| $settings[] = array('title' => _('Data Locations'), | ||
| 'settings' => array('GENERATE_MAPS' => $tmp['GENERATE_MAPS'], | ||
| 'RECENT_COMMITS' => $tmp['RECENT_COMMITS'], | ||
| 'settings' => array('RECENT_COMMITS' => $tmp['RECENT_COMMITS'], | ||
| 'WEBSVN' => $tmp['WEBSVN'], | ||
| 'WEBBUG' => $tmp['WEBBUG'], | ||
| 'WEBBUG_XML' => $tmp['WEBBUG_XML'], | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| /*-------------------------------------------------------+ | ||
| | PHPzy (Web Application Framework) | ||
| | Copyright 2010-2011 Danny Allen <[email protected]> | ||
| | Copyright 2010-2013 Danny Allen <[email protected]> | ||
| | http://www.dannya.com/ | ||
| +--------------------------------------------------------+ | ||
| | This program is released as free software under the | ||
|
|
@@ -21,7 +21,7 @@ public static function redirect($page) { | |
| header('Location: ' . BASE_URL . $page); | ||
|
|
||
| } else{ | ||
| echo '<script type="text/javascript">top.location="', BASE_URL, $page, '";</script>'; | ||
| echo '<script>top.location.href="', BASE_URL, $page, '";</script>'; | ||
| } | ||
|
|
||
| exit; | ||
|
|
@@ -57,7 +57,7 @@ public static function drawHtmlPageStart($title = null, array $css = array(), | |
|
|
||
| if ($js) { | ||
| foreach ($js as $file) { | ||
| $script .= '<script type="text/javascript" src="' . BASE_URL . $file . '"></script>' . "\n"; | ||
| $script .= '<script src="' . BASE_URL . $file . '"></script>' . "\n"; | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| /*-------------------------------------------------------+ | ||
| | Enzyme | ||
| | Copyright 2010-2011 Danny Allen <[email protected]> | ||
| | Copyright 2010-2014 Danny Allen <[email protected]> | ||
| | http://www.enzyme-project.org/ | ||
| +--------------------------------------------------------+ | ||
| | This program is released as free software under the | ||
|
|
@@ -16,13 +16,13 @@ | |
|
|
||
|
|
||
| final class Config { | ||
| public static $framework = array('version' => '20120710'); | ||
| public static $framework = array('version' => '20140104'); | ||
|
|
||
|
|
||
| // define app constants | ||
| public static $app = array('id' => 'enzyme', | ||
| 'name' => 'Enzyme', | ||
| 'version' => '1.23'); | ||
| 'version' => '1.30'); | ||
|
|
||
|
|
||
| // define meta information | ||
|
|
@@ -54,7 +54,6 @@ final class Config { | |
| 'data_terms', | ||
| 'developers', | ||
| 'developer_privacy', | ||
| 'developer_survey', | ||
| 'digests', | ||
| 'digest_intro_people', | ||
| 'digest_intro_sections', | ||
|
|
@@ -77,7 +76,7 @@ final class Config { | |
|
|
||
|
|
||
| // define settings information | ||
| private static $settings = null; | ||
| private static $settings = null; | ||
|
|
||
|
|
||
| public static function getSetting() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters