Changeset 14

Timestamp:

08/09/05 21:14:53 (6 years ago)

Author:

alexx

Message:

* fix #16 (add include of country list)
* fux bug in owned communities ("New Topic/event" not displayed)
* fix sample db data
* change strstr to strpos in includes/functions.inc.php (strpos is faster)

Location:

trunk

Files:

• dotnode-data.sql (modified) (1 diff)
• inc/communities/createEvent.inc.php (modified) (1 diff)
• inc/communities/editEvent.inc.php (modified) (1 diff)
• inc/communities/events.inc.php (modified) (1 diff)
• inc/communities/forum.inc.php (modified) (2 diffs)
• inc/communities/view.inc.php (modified) (1 diff)
• includes/functions.inc.php (modified) (2 diffs)
• smarty/templates/communities/events.tpl (modified) (1 diff)
• smarty/templates/communities/forum.tpl (modified) (1 diff)

trunk/dotnode-data.sql

@@ -89 +89 @@
 --
 
-INSERT INTO `cache_user` VALUES ('354a778bacabffaff3d3fd74f93ac278','alexx','Alexandre','DATH','','A42536','D000','','France','male',25,'committed','friend,business,partners',1084260676,'y',2,'1353c20315c720ad6c88a498ccc1c1ac,00112233445566778899001122334455',0,'',0,0,0,0,0.00,0.00,0.00);
+INSERT INTO `cache_user` VALUES ('354a778bacabffaff3d3fd74f93ac278','alexx','Alexandre','DATH','','A42536','D000','','France','male',25,'committed','friend,business,partners',1084260676,'y',2,'1353c20315c720ad6c88a498ccc1c1ac,00112233445566778899001122334455',1,'1',0,0,0,0,0.00,0.00,0.00);
 INSERT INTO `cache_user` VALUES ('00112233445566778899001122334455','moderator','Moderator','Moderator','','','','','France','male',25,'','',1084260676,'y',1,'354a778bacabffaff3d3fd74f93ac278',0,'',0,0,0,0,0.00,0.00,0.00);
 INSERT INTO `cache_user` VALUES ('1353c20315c720ad6c88a498ccc1c1ac','mdoe','John','Doe',NULL,'J500','D000',NULL,'France','male',0,'single','business,partners',1122934961,'y',1,'354a778bacabffaff3d3fd74f93ac278',0,'',1,0,1,5,0.00,0.00,0.00);

trunk/inc/communities/createEvent.inc.php

@@ -32 +32 @@
         if(in_array($community['info']['id_comm'], $_SESSION['my_communities_id']))
         {
-        /************* menu *******************/
-        $leftmenu["/communities/view/".$community['info']['id_comm']] = 'Return to community';
-        $leftmenu["/communities/forum/".$community['info']['id_comm']] = 'View forum';
-        $leftmenu["/communities/events/".$community['info']['id_comm']] = 'View events';
+                /************* menu *******************/
+                $leftmenu["/communities/view/".$community['info']['id_comm']] = 'Return to community';
+                $leftmenu["/communities/forum/".$community['info']['id_comm']] = 'View forum';
+                $leftmenu["/communities/events/".$community['info']['id_comm']] = 'View events';
 
-        $smarty->assign('leftmenu',$leftmenu);
-        /************************************/
+                $smarty->assign('leftmenu',$leftmenu);
+                /************************************/
 
-        $smarty->assign('Title', 'Communities');
-        $smarty->assign('community', $community);
+                $smarty->assign('Title', 'Communities');
+                $smarty->assign('community', $community);
         }
         else

trunk/inc/communities/editEvent.inc.php

@@ -22 +22 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  ******************** http://opensource.ikse.net/projects/dotnode ***/
+include(INCLUDESPATH.'/countries_list.inc.php');
 
 if(is_numeric($token[2]))

trunk/inc/communities/events.inc.php

@@ -40 +40 @@
         if($_SESSION['my_id'] != $community['info']['id'])
                 if(in_array($community['info']['id_comm'], $_SESSION['my_communities_id']) ) 
+                {
                         $leftmenu["/communities/unjoin/".$token[2]] = 'Unjoin';
+                        $_SMARTY['is_member'] = 1;
+                }
                 else
+                {
                         $leftmenu["/communities/join/".$token[2]] = 'Join';
+                        $_SMARTY['id_member'] = 0;
+                }
         else
+        {
                 $leftmenu["/communities/edit/".$token[2]] = 'Edit';     
-
+                $_SMARTY['is_member'] = 1;
+        }
 
         $leftmenu["/communities/forum/".$token[2]] = 'View forum';
         $leftmenu["/communities/invite/".$token[2]] = 'Invite friends';
 
