Merge commit 'upstream/master'

diff --combined htconfig.php
index 63a40c8090417866535283e73af7dc7347a6bc36,9d9c8a2c791ddd185a2d68949f4add5c5d6c76ec..63a40c8090417866535283e73af7dc7347a6bc36
mode 100755,100644..100644
--- 1/htconfig.php
--- 2/htconfig.php
+++ b/htconfig.php
@@@ -83,8 -83,5 +83,8 @@@ $a->config['system']['no_regfullname'] 
  // If set to true the priority settings of ostatus contacts are used
  $a->config['system']['ostatus_use_priority'] = false;
  
 -// If enabled all items are cached in the given directory
 +// If enabled, all items are cached in the given directory
  $a->config['system']['itemcache'] = "";
 +
 +// If enabled, the lockpath is used for a lockfile to check if the poller is running
 +$a->config['system']['lockpath'] = "";

diff --combined include/poller.php
index 499483d007dea6ecaffde1d9c4d0fffb420e79e3,90a97867c204e5abae28479262c8729e5320b242..499483d007dea6ecaffde1d9c4d0fffb420e79e3
mode 100755,100644..100644
--- 1/include/poller.php
--- 2/include/poller.php
+++ b/include/poller.php
@@@ -25,20 -25,10 +25,20 @@@ function poller_run($argv, $argc)
        require_once('include/Contact.php');
        require_once('include/email.php');
        require_once('include/socgraph.php');
 +      require_once('include/pidfile.php');
  
        load_config('config');
        load_config('system');
  
 +      $lockpath = get_config('system','lockpath');
 +      if ($lockpath != '') {
 +              $pidfile = new pidfile($lockpath, 'poller.lck');
 +              if($pidfile->is_already_running()) {
 +                      logger("poller: Already running");
 +                      exit;
 +              }
 +      }
 +
        $a->set_baseurl(get_config('system','url'));
  
        load_hooks();

diff --combined view/theme/diabook/style-network.css
index c40a9bf502aa79c18a85c9f726ace3cecc822ffe,4d35fe1c14ffd84b1b967b8d46d7317637476596..ef30cd07b44474fa493125284fa81828d373d61f
--- 1/view/theme/diabook/style-network.css
--- 2/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@@ -1183,7 -1183,6 +1183,6 @@@ body .pageheader
      padding: 0;
   }
  .tab.button {
-     margin-right: 5px; 
      margin-left: 5px; 
      /*background: none repeat scroll 0 0 #F8F8F8;*/
      border: 1px solid #CCCCCC;
@@@ -1308,6 -1307,7 +1307,7 @@@ transition: all 0.2s ease-in-out
    max-width: 420px;
    word-wrap: break-word;
    line-height: 1.2;
+   margin-bottom: 14px;
  }
  
  .wall-item-container .wall-item-content img {
@@@ -1405,9 -1405,9 +1405,9 @@@
    border: 1px solid #2d2d2d;
  }
  .comment-edit-preview {
-   width: 710px;
-   border: 1px solid #2d2d2d;
+   width: 500px;
    margin-top: 10px;
+   background-color:  #fff797;
  }
  .comment-edit-preview .contact-photo {
    width: 32px;
@@@ -1643,7 -1643,7 +1643,7 @@@
      height: 20px;
      margin: 0 0 5px;
      width: 60%;
-     border: 1px solid #ffffff;
+     border: 1px solid #d2d2d2;
  }
  #profile-jot-form #jot-title:-webkit-input-placeholder {
    font-weight: normal;
@@@ -2099,6 -2099,11 +2099,11 @@@ blockquote 
      border-left: 1px solid #D2D2D2;
      padding-left: 9px;
      margin: 0 0 0 .8ex;
+     color: #777;
+ }
+ .oembed {
+       font-size: large;
+       font-weight: bold;
  }
  .aprofile dt{
  box-shadow: 1px 1px 5px 0;
@@@ -2543,4 -2548,4 +2548,4 @@@ list-style-type: disc
  #photos-upload-newalbum-div {
          float: left;
          width: 175px;
 -}
 +}

