Merge pull request #84 from annando/master

fbpost can now post to groups and pages

diff --git a/altpager/admin.tpl b/altpager/admin.tpl
new file mode 100755 (executable)
index 0000000..6055880
--- /dev/null
+++ b/altpager/admin.tpl
@@ -0,0 +1,3 @@
+{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/altpager/altpager.php b/altpager/altpager.php
index 65f9c0d835e1ccc90be2ca1b2598bdc83dc22c24..f5ccbe4d025a79d9f280afe881cb6aed9daa4412 100755 (executable)
--- a/altpager/altpager.php
+++ b/altpager/altpager.php
@@ -61,6 +61,10 @@ function altpager_settings(&$a,&$s) {
        if(! local_user())
                return;
 
+       $global = get_config("alt_pager", "global");
+       if($global == 1)
+               return;
+
        /* Add our stylesheet to the page so we can make our settings look nice */
 
        $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/altpager/altpager.css' . '" media="all" />' . "\r\n";
@@ -87,3 +91,18 @@ function altpager_settings(&$a,&$s) {
        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="altpager-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
+
+function altpager_plugin_admin(&$a, &$o){
+       $t = file_get_contents( $a->get_baseurl() . "/addon/altpager/admin.tpl" );
+       $o = replace_macros($t, array(
+               '$submit' => t('Submit'),
+               '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'),  get_config('alt_pager', 'global') == 1),
+               '$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'),  get_config('alt_pager', 'global') == 0)
+       ));
+}
+
+function altpager_plugin_admin_post(&$a){
+       $choice =       ((x($_POST,'altpagerchoice'))           ? notags(trim($_POST['altpagerchoice']))        : '');
+       set_config('alt_pager','global',($choice == 1 ? 1 : 0));
+       info( t('Settings updated.'). EOL );
+}

diff --git a/convert.tgz b/convert.tgz
index 56e0080c36b9c959832c7d441e7fa1117f42edba..766eaf7aa41c9aa30835a773b68065c4f1e1829c 100755 (executable)
Binary files a/convert.tgz and b/convert.tgz differ

diff --git a/editplain.tgz b/editplain.tgz
index be81317741b2c89ac0b583107be2ba43940c7aa2..0f2b95d0ec1750d7d354ec0839b8ef61e3169489 100644 (file)
Binary files a/editplain.tgz and b/editplain.tgz differ

diff --git a/editplain/editplain.php b/editplain/editplain.php
index 7d91c29526bfe498096638725107ed0598e7da38..966e2d8fde5eaebe3f6e19a788ae316d9f3532e4 100755 (executable)
--- a/editplain/editplain.php
+++ b/editplain/editplain.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Editplain
- * Description: Disable richtext (TinyMCE) editor for status posting
+ * Description: This addon is deprecated and has been replaced with the "Advanced Features" setting.  Admins should remove this addon when their core code is updated to include advanced feature settings.
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * 

diff --git a/fbpost.tgz b/fbpost.tgz
index c60a6c06224f66574ff37e9ad3e3c915272e4b36..ded32e198ae4c8dc9a585e97e97e832f8afccdf7 100644 (file)
Binary files a/fbpost.tgz and b/fbpost.tgz differ

diff --git a/forumlist.tgz b/forumlist.tgz
index fe559f337b88b2784f3854b79f543d844036d224..cbcf0fbd82d4917b1c651b527d99c9beac1902ed 100644 (file)
Binary files a/forumlist.tgz and b/forumlist.tgz differ

diff --git a/js_upload.tgz b/js_upload.tgz
index 98e16c5a6fa2d90b20397396109657da6932e7fc..5a415de7dd170a11604772490a0402aabc88a9ac 100755 (executable)
Binary files a/js_upload.tgz and b/js_upload.tgz differ

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 3ba5f9c4dc74a850d5082565a4df5d09be979972..148fde313a43557d9b2068aa773c029127731590 100755 (executable)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -196,7 +196,13 @@ class qqUploadedFileXhr {
      */
     function save() {    
         $input = fopen("php://input", "r");
-        $this->pathnm = tempnam(sys_get_temp_dir(),'frn');
+
+               $upload_dir = get_config('system','tempdir');
+               if(! $upload_dir)
+                       $upload_dir = sys_get_temp_dir();
+
+        $this->pathnm = tempnam($upload_dir,'frn');
+
                $temp = fopen($this->pathnm,"w");
         $realSize = stream_copy_to_stream($input, $temp);
 

diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
index 2087d3f057a0a241c482268f9aab0d25a0aab6a8..e0494c5c45599d7e32803ec45d5c771044677e17 100755 (executable)
--- a/ljpost/ljpost.css
+++ b/ljpost/ljpost.css
@@ -1,6 +1,5 @@
 
 #ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
-<<<<<<< HEAD
        float: left;
        width: 200px;
        margin-top: 10px;
@@ -15,18 +14,3 @@
        margin-top: 15px;
 }
 
-=======
-float: left;
-width: 200px;
-margin-top: 10px;
-}
-
-#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
-float: left;
-margin-top: 10px;
-}
-
-#ljpost-submit {
-margin-top: 15px;
-}
->>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4

diff --git a/openstreetmap.tgz b/openstreetmap.tgz
index 34f4bd6b15ddd900a4859dfd3e6d6587ba6ee03a..c195d151cbcb66c49f95f39d2a8c0a13967fe5c5 100644 (file)
Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ

diff --git a/page.tgz b/page.tgz
index 21dab7b94164c7f51f9eff6ecd4071c44243b550..02140ce92def21beac5e562e0db67eefd522ff8a 100644 (file)
Binary files a/page.tgz and b/page.tgz differ

diff --git a/page/page.php b/page/page.php
index 0e00909800f28ef72d505319360a91bf44395dd8..21a83e16d48126d96e061d40136b0c55f3e357c1 100755 (executable)
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Page
- * Description: Shows list of subscribed community pages/forums on network sidebar
+ * Description: This addon is now deprecated.  Administrators should switch to forumlist instead.  Developers should also add any functionality to forumlist instead of here.
  * Version: 1.0
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by

diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
index b4c100804d3eac95cc71393cd27162f5ba8361c0..8441ab65160d2693a003bc269120ee7e338e7a6a 100644 (file)
Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index fe2689ca3714b971e2313049231a9ffd4ee05ae2..2efe63322c73961c2589ca82b927304bf3dc109d 100644 (file)
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ

diff --git a/statusnet.tgz b/statusnet.tgz
index c171f2c38aa190988fc5792d04fe3fb5b71df60e..72b6e928d7f92b1a7c79299b48a485295f33b9a8 100755 (executable)
Binary files a/statusnet.tgz and b/statusnet.tgz differ

diff --git a/twitter.tgz b/twitter.tgz
index beeea2bee46fb21069de6b6402035d4e3bf71511..539ded93508e549765402e20b2ad3d0a4aa2f5a9 100755 (executable)
Binary files a/twitter.tgz and b/twitter.tgz differ