-        $smarty->assign('leftmenu',$leftmenu);
-
+        $_SMARTY['leftmenu'] = $leftmenu;
 
         /************************************/
 
 
+        $_SMARTY['Title'] = 'Community';
 
-        $smarty->assign('Title', 'Community');
+        if($_SMARTY['is_member'])
+                $db->query('UPDATE user_comm SET last_visit=? WHERE id=? AND id_comm=?', array(time(), $_SESSION['my_id'], $community['info']['id_comm']));
 
-        if($_SESSION['my_communities_id'])
-        {
-                if( in_array($community['info']['id_comm'], $_SESSION['my_communities_id']) )
-                {
-                        $db->query('UPDATE user_comm SET last_visit=? WHERE id=? AND id_comm=?', array(time(), $_SESSION['my_id'], $community['info']['id_comm']));
-                        $smarty->assign('member', true);
-                }
-        }
-
-
-        $smarty->assign('community', $community);
+        $_SMARTY['community'] = $community;
 }
 else

trunk/inc/communities/forum.inc.php

@@ -39 +39 @@
         if($_SESSION['my_id'] != $community['info']['id'])
                 if(in_array($community['info']['id_comm'], $_SESSION['my_communities_id']) )
+                {
                         $leftmenu["/communities/unjoin/".$token[2]] = 'Unjoin';
+                        $_SMARTY['is_member'] = 1;
+                }
                 else
+                {
                         $leftmenu["/communities/join/".$token[2]] = 'Join';
+                        $_SMARTY['is_member'] = 0;
+                }
         else
+        {
                 $leftmenu["/communities/edit/".$token[2]] = 'Edit';     
-
+                $_SMARTY['is_member'] = 1;
+        }
 
         $leftmenu["/communities/events/".$token[2]] = 'View events';
         $leftmenu["/communities/invite/".$token[2]] = 'Invite friends';
 
-        $smarty->assign('leftmenu',$leftmenu);
+        $_SMARTY['leftmenu'] = $leftmenu;
 
 
@@ -56 +64 @@
 
 
-        $smarty->assign('Title', 'Community');
+        $_SMARTY['Title'] = 'Community';
+        
 
-        if($_SESSION['my_communities_id'])
-        {
-                if( in_array($community['info']['id_comm'], $_SESSION['my_communities_id']) )
-                {
-                        $db->query('UPDATE user_comm SET last_visit=? WHERE id=? AND id_comm=?', array(time(), $_SESSION['my_id'], $community['info']['id_comm']));
-                        $smarty->assign('member', true);
-                }
-        }
+        if($_SMARTY['is_member'])
+                $db->query('UPDATE user_comm SET last_visit=? WHERE id=? AND id_comm=?', array(time(), $_SESSION['my_id'], $community['info']['id_comm']));
 
-
-        $smarty->assign('community', $community);
+        $_SMARTY['community'] = $community;
 }
 else

trunk/inc/communities/view.inc.php

@@ -121 +121 @@
                 }
         else
+        {
+                $smarty->assign('is_member', 1);
                 $leftmenu["/communities/edit/".$token[2]] = 'Edit';     
+        }
 
 

trunk/includes/functions.inc.php

@@ -294 +294 @@
                 if(array_key_exists('friends_id', $info) && $info['friends_id'] != NULL)
                 {
-                        if(strstr($info['friends_id'],',') != false)
+                        if(strpos($info['friends_id'],','))
                                 $info['friends_id'] = explode(',', $info['friends_id']);
                         else
@@ -310 +310 @@
 
                 if(array_key_exists('communities_id', $info) && $info['communities_id'] != NULL)
-                        if(strstr($info['communities_id'],',') != false)
+                        if(strpos($info['communities_id'],','))
                                         $info['communities_id'] = explode(',', $info['communities_id']);
                                 else

trunk/smarty/templates/communities/events.tpl

@@ -47 +47 @@
 </tr>
 {/foreach}
-{if $member}
+{if $is_member}
 <tr class='{cycle name='events' values='odd,even'}'>
 <td colspan='3' align='right'><a class='button' href='/communities/createEvent/{$token[2]}'>{t}New event{/t}</a></td>

trunk/smarty/templates/communities/forum.tpl

@@ -51 +51 @@
 </tr>
 {/foreach}
-{if $member}
+{if $is_member}
 <tr class='{cycle name='forum' values='odd,even'}'>
 <td colspan='4' align='right'><a class='button' href='/communities/createTopic/{$token[2]}'>{t}New topic{/t}</a></td>