Browse Source

Replaced old and deleted PHP functions and slightly modified themes.

Klectik 7 years ago
parent
commit
3072457fb3

+ 1 - 1
archive.php View File

128
 		<meta name="generator" content="sorbet <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
128
 		<meta name="generator" content="sorbet <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
129
 		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
129
 		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
130
 		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlSorbet.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
130
 		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlSorbet.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
131
-		<title><?php echo $conf->title." &raquo; ".__(" archive"); ?></title>
131
+		<title><?php echo $conf->title." - ".__(" archive"); ?></title>
132
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.js"></script>
132
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.js"></script>
133
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.scrollTo-min.js"></script>
133
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.scrollTo-min.js"></script>
134
 		<link href="<?php echo $conf->urlSorbet;?>/admin/css/archive.css" type="text/css" rel="stylesheet">
134
 		<link href="<?php echo $conf->urlSorbet;?>/admin/css/archive.css" type="text/css" rel="stylesheet">

+ 1 - 1
classes/gettext.class.php View File

303
         } else {
303
         } else {
304
             $header = $this->get_translation_string(0);
304
             $header = $this->get_translation_string(0);
305
         }
305
         }
306
-        if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) {
306
+        if (preg_match("/plural-forms: ([^\n]*)\n/i", $header, $regs)) {
307
             $expr = $regs[1];
307
             $expr = $regs[1];
308
         } else {
308
         } else {
309
             $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
309
             $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";

+ 1 - 1
classes/pagination.class.php View File

101
         #to change urlFriendly
101
         #to change urlFriendly
102
         public function urlFriendly($value="%")
102
         public function urlFriendly($value="%")
103
         {
103
         {
104
-            if (eregi('^ *$', $value)) {
104
+            if (preg_match('/^ *$/i', $value)) {
105
                 $this->urlF=false;
105
                 $this->urlF=false;
106
                 return false;
106
                 return false;
107
             }
107
             }

+ 1 - 1
index.php View File

59
         $sorbet_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlSorbet."/images/favicon.ico\" />";
59
         $sorbet_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlSorbet."/images/favicon.ico\" />";
60
 
60
 
61
         $page_title = $conf->title;
61
         $page_title = $conf->title;
62
-        $page_title_divisor = " &raquo; "; // it should be set in configuration
62
+        $page_title_divisor = " - "; // it should be set in configuration
63
         $page_title_len = 50; // it should be set in configuration
63
         $page_title_len = 50; // it should be set in configuration
64
         if ($id_post) {
64
         if ($id_post) {
65
             $register = $tumble->getPost($id_post);
65
             $register = $tumble->getPost($id_post);

File diff suppressed because it is too large
+ 1 - 1
themes/SorbetDark/css/bootstrap.min.css


+ 4 - 4
themes/SorbetDark/index.htm View File

12
   </head>
12
   </head>
13
   <body>
13
   <body>
14
     <div class="container">
14
     <div class="container">
15
-      <header>
16
-        <h1><a href="{URL_Tumble}">{Title}</a></h1>
17
-        <p class="lead">{Description}</p>
18
-      </header>
19
       {if $isAuthenticated}
15
       {if $isAuthenticated}
20
       <nav class="navbar navbar-default">
16
       <nav class="navbar navbar-default">
21
         <div class="container-fluid">
17
         <div class="container-fluid">
38
         </div>
34
         </div>
39
       </nav>
35
       </nav>
40
       {/if}
36
       {/if}
37
+      <header>
38
+        <h1><a href="{URL_Tumble}">{Title}</a></h1>
39
+        <p class="lead">{Description}</p>
40
+      </header>
41
       {if $error}
41
       {if $error}
42
         <div>{$error}</div>
42
         <div>{$error}</div>
43
       {else}
43
       {else}

+ 4 - 4
themes/SorbetLight/index.htm View File

12
   </head>
12
   </head>
13
   <body>
13
   <body>
14
     <div class="container">
14
     <div class="container">
15
-      <header>
16
-        <h1><a href="{URL_Tumble}">{Title}</a></h1>
17
-        <p class="lead">{Description}</p>
18
-      </header>
19
       {if $isAuthenticated}
15
       {if $isAuthenticated}
20
       <nav class="navbar navbar-default">
16
       <nav class="navbar navbar-default">
21
         <div class="container-fluid">
17
         <div class="container-fluid">
38
         </div>
34
         </div>
39
       </nav>
35
       </nav>
40
       {/if}
36
       {/if}
37
+      <header>
38
+        <h1><a href="{URL_Tumble}">{Title}</a></h1>
39
+        <p class="lead">{Description}</p>
40
+      </header>
41
       {if $error}
41
       {if $error}
42
         <div>{$error}</div>
42
         <div>{$error}</div>
43
       {else}
43
       {else}