diff --combined view/theme/diabook/style-profile.css
index a34ee4cc9bb6539d2a872dba18821a4ece8aaf7a,b05b98300df0001d6c298d7946d6691674ab83c2..9d6542ac2324c2010217593982f071f074b157ea
--- 1/view/theme/diabook/style-profile.css
--- 2/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@@ -1176,7 -1176,6 +1176,6 @@@ body .pageheader
      padding: 0;
   }
  .tab.button {
-     margin-right: 5px; 
      margin-left: 5px; 
      /*background: none repeat scroll 0 0 #F8F8F8;*/
      border: 1px solid #CCCCCC;
@@@ -1302,6 -1301,7 +1301,7 @@@ transition: all 0.2s ease-in-out
    max-width: 420px;
    word-wrap: break-word;
    line-height: 1.2;
+   margin-bottom: 14px;
  }
  
  .wall-item-container .wall-item-content img {
@@@ -1399,9 -1399,9 +1399,9 @@@
    border: 1px solid #2d2d2d;
  }
  .comment-edit-preview {
-   width: 710px;
-   border: 1px solid #2d2d2d;
+   width: 500px;
    margin-top: 10px;
+   background-color:  #fff797;
  }
  .comment-edit-preview .contact-photo {
    width: 32px;
@@@ -1637,7 -1637,7 +1637,7 @@@
      height: 20px;
      margin: 0 0 5px;
      width: 60%;
-     border: 1px solid #ffffff;
+     border: 1px solid #d2d2d2;
  }
  #profile-jot-form #jot-title:-webkit-input-placeholder {
    font-weight: normal;
@@@ -2023,6 -2023,8 +2023,8 @@@ ul.tabs li .active 
  /* photo */
  .photo {
  border-radius: 10px;  
+ height: 145px !important;
+ width: 145px !important;
        }
  .lframe {
    float: left;
@@@ -2094,6 -2096,11 +2096,11 @@@ blockquote 
      border-left: 1px solid #D2D2D2;
      padding-left: 9px;
      margin: 0 0 0 .8ex;
+     color: #777;
+ }
+ .oembed {
+       font-size: large;
+       font-weight: bold;
  }
  .aprofile dt{
  box-shadow: 1px 1px 5px 0;
@@@ -2538,4 -2545,4 +2545,4 @@@ list-style-type: disc
  #photos-upload-newalbum-div {
          float: left;
          width: 175px;
 -}
 +}

diff --combined view/theme/diabook/style.css
index c097545e5165a7a37c4aa36f1d504d7a1d5fb43f,c06449d0106ea0006a82bdce20a7a324545040f0..e99aa564460d845a9cf7003e6275fddc1d6af261
--- 1/view/theme/diabook/style.css
--- 2/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@@ -449,6 -449,24 +449,24 @@@ a:hover 
    /*color: #005c94; */
    text-decoration: underline;
  }
+ .intro-end {
+       border-bottom: 1px solid black;
+    clear: both;
+    margin-bottom: 25px;
+    padding-bottom: 25px;
+    width: 75%;
+       }
+ .intro-form-end {
+       clear: both;
+       }
+ .intro-fullname {
+       padding-bottom: 5px;
+    padding-top: 5px;
+       }
+ .intro-wrapper-end {
+       clear: both;
+    padding-bottom: 5px;
+       }
  code {
    font-family: Courier, monospace;
    white-space: pre;
@@@ -1232,7 -1250,6 +1250,6 @@@ body .pageheader
      padding: 0;
   }
  .tab.button {
-     margin-right: 5px; 
      margin-left: 5px; 
      /*background: none repeat scroll 0 0 #F8F8F8;*/
      border: 1px solid #CCCCCC;
@@@ -1269,6 -1286,9 +1286,9 @@@
  .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
    display: table-row;
  }
