admin UI for theme swapping

voitto · Feb 17, 2009 · a79c3db · a79c3db
1 parent 6feb122
commit a79c3db
Show file tree

Hide file tree

Showing 532 changed files with 230 additions and 22 deletions.
diff --git a/README b/README
@@ -18,7 +18,9 @@ Version 0.1, 1-Sep-2008
 
 Version 0.2, 22-Oct-2008
  sms, app store
-
+
+Version 0.3, 15-Feb-2009
+ admin, themes
 
 
 REQUIREMENTS
@@ -123,14 +125,16 @@ Prety URL Requirements:
       todo: add a test for this problem
 
 To enable pretty URLs:
-  
+
 1) uncomment lines 65 & 66 in /db/boot.php
 
 2) type your own base URL in /db/boot.php
 
-3) set "RewriteEngine on" in .htaccess
+3) copy the file /resource/prettyurls/.htaccess to the top level folder
+
+4) set "RewriteEngine on" in .htaccess
 
-4) type your own base URL in .htaccess
+5) type your own base URL in .htaccess
 
 
 

diff --git a/app/auction/controllers/auction_bullets.php b/app/auction/controllers/auction_bullets.php
diff --git a/app/auction/controllers/auction_photos.php b/app/auction/controllers/auction_photos.php
diff --git a/app/auction/controllers/auctions.php b/app/auction/controllers/auctions.php
diff --git a/app/auction/models/Auction.php b/app/auction/models/Auction.php
diff --git a/app/auction/models/AuctionBullet.php b/app/auction/models/AuctionBullet.php
diff --git a/app/auction/models/AuctionPhoto.php b/app/auction/models/AuctionPhoto.php
diff --git a/app/auction/views/auction_bullets/_entry.html b/app/auction/views/auction_bullets/_entry.html
diff --git a/app/auction/views/auction_bullets/_new.html b/app/auction/views/auction_bullets/_new.html
diff --git a/app/auction/views/auction_photos/_entry.html b/app/auction/views/auction_photos/_entry.html
diff --git a/app/auction/views/auction_photos/_new.html b/app/auction/views/auction_photos/_new.html
diff --git a/app/auction/views/auctions/_edit.html b/app/auction/views/auctions/_edit.html
diff --git a/app/auction/views/auctions/_entry.html b/app/auction/views/auctions/_entry.html
diff --git a/app/auction/views/auctions/_index.html b/app/auction/views/auctions/_index.html
diff --git a/app/auction/views/auctions/_list.html b/app/auction/views/auctions/_list.html
diff --git a/app/auction/views/auctions/_nav.html b/app/auction/views/auctions/_nav.html
diff --git a/app/auction/views/auctions/_new.html b/app/auction/views/auctions/_new.html
diff --git a/app/auction/views/auctions/_show.html b/app/auction/views/auctions/_show.html
diff --git a/app/auction/views/index.html b/app/auction/views/index.html
diff --git a/app/config/config.yml b/app/config/config.yml
diff --git a/app/identica/controllers/dents.php b/app/identica/controllers/dents.php
diff --git a/app/identica/identica.php b/app/identica/identica.php
diff --git a/app/identica/models/Dent.php b/app/identica/models/Dent.php
diff --git a/app/identica/plugins/identica.php b/app/identica/plugins/identica.php
diff --git a/app/identica/views/dents/_edit.html b/app/identica/views/dents/_edit.html
diff --git a/app/notifixious/models/notifix.php b/app/notifixious/models/notifix.php
diff --git a/app/omb/controllers/admin.php b/app/omb/controllers/admin.php
@@ -1,6 +1,61 @@
 <?php
 
