diff options
| -rw-r--r-- | install/INSTALL.txt | 4 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | mod/channel.php | 5 | ||||
| -rw-r--r-- | mod/id.php | 54 | ||||
| -rwxr-xr-x | mod/setup.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/pdl/mod_id.pdl | 4 |
7 files changed, 30 insertions, 45 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index d042f34ec..36d112086 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -154,8 +154,8 @@ website. If not, edit htconfig.php and change system settings. Rename to .htconfig.php - Database is populated. - If not, import the contents of "database.sql" with phpmyadmin - or mysql command line + If not, import the contents of "install/schema_xxxxx.sql" with phpmyadmin + or mysql command line (replace 'xxxxx' with your DB type). 7. At this point visit your website again, and register your personal account. Registration errors should all be recoverable automatically. diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 3567085ce..b3f992500 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( KEY `abook_dob` (`abook_dob`), KEY `abook_connected` (`abook_connected`), KEY `abook_rating` (`abook_rating`), - KEY `abook_channel_closeness` (`book_channel`,`abook_closeness`) + KEY `abook_channel_closeness` (`abook_channel`,`abook_closeness`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/mod/channel.php b/mod/channel.php index 109c9a596..3216da7e1 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -36,6 +36,11 @@ function channel_init(&$a) { $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ; + +// Not yet ready for prime time +// $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->get_baseurl() . '/id/' . $which .'?f=" />' . "\r\n" ; +// $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $a->get_baseurl() . '/id/' . $which .'" />' . "\r\n" ; + // Run profile_load() here to make sure the theme is set before // we start loading content diff --git a/mod/id.php b/mod/id.php index 378022717..6678004c5 100644 --- a/mod/id.php +++ b/mod/id.php @@ -2,45 +2,21 @@ function id_init(&$a) { -logger('id: ' . print_r($_REQUEST,true)); - -/** - * This example shows several things: - * - How a setup interface should look like. - * - How to use a mysql table for authentication - * - How to store associations in mysql table, instead of php sessions. - * - How to store realm authorizations. - * - How to send AX/SREG parameters. - * For the example to work, you need to create the necessary tables: -CREATE TABLE Users ( - id INT NOT NULL auto_increment PRIMARY KEY, - login VARCHAR(32) NOT NULL, - password CHAR(40) NOT NULL, - firstName VARCHAR(32) NOT NULL, - lastName VARCHAR(32) NOT NULL -); - -CREATE TABLE AllowedSites ( - user INT NOT NULL, - realm TEXT NOT NULL, - attributes TEXT NOT NULL, - INDEX(user) -); - -CREATE TABLE Associations ( - id INT NOT NULL PRIMARY KEY, - data TEXT NOT NULL -); - * - * This is only an example. Don't use it in your code as-is. - * It has several security flaws, which you shouldn't copy (like storing plaintext login and password in forms). - * - * This setup could be very easily flooded with many associations, - * since non-private ones aren't automatically deleted. - * You could prevent this by storing a date of association and removing old ones, - * or by setting $this->dh = false; - * However, the latter one would disable stateful mode, unless connecting via HTTPS. - */ + logger('id: ' . print_r($_REQUEST,true)); + + + if(argc() > 1) + $which = argv(1); + else { + $a->error = 404; + return; + } + + $profile = ''; + $channel = $a->get_channel(); + profile_load($a,$which,$profile); + + require 'library/openid/provider/provider.php'; diff --git a/mod/setup.php b/mod/setup.php index adcbbef16..b885388be 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -233,10 +233,10 @@ function setup_content(&$a) { check_htconfig($checks); - check_smarty3($checks); - check_store($checks); + check_smarty3($checks); + check_keys($checks); if(x($_POST,'phpath')) diff --git a/version.inc b/version.inc index f31eec023..39ff03a5d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-14.971 +2015-03-15.972 diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl new file mode 100644 index 000000000..71ef7f898 --- /dev/null +++ b/view/pdl/mod_id.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] + |