Changeset 644 for trunk

Timestamp:

12/06/10 21:08:46 (18 months ago)

Author:

r2

Message:

всякое по-мелочи

Location:

trunk

Files:

• admin/editor/template.php (modified) (1 diff)
• admin/includes/cp.php (modified) (1 diff)
• admin/modules/mod_whoonline/backend.xml (modified) (1 diff)
• icms-trunk.sql (deleted)
• includes/nestedsets.php (modified) (1 diff)
• install/index.php (modified) (3 diffs)
• install/sqldumpdemo.sql (modified) (1 diff)
• install/sqldumpempty.sql (added)
• modules/mod_whoonline/module.php (modified) (3 diffs)
• templates/_default_/admin/content.php (modified) (1 diff)
• templates/_default_/modules/mod_usermenu.tpl (modified) (1 diff)

trunk/admin/editor/template.php

@@ -11 +11 @@
 <table width="100%" height="50" border="0" cellpadding="0" cellspacing="0" style="background-color:#2D557D">
   <tr>
-    <td width="326" style="padding-left:10px">
+    <td style="padding-left:10px">
         <h2><a style="color:#fff;text-decoration:none;" href="index.php"><?php echo $inConf->sitename; ?> &mdash; Ïàíåëü ðåäàêòîðà</a></h2>
     </td>

trunk/admin/includes/cp.php

@@ -15 +15 @@
     $inDB = cmsDatabase::getInstance();
 
-        if (!$GLOBALS['DEMO_MODE']){
-                return $inDB->query($sql);
-        } else {
-        
-                if (strstr($sql, 'SELECT')){
-                        return $inDB->query($sql);
-                }
-        
-        }
-    
-        return;
+    return $inDB->query($sql);
     
 }

trunk/admin/modules/mod_whoonline/backend.xml

@@ -8 +8 @@
         <param type="flag" name="show_today" title="Ïîêàçûâàòü êòî áûë ñåãîäíÿ" hint="Âûâîäèò äîïîëíèòåëüíî ñïèñîê âñåõ ïîñåòèòåëåé çà ñåãîäíÿ" default="on" />
                 <param type="flag" name="admin_editor" title="Ïîäñâå÷èâàòü àäìèíèñòðàòîðîâ è ðåäàêòîðîâ?" hint="Àäìèíèñòðàòîðû è ðåäàêòîðû áóäóò ïîäñâå÷åíû ñîîòâåòñòâåííî êðàñíûì è çåëåíûì" default="on" />
+        <param type="string" name="color_admin" title="Öâåò àäìèíèñòðàòîðîâ" hint="â ôîðìàòå #XXYYZZ" default="#FF0000" />
+        <param type="string" name="color_editor" title="Öâåò ðåäàêòîðîâ" hint="â ôîðìàòå #XXYYZZ" default="#009900" />
     </params>
 </backend>

trunk/includes/nestedsets.php

