forumlist: dbupdate

diff --git a/boot.php b/boot.php
index d1f0d705ff56d7128a540c7290c87205ba864ae4..6e9e45873a45cb6ca5f8e5b14d08e1cf35c73ea5 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -19,7 +19,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
 define ( 'FRIENDICA_VERSION',      '3.4.2' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1190      );
+define ( 'DB_UPDATE_VERSION',      1191      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 0dd74ab15f4cfb9eb0b33355ad87773a6f7862d2..7d8f89df6c6143fccc8cc25a811507f27a164674 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -2,7 +2,7 @@
 require_once("boot.php");
 require_once("include/text.php");
 
-define('NEW_UPDATE_ROUTINE_VERSION', 1170);
+define('NEW_UPDATE_ROUTINE_VERSION', 1191);
 
 /*
  * send the email and do what is needed to do on update fails

diff --git a/include/forums.php b/include/forums.php
index 47565806913a0ffa107b12d88cf8fafb21f8850c..e604a3156777a14638d0a697889c713f069bc341 100644 (file)
--- a/include/forums.php
+++ b/include/forums.php
@@ -2,20 +2,20 @@
 
 /**
  * @file include/forums.php
- * @brief functions related to forum functionality * 
+ * @brief Functions related to forum functionality * 
  */
 
 
 /**
- * @brief function to list all forums a user is connected with
+ * @brief Function to list all forums a user is connected with
  * 
  * @param int $uid of the profile owner
  * @param boolean $showhidden
- *     show frorums which are not hidden
+ *     Show frorums which are not hidden
  * @param boolean $lastitem
- *     sort by lastitem
+ *     Sort by lastitem
  * @param boolean $showprivate
- *     show private groups
+ *     Show private groups
  * 
  * @returns array
  *     'url'   => forum url
@@ -27,11 +27,11 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
 
        $forumlist = array();
 
-       $order = (($showhidden) ? '' : " AND `hidden` = 0 ");
+       $order = (($showhidden) ? '' : ' AND `hidden` = 0 ');
        $order .= (($lastitem) ? ' ORDER BY `last-item` ASC ' : ' ORDER BY `name` ASC ');
-       $select = "`forum` = 1";
+       $select = '`forum` = 1';
        if ($showprivate) {
-               $select = "( `forum` = 1 OR `prv` = 1 )";
+               $select = '( `forum` = 1 OR `prv` = 1 )';
        }
 
        $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM contact 
@@ -54,7 +54,7 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
 
 
 /**
- * @brief forumlist widget
+ * @brief Forumlist widget
  * 
  * Sidebar widget to show subcribed friendica forums. If activated
  * in the settings, it appears at the notwork page sidebar
@@ -95,7 +95,7 @@ function widget_forumlist($a) {
                $tpl = get_markup_template('widget_forumlist.tpl');
 
                $o .= replace_macros($tpl,array(
-                       '$title'        => t("Forums"),
+                       '$title'        => t('Forums'),
                        '$forums'       => $entries,
                        '$link_desc'    => t('External link to forum'),
                        '$total'        => $total,
@@ -108,7 +108,7 @@ function widget_forumlist($a) {
 }
 
 /**
- * @brief format forumlist as contact block
+ * @brief Format forumlist as contact block
  * 
  * This function is used to show the forumlist in
  * the advanced profile.
@@ -145,4 +145,4 @@ function forumlist_profile_advanced($uid) {
        if(count($contacts) > 0)
                $o .= $forumlist;
                return $o;
-}
\ No newline at end of file
+}

diff --git a/update.php b/update.php
index 33b4560c09a4981f3ea17e174f7ce2bd2fd8dde6..b6faa85081da95d7db136d35556bc807442e59a0 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1190 );
+define( 'UPDATE_VERSION' , 1191 );
 
 /**
  *
@@ -1659,3 +1659,51 @@ function update_1188() {
 
        return UPDATE_SUCCESS;
 }
+
+function update_1190() {
+
+       require_once('/include/plugins.php');
+
+       if (plugin_enabled('forumlist')) {
+               $plugin = 'forumlist';
+               $plugins = get_config('system','addon');
+               $plugins_arr = array();
+               if($plugins) {
+                       $plugins_arr = explode(',',str_replace(' ', '',$plugins));
+                       $idx = array_search($plugin, $plugins_arr);
+                       if ($idx !== false){
+                               unset($plugins_arr[$idx]);
+                               uninstall_plugin($plugin);
+                               set_config('system','addon', implode(', ',$plugins_arr));
+                       }
+               }
+       }
+
+       $r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%d' ",
+               dbesc('forumlist')
+);
+
+       foreach ($r as $rr) {
+               $uid = $rr['uid'];
+               $family = $rr['cat'];
+               $key = $rr['k'];
+               $value = $rr['v'];
+
+               if ($key === 'randomize')
+                       del_pconfig($uid,$family,$key);
+
+               if ($key === 'show_on_profile') {
+                       if ($value)
+                               set_pconfig($uid,feature,forumlist_profile,$value);
+
+                       del_pconfig($uid,$family,$key);
+               }
+
+               if ($key === 'show_on_network') {
+                       if ($value)
+                               set_pconfig($uid,feature,forumlist,$value);
+
+                       del_pconfig($uid,$family,$key);
+               }
+       }
+}

diff --git a/view/global.css b/view/global.css
index 29373941e33f37149e4f4182c14b51cd0909265c..24d0819db5b82d81619351afc04dd1e0b844e2de 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -312,4 +312,4 @@ ul.credits li {
 .forumlist-img {
   height: 20px;
   width: 20px;
-}
\ No newline at end of file
+}

diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 0306332638b93e6c032ab8e6f78b338456431365..4d155fd0ad99a565172e9a4c9418fcea573cb5fe 100644 (file)
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -42,4 +42,4 @@ function showHideForumlist() {
        </ul>
        {{/if}}
 
-</div>
\ No newline at end of file
+</div>