simplify

2 files changed, 6 insertions, 53 deletions

diff --git a/boot.php b/boot.php
index e979d614a..6bc21033b 100644
--- a/boot.php
+++ b/boot.php
@@ -175,59 +175,12 @@ define ( 'PERMS_COMMUNITY',          PERMS_VISIBLE|PERMS_RECEIVE|PERMS_COMMENT|P
 
 // General channel permissions
 
+define ( 'PERMS_PUBLIC'     , 0x0001 );
+define ( 'PERMS_NETWORK'    , 0x0002 );
+define ( 'PERMS_SITE'       , 0x0004 );
+define ( 'PERMS_CONTACTS'   , 0x0008 );
+define ( 'PERMS_SPECIFIC'   , 0x0080 );
 
-define ( 'PERMS_PUBLIC_VIEW_STREAM'     , 0x00000001 );
-define ( 'PERMS_SERVICE_VIEW_STREAM'    , 0x00000002 );
-define ( 'PERMS_SITE_VIEW_STREAM'       , 0x00000004 );
-define ( 'PERMS_CONTACTS_VIEW_STREAM'   , 0x00000008 );
-define ( 'PERMS_SPECIFIC_VIEW_STREAM'   , 0x00000010 );
-
-define ( 'PERMS_PUBLIC_VIEW_PROFILE'    , 0x00000020 );
-define ( 'PERMS_SERVICE_VIEW_PROFILE'   , 0x00000040 );
-define ( 'PERMS_SITE_VIEW_PROFILE'      , 0x00000080 );
-define ( 'PERMS_CONTACTS_VIEW_PROFILE'  , 0x00000100 );
-define ( 'PERMS_SPECIFIC_VIEW_PROFILE'  , 0x00000200 );
-
-define ( 'PERMS_PUBLIC_VIEW_PHOTOS'     , 0x00000400 );
-define ( 'PERMS_SERVICE_VIEW_PHOTOS'    , 0x00000800 );
-define ( 'PERMS_SITE_VIEW_PHOTOS'       , 0x00001000 );
-define ( 'PERMS_CONTACTS_VIEW_PHOTOS'   , 0x00002000 );
-define ( 'PERMS_SPECIFIC_VIEW_PHOTOS'   , 0x00004000 );
-
-define ( 'PERMS_PUBLIC_VIEW_CONTACTS'   , 0x00008000 );
-define ( 'PERMS_SERVICE_VIEW_CONTACTS'  , 0x00010000 );
-define ( 'PERMS_SITE_VIEW_CONTACTS'     , 0x00020000 );
-define ( 'PERMS_CONTACTS_VIEW_CONTACTS' , 0x00040000 );
-define ( 'PERMS_SPECIFIC_VIEW_CONTACTS' , 0x00080000 );
-
-define ( 'PERMS_PUBLIC_POST_STREAM'     , 0x00000001 );
-define ( 'PERMS_SERVICE_POST_STREAM'    , 0x00000002 );
-define ( 'PERMS_SITE_POST_STREAM'       , 0x00000004 );
-define ( 'PERMS_CONTACTS_POST_STREAM'   , 0x00000008 );
-define ( 'PERMS_SPECIFIC_POST_STREAM'   , 0x00000010 );
-
-define ( 'PERMS_PUBLIC_POST_WALL'       , 0x00000020 );
-define ( 'PERMS_SERVICE_POST_WALL'      , 0x00000040 );
-define ( 'PERMS_SITE_POST_WALL'         , 0x00000080 );
-define ( 'PERMS_CONTACTS_POST_WALL'     , 0x00000100 );
-define ( 'PERMS_SPECIFIC_POST_WALL'     , 0x00000200 );
-
-
-define ( 'PERMS_PUBLIC_POST_COMMENTS'   , 0x00000400 );
-define ( 'PERMS_SERVICE_POST_COMMENTS'  , 0x00000800 );
-define ( 'PERMS_SITE_POST_COMMENTS'     , 0x00001000 );
-define ( 'PERMS_CONTACTS_POST_COMMENTS' , 0x00002000 );
-define ( 'PERMS_SPECIFIC_POST_COMMENTS' , 0x00004000 );
-
-define ( 'PERMS_PUBLIC_POST_MAIL'       , 0x00008000 );
-define ( 'PERMS_SERVICE_POST_MAIL'      , 0x00010000 );
-define ( 'PERMS_SITE_POST_MAIL'         , 0x00020000 );
-define ( 'PERMS_CONTACTS_POST_MAIL'     , 0x00040000 );
-define ( 'PERMS_SPECIFIC_POST_MAIL'     , 0x00080000 );
-
-define ( 'DEFAULT_VIEW_PERMS', PERMS_SPECIFIC_VIEW_STREAM | PERMS_SPECIFIC_VIEW_PROFILE | PERMS_SPECIFIC_VIEW_PHOTOS | PERMS_SPECIFIC_VIEW_CONTACTS );
-
-define ( 'DEFAULT_POST_PERMS', PERMS_SPECIFIC_POST_STREAM | PERMS_SPECIFIC_POST_WALL | PERMS_SPECIFIC_POST_COMMENTS | PERMS_SPECIFIC_POST_MAIL );
 
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
diff --git a/version.inc b/version.inc
index ac7d596c4..00c5e8c7d 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-09-03.66
+2012-09-04.67