+ .wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+   display: table-row;
+ }
  .wall-item-bottom {
    font-size: 13px;
  }
@@@ -1294,16 -1314,32 +1314,32 @@@
    text-align: left;
    width: 80px;
  }
+ .wall-item-photo-container .wall-item-info {
+   display: table-cell;
+   vertical-align: top;
+   text-align: left;
+   width: 80px;
+ }
  .wall-item-container .wall-item-location {
    padding-right: 40px;
    display: table-cell;
  }
+ .wall-item-photo-container .wall-item-location {
+   padding-right: 40px;
+   display: table-cell;
+ }
  .wall-item-container .wall-item-ago {
    word-wrap: break-word;
    width: 50px;
    margin-left: 10px;
    color: #999;
  }
+ .wall-item-photo-container .wall-item-ago {
+   word-wrap: break-word;
+   width: 50px;
+   margin-left: 10px;
+   color: #999;
+ }
  .wall-item-location {
    
    clear: both;
@@@ -1317,15 -1353,29 +1353,29 @@@
    max-width: 720px;
    word-wrap: break-word;
    line-height: 1.2;
+   margin-bottom: 14px;
+ }
+ .wall-item-photo-container .wall-item-content {
+   font-size: 12.5px;
+   max-width: 720px;
+   word-wrap: break-word;
+   line-height: 1.2;
+   margin-bottom: 14px;
  }
- 
  .wall-item-container .wall-item-content img {
    max-width: 700px;
  }
+ .wall-item-photo-container .wall-item-content img {
+   max-width: 700px;
+ }
  .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
    display: table-cell;
    vertical-align: middle;
  }
+ .wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+   display: table-cell;
+   vertical-align: middle;
+ }
  .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
    opacity: 0.5;
    -webkit-transition: all 0.2s ease-in-out;
@@@ -1334,6 -1384,14 +1384,14 @@@
    -ms-transition: all 0.2s ease-in-out;
    transition: all 0.2s ease-in-out;
  }
+ .wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+   opacity: 0.5;
+   -webkit-transition: all 0.2s ease-in-out;
+   -moz-transition: all 0.2s ease-in-out;
+   -o-transition: all 0.2s ease-in-out;
+   -ms-transition: all 0.2s ease-in-out;
+   transition: all 0.2s ease-in-out;
+ }
  .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
    opacity: 1;
    -webkit-transition: all 0.2s ease-in-out;
@@@ -1342,14 -1400,22 +1400,22 @@@
    -ms-transition: all 0.2s ease-in-out;
    transition: all 0.2s ease-in-out;
  }
- .wall-item-container .wall-item-name {
+ .wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+   opacity: 1;
+   -webkit-transition: all 0.2s ease-in-out;
+   -moz-transition: all 0.2s ease-in-out;
+   -o-transition: all 0.2s ease-in-out;
+   -ms-transition: all 0.2s ease-in-out;
+   transition: all 0.2s ease-in-out;
+ }
+ .wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name {
    font-weight: bold;
  }