@@ -117 +117 @@
         private function BeginTransaction ($Differ = "")
         {
+        //r2: çäåñü íóæíî áóäåò ðàçáèðàòüñÿ ñ òðàíçàêöèÿìè
+        $this->_IsInTransaction = true; return true;
+
         $this->InitializeTransaction($Differ);
 

trunk/install/index.php

@@ -362 +362 @@
                                 <td align="center"><input name="db_prefix" type="text" class="txt" value="cms"></td>
                               </tr>
-                              <!--
-                              <tr>
-                                <td>Äåìî-äàííûå:<br>                      <br>                    </td>
+                              <tr>
+                                <td>Äåìî-äàííûå:</td>
                                 <td align="center" valign="top">
                                     <label><input name="demodata" type="radio" value="1" checked /> Äà</label>
@@ -370 +369 @@
                                 </td>
                               </tr>
-                              -->
                             </table>
                         </td>
@@ -376 +374 @@
                 </table>
 
-                                
-
-                <input type="hidden" name="demodata" value="1" />
-
-                <p style="color:gray">
+                                <p style="color:gray">
                     Ïðè óñòàíîâêå ñ äåìî-äàííûìè âñåì ïîëüçîâàòåëÿì áóäåò óñòàíîâëåí îäèíàêîâûé ïàðîëü, ñîâïàäàþùèé ñ ïàðîëåì àäìèíèñòðàòîðà.
                     Ëîãèí êàæäîãî ïîëüçîâàòåëÿ ìîæíî óçíàòü èç àäðåñà åãî ïðîôèëÿ èëè èç ïàíåëè óïðàâëåíèÿ.

trunk/install/sqldumpdemo.sql

@@ -1551 +1551 @@
   `user_id` int(11) NOT NULL,
   `album_id` int(11) NOT NULL,
-  `pubdate` date NOT NULL,
+  `pubdate` datetime NOT NULL,
   `title` varchar(250) NOT NULL,
   `description` text NOT NULL,

trunk/modules/mod_whoonline/module.php

@@ -14 +14 @@
         $inDB = cmsDatabase::getInstance();
                 $cfg = $inCore->loadModuleConfig($module_id);
+
+        if (!isset($cfg['color_admin'])) { $cfg['color_admin'] = '#FF0000'; }
+        if (!isset($cfg['color_editor'])) { $cfg['color_editor'] = '#009900'; }
 
         global $_LANG;
@@ -35 +38 @@
                                 while($usr = $inDB->fetch_assoc($result)){
                                         if($cfg['admin_editor']){
-                                        if ($inCore->userIsAdmin($usr['id'])){
-                                                echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:red");
-                                        } elseif ($inCore->userIsEditor($usr['id'])) {  
-                                                echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:green");
-                                        } else {
-                                                echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login']);
-                                        }
+                        if ($inCore->userIsAdmin($usr['id'])){
+                            echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:{$cfg['color_admin']}");
+                        } elseif ($inCore->userIsEditor($usr['id'])) {
+                            echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:{$cfg['color_editor']}");
+                        } else {
+                            echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login']);
+                        }
                                         } else {
                                                 echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login']);
@@ -73 +76 @@
                                         if($cfg['admin_editor']){
                                                 if ($inCore->userIsAdmin($usr['id'])){
-                                                        echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:red");
+                                                        echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:{$cfg['color_admin']}");
                                                 } elseif ($inCore->userIsEditor($usr['id'])) {  
-                                                        echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:green");
+                                                        echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login'], "color:{$cfg['color_editor']}");
                                                 } else {
                                                         echo cmsUser::getGenderLink($usr['id'], $usr['nickname'], null, $usr['gender'], $usr['login']);

trunk/templates/_default_/admin/content.php

@@ -28 +28 @@
                 </div>
             </div>
-            <?php foreach($cats as $num=>$cat) { ?>
-                <div style="padding-left:<?php echo ($cat['NSLevel'])*20; ?>px" class="cat_link">
-                    <div>
-                        <?php if ($category_id != $cat['id']) { ?>
-                            <a href="<?php echo $base_uri.'&cat_id='.$cat['id']; ?>" style="<?php if ($cat['NSLevel']==1){ echo 'font-weight:bold'; } ?>"><?php echo $cat['title']; ?></a>
-                        <?php } else { ?>
-                            <?php echo $cat['title']; $current_cat = $cat['title']; ?>
-                        <?php } ?>
+            <?php if (is_array($cats)){ ?>
+                <?php foreach($cats as $num=>$cat) { ?>
+                    <div style="padding-left:<?php echo ($cat['NSLevel'])*20; ?>px" class="cat_link">
+                        <div>
+                            <?php if ($category_id != $cat['id']) { ?>
+                                <a href="<?php echo $base_uri.'&cat_id='.$cat['id']; ?>" style="<?php if ($cat['NSLevel']==1){ echo 'font-weight:bold'; } ?>"><?php echo $cat['title']; ?></a>
+                            <?php } else { ?>
+                                <?php echo $cat['title']; $current_cat = $cat['title']; ?>
+                            <?php } ?>
+                        </div>
                     </div>
-                </div>
+                <?php } ?>
             <?php } ?>
         </td>

trunk/templates/_default_/modules/mod_usermenu.tpl

@@ -27 +27 @@
     {/if}
 
-    {if $is_can_add && !$is_admin}
+    {if $is_can_add && !$is_admin && !$is_editor}
     <span class="my_content">
         <a href="/content/my.html">{$LANG.USERMENU_ARTICLES}</a>