Changeset 13172

Timestamp:

Feb 15, 2012, 5:52:24 PM (12 years ago)

Author:

patdenice

Message:

feature:2577
Add functionnality in core files.

Location:

trunk

Files:

• admin/include/themes.class.php (modified) (6 diffs)
• admin/themes/default/template/themes_installed.tpl (modified) (2 diffs)
• include/common.inc.php (modified) (1 diff)
• include/mdetect.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/include/themes.class.php

@@ -49 +49 @@
   function perform_action($action, $theme_id)
   {
+    global $conf;
+
     if (isset($this->db_themes_by_id[$theme_id]))
     {
@@ -87 +89 @@
         }
 
+        if ($this->fs_themes[$theme_id]['mobile'] and !empty($conf['mobile_theme']))
+        {
+          array_push($errors, l10n('You can activate only one mobile theme.'));
+          break;
+        }
+
         if (file_exists($file_to_include))
         {
@@ -106 +114 @@
 ;';
           pwg_query($query);
+
+          if ($this->fs_themes[$theme_id]['mobile'])
+          {
+            conf_update_param('mobile_theme', $theme_id);
+          }
         }
         break;
@@ -165 +178 @@
 ;';
         pwg_query($query);
+
+        if ($this->fs_themes[$theme_id]['mobile'])
+        {
+          conf_update_param('mobile_theme', '');
+        }
         break;
 
@@ -326 +344 @@
             'description' => '',
             'author' => '',
+            'mobile' => false,
             );
           $theme_data = implode( '', file($path.'/themeconf.inc.php') );
@@ -366 +385 @@
             $theme['parent'] = $val[1];
           }
-          if (preg_match('/["\']activable["\'].*?(true|false)/', $theme_data, $val))
+          if (preg_match('/["\']activable["\'].*?(true|false)/i', $theme_data, $val))
           {
             $theme['activable'] = get_boolean($val[1]);
+          }
+          if (preg_match('/["\']mobile["\'].*?(true|false)/i', $theme_data, $val))
+          {
+            $theme['mobile'] = get_boolean($val[1]);
           }
 

trunk/admin/themes/default/template/themes_installed.tpl

@@ -18 +18 @@
 {foreach from=$active_themes item=theme}
   <div class="themeBox{if $theme.is_default} themeDefault{/if}">
-    <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if}</div>
+    <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if} {if $theme.mobile} <em>({'mobile'|@translate})</em>{/if}</div>
     <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div>
     <div class="themeActions">
@@ -48 +48 @@
 {foreach from=$inactive_themes item=theme}
   <div class="themeBox">
-    <div class="themeName">{$theme.name}</div>
+    <div class="themeName">{$theme.name}{if $theme.mobile} <em>({'mobile'|@translate})</em>{/if}</div>
     <div class="themeShot"><a href="{$theme.screenshot}" class="preview-box" title="{$theme.name}"><img src="{$theme.screenshot}" alt=""></a></div>
     <div class="themeActions">

trunk/include/common.inc.php

@@ -193 +193 @@
 else
 { // Classic template
-  $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme'] );
+  $theme = $user['theme'];
+
+  if (!isset($_SESSION['is_mobile']))
+  {
+    include_once(PHPWG_ROOT_PATH.'include/mdetect.php');
+    $uagent_obj = new uagent_info();
+    if ($_SESSION['is_mobile'] = $uagent_obj->DetectMobileLong())
+    {
+      $_SESSION['use_mobile_theme'] = !empty($conf['mobile_theme']);
+    }
+  }
+  if ($_SESSION['is_mobile'])
+  {
+    if (isset($_REQUEST['mobile']))
+    {
+      $_SESSION['use_mobile_theme'] = get_boolean($_REQUEST['mobile']);
+    }
+    if ($_SESSION['use_mobile_theme'])
+    {
+      $theme = $conf['mobile_theme'];
+    }
+  }
+  $template = new Template(PHPWG_ROOT_PATH.'themes', $theme );
 }
 

trunk/language/en_UK/admin.lang.php

@@ -846 +846 @@
 $lang['Center of interest'] = 'Center of interest';
 $lang['Move to album'] = 'Move to album';
+$lang['You can activate only one mobile theme.'] = 'You can activate only one mobile theme.';
+$lang['mobile'] = 'mobile';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -847 +847 @@
 $lang['%s has been successfully updated.'] = '%s a été mis à jour avec succès.';
 $lang['Move to album'] = 'Déplacer vers l\'album';
+$lang['You can activate only one mobile theme.'] = 'Vous ne pouvez activer qu\'un seul thème mobile.';
+$lang['mobile'] = 'mobile';
 ?>