- .wall-item-container .wall-item-actions-author {
+ .wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author {
    width: 100%;
    margin-bottom: 0.3em;
  }
- .wall-item-container .wall-item-actions-social {
+ .wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social {
    float: left;
    margin-bottom: 1px;
    display: table-cell;
@@@ -1357,20 -1423,35 +1423,35 @@@
  .wall-item-container .wall-item-actions-social a {
    margin-right: 1em;
  }
+ .wall-item-photo-container .wall-item-actions-social a {
+   margin-right: 1em;
+ }
  .wall-item-actions-social a {
    float: left;
  }
+ 
  .wall-item-container .wall-item-actions-tools {
    float: right;
    width: 80px;
    display: table-cell;
  }
+ .wall-item-photo-container .wall-item-actions-tools {
+   float: right;
+   width: 80px;
+   display: table-cell;
+ }
  .wall-item-container .wall-item-actions-tools a {
    float: right;
  }
+ .wall-item-photo-container .wall-item-actions-tools a {
+   float: right;
+ }
  .wall-item-container .wall-item-actions-tools input {
    float: right;
  }
+ .wall-item-photo-container .wall-item-actions-tools input {
+   float: right;
+ }
  .wall-item-container.comment {
    margin-top: 5px;
    margin-bottom: 5px;
@@@ -1378,6 -1459,48 +1459,48 @@@
    width: 700px;
    border-bottom: 1px solid hsl(198, 21%, 79%);
  }
+ .wall-item-photo-container.comment {
+   margin-top: 5px;
+   margin-bottom: 5px;
+   margin-left: 40px;
+   width: 650px;
+   border-bottom: 1px solid #D2D2D2;
+ }
+ .wall-item-photo-container.comment {
+   top: 15px !important;
+   left: 15px !important;
+ }
+ .wall-item-photo-container {
+   display: table;
+   width: 780px;
+ }
+ 
+ .my-comment-photo {
+   width: 48px;
+   margin-left: 40px;
+   margin-right: 32px;
+       }
+ .comment-edit-preview {
+   width: 500px;
+   margin-top: 10px;
+ }
+ .comment-edit-text-empty {
+     width: 500px;
+     border: 1px solid #D2D2D2;
+     height: 3.2em;
+     color: #2d2d2d;
+ }
+ .comment-edit-text-full {
+   font-size: 12.5px;
+   height: 3.3em;
+   
+   border: 1px solid #D2D2D2;
+   width: 500px;
+ }
+ .comment-edit-photo {
+     margin: 10px 0 0;
+     display: table-cell;
+ }
  .wall-item-container.comment .contact-photo {
    width: 32px;
    height: 32px;
@@@ -1413,11 -1536,7 +1536,7 @@@
    color: #2d2d2d;
    border: 1px solid #2d2d2d;
  }
- .comment-edit-preview {
-   width: 710px;
-   border: 1px solid #2d2d2d;
-   margin-top: 10px;
- }
+ 
  .comment-edit-preview .contact-photo {
    width: 32px;
    height: 32px;
@@@ -1429,6 -1548,11 +1548,11 @@@
    top: 15px !important;
    left: 15px !important;
  }
+ .comment-edit-preview {
+   width: 500px;
+   margin-top: 10px;
+   background-color:  #fff797;
+ }
  .comment-edit-preview .wall-item-links {
    padding-left: 12px;
  }
@@@ -1652,7 -1776,7 +1776,7 @@@
      height: 20px;
      margin: 0 0 5px;
      width: 60%;
-     border: 1px solid #ffffff;
+     border: 1px solid #d2d2d2;
  }
  #profile-jot-form #jot-title:-webkit-input-placeholder {
    font-weight: normal;
@@@ -2046,6 -2170,8 +2170,8 @@@ height: 350px
  /* photo */
  .photo {
  border-radius: 10px;  
+ height: 145px !important;
+ width: 145px !important;
        }
  .lframe {
    float: left;
@@@ -2117,6 -2243,11 +2243,11 @@@ blockquote 
      border-left: 1px solid #D2D2D2;
      padding-left: 9px;
      margin: 0 0 0 .8ex;
+        color: #777;
+ }
+ .oembed {
+       font-size: large;
+       font-weight: bold;
  }
  .aprofile dt{
  box-shadow: 1px 1px 5px 0;
@@@ -2377,13 -2508,8 +2508,8 @@@ a.mail-list-link 
      margin-right: 5px;
      margin-top: 30px;
        }
- .comment-edit-text-empty {
-     margin: 10px 0 0;
-     width: 85%;
- }
- .comment-edit-photo {
-     margin: 10px 0 0;
- }
+ 
+ 
  .wall-item-like-buttons .icon.like {
  float: left;
  }
@@@ -2561,4 -2687,4 +2687,4 @@@ list-style-type: disc
  #photos-upload-newalbum-div {
          float: left;
          width: 175px;
 -}
 +}