+function _theme( &$vars ) {
+
+  extract( $vars );
+
+  $paths = array( $GLOBALS['PATH']['app'], 'wp-content/' );
+
+  $previews = array();
+  $themepaths = array();
+
+  $installedtheme = '';
+
+  foreach($paths as $loadpath) {
+
+  if (!empty($loadpath) && $handle = opendir($loadpath)) {
+
+    while (false !== ($file = readdir($handle))) {
+      if ($file != '.' && $file != '..') {
+      $subload = $loadpath.$file;
+      if (is_dir($subload) && ($file != '.svn') && !empty($subload) && $subhandle = opendir($subload)) {
+        while (false !== ($subfile = readdir($subhandle))) {
+          if ($subfile != '.' && $subfile != '..' && $subfile != ".svn") {
+           $subsub = $subload."/".$subfile;
+          if (is_dir($subsub) && ($subfile != '.svn') && !empty($subsub) && $subsubhandle = opendir($subsub)) {
+          while (false !== ( $subsubf = readdir($subsubhandle))) {
+          if ($subsubf == 'screenshot.png') {
+            $previews[$subfile] = $subsub.'/screenshot.png';
+            $Setting =& $db->model('Setting');
+            $tp = $Setting->find_by('name','config.env.themepath'.$subfile);
+            if ($tp)
+              $db->delete_record($tp);
+            $tp = $Setting->base();
+            $tp->set_value('name','config.env.themepath'.$subfile);
+            $tp->set_value('value',$subload);
+            $tp->save_changes();
+          }
+          }}
+        }}
+        closedir($subhandle);
+      }
+    }}
+    closedir($handle);
+  }
+
+  }
+
 
+
+  return vars(
+    array( 
+      &$previews,
+      &$installedtheme
+    ),
+    get_defined_vars()
+  );
+
+}
 
 function index( &$vars ) {
   extract( $vars );

diff --git a/app/omb/controllers/categories.php b/app/omb/controllers/categories.php
diff --git a/app/omb/controllers/groups.php b/app/omb/controllers/groups.php
diff --git a/app/omb/controllers/identities.php b/app/omb/controllers/identities.php
diff --git a/app/omb/controllers/index.php b/app/omb/controllers/index.php
diff --git a/app/omb/controllers/settings.php b/app/omb/controllers/settings.php
@@ -16,16 +16,29 @@ function put( &$vars ) {
 
 function post( &$vars ) {
   extract( $vars );
+
   if (!(get_profile_id()))
     trigger_error( 'Sorry, the setting could not be saved', E_USER_ERROR );
+
   $request->set_param( array( 'setting', 'profile_id' ), get_profile_id() );
 
+  $settingname = $request->params['setting']['name'];
+
+  $set = split('\.',$settingname);
+
+  if (is_array($set) && $set[0] == 'config') {
+    if (!member_of('administrators'))
+      trigger_error( 'Sorry, you must be an administrator to do that', E_USER_ERROR );
+    $s = $Setting->find_by( 'name', $settingname );
+    if ($s)
+      $db->delete_record($s);
+  }
 
-  if ($request->params['setting']['name'] == 'app') {
+  if ($settingname == 'app') {
 
     $do_install = false;
 
-    $app = trim($request->params['setting']['value']);
+    $app = $settingname;
 
     $sources = environment('remote_sources');
     $remote_list = array();

diff --git a/app/omb/controllers/subscriptions.php b/app/omb/controllers/subscriptions.php
diff --git a/app/omb/models/Aggregate.php b/app/omb/models/Aggregate.php
diff --git a/app/omb/models/Category.php b/app/omb/models/Category.php
diff --git a/app/omb/models/Entry.php b/app/omb/models/Entry.php
diff --git a/app/omb/models/Event.php b/app/omb/models/Event.php
diff --git a/app/omb/models/Group.php b/app/omb/models/Group.php
diff --git a/app/omb/models/Identity.php b/app/omb/models/Identity.php
diff --git a/app/omb/models/Link.php b/app/omb/models/Link.php
diff --git a/app/omb/models/Membership.php b/app/omb/models/Membership.php
diff --git a/app/omb/models/Page.php b/app/omb/models/Page.php
diff --git a/app/omb/models/Person.php b/app/omb/models/Person.php
diff --git a/app/omb/models/Post.php b/app/omb/models/Post.php
diff --git a/app/omb/models/Review.php b/app/omb/models/Review.php
diff --git a/app/omb/models/Setting.php b/app/omb/models/Setting.php
@@ -22,6 +22,8 @@ function Setting() {
     $this->let_modify( 'all:members' );
     $this->let_delete( 'all:members' );
 
+    $this->let_access( 'all:administrators' );
+
     $this->set_hidden();
 
   }

diff --git a/app/omb/models/Subscription.php b/app/omb/models/Subscription.php
diff --git a/app/omb/models/Upload.php b/app/omb/models/Upload.php
diff --git a/app/omb/plugins/email_group.php b/app/omb/plugins/email_group.php
diff --git a/app/omb/plugins/email_notice.php b/app/omb/plugins/email_notice.php
diff --git a/app/omb/plugins/omb.php b/app/omb/plugins/omb.php
diff --git a/app/omb/plugins/omb_notice.php b/app/omb/plugins/omb_notice.php
diff --git a/app/omb/plugins/ping.php b/app/omb/plugins/ping.php
diff --git a/app/omb/plugins/renderer.php b/app/omb/plugins/renderer.php
diff --git a/app/omb/plugins/security.php b/app/omb/plugins/security.php
@@ -454,14 +454,63 @@ function normalize_url() {
   //
 }
 
+function password_register( &$vars ) {
+
+  extract( $vars );
+
+  $Identity =& $db->get_table( 'identities' );
+  $Person =& $db->get_table( 'people' );
+
+  if (!($request->password == $request->password2))
+    trigger_error( "sorry the passwords do not match", E_USER_ERROR );
+
+  $i = $Identity->find_by(array(
+    'nickname'=>$request->nickname
+  ),1);
+
+  $p = $Person->find( $i->person_id );
+
+  if ( isset( $p->id ) && $p->id != 0) {
+
+    trigger_error( "sorry that username is already taken", E_USER_ERROR );
+
+  } else {
+
+    // create new user and log them in
+    $p = $Person->base();
+    $p->save();
+    $i = $Identity->base();
+
+    $i->set_value( 'person_id', $p->id );
+    $i->set_value( 'label', 'profile 1' );
+    $i->set_value( 'nickname', $request->nickname );
+    $i->set_value( 'url', $request->base."".$request->nickname );
+    $i->set_value( 'password', md5($request->password) );
+    $i->save_changes();
+    $i->set_etag( $p->id );
+
+    $_SESSION['openid_complete'] = true;
+    set_cookie( $p->id );
+
+    if (!(empty($_SESSION['requested_url'])))
+      redirect_to( $_SESSION['requested_url'] );
+    else
+      redirect_to( $request->base );
+
+  }
+}
+
 function password_submit( &$vars ) {
   extract($vars);
   global $request;
   $Identity =& $db->get_table( 'identities' );
+  $Person =& $db->get_table( 'people' );
   $i = $Identity->find_by(array(
     'nickname'=>$request->nickname,
     'password'=>md5($request->password)
   ),1);
+  if (!$i)
+    trigger_error( "username or password incorrect, sorry", E_USER_ERROR );
   $p = $Person->find( $i->person_id );
   if ( isset( $p->id ) && $p->id != 0) {
     $_SESSION['openid_complete'] = true;
@@ -553,7 +602,10 @@ function openid_logout( &$vars ) {
   unset($_SESSION['requested_url']);
   unset($_SESSION['openid_complete']);
   unset($_SESSION['oid_return_to']);
-  redirect_to( environment('openid_server')."/?action=logout&return=".urlencode($request->base) );
+  if (environment('authentication') == 'password') 
+    redirect_to( $request->base );
+  else
+    redirect_to( environment('openid_server')."/?action=logout&return=".urlencode($request->base) );
 }
 
 function email_login( &$vars ) {
@@ -696,6 +748,8 @@ function security_init() {
   $request->connect( 'openid_submit' );
 
   $request->connect( 'password_submit' );
+
+  $request->connect( 'password_register' );
 
   $request->connect( 'openid_logout' );
 

diff --git a/app/omb/plugins/sessions.php b/app/omb/plugins/sessions.php
diff --git a/app/omb/plugins/sms_notice.php b/app/omb/plugins/sms_notice.php
diff --git a/app/omb/plugins/validation.php b/app/omb/plugins/validation.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-XRDS-Simple.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-XRDS-Simple.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/LICENSE b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/LICENSE
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/OAuth.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/OAuth.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/OAuthWordpressStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/OAuthWordpressStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/access_token.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/access_token.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/authorize_token.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/authorize_token.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/common.inc.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/common.inc.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/new_consumer.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/new_consumer.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/plugin.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/plugin.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/request_token.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-oauth/request_token.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/AX.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/AX.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Association.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Association.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/BigMath.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/BigMath.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Consumer.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Consumer.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/CryptUtil.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/CryptUtil.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DatabaseConnection.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DatabaseConnection.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DiffieHellman.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DiffieHellman.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Discover.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Discover.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DumbStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/DumbStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Extension.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Extension.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/FileStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/FileStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/HMACSHA1.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/HMACSHA1.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Interface.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Interface.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/KVForm.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/KVForm.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/MemcachedStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/MemcachedStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Message.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Message.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/MySQLStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/MySQLStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Nonce.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Nonce.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/PAPE.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/PAPE.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Parse.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Parse.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/PostgreSQLStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/PostgreSQLStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SQLStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SQLStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SQLiteStore.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SQLiteStore.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SReg.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/SReg.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Server.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/Server.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/ServerRequest.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/ServerRequest.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/TrustRoot.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/TrustRoot.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/URINorm.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/OpenID/URINorm.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/HTTPFetcher.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/HTTPFetcher.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Manager.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Manager.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Misc.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Misc.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/ParanoidHTTPFetcher.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/ParanoidHTTPFetcher.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/ParseHTML.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/ParseHTML.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/PlainHTTPFetcher.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/PlainHTTPFetcher.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XML.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XML.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRDS.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRDS.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRI.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRI.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRIRes.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/XRIRes.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Yadis.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Auth/Yadis/Yadis.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/error_log.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/error_log.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/file.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/file.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/null.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Log/null.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/OpenIDLog.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/OpenIDLog.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/formparse.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/formparse.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/php430.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/php430.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/username.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/Tests/username.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/core.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/core.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.textnode.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.textnode.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.textnode.min.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.textnode.min.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.xpath.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.xpath.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.xpath.min.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/jquery.xpath.min.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.css b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.css
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.gif b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.gif
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.min.js b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/files/openid.min.js
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/interface.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/interface.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/lang/openid.pot b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/lang/openid.pot
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/logic.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/logic.php
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/readme.txt b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/readme.txt
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-1.png b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-1.png
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-2.png b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-2.png
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-3.png b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/screenshot-3.png
diff --git a/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/store.php b/app/omb/plugins/wp-plugins/plugins/enabled/wp-openid/store.php
diff --git a/app/omb/plugins/wp-plugins/wp-admin/includes/upgrade.php b/app/omb/plugins/wp-plugins/wp-admin/includes/upgrade.php
diff --git a/app/omb/plugins/wp-plugins/wp-config.php b/app/omb/plugins/wp-plugins/wp-config.php
diff --git a/app/omb/plugins/wp-plugins/wp-includes/class-snoopy.php b/app/omb/plugins/wp-plugins/wp-includes/class-snoopy.php
diff --git a/app/omb/plugins/wp-plugins/wp-includes/pluggable.php b/app/omb/plugins/wp-plugins/wp-includes/pluggable.php
diff --git a/app/omb/plugins/wp.php b/app/omb/plugins/wp.php
diff --git a/app/omb/views/_doctype.html b/app/omb/views/_doctype.html
diff --git a/app/omb/views/_doctype.xhtml b/app/omb/views/_doctype.xhtml
diff --git a/app/omb/views/_email.html b/app/omb/views/_email.html
@@ -49,11 +49,8 @@
   </form>
 
   <center>
-    <a href="">Forgotten your details?</a>
-    <br />
-    <br />
-    <br />
-    <a href="">Home</a>
+    <a href="">Forgot your password?</a>
+
   </center>
 
   </td>

diff --git a/app/omb/views/_entry.json b/app/omb/views/_entry.json
diff --git a/app/omb/views/_entry.xrds b/app/omb/views/_entry.xrds
diff --git a/app/omb/views/_index.atom b/app/omb/views/_index.atom
diff --git a/app/omb/views/_index.html b/app/omb/views/_index.html
diff --git a/app/omb/views/_index.json b/app/omb/views/_index.json
diff --git a/app/omb/views/_index.rdf b/app/omb/views/_index.rdf
diff --git a/app/omb/views/_index.rss b/app/omb/views/_index.rss
diff --git a/app/omb/views/_login.html b/app/omb/views/_login.html
diff --git a/app/omb/views/_mobile.html b/app/omb/views/_mobile.html
diff --git a/app/omb/views/_register.html b/app/omb/views/_register.html
@@ -8,15 +8,15 @@
 <tr>
   <td class="content">
 
-  <form name="login" action="<?php print $submit_url; ?>" method="post">
+  <form name="login" action="<?php url_for('password_register'); ?>" method="post">
 
-  <input name="method" value="password_submit" type="hidden" />
+  <input name="method" value="password_register" type="hidden" />
 
   <input type="hidden" name="url" value="" />
 
     <table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
     <tr>
-      <td height="40" align="center" colspan="2">Please enter your username and password below</td>
+      <td height="40" align="center" colspan="2">Create a new username and password:</td>
     </tr>
     <tr>
       <td height="10" colspan="2"></td>
@@ -29,6 +29,10 @@
       <td width="170" height="30" align="right">Password:</td>
       <td><input type="password" maxlength="30" name="password" style="width: 180px;" /></td>
     </tr>
+    <tr>
+      <td width="170" height="30" align="right">Password (again):</td>
+      <td><input type="password" maxlength="30" name="password2" style="width: 180px;" /></td>
+    </tr>
     <tr height="30" style="display: none;">
       <td>&nbsp;</td>
       <td>
@@ -40,7 +44,7 @@
     </tr>
     <tr height="30">
       <td>&nbsp;</td>
-      <td><input type="submit" name="submit" value="Login" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" /></td>
+      <td><input type="submit" name="submit" value="Register" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" /></td>
     </tr>
     <tr>
       <td height="10" colspan="2"></td>
@@ -49,11 +53,7 @@
   </form>
 
   <center>
-    <a href="">Forgotten your details?</a>
-    <br />
-    <br />
-    <br />
-    <a href="">Home</a>
+     <a href="">Forgot your password?</a>
   </center>
 
   </td>

diff --git a/app/omb/views/admin/_theme.html b/app/omb/views/admin/_theme.html
@@ -0,0 +1,45 @@
+
+<form>
+<?php foreach ( $previews as $pname=>$pimg ) : ?>
+
+
+
+<p>
+  <img src="<?php echo $pimg; ?>" border="0" >
+  <?php echo $pname; ?>
+  <input name="<?php echo $pname; ?>" id="<?php echo $pname; ?>" type="checkbox" <?php if ($installedtheme == $pname) echo "checked"; ?>>
+</p>
+
+
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    $("#<?php echo $pname; ?>").click(function(e){
+
+      var someurl = "<?php url_for(array(
+        'resource'=>'settings'
+      )); ?>";
+
+      var submitdata = {};
+
+      submitdata['setting[name]'] = 'config.env.theme';
+      submitdata['method'] = 'post';
+      submitdata['setting[value]'] = '<?php echo $pname; ?>';
+
+      if (!$("#<?php echo $pname; ?>").attr('checked')) {
+        return;
+      }
+
+      $.post(someurl, submitdata, function(str) {
+        alert(str);
+      });
+
+    });
+  });
+</script>
+
+<?php endforeach; ?>
+</form>
+
+
+
diff --git a/app/omb/views/admin/index.html b/app/omb/views/admin/index.html
@@ -11,6 +11,12 @@
 	<script type="text/javascript">
 	$(function() {
 		$("#tabs").tabs();
+		$("#tabs").click(function() { 
+
+                   var b = $("#tabs").tabs('option', 'selected');
+                   if (b == 4) location.href='<?php base_url(); ?>';
+
+                });
 	});
 	</script>
 
@@ -29,6 +35,11 @@
   		    'resource'=>'categories',
   		    'action'=>'manage/partial'
   		  )); ?>">Categories</a></li>
+
+  		<li><a href="<?php url_for(array(
+  		    'resource'=>'admin',
+  		    'action'=>'theme/partial'
+  		  )); ?>">Themes</a></li>
 
   		<li><a href="<?php url_for(array(
   		    'resource'=>'groups',

diff --git a/app/omb/views/admin/style.css b/app/omb/views/admin/style.css
diff --git a/app/omb/views/categories/_block.js b/app/omb/views/categories/_block.js
diff --git a/app/omb/views/categories/_edit.html b/app/omb/views/categories/_edit.html
diff --git a/app/omb/views/categories/_entry.html b/app/omb/views/categories/_entry.html
diff --git a/app/omb/views/categories/_index.atom b/app/omb/views/categories/_index.atom
diff --git a/app/omb/views/categories/_index.html b/app/omb/views/categories/_index.html
diff --git a/app/omb/views/categories/_manage.html b/app/omb/views/categories/_manage.html
diff --git a/app/omb/views/categories/_new.html b/app/omb/views/categories/_new.html
diff --git a/app/omb/views/categories/_remove.html b/app/omb/views/categories/_remove.html
diff --git a/app/omb/views/categories/index.atom b/app/omb/views/categories/index.atom
diff --git a/app/omb/views/en_EN.php b/app/omb/views/en_EN.php
diff --git a/app/omb/views/events/_entry.html b/app/omb/views/events/_entry.html
diff --git a/app/omb/views/events/_index.html b/app/omb/views/events/_index.html
diff --git a/app/omb/views/events/_index.ics b/app/omb/views/events/_index.ics
diff --git a/app/omb/views/groups/_edit.html b/app/omb/views/groups/_edit.html
diff --git a/app/omb/views/groups/_entry.html b/app/omb/views/groups/_entry.html
diff --git a/app/omb/views/groups/_index.html b/app/omb/views/groups/_index.html
diff --git a/app/omb/views/groups/_new.html b/app/omb/views/groups/_new.html
diff --git a/app/omb/views/groups/_remove.html b/app/omb/views/groups/_remove.html
diff --git a/app/omb/views/identities/_admin.html b/app/omb/views/identities/_admin.html
diff --git a/app/omb/views/identities/_apps.html b/app/omb/views/identities/_apps.html
diff --git a/app/omb/views/identities/_edit.html b/app/omb/views/identities/_edit.html
@@ -41,7 +41,7 @@ <h2><?php if (isset($_SESSION['message'])) { echo $_SESSION['message']; unset($_
   </tr>
   <tr>
     <td align="right"><b>License URL</b></td>
-    <td valign="top" align="left"><input size="50" maxlength="255" id="identity_license" name="identity[license]" type="text" value="<?php if (!empty($Member->license)) echo $Member->license; else echo 'http://creativecommons.org/licenses/BSD/'; ?>" /></td>
+    <td valign="top" align="left"><input size="50" maxlength="255" id="identity_license" name="identity[license]" type="text" value="<?php if (!empty($Member->license)) echo $Member->license; else echo 'http://creativecommons.org/licenses/by/3.0/'; ?>" /></td>
   </tr>
   <tr>
     <td align="right"><b></b></td>

diff --git a/app/omb/views/identities/_entry.html b/app/omb/views/identities/_entry.html
diff --git a/app/omb/views/identities/_entry.rdf b/app/omb/views/identities/_entry.rdf
diff --git a/app/omb/views/identities/_entry.vcf b/app/omb/views/identities/_entry.vcf
diff --git a/app/omb/views/identities/_index.html b/app/omb/views/identities/_index.html
diff --git a/app/omb/views/identities/_new.html b/app/omb/views/identities/_new.html
diff --git a/app/omb/views/identities/_remove.html b/app/omb/views/identities/_remove.html
diff --git a/app/omb/views/identities/_subs.html b/app/omb/views/identities/_subs.html
diff --git a/app/omb/views/index.atom b/app/omb/views/index.atom
diff --git a/app/omb/views/index.html b/app/omb/views/index.html
diff --git a/app/omb/views/index.opml b/app/omb/views/index.opml
diff --git a/app/omb/views/index.wml b/app/omb/views/index.wml
diff --git a/app/omb/views/index.xhtml b/app/omb/views/index.xhtml
diff --git a/app/omb/views/introspection/_block.js b/app/omb/views/introspection/_block.js
diff --git a/app/omb/views/introspection/_index.atom b/app/omb/views/introspection/_index.atom
diff --git a/app/omb/views/introspection/_index.html b/app/omb/views/introspection/_index.html
diff --git a/app/omb/views/introspection/index.atom b/app/omb/views/introspection/index.atom
diff --git a/app/omb/views/links/_block.js b/app/omb/views/links/_block.js
diff --git a/app/omb/views/links/_edit.html b/app/omb/views/links/_edit.html
diff --git a/app/omb/views/links/_index.html b/app/omb/views/links/_index.html
diff --git a/app/omb/views/links/_new.html b/app/omb/views/links/_new.html
diff --git a/app/omb/views/pages/_block.js b/app/omb/views/pages/_block.js
diff --git a/app/omb/views/pages/_edit.html b/app/omb/views/pages/_edit.html
diff --git a/app/omb/views/pages/_entry.html b/app/omb/views/pages/_entry.html
diff --git a/app/omb/views/pages/_entry.wml b/app/omb/views/pages/_entry.wml
diff --git a/app/omb/views/pages/_index.atom b/app/omb/views/pages/_index.atom
diff --git a/app/omb/views/pages/_index.html b/app/omb/views/pages/_index.html
diff --git a/app/omb/views/pages/_index.wml b/app/omb/views/pages/_index.wml
diff --git a/app/omb/views/pages/_new.html b/app/omb/views/pages/_new.html
diff --git a/app/omb/views/pages/_remove.html b/app/omb/views/pages/_remove.html
diff --git a/app/omb/views/posts/_edit.html b/app/omb/views/posts/_edit.html
diff --git a/app/omb/views/posts/_entry.html b/app/omb/views/posts/_entry.html
diff --git a/app/omb/views/posts/_entry.wml b/app/omb/views/posts/_entry.wml
diff --git a/app/omb/views/posts/_index.atom b/app/omb/views/posts/_index.atom
diff --git a/app/omb/views/posts/_index.html b/app/omb/views/posts/_index.html
diff --git a/app/omb/views/posts/_index.wml b/app/omb/views/posts/_index.wml
diff --git a/app/omb/views/posts/_new.html b/app/omb/views/posts/_new.html
diff --git a/app/omb/views/posts/_remove.html b/app/omb/views/posts/_remove.html
diff --git a/app/omb/views/reviews/_entry.html b/app/omb/views/reviews/_entry.html
diff --git a/app/omb/views/reviews/_index.html b/app/omb/views/reviews/_index.html
diff --git a/app/omb/views/reviews/empty_star.gif b/app/omb/views/reviews/empty_star.gif
diff --git a/app/omb/views/reviews/full_star.gif b/app/omb/views/reviews/full_star.gif
diff --git a/app/omb/views/style.css b/app/omb/views/style.css
diff --git a/app/omb/views/subscriptions/_remove.html b/app/omb/views/subscriptions/_remove.html
diff --git a/app/plugins/wp-plugins/wp-includes/pluggable.php b/app/plugins/wp-plugins/wp-includes/pluggable.php
diff --git a/app/twitter/controllers/ak_twitter.php b/app/twitter/controllers/ak_twitter.php
diff --git a/app/twitter/models/AkTwitter.php b/app/twitter/models/AkTwitter.php
diff --git a/app/twitter/models/TwitterUser.php b/app/twitter/models/TwitterUser.php
diff --git a/app/twitter/plugins/twitter.php b/app/twitter/plugins/twitter.php
diff --git a/app/twitter/twitter.php b/app/twitter/twitter.php
diff --git a/app/twitter/views/ak_twitter/_edit.html b/app/twitter/views/ak_twitter/_edit.html
diff --git a/cache/.empty b/cache/.empty
diff --git a/db/.htaccess b/db/.htaccess
diff --git a/db/boot.php b/db/boot.php
@@ -312,6 +312,33 @@
 //$request->connect( 'migrate' );
 
 
+/**
+ * load saved config
+ */
+
+$Setting =& $db->model('Setting');
+$Setting->find_by(array(
+  'eq'    => 'like',
+  'name'  => 'config%'
+));
+while ($s = $Setting->MoveNext()) {
+$set = split('\.',$s->name);
+  if (is_array($set) && $set[0] == 'config') {
+    if ($set[1] == 'env')
+      $env[$set[2]] = $s->value;
+  }
+}
+
+$wp_theme = "wp-content".DIRECTORY_SEPARATOR."themes".DIRECTORY_SEPARATOR.$env['theme'];
+
+if ((file_exists($wp_theme))) {
+  $GLOBALS['PATH']['content_plugins'] = 'wp-content'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR;
+  $GLOBALS['PATH']['themes'] = "wp-content".DIRECTORY_SEPARATOR."themes".DIRECTORY_SEPARATOR;
+} else {
+  $GLOBALS['PATH']['themes'] = $env['themepath'.$env['theme']].DIRECTORY_SEPARATOR;
+}
+
+
   /**
    * load plugins
    */

diff --git a/db/library/S3.php b/db/library/S3.php
diff --git a/db/library/dbscript/_functions.php b/db/library/dbscript/_functions.php
diff --git a/db/library/dbscript/aggregatefeed.php b/db/library/dbscript/aggregatefeed.php
diff --git a/db/library/dbscript/bootloader.php b/db/library/dbscript/bootloader.php
diff --git a/db/library/dbscript/cache.php b/db/library/dbscript/cache.php
diff --git a/db/library/dbscript/collection.php b/db/library/dbscript/collection.php
diff --git a/db/library/dbscript/controller.php b/db/library/dbscript/controller.php
diff --git a/db/library/dbscript/cookie.php b/db/library/dbscript/cookie.php
diff --git a/db/library/dbscript/database.php b/db/library/dbscript/database.php
diff --git a/db/library/dbscript/genericiterator.php b/db/library/dbscript/genericiterator.php
diff --git a/db/library/dbscript/mapper.php b/db/library/dbscript/mapper.php
diff --git a/db/library/dbscript/model.php b/db/library/dbscript/model.php
diff --git a/db/library/dbscript/mysql.php b/db/library/dbscript/mysql.php
diff --git a/db/library/dbscript/pdo.php b/db/library/dbscript/pdo.php
diff --git a/db/library/dbscript/postgresql.php b/db/library/dbscript/postgresql.php
diff --git a/db/library/dbscript/record.php b/db/library/dbscript/record.php
diff --git a/db/library/dbscript/recordset.php b/db/library/dbscript/recordset.php
diff --git a/db/library/dbscript/resource.php b/db/library/dbscript/resource.php
diff --git a/db/library/dbscript/resultiterator.php b/db/library/dbscript/resultiterator.php
diff --git a/db/library/dbscript/route.php b/db/library/dbscript/route.php
diff --git a/db/library/dbscript/view.php b/db/library/dbscript/view.php
diff --git a/db/library/http_negotiate.php b/db/library/http_negotiate.php
diff --git a/db/library/ical_creator.php b/db/library/ical_creator.php
diff --git a/db/library/inflector.php b/db/library/inflector.php
diff --git a/db/library/json.php b/db/library/json.php
diff --git a/db/library/logging.php b/db/library/logging.php
diff --git a/db/library/openid.php b/db/library/openid.php
diff --git a/db/library/opensearch.php b/db/library/opensearch.php
diff --git a/db/library/php_microformats.php b/db/library/php_microformats.php
diff --git a/db/library/vcard.php b/db/library/vcard.php
diff --git a/db/library/xmlobj.php b/db/library/xmlobj.php
diff --git a/db/library/xmlstream.php b/db/library/xmlstream.php
diff --git a/db/library/xmpp.php b/db/library/xmpp.php
diff --git a/db/library/xpertmailer/ABOUT b/db/library/xpertmailer/ABOUT
diff --git a/db/library/xpertmailer/FUNC.php b/db/library/xpertmailer/FUNC.php
diff --git a/db/library/xpertmailer/LICENSE b/db/library/xpertmailer/LICENSE
diff --git a/db/library/xpertmailer/MAIL.php b/db/library/xpertmailer/MAIL.php
diff --git a/db/library/xpertmailer/MIME.php b/db/library/xpertmailer/MIME.php
diff --git a/db/library/xpertmailer/PHP4/FUNC4.php b/db/library/xpertmailer/PHP4/FUNC4.php
diff --git a/db/library/xpertmailer/PHP4/MAIL4.php b/db/library/xpertmailer/PHP4/MAIL4.php
diff --git a/db/library/xpertmailer/PHP4/MIME4.php b/db/library/xpertmailer/PHP4/MIME4.php
diff --git a/db/library/xpertmailer/PHP4/POP34.php b/db/library/xpertmailer/PHP4/POP34.php
diff --git a/db/library/xpertmailer/PHP4/SMTP4.php b/db/library/xpertmailer/PHP4/SMTP4.php
diff --git a/db/library/xpertmailer/PHP5/FUNC5.php b/db/library/xpertmailer/PHP5/FUNC5.php
diff --git a/db/library/xpertmailer/PHP5/MAIL5.php b/db/library/xpertmailer/PHP5/MAIL5.php
diff --git a/db/library/xpertmailer/PHP5/MIME5.php b/db/library/xpertmailer/PHP5/MIME5.php
diff --git a/db/library/xpertmailer/PHP5/POP35.php b/db/library/xpertmailer/PHP5/POP35.php
diff --git a/db/library/xpertmailer/PHP5/SMTP5.php b/db/library/xpertmailer/PHP5/SMTP5.php
diff --git a/db/library/xpertmailer/POP3.php b/db/library/xpertmailer/POP3.php
diff --git a/db/library/xpertmailer/SMTP.php b/db/library/xpertmailer/SMTP.php
diff --git a/db/library/yaml.php b/db/library/yaml.php
diff --git a/index.php b/index.php
diff --git a/resource/AC_QuickTime.js b/resource/AC_QuickTime.js
diff --git a/resource/block.gif b/resource/block.gif
diff --git a/resource/bookmark/blinklist.gif b/resource/bookmark/blinklist.gif
diff --git a/resource/bookmark/blogmarks.gif b/resource/bookmark/blogmarks.gif
diff --git a/resource/bookmark/co.mments.gif b/resource/bookmark/co.mments.gif
diff --git a/resource/bookmark/delicious.gif b/resource/bookmark/delicious.gif
diff --git a/resource/bookmark/delirious.gif b/resource/bookmark/delirious.gif
diff --git a/resource/bookmark/digg.gif b/resource/bookmark/digg.gif
diff --git a/resource/bookmark/facebook.png b/resource/bookmark/facebook.png
diff --git a/resource/bookmark/fark.gif b/resource/bookmark/fark.gif
diff --git a/resource/bookmark/furl.gif b/resource/bookmark/furl.gif
diff --git a/resource/bookmark/googlebookmark.png b/resource/bookmark/googlebookmark.png
diff --git a/resource/bookmark/live.png b/resource/bookmark/live.png
diff --git a/resource/bookmark/magnolia.gif b/resource/bookmark/magnolia.gif
diff --git a/resource/bookmark/newsvine.gif b/resource/bookmark/newsvine.gif
diff --git a/resource/bookmark/pownce.gif b/resource/bookmark/pownce.gif
diff --git a/resource/bookmark/propeller.gif b/resource/bookmark/propeller.gif
diff --git a/resource/bookmark/reddit.gif b/resource/bookmark/reddit.gif
diff --git a/resource/bookmark/scuttle.gif b/resource/bookmark/scuttle.gif
diff --git a/resource/bookmark/simpy.gif b/resource/bookmark/simpy.gif
diff --git a/resource/bookmark/sphinn.png b/resource/bookmark/sphinn.png